diff --git a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
index 8c6438116..5cf62eaca 100644
--- a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
+++ b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
@@ -25,6 +25,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "CDCPlainAuth"
+
 #include <maxscale/gw_authenticator.h>
 #include <sys/stat.h>
 #include <cdc.h>
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
index 0f1740b74..55e03382d 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
+++ b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
@@ -11,6 +11,8 @@
  * Public License.
  */
 
+#define MXS_MODULE_NAME "GSSAPIAuth"
+
 #include <maxscale/gw_authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c
index aa9f0aca0..0abae6cb1 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c
+++ b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c
@@ -11,6 +11,8 @@
  * Public License.
  */
 
+#define MXS_MODULE_NAME "GSSAPIBackendAuth"
+
 #include <maxscale/gw_authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
diff --git a/server/modules/authenticator/HTTPAuth/http_auth.c b/server/modules/authenticator/HTTPAuth/http_auth.c
index fcd5efeec..e69e8267f 100644
--- a/server/modules/authenticator/HTTPAuth/http_auth.c
+++ b/server/modules/authenticator/HTTPAuth/http_auth.c
@@ -24,6 +24,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "HTTPAuth"
+
 #include <maxscale/gw_authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c b/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c
index 0888e66b5..2ec54299f 100644
--- a/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c
+++ b/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c
@@ -26,6 +26,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "MaxAdminAuth"
+
 #include <maxscale/gw_authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/authenticator/MySQLAuth/dbusers.c b/server/modules/authenticator/MySQLAuth/dbusers.c
index eebdb82ad..418f80a21 100644
--- a/server/modules/authenticator/MySQLAuth/dbusers.c
+++ b/server/modules/authenticator/MySQLAuth/dbusers.c
@@ -35,6 +35,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "MySQLAuth"
+
 #include <stdio.h>
 #include <ctype.h>
 #include <mysql.h>
diff --git a/server/modules/authenticator/MySQLAuth/mysql_auth.c b/server/modules/authenticator/MySQLAuth/mysql_auth.c
index 17ed4d237..796136ada 100644
--- a/server/modules/authenticator/MySQLAuth/mysql_auth.c
+++ b/server/modules/authenticator/MySQLAuth/mysql_auth.c
@@ -25,6 +25,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "MySQLAuth"
+
 #include <mysql_auth.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/gw_authenticator.h>
diff --git a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c b/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
index c7fb10972..6f893f1a8 100644
--- a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
+++ b/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
@@ -29,6 +29,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "MySQLBackendAuth"
+
 #include <maxscale/gw_authenticator.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
diff --git a/server/modules/authenticator/NullAuthAllow/null_auth_allow.c b/server/modules/authenticator/NullAuthAllow/null_auth_allow.c
index 98d468dda..e3d6d5058 100644
--- a/server/modules/authenticator/NullAuthAllow/null_auth_allow.c
+++ b/server/modules/authenticator/NullAuthAllow/null_auth_allow.c
@@ -27,6 +27,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "NullAuthAllow"
+
 #include <maxscale/gw_authenticator.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.h>
diff --git a/server/modules/authenticator/NullAuthDeny/null_auth_deny.c b/server/modules/authenticator/NullAuthDeny/null_auth_deny.c
index b019ada95..9ad1dc6e7 100644
--- a/server/modules/authenticator/NullAuthDeny/null_auth_deny.c
+++ b/server/modules/authenticator/NullAuthDeny/null_auth_deny.c
@@ -27,6 +27,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "NullAuthDeny"
+
 #include <maxscale/gw_authenticator.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.h>
diff --git a/server/modules/filter/ccrfilter/ccrfilter.c b/server/modules/filter/ccrfilter/ccrfilter.c
index 772155401..905fb9103 100644
--- a/server/modules/filter/ccrfilter/ccrfilter.c
+++ b/server/modules/filter/ccrfilter/ccrfilter.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#define MXS_MODULE_NAME "ccrfilter"
+
 #include <stdio.h>
 #include <maxscale/filter.h>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/filter/hintfilter/hintfilter.c b/server/modules/filter/hintfilter/hintfilter.c
