From cf0aeed5160b9b4805fc547c0bec809e70bc0e7e Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Thu, 16 Aug 2018 14:47:25 +0300
Subject: [PATCH] MXS-2014 Rename log_manager.h to log.h

There's nothing resembling a manager anymore.
---
 avro/maxavro.c                                                  | 2 +-
 avro/maxavro_file.c                                             | 2 +-
 avro/maxavro_record.c                                           | 2 +-
 avro/maxavro_schema.c                                           | 2 +-
 avro/maxavro_write.c                                            | 2 +-
 include/maxscale/ccdefs.hh                                      | 2 +-
 include/maxscale/customparser.hh                                | 2 +-
 include/maxscale/debug.h                                        | 2 +-
 include/maxscale/{log_manager.h => log.h}                       | 0
 include/maxscale/session.h                                      | 2 +-
 query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc           | 2 +-
 query_classifier/qc_sqlite/qc_sqlite.cc                         | 2 +-
 query_classifier/test/classify.c                                | 2 +-
 query_classifier/test/compare.cc                                | 2 +-
 query_classifier/test/qc_cache.cc                               | 2 +-
 query_classifier/test/version_sensitivity.cc                    | 2 +-
 server/core/CMakeLists.txt                                      | 2 +-
 server/core/adminusers.cc                                       | 2 +-
 server/core/alloc.cc                                            | 2 +-
 server/core/buffer.cc                                           | 2 +-
 server/core/config.cc                                           | 2 +-
 server/core/dcb.cc                                              | 2 +-
 server/core/externcmd.cc                                        | 2 +-
 server/core/filter.cc                                           | 2 +-
 server/core/gateway.cc                                          | 2 +-
 server/core/listener.cc                                         | 2 +-
 server/core/load_utils.cc                                       | 2 +-
 server/core/{log_manager.cc => log.cc}                          | 2 +-
 server/core/maxkeys.c                                           | 2 +-
 server/core/maxpasswd.c                                         | 2 +-
 server/core/maxscale_pcre2.cc                                   | 2 +-
 server/core/messagequeue.cc                                     | 2 +-
 server/core/monitor.cc                                          | 2 +-
 server/core/mysql_binlog.cc                                     | 2 +-
 server/core/mysql_utils.cc                                      | 2 +-
 server/core/query_classifier.cc                                 | 2 +-
 server/core/secrets.cc                                          | 2 +-
 server/core/server.cc                                           | 2 +-
 server/core/service.cc                                          | 2 +-
 server/core/session.cc                                          | 2 +-
 server/core/ssl.cc                                              | 2 +-
 server/core/test/test_config.cc                                 | 2 +-
 server/core/test/test_event.cc                                  | 2 +-
 server/core/test/test_log.cc                                    | 2 +-
 server/core/test/test_logorder.cc                               | 2 +-
 server/core/test/test_logthrottling.cc                          | 2 +-
 server/core/test/test_server.cc                                 | 2 +-
 server/core/test/test_users.cc                                  | 2 +-
 server/core/test/test_utils.h                                   | 2 +-
 server/core/users.cc                                            | 2 +-
 server/core/utils.cc                                            | 2 +-
 server/core/worker.cc                                           | 2 +-
 server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc   | 2 +-
 .../GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc             | 2 +-
 server/modules/authenticator/GSSAPI/gssapi_auth_common.cc       | 2 +-
 server/modules/authenticator/MySQLAuth/dbusers.cc               | 2 +-
 server/modules/authenticator/PAM/PAMAuth/pam_instance.cc        | 2 +-
 .../authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc        | 2 +-
 server/modules/filter/cache/storagefactory.cc                   | 2 +-
 server/modules/filter/cache/test/testkeygeneration.cc           | 2 +-
 server/modules/filter/cache/test/testrules.cc                   | 2 +-
 server/modules/filter/cache/test/teststorage.cc                 | 2 +-
 server/modules/filter/ccrfilter/ccrfilter.cc                    | 2 +-
 server/modules/filter/dbfwfilter/dbfwfilter.cc                  | 2 +-
 server/modules/filter/dbfwfilter/ruleparser.y                   | 2 +-
 server/modules/filter/dbfwfilter/rules.cc                       | 2 +-
 server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc        | 2 +-
 server/modules/filter/dbfwfilter/token.l                        | 2 +-
 server/modules/filter/hintfilter/hintparser.cc                  | 2 +-
 server/modules/filter/insertstream/insertstream.cc              | 2 +-
 server/modules/filter/luafilter/luafilter.cc                    | 2 +-
 server/modules/filter/maxrows/maxrows.cc                        | 2 +-
 server/modules/filter/mqfilter/mqfilter.cc                      | 2 +-
 server/modules/filter/namedserverfilter/namedserverfilter.cc    | 2 +-
 server/modules/filter/qlafilter/qlafilter.cc                    | 2 +-
 server/modules/filter/regexfilter/regexfilter.cc                | 2 +-
 server/modules/filter/tee/tee.cc                                | 2 +-
 server/modules/filter/topfilter/topfilter.cc                    | 2 +-
 server/modules/filter/tpmfilter/tpmfilter.cc                    | 2 +-
 server/modules/monitor/galeramon/galeramon.cc                   | 2 +-
 server/modules/monitor/mmmon/mmmon.cc                           | 2 +-
 server/modules/protocol/CDC/cdc.cc                              | 2 +-
 server/modules/protocol/HTTPD/httpd.cc                          | 2 +-
 server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc   | 2 +-
 server/modules/protocol/MySQL/mariadbclient/mysql_client.cc     | 2 +-
 server/modules/protocol/MySQL/mysql_common.cc                   | 2 +-
 server/modules/protocol/maxscaled/maxscaled.cc                  | 2 +-
 server/modules/protocol/telnetd/telnetd.cc                      | 2 +-
 server/modules/routing/avrorouter/avro.cc                       | 2 +-
 server/modules/routing/avrorouter/avro_client.cc                | 2 +-
 server/modules/routing/avrorouter/avro_converter.cc             | 2 +-
 server/modules/routing/avrorouter/avro_file.cc                  | 2 +-
 server/modules/routing/avrorouter/avro_main.cc                  | 2 +-
 server/modules/routing/avrorouter/avro_schema.cc                | 2 +-
 server/modules/routing/binlogrouter/binlog_common.cc            | 2 +-
 server/modules/routing/binlogrouter/blr.cc                      | 2 +-
 server/modules/routing/binlogrouter/blr_cache.cc                | 2 +-
 server/modules/routing/binlogrouter/blr_file.cc                 | 2 +-
 server/modules/routing/binlogrouter/blr_master.cc               | 2 +-
 server/modules/routing/binlogrouter/blr_slave.cc                | 2 +-
 server/modules/routing/binlogrouter/maxbinlogcheck.cc           | 2 +-
 server/modules/routing/binlogrouter/test/testbinlog.cc          | 2 +-
 server/modules/routing/cli/cli.cc                               | 2 +-
 server/modules/routing/debugcli/debugcli.cc                     | 2 +-
 server/modules/routing/debugcli/debugcmd.cc                     | 2 +-
 server/modules/routing/hintrouter/hintrouter.cc                 | 2 +-
 server/modules/routing/hintrouter/hintrouterdefs.hh             | 2 +-
 server/modules/routing/maxinfo/maxinfo.cc                       | 2 +-
 server/modules/routing/maxinfo/maxinfo_error.cc                 | 2 +-
 server/modules/routing/maxinfo/maxinfo_exec.cc                  | 2 +-
 server/modules/routing/maxinfo/maxinfo_parse.cc                 | 2 +-
 server/modules/routing/readconnroute/readconnroute.cc           | 2 +-
 server/modules/routing/readwritesplit/readwritesplit.cc         | 2 +-
 server/modules/routing/readwritesplit/readwritesplit.hh         | 2 +-
 server/modules/routing/readwritesplit/rwbackend.cc              | 2 +-
 server/modules/routing/readwritesplit/rwsplit_mysql.cc          | 2 +-
 server/modules/routing/schemarouter/schemarouterinstance.cc     | 2 +-
 117 files changed, 116 insertions(+), 116 deletions(-)
 rename include/maxscale/{log_manager.h => log.h} (100%)
 rename server/core/{log_manager.cc => log.cc} (99%)

