diff --git a/avro/maxavro.cc b/avro/maxavro.cc
index 4e4844db5..81f894bbe 100644
--- a/avro/maxavro.cc
+++ b/avro/maxavro.cc
@@ -16,7 +16,7 @@
 #include <stdbool.h>
 #include "maxavro_internal.h"
 #include <maxbase/assert.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <errno.h>
 
 /** Maximum byte size of an integer value */
diff --git a/avro/maxavro_file.cc b/avro/maxavro_file.cc
index 9340ad79c..79c2987c9 100644
--- a/avro/maxavro_file.cc
+++ b/avro/maxavro_file.cc
@@ -15,7 +15,7 @@
 #include <errno.h>
 #include <string.h>
 #include <maxbase/assert.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <zlib.h>
 
 static bool maxavro_read_sync(FILE* file, uint8_t* sync)
diff --git a/avro/maxavro_record.cc b/avro/maxavro_record.cc
index 50cddabe5..4e07f9ef6 100644
--- a/avro/maxavro_record.cc
+++ b/avro/maxavro_record.cc
@@ -15,7 +15,7 @@
 #include "maxavro_internal.h"
 #include <string.h>
 #include <maxbase/assert.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <errno.h>
 
 /**
diff --git a/avro/maxavro_schema.cc b/avro/maxavro_schema.cc
index 5835b6581..8659d1447 100644
--- a/avro/maxavro_schema.cc
+++ b/avro/maxavro_schema.cc
@@ -15,7 +15,7 @@
 #include <jansson.h>
 #include <string.h>
 #include <maxbase/assert.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 
 static const MAXAVRO_SCHEMA_FIELD types[MAXAVRO_TYPE_MAX] =
 {
diff --git a/avro/maxavro_write.cc b/avro/maxavro_write.cc
index 61db3876d..7b5ec306b 100644
--- a/avro/maxavro_write.cc
+++ b/avro/maxavro_write.cc
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include "maxavro_internal.h"
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <errno.h>
 
 /**
diff --git a/avro/maxavrocheck.cc b/avro/maxavrocheck.cc
index 5190d66a6..09352c4d0 100644
--- a/avro/maxavrocheck.cc
+++ b/avro/maxavrocheck.cc
@@ -24,7 +24,7 @@
 #include <limits.h>
 #include <getopt.h>
 
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 
 static int verbose = 0;
 static uint64_t seekto = 0;
diff --git a/include/maxscale/ccdefs.hh b/include/maxscale/ccdefs.hh
index f59c360f3..5ffd8b7dc 100644
--- a/include/maxscale/ccdefs.hh
+++ b/include/maxscale/ccdefs.hh
@@ -24,7 +24,7 @@
 
 #include <maxscale/cdefs.h>
 #include <maxbase/ccdefs.hh>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 
 /**
  * All classes of MaxScale are defined in the namespace @c maxscale.
diff --git a/include/maxscale/config.hh b/include/maxscale/config.hh
index 1c78cfb4f..5a40f5f2c 100644
--- a/include/maxscale/config.hh
+++ b/include/maxscale/config.hh
@@ -16,7 +16,7 @@
  * @file include/maxscale/config.h The configuration handling elements
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 
 #include <unordered_map>
 #include <string>
@@ -29,7 +29,6 @@ typedef std::unordered_map<std::string, int32_t> MxsDiskSpaceThreshold;
 #include <time.h>
 
 #include <maxbase/jansson.h>
-#include <maxbase/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/query_classifier.h>
diff --git a/include/maxscale/customparser.hh b/include/maxscale/customparser.hh
index f6adff515..79c6d88f2 100644
--- a/include/maxscale/customparser.hh
+++ b/include/maxscale/customparser.hh
@@ -13,7 +13,6 @@
 #pragma once
 
 #include <maxscale/ccdefs.hh>
-#include <maxscale/log.h>
 #include <maxscale/modutil.hh>
 #include <ctype.h>
 
diff --git a/include/maxscale/dcb.hh b/include/maxscale/dcb.hh
index 6664f6fc1..2d2bbd080 100644
--- a/include/maxscale/dcb.hh
+++ b/include/maxscale/dcb.hh
@@ -16,12 +16,11 @@
  * @file dcb.h  The Descriptor Control Block
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 #include <netinet/in.h>
 #include <maxbase/poll.h>
 #include <maxscale/authenticator.h>
 #include <maxscale/buffer.h>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/protocol.h>
 #include <maxscale/ssl.h>
diff --git a/include/maxscale/log.h b/include/maxscale/log.hh
similarity index 97%
rename from include/maxscale/log.h
rename to include/maxscale/log.hh
index ecd480160..50536bf81 100644
--- a/include/maxscale/log.h
+++ b/include/maxscale/log.hh
@@ -12,6 +12,7 @@
  */
 #pragma once
 
+// NOTE: Do not include <maxscale/ccefs.hh>, it includes this.
 #include <maxscale/cdefs.h>
 
 #include <assert.h>
diff --git a/include/maxscale/session.hh b/include/maxscale/session.hh
index 9848c9da9..b895aa23f 100644
--- a/include/maxscale/session.hh
+++ b/include/maxscale/session.hh
@@ -20,7 +20,6 @@
 #include <maxbase/jansson.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/buffer.h>
-#include <maxscale/log.h>
 #include <maxscale/utils.hh>
 
 struct DCB;
diff --git a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
index 2241e255a..02c71125d 100644
--- a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
+++ b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
@@ -61,7 +61,7 @@
 #include <pthread.h>
 
 #include <maxbase/assert.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/paths.h>
