diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt
index 274dd23e6b0..055f6eaa177 100644
--- a/storage/tokudb/CMakeLists.txt
+++ b/storage/tokudb/CMakeLists.txt
@@ -14,8 +14,7 @@ IF(NOT TOKUDB_OK)
 ENDIF()
 
 SET(TOKUDB_SOURCES ha_tokudb.cc)
-MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
-    LINK_LIBRARIES ${ZLIB_LIBRARY} stdc++)
+MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY)
 
 IF(NOT TARGET tokudb)
   RETURN()
@@ -85,7 +84,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index/buildheader)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index/portability)
 
-TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static)
+TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
+                      ${ZLIB_LIBRARY} stdc++)
 
 SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
 SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
diff --git a/storage/tokudb/ft-index/tools/tokuft_logprint.cc b/storage/tokudb/ft-index/tools/tokuft_logprint.cc
index 1dd7581b9f5..1abe289ff1b 100644
--- a/storage/tokudb/ft-index/tools/tokuft_logprint.cc
+++ b/storage/tokudb/ft-index/tools/tokuft_logprint.cc
@@ -91,6 +91,7 @@ PATENT RIGHTS GRANT:
 
 /* Dump the log from stdin to stdout. */
 
+#include <my_config.h>
 #include "ft/log_header.h"
 #include "ft/logger/logger.h"