diff --git a/CMakeLists.txt b/CMakeLists.txt
index c21a83c7b..88a598ab5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -239,11 +239,13 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-copy" DEBUG RELEASE RELWITHDEBIN
 MY_CHECK_AND_SET_COMPILER_FLAG("-Werror -Wall")
 SET (ENGINE_LDFLAGS    "-Wl,--no-as-needed -Wl,--add-needed")
 SET (ENGINE_DT_LIB datatypes)
-SET (ENGINE_COMMON_LIBS     messageqcpp loggingcpp configcpp idbboot boost_thread xml2 pthread rt libmysql_client ${ENGINE_DT_LIB})
+SET (ENGINE_COMMON_LIBS     messageqcpp loggingcpp configcpp idbboot boost_thread xml2 pthread rt ${ENGINE_DT_LIB})
 SET (ENGINE_OAM_LIBS        oamcpp)
 SET (ENGINE_BRM_LIBS        brm idbdatafile cacheutils rwlock ${ENGINE_OAM_LIBS} ${ENGINE_COMMON_LIBS})
-SET (ENGINE_EXEC_LIBS       joblist execplan windowfunction joiner rowgroup funcexp udfsdk regr dataconvert common compress querystats querytele thrift threadpool ${ENGINE_BRM_LIBS})
-SET (ENGINE_WRITE_LIBS      ddlpackageproc ddlpackage dmlpackageproc dmlpackage writeengine writeengineclient idbdatafile cacheutils ${ENGINE_EXEC_LIBS})
+SET (PLUGIN_EXEC_LIBS       execplan windowfunction joiner rowgroup funcexp udfsdk regr dataconvert common compress querytele thrift threadpool ${ENGINE_BRM_LIBS})
+SET (ENGINE_EXEC_LIBS       joblist querystats libmysql_client ${PLUGIN_EXEC_LIBS})
+SET (PLUGIN_WRITE_LIBS      ddlpackageproc ddlpackage dmlpackageproc dmlpackage writeengine writeengineclient idbdatafile cacheutils)
+SET (ENGINE_WRITE_LIBS      ${PLUGIN_WRITE_LIBS} ${ENGINE_EXEC_LIBS})
 
 SET (ENGINE_COMMON_LDFLAGS  "")
 
diff --git a/dbcon/joblist/CMakeLists.txt b/dbcon/joblist/CMakeLists.txt
index db1e12a32..0e1e998c8 100644
--- a/dbcon/joblist/CMakeLists.txt
+++ b/dbcon/joblist/CMakeLists.txt
@@ -1,13 +1,5 @@
-include_directories(BEFORE
-    ${CMAKE_BINARY_DIR}/libmariadb/include
-    ${CMAKE_SOURCE_DIR}/libmariadb/include)
-add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED)
-
 include_directories( ${ENGINE_COMMON_INCLUDES} ${ENGINE_SRC_DIR}/tools/passwd)
 
-
-########### next target ###############
-
 set(joblist_LIB_SRCS
     anydatalist.cpp
     batchprimitiveprocessor-jl.cpp
@@ -62,9 +54,15 @@ set(joblist_LIB_SRCS
     windowfunctionstep.cpp
     ${ENGINE_SRC_DIR}/tools/passwd/secrets.cpp)
 
+########### next target ###############
+
+add_library(joblist_server STATIC ${joblist_LIB_SRCS})
+
+########### next target ###############
+
+add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED)
+
 add_library(joblist SHARED ${joblist_LIB_SRCS})
-add_dependencies(joblist_server loggingcpp)
-target_include_directories(joblist BEFORE PUBLIC ${OPENSSL_INCLUDE_DIR})
 add_dependencies(joblist loggingcpp)
 
 install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt
index eff43d84a..7af81922f 100644
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -11,6 +11,8 @@ SET(S3API_DEPS marias3 curl CACHE INTERNAL "S3API_DEPS")
 
 SET ( libcalmysql_SRCS
     ../../datatypes/mcs_datatype.cpp
+    ../../utils/libmysql_client/libmysql_client.cpp
+    ../../utils/querystats/querystats.cpp
     ha_mcs_sysvars.cpp
     ha_mcs_client_udfs.cpp
     ha_mcs_opt_rewrites.cpp
@@ -45,7 +47,7 @@ if (COMMAND mysql_add_plugin)
   ENDIF()
 
   mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY ${disabled}
-      LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${S3API_DEPS} threadpool
+      LINK_LIBRARIES ${ENGINE_LDFLAGS} ${PLUGIN_EXEC_LIBS} ${PLUGIN_WRITE_LIBS} joblist_server ${NETSNMP_LIBRARIES} ${S3API_DEPS} threadpool
       VERSION ${PACKAGE_VERSION}
       COMPONENT columnstore-engine CONFIG columnstore.cnf)
 else ()
diff --git a/utils/libmysql_client/libmysql_client.h b/utils/libmysql_client/libmysql_client.h
index 931886b78..5e04304d0 100644
--- a/utils/libmysql_client/libmysql_client.h
+++ b/utils/libmysql_client/libmysql_client.h
@@ -19,7 +19,11 @@
 #define UTILS LIBMYSQL_CL_H
 
 #include <my_config.h>
+#ifdef MYSQL_DYNAMIC_PLUGIN
+#include <mysql/service_sql.h>
+#else
 #include <mysql.h>
+#endif
 
 #include <boost/scoped_array.hpp>
 
diff --git a/utils/querystats/querystats.cpp b/utils/querystats/querystats.cpp
index 360e774ce..ac9ed79e6 100644
--- a/utils/querystats/querystats.cpp
+++ b/utils/querystats/querystats.cpp
@@ -23,7 +23,6 @@
 
 #define PREFER_MY_CONFIG_H
 #include <my_config.h>
-#include <mysql.h>
 
 #include <string>
 using namespace std;