diff --git a/include/maxscale/monitor.hh b/include/maxscale/monitor.hh
index ce3616459..0c093761c 100644
--- a/include/maxscale/monitor.hh
+++ b/include/maxscale/monitor.hh
@@ -15,7 +15,6 @@
 #include <maxscale/ccdefs.hh>
 #include <maxscale/monitor.h>
 #include <maxscale/semaphore.hh>
-#include <maxscale/thread.h>
 #include <maxscale/worker.hh>
 
 namespace maxscale
diff --git a/include/maxscale/worker.h b/include/maxscale/worker.h
index 74167f629..97f0804ce 100644
--- a/include/maxscale/worker.h
+++ b/include/maxscale/worker.h
@@ -14,7 +14,6 @@
 
 #include <maxscale/cdefs.h>
 #include <maxscale/poll.h>
-#include <maxscale/thread.h>
 #include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index 46887fb25..43399a4ba 100644
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@@ -3377,16 +3377,16 @@ static inline void dcb_sanity_check(DCB* dcb)
 
     if (dcb->state == DCB_STATE_DISCONNECTED || dcb->state == DCB_STATE_UNDEFINED)
     {
-        MXS_ERROR("%lu [poll_add_dcb] Error : existing state of dcb %p "
+        MXS_ERROR("[poll_add_dcb] Error : existing state of dcb %p "
                   "is %s, but this should be impossible, crashing.",
-                  thread_self(), dcb, STRDCBSTATE(dcb->state));
+                  dcb, STRDCBSTATE(dcb->state));
         raise(SIGABRT);
     }
     else if (dcb->state == DCB_STATE_POLLING || dcb->state == DCB_STATE_LISTENING)
     {
-        MXS_ERROR("%lu [poll_add_dcb] Error : existing state of dcb %p "
+        MXS_ERROR("[poll_add_dcb] Error : existing state of dcb %p "
                   "is %s, but this is probably an error, not crashing.",
-                  thread_self(), dcb, STRDCBSTATE(dcb->state));
+                  dcb, STRDCBSTATE(dcb->state));
     }
 }
 
diff --git a/server/core/internal/admin.hh b/server/core/internal/admin.hh
index e27bc8312..fc66cc926 100644
--- a/server/core/internal/admin.hh
+++ b/server/core/internal/admin.hh
@@ -17,8 +17,6 @@
 #include <string>
 #include <microhttpd.h>
 
-#include <maxscale/thread.h>
-
 class Client
 {
     Client(const Client&);
diff --git a/server/modules/monitor/mariadbmon/cluster_manipulation.cc b/server/modules/monitor/mariadbmon/cluster_manipulation.cc
index bcab859b3..feedb410a 100644
--- a/server/modules/monitor/mariadbmon/cluster_manipulation.cc
+++ b/server/modules/monitor/mariadbmon/cluster_manipulation.cc
@@ -836,7 +836,7 @@ bool MariaDBMonitor::wait_cluster_stabilization(MariaDBServer* new_master, const
         {
             if (!first_round)
             {
-                thread_millisleep(500);
+                std::this_thread::sleep_for(std::chrono::milliseconds(500));
             }
 
             // Erasing elements from an array, so iterate from last to first
diff --git a/server/modules/monitor/mariadbmon/mariadbmon.hh b/server/modules/monitor/mariadbmon/mariadbmon.hh
index 9519be356..1177e1ebf 100644
--- a/server/modules/monitor/mariadbmon/mariadbmon.hh
+++ b/server/modules/monitor/mariadbmon/mariadbmon.hh
@@ -20,7 +20,6 @@
 #include <vector>
 
 #include <maxscale/monitor.hh>
-#include <maxscale/thread.h>
 
 #include "mariadbserver.hh"
 
diff --git a/server/modules/monitor/mmmon/mmmon.hh b/server/modules/monitor/mmmon/mmmon.hh
index cb5307e94..62decc9cf 100644
--- a/server/modules/monitor/mmmon/mmmon.hh
+++ b/server/modules/monitor/mmmon/mmmon.hh
@@ -14,7 +14,6 @@
 
 #include <maxscale/ccdefs.hh>
 #include <maxscale/monitor.hh>
-#include <maxscale/thread.h>
 
 /**
  * @file mmmon.hh - The Multi-Master monitor
diff --git a/server/modules/monitor/ndbclustermon/ndbclustermon.hh b/server/modules/monitor/ndbclustermon/ndbclustermon.hh
index b84cfa125..8aa0837d0 100644
--- a/server/modules/monitor/ndbclustermon/ndbclustermon.hh
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.hh
@@ -14,7 +14,6 @@
 
 #include <maxscale/ccdefs.hh>
 #include <maxscale/monitor.hh>
-#include <maxscale/thread.h>
 
 /**
  * @file ndbcclustermon.hh A NDBC cluster monitor