diff --git a/query_classifier/qc_dummy/qc_dummy.cc b/query_classifier/qc_dummy/qc_dummy.cc
index 7dffa48d9..15ea5eaff 100644
--- a/query_classifier/qc_dummy/qc_dummy.cc
+++ b/query_classifier/qc_dummy/qc_dummy.cc
@@ -12,9 +12,10 @@
  */
 
 #define MXS_MODULE_NAME "qc_sqlite"
-#include <maxscale/modules.h>
 #include <maxscale/query_classifier.h>
 
+#include "../../server/core/maxscale/config.h"
+
 int32_t qc_dummy_parse(GWBUF* querybuf, int32_t* pResult)
 {
     *pResult = QC_QUERY_INVALID;
diff --git a/server/core/authenticator.c b/server/core/authenticator.c
index 22d32cd28..98b1cd65e 100644
--- a/server/core/authenticator.c
+++ b/server/core/authenticator.c
@@ -13,9 +13,9 @@
 
 #include <maxscale/gw_authenticator.h>
 #include <maxscale/modutil.h>
-#include <maxscale/modules.h>
 #include <maxscale/alloc.h>
 
+#include "maxscale/modules.h"
 /**
  * @file authenticator.c - Authenticator module functions
  */
diff --git a/server/core/config.c b/server/core/config.c
index 563da24fd..db36e649b 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -58,7 +58,6 @@
 #include <maxscale/housekeeper.h>
 #include <maxscale/limits.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/modules.h>
 #include <maxscale/notification.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/spinlock.h>
@@ -69,6 +68,7 @@
 #include "maxscale/filter.h"
 #include "maxscale/service.h"
 #include "maxscale/monitor.h"
+#include "maxscale/modules.h"
 
 typedef struct duplicate_context
 {
diff --git a/server/core/config_runtime.c b/server/core/config_runtime.c
index eb7745a57..0897366fc 100644
--- a/server/core/config_runtime.c
+++ b/server/core/config_runtime.c
@@ -16,11 +16,11 @@
 #include <maxscale/config_runtime.h>
 #include <maxscale/gwdirs.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/modules.h>
 
 #include "maxscale/config.h"
 #include "maxscale/service.h"
 #include "maxscale/monitor.h"
+#include "maxscale/modules.h"
 
 static SPINLOCK crt_lock = SPINLOCK_INIT;
 
diff --git a/server/core/dcb.c b/server/core/dcb.c
index 1b9a34707..a0e588fc8 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -76,7 +76,6 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/server.h>
 #include <maxscale/service.h>
-#include <maxscale/modules.h>
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
 #include <maxscale/atomic.h>
@@ -95,6 +94,7 @@
 #include <maxscale/platform.h>
 
 #include "maxscale/session.h"
+#include "maxscale/modules.h"
 
 /* A DCB with null values, used for initialization */
 static DCB dcb_initialized = DCB_INIT;
diff --git a/server/core/filter.c b/server/core/filter.c
index 5ee808037..2669a5758 100644
--- a/server/core/filter.c
+++ b/server/core/filter.c
@@ -29,12 +29,12 @@
 #include <errno.h>
 #include <maxscale/alloc.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/modules.h>
 #include <maxscale/session.h>
 #include <maxscale/spinlock.h>
 #include "maxscale/filter.h"
 
 #include "maxscale/config.h"
+#include "maxscale/modules.h"
 
 static SPINLOCK filter_spin = SPINLOCK_INIT;    /**< Protects the list of all filters */
 static MXS_FILTER_DEF *allFilters = NULL;           /**< The list of all filters */
diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index 359217b4d..d1c946a38 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -60,7 +60,6 @@
 #include <maxscale/log_manager.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/memlog.h>
-#include <maxscale/modules.h>
 #include <maxscale/poll.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/server.h>
@@ -73,6 +72,7 @@
 #include "maxscale/service.h"
 #include "maxscale/statistics.h"
 #include "maxscale/monitor.h"
+#include "maxscale/modules.h"
 
 #define STRING_BUFFER_SIZE 1024
 #define PIDFD_CLOSED -1
diff --git a/server/core/listener.c b/server/core/listener.c
index d4256a0e3..39e09a5f4 100644
--- a/server/core/listener.c
+++ b/server/core/listener.c
@@ -38,7 +38,6 @@
 #include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
 #include <maxscale/users.h>
-#include <maxscale/modules.h>
 #include <maxscale/service.h>
 
 static RSA *rsa_512 = NULL;
diff --git a/server/core/load_utils.c b/server/core/load_utils.c
index 02a2cfe2f..0b3312c97 100644
--- a/server/core/load_utils.c
+++ b/server/core/load_utils.c
@@ -34,7 +34,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <dlfcn.h>
-#include <maxscale/modules.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/version.h>
@@ -45,6 +44,8 @@
 #include <maxscale/gwdirs.h>
 #include <maxscale/alloc.h>
 
+#include "maxscale/modules.h"
+
 typedef struct loaded_module
 {
     char    *module;       /**< The name of the module */
diff --git a/include/maxscale/modules.h b/server/core/maxscale/modules.h
similarity index 100%
rename from include/maxscale/modules.h
rename to server/core/maxscale/modules.h
diff --git a/server/core/monitor.c b/server/core/monitor.c
index 01a760e4f..7c1612d97 100644
--- a/server/core/monitor.c
+++ b/server/core/monitor.c
@@ -38,7 +38,6 @@
 #include <maxscale/externcmd.h>
 #include <maxscale/gwdirs.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/modules.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/secrets.h>
@@ -46,6 +45,7 @@
 
 #include "maxscale/config.h"
 #include "maxscale/monitor.h"
+#include "maxscale/modules.h"
 
 static MXS_MONITOR  *allMonitors = NULL;
 static SPINLOCK monLock = SPINLOCK_INIT;
diff --git a/server/core/query_classifier.c b/server/core/query_classifier.c
index 404fd49e5..e3b8a1fed 100644
--- a/server/core/query_classifier.c
+++ b/server/core/query_classifier.c
@@ -13,11 +13,12 @@
 
 #include <maxscale/query_classifier.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/modules.h>
 #include <maxscale/modutil.h>
 #include <maxscale/alloc.h>
 #include <maxscale/utils.h>
 
+#include "../core/maxscale/modules.h"
+
 //#define QC_TRACE_ENABLED
 #undef QC_TRACE_ENABLED
 
diff --git a/server/core/server.c b/server/core/server.c
index 982322eb5..0c713325b 100644
--- a/server/core/server.c
+++ b/server/core/server.c
@@ -47,7 +47,6 @@
 #include <maxscale/log_manager.h>
 #include <maxscale/gw_ssl.h>
 #include <maxscale/alloc.h>
-#include <maxscale/modules.h>
 #include <maxscale/gwdirs.h>
 
 #include "maxscale/monitor.h"
diff --git a/server/core/service.c b/server/core/service.c
index a80b39eb5..6b1959304 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -54,7 +54,6 @@
 #include <maxscale/housekeeper.h>
 #include <maxscale/listener.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/modules.h>
 #include <maxscale/poll.h>
 #include <maxscale/protocol.h>
 #include <maxscale/queuemanager.h>
@@ -70,6 +69,7 @@
 #include "maxscale/config.h"
 #include "maxscale/filter.h"
 #include "maxscale/service.h"
+#include "maxscale/modules.h"
 
 /** Base value for server weights */
 #define SERVICE_BASE_SERVER_WEIGHT 1000
diff --git a/server/core/test/testfeedback.c b/server/core/test/testfeedback.c
index 0e356f797..0e729e8f0 100644
--- a/server/core/test/testfeedback.c
+++ b/server/core/test/testfeedback.c
@@ -43,8 +43,8 @@
 #include <maxscale/housekeeper.h>
 #include <maxscale/buffer.h>
 #include <regex.h>
-#include <maxscale/modules.h>
 #include <maxscale/maxscale_test.h>
+
 #include "../load_utils.c"
 
 static char* server_options[] =
diff --git a/server/modules/routing/cli/cli.c b/server/modules/routing/cli/cli.c
index 5375880c8..b9460e2cb 100644
--- a/server/modules/routing/cli/cli.c
+++ b/server/modules/routing/cli/cli.c
@@ -33,7 +33,6 @@
 #include <maxscale/service.h>
 #include <maxscale/session.h>
 #include <maxscale/router.h>
-#include <maxscale/modules.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/atomic.h>
 #include <maxscale/spinlock.h>
diff --git a/server/modules/routing/debugcli/debugcli.c b/server/modules/routing/debugcli/debugcli.c
index 016c6faad..cbaa91ba1 100644
--- a/server/modules/routing/debugcli/debugcli.c
+++ b/server/modules/routing/debugcli/debugcli.c
@@ -32,7 +32,6 @@
 #include <maxscale/service.h>
 #include <maxscale/session.h>
 #include <maxscale/router.h>
-#include <maxscale/modules.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/atomic.h>
 #include <maxscale/spinlock.h>
diff --git a/server/modules/routing/debugcli/debugcmd.c b/server/modules/routing/debugcli/debugcmd.c
index 526c8eb27..2775288fa 100644
--- a/server/modules/routing/debugcli/debugcmd.c
+++ b/server/modules/routing/debugcli/debugcmd.c
@@ -58,7 +58,6 @@
 #include <maxscale/service.h>
 #include <maxscale/router.h>
 #include <maxscale/filter.h>
-#include <maxscale/modules.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/atomic.h>
 #include <maxscale/server.h>
@@ -81,6 +80,8 @@
 
 #include "../../../core/maxscale/session.h"
 
+#include "../../../core/maxscale/modules.h"
+
 #define MAXARGS 12
 
 #define ARG_TYPE_NONE           0
diff --git a/server/modules/routing/maxinfo/maxinfo.c b/server/modules/routing/maxinfo/maxinfo.c
index 573afe3ea..ffd2dd661 100644
--- a/server/modules/routing/maxinfo/maxinfo.c
+++ b/server/modules/routing/maxinfo/maxinfo.c
@@ -36,7 +36,6 @@
 #include <maxscale/service.h>
 #include <maxscale/server.h>
 #include <maxscale/router.h>
-#include <maxscale/modules.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/monitor.h>
@@ -52,6 +51,7 @@
 #include <maxscale/secrets.h>
 #include <maxscale/users.h>
 
+#include "../../../core/maxscale/modules.h"
 #include "../../../core/maxscale/session.h"
 #include "../../../core/maxscale/monitor.h"
 
diff --git a/server/modules/routing/maxinfo/maxinfo_error.c b/server/modules/routing/maxinfo/maxinfo_error.c
index 5a77eced6..58d09586c 100644
--- a/server/modules/routing/maxinfo/maxinfo_error.c
+++ b/server/modules/routing/maxinfo/maxinfo_error.c
@@ -32,7 +32,6 @@
 #include <maxscale/service.h>
 #include <maxscale/session.h>
 #include <maxscale/router.h>
-#include <maxscale/modules.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/atomic.h>
diff --git a/server/modules/routing/maxinfo/maxinfo_exec.c b/server/modules/routing/maxinfo/maxinfo_exec.c
index 92ec18a94..6d261c208 100644
--- a/server/modules/routing/maxinfo/maxinfo_exec.c
+++ b/server/modules/routing/maxinfo/maxinfo_exec.c
@@ -29,23 +29,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <maxscale/alloc.h>
-#include <maxscale/service.h>
-#include <maxscale/router.h>
-#include <maxscale/modules.h>
-#include <maxscale/version.h>
+#include <maxscale/atomic.h>
+#include <maxscale/config.h>
+#include <maxscale/dcb.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/maxscale.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <maxscale/atomic.h>
-#include <maxscale/spinlock.h>
-#include <maxscale/dcb.h>
-#include <maxscale/maxscale.h>
 #include <maxscale/poll.h>
-#include <maxscale/log_manager.h>
 #include <maxscale/resultset.h>
-#include <maxscale/config.h>
+#include <maxscale/router.h>
+#include <maxscale/service.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/version.h>
 
 #include "../../../core/maxscale/session.h"
+#include "../../../core/maxscale/modules.h"
 #include "../../../core/maxscale/monitor.h"
 
 static void exec_show(DCB *dcb, MAXINFO_TREE *tree);
diff --git a/server/modules/routing/maxinfo/maxinfo_parse.c b/server/modules/routing/maxinfo/maxinfo_parse.c
index de958c610..9f6857dc5 100644
--- a/server/modules/routing/maxinfo/maxinfo_parse.c
+++ b/server/modules/routing/maxinfo/maxinfo_parse.c
@@ -34,7 +34,6 @@
 #include <maxscale/service.h>
 #include <maxscale/session.h>
 #include <maxscale/router.h>
-#include <maxscale/modules.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/atomic.h>