diff --git a/include/maxscale/config.h b/include/maxscale/config.h
index ce4449d79..92b90b5c4 100644
--- a/include/maxscale/config.h
+++ b/include/maxscale/config.h
@@ -13,25 +13,16 @@
  */
 
 /**
- * @file config.h The configuration handling elements
+ * @file include/maxscale/config.h The configuration handling elements
  *
- * @verbatim
- * Revision History
- *
- * Date         Who                     Description
- * 21/06/13     Mark Riddoch            Initial implementation
- * 07/05/14     Massimiliano Pinto      Added version_string to global configuration
- * 23/05/14     Massimiliano Pinto      Added id to global configuration
- * 17/10/14     Mark Riddoch            Added poll tuning configuration parameters
- * 05/03/15     Massimiliano Pinto      Added sysname, release, sha1_mac to gateway struct
- *
- * @endverbatim
  */
 
 #include <maxscale/cdefs.h>
+
 #include <limits.h>
 #include <sys/utsname.h>
 #include <openssl/sha.h>
+
 #include <maxscale/ssl.h>
 #include <maxscale/modinfo.h>
 
diff --git a/server/core/config_runtime.c b/server/core/config_runtime.c
index 8007c544b..e3ef0ddf4 100644
--- a/server/core/config_runtime.c
+++ b/server/core/config_runtime.c
@@ -10,17 +10,18 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+#include "maxscale/config_runtime.h"
 
 #include <strings.h>
+
 #include <maxscale/atomic.h>
-#include <maxscale/config_runtime.h>
 #include <maxscale/paths.h>
 #include <maxscale/spinlock.h>
 
 #include "maxscale/config.h"
-#include "maxscale/service.h"
 #include "maxscale/monitor.h"
 #include "maxscale/modules.h"
+#include "maxscale/service.h"
 
 static SPINLOCK crt_lock = SPINLOCK_INIT;
 
diff --git a/server/core/externcmd.c b/server/core/externcmd.c
index 9fa3192e5..10ee7f408 100644
--- a/server/core/externcmd.c
+++ b/server/core/externcmd.c
@@ -11,9 +11,17 @@
  * Public License.
  */
 
-#include <maxscale/externcmd.h>
+#include "maxscale/externcmd.h"
+
 #include <ctype.h>
+#include <errno.h>
+#include <string.h>
+
 #include <maxscale/alloc.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/pcre2.h>
+
+
 
 /**
  * Tokenize a string into arguments suitable for a execvp call.
diff --git a/include/maxscale/config_runtime.h b/server/core/maxscale/config_runtime.h
similarity index 99%
rename from include/maxscale/config_runtime.h
rename to server/core/maxscale/config_runtime.h
index a1deed5cd..8a32ac57b 100644
--- a/include/maxscale/config_runtime.h
+++ b/server/core/maxscale/config_runtime.h
@@ -18,7 +18,6 @@
 
 #include <maxscale/cdefs.h>
 
-#include <maxscale/filter.h>
 #include <maxscale/monitor.h>
 #include <maxscale/server.h>
 #include <maxscale/service.h>
diff --git a/include/maxscale/externcmd.h b/server/core/maxscale/externcmd.h
similarity index 91%
rename from include/maxscale/externcmd.h
rename to server/core/maxscale/externcmd.h
index 284c7e8dd..6d5aead41 100644
--- a/include/maxscale/externcmd.h
+++ b/server/core/maxscale/externcmd.h
@@ -13,11 +13,8 @@
  */
 
 #include <maxscale/cdefs.h>
+
 #include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <maxscale/log_manager.h>
-#include <maxscale/pcre2.h>
 
 MXS_BEGIN_DECLS
 
diff --git a/server/core/monitor.c b/server/core/monitor.c
index 7005eaf62..6bc103e98 100644
--- a/server/core/monitor.c
+++ b/server/core/monitor.c
@@ -35,7 +35,6 @@
 
 #include <maxscale/alloc.h>
 #include <mysqld_error.h>
-#include <maxscale/externcmd.h>
 #include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/mysql_utils.h>
@@ -44,6 +43,7 @@
 #include <maxscale/spinlock.h>
 
 #include "maxscale/config.h"
+#include "maxscale/externcmd.h"
 #include "maxscale/monitor.h"
 #include "maxscale/modules.h"
 
diff --git a/server/modules/monitor/galeramon/galeramon.h b/server/modules/monitor/galeramon/galeramon.h
index 19f3a2de2..1f5c9874b 100644
--- a/server/modules/monitor/galeramon/galeramon.h
+++ b/server/modules/monitor/galeramon/galeramon.h
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <maxscale/monitor.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/externcmd.h>
 #include <maxscale/thread.h>
 #include <mysql.h>
 #include <mysqld_error.h>
diff --git a/server/modules/monitor/mmmon/mmmon.h b/server/modules/monitor/mmmon/mmmon.h
index f4f8e69b4..550ff8720 100644
--- a/server/modules/monitor/mmmon/mmmon.h
+++ b/server/modules/monitor/mmmon/mmmon.h
@@ -28,7 +28,6 @@
 #include <maxscale/dcb.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/config.h>
-#include <maxscale/externcmd.h>
 
 /**
  * @file mmmon.h - The Multi-Master monitor
diff --git a/server/modules/monitor/mysqlmon.h b/server/modules/monitor/mysqlmon.h
index 8f60e5415..4cedb3b6a 100644
--- a/server/modules/monitor/mysqlmon.h
+++ b/server/modules/monitor/mysqlmon.h
@@ -48,7 +48,6 @@
 #include <maxscale/dcb.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/config.h>
-#include <maxscale/externcmd.h>
 #include <maxscale/hashtable.h>
 
 MXS_BEGIN_DECLS
diff --git a/server/modules/routing/debugcli/debugcmd.c b/server/modules/routing/debugcli/debugcmd.c
index d3ff85e2c..a25c6fea2 100644
--- a/server/modules/routing/debugcli/debugcmd.c
+++ b/server/modules/routing/debugcli/debugcmd.c
@@ -46,6 +46,7 @@
  *
  * @endverbatim
  */
+#include <maxscale/cdefs.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -71,10 +72,10 @@
 #include <maxscale/housekeeper.h>
 #include <maxscale/listmanager.h>
 #include <maxscale/maxscale.h>
-#include <maxscale/config_runtime.h>
 #include <maxscale/version.h>
 #include <maxscale/log_manager.h>
 
+#include "../../../core/maxscale/config_runtime.h"
 #include "../../../core/maxscale/modules.h"
 #include "../../../core/maxscale/monitor.h"
 #include "../../../core/maxscale/session.h"