diff --git a/examples/roundrobinrouter.cpp b/examples/roundrobinrouter.cpp
index 4a55fae69..2ded3888e 100644
--- a/examples/roundrobinrouter.cpp
+++ b/examples/roundrobinrouter.cpp
@@ -41,7 +41,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/modutil.hh>
diff --git a/include/maxscale/adminusers.h.in b/include/maxscale/adminusers.h.in
index 848bf0e6b..cc5d042b6 100644
--- a/include/maxscale/adminusers.h.in
+++ b/include/maxscale/adminusers.h.in
@@ -17,7 +17,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/users.h>
 
 MXS_BEGIN_DECLS
diff --git a/include/maxscale/dcb.h b/include/maxscale/dcb.hh
similarity index 100%
rename from include/maxscale/dcb.h
rename to include/maxscale/dcb.hh
diff --git a/include/maxscale/filter.hh b/include/maxscale/filter.hh
index 3858fd63e..6c90354d3 100644
--- a/include/maxscale/filter.hh
+++ b/include/maxscale/filter.hh
@@ -21,7 +21,7 @@
 #include <maxbase/jansson.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/config.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/routing.h>
 #include <maxscale/session.hh>
 
diff --git a/include/maxscale/housekeeper.h b/include/maxscale/housekeeper.h
index 84a059b67..46861a382 100644
--- a/include/maxscale/housekeeper.h
+++ b/include/maxscale/housekeeper.h
@@ -17,7 +17,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 
 MXS_BEGIN_DECLS
 
diff --git a/include/maxscale/modulecmd.hh b/include/maxscale/modulecmd.hh
index a8a933a83..3d0121b50 100644
--- a/include/maxscale/modulecmd.hh
+++ b/include/maxscale/modulecmd.hh
@@ -24,7 +24,7 @@
 
 #include <maxscale/ccdefs.hh>
 #include <maxbase/jansson.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/monitor.hh>
 #include <maxscale/server.hh>
diff --git a/include/maxscale/modutil.hh b/include/maxscale/modutil.hh
index deeb5e4f8..9193d09ce 100644
--- a/include/maxscale/modutil.hh
+++ b/include/maxscale/modutil.hh
@@ -19,7 +19,7 @@
 #include <maxscale/ccdefs.hh>
 #include <string>
 #include <maxscale/buffer.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/pcre2.h>
 
 #define PTR_IS_RESULTSET(b)    (b[0] == 0x01 && b[1] == 0x0 && b[2] == 0x0 && b[3] == 0x01)
diff --git a/include/maxscale/monitor.hh b/include/maxscale/monitor.hh
index d9f09b27c..48dc771a8 100644
--- a/include/maxscale/monitor.hh
+++ b/include/maxscale/monitor.hh
@@ -24,7 +24,7 @@
 #include <maxbase/worker.hh>
 #include <maxbase/jansson.h>
 #include <maxscale/config.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/server.hh>
 #include <maxscale/protocol/mysql.h>
 
diff --git a/include/maxscale/poll.h b/include/maxscale/poll.h
index 0fec34c76..4504c26de 100644
--- a/include/maxscale/poll.h
+++ b/include/maxscale/poll.h
@@ -19,7 +19,7 @@
 #include <maxscale/cdefs.h>
 
 #include <maxscale/buffer.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 
 MXS_BEGIN_DECLS
 
diff --git a/include/maxscale/protocol/mysql.h b/include/maxscale/protocol/mysql.h
index 50009ffae..85b018357 100644
--- a/include/maxscale/protocol/mysql.h
+++ b/include/maxscale/protocol/mysql.h
@@ -37,7 +37,7 @@
 #include <unistd.h>
 
 #include <maxscale/buffer.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/session.hh>
 #include <maxscale/version.h>
 