index b15bfd48a..c5ec4d64c 100644
--- a/server/modules/filter/hintfilter/hintfilter.c
+++ b/server/modules/filter/hintfilter/hintfilter.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#define MXS_MODULE_NAME "hintfilter"
+
 #include <stdio.h>
 #include <maxscale/filter.h>
 #include <maxscale/alloc.h>
diff --git a/server/modules/filter/hintfilter/hintparser.c b/server/modules/filter/hintfilter/hintparser.c
index 0db3498fd..3d0b2700c 100644
--- a/server/modules/filter/hintfilter/hintparser.c
+++ b/server/modules/filter/hintfilter/hintparser.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#define MXS_MODULE_NAME "hintfilter"
+
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/server/modules/filter/insertstream/insertstream.c b/server/modules/filter/insertstream/insertstream.c
index 8d09ba2f6..07beeeffb 100644
--- a/server/modules/filter/insertstream/insertstream.c
+++ b/server/modules/filter/insertstream/insertstream.c
@@ -11,6 +11,8 @@
  * Public License.
  */
 
+#define MXS_MODULE_NAME "insertstream"
+
 #include <maxscale/cdefs.h>
 
 #include <strings.h>
diff --git a/server/modules/filter/luafilter/luafilter.c b/server/modules/filter/luafilter/luafilter.c
index 02c8ea22f..3a192492b 100644
--- a/server/modules/filter/luafilter/luafilter.c
+++ b/server/modules/filter/luafilter/luafilter.c
@@ -36,6 +36,8 @@
  * or diagnostic being made for the session script.
  */
 
+#define MXS_MODULE_NAME "luafilter"
+
 #include <maxscale/cdefs.h>
 #include <lauxlib.h>
 #include <lua.h>
diff --git a/server/modules/filter/mqfilter/mqfilter.c b/server/modules/filter/mqfilter/mqfilter.c
index ec2ba0656..8b2e86782 100644
--- a/server/modules/filter/mqfilter/mqfilter.c
+++ b/server/modules/filter/mqfilter/mqfilter.c
@@ -56,6 +56,9 @@
  *@endverbatim
  * See the individual struct documentations for logging trigger parameters
  */
+
+#define MXS_MODULE_NAME "mqfilter"
+
 #include <my_config.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.c b/server/modules/filter/namedserverfilter/namedserverfilter.c
index 60fec7351..4f71f4085 100644
--- a/server/modules/filter/namedserverfilter/namedserverfilter.c
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.c
@@ -11,6 +11,8 @@
  * Public License.
  */
 
+#define MXS_MODULE_NAME "namedserverfilter"
+
 #include <stdio.h>
 #include <maxscale/alloc.h>
 #include <maxscale/filter.h>
diff --git a/server/modules/filter/qlafilter/qlafilter.c b/server/modules/filter/qlafilter/qlafilter.c
index ed93a4af8..eb6722b94 100644
--- a/server/modules/filter/qlafilter/qlafilter.c
+++ b/server/modules/filter/qlafilter/qlafilter.c
@@ -34,6 +34,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "qlafilter"
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/server/modules/filter/regexfilter/regexfilter.c b/server/modules/filter/regexfilter/regexfilter.c
index d5e8f12d4..175e175e0 100644
--- a/server/modules/filter/regexfilter/regexfilter.c
+++ b/server/modules/filter/regexfilter/regexfilter.c
@@ -11,6 +11,8 @@
  * Public License.
  */
 
+#define MXS_MODULE_NAME "regexfilter"
+
 #include <maxscale/cdefs.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/server/modules/filter/tee/tee.c b/server/modules/filter/tee/tee.c
index ca99a7c49..1496a9705 100644
--- a/server/modules/filter/tee/tee.c
+++ b/server/modules/filter/tee/tee.c
@@ -41,6 +41,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "tee"
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <maxscale/filter.h>
diff --git a/server/modules/filter/topfilter/topfilter.c b/server/modules/filter/topfilter/topfilter.c
index b5cfaef13..7ec9a4fff 100644
--- a/server/modules/filter/topfilter/topfilter.c
+++ b/server/modules/filter/topfilter/topfilter.c
@@ -32,6 +32,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "topfilter"
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <maxscale/filter.h>
diff --git a/server/modules/filter/tpmfilter/tpmfilter.c b/server/modules/filter/tpmfilter/tpmfilter.c
index ff05cb29a..223982f6e 100644
--- a/server/modules/filter/tpmfilter/tpmfilter.c
+++ b/server/modules/filter/tpmfilter/tpmfilter.c
@@ -40,6 +40,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "tpmfilter"
+
 #include <maxscale/cdefs.h>
 
 #include <ctype.h>
