diff --git a/server/core/internal/messagequeue.hh b/include/maxscale/messagequeue.hh
similarity index 100%
rename from server/core/internal/messagequeue.hh
rename to include/maxscale/messagequeue.hh
diff --git a/include/maxscale/poll.h b/include/maxscale/poll.h
index c3ec08cab..8ec406f0f 100644
--- a/include/maxscale/poll.h
+++ b/include/maxscale/poll.h
@@ -23,6 +23,31 @@
 
 MXS_BEGIN_DECLS
 
+/**
+ * A statistic identifier that can be returned by poll_get_stat
+ */
+typedef enum
+{
+    POLL_STAT_READ,
+    POLL_STAT_WRITE,
+    POLL_STAT_ERROR,
+    POLL_STAT_HANGUP,
+    POLL_STAT_ACCEPT,
+    POLL_STAT_EVQ_LEN,
+    POLL_STAT_EVQ_MAX,
+    POLL_STAT_MAX_QTIME,
+    POLL_STAT_MAX_EXECTIME
+} POLL_STAT;
+
+/*
+ * Return a particular statistics value.
+ *
+ * @param stat  What to return.
+ *
+ * @return The value.
+ */
+int64_t poll_get_stat(POLL_STAT stat);
+
 /*
  * Insert a fake hangup event for a DCB into the polling queue.
  *
diff --git a/server/core/internal/worker.hh b/include/maxscale/worker.hh
similarity index 99%
rename from server/core/internal/worker.hh
rename to include/maxscale/worker.hh
index 789a35ae5..614dd5bf0 100644
--- a/server/core/internal/worker.hh
+++ b/include/maxscale/worker.hh
@@ -19,11 +19,9 @@
 #include <maxscale/platform.h>
 #include <maxscale/session.h>
 #include <maxscale/utils.hh>
+#include <maxscale/worker.h>
 #include "messagequeue.hh"
-#include "poll.h"
-#include "worker.h"
-#include "workertask.hh"
-#include "session.hh"
+#include <maxscale/workertask.hh>
 
 namespace maxscale
 {
diff --git a/server/core/internal/workertask.hh b/include/maxscale/workertask.hh
similarity index 100%
rename from server/core/internal/workertask.hh
rename to include/maxscale/workertask.hh
diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index 36397beac..9d42afbd9 100644
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@@ -55,11 +55,11 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/utils.h>
 #include <maxscale/semaphore.hh>
+#include <maxscale/workertask.hh>
 
 #include "internal/modules.h"
 #include "internal/routingworker.hh"
 #include "internal/session.h"
-#include "internal/workertask.hh"
 
 using maxscale::RoutingWorker;
 using maxscale::Worker;
diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index 290bb4bbe..86b6015e7 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -43,6 +43,7 @@
 #include <maxscale/housekeeper.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/maxscale.h>
+#include <maxscale/messagequeue.hh>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
@@ -56,7 +57,6 @@
 #include "internal/admin.hh"
 #include "internal/config.h"
 #include "internal/maxscale.h"
-#include "internal/messagequeue.hh"
 #include "internal/modules.h"
 #include "internal/monitor.h"
 #include "internal/poll.h"
diff --git a/server/core/internal/poll.h b/server/core/internal/poll.h
index c5cb95104..27420ef51 100644
--- a/server/core/internal/poll.h
+++ b/server/core/internal/poll.h
@@ -26,22 +26,6 @@ struct mxs_worker;
 
 #define MAX_EVENTS 1000
 
-/**
- * A statistic identifier that can be returned by poll_get_stat
- */
-typedef enum
-{
-    POLL_STAT_READ,
-    POLL_STAT_WRITE,
-    POLL_STAT_ERROR,
-    POLL_STAT_HANGUP,
-    POLL_STAT_ACCEPT,
-    POLL_STAT_EVQ_LEN,
-    POLL_STAT_EVQ_MAX,
-    POLL_STAT_MAX_QTIME,
-    POLL_STAT_MAX_EXECTIME
-} POLL_STAT;
-
 enum poll_message
 {
     POLL_MSG_CLEAN_PERSISTENT = 0x01
@@ -58,7 +42,6 @@ void            dShowThreads(DCB *dcb);
 void            dShowEventQ(DCB *dcb);
 void            dShowEventStats(DCB *dcb);
 
-int64_t         poll_get_stat(POLL_STAT stat);
 RESULTSET       *eventTimesGetList();
 
 MXS_END_DECLS
diff --git a/server/core/internal/routingworker.hh b/server/core/internal/routingworker.hh
index 6a34b62c6..3ed9c09f0 100644
--- a/server/core/internal/routingworker.hh
+++ b/server/core/internal/routingworker.hh
@@ -14,7 +14,7 @@
 
 #include <maxscale/cppdefs.hh>
 #include <maxscale/routingworker.h>
-#include "worker.hh"
+#include <maxscale/worker.hh>
 #include "session.hh"
 
 namespace maxscale
diff --git a/server/core/messagequeue.cc b/server/core/messagequeue.cc
index 30ef13eee..cd3d08125 100644
--- a/server/core/messagequeue.cc
+++ b/server/core/messagequeue.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "internal/messagequeue.hh"
+#include <maxscale/messagequeue.hh>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/server/core/routingworker.cc b/server/core/routingworker.cc
index e945c40e1..06c874e4b 100644
--- a/server/core/routingworker.cc
+++ b/server/core/routingworker.cc
@@ -36,7 +36,6 @@
 #include "internal/poll.h"
 #include "internal/service.h"
 #include "internal/statistics.h"
-#include "internal/workertask.hh"
 
 #define WORKER_ABSENT_ID -1
 
diff --git a/server/core/server.cc b/server/core/server.cc
index b9a65c63c..35326286a 100644
--- a/server/core/server.cc
+++ b/server/core/server.cc
@@ -43,7 +43,6 @@
 
 #include "internal/monitor.h"
 #include "internal/poll.h"
-#include "internal/workertask.hh"
 #include "internal/routingworker.hh"
 
 using maxscale::Semaphore;
diff --git a/server/core/session.cc b/server/core/session.cc
index e00cb38c5..5ac85b49d 100644
--- a/server/core/session.cc
+++ b/server/core/session.cc
@@ -44,7 +44,6 @@
 #include "internal/filter.h"
 #include "internal/routingworker.hh"
 #include "internal/session.h"
-#include "internal/workertask.hh"
 
 using std::string;
 using std::stringstream;
diff --git a/server/core/test/test_dcb.cc b/server/core/test/test_dcb.cc
index 52313ab7d..9919c603a 100644
--- a/server/core/test/test_dcb.cc
+++ b/server/core/test/test_dcb.cc
@@ -36,8 +36,8 @@
 
 #include <maxscale/config.h>
 #include <maxscale/listener.h>
+#include <maxscale/messagequeue.hh>
 
-#include "../internal/messagequeue.hh"
 #include "../internal/routingworker.hh"
 #include "../dcb.cc"
 #include "test_utils.h"
diff --git a/server/core/test/test_worker.cc b/server/core/test/test_worker.cc
index bef9ffed0..4f368e9e4 100644
--- a/server/core/test/test_worker.cc
+++ b/server/core/test/test_worker.cc
@@ -12,7 +12,8 @@
  */
 
 #include <iostream>
-#include "../internal/worker.hh"
+#include <maxscale/worker.hh>
+#include "../internal/poll.h"
 
 using namespace std;
 
diff --git a/server/core/worker.cc b/server/core/worker.cc
index aaf9ad55d..9e7e47a7d 100644
--- a/server/core/worker.cc
+++ b/server/core/worker.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "internal/worker.hh"
+#include <maxscale/worker.hh>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -38,7 +38,6 @@
 #include "internal/poll.h"
 #include "internal/service.h"
 #include "internal/statistics.h"
-#include "internal/workertask.hh"
 
 #define WORKER_ABSENT_ID -1
 
diff --git a/server/core/workertask.cc b/server/core/workertask.cc
index 761bc37e6..329ea1e49 100644
--- a/server/core/workertask.cc
+++ b/server/core/workertask.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "internal/workertask.hh"
+#include <maxscale/workertask.hh>
 #include <maxscale/atomic.h>
 #include <maxscale/debug.h>