diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index f22cabf1d..b38a46cb9 100644
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@@ -44,7 +44,6 @@
 #include <maxscale/clock.h>
 #include <maxscale/limits.h>
 #include <maxscale/listener.hh>
-#include <maxscale/log.hh>
 #include <maxscale/poll.hh>
 #include <maxscale/router.hh>
 #include <maxscale/server.hh>
diff --git a/server/core/externcmd.cc b/server/core/externcmd.cc
index f0e1f05c2..06fc86862 100644
--- a/server/core/externcmd.cc
+++ b/server/core/externcmd.cc
@@ -23,7 +23,6 @@
 
 #include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/log.hh>
 #include <maxscale/pcre2.h>
 
 /**
diff --git a/server/core/maxkeys.cc b/server/core/maxkeys.cc
index 7dd43d9c1..3c0fa5f0a 100644
--- a/server/core/maxkeys.cc
+++ b/server/core/maxkeys.cc
@@ -13,23 +13,13 @@
 
 /**
  * @file maxkeys.c  - Create the random encryption keys for maxscale
- *
- * @verbatim
- * Revision History
- *
- * Date         Who             Description
- * 24/07/13     Mark Riddoch    Initial implementation
- *
- * @endverbatim
  */
-#include "internal/secrets.h"
-
+#include <maxscale/ccdefs.hh>
 #include <getopt.h>
 #include <stdio.h>
-
-#include <maxscale/log.hh>
 #include <maxscale/paths.h>
 #include <maxscale/random.h>
+#include "internal/secrets.h"
 
 #ifdef HAVE_GLIBC
 struct option options[] =
diff --git a/server/core/maxpasswd.cc b/server/core/maxpasswd.cc
index 3845f588b..efc5f7191 100644
--- a/server/core/maxpasswd.cc
+++ b/server/core/maxpasswd.cc
@@ -13,14 +13,6 @@
 
 /**
  * @file maxpasswd.c  - Implementation of pasword encoding
- *
- * @verbatim
- * Revision History
- *
- * Date         Who             Description
- * 24/07/13     Mark Riddoch    Initial implementation
- *
- * @endverbatim
  */
 
 #include <maxscale/ccdefs.hh>
@@ -31,7 +23,6 @@
 #include <getopt.h>
 
 #include <maxscale/paths.h>
-#include <maxscale/log.hh>
 #include <maxscale/random.h>
 #include <maxscale/alloc.h>
 
diff --git a/server/core/test/test_config.cc b/server/core/test/test_config.cc
index 6526caa48..a0f22d75a 100644
--- a/server/core/test/test_config.cc
+++ b/server/core/test/test_config.cc
@@ -17,7 +17,6 @@
 #endif
 
 #include <iostream>
-#include <maxscale/log.hh>
 #include "../config.cc"
 
 using namespace std;
diff --git a/server/core/test/test_event.cc b/server/core/test/test_event.cc
index c716ea700..a2f26372e 100644
--- a/server/core/test/test_event.cc
+++ b/server/core/test/test_event.cc
@@ -21,7 +21,6 @@
 #include <iostream>
 #include <sstream>
 #include <maxbase/assert.h>
-#include <maxscale/log.hh>
 
 using namespace maxscale;
 using namespace std;
diff --git a/server/core/test/test_logthrottling.cc b/server/core/test/test_logthrottling.cc
index 6fb66d943..953f601d6 100644
--- a/server/core/test/test_logthrottling.cc
+++ b/server/core/test/test_logthrottling.cc
@@ -11,6 +11,7 @@
  * Public License.
  */
 
+#include <maxscale/log.hh>
 #include <unistd.h>
 #include <cstdio>
 #include <stdint.h>
@@ -20,7 +21,6 @@
 #include <pthread.h>
 #include <sched.h>
 #include <semaphore.h>
-#include <maxscale/log.hh>
 #include <maxscale/random.h>
 
 using std::cerr;
diff --git a/server/modules/filter/dbfwfilter/rules.cc b/server/modules/filter/dbfwfilter/rules.cc
index 1cf1402a8..e15e15fde 100644
--- a/server/modules/filter/dbfwfilter/rules.cc
+++ b/server/modules/filter/dbfwfilter/rules.cc
@@ -17,7 +17,6 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
-#include <maxscale/log.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
 