diff --git a/server/modules/monitor/auroramon/auroramon.c b/server/modules/monitor/auroramon/auroramon.c
index 2a06a605f..cd1d5956e 100644
--- a/server/modules/monitor/auroramon/auroramon.c
+++ b/server/modules/monitor/auroramon/auroramon.c
@@ -15,6 +15,8 @@
  * @file auroramon.c - Amazon RDS Aurora monitor
  */
 
+#define MXS_MODULE_NAME "auroramon"
+
 #include <maxscale/modinfo.h>
 #include <maxscale/thread.h>
 #include <maxscale/monitor.h>
diff --git a/server/modules/monitor/galeramon/galeramon.c b/server/modules/monitor/galeramon/galeramon.c
index 662a76125..dd051990b 100644
--- a/server/modules/monitor/galeramon/galeramon.c
+++ b/server/modules/monitor/galeramon/galeramon.c
@@ -33,6 +33,7 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "galeramon"
 
 #include "galeramon.h"
 #include <maxscale/dcb.h>
diff --git a/server/modules/monitor/mmmon/mmmon.c b/server/modules/monitor/mmmon/mmmon.c
index ae5b28b5e..9353db716 100644
--- a/server/modules/monitor/mmmon/mmmon.c
+++ b/server/modules/monitor/mmmon/mmmon.c
@@ -25,6 +25,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "mmmon"
+
 #include "mmmon.h"
 #include <maxscale/dcb.h>
 #include <maxscale/alloc.h>
diff --git a/server/modules/monitor/mysqlmon/mysql_mon.c b/server/modules/monitor/mysqlmon/mysql_mon.c
index d7e1b4b98..e119c1545 100644
--- a/server/modules/monitor/mysqlmon/mysql_mon.c
+++ b/server/modules/monitor/mysqlmon/mysql_mon.c
@@ -45,6 +45,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "mysqlmon"
+
 #include "../mysqlmon.h"
 #include <maxscale/dcb.h>
 #include <maxscale/modutil.h>
diff --git a/server/modules/monitor/ndbclustermon/ndbclustermon.c b/server/modules/monitor/ndbclustermon/ndbclustermon.c
index 789fb4b37..fa4b743a5 100644
--- a/server/modules/monitor/ndbclustermon/ndbclustermon.c
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.c
@@ -25,6 +25,7 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "ndbclustermon"
 
 #include "../mysqlmon.h"
 #include <maxscale/alloc.h>
diff --git a/server/modules/protocol/CDC/cdc.c b/server/modules/protocol/CDC/cdc.c
index 6acb8b7e9..9a2ed7ab8 100644
--- a/server/modules/protocol/CDC/cdc.c
+++ b/server/modules/protocol/CDC/cdc.c
@@ -30,6 +30,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "CDC"
+
 #include <cdc.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/protocol/HTTPD/httpd.c b/server/modules/protocol/HTTPD/httpd.c
index ec4142e32..693fc9f0a 100644
--- a/server/modules/protocol/HTTPD/httpd.c
+++ b/server/modules/protocol/HTTPD/httpd.c
@@ -32,6 +32,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "HTTPD"
+
 #include "httpd.h"
 #include <ctype.h>
 #include <maxscale/alloc.h>
diff --git a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
index 4bf923ed8..ec5db9a4a 100644
--- a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
+++ b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
@@ -11,6 +11,8 @@
  * Public License.
  */
 
+#define MXS_MODULE_NAME "MySQLBackend"
+
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modutil.h>
diff --git a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
index 626741da6..d27b0a2b0 100644
--- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
+++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
@@ -45,6 +45,9 @@
  * 07/02/2016   Martin Brampton         Split off authentication and SSL.
  * 31/05/2016   Martin Brampton         Implement connection throttling
  */
