diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 4be8a81b845..191a3bd2ad8 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -42,6 +42,8 @@ have disables the InnoDB inlining in this file. */
 
 #define MAX_ULONG_BIT ((ulong) 1 << (sizeof(ulong)*8-1))
 
+#ifdef WITH_INNOBASE_STORAGE_ENGINE
+
 #include "ha_innodb.h"
 
 pthread_mutex_t innobase_share_mutex,	/* to protect innobase_open_files */
@@ -7460,3 +7462,5 @@ mysql_declare_plugin(innobase)
 }
 mysql_declare_plugin_end;
 
+#endif
+
diff --git a/unittest/Makefile.am b/unittest/Makefile.am
index 5e0a8658fb6..ca3291efde0 100644
--- a/unittest/Makefile.am
+++ b/unittest/Makefile.am
@@ -1,7 +1,8 @@
 SUBDIRS      = mytap . mysys examples
 
 noinst_SCRIPTS = unit
-EXTRA_DIST = 		unit.pl
+EXTRA_DIST = unit.pl
+CLEANFILES = unit
 
 unittests = mytap mysys