diff --git a/storage/tokudb/Makefile.am b/storage/tokudb/Makefile.am
index 9b7aee5939b..e89ce061cc5 100644
--- a/storage/tokudb/Makefile.am
+++ b/storage/tokudb/Makefile.am
@@ -19,12 +19,12 @@ EXTRA_LTLIBRARIES =	ha_tokudb.la
 pkglib_LTLIBRARIES =	@plugin_tokudb_shared_target@
 ha_tokudb_la_LIBADD =   -L$(TOKUFRACTALTREE)/lib -l$(TOKUFRACTALTREE_LIBNAME) -ltokuportability
 ha_tokudb_la_LDFLAGS =	-module -rpath $(pkglibdir)/plugin
-ha_tokudb_la_CXXFLAGS =	$(AM_CFLAGS) -DMYSQL_PLUGIN
+ha_tokudb_la_CXXFLAGS =	$(AM_CFLAGS) -DMYSQL_PLUGIN -DTOKUDB_VERSION=\"$(TOKUDB_VERSION)\" -Wall
 ha_tokudb_la_SOURCES =	hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc
 
 EXTRA_LIBRARIES =	libtokudb.a
 noinst_LIBRARIES =	@plugin_tokudb_static_target@
-libtokudb_a_CXXFLAGS =	$(AM_CFLAGS)
+libtokudb_a_CXXFLAGS =	$(AM_CFLAGS) -Wall
 libtokudb_a_SOURCES =	hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc
 
 EXTRA_DIST =		CMakeLists.txt plug.in
diff --git a/storage/tokudb/Makefile.in b/storage/tokudb/Makefile.in
index 850336d048e..84990fa1a78 100644
--- a/storage/tokudb/Makefile.in
+++ b/storage/tokudb/Makefile.in
@@ -417,11 +417,11 @@ EXTRA_LTLIBRARIES = ha_tokudb.la
 pkglib_LTLIBRARIES = @plugin_tokudb_shared_target@
 ha_tokudb_la_LIBADD = -L$(TOKUFRACTALTREE)/lib -l$(TOKUFRACTALTREE_LIBNAME) -ltokuportability
 ha_tokudb_la_LDFLAGS = -module -rpath $(pkglibdir)/plugin
-ha_tokudb_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_PLUGIN
+ha_tokudb_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_PLUGIN -DTOKUDB_VERSION=\"$(TOKUDB_VERSION)\" -Wall
 ha_tokudb_la_SOURCES = hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc
 EXTRA_LIBRARIES = libtokudb.a
 noinst_LIBRARIES = @plugin_tokudb_static_target@
-libtokudb_a_CXXFLAGS = $(AM_CFLAGS)
+libtokudb_a_CXXFLAGS = $(AM_CFLAGS) -Wall
 libtokudb_a_SOURCES = hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc
 EXTRA_DIST = CMakeLists.txt plug.in
 all: all-am