diff --git a/include/maxscale/resultset.hh b/include/maxscale/resultset.hh
index 5886617b3..ff99d0666 100644
--- a/include/maxscale/resultset.hh
+++ b/include/maxscale/resultset.hh
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/mysql_binlog.h>
 
 /**
diff --git a/include/maxscale/server.hh b/include/maxscale/server.hh
index 0fa71ca86..8ea457ef3 100644
--- a/include/maxscale/server.hh
+++ b/include/maxscale/server.hh
@@ -17,7 +17,7 @@
 #include <string>
 #include <maxbase/jansson.h>
 #include <maxscale/config.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 
 #define MAX_SERVER_ADDRESS_LEN 1024
 #define MAX_SERVER_MONUSER_LEN 1024
diff --git a/include/maxscale/service.hh b/include/maxscale/service.hh
index 0d1c7e3ff..326fe192b 100644
--- a/include/maxscale/service.hh
+++ b/include/maxscale/service.hh
@@ -24,7 +24,7 @@
 #include <maxbase/jansson.h>
 #include <maxscale/config.hh>
 #include <maxscale/protocol.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/listener.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/server.hh>
diff --git a/include/maxscale/session.hh b/include/maxscale/session.hh
index ae219fd4f..abee0a134 100644
--- a/include/maxscale/session.hh
+++ b/include/maxscale/session.hh
@@ -18,7 +18,7 @@
 
 #include <maxbase/atomic.h>
 #include <maxbase/jansson.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/buffer.h>
 #include <maxscale/log.h>
 #include <maxscale/utils.hh>
diff --git a/include/maxscale/users.h b/include/maxscale/users.h
index 6e99306ce..0f6255cb4 100644
--- a/include/maxscale/users.h
+++ b/include/maxscale/users.h
@@ -18,7 +18,7 @@
 
 #include <maxscale/cdefs.h>
 #include <maxbase/jansson.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/listener.hh>
 #include <maxscale/service.hh>
 #include <openssl/sha.h>
diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index 8e89d816e..82c7d94b7 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -49,7 +49,7 @@
 #include <maxsql/mariadb.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <maxscale/log.h>
 #include <maxscale/maxscale.h>
diff --git a/server/core/internal/dcb.hh b/server/core/internal/dcb.hh
index 851994d0e..06cb4e7d2 100644
--- a/server/core/internal/dcb.hh
+++ b/server/core/internal/dcb.hh
@@ -12,7 +12,7 @@
  */
 #pragma once
 
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 
 MXS_BEGIN_DECLS
 
diff --git a/server/core/internal/modules.hh b/server/core/internal/modules.hh
index 48aed7ee1..5b35d943c 100644
--- a/server/core/internal/modules.hh
+++ b/server/core/internal/modules.hh
@@ -13,7 +13,7 @@
 #pragma once
 
 #include <maxscale/ccdefs.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/resultset.hh>
 
diff --git a/server/core/internal/session.hh b/server/core/internal/session.hh
index c759aeadf..8d7b19682 100644
--- a/server/core/internal/session.hh
+++ b/server/core/internal/session.hh
@@ -60,7 +60,7 @@ const char* session_state(mxs_session_state_t);
  * @param session  The session to link with the dcb
  * @param dcb      The backend DCB to be linked
  */
-void session_link_backend_dcb(MXS_SESSION* session, struct dcb* dcb);
+void session_link_backend_dcb(MXS_SESSION* session, DCB* dcb);
 
 /**
  * Unlink a session to a backend DCB.
@@ -68,15 +68,15 @@ void session_link_backend_dcb(MXS_SESSION* session, struct dcb* dcb);
  * @param session  The session to unlink with the dcb
  * @param dcb      The backend DCB to be unlinked
  */
-void session_unlink_backend_dcb(MXS_SESSION* session, struct dcb* dcb);
+void session_unlink_backend_dcb(MXS_SESSION* session, DCB* dcb);
 
 void printAllSessions();
 void printSession(MXS_SESSION*);
 
 void dprintSessionList(DCB* pdcb);