diff --git a/query_classifier/qc_sqlite/qc_sqlite.cc b/query_classifier/qc_sqlite/qc_sqlite.cc
index 4ca6d37fc..c3a174cee 100644
--- a/query_classifier/qc_sqlite/qc_sqlite.cc
+++ b/query_classifier/qc_sqlite/qc_sqlite.cc
@@ -29,7 +29,6 @@
 #include <mutex>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
diff --git a/query_classifier/test/classify.cc b/query_classifier/test/classify.cc
index 4fcd0a816..97323a1b9 100644
--- a/query_classifier/test/classify.cc
+++ b/query_classifier/test/classify.cc
@@ -20,7 +20,7 @@
 #include <mysql.h>
 #include <unistd.h>
 #include <maxscale/paths.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 
 char* append(char* types, const char* type_name, size_t* lenp)
 {
diff --git a/query_classifier/test/compare.cc b/query_classifier/test/compare.cc
index bcad32646..02f501bd5 100644
--- a/query_classifier/test/compare.cc
+++ b/query_classifier/test/compare.cc
@@ -22,7 +22,7 @@
 #include <sstream>
 #include <my_config.h>
 #include <maxscale/paths.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/query_classifier.h>
 #include "../../server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh"
diff --git a/query_classifier/test/qc_cache.cc b/query_classifier/test/qc_cache.cc
index 401a96b07..8f35b2adb 100644
--- a/query_classifier/test/qc_cache.cc
+++ b/query_classifier/test/qc_cache.cc
@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <chrono>
 #include <iostream>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.hh>
diff --git a/query_classifier/test/version_sensitivity.cc b/query_classifier/test/version_sensitivity.cc
index b9d4c38ba..5754079b5 100644
--- a/query_classifier/test/version_sensitivity.cc
+++ b/query_classifier/test/version_sensitivity.cc
@@ -12,7 +12,7 @@
  */
 
 #include <iostream>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/server.hh>
diff --git a/server/core/adminusers.cc b/server/core/adminusers.cc
index b2dab52cc..6f2488b6f 100644
--- a/server/core/adminusers.cc
+++ b/server/core/adminusers.cc
@@ -25,7 +25,6 @@
 #include <maxscale/alloc.h>
 #include <maxscale/users.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/json_api.h>
 
diff --git a/server/core/buffer.cc b/server/core/buffer.cc
index beb1832a0..f775c5b97 100644
--- a/server/core/buffer.cc
+++ b/server/core/buffer.cc
@@ -20,7 +20,6 @@
 #include <maxbase/assert.h>
 #include <maxscale/alloc.h>
 #include <maxscale/hint.h>
-#include <maxscale/log.h>
 #include <maxscale/utils.h>
 #include <maxscale/routingworker.hh>
 
diff --git a/server/core/config.cc b/server/core/config.cc
index 3b0e14de6..e6c523553 100644
--- a/server/core/config.cc
+++ b/server/core/config.cc
@@ -48,7 +48,6 @@
 #include <maxscale/http.hh>
 #include <maxscale/json_api.h>
 #include <maxscale/limits.h>
-#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/maxadmin.h>
 #include <maxscale/paths.h>
diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index 8c2c59e1d..f22cabf1d 100644
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@@ -44,7 +44,7 @@
 #include <maxscale/clock.h>
 #include <maxscale/limits.h>
 #include <maxscale/listener.hh>
-#include <maxscale/log.h>
+#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 587606196..f0e1f05c2 100644
--- a/server/core/externcmd.cc
+++ b/server/core/externcmd.cc
@@ -23,7 +23,7 @@
 
 #include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/pcre2.h>
 
 /**
diff --git a/server/core/filter.cc b/server/core/filter.cc
index e39793e9d..4cabc175d 100644
--- a/server/core/filter.cc
+++ b/server/core/filter.cc
@@ -31,7 +31,6 @@
 #include <vector>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/session.hh>
 #include <maxscale/service.hh>
diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index d2cb4aafa..60206b42a 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -51,7 +51,6 @@
 #include <maxscale/adminusers.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/paths.h>
diff --git a/server/core/listener.cc b/server/core/listener.cc
index 453cff952..e116bf656 100644
--- a/server/core/listener.cc
+++ b/server/core/listener.cc
@@ -30,7 +30,6 @@
 #include <maxscale/paths.h>
 #include <maxscale/ssl.h>
 #include <maxscale/protocol.h>
-#include <maxscale/log.h>
 #include <maxscale/alloc.h>
 #include <maxscale/users.h>
 #include <maxscale/service.hh>
diff --git a/server/core/load_utils.cc b/server/core/load_utils.cc
index 406224bd6..e4f035dc7 100644
--- a/server/core/load_utils.cc
+++ b/server/core/load_utils.cc
@@ -25,7 +25,6 @@
 #include <string>
 
 #include <maxscale/modinfo.h>
-#include <maxscale/log.h>
 #include <maxscale/version.h>
 #include <maxscale/paths.h>
 #include <maxscale/alloc.h>
diff --git a/server/core/log.cc b/server/core/log.cc
index dc1e099c3..7e14a8d89 100644
--- a/server/core/log.cc
+++ b/server/core/log.cc
@@ -11,14 +11,14 @@
  * Public License.
  */
 
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 
 #include <sys/time.h>
 #include <syslog.h>
 
 #include <cinttypes>
 
-#include <maxbase/log.h>
+#include <maxbase/log.hh>
 #include <maxbase/logger.hh>
 
 #include <maxscale/config.hh>
diff --git a/server/core/maxkeys.cc b/server/core/maxkeys.cc
index 71c0fc419..7dd43d9c1 100644
--- a/server/core/maxkeys.cc
+++ b/server/core/maxkeys.cc
@@ -27,7 +27,7 @@
 #include <getopt.h>
 #include <stdio.h>
 
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/paths.h>
 #include <maxscale/random.h>
 
diff --git a/server/core/maxpasswd.cc b/server/core/maxpasswd.cc
index d5e729697..3845f588b 100644
--- a/server/core/maxpasswd.cc
+++ b/server/core/maxpasswd.cc
@@ -31,7 +31,7 @@
 #include <getopt.h>
 
 #include <maxscale/paths.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/random.h>
 #include <maxscale/alloc.h>
 
diff --git a/server/core/maxscale_pcre2.cc b/server/core/maxscale_pcre2.cc
index b98d0b4e9..c63e43108 100644
--- a/server/core/maxscale_pcre2.cc
+++ b/server/core/maxscale_pcre2.cc
@@ -27,7 +27,7 @@
 #include <maxscale/pcre2.h>
 #include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 
 /**
  * Utility wrapper for PCRE2 library function call pcre2_substitute.
diff --git a/server/core/monitor.cc b/server/core/monitor.cc
index 8970426cd..4e5d6f742 100644
--- a/server/core/monitor.cc
+++ b/server/core/monitor.cc
@@ -33,7 +33,6 @@
 #include <maxbase/atomic.hh>
 #include <maxscale/clock.h>
 #include <maxscale/json_api.h>
-#include <maxscale/log.h>
 #include <maxscale/mariadb.hh>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/paths.h>
diff --git a/server/core/mysql_binlog.cc b/server/core/mysql_binlog.cc
index 3c451551e..0e2767f8c 100644
--- a/server/core/mysql_binlog.cc
+++ b/server/core/mysql_binlog.cc
@@ -18,7 +18,6 @@
 #include <maxscale/mysql_binlog.h>
 #include <maxscale/mysql_utils.hh>
 #include <stdlib.h>
-#include <maxscale/log.h>
 #include <string.h>
 #include <maxscale/users.h>
 #include <strings.h>
diff --git a/server/core/mysql_utils.cc b/server/core/mysql_utils.cc
index 036486410..7d5d92e6f 100644
--- a/server/core/mysql_utils.cc
+++ b/server/core/mysql_utils.cc
@@ -30,7 +30,6 @@
 #include <maxsql/mariadb.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/config.hh>
-#include <maxscale/log.h>
 #include <maxbase/atomic.hh>
 
 /**
diff --git a/server/core/query_classifier.cc b/server/core/query_classifier.cc
index 79bbde5ab..901a3bb36 100644
--- a/server/core/query_classifier.cc
+++ b/server/core/query_classifier.cc
@@ -22,7 +22,6 @@
 #include <maxbase/format.hh>
 #include <maxscale/config.hh>
 #include <maxscale/json_api.h>
-#include <maxscale/log.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/pcre2.h>
 #include <maxscale/utils.h>
diff --git a/server/core/secrets.cc b/server/core/secrets.cc
index 525e1f484..a9a04502c 100644
--- a/server/core/secrets.cc
+++ b/server/core/secrets.cc
@@ -19,7 +19,6 @@
 #include <time.h>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/random.h>
diff --git a/server/core/server.cc b/server/core/server.cc
index 3ad18426b..702bd352b 100644
--- a/server/core/server.cc
+++ b/server/core/server.cc
@@ -39,7 +39,6 @@
 #include <maxscale/session.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/poll.hh>
-#include <maxscale/log.h>
 #include <maxscale/ssl.h>
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>
diff --git a/server/core/service.cc b/server/core/service.cc
index daf4e432b..0b3a16777 100644
--- a/server/core/service.cc
+++ b/server/core/service.cc
@@ -42,7 +42,6 @@
 #include <maxscale/paths.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/listener.hh>
-#include <maxscale/log.h>
 #include <maxscale/poll.hh>
 #include <maxscale/protocol.h>
 #include <maxscale/resultset.hh>
diff --git a/server/core/session.cc b/server/core/session.cc
index b0f1d9ab0..f19344d98 100644
--- a/server/core/session.cc
+++ b/server/core/session.cc
@@ -32,7 +32,6 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <maxscale/json_api.h>
-#include <maxscale/log.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/poll.hh>
 #include <maxscale/router.hh>
diff --git a/server/core/ssl.cc b/server/core/ssl.cc
index 46da8c35d..c334a10a8 100644
--- a/server/core/ssl.cc
+++ b/server/core/ssl.cc
@@ -31,7 +31,6 @@
 #include <stdbool.h>
 #include <sys/ioctl.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
 #include <maxscale/poll.hh>
 #include <maxscale/service.hh>
 
diff --git a/server/core/test/test_config.cc b/server/core/test/test_config.cc
index a8d718722..6526caa48 100644
--- a/server/core/test/test_config.cc
+++ b/server/core/test/test_config.cc
@@ -17,7 +17,7 @@
 #endif
 
 #include <iostream>
-#include <maxscale/log.h>
+#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 2941b1fdd..c716ea700 100644
--- a/server/core/test/test_event.cc
+++ b/server/core/test/test_event.cc
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <sstream>
 #include <maxbase/assert.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 
 using namespace maxscale;
 using namespace std;
diff --git a/server/core/test/test_log.cc b/server/core/test/test_log.cc
index 38f9b2edc..49a6edae8 100644
--- a/server/core/test/test_log.cc
+++ b/server/core/test/test_log.cc
@@ -21,7 +21,7 @@
 #include <time.h>
 #include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 
 static void skygw_log_enable(int priority)
 {
diff --git a/server/core/test/test_logorder.cc b/server/core/test/test_logorder.cc
index 7d5e66b69..1cecafdf0 100644
--- a/server/core/test/test_logorder.cc
+++ b/server/core/test/test_logorder.cc
@@ -18,7 +18,7 @@
 #include <time.h>
 #include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 
 static void skygw_log_enable(int priority)
 {
diff --git a/server/core/test/test_logthrottling.cc b/server/core/test/test_logthrottling.cc
index 3b0313757..6fb66d943 100644
--- a/server/core/test/test_logthrottling.cc
+++ b/server/core/test/test_logthrottling.cc
@@ -20,7 +20,7 @@
 #include <pthread.h>
 #include <sched.h>
 #include <semaphore.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/random.h>
 
 using std::cerr;
diff --git a/server/core/test/test_server.cc b/server/core/test/test_server.cc
index d099f5788..d9828bfc8 100644
--- a/server/core/test/test_server.cc
+++ b/server/core/test/test_server.cc
@@ -35,7 +35,6 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/server.hh>
-#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/config.hh>
 
diff --git a/server/core/test/test_users.cc b/server/core/test/test_users.cc
index a2f8214bb..d1389318e 100644
--- a/server/core/test/test_users.cc
+++ b/server/core/test/test_users.cc
@@ -34,7 +34,6 @@
 #include <string.h>
 
 #include <maxscale/users.h>
-#include <maxscale/log.h>
 
 static int test1()
 {
diff --git a/server/core/test/test_utils.h b/server/core/test/test_utils.h
index 9c09bc297..ceb0cad18 100644
--- a/server/core/test/test_utils.h
+++ b/server/core/test/test_utils.h
@@ -19,7 +19,7 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <maxscale/maxscale_test.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/config.hh>
 #include <maxscale/query_classifier.h>
 #include <maxscale/paths.h>
diff --git a/server/core/users.cc b/server/core/users.cc
index 014acf20b..8e9280ec9 100644
--- a/server/core/users.cc
+++ b/server/core/users.cc
@@ -22,7 +22,6 @@
 
 #include <maxscale/users.h>
 #include <maxscale/authenticator.h>
-#include <maxscale/log.h>
 #include <maxscale/jansson.hh>
 
 namespace
diff --git a/server/core/utils.cc b/server/core/utils.cc
index 8840fa855..ce7d4c7eb 100644
--- a/server/core/utils.cc
+++ b/server/core/utils.cc
@@ -45,7 +45,6 @@
 #include <maxscale/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
 #include <maxscale/limits.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/poll.hh>
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
index d06525c3c..985cfaa7d 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
+++ b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
@@ -13,12 +13,11 @@
 
 #define MXS_MODULE_NAME "GSSAPIAuth"
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/secrets.h>
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
index 3e2985471..3c08a12e2 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
+++ b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
@@ -13,10 +13,10 @@
 
 #define MXS_MODULE_NAME "GSSAPIBackendAuth"
 
+#include <maxscale/ccdefs.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/server.hh>
 
diff --git a/server/modules/authenticator/GSSAPI/gssapi_auth.h b/server/modules/authenticator/GSSAPI/gssapi_auth.h
index 6d7f801e5..4bcfa3a6e 100644
--- a/server/modules/authenticator/GSSAPI/gssapi_auth.h
+++ b/server/modules/authenticator/GSSAPI/gssapi_auth.h
@@ -14,7 +14,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 #include <stdint.h>
 #include <stddef.h>
 #include <gssapi.h>
diff --git a/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc b/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc
index 445146afc..8006b9f81 100644
--- a/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc
+++ b/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc
@@ -13,7 +13,6 @@
 
 #include "gssapi_auth.h"
 #include <maxscale/alloc.h>
-#include <maxscale/log.h>
 
 /**
  * @brief Report GSSAPI errors
diff --git a/server/modules/authenticator/MySQLAuth/dbusers.cc b/server/modules/authenticator/MySQLAuth/dbusers.cc
index 626e7d363..1492dfdc4 100644
--- a/server/modules/authenticator/MySQLAuth/dbusers.cc
+++ b/server/modules/authenticator/MySQLAuth/dbusers.cc
@@ -23,7 +23,6 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/paths.h>
diff --git a/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc b/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc
index f98dcf1c4..8db88d005 100644
--- a/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc
+++ b/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc
@@ -16,7 +16,6 @@
 #include <string>
 #include <string.h>
 #include <maxscale/jansson.hh>
-#include <maxscale/log.h>
 #include <maxscale/secrets.h>
 #include <maxscale/mysql_utils.hh>
 
diff --git a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc
index acc0d2294..68857c14a 100644
--- a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc
+++ b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc
@@ -14,7 +14,6 @@
 #include "pam_backend_auth.hh"
 
 #include <maxscale/authenticator.h>
-#include <maxscale/log.h>
 #include <maxscale/server.hh>
 #include "pam_backend_session.hh"
 #include "../pam_auth_common.hh"
diff --git a/server/modules/filter/cache/storagefactory.cc b/server/modules/filter/cache/storagefactory.cc
index d2c575bc1..39be872d4 100644
--- a/server/modules/filter/cache/storagefactory.cc
+++ b/server/modules/filter/cache/storagefactory.cc
@@ -18,7 +18,6 @@
 #include <new>
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>
-#include <maxscale/log.h>
 #include "cachefilter.hh"
 #include "lrustoragest.hh"
 #include "lrustoragemt.hh"
diff --git a/server/modules/filter/cache/test/testkeygeneration.cc b/server/modules/filter/cache/test/testkeygeneration.cc
index f823e5c6e..e4a921061 100644
--- a/server/modules/filter/cache/test/testkeygeneration.cc
+++ b/server/modules/filter/cache/test/testkeygeneration.cc
@@ -18,7 +18,6 @@
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
-#include <maxscale/log.h>
 #include "storagefactory.hh"
 #include "cache.hh"
 #include "cache_storage_api.hh"
diff --git a/server/modules/filter/cache/test/testrules.cc b/server/modules/filter/cache/test/testrules.cc
index e19c64e40..ec7d0cbab 100644
--- a/server/modules/filter/cache/test/testrules.cc
+++ b/server/modules/filter/cache/test/testrules.cc
@@ -16,7 +16,6 @@
 #include <iostream>
 #include <maxscale/alloc.h>
 #include <maxscale/config.hh>
-#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/query_classifier.h>
diff --git a/server/modules/filter/cache/test/teststorage.cc b/server/modules/filter/cache/test/teststorage.cc
index a75771339..4241ef6e7 100644
--- a/server/modules/filter/cache/test/teststorage.cc
+++ b/server/modules/filter/cache/test/teststorage.cc
@@ -17,7 +17,6 @@
 #include <iostream>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/utils.h>
diff --git a/server/modules/filter/ccrfilter/ccrfilter.cc b/server/modules/filter/ccrfilter/ccrfilter.cc
index e1e0a4e8e..27d9d07a4 100644
--- a/server/modules/filter/ccrfilter/ccrfilter.cc
+++ b/server/modules/filter/ccrfilter/ccrfilter.cc
@@ -20,7 +20,6 @@
 #include <maxscale/alloc.h>
 #include <maxscale/filter.hh>
 #include <maxscale/hint.h>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/pcre2.h>
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.cc b/server/modules/filter/dbfwfilter/dbfwfilter.cc
index eb20e0f6a..6fb72ea5b 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc
@@ -72,7 +72,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/modutil.hh>
-#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/pcre2.h>
 #include <maxscale/alloc.h>
diff --git a/server/modules/filter/dbfwfilter/rules.cc b/server/modules/filter/dbfwfilter/rules.cc
index d3bf3cfff..1cf1402a8 100644
--- a/server/modules/filter/dbfwfilter/rules.cc
+++ b/server/modules/filter/dbfwfilter/rules.cc
@@ -17,7 +17,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
 
diff --git a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
index dddd41602..7c2c8c44a 100644
--- a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
@@ -14,7 +14,6 @@
 #include <cstdlib>
 #include <memory>
 #include <iostream>
-#include <maxscale/log.h>
 #include <maxscale/filtermodule.hh>
 #include <maxscale/queryclassifiermodule.hh>
 #include <maxscale/mock/backend.hh>
diff --git a/server/modules/filter/hintfilter/hintparser.cc b/server/modules/filter/hintfilter/hintparser.cc
index d56e699d0..46e0594be 100644
--- a/server/modules/filter/hintfilter/hintparser.cc
+++ b/server/modules/filter/hintfilter/hintparser.cc
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <maxscale/log.h>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
diff --git a/server/modules/filter/insertstream/insertstream.cc b/server/modules/filter/insertstream/insertstream.cc
index 75a7de559..479be22eb 100644
--- a/server/modules/filter/insertstream/insertstream.cc
+++ b/server/modules/filter/insertstream/insertstream.cc
@@ -13,13 +13,12 @@
 
 #define MXS_MODULE_NAME "insertstream"
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 
 #include <strings.h>
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
 #include <maxscale/filter.hh>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/poll.hh>
diff --git a/server/modules/filter/luafilter/luafilter.cc b/server/modules/filter/luafilter/luafilter.cc
index 64403dc1d..20d8ac7f7 100644
--- a/server/modules/filter/luafilter/luafilter.cc
+++ b/server/modules/filter/luafilter/luafilter.cc
@@ -53,7 +53,6 @@ extern "C"
 #include <mutex>
 #include <maxscale/alloc.h>
 #include <maxscale/filter.hh>
-#include <maxscale/log.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.h>
 #include <maxscale/session.hh>
diff --git a/server/modules/filter/maxrows/maxrows.cc b/server/modules/filter/maxrows/maxrows.cc
index 609cdc21b..6ed2f1bca 100644
--- a/server/modules/filter/maxrows/maxrows.cc
+++ b/server/modules/filter/maxrows/maxrows.cc
@@ -17,7 +17,7 @@
 
 #define MXS_MODULE_NAME "maxrows"
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -26,7 +26,6 @@
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
 #include <maxscale/filter.hh>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>
diff --git a/server/modules/filter/mqfilter/mqfilter.cc b/server/modules/filter/mqfilter/mqfilter.cc
index cfcbe272a..b1a28f916 100644
--- a/server/modules/filter/mqfilter/mqfilter.cc
+++ b/server/modules/filter/mqfilter/mqfilter.cc
@@ -59,6 +59,7 @@
 
 #define MXS_MODULE_NAME "mqfilter"
 
+#include <maxscale/ccdefs.hh>
 #include <stdio.h>
 #include <fcntl.h>
 #include <maxscale/filter.hh>
@@ -73,7 +74,6 @@
 #include <amqp_tcp_socket.h>
 #include <amqp_ssl_socket.h>
 #include <maxscale/protocol/mysql.hh>
-#include <maxscale/log.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/session.hh>
 #include <maxscale/housekeeper.h>
diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.cc b/server/modules/filter/namedserverfilter/namedserverfilter.cc
index 39256b1dd..9e54b8bb8 100644
--- a/server/modules/filter/namedserverfilter/namedserverfilter.cc
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.cc
@@ -39,7 +39,6 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/hint.h>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/server.hh>
diff --git a/server/modules/filter/qlafilter/qlafilter.cc b/server/modules/filter/qlafilter/qlafilter.cc
index feb7f91ec..73c3d07f4 100644
--- a/server/modules/filter/qlafilter/qlafilter.cc
+++ b/server/modules/filter/qlafilter/qlafilter.cc
@@ -40,7 +40,6 @@
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/filter.hh>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/pcre2.h>
diff --git a/server/modules/filter/regexfilter/regexfilter.cc b/server/modules/filter/regexfilter/regexfilter.cc
index 407430d67..5666c0fef 100644
--- a/server/modules/filter/regexfilter/regexfilter.cc
+++ b/server/modules/filter/regexfilter/regexfilter.cc
@@ -13,14 +13,13 @@
 
 #define MXS_MODULE_NAME "regexfilter"
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 #include <string.h>
 #include <stdio.h>
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/config.hh>
 #include <maxscale/filter.hh>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/pcre2.h>
diff --git a/server/modules/filter/tee/tee.cc b/server/modules/filter/tee/tee.cc
index b07662eb2..c42277ec7 100644
--- a/server/modules/filter/tee/tee.cc
+++ b/server/modules/filter/tee/tee.cc
@@ -21,7 +21,6 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/log.h>
 #include <maxscale/modulecmd.hh>
 
 #include "tee.hh"
diff --git a/server/modules/filter/topfilter/topfilter.cc b/server/modules/filter/topfilter/topfilter.cc
index e9c70c1fc..40f05ec11 100644
--- a/server/modules/filter/topfilter/topfilter.cc
+++ b/server/modules/filter/topfilter/topfilter.cc
@@ -34,12 +34,12 @@
 
 #define MXS_MODULE_NAME "topfilter"
 
+#include <maxscale/ccdefs.hh>
 #include <stdio.h>
 #include <fcntl.h>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/log.h>
 #include <string.h>
 #include <time.h>
 #include <sys/time.h>
diff --git a/server/modules/filter/tpmfilter/tpmfilter.cc b/server/modules/filter/tpmfilter/tpmfilter.cc
index 0260afa6a..91796ad03 100644
--- a/server/modules/filter/tpmfilter/tpmfilter.cc
+++ b/server/modules/filter/tpmfilter/tpmfilter.cc
@@ -42,7 +42,7 @@
 
 #define MXS_MODULE_NAME "tpmfilter"
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 
 #include <ctype.h>
 #include <stdio.h>
@@ -59,7 +59,6 @@
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/log.h>
 #include <maxscale/server.hh>
 #include <maxbase/atomic.h>
 #include <maxscale/query_classifier.h>
diff --git a/server/modules/monitor/galeramon/galeramon.cc b/server/modules/monitor/galeramon/galeramon.cc
index 809b21086..4e70a4f65 100644
--- a/server/modules/monitor/galeramon/galeramon.cc
+++ b/server/modules/monitor/galeramon/galeramon.cc
@@ -26,7 +26,6 @@
 #include <maxscale/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/secrets.h>
diff --git a/server/modules/monitor/mmmon/mmmon.cc b/server/modules/monitor/mmmon/mmmon.cc
index 3036f2ae6..2772e13f1 100644
--- a/server/modules/monitor/mmmon/mmmon.cc
+++ b/server/modules/monitor/mmmon/mmmon.cc
@@ -27,7 +27,6 @@
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/secrets.h>
diff --git a/server/modules/protocol/CDC/cdc.cc b/server/modules/protocol/CDC/cdc.cc
index 1d293ab68..edbd693e2 100644
--- a/server/modules/protocol/CDC/cdc.cc
+++ b/server/modules/protocol/CDC/cdc.cc
@@ -32,10 +32,10 @@
 
 #define MXS_MODULE_NAME "CDC"
 
+#include <maxscale/ccdefs.hh>
 #include <cdc.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/log.h>
 #include <maxscale/protocol.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/poll.hh>
diff --git a/server/modules/protocol/HTTPD/httpd.cc b/server/modules/protocol/HTTPD/httpd.cc
index 342bc7321..932d9f7f0 100644
--- a/server/modules/protocol/HTTPD/httpd.cc
+++ b/server/modules/protocol/HTTPD/httpd.cc
@@ -39,7 +39,6 @@
 #include <maxscale/alloc.h>
 #include <maxscale/protocol.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/log.h>
 #include <maxscale/resultset.hh>
 
 #define ISspace(x) isspace((int)(x))
diff --git a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
index 3cc95cd9f..9c3dda097 100644
--- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
+++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
@@ -13,9 +13,9 @@
 
 #define MXS_MODULE_NAME "mariadbbackend"
 
+#include <maxscale/ccdefs.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/limits.h>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/poll.hh>
diff --git a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
index ae61793fb..65d1114ea 100644
--- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
@@ -26,7 +26,6 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/poll.hh>
diff --git a/server/modules/protocol/MySQL/mysql_common.cc b/server/modules/protocol/MySQL/mysql_common.cc
index 9f815266e..02b5cd893 100644
--- a/server/modules/protocol/MySQL/mysql_common.cc
+++ b/server/modules/protocol/MySQL/mysql_common.cc
@@ -23,7 +23,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/clock.h>
-#include <maxscale/log.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 b9f18a821..76ef1e20c 100644
--- a/server/modules/protocol/MySQL/rwbackend.cc
+++ b/server/modules/protocol/MySQL/rwbackend.cc
@@ -15,7 +15,7 @@
 
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 
 namespace maxscale
 {
diff --git a/server/modules/protocol/maxscaled/maxscaled.cc b/server/modules/protocol/maxscaled/maxscaled.cc
index 0943b83ca..3daa5090a 100644
--- a/server/modules/protocol/maxscaled/maxscaled.cc
+++ b/server/modules/protocol/maxscaled/maxscaled.cc
@@ -13,6 +13,7 @@
 
 #define MXS_MODULE_NAME "maxscaled"
 
+#include <maxscale/ccdefs.hh>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -34,7 +35,6 @@
 #include <maxscale/poll.hh>
 #include <maxbase/atomic.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include "maxscaled.h"
 #include <maxscale/maxadmin.h>
diff --git a/server/modules/protocol/telnetd/telnetd.cc b/server/modules/protocol/telnetd/telnetd.cc
index f44370b96..c63afa755 100644
--- a/server/modules/protocol/telnetd/telnetd.cc
+++ b/server/modules/protocol/telnetd/telnetd.cc
@@ -13,6 +13,7 @@
 
 #define MXS_MODULE_NAME "telnetd"
 
+#include <maxscale/ccdefs.hh>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -33,7 +34,6 @@
 #include <maxbase/atomic.h>
 #include <telnetd.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 
 /**
diff --git a/server/modules/routing/avrorouter/avro.cc b/server/modules/routing/avrorouter/avro.cc
index 869e097e9..2a76e8ccb 100644
--- a/server/modules/routing/avrorouter/avro.cc
+++ b/server/modules/routing/avrorouter/avro.cc
@@ -32,7 +32,7 @@
 #include <maxbase/worker.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
+#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 4cdc81d61..f67e47f41 100644
--- a/server/modules/routing/avrorouter/avro_client.cc
+++ b/server/modules/routing/avrorouter/avro_client.cc
@@ -29,7 +29,7 @@
 #include <maxscale/router.hh>
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
+#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 9d196feae..0b1e8ce83 100644
--- a/server/modules/routing/avrorouter/avro_converter.cc
+++ b/server/modules/routing/avrorouter/avro_converter.cc
@@ -17,7 +17,7 @@
 
 #include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/log.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 aeee78618..075612d2f 100644
--- a/server/modules/routing/avrorouter/avro_file.cc
+++ b/server/modules/routing/avrorouter/avro_file.cc
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log.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 e34aed998..c0d9666bf 100644
--- a/server/modules/routing/avrorouter/avro_main.cc
+++ b/server/modules/routing/avrorouter/avro_main.cc
@@ -28,7 +28,7 @@
 #include <maxbase/worker.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
+#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 fb556f024..51f38fc41 100644
--- a/server/modules/routing/avrorouter/avro_schema.cc
+++ b/server/modules/routing/avrorouter/avro_schema.cc
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <limits.h>
 #include <unistd.h>
-#include <maxscale/log.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 f8b8cb3bf..ac3d3a894 100644
--- a/server/modules/routing/binlogrouter/binlog_common.cc
+++ b/server/modules/routing/binlogrouter/binlog_common.cc
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <binlog_common.h>
 #include <blr_constants.h>
-#include <maxscale/log.h>
+#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 1f299be0d..ff6f41d1b 100644
--- a/server/modules/routing/binlogrouter/blr.cc
+++ b/server/modules/routing/binlogrouter/blr.cc
@@ -41,7 +41,7 @@
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.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 7b2311a1d..87dbd59df 100644
--- a/server/modules/routing/binlogrouter/blr_cache.cc
+++ b/server/modules/routing/binlogrouter/blr_cache.cc
@@ -35,7 +35,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
 
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 
 
 /**
diff --git a/server/modules/routing/binlogrouter/blr_file.cc b/server/modules/routing/binlogrouter/blr_file.cc
index 81b0a3a40..8f95d4f02 100644
--- a/server/modules/routing/binlogrouter/blr_file.cc
+++ b/server/modules/routing/binlogrouter/blr_file.cc
@@ -34,7 +34,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/encryption.h>
-#include <maxscale/log.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 b16755235..2b7a09188 100644
--- a/server/modules/routing/binlogrouter/blr_master.cc
+++ b/server/modules/routing/binlogrouter/blr_master.cc
@@ -45,7 +45,7 @@
 #include <maxscale/buffer.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.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 400fa6ae9..ce26949f3 100644
--- a/server/modules/routing/binlogrouter/blr_slave.cc
+++ b/server/modules/routing/binlogrouter/blr_slave.cc
@@ -39,7 +39,7 @@
 #include <maxscale/clock.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.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 2617068f0..a73be135b 100644
--- a/server/modules/routing/binlogrouter/maxbinlogcheck.cc
+++ b/server/modules/routing/binlogrouter/maxbinlogcheck.cc
@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log.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 68b56dcf6..37cea98cb 100644
--- a/server/modules/routing/binlogrouter/test/testbinlog.cc
+++ b/server/modules/routing/binlogrouter/test/testbinlog.cc
@@ -35,7 +35,7 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <time.h>
-#include <maxscale/log.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 e2b37edef..ac010af7c 100644
--- a/server/modules/routing/cli/cli.cc
+++ b/server/modules/routing/cli/cli.cc
@@ -34,7 +34,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
+#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 aedc36c6a..b8babda68 100644
--- a/server/modules/routing/debugcli/debugcli.cc
+++ b/server/modules/routing/debugcli/debugcli.cc
@@ -33,7 +33,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
+#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 b1150f970..3d784769f 100644
--- a/server/modules/routing/debugcli/debugcmd.cc
+++ b/server/modules/routing/debugcli/debugcmd.cc
@@ -43,7 +43,7 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/maxscale.h>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/router.hh>
diff --git a/server/modules/routing/hintrouter/hintrouter.cc b/server/modules/routing/hintrouter/hintrouter.cc
index 20be13525..9bcc5f250 100644
--- a/server/modules/routing/hintrouter/hintrouter.cc
+++ b/server/modules/routing/hintrouter/hintrouter.cc
@@ -18,7 +18,6 @@
 #include <vector>
 
 #include <maxbase/atomic.hh>
-#include <maxscale/log.h>
 #include "dcb.hh"
 
 static const MXS_ENUM_VALUE default_action_values[] =
diff --git a/server/modules/routing/hintrouter/hintrouterdefs.hh b/server/modules/routing/hintrouter/hintrouterdefs.hh
index ee728efa9..0a7da279a 100644
--- a/server/modules/routing/hintrouter/hintrouterdefs.hh
+++ b/server/modules/routing/hintrouter/hintrouterdefs.hh
@@ -15,7 +15,6 @@
 #include <maxscale/ccdefs.hh>
 
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
 
 #if defined (SS_DEBUG)
 #define DEBUG_HINTROUTER
diff --git a/server/modules/routing/maxinfo/maxinfo.cc b/server/modules/routing/maxinfo/maxinfo.cc
index b951bc066..03d311071 100644
--- a/server/modules/routing/maxinfo/maxinfo.cc
+++ b/server/modules/routing/maxinfo/maxinfo.cc
@@ -43,7 +43,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/maxscale.h>
-#include <maxscale/log.h>
 #include <maxscale/resultset.hh>
 #include <maxscale/version.h>
 #include <maxscale/resultset.hh>
diff --git a/server/modules/routing/maxinfo/maxinfo.h b/server/modules/routing/maxinfo/maxinfo.h
index c9f5ccfef..7df26ec56 100644
--- a/server/modules/routing/maxinfo/maxinfo.h
+++ b/server/modules/routing/maxinfo/maxinfo.h
@@ -28,7 +28,7 @@
 
 #define MXS_MODULE_NAME "maxinfo"
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
 #include <maxscale/resultset.hh>
diff --git a/server/modules/routing/maxinfo/maxinfo_error.cc b/server/modules/routing/maxinfo/maxinfo_error.cc
index 2df234069..765bd0658 100644
--- a/server/modules/routing/maxinfo/maxinfo_error.cc
+++ b/server/modules/routing/maxinfo/maxinfo_error.cc
@@ -37,7 +37,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/poll.hh>
-#include <maxscale/log.h>
 
 
 /**
diff --git a/server/modules/routing/maxinfo/maxinfo_exec.cc b/server/modules/routing/maxinfo/maxinfo_exec.cc
index 7c84500f5..8147c3a54 100644
--- a/server/modules/routing/maxinfo/maxinfo_exec.cc
+++ b/server/modules/routing/maxinfo/maxinfo_exec.cc
@@ -35,7 +35,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
diff --git a/server/modules/routing/maxinfo/maxinfo_parse.cc b/server/modules/routing/maxinfo/maxinfo_parse.cc
index 951d98c13..572bfefbe 100644
--- a/server/modules/routing/maxinfo/maxinfo_parse.cc
+++ b/server/modules/routing/maxinfo/maxinfo_parse.cc
@@ -39,7 +39,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/poll.hh>
-#include <maxscale/log.h>
 
 static MAXINFO_TREE* make_tree_node(MAXINFO_OPERATOR, char*, MAXINFO_TREE*, MAXINFO_TREE*);
 void                 maxinfo_free_tree(MAXINFO_TREE*);  // This function is needed by maxinfo.c
diff --git a/server/modules/routing/readconnroute/readconnroute.cc b/server/modules/routing/readconnroute/readconnroute.cc
index 07f9d36cb..b836d3e99 100644
--- a/server/modules/routing/readconnroute/readconnroute.cc
+++ b/server/modules/routing/readconnroute/readconnroute.cc
@@ -84,7 +84,7 @@
 #include <maxbase/atomic.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/utils.hh>
diff --git a/server/modules/routing/readwritesplit/readwritesplit.cc b/server/modules/routing/readwritesplit/readwritesplit.cc
index d09cfb95d..f682c3ed4 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.cc
+++ b/server/modules/routing/readwritesplit/readwritesplit.cc
@@ -25,7 +25,6 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.h>
diff --git a/server/modules/routing/readwritesplit/readwritesplit.hh b/server/modules/routing/readwritesplit/readwritesplit.hh
index d389e887f..e53abf2a8 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.hh
+++ b/server/modules/routing/readwritesplit/readwritesplit.hh
@@ -28,7 +28,6 @@
 #include <functional>
 
 #include <maxscale/dcb.hh>
-#include <maxscale/log.h>
 #include <maxscale/queryclassifier.hh>
 #include <maxscale/router.hh>
 #include <maxscale/service.hh>
diff --git a/server/modules/routing/readwritesplit/rwsplit_mysql.cc b/server/modules/routing/readwritesplit/rwsplit_mysql.cc
index 349a17c5e..915700c20 100644
--- a/server/modules/routing/readwritesplit/rwsplit_mysql.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_mysql.cc
@@ -20,7 +20,6 @@
 #include <stdint.h>
 
 #include <maxscale/router.hh>
-#include <maxscale/log.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/routing/schemarouter/schemarouter.hh b/server/modules/routing/schemarouter/schemarouter.hh
index 50b9c113b..2e3a2a003 100644
--- a/server/modules/routing/schemarouter/schemarouter.hh
+++ b/server/modules/routing/schemarouter/schemarouter.hh
@@ -18,7 +18,7 @@
 
 #define MXS_MODULE_NAME "schemarouter"
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 
 #include <limits>
 #include <list>
diff --git a/server/modules/routing/schemarouter/schemarouterinstance.cc b/server/modules/routing/schemarouter/schemarouterinstance.cc
index 4346caed3..384a75087 100644
--- a/server/modules/routing/schemarouter/schemarouterinstance.cc
+++ b/server/modules/routing/schemarouter/schemarouterinstance.cc
@@ -22,7 +22,6 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/poll.hh>