diff --git a/include/maxscale/maxconfig.h b/include/maxscale/config.h
similarity index 100%
rename from include/maxscale/maxconfig.h
rename to include/maxscale/config.h
diff --git a/include/maxscale/monitor.h b/include/maxscale/monitor.h
index 7b2867391..a5dac0abb 100644
--- a/include/maxscale/monitor.h
+++ b/include/maxscale/monitor.h
@@ -17,7 +17,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/resultset.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 #include <maxscale/externcmd.h>
 #include <maxscale/secrets.h>
 
diff --git a/include/maxscale/service.h b/include/maxscale/service.h
index 51b81ca6f..eae46c1a7 100644
--- a/include/maxscale/service.h
+++ b/include/maxscale/service.h
@@ -22,7 +22,7 @@
 #include <maxscale/filter.h>
 #include <maxscale/hashtable.h>
 #include <maxscale/resultset.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 #include <maxscale/queuemanager.h>
 #include <openssl/crypto.h>
 #include <openssl/ssl.h>
diff --git a/server/core/config.c b/server/core/config.c
index 060386f97..e1cb5b747 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -50,7 +50,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <ini.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 #include <maxscale/dcb.h>
 #include <maxscale/session.h>
 #include <maxscale/service.h>
diff --git a/server/core/gateway.c b/server/core/gateway.c
index f8e567344..c2919e03e 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -57,7 +57,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/session.h>
 #include <maxscale/modules.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 #include <maxscale/poll.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/service.h>
diff --git a/server/core/mysql_utils.c b/server/core/mysql_utils.c
index 3c1b2159c..7ae98160f 100644
--- a/server/core/mysql_utils.c
+++ b/server/core/mysql_utils.c
@@ -26,7 +26,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/skygw_debug.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 
 /**
  * @brief Calculate the length of a length-encoded integer in bytes
diff --git a/server/core/poll.c b/server/core/poll.c
index d68a44e26..e7a1fbb0f 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -27,9 +27,8 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/gw.h>
-#include <maxscale/maxconfig.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 #include <mysql.h>
 #include <maxscale/resultset.h>
 #include <maxscale/session.h>
diff --git a/server/core/statistics.c b/server/core/statistics.c
index 259608efa..c0e1dadfb 100644
--- a/server/core/statistics.c
+++ b/server/core/statistics.c
@@ -25,7 +25,7 @@
 
 #include <maxscale/statistics.h>
 #include <maxscale/alloc.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 #include <string.h>
 #include <maxscale/platform.h>
 
diff --git a/server/modules/filter/regexfilter/regexfilter.c b/server/modules/filter/regexfilter/regexfilter.c
index c0e2a6ee6..df84853e2 100644
--- a/server/modules/filter/regexfilter/regexfilter.c
+++ b/server/modules/filter/regexfilter/regexfilter.c
@@ -22,7 +22,7 @@
 #include <pcre2.h>
 #include <maxscale/atomic.h>
 #include <maxscale/alloc.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 
 /**
  * @file regexfilter.c - a very simple regular expression rewrite filter.
diff --git a/server/modules/monitor/galeramon/galeramon.h b/server/modules/monitor/galeramon/galeramon.h
index 9fdcd8b27..a9563e025 100644
--- a/server/modules/monitor/galeramon/galeramon.h
+++ b/server/modules/monitor/galeramon/galeramon.h
@@ -27,7 +27,7 @@
 #include <maxscale/secrets.h>
 #include <maxscale/dcb.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 
 /**
  * @file galeramon.h - The Galera cluster monitor
diff --git a/server/modules/monitor/mmmon/mmmon.h b/server/modules/monitor/mmmon/mmmon.h
index df3747c9a..674672d89 100644
--- a/server/modules/monitor/mmmon/mmmon.h
+++ b/server/modules/monitor/mmmon/mmmon.h
@@ -26,7 +26,7 @@
 #include <maxscale/secrets.h>
 #include <maxscale/dcb.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 #include <maxscale/externcmd.h>
 
 /**
diff --git a/server/modules/monitor/mysqlmon.h b/server/modules/monitor/mysqlmon.h
index b49cb8ba0..357d1b235 100644
--- a/server/modules/monitor/mysqlmon.h
+++ b/server/modules/monitor/mysqlmon.h
@@ -26,7 +26,7 @@
 #include <maxscale/secrets.h>
 #include <maxscale/dcb.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 #include <maxscale/externcmd.h>
 #include <maxscale/hashtable.h>
 
diff --git a/server/modules/monitor/ndbclustermon/ndbclustermon.h b/server/modules/monitor/ndbclustermon/ndbclustermon.h
index b491b13db..2b98613c4 100644
--- a/server/modules/monitor/ndbclustermon/ndbclustermon.h
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.h
@@ -26,7 +26,7 @@
 #include <secrets.h>
 #include <dcb.h>
 #include <modinfo.h>
-#include <maxconfig.h>
+#include <config.h>
 #include <externcmd.h>
 
 /**
diff --git a/server/modules/routing/debugcli/debugcmd.c b/server/modules/routing/debugcli/debugcmd.c
index 93bb67d8b..247f69f87 100644
--- a/server/modules/routing/debugcli/debugcmd.c
+++ b/server/modules/routing/debugcli/debugcmd.c
@@ -64,7 +64,7 @@
 #include <maxscale/poll.h>
 #include <maxscale/users.h>
 #include <maxscale/dbusers.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 #include <telnetd.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/monitor.h>
diff --git a/server/modules/routing/maxinfo/maxinfo_exec.c b/server/modules/routing/maxinfo/maxinfo_exec.c
index 950ae0183..d3c84ab0b 100644
--- a/server/modules/routing/maxinfo/maxinfo_exec.c
+++ b/server/modules/routing/maxinfo/maxinfo_exec.c
@@ -44,7 +44,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/resultset.h>
-#include <maxscale/maxconfig.h>
+#include <maxscale/config.h>
 
 static void exec_show(DCB *dcb, MAXINFO_TREE *tree);
 static void exec_select(DCB *dcb, MAXINFO_TREE *tree);