-void dprintAllSessions(struct dcb*);
-void dprintSession(struct dcb*, MXS_SESSION*);
-void dListSessions(struct dcb*);
+void dprintAllSessions(DCB*);
+void dprintSession(DCB*, MXS_SESSION*);
+void dListSessions(DCB*);
 
 /**
  * @brief Get a session reference
diff --git a/server/core/resultset.cc b/server/core/resultset.cc
index a8f8c2794..55a9246d7 100644
--- a/server/core/resultset.cc
+++ b/server/core/resultset.cc
@@ -18,7 +18,7 @@
 
 #include <maxscale/resultset.hh>
 #include <maxscale/buffer.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/mysql_binlog.h>
 #include <maxscale/protocol/mysql.h>
 
diff --git a/server/core/server.cc b/server/core/server.cc
index 9ce97442a..c3a507ee4 100644
--- a/server/core/server.cc
+++ b/server/core/server.cc
@@ -37,7 +37,7 @@
 #include <maxscale/config.hh>
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/poll.h>
 #include <maxscale/log.h>
 #include <maxscale/ssl.h>
diff --git a/server/core/service.cc b/server/core/service.cc
index d7e420462..846275f4d 100644
--- a/server/core/service.cc
+++ b/server/core/service.cc
@@ -38,7 +38,7 @@
 
 #include <maxscale/service.hh>
 #include <maxscale/alloc.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/paths.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/listener.hh>
diff --git a/server/core/session.cc b/server/core/session.cc
index ea720135b..f9a20b2b0 100644
--- a/server/core/session.cc
+++ b/server/core/session.cc
@@ -29,7 +29,7 @@
 #include <maxbase/atomic.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/clock.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <maxscale/json_api.h>
 #include <maxscale/log.h>
diff --git a/server/core/ssl.cc b/server/core/ssl.cc
index d47d3fc2e..a5d3103d3 100644
--- a/server/core/ssl.cc
+++ b/server/core/ssl.cc
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include <sys/ioctl.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/poll.h>
 #include <maxscale/service.hh>
diff --git a/server/core/test/test_modulecmd.cc b/server/core/test/test_modulecmd.cc
index 33222febc..16d2246f4 100644
--- a/server/core/test/test_modulecmd.cc
+++ b/server/core/test/test_modulecmd.cc
@@ -17,7 +17,7 @@
 
 #include <maxbase/maxbase.hh>
 #include <maxscale/alloc.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/paths.h>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/session.hh>
diff --git a/server/core/test/test_poll.cc b/server/core/test/test_poll.cc
index 13cb5a579..ad1c22393 100644
--- a/server/core/test/test_poll.cc
+++ b/server/core/test/test_poll.cc
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/listener.hh>
 #include <maxscale/service.hh>
 
diff --git a/server/core/test/test_utils.h b/server/core/test/test_utils.h
index 237ad26d6..f4390b3c3 100644
--- a/server/core/test/test_utils.h
+++ b/server/core/test/test_utils.h
@@ -16,7 +16,7 @@
 
 #include <maxscale/cdefs.h>
 #include <maxbase/maxbase.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <maxscale/maxscale_test.h>
 #include <maxscale/log.h>
diff --git a/server/core/utils.cc b/server/core/utils.cc
index 58ef80af9..22a4ac777 100644
--- a/server/core/utils.cc
+++ b/server/core/utils.cc
@@ -44,7 +44,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/config.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/limits.h>
 #include <maxscale/pcre2.h>
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
index 4a4540f3f..a843ef22c 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
+++ b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
@@ -17,7 +17,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
index 775512ae2..04a25fc82 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
+++ b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
@@ -15,7 +15,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/server.hh>
diff --git a/server/modules/authenticator/HTTPAuth/http_auth.cc b/server/modules/authenticator/HTTPAuth/http_auth.cc
index d397d66f0..4e2c7af27 100644
--- a/server/modules/authenticator/HTTPAuth/http_auth.cc
+++ b/server/modules/authenticator/HTTPAuth/http_auth.cc
@@ -29,7 +29,7 @@
 #include <maxscale/authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/buffer.h>
 #include <openssl/bio.h>
 #include <maxscale/service.hh>
diff --git a/server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc b/server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc
index 6e4c8991e..5240436ff 100644
--- a/server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc
+++ b/server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc
@@ -31,7 +31,7 @@
 #include <maxscale/authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/buffer.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/users.h>
diff --git a/server/modules/authenticator/MySQLAuth/dbusers.cc b/server/modules/authenticator/MySQLAuth/dbusers.cc
index b8079a8b7..12b4c0169 100644
--- a/server/modules/authenticator/MySQLAuth/dbusers.cc
+++ b/server/modules/authenticator/MySQLAuth/dbusers.cc
@@ -22,7 +22,7 @@
 #include <stdio.h>
 
 #include <maxscale/alloc.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/mysql_utils.hh>
diff --git a/server/modules/authenticator/MySQLAuth/mysql_auth.hh b/server/modules/authenticator/MySQLAuth/mysql_auth.hh
index 3f80017ab..737226c68 100644
--- a/server/modules/authenticator/MySQLAuth/mysql_auth.hh
+++ b/server/modules/authenticator/MySQLAuth/mysql_auth.hh
@@ -20,7 +20,7 @@
 #include <arpa/inet.h>
 
 #include <maxscale/authenticator.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/buffer.hh>
 #include <maxscale/service.hh>
 #include <maxscale/sqlite3.h>
diff --git a/server/modules/authenticator/NullAuthAllow/null_auth_allow.cc b/server/modules/authenticator/NullAuthAllow/null_auth_allow.cc
index 30b280f15..a48d20935 100644
--- a/server/modules/authenticator/NullAuthAllow/null_auth_allow.cc
+++ b/server/modules/authenticator/NullAuthAllow/null_auth_allow.cc
@@ -31,7 +31,7 @@
 
 #include <maxscale/authenticator.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/buffer.h>
 #include <maxscale/users.h>
 
diff --git a/server/modules/authenticator/NullAuthDeny/null_auth_deny.cc b/server/modules/authenticator/NullAuthDeny/null_auth_deny.cc
index 7ac492e20..ca166c870 100644
--- a/server/modules/authenticator/NullAuthDeny/null_auth_deny.cc
+++ b/server/modules/authenticator/NullAuthDeny/null_auth_deny.cc
@@ -31,7 +31,7 @@
 
 #include <maxscale/authenticator.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/buffer.h>
 #include <maxscale/users.h>
 
diff --git a/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh b/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh
index 99184b783..0777b1178 100644
--- a/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh
+++ b/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh
@@ -22,7 +22,7 @@
 #include <string>
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/protocol/mysql.h>
 
 using std::string;
diff --git a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh
index 321530ace..a667b1076 100644
--- a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh
+++ b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh
@@ -20,5 +20,5 @@
 #include <maxscale/ccdefs.hh>
 
 #include <maxscale/buffer.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/filter/test/maxscale/mock/dcb.hh b/server/modules/filter/test/maxscale/mock/dcb.hh
index ac9534bd4..d659ef54d 100644
--- a/server/modules/filter/test/maxscale/mock/dcb.hh
+++ b/server/modules/filter/test/maxscale/mock/dcb.hh
@@ -13,7 +13,7 @@
 #pragma once
 
 #include "mock.hh"
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/session.hh>
 
 namespace maxscale
diff --git a/server/modules/include/cdc.hh b/server/modules/include/cdc.hh
index 2374ebe08..073f88fcb 100644
--- a/server/modules/include/cdc.hh
+++ b/server/modules/include/cdc.hh
@@ -22,7 +22,7 @@
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/buffer.hh>
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
diff --git a/server/modules/include/telnetd.h b/server/modules/include/telnetd.h
index 5d3389db2..ac16267df 100644
--- a/server/modules/include/telnetd.h
+++ b/server/modules/include/telnetd.h
@@ -27,7 +27,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 
 MXS_BEGIN_DECLS
diff --git a/server/modules/monitor/galeramon/galeramon.cc b/server/modules/monitor/galeramon/galeramon.cc
index 527d54371..809b21086 100644
--- a/server/modules/monitor/galeramon/galeramon.cc
+++ b/server/modules/monitor/galeramon/galeramon.cc
@@ -25,7 +25,7 @@
 #include <mysqld_error.h>
 #include <maxscale/alloc.h>
 #include <maxscale/config.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/mysql_utils.hh>
diff --git a/server/modules/monitor/mariadbmon/mariadbmon.cc b/server/modules/monitor/mariadbmon/mariadbmon.cc
index c125164ea..195d57151 100644
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@@ -21,9 +21,10 @@
 #include <maxbase/assert.h>
 #include <maxbase/format.hh>
 #include <maxscale/alloc.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/mysql_utils.hh>
+
 #include <maxscale/routingworker.h>
 #include <maxscale/secrets.h>
 #include <maxscale/utils.h>
diff --git a/server/modules/monitor/mmmon/mmmon.cc b/server/modules/monitor/mmmon/mmmon.cc
index 752e61960..3036f2ae6 100644
--- a/server/modules/monitor/mmmon/mmmon.cc
+++ b/server/modules/monitor/mmmon/mmmon.cc
@@ -25,8 +25,8 @@
 #include <mysqld_error.h>
 #include <maxscale/alloc.h>
 #include <maxscale/config.hh>
-#include <maxscale/dcb.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/mysql_utils.hh>
diff --git a/server/modules/protocol/HTTPD/httpd.hh b/server/modules/protocol/HTTPD/httpd.hh
index 6a4fb1b02..9b128d7a8 100644
--- a/server/modules/protocol/HTTPD/httpd.hh
+++ b/server/modules/protocol/HTTPD/httpd.hh
@@ -22,7 +22,7 @@
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/buffer.hh>
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
diff --git a/server/modules/protocol/maxscaled/maxscaled.cc b/server/modules/protocol/maxscaled/maxscaled.cc
index b4ce1da0e..998ef956d 100644
--- a/server/modules/protocol/maxscaled/maxscaled.cc
+++ b/server/modules/protocol/maxscaled/maxscaled.cc
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/buffer.h>
 #include <maxscale/protocol.h>
 #include <maxscale/service.hh>
diff --git a/server/modules/protocol/maxscaled/maxscaled.h b/server/modules/protocol/maxscaled/maxscaled.h
index 2e44769e0..82ab0e2de 100644
--- a/server/modules/protocol/maxscaled/maxscaled.h
+++ b/server/modules/protocol/maxscaled/maxscaled.h
@@ -25,7 +25,7 @@
  *
  * @endverbatim
  */
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 
 MXS_BEGIN_DECLS