diff --git a/server/modules/protocol/MySQL/mysql_common.cc b/server/modules/protocol/MySQL/mysql_common.cc
index 02b5cd893..d209454d5 100644
--- a/server/modules/protocol/MySQL/mysql_common.cc
+++ b/server/modules/protocol/MySQL/mysql_common.cc
@@ -23,7 +23,6 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/clock.h>
-#include <maxscale/log.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/protocol/mysql.hh>
diff --git a/server/modules/protocol/MySQL/rwbackend.cc b/server/modules/protocol/MySQL/rwbackend.cc
index 76ef1e20c..eee53e512 100644
--- a/server/modules/protocol/MySQL/rwbackend.cc
+++ b/server/modules/protocol/MySQL/rwbackend.cc
@@ -15,7 +15,6 @@
 
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
-#include <maxscale/log.hh>
 
 namespace maxscale
 {
diff --git a/server/modules/routing/avrorouter/avro.cc b/server/modules/routing/avrorouter/avro.cc
index d0df43b64..0b0524917 100644
--- a/server/modules/routing/avrorouter/avro.cc
+++ b/server/modules/routing/avrorouter/avro.cc
@@ -32,7 +32,6 @@
 #include <maxbase/worker.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>
diff --git a/server/modules/routing/avrorouter/avro_client.cc b/server/modules/routing/avrorouter/avro_client.cc
index f67e47f41..87c9bda4b 100644
--- a/server/modules/routing/avrorouter/avro_client.cc
+++ b/server/modules/routing/avrorouter/avro_client.cc
@@ -29,7 +29,6 @@
 #include <maxscale/router.hh>
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.hh>
 #include <maxscale/version.h>
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.hh>
diff --git a/server/modules/routing/avrorouter/avro_converter.cc b/server/modules/routing/avrorouter/avro_converter.cc
index 0b1e8ce83..6a23c3f89 100644
--- a/server/modules/routing/avrorouter/avro_converter.cc
+++ b/server/modules/routing/avrorouter/avro_converter.cc
@@ -17,7 +17,6 @@
 
 #include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/log.hh>
 
 /**
  * @brief Allocate an Avro table
diff --git a/server/modules/routing/avrorouter/avro_file.cc b/server/modules/routing/avrorouter/avro_file.cc
index 1a976c8fa..48431e119 100644
--- a/server/modules/routing/avrorouter/avro_file.cc
+++ b/server/modules/routing/avrorouter/avro_file.cc
@@ -33,7 +33,6 @@
 #include <sys/stat.h>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log.hh>
 #include <maxscale/maxscale.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/utils.h>
diff --git a/server/modules/routing/avrorouter/avro_main.cc b/server/modules/routing/avrorouter/avro_main.cc
index aa38a7ad8..537f6ec2a 100644
--- a/server/modules/routing/avrorouter/avro_main.cc
+++ b/server/modules/routing/avrorouter/avro_main.cc
@@ -28,7 +28,6 @@
 #include <maxbase/worker.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>
diff --git a/server/modules/routing/avrorouter/avro_schema.cc b/server/modules/routing/avrorouter/avro_schema.cc
index 51f38fc41..dda201524 100644
--- a/server/modules/routing/avrorouter/avro_schema.cc
+++ b/server/modules/routing/avrorouter/avro_schema.cc
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <limits.h>
 #include <unistd.h>
-#include <maxscale/log.hh>
 #include <sys/stat.h>
 #include <errno.h>
 #include <string.h>
diff --git a/server/modules/routing/binlogrouter/binlog_common.cc b/server/modules/routing/binlogrouter/binlog_common.cc
index f57e738fe..83f5858b1 100644
--- a/server/modules/routing/binlogrouter/binlog_common.cc
+++ b/server/modules/routing/binlogrouter/binlog_common.cc
@@ -18,7 +18,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <blr_constants.hh>
-#include <maxscale/log.hh>
 
 /**
  * @file binlog_common.c - Common binary log code shared between multiple modules
diff --git a/server/modules/routing/binlogrouter/blr.cc b/server/modules/routing/binlogrouter/blr.cc
index ff6f41d1b..16daa8b14 100644
--- a/server/modules/routing/binlogrouter/blr.cc
+++ b/server/modules/routing/binlogrouter/blr.cc
@@ -41,7 +41,6 @@
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/router.hh>
 #include <maxscale/secrets.h>
diff --git a/server/modules/routing/binlogrouter/blr_cache.cc b/server/modules/routing/binlogrouter/blr_cache.cc
index 87dbd59df..915fd1c4d 100644
--- a/server/modules/routing/binlogrouter/blr_cache.cc
+++ b/server/modules/routing/binlogrouter/blr_cache.cc
@@ -35,9 +35,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
 
-#include <maxscale/log.hh>
-
-
 /**
  * Initialise the cache for this instanceof the binlog router. As a side
  * effect also determine the binlog file to read and the position to read
diff --git a/server/modules/routing/binlogrouter/blr_file.cc b/server/modules/routing/binlogrouter/blr_file.cc
index 8f95d4f02..bad7b2990 100644
--- a/server/modules/routing/binlogrouter/blr_file.cc
+++ b/server/modules/routing/binlogrouter/blr_file.cc
@@ -34,7 +34,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/encryption.h>
-#include <maxscale/log.hh>
 #include <maxscale/paths.h>
 #include <maxscale/router.hh>
 #include <maxscale/secrets.h>
diff --git a/server/modules/routing/binlogrouter/blr_master.cc b/server/modules/routing/binlogrouter/blr_master.cc
index 2b7a09188..ddb83882f 100644
--- a/server/modules/routing/binlogrouter/blr_master.cc
+++ b/server/modules/routing/binlogrouter/blr_master.cc
@@ -45,7 +45,6 @@
 #include <maxscale/buffer.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/router.hh>
 #include <maxscale/routingworker.hh>
diff --git a/server/modules/routing/binlogrouter/blr_slave.cc b/server/modules/routing/binlogrouter/blr_slave.cc
index ce26949f3..b47aa096d 100644
--- a/server/modules/routing/binlogrouter/blr_slave.cc
+++ b/server/modules/routing/binlogrouter/blr_slave.cc
@@ -39,7 +39,6 @@
 #include <maxscale/clock.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.hh>
 #include <maxscale/maxscale.h>
 #include <maxscale/poll.hh>
 #include <maxscale/router.hh>
diff --git a/server/modules/routing/binlogrouter/maxbinlogcheck.cc b/server/modules/routing/binlogrouter/maxbinlogcheck.cc
index a73be135b..9f3972136 100644
--- a/server/modules/routing/binlogrouter/maxbinlogcheck.cc
+++ b/server/modules/routing/binlogrouter/maxbinlogcheck.cc
@@ -28,7 +28,6 @@
 #include <sys/stat.h>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log.hh>
 
 
 static void printVersion(const char* progname);
diff --git a/server/modules/routing/binlogrouter/test/testbinlog.cc b/server/modules/routing/binlogrouter/test/testbinlog.cc
index 37cea98cb..166ce7fc2 100644
--- a/server/modules/routing/binlogrouter/test/testbinlog.cc
+++ b/server/modules/routing/binlogrouter/test/testbinlog.cc
@@ -35,7 +35,6 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <time.h>
-#include <maxscale/log.hh>
 #include <maxscale/paths.h>
 #include <maxscale/alloc.h>
 #include <maxscale/utils.hh>
diff --git a/server/modules/routing/cli/cli.cc b/server/modules/routing/cli/cli.cc
index 399ca1f9b..99dcd9c69 100644
--- a/server/modules/routing/cli/cli.cc
+++ b/server/modules/routing/cli/cli.cc
@@ -34,7 +34,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/poll.hh>
 #include <maxscale/router.hh>
diff --git a/server/modules/routing/debugcli/debugcli.cc b/server/modules/routing/debugcli/debugcli.cc
index 114ef4a2b..6272d14e4 100644
--- a/server/modules/routing/debugcli/debugcli.cc
+++ b/server/modules/routing/debugcli/debugcli.cc
@@ -33,7 +33,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/poll.hh>
 #include <maxscale/router.hh>
diff --git a/server/modules/routing/debugcli/debugcmd.cc b/server/modules/routing/debugcli/debugcmd.cc
index 87bed500f..f4471e467 100644
--- a/server/modules/routing/debugcli/debugcmd.cc
+++ b/server/modules/routing/debugcli/debugcmd.cc
@@ -43,7 +43,6 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.hh>
 #include <maxscale/maxscale.h>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/router.hh>