diff --git a/include/maxscale/poll.h b/include/maxscale/poll.hh
similarity index 96%
rename from include/maxscale/poll.h
rename to include/maxscale/poll.hh
index 4504c26de..cf18bfbb6 100644
--- a/include/maxscale/poll.h
+++ b/include/maxscale/poll.hh
@@ -13,12 +13,12 @@
 #pragma once
 
 /**
- * @file include/maxscale/poll.h - The public poll interface
+ * @file include/maxscale/poll.hh - The public poll interface
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/dcb.hh>
 
 MXS_BEGIN_DECLS
diff --git a/include/maxscale/routingworker.hh b/include/maxscale/routingworker.hh
index 3af2498fe..54d0551c7 100644
--- a/include/maxscale/routingworker.hh
+++ b/include/maxscale/routingworker.hh
@@ -24,7 +24,7 @@
 #include <maxbase/semaphore.hh>
 #include <maxbase/worker.hh>
 #include <maxbase/stopwatch.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/query_classifier.h>
 #include <maxscale/routingworker.h>
 #include <maxscale/session.hh>
diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index bc3489422..3e43f0716 100644
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@@ -45,7 +45,7 @@
 #include <maxscale/limits.h>
 #include <maxscale/listener.hh>
 #include <maxscale/log.h>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/router.hh>
 #include <maxscale/server.hh>
 #include <maxscale/service.hh>
diff --git a/server/core/internal/poll.hh b/server/core/internal/poll.hh
index 57c8ed722..3a2e017fd 100644
--- a/server/core/internal/poll.hh
+++ b/server/core/internal/poll.hh
@@ -17,7 +17,7 @@
  */
 
 #include <maxscale/ccdefs.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/resultset.hh>
 
 struct mxs_worker;
diff --git a/server/core/listener.cc b/server/core/listener.cc
index c15515bed..0c1f7dc5d 100644
--- a/server/core/listener.cc
+++ b/server/core/listener.cc
@@ -34,7 +34,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/users.h>
 #include <maxscale/service.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/routingworker.hh>
 
 #include "internal/modules.hh"
diff --git a/server/core/modutil.cc b/server/core/modutil.cc
index ffa583ea7..ccefaaaed 100644
--- a/server/core/modutil.cc
+++ b/server/core/modutil.cc
@@ -25,7 +25,7 @@
 #include <maxscale/buffer.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/modutil.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/utils.h>
 #include <maxscale/mysql_utils.hh>
diff --git a/server/core/poll.cc b/server/core/poll.cc
index 4b7ae3a3f..5a8148d55 100644
--- a/server/core/poll.cc
+++ b/server/core/poll.cc
@@ -15,7 +15,7 @@
  * @file poll.c  - Abstraction of the epoll functionality
  */
 
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 
 #include <errno.h>
 #include <inttypes.h>
diff --git a/server/core/server.cc b/server/core/server.cc
index 19882e7a3..437bb01ea 100644
--- a/server/core/server.cc
+++ b/server/core/server.cc
@@ -38,7 +38,7 @@
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
 #include <maxscale/dcb.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/log.h>
 #include <maxscale/ssl.h>
 #include <maxscale/alloc.h>
diff --git a/server/core/service.cc b/server/core/service.cc
index 926d6da77..a03d373ff 100644
--- a/server/core/service.cc
+++ b/server/core/service.cc
@@ -43,7 +43,7 @@
 #include <maxscale/housekeeper.h>
 #include <maxscale/listener.hh>
 #include <maxscale/log.h>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/protocol.h>
 #include <maxscale/resultset.hh>
 #include <maxscale/router.hh>
diff --git a/server/core/session.cc b/server/core/session.cc
index 7530e2e7e..dc6aa0d79 100644
--- a/server/core/session.cc
+++ b/server/core/session.cc
@@ -34,7 +34,7 @@
 #include <maxscale/json_api.h>
 #include <maxscale/log.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/router.hh>
 #include <maxscale/routingworker.hh>
 #include <maxscale/service.hh>
