diff --git a/maxutils/maxsql/include/maxsql/mysql_plus.hh b/include/maxscale/mysql_plus.hh
similarity index 100%
rename from maxutils/maxsql/include/maxsql/mysql_plus.hh
rename to include/maxscale/mysql_plus.hh
diff --git a/maxutils/maxsql/include/maxsql/packet_tracker.hh b/include/maxscale/packet_tracker.hh
similarity index 100%
rename from maxutils/maxsql/include/maxsql/packet_tracker.hh
rename to include/maxscale/packet_tracker.hh
diff --git a/maxutils/maxsql/include/maxsql/CMakeLists.txt b/maxutils/maxsql/include/maxsql/CMakeLists.txt
index 3a5b14b27..531119fb3 100644
--- a/maxutils/maxsql/include/maxsql/CMakeLists.txt
+++ b/maxutils/maxsql/include/maxsql/CMakeLists.txt
@@ -1,4 +1,2 @@
 install_header(mariadb.hh devel)
 install_header(ccdefs.hh devel)
-install_header(packet_tracker.hh devel)
-install_header(mysql_plus.hh devel)
diff --git a/maxutils/maxsql/src/CMakeLists.txt b/maxutils/maxsql/src/CMakeLists.txt
index 298eb323d..3e75379d9 100644
--- a/maxutils/maxsql/src/CMakeLists.txt
+++ b/maxutils/maxsql/src/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_library(maxsql STATIC
   mariadb.cc
-  packet_tracker.cc
   queryresult.cc
   )
 
diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
index 2d2b85095..371ecdff2 100644
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@@ -29,6 +29,7 @@ add_library(maxscale-common SHARED
   monitormanager.cc
   mysql_binlog.cc
   mysql_utils.cc
+  packet_tracker.cc
   paths.cc
   poll.cc
   queryclassifier.cc
diff --git a/maxutils/maxsql/src/packet_tracker.cc b/server/core/packet_tracker.cc
similarity index 99%
rename from maxutils/maxsql/src/packet_tracker.cc
rename to server/core/packet_tracker.cc
index 46e566647..082525b0d 100644
--- a/maxutils/maxsql/src/packet_tracker.cc
+++ b/server/core/packet_tracker.cc
@@ -13,8 +13,8 @@
 
 // LIMITATION: local infile not handled yet.
 
-#include <maxsql/packet_tracker.hh>
-#include <maxsql/mysql_plus.hh>
+#include <maxscale/packet_tracker.hh>
+#include <maxscale/mysql_plus.hh>
 #include <maxscale/modutil.hh>
 
 #include <array>
diff --git a/server/modules/routing/smartrouter/smartsession.cc b/server/modules/routing/smartrouter/smartsession.cc
index 40a329671..29362c338 100644
--- a/server/modules/routing/smartrouter/smartsession.cc
+++ b/server/modules/routing/smartrouter/smartsession.cc
@@ -15,7 +15,7 @@
 #include "performance.hh"
 
 #include <maxscale/modutil.hh>
-#include <maxsql/mysql_plus.hh>
+#include <maxscale/mysql_plus.hh>
 
 // COPY-PASTED error-extraction functions from rwsplit. TODO move to lib.
 inline void extract_error_state(uint8_t* pBuffer, uint8_t** ppState, uint16_t* pnState)
diff --git a/server/modules/routing/smartrouter/smartsession.hh b/server/modules/routing/smartrouter/smartsession.hh
index 54d816e8a..7e4ca1924 100644
--- a/server/modules/routing/smartrouter/smartsession.hh
+++ b/server/modules/routing/smartrouter/smartsession.hh
@@ -14,11 +14,10 @@
 
 #include "smartrouter.hh"
 
-#include <maxsql/packet_tracker.hh>
-#include <maxscale/queryclassifier.hh>
-#include <maxbase/host.hh>
-
 #include <iostream>
+#include <maxbase/host.hh>
+#include <maxscale/packet_tracker.hh>
+#include <maxscale/queryclassifier.hh>
 
 class SmartRouter;