+
+#define MXS_MODULE_NAME "MySQLClient"
+
 #include <maxscale/protocol.h>
 #include <maxscale/alloc.h>
 #include <maxscale/log_manager.h>
diff --git a/server/modules/protocol/maxscaled/maxscaled.c b/server/modules/protocol/maxscaled/maxscaled.c
index 74d1ebeb4..ca97b7eb3 100644
--- a/server/modules/protocol/maxscaled/maxscaled.c
+++ b/server/modules/protocol/maxscaled/maxscaled.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#define MXS_MODULE_NAME "maxscaled"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/server/modules/protocol/telnetd/telnetd.c b/server/modules/protocol/telnetd/telnetd.c
index 054eab4f7..613f92424 100644
--- a/server/modules/protocol/telnetd/telnetd.c
+++ b/server/modules/protocol/telnetd/telnetd.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#define MXS_MODULE_NAME "telnetd"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/server/modules/routing/avrorouter/avro.c b/server/modules/routing/avrorouter/avro.c
index 4e3d919ee..b53ed69cf 100644
--- a/server/modules/routing/avrorouter/avro.c
+++ b/server/modules/routing/avrorouter/avro.c
@@ -24,8 +24,7 @@
  * @endverbatim
  */
 
-#define MXS_MODULE_NAME "avrorouter"
-#include <maxscale/cdefs.h>
+#include "avrorouter.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,7 +47,6 @@
 #include <ini.h>
 #include <sys/stat.h>
 
-#include "avrorouter.h"
 #include <maxscale/random_jkiss.h>
 #include <binlog_common.h>
 #include <avro/errors.h>
diff --git a/server/modules/routing/avrorouter/avro_client.c b/server/modules/routing/avrorouter/avro_client.c
index 64efed432..56e4d0015 100644
--- a/server/modules/routing/avrorouter/avro_client.c
+++ b/server/modules/routing/avrorouter/avro_client.c
@@ -24,6 +24,8 @@
  * @endverbatim
  */
 
+#include "avrorouter.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -37,7 +39,6 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/version.h>
-#include "avrorouter.h"
 #include <maxavro.h>
 #include <maxscale/alloc.h>
 
diff --git a/server/modules/routing/avrorouter/avro_file.c b/server/modules/routing/avrorouter/avro_file.c
index 5892a3c73..44dff6654 100644
--- a/server/modules/routing/avrorouter/avro_file.c
+++ b/server/modules/routing/avrorouter/avro_file.c
@@ -30,10 +30,11 @@
  * @endverbatim
  */
 
+#include "avrorouter.h"
+
 #include <binlog_common.h>
 #include <blr_constants.h>
 #include <sys/stat.h>
-#include "avrorouter.h"
 #include <maxscale/log_manager.h>
 #include <maxscale/pcre2.h>
 #include <ini.h>
diff --git a/server/modules/routing/avrorouter/avro_index.c b/server/modules/routing/avrorouter/avro_index.c
index d4510fb03..1c1d34a5f 100644
--- a/server/modules/routing/avrorouter/avro_index.c
+++ b/server/modules/routing/avrorouter/avro_index.c
@@ -33,6 +33,7 @@
  */
 
 #include "avrorouter.h"
+
 #include <maxscale/debug.h>
 #include <glob.h>
 
diff --git a/server/modules/routing/avrorouter/avro_rbr.c b/server/modules/routing/avrorouter/avro_rbr.c
index 125552004..f9adc9bab 100644
--- a/server/modules/routing/avrorouter/avro_rbr.c
+++ b/server/modules/routing/avrorouter/avro_rbr.c
@@ -11,11 +11,11 @@
  * Public License.
  */
 
+#include "avrorouter.h"
 
 #include <maxscale/mysql_utils.h>
 #include <jansson.h>
 #include <maxscale/alloc.h>
-#include "avrorouter.h"
 #include <strings.h>
 
 #define WRITE_EVENT         0