diff --git a/server/modules/protocol/telnetd/telnetd.cc b/server/modules/protocol/telnetd/telnetd.cc
index 5bd4f46aa..60c819629 100644
--- a/server/modules/protocol/telnetd/telnetd.cc
+++ b/server/modules/protocol/telnetd/telnetd.cc
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <maxscale/alloc.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/buffer.h>
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
diff --git a/server/modules/routing/avrorouter/avro.cc b/server/modules/routing/avrorouter/avro.cc
index a068466b4..3a496481b 100644
--- a/server/modules/routing/avrorouter/avro.cc
+++ b/server/modules/routing/avrorouter/avro.cc
@@ -31,7 +31,7 @@
 #include <maxbase/atomic.h>
 #include <maxbase/worker.hh>
 #include <maxscale/alloc.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #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 d32937ed4..6a57985a9 100644
--- a/server/modules/routing/avrorouter/avro_client.cc
+++ b/server/modules/routing/avrorouter/avro_client.cc
@@ -28,7 +28,7 @@
 #include <maxscale/server.hh>
 #include <maxscale/router.hh>
 #include <maxbase/atomic.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/version.h>
 #include <maxscale/alloc.h>
diff --git a/server/modules/routing/avrorouter/avro_main.cc b/server/modules/routing/avrorouter/avro_main.cc
index ad62b8a6a..45570d494 100644
--- a/server/modules/routing/avrorouter/avro_main.cc
+++ b/server/modules/routing/avrorouter/avro_main.cc
@@ -27,7 +27,7 @@
 #include <maxscale/maxscale.h>
 #include <maxbase/worker.hh>
 #include <maxscale/alloc.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/paths.h>
