From 4efa9dbeeab52ef6c9b1db5aa18acba03f52b623 Mon Sep 17 00:00:00 2001
From: Esa Korhonen <esa.korhonen@mariadb.com>
Date: Wed, 5 Jun 2019 16:23:10 +0300
Subject: [PATCH] Remove maxscale/alloc.h

The remaining contents were moved to maxbase/alloc.h.
---
 examples/roundrobinrouter.cpp                 |  2 +-
 include/maxscale/alloc.h                      | 46 -------------------
 include/maxscale/jansson.hh                   |  2 +-
 maxutils/maxbase/include/maxbase/alloc.h      | 24 ++++++++++
 query_classifier/qc_sqlite/qc_sqlite.cc       |  2 +-
 server/core/adminusers.cc                     |  2 +-
 server/core/authenticator.cc                  |  2 +-
 server/core/backend.cc                        |  2 +-
 server/core/buffer.cc                         |  2 +-
 server/core/config.cc                         |  2 +-
 server/core/dcb.cc                            |  2 +-
 server/core/encryption.cc                     |  2 +-
 server/core/externcmd.cc                      |  2 +-
 server/core/filter.cc                         |  2 +-
 server/core/gateway.cc                        |  2 +-
 server/core/hint.cc                           |  2 +-
 server/core/httpresponse.cc                   |  2 +-
 server/core/listener.cc                       |  2 +-
 server/core/load_utils.cc                     |  2 +-
 server/core/maxpasswd.cc                      |  2 +-
 server/core/maxscale_pcre2.cc                 |  2 +-
 server/core/modulecmd.cc                      |  2 +-
 server/core/modutil.cc                        |  2 +-
 server/core/monitor.cc                        |  2 +-
 server/core/mysql_utils.cc                    |  2 +-
 server/core/paths.cc                          |  2 +-
 server/core/poll.cc                           |  2 +-
 server/core/query_classifier.cc               |  2 +-
 server/core/queryclassifier.cc                |  2 +-
 server/core/resource.cc                       |  2 +-
 server/core/resultset.cc                      |  2 +-
 server/core/routingworker.cc                  |  2 +-
 server/core/secrets.cc                        |  2 +-
 server/core/server.cc                         |  2 +-
 server/core/service.cc                        |  2 +-
 server/core/session.cc                        |  2 +-
 server/core/test/test_adminusers.cc           |  2 +-
 server/core/test/test_buffer.cc               |  2 +-
 server/core/test/test_filter.cc               |  2 +-
 server/core/test/test_hint.cc                 |  2 +-
 server/core/test/test_log.cc                  |  2 +-
 server/core/test/test_logorder.cc             |  2 +-
 server/core/test/test_maxscalepcre2.cc        |  2 +-
 server/core/test/test_modulecmd.cc            |  2 +-
 server/core/test/test_modutil.cc              |  2 +-
 server/core/test/test_server.cc               |  2 +-
 server/core/test/test_service.cc              |  2 +-
 server/core/test/test_session_track.cc        |  2 +-
 server/core/test/test_trxcompare.cc           |  2 +-
 server/core/test/test_utils.hh                |  2 +-
 server/core/utils.cc                          |  2 +-
 .../CDCPlainAuth/cdc_plain_auth.cc            |  2 +-
 .../GSSAPI/GSSAPIAuth/gssapi_auth.cc          |  2 +-
 .../GSSAPIBackendAuth/gssapi_backend_auth.cc  |  2 +-
 .../GSSAPI/gssapi_auth_common.cc              |  2 +-
 .../authenticator/HTTPAuth/http_auth.cc       |  2 +-
 .../authenticator/MariaDBAuth/dbusers.cc      |  2 +-
 .../authenticator/MariaDBAuth/mysql_auth.cc   |  2 +-
 .../MariaDBBackendAuth/mysql_backend_auth.cc  |  2 +-
 .../MaxAdminAuth/max_admin_auth.cc            |  2 +-
 .../authenticator/PAM/PAMAuth/pam_auth.hh     |  2 +-
 .../binlogfilter/binlogfiltersession.cc       |  2 +-
 server/modules/filter/cache/cache.cc          |  2 +-
 server/modules/filter/cache/cachefilter.cc    |  2 +-
 .../filter/cache/cachefiltersession.cc        |  2 +-
 server/modules/filter/cache/rules.cc          |  2 +-
 .../storage_inmemory/inmemorystorage.cc       |  2 +-
 server/modules/filter/cache/storagefactory.cc |  2 +-
 .../filter/cache/test/testkeygeneration.cc    |  2 +-
 .../filter/cache/test/testlrustorage.cc       |  2 +-
 .../filter/cache/test/testrawstorage.cc       |  2 +-
 server/modules/filter/cache/test/testrules.cc |  2 +-
 .../modules/filter/cache/test/teststorage.cc  |  2 +-
 server/modules/filter/ccrfilter/ccrfilter.cc  |  2 +-
 .../modules/filter/dbfwfilter/dbfwfilter.cc   |  2 +-
 server/modules/filter/dbfwfilter/rules.cc     |  2 +-
 server/modules/filter/dbfwfilter/user.cc      |  2 +-
 .../modules/filter/hintfilter/hintfilter.cc   |  2 +-
 .../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 +-
 .../namedserverfilter/namedserverfilter.cc    |  2 +-
 server/modules/filter/qlafilter/qlafilter.cc  |  2 +-
 .../modules/filter/regexfilter/regexfilter.cc |  2 +-
 server/modules/filter/tee/tee.cc              |  2 +-
 server/modules/filter/test/module.cc          |  2 +-
 server/modules/filter/topfilter/topfilter.cc  |  2 +-
 server/modules/filter/tpmfilter/tpmfilter.cc  |  2 +-
 server/modules/monitor/auroramon/auroramon.cc |  2 +-
 server/modules/monitor/galeramon/galeramon.cc |  2 +-
 .../modules/monitor/mariadbmon/mariadbmon.cc  |  2 +-
 .../mariadbmon/test/test_cycle_find.cc        |  2 +-
 server/modules/protocol/CDC/cdc.cc            |  2 +-
 server/modules/protocol/HTTPD/httpd.cc        |  2 +-
 .../MySQL/mariadbbackend/mysql_backend.cc     |  2 +-
 .../MySQL/mariadbclient/mysql_client.cc       |  2 +-
 server/modules/protocol/MySQL/mysql_common.cc |  2 +-
 .../modules/protocol/maxscaled/maxscaled.cc   |  2 +-
 server/modules/protocol/telnetd/telnetd.cc    |  2 +-
 server/modules/routing/avrorouter/avro.cc     |  2 +-
 .../modules/routing/avrorouter/avro_client.cc |  2 +-
 .../routing/avrorouter/avro_converter.cc      |  2 +-
 .../modules/routing/avrorouter/avro_file.cc   |  2 +-
 .../modules/routing/avrorouter/avro_main.cc   |  2 +-
 server/modules/routing/avrorouter/avro_rbr.cc |  2 +-
 .../modules/routing/avrorouter/avro_schema.cc |  2 +-
 .../modules/routing/avrorouter/avrorouter.hh  |  2 +-
 server/modules/routing/binlogrouter/blr.cc    |  2 +-
 .../modules/routing/binlogrouter/blr_event.cc |  2 +-
 .../modules/routing/binlogrouter/blr_file.cc  |  2 +-
 .../routing/binlogrouter/blr_master.cc        |  2 +-
 .../modules/routing/binlogrouter/blr_slave.cc |  2 +-
 .../routing/binlogrouter/maxbinlogcheck.cc    |  2 +-
 .../routing/binlogrouter/test/testbinlog.cc   |  2 +-
 server/modules/routing/cli/cli.cc             |  2 +-
 server/modules/routing/cli/debugcmd.cc        |  2 +-
 .../routing/hintrouter/hintroutersession.cc   |  2 +-
 server/modules/routing/maxinfo/maxinfo.cc     |  2 +-
 .../modules/routing/maxinfo/maxinfo_error.cc  |  2 +-
 .../modules/routing/maxinfo/maxinfo_exec.cc   |  2 +-
 .../modules/routing/maxinfo/maxinfo_parse.cc  |  2 +-
 .../routing/readwritesplit/readwritesplit.cc  |  2 +-
 .../routing/readwritesplit/rwsplit_mysql.cc   |  2 +-
 .../readwritesplit/rwsplit_route_stmt.cc      |  2 +-
 .../schemarouter/schemarouterinstance.cc      |  2 +-
 .../schemarouter/schemaroutersession.cc       |  2 +-
 .../modules/routing/schemarouter/shard_map.cc |  2 +-
 128 files changed, 150 insertions(+), 172 deletions(-)
 delete mode 100644 include/maxscale/alloc.h

