diff --git a/beast/threads/ServiceQueue.h b/beast/threads/ServiceQueue.h
index 2b2cb3beae..115737c833 100644
--- a/beast/threads/ServiceQueue.h
+++ b/beast/threads/ServiceQueue.h
@@ -328,6 +328,8 @@ private:
 
 #endif
 
+}
+
 //------------------------------------------------------------------------------
 
 class ServiceQueueBase
@@ -399,8 +401,6 @@ protected:
     static ThreadLocalValue <ServiceQueueBase*> s_service;
 };
 
-}
-
 //------------------------------------------------------------------------------
 
 /** A queue for disatching function calls on other threads.
@@ -408,7 +408,7 @@ protected:
     calling run, run_one, poll, or poll_one.
 */
 template <class Allocator = std::allocator <char> >
-class ServiceQueueType : public detail::ServiceQueueBase
+class ServiceQueueType : public ServiceQueueBase
 {
 private:
     using ServiceQueueBase::Item;
diff --git a/beast/threads/impl/ServiceQueue.cpp b/beast/threads/impl/ServiceQueue.cpp
index f82368c49a..1facf600b2 100644
--- a/beast/threads/impl/ServiceQueue.cpp
+++ b/beast/threads/impl/ServiceQueue.cpp
@@ -23,10 +23,6 @@
 
 namespace beast {
 
-namespace detail {
-
-//------------------------------------------------------------------------------
-
 class ServiceQueueBase::ScopedServiceThread : public List <ScopedServiceThread>::Node
 {
 public:
@@ -189,12 +185,9 @@ void ServiceQueueBase::enqueue (Item* item)
 //
 ThreadLocalValue <ServiceQueueBase*> ServiceQueueBase::s_service;
 
-}
-
 //------------------------------------------------------------------------------
 
-namespace detail
-{
+namespace detail {
 
 //------------------------------------------------------------------------------