diff --git a/server/modules/routing/avrorouter/avro_schema.c b/server/modules/routing/avrorouter/avro_schema.c
index 6ec11eefb..596ae5bff 100644
--- a/server/modules/routing/avrorouter/avro_schema.c
+++ b/server/modules/routing/avrorouter/avro_schema.c
@@ -14,11 +14,9 @@
 /**
  * @file avro_schema.c - Avro schema related functions
  */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 
 #include "avrorouter.h"
+
 #include <maxscale/mysql_utils.h>
 #include <jansson.h>
 #include <stdio.h>
diff --git a/server/modules/routing/avrorouter/avrorouter.h b/server/modules/routing/avrorouter/avrorouter.h
index f6dfbe075..2d762122d 100644
--- a/server/modules/routing/avrorouter/avrorouter.h
+++ b/server/modules/routing/avrorouter/avrorouter.h
@@ -18,6 +18,9 @@
  * MaxScale AVRO router
  *
  */
+
+#define MXS_MODULE_NAME "avrorouter"
+
 #include <maxscale/cdefs.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/server/modules/routing/binlogrouter/blr.c b/server/modules/routing/binlogrouter/blr.c
index 3c777dec1..fb7daf7ee 100644
--- a/server/modules/routing/binlogrouter/blr.c
+++ b/server/modules/routing/binlogrouter/blr.c
@@ -59,6 +59,9 @@
  *
  * @endverbatim
  */
+
+#include "blr.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -71,7 +74,6 @@
 #include <maxscale/utils.h>
 #include <maxscale/secrets.h>
 #include <maxscale/spinlock.h>
-#include "blr.h"
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/housekeeper.h>
diff --git a/server/modules/routing/binlogrouter/blr.h b/server/modules/routing/binlogrouter/blr.h
index 6d0c8c324..8f6c76c92 100644
--- a/server/modules/routing/binlogrouter/blr.h
+++ b/server/modules/routing/binlogrouter/blr.h
@@ -43,6 +43,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "binlogrouter"
+
 #include <maxscale/cdefs.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
diff --git a/server/modules/routing/binlogrouter/blr_cache.c b/server/modules/routing/binlogrouter/blr_cache.c
index 613bb35e2..7a39a457e 100644
--- a/server/modules/routing/binlogrouter/blr_cache.c
+++ b/server/modules/routing/binlogrouter/blr_cache.c
@@ -31,6 +31,9 @@
  *
  * @endverbatim
  */
+
+#include "blr.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -39,7 +42,6 @@
 #include <maxscale/router.h>
 #include <maxscale/atomic.h>
 #include <maxscale/spinlock.h>
-#include "blr.h"
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 
diff --git a/server/modules/routing/binlogrouter/blr_file.c b/server/modules/routing/binlogrouter/blr_file.c
index 4fa1ac925..6a0d5a5d8 100644
--- a/server/modules/routing/binlogrouter/blr_file.c
+++ b/server/modules/routing/binlogrouter/blr_file.c
@@ -48,6 +48,9 @@
  *
  * @endverbatim
  */
+
+#include "blr.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -62,7 +65,6 @@
 #include <maxscale/router.h>
 #include <maxscale/atomic.h>
 #include <maxscale/spinlock.h>
-#include "blr.h"
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/gwdirs.h>
diff --git a/server/modules/routing/binlogrouter/blr_master.c b/server/modules/routing/binlogrouter/blr_master.c
index 2c08c5f2f..19009a862 100644
--- a/server/modules/routing/binlogrouter/blr_master.c
+++ b/server/modules/routing/binlogrouter/blr_master.c
@@ -55,6 +55,9 @@
  *
  * @endverbatim
  */
+
+#include "blr.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -63,7 +66,6 @@
 #include <maxscale/router.h>
 #include <maxscale/atomic.h>
 #include <maxscale/session.h>
-#include "blr.h"
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/housekeeper.h>
diff --git a/server/modules/routing/binlogrouter/blr_slave.c b/server/modules/routing/binlogrouter/blr_slave.c
index 6e43a6788..8a9b597d6 100644
--- a/server/modules/routing/binlogrouter/blr_slave.c
+++ b/server/modules/routing/binlogrouter/blr_slave.c
@@ -68,6 +68,8 @@
  * @endverbatim
  */
 