diff --git a/examples/roundrobinrouter.cpp b/examples/roundrobinrouter.cpp
index fc761a807..392a12476 100644
--- a/examples/roundrobinrouter.cpp
+++ b/examples/roundrobinrouter.cpp
@@ -39,7 +39,7 @@
 #include <string>
 #include <iterator>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>
diff --git a/include/maxscale/alloc.h b/include/maxscale/alloc.h
deleted file mode 100644
index 9ff332758..000000000
--- a/include/maxscale/alloc.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2018 MariaDB Corporation Ab
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
- *
- * Change Date: 2022-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2 or later of the General
- * Public License.
- */
-#pragma once
-
-#include <maxscale/cdefs.h>
-#include <stdlib.h>
-#include <string.h>
-#include <maxbase/alloc.h>
-
-MXS_BEGIN_DECLS
-
-/**
- * @brief Abort the process if the pointer is NULL.
- *
- * To be used in circumstances where a memory allocation failure
- * cannot - currently - be dealt with properly.
- */
-#define MXS_ABORT_IF_NULL(p) do {if (!p) {abort();}} while (false)
-
-/**
- * @brief Abort the process if the provided value is non-zero.
- *
- * To be used in circumstances where a memory allocation or other
- * fatal error cannot - currently - be dealt with properly.
- */
-#define MXS_ABORT_IF_TRUE(b) do {if (b) {abort();}} while (false)
-
-/**
- * @brief Abort the process if the provided value is zero.
- *
- * To be used in circumstances where a memory allocation or other
- * fatal error cannot - currently - be dealt with properly.
- */
-#define MXS_ABORT_IF_FALSE(b) do {if (!(b)) {abort();}} while (false)
-
-MXS_END_DECLS
diff --git a/include/maxscale/jansson.hh b/include/maxscale/jansson.hh
index a939934dd..2f5cd89a3 100644
--- a/include/maxscale/jansson.hh
+++ b/include/maxscale/jansson.hh
@@ -20,7 +20,7 @@
 
 #include <maxbase/assert.h>
 #include <maxbase/jansson.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 namespace std
 {
diff --git a/maxutils/maxbase/include/maxbase/alloc.h b/maxutils/maxbase/include/maxbase/alloc.h
index 4844e4b32..2b5d7c055 100644
--- a/maxutils/maxbase/include/maxbase/alloc.h
+++ b/maxutils/maxbase/include/maxbase/alloc.h
@@ -46,4 +46,28 @@ char* mxb_strndup_a(const char* s, size_t n    /*, const char *caller*/);
 #define MXS_STRDUP_A(s)     mxb_strdup_a(s    /*, __func__*/)
 #define MXS_STRNDUP_A(s, n) mxb_strndup_a(s, n    /*, __func__*/)
 
+/**
+ * @brief Abort the process if the pointer is NULL.
+ *
+ * To be used in circumstances where a memory allocation failure
+ * cannot - currently - be dealt with properly.
+ */
+#define MXS_ABORT_IF_NULL(p) do {if (!p) {abort();}} while (false)
+
+/**
+ * @brief Abort the process if the provided value is non-zero.
+ *
+ * To be used in circumstances where a memory allocation or other
+ * fatal error cannot - currently - be dealt with properly.
+ */
+#define MXS_ABORT_IF_TRUE(b) do {if (b) {abort();}} while (false)
+
+/**
+ * @brief Abort the process if the provided value is zero.
+ *
+ * To be used in circumstances where a memory allocation or other
+ * fatal error cannot - currently - be dealt with properly.
+ */
+#define MXS_ABORT_IF_FALSE(b) do {if (!(b)) {abort();}} while (false)
+
 MXB_END_DECLS
diff --git a/query_classifier/qc_sqlite/qc_sqlite.cc b/query_classifier/qc_sqlite/qc_sqlite.cc
index d99330d5a..402f2d9db 100644
--- a/query_classifier/qc_sqlite/qc_sqlite.cc
+++ b/query_classifier/qc_sqlite/qc_sqlite.cc
@@ -28,7 +28,7 @@
 #include <vector>
 #include <mutex>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
diff --git a/server/core/adminusers.cc b/server/core/adminusers.cc
index 5a8d39af0..4a571b42a 100644
--- a/server/core/adminusers.cc
+++ b/server/core/adminusers.cc
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <string>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/users.h>
 #include <maxscale/adminusers.h>
 #include <maxbase/pam_utils.hh>
diff --git a/server/core/authenticator.cc b/server/core/authenticator.cc
index 6d73e17fe..c16258617 100644
--- a/server/core/authenticator.cc
+++ b/server/core/authenticator.cc
@@ -13,7 +13,7 @@
 
 #include <maxscale/authenticator.hh>
 #include <maxscale/modutil.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 #include "internal/modules.hh"
 /**
diff --git a/server/core/backend.cc b/server/core/backend.cc
index 21a7e6d0a..86ba291ce 100644
--- a/server/core/backend.cc
+++ b/server/core/backend.cc
@@ -17,7 +17,7 @@
 
 #include <maxbase/atomic.hh>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/protocol/mysql.hh>
 
 using namespace maxscale;
diff --git a/server/core/buffer.cc b/server/core/buffer.cc
index 912c83a5a..c54e9c2ea 100644
--- a/server/core/buffer.cc
+++ b/server/core/buffer.cc
@@ -18,7 +18,7 @@
 #include <sstream>
 
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/hint.h>
 #include <maxscale/utils.h>
 #include <maxscale/routingworker.hh>
diff --git a/server/core/config.cc b/server/core/config.cc
index 918067034..b3c9b1966 100644
--- a/server/core/config.cc
+++ b/server/core/config.cc
@@ -42,7 +42,7 @@
 #include <maxbase/atomic.hh>
 #include <maxbase/format.hh>
 #include <maxscale/adminusers.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/clock.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/http.hh>
diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index 9f7c16ef8..6d920c1e1 100644
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@@ -40,7 +40,7 @@
 
 #include <atomic>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxbase/atomic.hh>
 #include <maxscale/clock.h>
diff --git a/server/core/encryption.cc b/server/core/encryption.cc
index e50b96c49..7594afe5d 100644
--- a/server/core/encryption.cc
+++ b/server/core/encryption.cc
@@ -13,7 +13,7 @@
 
 #include <maxscale/ccdefs.hh>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/encryption.h>
 
 EVP_CIPHER_CTX* mxs_evp_cipher_ctx_alloc()
diff --git a/server/core/externcmd.cc b/server/core/externcmd.cc
index 3ac1facd0..69e888299 100644
--- a/server/core/externcmd.cc
+++ b/server/core/externcmd.cc
@@ -21,7 +21,7 @@
 #include <thread>
 
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/pcre2.h>
 
 using std::string;
diff --git a/server/core/filter.cc b/server/core/filter.cc
index e288339c9..09dbb4eef 100644
--- a/server/core/filter.cc
+++ b/server/core/filter.cc
@@ -30,7 +30,7 @@
 #include <string>
 #include <vector>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.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 a23fea6fc..ad7d35d71 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -47,7 +47,7 @@
 #include <maxbase/maxbase.hh>
 #include <maxbase/stacktrace.hh>
 #include <maxsql/mariadb.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
diff --git a/server/core/hint.cc b/server/core/hint.cc
index fda0f0787..598b9d968 100644
--- a/server/core/hint.cc
+++ b/server/core/hint.cc
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <maxbase/assert.h>
 #include <maxscale/hint.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /**
  * @file hint.c generic support routines for hints.
diff --git a/server/core/httpresponse.cc b/server/core/httpresponse.cc
index 924f21dcc..a6f3e5f1b 100644
--- a/server/core/httpresponse.cc
+++ b/server/core/httpresponse.cc
@@ -16,7 +16,7 @@
 #include <string>
 #include <sstream>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <sys/time.h>
 
 #include "internal/admin.hh"
diff --git a/server/core/listener.cc b/server/core/listener.cc
index 373844dd6..a46c10cc4 100644
--- a/server/core/listener.cc
+++ b/server/core/listener.cc
@@ -33,7 +33,7 @@
 #include <maxscale/paths.h>
 #include <maxscale/ssl.hh>
 #include <maxscale/protocol.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/users.h>
 #include <maxscale/service.hh>
 #include <maxscale/poll.hh>
diff --git a/server/core/load_utils.cc b/server/core/load_utils.cc
index 4a82650d8..b4406c616 100644
--- a/server/core/load_utils.cc
+++ b/server/core/load_utils.cc
@@ -27,7 +27,7 @@
 #include <maxscale/modinfo.h>
 #include <maxscale/version.h>
 #include <maxscale/paths.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/json_api.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/protocol.hh>
diff --git a/server/core/maxpasswd.cc b/server/core/maxpasswd.cc
index 3311db7bc..0db1e3751 100644
--- a/server/core/maxpasswd.cc
+++ b/server/core/maxpasswd.cc
@@ -24,7 +24,7 @@
 
 #include <maxscale/paths.h>
 #include <maxscale/random.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 #include "internal/secrets.hh"
 
diff --git a/server/core/maxscale_pcre2.cc b/server/core/maxscale_pcre2.cc
index c63e43108..1efc0e521 100644
--- a/server/core/maxscale_pcre2.cc
+++ b/server/core/maxscale_pcre2.cc
@@ -26,7 +26,7 @@
 
 #include <maxscale/pcre2.h>
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/log.hh>
 
 /**
diff --git a/server/core/modulecmd.cc b/server/core/modulecmd.cc
index e8a9e1945..554ff2026 100644
--- a/server/core/modulecmd.cc
+++ b/server/core/modulecmd.cc
@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/pcre2.h>
 
diff --git a/server/core/modutil.cc b/server/core/modutil.cc
index 94ffff475..834b3121b 100644
--- a/server/core/modutil.cc
+++ b/server/core/modutil.cc
@@ -25,7 +25,7 @@
 #include <cctype>
 
 #include <maxsql/mariadb.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/poll.hh>
diff --git a/server/core/monitor.cc b/server/core/monitor.cc
index a45fb1c9c..37767b69d 100644
--- a/server/core/monitor.cc
+++ b/server/core/monitor.cc
@@ -30,7 +30,7 @@
 #include <vector>
 #include <mutex>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/clock.h>
 #include <maxscale/json_api.hh>
 #include <maxscale/mariadb.hh>
diff --git a/server/core/mysql_utils.cc b/server/core/mysql_utils.cc
index beb97ffa9..c58e3c814 100644
--- a/server/core/mysql_utils.cc
+++ b/server/core/mysql_utils.cc
@@ -30,7 +30,7 @@
 #include <maxbase/atomic.hh>
 #include <maxbase/format.hh>
 #include <maxsql/mariadb.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 
 MYSQL* mxs_mysql_real_connect(MYSQL* con, SERVER* server, const char* user, const char* passwd)
diff --git a/server/core/paths.cc b/server/core/paths.cc
index cd29f68d2..46f596ffb 100644
--- a/server/core/paths.cc
+++ b/server/core/paths.cc
@@ -12,7 +12,7 @@
  */
 
 #include <maxscale/paths.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/utils.h>
 
 /**
diff --git a/server/core/poll.cc b/server/core/poll.cc
index 540e700c9..2a33c7ed3 100644
--- a/server/core/poll.cc
+++ b/server/core/poll.cc
@@ -28,7 +28,7 @@
 #include <mysql.h>
 #include <sys/epoll.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/config.hh>
 #include <maxscale/clock.h>
diff --git a/server/core/query_classifier.cc b/server/core/query_classifier.cc
index a5070bc09..69880cc11 100644
--- a/server/core/query_classifier.cc
+++ b/server/core/query_classifier.cc
@@ -17,7 +17,7 @@
 #include <atomic>
 #include <random>
 #include <unordered_map>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxbase/format.hh>
 #include <maxscale/config.hh>
diff --git a/server/core/queryclassifier.cc b/server/core/queryclassifier.cc
index adbfbbd95..6e271b464 100644
--- a/server/core/queryclassifier.cc
+++ b/server/core/queryclassifier.cc
@@ -13,7 +13,7 @@
 
 #include <maxscale/queryclassifier.hh>
 #include <unordered_map>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.hh>
 #include <maxscale/protocol/mysql.hh>
diff --git a/server/core/resource.cc b/server/core/resource.cc
index 36b20ff6a..d2657426a 100644
--- a/server/core/resource.cc
+++ b/server/core/resource.cc
@@ -17,7 +17,7 @@
 #include <sstream>
 
 #include <maxscale/adminusers.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/http.hh>
 #include <maxscale/jansson.hh>
diff --git a/server/core/resultset.cc b/server/core/resultset.cc
index 0974e02c8..6adfbd8f1 100644
--- a/server/core/resultset.cc
+++ b/server/core/resultset.cc
@@ -16,7 +16,7 @@
 
 #include <numeric>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/resultset.hh>
 #include <maxscale/buffer.hh>
 #include <maxscale/dcb.hh>
diff --git a/server/core/routingworker.cc b/server/core/routingworker.cc
index 67cac1364..29d62fecc 100644
--- a/server/core/routingworker.cc
+++ b/server/core/routingworker.cc
@@ -26,7 +26,7 @@
 
 #include <maxbase/atomic.hh>
 #include <maxbase/semaphore.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/clock.h>
 #include <maxscale/limits.h>
diff --git a/server/core/secrets.cc b/server/core/secrets.cc
index 3144c13e6..738afc534 100644
--- a/server/core/secrets.cc
+++ b/server/core/secrets.cc
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.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 613fb8eed..ad05c3372 100644
--- a/server/core/server.cc
+++ b/server/core/server.cc
@@ -35,7 +35,7 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/poll.hh>
 #include <maxscale/ssl.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/utils.h>
 #include <maxscale/json_api.hh>
diff --git a/server/core/service.cc b/server/core/service.cc
index 6d1df2a85..c58571975 100644
--- a/server/core/service.cc
+++ b/server/core/service.cc
@@ -37,7 +37,7 @@
 #include <maxbase/jansson.h>
 
 #include <maxscale/service.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/paths.h>
 #include <maxscale/listener.hh>
diff --git a/server/core/session.cc b/server/core/session.cc
index ba521d60a..1467525bb 100644
--- a/server/core/session.cc
+++ b/server/core/session.cc
@@ -28,7 +28,7 @@
 
 #include <maxbase/atomic.hh>
 #include <maxbase/host.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/clock.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
diff --git a/server/core/test/test_adminusers.cc b/server/core/test/test_adminusers.cc
index 8c330973a..59e416704 100644
--- a/server/core/test/test_adminusers.cc
+++ b/server/core/test/test_adminusers.cc
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <maxscale/paths.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/utils.h>
 #include <maxscale/users.h>
 
diff --git a/server/core/test/test_buffer.cc b/server/core/test/test_buffer.cc
index 07ea946b7..9a0b30a7d 100644
--- a/server/core/test/test_buffer.cc
+++ b/server/core/test/test_buffer.cc
@@ -35,7 +35,7 @@
 
 #include <maxbase/assert.h>
 #include <maxbase/log.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/hint.h>
 
diff --git a/server/core/test/test_filter.cc b/server/core/test/test_filter.cc
index 567713932..69794c6d0 100644
--- a/server/core/test/test_filter.cc
+++ b/server/core/test/test_filter.cc
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 
 #include "../internal/filter.hh"
diff --git a/server/core/test/test_hint.cc b/server/core/test/test_hint.cc
index cd5440991..a03b1f325 100644
--- a/server/core/test/test_hint.cc
+++ b/server/core/test/test_hint.cc
@@ -35,7 +35,7 @@
 
 #include <maxbase/assert.h>
 #include <maxscale/hint.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /**
  * test1    Allocate table of users and mess around with it
diff --git a/server/core/test/test_log.cc b/server/core/test/test_log.cc
index 49a6edae8..0efd0594f 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 <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.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 1cecafdf0..00fa99684 100644
--- a/server/core/test/test_logorder.cc
+++ b/server/core/test/test_logorder.cc
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <time.h>
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/log.hh>
 
 static void skygw_log_enable(int priority)
diff --git a/server/core/test/test_maxscalepcre2.cc b/server/core/test/test_maxscalepcre2.cc
index 5aeac0f48..5fb53c304 100644
--- a/server/core/test/test_maxscalepcre2.cc
+++ b/server/core/test/test_maxscalepcre2.cc
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/pcre2.h>
 
 #define test_assert(a, b) if (!(a)) {fprintf(stderr, b); return 1;}
diff --git a/server/core/test/test_modulecmd.cc b/server/core/test/test_modulecmd.cc
index 374a2645a..08f961066 100644
--- a/server/core/test/test_modulecmd.cc
+++ b/server/core/test/test_modulecmd.cc
@@ -16,7 +16,7 @@
  */
 
 #include <maxbase/maxbase.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/paths.h>
 #include <maxscale/modulecmd.hh>
diff --git a/server/core/test/test_modutil.cc b/server/core/test/test_modutil.cc
index 47653f821..ee3df8c73 100644
--- a/server/core/test/test_modutil.cc
+++ b/server/core/test/test_modutil.cc
@@ -34,7 +34,7 @@
 #include <string.h>
 
 #include <maxbase/log.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/buffer.hh>
 
diff --git a/server/core/test/test_server.cc b/server/core/test/test_server.cc
index d61fd6479..3e68eaba7 100644
--- a/server/core/test/test_server.cc
+++ b/server/core/test/test_server.cc
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/server.hh>
 #include <maxscale/paths.h>
 #include <maxscale/config.hh>
diff --git a/server/core/test/test_service.cc b/server/core/test/test_service.cc
index fc7bbe3cb..573cb04aa 100644
--- a/server/core/test/test_service.cc
+++ b/server/core/test/test_service.cc
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <maxscale/maxscale_test.h>
 #include <maxscale/paths.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 #include "../internal/service.hh"
 #include "test_utils.hh"
diff --git a/server/core/test/test_session_track.cc b/server/core/test/test_session_track.cc
index df27d9948..071791788 100644
--- a/server/core/test/test_session_track.cc
+++ b/server/core/test/test_session_track.cc
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/protocol/mysql.hh>
 
diff --git a/server/core/test/test_trxcompare.cc b/server/core/test/test_trxcompare.cc
index ba7ae47fe..b8d708bb1 100644
--- a/server/core/test/test_trxcompare.cc
+++ b/server/core/test/test_trxcompare.cc
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <string>
 #include "../internal/query_classifier.hh"
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>
 #include "../../../query_classifier/test/testreader.hh"
diff --git a/server/core/test/test_utils.hh b/server/core/test/test_utils.hh
index c3165e5b2..c2d39fe4c 100644
--- a/server/core/test/test_utils.hh
+++ b/server/core/test/test_utils.hh
@@ -21,7 +21,7 @@
 #include <maxscale/config.hh>
 #include <maxscale/query_classifier.hh>
 #include <maxscale/paths.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/routingworker.hh>
 
 #include <sys/stat.h>
diff --git a/server/core/utils.cc b/server/core/utils.cc
index dd22444e8..b114702fe 100644
--- a/server/core/utils.cc
+++ b/server/core/utils.cc
@@ -45,7 +45,7 @@
 #include <curl/curl.h>
 #include <crypt.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/limits.h>
diff --git a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc
index 88f11a117..54d970c3e 100644
--- a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc
+++ b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <cdc.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/event.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/modutil.hh>
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
index 696fa7e56..d49e68caf 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
+++ b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
@@ -15,7 +15,7 @@
 
 #include <maxscale/ccdefs.hh>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/authenticator.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/mysql_utils.hh>
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
index 1cf68891a..e580cb29b 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
+++ b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
@@ -14,7 +14,7 @@
 #define MXS_MODULE_NAME "GSSAPIBackendAuth"
 
 #include <maxscale/ccdefs.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/authenticator.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/protocol/mysql.hh>
diff --git a/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc b/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc
index 035e7b1a1..57df82cb8 100644
--- a/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc
+++ b/server/modules/authenticator/GSSAPI/gssapi_auth_common.cc
@@ -12,7 +12,7 @@
  */
 
 #include "gssapi_auth.hh"
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /**
  * @brief Report GSSAPI errors
diff --git a/server/modules/authenticator/HTTPAuth/http_auth.cc b/server/modules/authenticator/HTTPAuth/http_auth.cc
index 067bc824a..2d7276a6c 100644
--- a/server/modules/authenticator/HTTPAuth/http_auth.cc
+++ b/server/modules/authenticator/HTTPAuth/http_auth.cc
@@ -27,7 +27,7 @@
 #define MXS_MODULE_NAME "HTTPAuth"
 
 #include <maxscale/authenticator.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/buffer.hh>
diff --git a/server/modules/authenticator/MariaDBAuth/dbusers.cc b/server/modules/authenticator/MariaDBAuth/dbusers.cc
index 5d071191a..05d2b2d7e 100644
--- a/server/modules/authenticator/MariaDBAuth/dbusers.cc
+++ b/server/modules/authenticator/MariaDBAuth/dbusers.cc
@@ -21,7 +21,7 @@
 #include <netdb.h>
 #include <stdio.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/maxscale.h>
 #include <maxscale/mysql_utils.hh>
diff --git a/server/modules/authenticator/MariaDBAuth/mysql_auth.cc b/server/modules/authenticator/MariaDBAuth/mysql_auth.cc
index d6f613741..e7a7a961a 100644
--- a/server/modules/authenticator/MariaDBAuth/mysql_auth.cc
+++ b/server/modules/authenticator/MariaDBAuth/mysql_auth.cc
@@ -29,7 +29,7 @@
 
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/authenticator.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/event.hh>
 #include <maxscale/poll.hh>
 #include <maxscale/paths.h>
diff --git a/server/modules/authenticator/MariaDBBackendAuth/mysql_backend_auth.cc b/server/modules/authenticator/MariaDBBackendAuth/mysql_backend_auth.cc
index 6722f9ccc..6606058b5 100644
--- a/server/modules/authenticator/MariaDBBackendAuth/mysql_backend_auth.cc
+++ b/server/modules/authenticator/MariaDBBackendAuth/mysql_backend_auth.cc
@@ -24,7 +24,7 @@
 
 #define MXS_MODULE_NAME "MariaDBBackendAuth"
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/authenticator.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/server.hh>
diff --git a/server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc b/server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc
index 1017fd05f..f61883ea4 100644
--- a/server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc
+++ b/server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc
@@ -29,7 +29,7 @@
 #define MXS_MODULE_NAME "MaxAdminAuth"
 
 #include <maxscale/authenticator.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/buffer.hh>
diff --git a/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh b/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh
index acdad5ed5..1271c7d71 100644
--- a/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh
+++ b/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh
@@ -20,7 +20,7 @@
 #include <maxscale/ccdefs.hh>
 
 #include <string>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/protocol/mysql.hh>
diff --git a/server/modules/filter/binlogfilter/binlogfiltersession.cc b/server/modules/filter/binlogfilter/binlogfiltersession.cc
index e825cceb4..32b52e68c 100644
--- a/server/modules/filter/binlogfilter/binlogfiltersession.cc
+++ b/server/modules/filter/binlogfilter/binlogfiltersession.cc
@@ -49,7 +49,7 @@
 #include <algorithm>
 
 #include <maxscale/protocol/mysql.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/poll.hh>
 #include <maxscale/modutil.hh>
 
diff --git a/server/modules/filter/cache/cache.cc b/server/modules/filter/cache/cache.cc
index 1a2355336..8e342b954 100644
--- a/server/modules/filter/cache/cache.cc
+++ b/server/modules/filter/cache/cache.cc
@@ -17,7 +17,7 @@
 #include <set>
 #include <string>
 #include <zlib.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.hh>
diff --git a/server/modules/filter/cache/cachefilter.cc b/server/modules/filter/cache/cachefilter.cc
index 206252e1e..cab2d4187 100644
--- a/server/modules/filter/cache/cachefilter.cc
+++ b/server/modules/filter/cache/cachefilter.cc
@@ -14,7 +14,7 @@
 #define MXS_MODULE_NAME "cache"
 #include "cachefilter.hh"
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/jansson.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/paths.h>
diff --git a/server/modules/filter/cache/cachefiltersession.cc b/server/modules/filter/cache/cachefiltersession.cc
index 897a7f553..73b092882 100644
--- a/server/modules/filter/cache/cachefiltersession.cc
+++ b/server/modules/filter/cache/cachefiltersession.cc
@@ -14,7 +14,7 @@
 #define MXS_MODULE_NAME "cache"
 #include "cachefiltersession.hh"
 #include <new>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/query_classifier.hh>
diff --git a/server/modules/filter/cache/rules.cc b/server/modules/filter/cache/rules.cc
index dfe5d68ba..6acbdfe69 100644
--- a/server/modules/filter/cache/rules.cc
+++ b/server/modules/filter/cache/rules.cc
@@ -19,7 +19,7 @@
 #include <new>
 #include <vector>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc
index 104b277b4..dc487021a 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc
@@ -13,7 +13,7 @@
 
 #define MXS_MODULE_NAME "storage_inmemory"
 #include "inmemorystorage.hh"
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.hh>
 #include "../../cache.hh"
diff --git a/server/modules/filter/cache/storagefactory.cc b/server/modules/filter/cache/storagefactory.cc
index 39be872d4..0f02f5817 100644
--- a/server/modules/filter/cache/storagefactory.cc
+++ b/server/modules/filter/cache/storagefactory.cc
@@ -16,7 +16,7 @@
 #include <dlfcn.h>
 #include <sys/param.h>
 #include <new>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include "cachefilter.hh"
 #include "lrustoragest.hh"
diff --git a/server/modules/filter/cache/test/testkeygeneration.cc b/server/modules/filter/cache/test/testkeygeneration.cc
index a18d9b661..d75a5cdcf 100644
--- a/server/modules/filter/cache/test/testkeygeneration.cc
+++ b/server/modules/filter/cache/test/testkeygeneration.cc
@@ -15,7 +15,7 @@
 #include <iostream>
 #include <fstream>
 #include <unordered_map>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.hh>
 #include "storagefactory.hh"
diff --git a/server/modules/filter/cache/test/testlrustorage.cc b/server/modules/filter/cache/test/testlrustorage.cc
index 7c686cd5f..6008ab93b 100644
--- a/server/modules/filter/cache/test/testlrustorage.cc
+++ b/server/modules/filter/cache/test/testlrustorage.cc
@@ -13,7 +13,7 @@
 
 #include <maxscale/ccdefs.hh>
 #include <iostream>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include "teststorage.hh"
 #include "testerlrustorage.hh"
diff --git a/server/modules/filter/cache/test/testrawstorage.cc b/server/modules/filter/cache/test/testrawstorage.cc
index 5685eff3d..8792b0f8b 100644
--- a/server/modules/filter/cache/test/testrawstorage.cc
+++ b/server/modules/filter/cache/test/testrawstorage.cc
@@ -13,7 +13,7 @@
 
 #include <maxscale/ccdefs.hh>
 #include <iostream>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include "teststorage.hh"
 #include "testerrawstorage.hh"
diff --git a/server/modules/filter/cache/test/testrules.cc b/server/modules/filter/cache/test/testrules.cc
index 8f6b0b3bc..38e69c2c2 100644
--- a/server/modules/filter/cache/test/testrules.cc
+++ b/server/modules/filter/cache/test/testrules.cc
@@ -14,7 +14,7 @@
 #include "rules.hh"
 #include <algorithm>
 #include <iostream>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>
diff --git a/server/modules/filter/cache/test/teststorage.cc b/server/modules/filter/cache/test/teststorage.cc
index ebbb034f8..163d18be5 100644
--- a/server/modules/filter/cache/test/teststorage.cc
+++ b/server/modules/filter/cache/test/teststorage.cc
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <iostream>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.hh>
 #include <maxscale/utils.h>
diff --git a/server/modules/filter/ccrfilter/ccrfilter.cc b/server/modules/filter/ccrfilter/ccrfilter.cc
index 1b77808f8..e411d63e7 100644
--- a/server/modules/filter/ccrfilter/ccrfilter.cc
+++ b/server/modules/filter/ccrfilter/ccrfilter.cc
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/filter.hh>
 #include <maxscale/hint.h>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.cc b/server/modules/filter/dbfwfilter/dbfwfilter.cc
index 317db80d4..a91a81ce8 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc
@@ -74,7 +74,7 @@
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/pcre2.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/utils.h>
 
 #include "rules.hh"
diff --git a/server/modules/filter/dbfwfilter/rules.cc b/server/modules/filter/dbfwfilter/rules.cc
index 3ca3c880c..dd8a8b8e9 100644
--- a/server/modules/filter/dbfwfilter/rules.cc
+++ b/server/modules/filter/dbfwfilter/rules.cc
@@ -15,7 +15,7 @@
 
 #include <algorithm>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
diff --git a/server/modules/filter/dbfwfilter/user.cc b/server/modules/filter/dbfwfilter/user.cc
index b2df9dd8e..ad7a8d26b 100644
--- a/server/modules/filter/dbfwfilter/user.cc
+++ b/server/modules/filter/dbfwfilter/user.cc
@@ -13,7 +13,7 @@
 
 #include "user.hh"
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
 
diff --git a/server/modules/filter/hintfilter/hintfilter.cc b/server/modules/filter/hintfilter/hintfilter.cc
index a005c8404..e6efb648c 100644
--- a/server/modules/filter/hintfilter/hintfilter.cc
+++ b/server/modules/filter/hintfilter/hintfilter.cc
@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include <maxscale/filter.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include "mysqlhint.hh"
diff --git a/server/modules/filter/insertstream/insertstream.cc b/server/modules/filter/insertstream/insertstream.cc
index 8033f8966..2a1c3eaff 100644
--- a/server/modules/filter/insertstream/insertstream.cc
+++ b/server/modules/filter/insertstream/insertstream.cc
@@ -16,7 +16,7 @@
 #include <maxscale/ccdefs.hh>
 
 #include <strings.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/filter/luafilter/luafilter.cc b/server/modules/filter/luafilter/luafilter.cc
index 4079b7cac..7fbd4b7ef 100644
--- a/server/modules/filter/luafilter/luafilter.cc
+++ b/server/modules/filter/luafilter/luafilter.cc
@@ -50,7 +50,7 @@ extern "C"
 }
 
 #include <mutex>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/filter.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.hh>
diff --git a/server/modules/filter/maxrows/maxrows.cc b/server/modules/filter/maxrows/maxrows.cc
index cafa456bd..df7d28816 100644
--- a/server/modules/filter/maxrows/maxrows.cc
+++ b/server/modules/filter/maxrows/maxrows.cc
@@ -21,7 +21,7 @@
 #include <stdint.h>
 
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/filter/mqfilter/mqfilter.cc b/server/modules/filter/mqfilter/mqfilter.cc
index fbec37cf1..5fe0e88fd 100644
--- a/server/modules/filter/mqfilter/mqfilter.cc
+++ b/server/modules/filter/mqfilter/mqfilter.cc
@@ -77,7 +77,7 @@
 #include <maxscale/query_classifier.hh>
 #include <maxscale/session.hh>
 #include <maxscale/mainworker.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 static int uid_gen;
 static int hktask_id = 0;
diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.cc b/server/modules/filter/namedserverfilter/namedserverfilter.cc
index 6bd8ca7d5..6d8d8bcb2 100644
--- a/server/modules/filter/namedserverfilter/namedserverfilter.cc
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.cc
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <vector>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/hint.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
diff --git a/server/modules/filter/qlafilter/qlafilter.cc b/server/modules/filter/qlafilter/qlafilter.cc
index d02d015b3..922b032c6 100644
--- a/server/modules/filter/qlafilter/qlafilter.cc
+++ b/server/modules/filter/qlafilter/qlafilter.cc
@@ -37,7 +37,7 @@
 #include <sstream>
 #include <string>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxbase/format.hh>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/filter/regexfilter/regexfilter.cc b/server/modules/filter/regexfilter/regexfilter.cc
index f682b29eb..278c27fba 100644
--- a/server/modules/filter/regexfilter/regexfilter.cc
+++ b/server/modules/filter/regexfilter/regexfilter.cc
@@ -16,7 +16,7 @@
 #include <maxscale/ccdefs.hh>
 #include <string.h>
 #include <stdio.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/config.hh>
 #include <maxscale/filter.hh>
diff --git a/server/modules/filter/tee/tee.cc b/server/modules/filter/tee/tee.cc
index 4b5eaf11f..469b36c2f 100644
--- a/server/modules/filter/tee/tee.cc
+++ b/server/modules/filter/tee/tee.cc
@@ -19,7 +19,7 @@
 
 #include <maxscale/ccdefs.hh>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/pcre2.hh>
diff --git a/server/modules/filter/test/module.cc b/server/modules/filter/test/module.cc
index c95a35d96..34b67d782 100644
--- a/server/modules/filter/test/module.cc
+++ b/server/modules/filter/test/module.cc
@@ -12,7 +12,7 @@
  */
 
 #include "maxscale/module.hh"
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <string>
 #include "../../../core/internal/modules.hh"
 
diff --git a/server/modules/filter/topfilter/topfilter.cc b/server/modules/filter/topfilter/topfilter.cc
index 53f870076..b73ee0c1f 100644
--- a/server/modules/filter/topfilter/topfilter.cc
+++ b/server/modules/filter/topfilter/topfilter.cc
@@ -45,7 +45,7 @@
 #include <sys/time.h>
 #include <regex.h>
 #include <maxbase/atomic.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /*
  * The filter entry points
diff --git a/server/modules/filter/tpmfilter/tpmfilter.cc b/server/modules/filter/tpmfilter/tpmfilter.cc
index 5803b3dbe..e1fce4e14 100644
--- a/server/modules/filter/tpmfilter/tpmfilter.cc
+++ b/server/modules/filter/tpmfilter/tpmfilter.cc
@@ -55,7 +55,7 @@
 #include <regex.h>
 #include <thread>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
diff --git a/server/modules/monitor/auroramon/auroramon.cc b/server/modules/monitor/auroramon/auroramon.cc
index 5671ec892..b989bf339 100644
--- a/server/modules/monitor/auroramon/auroramon.cc
+++ b/server/modules/monitor/auroramon/auroramon.cc
@@ -19,7 +19,7 @@
 
 #include "auroramon.hh"
 #include <mysqld_error.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/assert.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/mysql_utils.hh>
diff --git a/server/modules/monitor/galeramon/galeramon.cc b/server/modules/monitor/galeramon/galeramon.cc
index 0ab2bf97c..a3e40d9db 100644
--- a/server/modules/monitor/galeramon/galeramon.cc
+++ b/server/modules/monitor/galeramon/galeramon.cc
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <mysql.h>
 #include <mysqld_error.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/monitor/mariadbmon/mariadbmon.cc b/server/modules/monitor/mariadbmon/mariadbmon.cc
index ddcb567a3..ea14e7c72 100644
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@@ -21,7 +21,7 @@
 #include <sstream>
 #include <maxbase/assert.h>
 #include <maxbase/format.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/mysql_utils.hh>
diff --git a/server/modules/monitor/mariadbmon/test/test_cycle_find.cc b/server/modules/monitor/mariadbmon/test/test_cycle_find.cc
index ba58dc4f5..baa6c753a 100644
--- a/server/modules/monitor/mariadbmon/test/test_cycle_find.cc
+++ b/server/modules/monitor/mariadbmon/test/test_cycle_find.cc
@@ -20,7 +20,7 @@
 #include <vector>
 #include <maxbase/log.hh>
 #include <maxbase/maxbase.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include "../../../../core/internal/server.hh"
 
 using std::string;
diff --git a/server/modules/protocol/CDC/cdc.cc b/server/modules/protocol/CDC/cdc.cc
index b7f02e709..6e37b242d 100644
--- a/server/modules/protocol/CDC/cdc.cc
+++ b/server/modules/protocol/CDC/cdc.cc
@@ -34,7 +34,7 @@
 
 #include <maxscale/ccdefs.hh>
 #include <cdc.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/protocol.hh>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/protocol/HTTPD/httpd.cc b/server/modules/protocol/HTTPD/httpd.cc
index de4e4db88..368fb1e4a 100644
--- a/server/modules/protocol/HTTPD/httpd.cc
+++ b/server/modules/protocol/HTTPD/httpd.cc
@@ -36,7 +36,7 @@
 
 #include "httpd.hh"
 #include <ctype.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/protocol.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/resultset.hh>
diff --git a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
index ca2b2a588..df64a7d41 100644
--- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
+++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
@@ -14,7 +14,7 @@
 #define MXS_MODULE_NAME "mariadbbackend"
 
 #include <maxscale/ccdefs.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/limits.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
diff --git a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
index 386821d43..38b1521b1 100644
--- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
@@ -25,7 +25,7 @@
 #include <vector>
 #include <sstream>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/authenticator.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
diff --git a/server/modules/protocol/MySQL/mysql_common.cc b/server/modules/protocol/MySQL/mysql_common.cc
index a364242b3..c4e146f94 100644
--- a/server/modules/protocol/MySQL/mysql_common.cc
+++ b/server/modules/protocol/MySQL/mysql_common.cc
@@ -22,7 +22,7 @@
 #include <map>
 
 #include <maxsql/mariadb.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/clock.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>
diff --git a/server/modules/protocol/maxscaled/maxscaled.cc b/server/modules/protocol/maxscaled/maxscaled.cc
index 326a425a3..cfbc2973b 100644
--- a/server/modules/protocol/maxscaled/maxscaled.cc
+++ b/server/modules/protocol/maxscaled/maxscaled.cc
@@ -38,7 +38,7 @@
 #include <maxscale/modinfo.h>
 #include "maxscaled.hh"
 #include <maxscale/maxadmin.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /**
  * @file maxscaled.c - MaxScale administration protocol
diff --git a/server/modules/protocol/telnetd/telnetd.cc b/server/modules/protocol/telnetd/telnetd.cc
index 712b66d3e..263b4eb2b 100644
--- a/server/modules/protocol/telnetd/telnetd.cc
+++ b/server/modules/protocol/telnetd/telnetd.cc
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/buffer.hh>
 #include <maxscale/service.hh>
diff --git a/server/modules/routing/avrorouter/avro.cc b/server/modules/routing/avrorouter/avro.cc
index 6d460fc1a..05ba71b73 100644
--- a/server/modules/routing/avrorouter/avro.cc
+++ b/server/modules/routing/avrorouter/avro.cc
@@ -30,7 +30,7 @@
 #include <avro/errors.h>
 #include <maxbase/atomic.h>
 #include <maxbase/worker.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/paths.h>
diff --git a/server/modules/routing/avrorouter/avro_client.cc b/server/modules/routing/avrorouter/avro_client.cc
index 91c38b9a1..cc18aa825 100644
--- a/server/modules/routing/avrorouter/avro_client.cc
+++ b/server/modules/routing/avrorouter/avro_client.cc
@@ -30,7 +30,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/version.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/utils.hh>
 #include <maxscale/routingworker.hh>
diff --git a/server/modules/routing/avrorouter/avro_converter.cc b/server/modules/routing/avrorouter/avro_converter.cc
index 6a23c3f89..2d0a63b95 100644
--- a/server/modules/routing/avrorouter/avro_converter.cc
+++ b/server/modules/routing/avrorouter/avro_converter.cc
@@ -16,7 +16,7 @@
 #include <limits.h>
 
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.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 81354a2be..5e2878634 100644
--- a/server/modules/routing/avrorouter/avro_file.cc
+++ b/server/modules/routing/avrorouter/avro_file.cc
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #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 13ae7d9d7..4ae6db644 100644
--- a/server/modules/routing/avrorouter/avro_main.cc
+++ b/server/modules/routing/avrorouter/avro_main.cc
@@ -26,7 +26,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/maxscale.h>
 #include <maxbase/worker.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/paths.h>
diff --git a/server/modules/routing/avrorouter/avro_rbr.cc b/server/modules/routing/avrorouter/avro_rbr.cc
index 2589b2a2f..4074b739d 100644
--- a/server/modules/routing/avrorouter/avro_rbr.cc
+++ b/server/modules/routing/avrorouter/avro_rbr.cc
@@ -15,7 +15,7 @@
 
 #include <maxscale/mysql_utils.hh>
 #include <jansson.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <strings.h>
 #include <signal.h>
 #include <maxscale/utils.h>
diff --git a/server/modules/routing/avrorouter/avro_schema.cc b/server/modules/routing/avrorouter/avro_schema.cc
index 9297d5c3c..17dcf1b14 100644
--- a/server/modules/routing/avrorouter/avro_schema.cc
+++ b/server/modules/routing/avrorouter/avro_schema.cc
@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <string.h>
 #include <strings.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /**
  * @brief Check whether the field is one that was generated by the avrorouter
diff --git a/server/modules/routing/avrorouter/avrorouter.hh b/server/modules/routing/avrorouter/avrorouter.hh
index d6d6972a4..0fb4a69e8 100644
--- a/server/modules/routing/avrorouter/avrorouter.hh
+++ b/server/modules/routing/avrorouter/avrorouter.hh
@@ -19,7 +19,7 @@
 #include <stdint.h>
 #include <string>
 #include <vector>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/service.hh>
 #include <maxscale/mysql_binlog.h>
diff --git a/server/modules/routing/binlogrouter/blr.cc b/server/modules/routing/binlogrouter/blr.cc
index ee528328d..1436741a2 100644
--- a/server/modules/routing/binlogrouter/blr.cc
+++ b/server/modules/routing/binlogrouter/blr.cc
@@ -37,7 +37,7 @@
 
 #include <maxbase/atomic.h>
 #include <maxbase/worker.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
diff --git a/server/modules/routing/binlogrouter/blr_event.cc b/server/modules/routing/binlogrouter/blr_event.cc
index 7cd961956..cc1082688 100644
--- a/server/modules/routing/binlogrouter/blr_event.cc
+++ b/server/modules/routing/binlogrouter/blr_event.cc
@@ -15,7 +15,7 @@
 
 #include <inttypes.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 bool blr_handle_one_event(MXS_ROUTER* instance, REP_HEADER& hdr, uint8_t* ptr, uint32_t len, int semisync)
 {
diff --git a/server/modules/routing/binlogrouter/blr_file.cc b/server/modules/routing/binlogrouter/blr_file.cc
index 5354ff51f..2cd50925d 100644
--- a/server/modules/routing/binlogrouter/blr_file.cc
+++ b/server/modules/routing/binlogrouter/blr_file.cc
@@ -30,7 +30,7 @@
 
 #include <ini.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/encryption.h>
diff --git a/server/modules/routing/binlogrouter/blr_master.cc b/server/modules/routing/binlogrouter/blr_master.cc
index c3d00e401..a5f42a80c 100644
--- a/server/modules/routing/binlogrouter/blr_master.cc
+++ b/server/modules/routing/binlogrouter/blr_master.cc
@@ -40,7 +40,7 @@
 
 #include <sstream>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/dcb.hh>
diff --git a/server/modules/routing/binlogrouter/blr_slave.cc b/server/modules/routing/binlogrouter/blr_slave.cc
index 4b2613f21..8cce15062 100644
--- a/server/modules/routing/binlogrouter/blr_slave.cc
+++ b/server/modules/routing/binlogrouter/blr_slave.cc
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <zlib.h>
 #include <vector>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/clock.h>
 #include <maxscale/dcb.hh>
diff --git a/server/modules/routing/binlogrouter/maxbinlogcheck.cc b/server/modules/routing/binlogrouter/maxbinlogcheck.cc
index 348d2bfb1..643758636 100644
--- a/server/modules/routing/binlogrouter/maxbinlogcheck.cc
+++ b/server/modules/routing/binlogrouter/maxbinlogcheck.cc
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.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 01f749b5c..c61de7b64 100644
--- a/server/modules/routing/binlogrouter/test/testbinlog.cc
+++ b/server/modules/routing/binlogrouter/test/testbinlog.cc
@@ -36,7 +36,7 @@
 #include <maxscale/dcb.hh>
 #include <time.h>
 #include <maxscale/paths.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/mainworker.hh>
 #include <maxscale/utils.hh>
 #include "../../../../core/internal/modules.hh"
diff --git a/server/modules/routing/cli/cli.cc b/server/modules/routing/cli/cli.cc
index 343af19a8..0c2ccb49f 100644
--- a/server/modules/routing/cli/cli.cc
+++ b/server/modules/routing/cli/cli.cc
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <maxbase/atomic.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/poll.hh>
diff --git a/server/modules/routing/cli/debugcmd.cc b/server/modules/routing/cli/debugcmd.cc
index d1a9d0d94..c8b7fbe5a 100644
--- a/server/modules/routing/cli/debugcmd.cc
+++ b/server/modules/routing/cli/debugcmd.cc
@@ -37,7 +37,7 @@
 
 #include <maxbase/atomic.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
diff --git a/server/modules/routing/hintrouter/hintroutersession.cc b/server/modules/routing/hintrouter/hintroutersession.cc
index e23b7061f..004bcff4c 100644
--- a/server/modules/routing/hintrouter/hintroutersession.cc
+++ b/server/modules/routing/hintrouter/hintroutersession.cc
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <functional>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include "hintrouter.hh"
 
 namespace
diff --git a/server/modules/routing/maxinfo/maxinfo.cc b/server/modules/routing/maxinfo/maxinfo.cc
index 35fcaa23f..557247905 100644
--- a/server/modules/routing/maxinfo/maxinfo.cc
+++ b/server/modules/routing/maxinfo/maxinfo.cc
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/service.hh>
 #include <maxscale/server.hh>
 #include <maxscale/router.hh>
diff --git a/server/modules/routing/maxinfo/maxinfo_error.cc b/server/modules/routing/maxinfo/maxinfo_error.cc
index 27ce0f4b4..420bcdd47 100644
--- a/server/modules/routing/maxinfo/maxinfo_error.cc
+++ b/server/modules/routing/maxinfo/maxinfo_error.cc
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
 #include <maxscale/router.hh>
diff --git a/server/modules/routing/maxinfo/maxinfo_exec.cc b/server/modules/routing/maxinfo/maxinfo_exec.cc
index 333b2a175..16e10c373 100644
--- a/server/modules/routing/maxinfo/maxinfo_exec.cc
+++ b/server/modules/routing/maxinfo/maxinfo_exec.cc
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
diff --git a/server/modules/routing/maxinfo/maxinfo_parse.cc b/server/modules/routing/maxinfo/maxinfo_parse.cc
index ca6aa4662..e0c48e40d 100644
--- a/server/modules/routing/maxinfo/maxinfo_parse.cc
+++ b/server/modules/routing/maxinfo/maxinfo_parse.cc
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
 #include <maxscale/router.hh>
diff --git a/server/modules/routing/readwritesplit/readwritesplit.cc b/server/modules/routing/readwritesplit/readwritesplit.cc
index e665fdbac..3e4d33573 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.cc
+++ b/server/modules/routing/readwritesplit/readwritesplit.cc
@@ -23,7 +23,7 @@
 #include <new>
 #include <sstream>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
diff --git a/server/modules/routing/readwritesplit/rwsplit_mysql.cc b/server/modules/routing/readwritesplit/rwsplit_mysql.cc
index 95c624925..a5328f597 100644
--- a/server/modules/routing/readwritesplit/rwsplit_mysql.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_mysql.cc
@@ -25,7 +25,7 @@
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /**
  * Functions within the read-write split router that are specific to
diff --git a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
index bc9f3e83a..ca64986fa 100644
--- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <strings.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/clock.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/modutil.hh>
diff --git a/server/modules/routing/schemarouter/schemarouterinstance.cc b/server/modules/routing/schemarouter/schemarouterinstance.cc
index cb7c24cf7..dd6cd7f75 100644
--- a/server/modules/routing/schemarouter/schemarouterinstance.cc
+++ b/server/modules/routing/schemarouter/schemarouterinstance.cc
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <strings.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
diff --git a/server/modules/routing/schemarouter/schemaroutersession.cc b/server/modules/routing/schemarouter/schemaroutersession.cc
index 684ebc4cf..330033a7e 100644
--- a/server/modules/routing/schemarouter/schemaroutersession.cc
+++ b/server/modules/routing/schemarouter/schemaroutersession.cc
@@ -18,7 +18,7 @@
 #include <inttypes.h>
 
 #include <maxbase/atomic.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/poll.hh>
 #include <maxscale/query_classifier.hh>
diff --git a/server/modules/routing/schemarouter/shard_map.cc b/server/modules/routing/schemarouter/shard_map.cc
index cdc92424c..d4f1cdd6f 100644
--- a/server/modules/routing/schemarouter/shard_map.cc
+++ b/server/modules/routing/schemarouter/shard_map.cc
@@ -15,7 +15,7 @@
 
 #include <algorithm>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 Shard::Shard()
     : m_last_updated(time(NULL))