diff --git a/server/modules/routing/avrorouter/avrorouter.hh b/server/modules/routing/avrorouter/avrorouter.hh
index 6ffe026bd..e1a80e34c 100644
--- a/server/modules/routing/avrorouter/avrorouter.hh
+++ b/server/modules/routing/avrorouter/avrorouter.hh
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 #include <maxscale/alloc.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/service.hh>
 #include <maxscale/mysql_binlog.h>
 #include <maxscale/users.h>
diff --git a/server/modules/routing/binlogrouter/blr.cc b/server/modules/routing/binlogrouter/blr.cc
index 9b963a74b..2f26309d7 100644
--- a/server/modules/routing/binlogrouter/blr.cc
+++ b/server/modules/routing/binlogrouter/blr.cc
@@ -39,7 +39,7 @@
 #include <maxbase/worker.h>
 #include <maxscale/alloc.h>
 #include <maxscale/config.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/routing/binlogrouter/blr.hh b/server/modules/routing/binlogrouter/blr.hh
index 91064bcb4..eff7e8e57 100644
--- a/server/modules/routing/binlogrouter/blr.hh
+++ b/server/modules/routing/binlogrouter/blr.hh
@@ -32,7 +32,7 @@
 #include <vector>
 
 #include <maxscale/buffer.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/router.hh>
 #include <maxscale/secrets.h>