diff --git a/avro/maxavro.c b/avro/maxavro.c
index d71961137..e5c5d426b 100644
--- a/avro/maxavro.c
+++ b/avro/maxavro.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include "maxavro_internal.h"
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <errno.h>
 
 /** Maximum byte size of an integer value */
diff --git a/avro/maxavro_file.c b/avro/maxavro_file.c
index 54372b347..1e36aaf87 100644
--- a/avro/maxavro_file.c
+++ b/avro/maxavro_file.c
@@ -14,7 +14,7 @@
 #include "maxavro_internal.h"
 #include <errno.h>
 #include <string.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <zlib.h>
 
 static bool maxavro_read_sync(FILE *file, uint8_t* sync)
diff --git a/avro/maxavro_record.c b/avro/maxavro_record.c
index 685bdd486..593c7afc5 100644
--- a/avro/maxavro_record.c
+++ b/avro/maxavro_record.c
@@ -15,7 +15,7 @@
 #include "maxavro_internal.h"
 #include <string.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <errno.h>
 
 bool maxavro_read_datablock_start(MAXAVRO_FILE *file);
diff --git a/avro/maxavro_schema.c b/avro/maxavro_schema.c
index 665789557..bc6ac50f6 100644
--- a/avro/maxavro_schema.c
+++ b/avro/maxavro_schema.c
@@ -15,7 +15,7 @@
 #include <jansson.h>
 #include <string.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 static const MAXAVRO_SCHEMA_FIELD types[MAXAVRO_TYPE_MAX] =
 {
diff --git a/avro/maxavro_write.c b/avro/maxavro_write.c
index 5b63771a2..39635ad14 100644
--- a/avro/maxavro_write.c
+++ b/avro/maxavro_write.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include "maxavro_internal.h"
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <errno.h>
 
 /**
diff --git a/include/maxscale/ccdefs.hh b/include/maxscale/ccdefs.hh
index 7d529059f..4834d82dd 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_manager.h>
+#include <maxscale/log.h>
 
 /**
  * All classes of MaxScale are defined in the namespace @c maxscale.
diff --git a/include/maxscale/customparser.hh b/include/maxscale/customparser.hh
index f8a7a4775..76824ccf2 100644
--- a/include/maxscale/customparser.hh
+++ b/include/maxscale/customparser.hh
@@ -13,7 +13,7 @@
  */
 
 #include <maxscale/ccdefs.hh>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modutil.h>
 #include <ctype.h>
 
diff --git a/include/maxscale/debug.h b/include/maxscale/debug.h
index 3ec2a84e3..a5d975c93 100644
--- a/include/maxscale/debug.h
+++ b/include/maxscale/debug.h
@@ -16,7 +16,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 MXS_BEGIN_DECLS
 
diff --git a/include/maxscale/log_manager.h b/include/maxscale/log.h
similarity index 100%
rename from include/maxscale/log_manager.h
rename to include/maxscale/log.h
diff --git a/include/maxscale/session.h b/include/maxscale/session.h
index b33d0ebbe..f2be02949 100644
--- a/include/maxscale/session.h
+++ b/include/maxscale/session.h
@@ -24,7 +24,7 @@
 #include <maxbase/jansson.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/spinlock.h>
 
 MXS_BEGIN_DECLS
diff --git a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
index 1fdcf8a6a..f7c7821bb 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 <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/platform.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.h>
diff --git a/query_classifier/qc_sqlite/qc_sqlite.cc b/query_classifier/qc_sqlite/qc_sqlite.cc
index 0b6a568ef..2241b3d91 100644
--- a/query_classifier/qc_sqlite/qc_sqlite.cc
+++ b/query_classifier/qc_sqlite/qc_sqlite.cc
@@ -29,7 +29,7 @@
 #include <mutex>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/platform.h>
diff --git a/query_classifier/test/classify.c b/query_classifier/test/classify.c
index 1dba83d76..3c0a2ac80 100644
--- a/query_classifier/test/classify.c
+++ b/query_classifier/test/classify.c
@@ -20,7 +20,7 @@
 #include <mysql.h>
 #include <unistd.h>
 #include <maxscale/paths.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 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 e8ba9f40a..0af525970 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_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #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 d67954d23..6bf5da136 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_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.h>
diff --git a/query_classifier/test/version_sensitivity.cc b/query_classifier/test/version_sensitivity.cc
index f64ce739e..bc820927f 100644
--- a/query_classifier/test/version_sensitivity.cc
+++ b/query_classifier/test/version_sensitivity.cc
@@ -12,7 +12,7 @@
  */
 
 #include <iostream>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/server.h>
diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
index 54793f3a0..97cbbc27c 100644
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@@ -20,7 +20,7 @@ add_library(maxscale-common SHARED
   json_api.cc
   listener.cc
   load_utils.cc
-  log_manager.cc
+  log.cc
   mariadb.cc
   maxscale_pcre2.cc
   misc.cc
diff --git a/server/core/adminusers.cc b/server/core/adminusers.cc
index dbafa4f6d..3873486d9 100644
--- a/server/core/adminusers.cc
+++ b/server/core/adminusers.cc
@@ -23,7 +23,7 @@
 
 #include <maxscale/users.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/json_api.h>
 
diff --git a/server/core/alloc.cc b/server/core/alloc.cc
index a8c1c647d..86dbbd424 100644
--- a/server/core/alloc.cc
+++ b/server/core/alloc.cc
@@ -13,7 +13,7 @@
 
 #include <maxscale/alloc.h>
 #include <stdlib.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 /**
  * @brief Allocates memory; behaves exactly like `malloc`.
diff --git a/server/core/buffer.cc b/server/core/buffer.cc
index 0fb39c58a..e2deb4fd7 100644
--- a/server/core/buffer.cc
+++ b/server/core/buffer.cc
@@ -22,7 +22,7 @@
 #include <maxscale/debug.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/hint.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/utils.h>
 
 #if defined(BUFFER_TRACE)
diff --git a/server/core/config.cc b/server/core/config.cc
index 051740a1a..9216f1340 100644
--- a/server/core/config.cc
+++ b/server/core/config.cc
@@ -47,7 +47,7 @@
 #include <maxscale/http.hh>
 #include <maxscale/json_api.h>
 #include <maxscale/limits.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/paths.h>
 #include <maxscale/pcre2.h>
diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index d690f5888..f1a6765ff 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.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/platform.h>
 #include <maxscale/poll.h>
 #include <maxscale/router.h>
diff --git a/server/core/externcmd.cc b/server/core/externcmd.cc
index 890c465bc..6a183eff3 100644
--- a/server/core/externcmd.cc
+++ b/server/core/externcmd.cc
@@ -23,7 +23,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/pcre2.h>
 
 /**
diff --git a/server/core/filter.cc b/server/core/filter.cc
index 72e08fc95..e1142b1f6 100644
--- a/server/core/filter.cc
+++ b/server/core/filter.cc
@@ -31,7 +31,7 @@
 #include <vector>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/session.h>
 #include <maxscale/service.h>
diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index 044ab5cdc..e6017a406 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -44,7 +44,7 @@
 #include <maxscale/adminusers.h>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/messagequeue.hh>
 #include <maxscale/mysql_utils.h>
diff --git a/server/core/listener.cc b/server/core/listener.cc
index e43df04bb..0ae3da47e 100644
--- a/server/core/listener.cc
+++ b/server/core/listener.cc
@@ -38,7 +38,7 @@
 #include <maxscale/ssl.h>
 #include <maxscale/platform.h>
 #include <maxscale/protocol.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/alloc.h>
 #include <maxscale/users.h>
 #include <maxscale/service.h>
diff --git a/server/core/load_utils.cc b/server/core/load_utils.cc
index 4268c9f7d..e7e9418de 100644
--- a/server/core/load_utils.cc
+++ b/server/core/load_utils.cc
@@ -25,7 +25,7 @@
 #include <string>
 
 #include <maxscale/modinfo.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/version.h>
 #include <maxscale/paths.h>
 #include <maxscale/alloc.h>
diff --git a/server/core/log_manager.cc b/server/core/log.cc
similarity index 99%
rename from server/core/log_manager.cc
rename to server/core/log.cc
index b50d7451b..88e7dd87e 100644
--- a/server/core/log_manager.cc
+++ b/server/core/log.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 #include <sys/time.h>
 #include <syslog.h>
diff --git a/server/core/maxkeys.c b/server/core/maxkeys.c
index 8eeaff5aa..dbd2b88fd 100644
--- a/server/core/maxkeys.c
+++ b/server/core/maxkeys.c
@@ -27,7 +27,7 @@
 #include <getopt.h>
 #include <stdio.h>
 
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/random.h>
 
diff --git a/server/core/maxpasswd.c b/server/core/maxpasswd.c
index 87174d4d2..ebc146787 100644
--- a/server/core/maxpasswd.c
+++ b/server/core/maxpasswd.c
@@ -31,7 +31,7 @@
 #include <getopt.h>
 
 #include <maxscale/paths.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/random.h>
 #include <maxscale/alloc.h>
 
diff --git a/server/core/maxscale_pcre2.cc b/server/core/maxscale_pcre2.cc
index f3a76047e..0670e9367 100644
--- a/server/core/maxscale_pcre2.cc
+++ b/server/core/maxscale_pcre2.cc
@@ -27,7 +27,7 @@
 #include <maxscale/pcre2.h>
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 /**
  * Utility wrapper for PCRE2 library function call pcre2_substitute.
diff --git a/server/core/messagequeue.cc b/server/core/messagequeue.cc
index 71f35cf86..7522920b2 100644
--- a/server/core/messagequeue.cc
+++ b/server/core/messagequeue.cc
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <fstream>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include "internal/routingworker.hh"
 
 namespace
diff --git a/server/core/monitor.cc b/server/core/monitor.cc
index 78a1f4a7d..a39bafdf1 100644
--- a/server/core/monitor.cc
+++ b/server/core/monitor.cc
@@ -30,7 +30,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/clock.h>
 #include <maxscale/json_api.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/mariadb.hh>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/paths.h>
diff --git a/server/core/mysql_binlog.cc b/server/core/mysql_binlog.cc
index 583fa05e1..135a1e3a7 100644
--- a/server/core/mysql_binlog.cc
+++ b/server/core/mysql_binlog.cc
@@ -18,7 +18,7 @@
 #include <maxscale/mysql_binlog.h>
 #include <maxscale/mysql_utils.h>
 #include <stdlib.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <string.h>
 #include <maxscale/debug.h>
 #include <maxscale/users.h>
diff --git a/server/core/mysql_utils.cc b/server/core/mysql_utils.cc
index 470e6da25..5892c709b 100644
--- a/server/core/mysql_utils.cc
+++ b/server/core/mysql_utils.cc
@@ -30,7 +30,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 namespace
 {
diff --git a/server/core/query_classifier.cc b/server/core/query_classifier.cc
index d7bac5384..0bd44c58a 100644
--- a/server/core/query_classifier.cc
+++ b/server/core/query_classifier.cc
@@ -21,7 +21,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/config.h>
 #include <maxscale/json_api.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/pcre2.h>
 #include <maxscale/platform.h>
diff --git a/server/core/secrets.cc b/server/core/secrets.cc
index 558f49dcc..f13c3c19a 100644
--- a/server/core/secrets.cc
+++ b/server/core/secrets.cc
@@ -19,7 +19,7 @@
 #include <time.h>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/random.h>
diff --git a/server/core/server.cc b/server/core/server.cc
index 57646b396..c2c3f2405 100644
--- a/server/core/server.cc
+++ b/server/core/server.cc
@@ -35,7 +35,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/poll.h>
-#include <maxscale/log_manager.h>
+#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 166697ca0..0e0cf94b3 100644
--- a/server/core/service.cc
+++ b/server/core/service.cc
@@ -40,7 +40,7 @@
 #include <maxscale/paths.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/listener.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/poll.h>
 #include <maxscale/protocol.h>
 #include <maxscale/resultset.hh>
diff --git a/server/core/session.cc b/server/core/session.cc
index 97c510d35..e1769b90a 100644
--- a/server/core/session.cc
+++ b/server/core/session.cc
@@ -31,7 +31,7 @@
 #include <maxscale/clock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/poll.h>
 #include <maxscale/router.h>
 #include <maxscale/service.h>
diff --git a/server/core/ssl.cc b/server/core/ssl.cc
index 4a21689ef..e532e32c4 100644
--- a/server/core/ssl.cc
+++ b/server/core/ssl.cc
@@ -31,7 +31,7 @@
 #include <stdbool.h>
 #include <sys/ioctl.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/poll.h>
 #include <maxscale/service.h>
 
diff --git a/server/core/test/test_config.cc b/server/core/test/test_config.cc
index 35afdfa8a..5daddc9ce 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_manager.h>
+#include <maxscale/log.h>
 #include "../config.cc"
 
 using namespace std;
diff --git a/server/core/test/test_event.cc b/server/core/test/test_event.cc
index 2c55c0334..ee717a1c9 100644
--- a/server/core/test/test_event.cc
+++ b/server/core/test/test_event.cc
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <sstream>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 using namespace maxscale;
 using namespace std;
diff --git a/server/core/test/test_log.cc b/server/core/test/test_log.cc
index f7a415921..bf6877eef 100644
--- a/server/core/test/test_log.cc
+++ b/server/core/test/test_log.cc
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <time.h>
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/debug.h>
 
 static void skygw_log_enable(int priority)
diff --git a/server/core/test/test_logorder.cc b/server/core/test/test_logorder.cc
index 677a180fb..edb9374d5 100644
--- a/server/core/test/test_logorder.cc
+++ b/server/core/test/test_logorder.cc
@@ -18,7 +18,7 @@
 #include <time.h>
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 static void skygw_log_enable(int priority)
 {
diff --git a/server/core/test/test_logthrottling.cc b/server/core/test/test_logthrottling.cc
index c4086c797..20cd9745f 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_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/random.h>
 
 using std::cerr;
diff --git a/server/core/test/test_server.cc b/server/core/test/test_server.cc
index 1aca5b0e1..e5b378225 100644
--- a/server/core/test/test_server.cc
+++ b/server/core/test/test_server.cc
@@ -35,7 +35,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/server.h>
-#include <maxscale/log_manager.h>
+#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 a228ed1af..aa6736c6d 100644
--- a/server/core/test/test_users.cc
+++ b/server/core/test/test_users.cc
@@ -34,7 +34,7 @@
 #include <string.h>
 
 #include <maxscale/users.h>
-#include <maxscale/log_manager.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 0873daac6..542448ebc 100644
--- a/server/core/test/test_utils.h
+++ b/server/core/test/test_utils.h
@@ -18,7 +18,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/maxscale_test.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/config.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/paths.h>
diff --git a/server/core/users.cc b/server/core/users.cc
index ac269cb73..b79f97ff4 100644
--- a/server/core/users.cc
+++ b/server/core/users.cc
@@ -21,7 +21,7 @@
 #include <maxscale/users.h>
 #include <maxscale/authenticator.h>
 #include <maxscale/spinlock.hh>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/jansson.hh>
 
 namespace
diff --git a/server/core/utils.cc b/server/core/utils.cc
index abe456428..5f004cef2 100644
--- a/server/core/utils.cc
+++ b/server/core/utils.cc
@@ -44,7 +44,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/limits.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/poll.h>
diff --git a/server/core/worker.cc b/server/core/worker.cc
index 00056c36a..9cfb1a42b 100644
--- a/server/core/worker.cc
+++ b/server/core/worker.cc
@@ -23,7 +23,7 @@
 #include <sys/timerfd.h>
 
 #include <maxbase/atomic.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/semaphore.hh>
 
 #define WORKER_ABSENT_ID -1
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
index 63f4e222e..39102ee0e 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
+++ b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
@@ -18,7 +18,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/protocol/mysql.h>
 #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 a368a904d..8222d05d2 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
+++ b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
@@ -16,7 +16,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/server.h>
 
diff --git a/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc b/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc
index 4fe750bd1..445146afc 100644
--- a/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc
+++ b/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc
@@ -13,7 +13,7 @@
 
 #include "gssapi_auth.h"
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.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 a3519840c..18d75a575 100644
--- a/server/modules/authenticator/MySQLAuth/dbusers.cc
+++ b/server/modules/authenticator/MySQLAuth/dbusers.cc
@@ -23,7 +23,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc b/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc
index fc543deea..ae5e6024d 100644
--- a/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc
+++ b/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc
@@ -16,7 +16,7 @@
 #include <string>
 #include <string.h>
 #include <maxscale/jansson.hh>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/secrets.h>
 #include <maxscale/mysql_utils.h>
 
diff --git a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc
index a6548a250..8e784a2a1 100644
--- a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc
+++ b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc
@@ -14,7 +14,7 @@
 #include "pam_backend_auth.hh"
 
 #include <maxscale/authenticator.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/server.h>
 #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 8dbab2dd9..2cea39491 100644
--- a/server/modules/filter/cache/storagefactory.cc
+++ b/server/modules/filter/cache/storagefactory.cc
@@ -18,7 +18,7 @@
 #include <new>
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include "cachefilter.h"
 #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 e21540434..96ab87cdc 100644
--- a/server/modules/filter/cache/test/testkeygeneration.cc
+++ b/server/modules/filter/cache/test/testkeygeneration.cc
@@ -18,7 +18,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
-#include <maxscale/log_manager.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 9a0dec3ba..bce6ebae9 100644
--- a/server/modules/filter/cache/test/testrules.cc
+++ b/server/modules/filter/cache/test/testrules.cc
@@ -16,7 +16,7 @@
 #include <iostream>
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
diff --git a/server/modules/filter/cache/test/teststorage.cc b/server/modules/filter/cache/test/teststorage.cc
index 8312f3902..b7ad56472 100644
--- a/server/modules/filter/cache/test/teststorage.cc
+++ b/server/modules/filter/cache/test/teststorage.cc
@@ -17,7 +17,7 @@
 #include <iostream>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.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 2faee8370..255ec9f3e 100644
--- a/server/modules/filter/ccrfilter/ccrfilter.cc
+++ b/server/modules/filter/ccrfilter/ccrfilter.cc
@@ -20,7 +20,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/filter.h>
 #include <maxscale/hint.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/pcre2.h>
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.cc b/server/modules/filter/dbfwfilter/dbfwfilter.cc
index e0a585606..edc358b91 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc
@@ -72,7 +72,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/modutil.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/platform.h>
 #include <maxscale/pcre2.h>
diff --git a/server/modules/filter/dbfwfilter/ruleparser.y b/server/modules/filter/dbfwfilter/ruleparser.y
index 6147816aa..fc29b1f74 100644
--- a/server/modules/filter/dbfwfilter/ruleparser.y
+++ b/server/modules/filter/dbfwfilter/ruleparser.y
@@ -20,7 +20,7 @@
 %{
 #include <lex.yy.h>
 #include "dbfwfilter.h"
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 %}
 
 /** We need a reentrant scanner so no global variables are used */
diff --git a/server/modules/filter/dbfwfilter/rules.cc b/server/modules/filter/dbfwfilter/rules.cc
index 02d7d33cc..be56c2070 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_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modutil.h>
 #include <maxscale/protocol/mysql.h>
 
diff --git a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
index 994b99596..cf51e1bd1 100644
--- a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
@@ -14,7 +14,7 @@
 #include <cstdlib>
 #include <memory>
 #include <iostream>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/filtermodule.hh>
 #include <maxscale/queryclassifiermodule.hh>
 #include <maxscale/mock/backend.hh>
diff --git a/server/modules/filter/dbfwfilter/token.l b/server/modules/filter/dbfwfilter/token.l
index df44fb57c..81558fcb2 100644
--- a/server/modules/filter/dbfwfilter/token.l
+++ b/server/modules/filter/dbfwfilter/token.l
@@ -13,7 +13,7 @@
 
 %{
 #include <ruleparser.yy.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 %}
 
 %option reentrant noyywrap bison-bridge prefix="dbfw_yy"
diff --git a/server/modules/filter/hintfilter/hintparser.cc b/server/modules/filter/hintfilter/hintparser.cc
index 16bd83379..29a04391b 100644
--- a/server/modules/filter/hintfilter/hintparser.cc
+++ b/server/modules/filter/hintfilter/hintparser.cc
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/filter.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
diff --git a/server/modules/filter/insertstream/insertstream.cc b/server/modules/filter/insertstream/insertstream.cc
index eecdf5e5d..35e18b801 100644
--- a/server/modules/filter/insertstream/insertstream.cc
+++ b/server/modules/filter/insertstream/insertstream.cc
@@ -19,7 +19,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
 #include <maxscale/filter.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/poll.h>
diff --git a/server/modules/filter/luafilter/luafilter.cc b/server/modules/filter/luafilter/luafilter.cc
index e42384c81..8de0724c8 100644
--- a/server/modules/filter/luafilter/luafilter.cc
+++ b/server/modules/filter/luafilter/luafilter.cc
@@ -46,7 +46,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
 #include <maxscale/filter.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modutil.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/session.h>
diff --git a/server/modules/filter/maxrows/maxrows.cc b/server/modules/filter/maxrows/maxrows.cc
index fe613157b..eaede67cd 100644
--- a/server/modules/filter/maxrows/maxrows.cc
+++ b/server/modules/filter/maxrows/maxrows.cc
@@ -26,7 +26,7 @@
 #include <maxscale/buffer.h>
 #include <maxscale/debug.h>
 #include <maxscale/filter.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/mysql_utils.h>
diff --git a/server/modules/filter/mqfilter/mqfilter.cc b/server/modules/filter/mqfilter/mqfilter.cc
index 8eded457b..8ab7f5b04 100644
--- a/server/modules/filter/mqfilter/mqfilter.cc
+++ b/server/modules/filter/mqfilter/mqfilter.cc
@@ -73,7 +73,7 @@
 #include <amqp_tcp_socket.h>
 #include <amqp_ssl_socket.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/session.h>
diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.cc b/server/modules/filter/namedserverfilter/namedserverfilter.cc
index 0586b46e4..ff7a0e019 100644
--- a/server/modules/filter/namedserverfilter/namedserverfilter.cc
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.cc
@@ -39,7 +39,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/hint.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/server.h>
diff --git a/server/modules/filter/qlafilter/qlafilter.cc b/server/modules/filter/qlafilter/qlafilter.cc
index e91e96d7b..88e4d533e 100644
--- a/server/modules/filter/qlafilter/qlafilter.cc
+++ b/server/modules/filter/qlafilter/qlafilter.cc
@@ -40,7 +40,7 @@
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/filter.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/pcre2.h>
diff --git a/server/modules/filter/regexfilter/regexfilter.cc b/server/modules/filter/regexfilter/regexfilter.cc
index c336991d4..0e9454252 100644
--- a/server/modules/filter/regexfilter/regexfilter.cc
+++ b/server/modules/filter/regexfilter/regexfilter.cc
@@ -20,7 +20,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/config.h>
 #include <maxscale/filter.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/pcre2.h>
diff --git a/server/modules/filter/tee/tee.cc b/server/modules/filter/tee/tee.cc
index 4d2e1c5b0..155965d0e 100644
--- a/server/modules/filter/tee/tee.cc
+++ b/server/modules/filter/tee/tee.cc
@@ -21,7 +21,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modulecmd.h>
 
 #include "tee.hh"
diff --git a/server/modules/filter/topfilter/topfilter.cc b/server/modules/filter/topfilter/topfilter.cc
index 246be4964..9f6ddaa23 100644
--- a/server/modules/filter/topfilter/topfilter.cc
+++ b/server/modules/filter/topfilter/topfilter.cc
@@ -39,7 +39,7 @@
 #include <maxscale/filter.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <maxscale/log_manager.h>
+#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 e5980d269..2cfc313a0 100644
--- a/server/modules/filter/tpmfilter/tpmfilter.cc
+++ b/server/modules/filter/tpmfilter/tpmfilter.cc
@@ -59,7 +59,7 @@
 #include <maxscale/filter.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/server.h>
 #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 d0600f80b..412a59432 100644
--- a/server/modules/monitor/galeramon/galeramon.cc
+++ b/server/modules/monitor/galeramon/galeramon.cc
@@ -26,7 +26,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/secrets.h>
diff --git a/server/modules/monitor/mmmon/mmmon.cc b/server/modules/monitor/mmmon/mmmon.cc
index 7efe090f4..cedb28cec 100644
--- a/server/modules/monitor/mmmon/mmmon.cc
+++ b/server/modules/monitor/mmmon/mmmon.cc
@@ -27,7 +27,7 @@
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/secrets.h>
diff --git a/server/modules/protocol/CDC/cdc.cc b/server/modules/protocol/CDC/cdc.cc
index 59a6807a7..00dd0ca03 100644
--- a/server/modules/protocol/CDC/cdc.cc
+++ b/server/modules/protocol/CDC/cdc.cc
@@ -35,7 +35,7 @@
 #include <cdc.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/poll.h>
diff --git a/server/modules/protocol/HTTPD/httpd.cc b/server/modules/protocol/HTTPD/httpd.cc
index f1367ac7f..1c3019083 100644
--- a/server/modules/protocol/HTTPD/httpd.cc
+++ b/server/modules/protocol/HTTPD/httpd.cc
@@ -39,7 +39,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/protocol.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/log_manager.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 43acb2641..7a9d191b9 100644
--- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
+++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
@@ -15,7 +15,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/limits.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/poll.h>
diff --git a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
index 432b91d01..59ee07c11 100644
--- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
@@ -25,7 +25,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/poll.h>
diff --git a/server/modules/protocol/MySQL/mysql_common.cc b/server/modules/protocol/MySQL/mysql_common.cc
index 58772dca6..c6718aaa8 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_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modutil.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/protocol/maxscaled/maxscaled.cc b/server/modules/protocol/maxscaled/maxscaled.cc
index a95e1fccb..2d3134c4f 100644
--- a/server/modules/protocol/maxscaled/maxscaled.cc
+++ b/server/modules/protocol/maxscaled/maxscaled.cc
@@ -34,7 +34,7 @@
 #include <maxscale/poll.h>
 #include <maxbase/atomic.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/log_manager.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 a067f0218..33c0248ea 100644
--- a/server/modules/protocol/telnetd/telnetd.cc
+++ b/server/modules/protocol/telnetd/telnetd.cc
@@ -33,7 +33,7 @@
 #include <maxbase/atomic.h>
 #include <telnetd.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/log_manager.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 e042eac88..0d1331f09 100644
--- a/server/modules/routing/avrorouter/avro.cc
+++ b/server/modules/routing/avrorouter/avro.cc
@@ -31,7 +31,7 @@
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/routing/avrorouter/avro_client.cc b/server/modules/routing/avrorouter/avro_client.cc
index 766eef946..a4f78d0af 100644
--- a/server/modules/routing/avrorouter/avro_client.cc
+++ b/server/modules/routing/avrorouter/avro_client.cc
@@ -31,7 +31,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #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 bd053674c..333947cd7 100644
--- a/server/modules/routing/avrorouter/avro_converter.cc
+++ b/server/modules/routing/avrorouter/avro_converter.cc
@@ -17,7 +17,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 /**
  * @brief Allocate an Avro table
diff --git a/server/modules/routing/avrorouter/avro_file.cc b/server/modules/routing/avrorouter/avro_file.cc
index 54555c691..bc7cea00e 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_manager.h>
+#include <maxscale/log.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 9cb1ff27e..d8db74709 100644
--- a/server/modules/routing/avrorouter/avro_main.cc
+++ b/server/modules/routing/avrorouter/avro_main.cc
@@ -26,7 +26,7 @@
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/routing/avrorouter/avro_schema.cc b/server/modules/routing/avrorouter/avro_schema.cc
index c97e96748..cc5633855 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_manager.h>
+#include <maxscale/log.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <maxscale/debug.h>
diff --git a/server/modules/routing/binlogrouter/binlog_common.cc b/server/modules/routing/binlogrouter/binlog_common.cc
index 93b8f0dd7..27c4aaa5a 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_manager.h>
+#include <maxscale/log.h>
 
 /**
  * @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 e61697aea..afc8bc634 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.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/router.h>
 #include <maxscale/secrets.h>
diff --git a/server/modules/routing/binlogrouter/blr_cache.cc b/server/modules/routing/binlogrouter/blr_cache.cc
index cebe70aff..40aa1e659 100644
--- a/server/modules/routing/binlogrouter/blr_cache.cc
+++ b/server/modules/routing/binlogrouter/blr_cache.cc
@@ -37,7 +37,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 
 /**
diff --git a/server/modules/routing/binlogrouter/blr_file.cc b/server/modules/routing/binlogrouter/blr_file.cc
index 44a76312e..5b31aaf70 100644
--- a/server/modules/routing/binlogrouter/blr_file.cc
+++ b/server/modules/routing/binlogrouter/blr_file.cc
@@ -32,7 +32,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.h>
 #include <maxscale/encryption.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/router.h>
 #include <maxscale/secrets.h>
diff --git a/server/modules/routing/binlogrouter/blr_master.cc b/server/modules/routing/binlogrouter/blr_master.cc
index 80f076f57..606df64b8 100644
--- a/server/modules/routing/binlogrouter/blr_master.cc
+++ b/server/modules/routing/binlogrouter/blr_master.cc
@@ -43,7 +43,7 @@
 #include <maxscale/buffer.h>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/router.h>
 #include <maxscale/routingworker.h>
diff --git a/server/modules/routing/binlogrouter/blr_slave.cc b/server/modules/routing/binlogrouter/blr_slave.cc
index e456c47c9..f1effb0b9 100644
--- a/server/modules/routing/binlogrouter/blr_slave.cc
+++ b/server/modules/routing/binlogrouter/blr_slave.cc
@@ -38,7 +38,7 @@
 #include <maxscale/clock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/poll.h>
 #include <maxscale/router.h>
diff --git a/server/modules/routing/binlogrouter/maxbinlogcheck.cc b/server/modules/routing/binlogrouter/maxbinlogcheck.cc
index 3e6a8d0b5..d13689da5 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_manager.h>
+#include <maxscale/log.h>
 
 
 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 27ea8213d..fc4fa303a 100644
--- a/server/modules/routing/binlogrouter/test/testbinlog.cc
+++ b/server/modules/routing/binlogrouter/test/testbinlog.cc
@@ -37,7 +37,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/housekeeper.h>
 #include <time.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #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 ce74d67eb..84712eb98 100644
--- a/server/modules/routing/cli/cli.cc
+++ b/server/modules/routing/cli/cli.cc
@@ -40,7 +40,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/poll.h>
 #include <debugcli.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 /* The router entry points */
 static  MXS_ROUTER *createInstance(SERVICE *service, MXS_CONFIG_PARAMETER* params);
diff --git a/server/modules/routing/debugcli/debugcli.cc b/server/modules/routing/debugcli/debugcli.cc
index 037c07ee6..d9949ee69 100644
--- a/server/modules/routing/debugcli/debugcli.cc
+++ b/server/modules/routing/debugcli/debugcli.cc
@@ -39,7 +39,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/poll.h>
 #include <debugcli.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 /* The router entry points */
 static  MXS_ROUTER *createInstance(SERVICE *service, MXS_CONFIG_PARAMETER* params);
diff --git a/server/modules/routing/debugcli/debugcmd.cc b/server/modules/routing/debugcli/debugcmd.cc
index 8aa4994fe..19391f8d6 100644
--- a/server/modules/routing/debugcli/debugcmd.cc
+++ b/server/modules/routing/debugcli/debugcmd.cc
@@ -43,7 +43,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/filter.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/router.h>
diff --git a/server/modules/routing/hintrouter/hintrouter.cc b/server/modules/routing/hintrouter/hintrouter.cc
index c68835995..3a2ce697f 100644
--- a/server/modules/routing/hintrouter/hintrouter.cc
+++ b/server/modules/routing/hintrouter/hintrouter.cc
@@ -17,7 +17,7 @@
 #include <limits>
 #include <vector>
 
-#include <maxscale/log_manager.h>
+#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 cb84b4666..458a02d47 100644
--- a/server/modules/routing/hintrouter/hintrouterdefs.hh
+++ b/server/modules/routing/hintrouter/hintrouterdefs.hh
@@ -15,7 +15,7 @@
 #include <maxscale/ccdefs.hh>
 
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#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 37b3fa3a3..d5435127d 100644
--- a/server/modules/routing/maxinfo/maxinfo.cc
+++ b/server/modules/routing/maxinfo/maxinfo.cc
@@ -44,7 +44,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/maxscale.h>
-#include <maxscale/log_manager.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_error.cc b/server/modules/routing/maxinfo/maxinfo_error.cc
index f8713c464..706782a5f 100644
--- a/server/modules/routing/maxinfo/maxinfo_error.cc
+++ b/server/modules/routing/maxinfo/maxinfo_error.cc
@@ -38,7 +38,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/poll.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 
 /**
diff --git a/server/modules/routing/maxinfo/maxinfo_exec.cc b/server/modules/routing/maxinfo/maxinfo_exec.cc
index 930b440e9..bc38c28f5 100644
--- a/server/modules/routing/maxinfo/maxinfo_exec.cc
+++ b/server/modules/routing/maxinfo/maxinfo_exec.cc
@@ -35,7 +35,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
diff --git a/server/modules/routing/maxinfo/maxinfo_parse.cc b/server/modules/routing/maxinfo/maxinfo_parse.cc
index 3b3a51a18..d6a032a47 100644
--- a/server/modules/routing/maxinfo/maxinfo_parse.cc
+++ b/server/modules/routing/maxinfo/maxinfo_parse.cc
@@ -40,7 +40,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/poll.h>
-#include <maxscale/log_manager.h>
+#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 4babe71bd..925b28f11 100644
--- a/server/modules/routing/readconnroute/readconnroute.cc
+++ b/server/modules/routing/readconnroute/readconnroute.cc
@@ -85,7 +85,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/modutil.h>
 #include <maxscale/utils.hh>
diff --git a/server/modules/routing/readwritesplit/readwritesplit.cc b/server/modules/routing/readwritesplit/readwritesplit.cc
index e15c42da4..75e5e5972 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.cc
+++ b/server/modules/routing/readwritesplit/readwritesplit.cc
@@ -25,7 +25,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/query_classifier.h>
diff --git a/server/modules/routing/readwritesplit/readwritesplit.hh b/server/modules/routing/readwritesplit/readwritesplit.hh
index 4b9f6f776..4b86f0d05 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.hh
+++ b/server/modules/routing/readwritesplit/readwritesplit.hh
@@ -27,7 +27,7 @@
 #include <mutex>
 
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/queryclassifier.hh>
 #include <maxscale/router.hh>
 #include <maxscale/service.h>
diff --git a/server/modules/routing/readwritesplit/rwbackend.cc b/server/modules/routing/readwritesplit/rwbackend.cc
index de5db5df3..83260bd9c 100644
--- a/server/modules/routing/readwritesplit/rwbackend.cc
+++ b/server/modules/routing/readwritesplit/rwbackend.cc
@@ -2,7 +2,7 @@
 
 #include <maxscale/modutil.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 namespace maxscale
 {
diff --git a/server/modules/routing/readwritesplit/rwsplit_mysql.cc b/server/modules/routing/readwritesplit/rwsplit_mysql.cc
index 50e95418a..9ce69f26a 100644
--- a/server/modules/routing/readwritesplit/rwsplit_mysql.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_mysql.cc
@@ -20,7 +20,7 @@
 #include <stdint.h>
 
 #include <maxscale/router.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
diff --git a/server/modules/routing/schemarouter/schemarouterinstance.cc b/server/modules/routing/schemarouter/schemarouterinstance.cc
index 0a40154a8..b6f3c6ddf 100644
--- a/server/modules/routing/schemarouter/schemarouterinstance.cc
+++ b/server/modules/routing/schemarouter/schemarouterinstance.cc
@@ -22,7 +22,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/poll.h>