+#include "blr.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -78,7 +80,6 @@
 #include <maxscale/router.h>
 #include <maxscale/atomic.h>
 #include <maxscale/spinlock.h>
-#include "blr.h"
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/housekeeper.h>
diff --git a/server/modules/routing/binlogrouter/maxbinlogcheck.c b/server/modules/routing/binlogrouter/maxbinlogcheck.c
index 3760c0978..73b805cb8 100644
--- a/server/modules/routing/binlogrouter/maxbinlogcheck.c
+++ b/server/modules/routing/binlogrouter/maxbinlogcheck.c
@@ -40,6 +40,8 @@
  * @endverbatim
  */
 
+#include "blr.h"
+
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,7 +50,6 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/log_manager.h>
-#include "blr.h"
 
 
 static void printVersion(const char *progname);
diff --git a/server/modules/routing/binlogrouter/test/testbinlog.c b/server/modules/routing/binlogrouter/test/testbinlog.c
index 24078b42d..bf1100202 100644
--- a/server/modules/routing/binlogrouter/test/testbinlog.c
+++ b/server/modules/routing/binlogrouter/test/testbinlog.c
@@ -21,6 +21,9 @@
  *
  * @endverbatim
  */
+
+#include "../blr.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,7 +33,6 @@
 #include <maxscale/router.h>
 #include <maxscale/atomic.h>
 #include <maxscale/spinlock.h>
-#include "../blr.h"
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/housekeeper.h>
diff --git a/server/modules/routing/cli/cli.c b/server/modules/routing/cli/cli.c
index 5f0f555ca..d38adb354 100644
--- a/server/modules/routing/cli/cli.c
+++ b/server/modules/routing/cli/cli.c
@@ -24,6 +24,9 @@
  *
  * @endverbatim
  */
+
+#define MXS_MODULE_NAME "cli"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/modules/routing/debugcli/debugcli.c b/server/modules/routing/debugcli/debugcli.c
index 28f9c84b3..cd5fb4a1c 100644
--- a/server/modules/routing/debugcli/debugcli.c
+++ b/server/modules/routing/debugcli/debugcli.c
@@ -23,6 +23,9 @@
  *
  * @endverbatim
  */
+
+#define MXS_MODULE_NAME "debugcli"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/modules/routing/maxinfo/maxinfo.c b/server/modules/routing/maxinfo/maxinfo.c
index 6d069c6fb..fc676a4c7 100644
--- a/server/modules/routing/maxinfo/maxinfo.c
+++ b/server/modules/routing/maxinfo/maxinfo.c
@@ -25,6 +25,9 @@
  *
  * @endverbatim
  */
+
+#include "maxinfo.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -43,7 +46,6 @@
 #include <maxscale/dcb.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/poll.h>
-#include "maxinfo.h"
 #include <maxscale/log_manager.h>
 #include <maxscale/resultset.h>
 #include <maxscale/version.h>
diff --git a/server/modules/routing/maxinfo/maxinfo.h b/server/modules/routing/maxinfo/maxinfo.h
index f736b3f0e..b891ad0e0 100644
--- a/server/modules/routing/maxinfo/maxinfo.h
+++ b/server/modules/routing/maxinfo/maxinfo.h
@@ -26,6 +26,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "maxinfo"
+
 #include <maxscale/cdefs.h>
 #include <maxscale/service.h>
 #include <maxscale/session.h>
diff --git a/server/modules/routing/maxinfo/maxinfo_error.c b/server/modules/routing/maxinfo/maxinfo_error.c
index aefd46f77..932646e1e 100644
--- a/server/modules/routing/maxinfo/maxinfo_error.c
+++ b/server/modules/routing/maxinfo/maxinfo_error.c
@@ -22,6 +22,9 @@
  *
  * @endverbatim
  */
+
+#include "maxinfo.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -36,7 +39,6 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/poll.h>
-#include "maxinfo.h"
 #include <maxscale/log_manager.h>
 
 
diff --git a/server/modules/routing/maxinfo/maxinfo_exec.c b/server/modules/routing/maxinfo/maxinfo_exec.c
index 17521e42a..c48b564cb 100644
--- a/server/modules/routing/maxinfo/maxinfo_exec.c
+++ b/server/modules/routing/maxinfo/maxinfo_exec.c
@@ -23,6 +23,9 @@
  *
  * @endverbatim
  */