diff --git a/server/modules/routing/binlogrouter/blr_cache.cc b/server/modules/routing/binlogrouter/blr_cache.cc
index 7910eda94..7b2311a1d 100644
--- a/server/modules/routing/binlogrouter/blr_cache.cc
+++ b/server/modules/routing/binlogrouter/blr_cache.cc
@@ -33,7 +33,7 @@
 #include <maxscale/server.hh>
 #include <maxscale/router.hh>
 #include <maxbase/atomic.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 
 #include <maxscale/log.h>
 
diff --git a/server/modules/routing/binlogrouter/blr_file.cc b/server/modules/routing/binlogrouter/blr_file.cc
index 6207fdd53..81b0a3a40 100644
--- a/server/modules/routing/binlogrouter/blr_file.cc
+++ b/server/modules/routing/binlogrouter/blr_file.cc
@@ -32,7 +32,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/encryption.h>
 #include <maxscale/log.h>
 #include <maxscale/paths.h>
diff --git a/server/modules/routing/binlogrouter/blr_master.cc b/server/modules/routing/binlogrouter/blr_master.cc
index 8a14e2017..8a15ce4eb 100644
--- a/server/modules/routing/binlogrouter/blr_master.cc
+++ b/server/modules/routing/binlogrouter/blr_master.cc
@@ -43,7 +43,7 @@
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/buffer.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/routing/binlogrouter/blr_slave.cc b/server/modules/routing/binlogrouter/blr_slave.cc
index bf20a0b73..dbca7f70d 100644
--- a/server/modules/routing/binlogrouter/blr_slave.cc
+++ b/server/modules/routing/binlogrouter/blr_slave.cc
@@ -37,7 +37,7 @@
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/clock.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <maxscale/log.h>
 #include <maxscale/maxscale.h>
diff --git a/server/modules/routing/binlogrouter/test/testbinlog.cc b/server/modules/routing/binlogrouter/test/testbinlog.cc
index bd08b977f..4898e33d2 100644
--- a/server/modules/routing/binlogrouter/test/testbinlog.cc
+++ b/server/modules/routing/binlogrouter/test/testbinlog.cc
@@ -32,7 +32,7 @@
 #include <maxscale/server.hh>
 #include <maxscale/router.hh>
 #include <maxbase/atomic.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <time.h>
 #include <maxscale/log.h>
diff --git a/server/modules/routing/cli/cli.cc b/server/modules/routing/cli/cli.cc
index dcb8130c8..3e3a5f467 100644
--- a/server/modules/routing/cli/cli.cc
+++ b/server/modules/routing/cli/cli.cc
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <maxbase/atomic.h>
 #include <maxscale/alloc.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/poll.h>
diff --git a/server/modules/routing/debugcli/debugcli.cc b/server/modules/routing/debugcli/debugcli.cc
index ca1150676..76aa1876a 100644
--- a/server/modules/routing/debugcli/debugcli.cc
+++ b/server/modules/routing/debugcli/debugcli.cc
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <maxbase/atomic.h>
 #include <maxscale/alloc.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/poll.h>
diff --git a/server/modules/routing/debugcli/debugcmd.cc b/server/modules/routing/debugcli/debugcmd.cc
index 706a9acc1..15665c15b 100644
--- a/server/modules/routing/debugcli/debugcmd.cc
+++ b/server/modules/routing/debugcli/debugcmd.cc
@@ -40,7 +40,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
 #include <maxscale/config.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/housekeeper.h>
 #include <maxscale/log.h>