diff --git a/server/core/ssl.cc b/server/core/ssl.cc
index 19fd7d3e4..46da8c35d 100644
--- a/server/core/ssl.cc
+++ b/server/core/ssl.cc
@@ -32,7 +32,7 @@
 #include <sys/ioctl.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/log.h>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/service.hh>
 
 /**
diff --git a/server/core/test/test_session.cc b/server/core/test/test_session.cc
index ec96c748a..f564251a8 100644
--- a/server/core/test/test_session.cc
+++ b/server/core/test/test_session.cc
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <dcb.h>
 
 /**
diff --git a/server/core/utils.cc b/server/core/utils.cc
index 22a4ac777..c54b8c3f4 100644
--- a/server/core/utils.cc
+++ b/server/core/utils.cc
@@ -48,7 +48,7 @@
 #include <maxscale/log.h>
 #include <maxscale/limits.h>
 #include <maxscale/pcre2.h>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/random.h>
 #include <maxscale/secrets.h>
 #include <maxscale/session.hh>
diff --git a/server/modules/authenticator/MySQLAuth/mysql_auth.cc b/server/modules/authenticator/MySQLAuth/mysql_auth.cc
index 75568dfd8..4fd2e585d 100644
--- a/server/modules/authenticator/MySQLAuth/mysql_auth.cc
+++ b/server/modules/authenticator/MySQLAuth/mysql_auth.cc
@@ -31,7 +31,7 @@
 #include <maxscale/authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/event.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/paths.h>
 #include <maxscale/secrets.h>
 #include <maxscale/utils.h>
diff --git a/server/modules/filter/binlogfilter/binlogfiltersession.cc b/server/modules/filter/binlogfilter/binlogfiltersession.cc
index eeadc51ca..a1e40dd35 100644
--- a/server/modules/filter/binlogfilter/binlogfiltersession.cc
+++ b/server/modules/filter/binlogfilter/binlogfiltersession.cc
@@ -50,7 +50,7 @@
 
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 
 #include "binlogfilter.hh"
 #include "binlogfiltersession.hh"
diff --git a/server/modules/filter/insertstream/insertstream.cc b/server/modules/filter/insertstream/insertstream.cc
index 4b435e1d9..53290e73b 100644
--- a/server/modules/filter/insertstream/insertstream.cc
+++ b/server/modules/filter/insertstream/insertstream.cc
@@ -22,7 +22,7 @@
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
 
diff --git a/server/modules/filter/masking/maskingfiltersession.cc b/server/modules/filter/masking/maskingfiltersession.cc
index 8538e6ca5..7dd331216 100644
--- a/server/modules/filter/masking/maskingfiltersession.cc
+++ b/server/modules/filter/masking/maskingfiltersession.cc
@@ -20,7 +20,7 @@
 #include <maxscale/filter.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/protocol/mysql.h>
 
 #include "maskingfilter.hh"
diff --git a/server/modules/filter/maxrows/maxrows.cc b/server/modules/filter/maxrows/maxrows.cc
index 31a32119c..b36705bb5 100644
--- a/server/modules/filter/maxrows/maxrows.cc
+++ b/server/modules/filter/maxrows/maxrows.cc
@@ -31,7 +31,7 @@
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/paths.h>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
 
diff --git a/server/modules/filter/throttlefilter/throttlesession.cc b/server/modules/filter/throttlefilter/throttlesession.cc
index fd5ac6f96..0f0570ff4 100644
--- a/server/modules/filter/throttlefilter/throttlesession.cc
+++ b/server/modules/filter/throttlefilter/throttlesession.cc
@@ -15,7 +15,7 @@
 
 #include <maxscale/ccdefs.hh>
 #include <maxscale/modutil.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/query_classifier.h>
 
 #include "throttlesession.hh"
diff --git a/server/modules/include/cdc.hh b/server/modules/include/cdc.hh
index 073f88fcb..2ca37df95 100644
--- a/server/modules/include/cdc.hh
+++ b/server/modules/include/cdc.hh
@@ -27,7 +27,7 @@
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
 #include <maxscale/router.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxbase/atomic.h>
 
 MXS_BEGIN_DECLS
diff --git a/server/modules/protocol/CDC/cdc.cc b/server/modules/protocol/CDC/cdc.cc
index 5e482eb62..1d293ab68 100644
--- a/server/modules/protocol/CDC/cdc.cc
+++ b/server/modules/protocol/CDC/cdc.cc
@@ -38,7 +38,7 @@
 #include <maxscale/log.h>
 #include <maxscale/protocol.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 
 #define ISspace(x) isspace((int)(x))
 #define CDC_SERVER_STRING "MaxScale(c) v.1.0.0"
diff --git a/server/modules/protocol/HTTPD/httpd.hh b/server/modules/protocol/HTTPD/httpd.hh
index 9b128d7a8..9f5dbab5b 100644
--- a/server/modules/protocol/HTTPD/httpd.hh
+++ b/server/modules/protocol/HTTPD/httpd.hh
@@ -27,7 +27,7 @@
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
 #include <maxscale/router.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxbase/atomic.h>
 
 MXS_BEGIN_DECLS
diff --git a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
index 8764f18c0..491f1cb6d 100644
--- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
+++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
@@ -18,7 +18,7 @@
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/protocol.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/router.hh>
diff --git a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
index 500d8ef84..a0d39bb56 100644
--- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
@@ -29,7 +29,7 @@
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/protocol.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
diff --git a/server/modules/protocol/MySQL/mysql_common.cc b/server/modules/protocol/MySQL/mysql_common.cc
index 8dc061450..a4a6c5dcf 100644
--- a/server/modules/protocol/MySQL/mysql_common.cc
+++ b/server/modules/protocol/MySQL/mysql_common.cc
@@ -29,7 +29,7 @@
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/utils.h>
 #include <maxscale/protocol/mariadb_client.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/routingworker.h>
 
 
diff --git a/server/modules/protocol/maxscaled/maxscaled.cc b/server/modules/protocol/maxscaled/maxscaled.cc
index 5f4e0a644..0943b83ca 100644
--- a/server/modules/protocol/maxscaled/maxscaled.cc
+++ b/server/modules/protocol/maxscaled/maxscaled.cc
@@ -31,7 +31,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <maxscale/router.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxbase/atomic.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/log.h>
diff --git a/server/modules/protocol/telnetd/telnetd.cc b/server/modules/protocol/telnetd/telnetd.cc
index 7386fd8f5..f44370b96 100644
--- a/server/modules/protocol/telnetd/telnetd.cc
+++ b/server/modules/protocol/telnetd/telnetd.cc
@@ -29,7 +29,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <maxscale/router.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxbase/atomic.h>
 #include <telnetd.h>
 #include <maxscale/adminusers.h>
diff --git a/server/modules/routing/binlogrouter/blr_slave.cc b/server/modules/routing/binlogrouter/blr_slave.cc
index dbca7f70d..68e71645b 100644
--- a/server/modules/routing/binlogrouter/blr_slave.cc
+++ b/server/modules/routing/binlogrouter/blr_slave.cc
@@ -41,7 +41,7 @@
 #include <maxscale/housekeeper.h>
 #include <maxscale/log.h>
 #include <maxscale/maxscale.h>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/router.hh>
 #include <maxscale/server.hh>
 #include <maxscale/service.hh>
diff --git a/server/modules/routing/cli/cli.cc b/server/modules/routing/cli/cli.cc
index 3e3a5f467..e2b37edef 100644
--- a/server/modules/routing/cli/cli.cc
+++ b/server/modules/routing/cli/cli.cc
@@ -36,7 +36,7 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/router.hh>
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
diff --git a/server/modules/routing/debugcli/debugcli.cc b/server/modules/routing/debugcli/debugcli.cc
index 76aa1876a..aedc36c6a 100644
--- a/server/modules/routing/debugcli/debugcli.cc
+++ b/server/modules/routing/debugcli/debugcli.cc
@@ -35,7 +35,7 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/router.hh>
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
diff --git a/server/modules/routing/maxinfo/maxinfo_error.cc b/server/modules/routing/maxinfo/maxinfo_error.cc
index f58155d62..2df234069 100644
--- a/server/modules/routing/maxinfo/maxinfo_error.cc
+++ b/server/modules/routing/maxinfo/maxinfo_error.cc
@@ -36,7 +36,7 @@
 #include <maxscale/modutil.hh>
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/log.h>
 
 
diff --git a/server/modules/routing/maxinfo/maxinfo_parse.cc b/server/modules/routing/maxinfo/maxinfo_parse.cc
index 565f51eb3..951d98c13 100644
--- a/server/modules/routing/maxinfo/maxinfo_parse.cc
+++ b/server/modules/routing/maxinfo/maxinfo_parse.cc
@@ -38,7 +38,7 @@
 #include <maxscale/modutil.hh>
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/log.h>
 
 static MAXINFO_TREE* make_tree_node(MAXINFO_OPERATOR, char*, MAXINFO_TREE*, MAXINFO_TREE*);
diff --git a/server/modules/routing/readwritesplit/rwsplitsession.cc b/server/modules/routing/readwritesplit/rwsplitsession.cc
index c1f6fd488..a962a943e 100644
--- a/server/modules/routing/readwritesplit/rwsplitsession.cc
+++ b/server/modules/routing/readwritesplit/rwsplitsession.cc
@@ -16,7 +16,7 @@
 #include <cmath>
 
 #include <maxscale/modutil.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 
 using namespace maxscale;
 
diff --git a/server/modules/routing/schemarouter/schemarouterinstance.cc b/server/modules/routing/schemarouter/schemarouterinstance.cc
index 21994390f..4346caed3 100644
--- a/server/modules/routing/schemarouter/schemarouterinstance.cc
+++ b/server/modules/routing/schemarouter/schemarouterinstance.cc
@@ -25,7 +25,7 @@
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/query_classifier.h>
 #include <maxscale/router.hh>
 #include <maxscale/secrets.h>
diff --git a/server/modules/routing/schemarouter/schemaroutersession.cc b/server/modules/routing/schemarouter/schemaroutersession.cc
index 27228ccbe..b45f5e7ef 100644
--- a/server/modules/routing/schemarouter/schemaroutersession.cc
+++ b/server/modules/routing/schemarouter/schemaroutersession.cc
@@ -20,7 +20,7 @@
 #include <maxbase/atomic.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/poll.h>
+#include <maxscale/poll.hh>
 #include <maxscale/query_classifier.h>
 #include <maxscale/resultset.hh>