+
+#include "maxinfo.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -40,7 +43,6 @@
 #include <maxscale/dcb.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/poll.h>
-#include "maxinfo.h"
 #include <maxscale/log_manager.h>
 #include <maxscale/resultset.h>
 #include <maxscale/config.h>
diff --git a/server/modules/routing/maxinfo/maxinfo_parse.c b/server/modules/routing/maxinfo/maxinfo_parse.c
index 95b4cdfbf..2bbf17cc0 100644
--- a/server/modules/routing/maxinfo/maxinfo_parse.c
+++ b/server/modules/routing/maxinfo/maxinfo_parse.c
@@ -24,6 +24,8 @@
  * @endverbatim
  */
 
+#include "maxinfo.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,7 +41,6 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/poll.h>
-#include "maxinfo.h"
 #include <maxscale/log_manager.h>
 
 static MAXINFO_TREE *make_tree_node(MAXINFO_OPERATOR, char *, MAXINFO_TREE *, MAXINFO_TREE *);
diff --git a/server/modules/routing/readconnroute/readconnection.h b/server/modules/routing/readconnroute/readconnection.h
index dfcf153fd..7163a00b7 100644
--- a/server/modules/routing/readconnroute/readconnection.h
+++ b/server/modules/routing/readconnroute/readconnection.h
@@ -27,8 +27,11 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "readconnroute"
+
 #include <maxscale/cdefs.h>
 #include <maxscale/dcb.h>
+#include <maxscale/service.h>
 
 MXS_BEGIN_DECLS
 
diff --git a/server/modules/routing/readconnroute/readconnroute.c b/server/modules/routing/readconnroute/readconnroute.c
index a5113067c..b63f4019e 100644
--- a/server/modules/routing/readconnroute/readconnroute.c
+++ b/server/modules/routing/readconnroute/readconnroute.c
@@ -69,25 +69,23 @@
  *
  * @endverbatim
  */
+
+#include "readconnection.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <maxscale/alloc.h>
-#include <maxscale/service.h>
 #include <maxscale/server.h>
 #include <maxscale/router.h>
 #include <maxscale/atomic.h>
 #include <maxscale/spinlock.h>
-#include "readconnection.h"
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/modinfo.h>
-
 #include <maxscale/log_manager.h>
-
 #include <maxscale/protocol/mysql.h>
-
 #include <maxscale/modutil.h>
 
 /* The router entry points */
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index 17f562d2d..1af1e6ebc 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#include "readwritesplit.h"
+
 #include <stdio.h>
 #include <strings.h>
 #include <string.h>
@@ -17,7 +20,6 @@
 #include <stdint.h>
 
 #include <maxscale/router.h>
-#include "readwritesplit.h"
 #include "rwsplit_internal.h"
 
 #include <maxscale/log_manager.h>
diff --git a/server/modules/routing/readwritesplit/readwritesplit.h b/server/modules/routing/readwritesplit/readwritesplit.h
index 11256edac..da3c339c9 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.h
+++ b/server/modules/routing/readwritesplit/readwritesplit.h
@@ -25,9 +25,12 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "readwritesplit"
+
 #include <maxscale/cdefs.h>
 #include <maxscale/dcb.h>
 #include <maxscale/hashtable.h>
+#include <maxscale/service.h>
 #include <math.h>
 
 MXS_BEGIN_DECLS
diff --git a/server/modules/routing/readwritesplit/rwsplit_mysql.c b/server/modules/routing/readwritesplit/rwsplit_mysql.c
index de5a429cd..22db1ea88 100644
--- a/server/modules/routing/readwritesplit/rwsplit_mysql.c
+++ b/server/modules/routing/readwritesplit/rwsplit_mysql.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#include "readwritesplit.h"
+
 #include <my_config.h>
 #include <stdio.h>
 #include <strings.h>
@@ -18,7 +21,6 @@
 #include <stdint.h>
 
 #include <maxscale/router.h>