diff --git a/server/modules/routing/hintrouter/dcb.hh b/server/modules/routing/hintrouter/dcb.hh
index 49bb39309..777079327 100644
--- a/server/modules/routing/hintrouter/dcb.hh
+++ b/server/modules/routing/hintrouter/dcb.hh
@@ -16,7 +16,7 @@
 
 #include <memory>
 
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 
 class Dcb
 {
diff --git a/server/modules/routing/hintrouter/hintrouterdefs.hh b/server/modules/routing/hintrouter/hintrouterdefs.hh
index 8b1e572b9..ee728efa9 100644
--- a/server/modules/routing/hintrouter/hintrouterdefs.hh
+++ b/server/modules/routing/hintrouter/hintrouterdefs.hh
@@ -14,7 +14,7 @@
 
 #include <maxscale/ccdefs.hh>
 
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 
 #if defined (SS_DEBUG)
diff --git a/server/modules/routing/maxinfo/maxinfo.cc b/server/modules/routing/maxinfo/maxinfo.cc
index 19d66bc7a..71643897e 100644
--- a/server/modules/routing/maxinfo/maxinfo.cc
+++ b/server/modules/routing/maxinfo/maxinfo.cc
@@ -41,7 +41,7 @@
 #include <maxscale/modutil.hh>
 #include <maxscale/monitor.hh>
 #include <maxbase/atomic.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/maxscale.h>
 #include <maxscale/log.h>
 #include <maxscale/resultset.hh>
diff --git a/server/modules/routing/maxinfo/maxinfo_error.cc b/server/modules/routing/maxinfo/maxinfo_error.cc
index 3108a4997..f58155d62 100644
--- a/server/modules/routing/maxinfo/maxinfo_error.cc
+++ b/server/modules/routing/maxinfo/maxinfo_error.cc
@@ -35,7 +35,7 @@
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxbase/atomic.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/poll.h>
 #include <maxscale/log.h>
 
diff --git a/server/modules/routing/maxinfo/maxinfo_exec.cc b/server/modules/routing/maxinfo/maxinfo_exec.cc
index dd2937f7b..7c84500f5 100644
--- a/server/modules/routing/maxinfo/maxinfo_exec.cc
+++ b/server/modules/routing/maxinfo/maxinfo_exec.cc
@@ -34,7 +34,7 @@
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/config.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/routing/maxinfo/maxinfo_parse.cc b/server/modules/routing/maxinfo/maxinfo_parse.cc
index a59cb972e..565f51eb3 100644
--- a/server/modules/routing/maxinfo/maxinfo_parse.cc
+++ b/server/modules/routing/maxinfo/maxinfo_parse.cc
@@ -37,7 +37,7 @@
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxbase/atomic.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/poll.h>
 #include <maxscale/log.h>
 
diff --git a/server/modules/routing/readconnroute/readconnection.hh b/server/modules/routing/readconnroute/readconnection.hh
index 3276939ec..31439628f 100644
--- a/server/modules/routing/readconnroute/readconnection.hh
+++ b/server/modules/routing/readconnroute/readconnection.hh
@@ -19,7 +19,7 @@
 #define MXS_MODULE_NAME "readconnroute"
 
 #include <maxscale/ccdefs.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/service.hh>
 #include <maxscale/router.hh>
 
diff --git a/server/modules/routing/readconnroute/readconnroute.cc b/server/modules/routing/readconnroute/readconnroute.cc
index adccf2382..12ee332dd 100644
--- a/server/modules/routing/readconnroute/readconnroute.cc
+++ b/server/modules/routing/readconnroute/readconnroute.cc
@@ -82,7 +82,7 @@
 #include <maxscale/server.hh>
 #include <maxscale/router.hh>
 #include <maxbase/atomic.hh>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/routing/readwritesplit/readwritesplit.cc b/server/modules/routing/readwritesplit/readwritesplit.cc
index 81637e424..3904b70b0 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.cc
+++ b/server/modules/routing/readwritesplit/readwritesplit.cc
@@ -24,7 +24,7 @@
 #include <sstream>
 
 #include <maxscale/alloc.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
diff --git a/server/modules/routing/readwritesplit/readwritesplit.hh b/server/modules/routing/readwritesplit/readwritesplit.hh
index 3e760f7be..883473bb8 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.hh
+++ b/server/modules/routing/readwritesplit/readwritesplit.hh
@@ -27,7 +27,7 @@
 #include <mutex>
 #include <functional>
 
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/queryclassifier.hh>
 #include <maxscale/router.hh>
diff --git a/server/modules/routing/readwritesplit/rwsplit_mysql.cc b/server/modules/routing/readwritesplit/rwsplit_mysql.cc
index fa7ab46d2..f7df62a7a 100644
--- a/server/modules/routing/readwritesplit/rwsplit_mysql.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_mysql.cc
@@ -22,7 +22,7 @@
 #include <maxscale/router.hh>
 #include <maxscale/log.h>
 #include <maxscale/query_classifier.h>
-#include <maxscale/dcb.h>
+#include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.h>