-#include "readwritesplit.h"
 #include "rwsplit_internal.h"
 
 #include <mysql.h>
diff --git a/server/modules/routing/readwritesplit/rwsplit_route_stmt.c b/server/modules/routing/readwritesplit/rwsplit_route_stmt.c
index f3fe949bb..5865b8f72 100644
--- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.c
+++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#include "readwritesplit.h"
+
 #include <stdio.h>
 #include <strings.h>
 #include <string.h>
@@ -18,7 +21,6 @@
 #include <maxscale/alloc.h>
 
 #include <maxscale/router.h>
-#include "readwritesplit.h"
 #include "rwsplit_internal.h"
 /**
  * @file rwsplit_route_stmt.c   The functions that support the routing of
diff --git a/server/modules/routing/readwritesplit/rwsplit_select_backends.c b/server/modules/routing/readwritesplit/rwsplit_select_backends.c
index 31c45cee8..a3a87e15e 100644
--- a/server/modules/routing/readwritesplit/rwsplit_select_backends.c
+++ b/server/modules/routing/readwritesplit/rwsplit_select_backends.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#include "readwritesplit.h"
+
 #include <stdio.h>
 #include <strings.h>
 #include <string.h>
@@ -17,7 +20,6 @@
 #include <stdint.h>
 
 #include <maxscale/router.h>
-#include "readwritesplit.h"
 #include "rwsplit_internal.h"
 /**
  * @file rwsplit_select_backends.c   The functions that implement back end
diff --git a/server/modules/routing/readwritesplit/rwsplit_session_cmd.c b/server/modules/routing/readwritesplit/rwsplit_session_cmd.c
index 09676e2f7..11b8280f1 100644
--- a/server/modules/routing/readwritesplit/rwsplit_session_cmd.c
+++ b/server/modules/routing/readwritesplit/rwsplit_session_cmd.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#include "readwritesplit.h"
+
 #include <stdio.h>
 #include <strings.h>
 #include <string.h>
@@ -17,7 +20,6 @@
 #include <stdint.h>
 
 #include <maxscale/router.h>
-#include "readwritesplit.h"
 #include "rwsplit_internal.h"
 
 /**
diff --git a/server/modules/routing/readwritesplit/rwsplit_tmp_table_multi.c b/server/modules/routing/readwritesplit/rwsplit_tmp_table_multi.c
index 8eaa689ea..4a6bdee14 100644
--- a/server/modules/routing/readwritesplit/rwsplit_tmp_table_multi.c
+++ b/server/modules/routing/readwritesplit/rwsplit_tmp_table_multi.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#include "readwritesplit.h"
+
 #include <stdio.h>
 #include <strings.h>
 #include <string.h>
@@ -21,7 +24,6 @@
 #include <maxscale/modutil.h>
 
 #include <maxscale/router.h>
-#include "readwritesplit.h"
 #include "rwsplit_internal.h"
 /**
  * @file rwsplit_tmp_table.c   The functions that carry out checks on
diff --git a/server/modules/routing/schemarouter/schemarouter.c b/server/modules/routing/schemarouter/schemarouter.c
index dc39720fd..b050c6111 100644
--- a/server/modules/routing/schemarouter/schemarouter.c
+++ b/server/modules/routing/schemarouter/schemarouter.c
@@ -10,6 +10,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
+
+#include "schemarouter.h"
+
 #include <my_config.h>
 #include <stdio.h>
 #include <strings.h>
@@ -17,7 +20,6 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <maxscale/router.h>
-#include "schemarouter.h"
 #include "sharding_common.h"
 #include <maxscale/secrets.h>
 #include <mysql.h>
diff --git a/server/modules/routing/schemarouter/schemarouter.h b/server/modules/routing/schemarouter/schemarouter.h
index c3cab3c28..b3292206f 100644
--- a/server/modules/routing/schemarouter/schemarouter.h
+++ b/server/modules/routing/schemarouter/schemarouter.h
@@ -25,6 +25,8 @@
  * @endverbatim
  */
 
+#define MXS_MODULE_NAME "schemarouter"
+
 #include <maxscale/cdefs.h>
 #include <maxscale/dcb.h>
 #include <maxscale/hashtable.h>