diff --git a/nano/lib/plat/darwin/thread_role.cpp b/nano/lib/plat/darwin/thread_role.cpp
index dd9bdc61..4726e8f5 100644
--- a/nano/lib/plat/darwin/thread_role.cpp
+++ b/nano/lib/plat/darwin/thread_role.cpp
@@ -1,4 +1,4 @@
-#include <nano/lib/threading.hpp>
+#include <nano/lib/thread_roles.hpp>
 
 #include <pthread.h>
 
diff --git a/nano/lib/plat/linux/thread_role.cpp b/nano/lib/plat/linux/thread_role.cpp
index 46d29522..d95a158d 100644
--- a/nano/lib/plat/linux/thread_role.cpp
+++ b/nano/lib/plat/linux/thread_role.cpp
@@ -1,4 +1,4 @@
-#include <nano/lib/threading.hpp>
+#include <nano/lib/thread_roles.hpp>
 
 #include <pthread.h>
 
diff --git a/nano/lib/plat/windows/thread_role.cpp b/nano/lib/plat/windows/thread_role.cpp
index a604e67b..5b0e3344 100644
--- a/nano/lib/plat/windows/thread_role.cpp
+++ b/nano/lib/plat/windows/thread_role.cpp
@@ -1,4 +1,4 @@
-#include <nano/lib/threading.hpp>
+#include <nano/lib/thread_roles.hpp>
 
 #include <processthreadsapi.h>
 
diff --git a/nano/lib/processing_queue.hpp b/nano/lib/processing_queue.hpp
index 4fa89584..e9f31737 100644
--- a/nano/lib/processing_queue.hpp
+++ b/nano/lib/processing_queue.hpp
@@ -3,6 +3,7 @@
 #include <nano/lib/locks.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/stats.hpp>
+#include <nano/lib/thread_roles.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/utility.hpp>
 
@@ -189,4 +190,4 @@ private:
 	nano::condition_variable condition;
 	std::vector<std::thread> threads;
 };
-}
\ No newline at end of file
+}
diff --git a/nano/lib/threading.cpp b/nano/lib/threading.cpp
index e5d00286..6da0e000 100644
--- a/nano/lib/threading.cpp
+++ b/nano/lib/threading.cpp
@@ -1,13 +1,7 @@
 #include <nano/lib/config.hpp>
+#include <nano/lib/thread_roles.hpp>
 #include <nano/lib/threading.hpp>
 
-#include <boost/asio/post.hpp>
-#include <boost/asio/steady_timer.hpp>
-#include <boost/asio/thread_pool.hpp>
-#include <boost/format.hpp>
-
-#include <future>
-#include <iostream>
 #include <thread>
 
 /*
diff --git a/nano/lib/threading.hpp b/nano/lib/threading.hpp
index d74bdd34..25626733 100644
--- a/nano/lib/threading.hpp
+++ b/nano/lib/threading.hpp
@@ -1,25 +1,16 @@
 #pragma once
 
 #include <nano/lib/relaxed_atomic.hpp>
-#include <nano/lib/thread_roles.hpp>
 #include <nano/lib/utility.hpp>
 
 #include <boost/thread/thread.hpp>
 
-#include <latch>
-#include <thread>
-
-namespace boost::asio
-{
-class thread_pool;
-}
-
 namespace nano
 {
 namespace thread_attributes
 {
 	boost::thread::attributes get_default ();
-}
+} // namespace thread_attributes
 
 /**
  * Number of available logical processor cores. Might be overridden by setting `NANO_HARDWARE_CONCURRENCY` environment variable
@@ -28,6 +19,7 @@ unsigned int hardware_concurrency ();
 
 /**
  * If thread is joinable joins it, otherwise does nothing
+ * Returns thread.joinable()
  */
 bool join_or_pass (std::thread &);
-}
+} // namespace nano
diff --git a/nano/lib/work.cpp b/nano/lib/work.cpp
index 7e02981a..07b27e39 100644
--- a/nano/lib/work.cpp
+++ b/nano/lib/work.cpp
@@ -1,6 +1,7 @@
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/epoch.hpp>
+#include <nano/lib/thread_roles.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/work.hpp>
 #include <nano/node/xorshift.hpp>
diff --git a/nano/node/confirmation_height_processor.cpp b/nano/node/confirmation_height_processor.cpp
index df4be6c4..6cf97729 100644
--- a/nano/node/confirmation_height_processor.cpp
+++ b/nano/node/confirmation_height_processor.cpp
@@ -1,6 +1,6 @@
 #include <nano/lib/logger_mt.hpp>
 #include <nano/lib/numbers.hpp>
-#include <nano/lib/threading.hpp>
+#include <nano/lib/thread_roles.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/node/confirmation_height_processor.hpp>
 #include <nano/node/write_database_queue.hpp>
diff --git a/nano/node/lmdb/lmdb_txn.cpp b/nano/node/lmdb/lmdb_txn.cpp
index 5d577b38..a8ef80d4 100644
--- a/nano/node/lmdb/lmdb_txn.cpp
+++ b/nano/node/lmdb/lmdb_txn.cpp
@@ -1,6 +1,6 @@
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/lib/logger_mt.hpp>
-#include <nano/lib/threading.hpp>
+#include <nano/lib/thread_roles.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/node/lmdb/lmdb_env.hpp>
 #include <nano/node/lmdb/lmdb_txn.hpp>
diff --git a/nano/node/unchecked_map.cpp b/nano/node/unchecked_map.cpp
index 64b2b9cf..45d3b495 100644
--- a/nano/node/unchecked_map.cpp
+++ b/nano/node/unchecked_map.cpp
@@ -1,7 +1,7 @@
 #include <nano/lib/locks.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/lib/stats_enums.hpp>
-#include <nano/lib/threading.hpp>
+#include <nano/lib/thread_roles.hpp>
 #include <nano/lib/timer.hpp>
 #include <nano/node/unchecked_map.hpp>
 
diff --git a/nano/rpc/rpc_request_processor.cpp b/nano/rpc/rpc_request_processor.cpp
index 964bcd22..d7315890 100644
--- a/nano/rpc/rpc_request_processor.cpp
+++ b/nano/rpc/rpc_request_processor.cpp
@@ -1,6 +1,6 @@
 #include <nano/lib/asio.hpp>
 #include <nano/lib/json_error_response.hpp>
-#include <nano/lib/threading.hpp>
+#include <nano/lib/thread_roles.hpp>
 #include <nano/rpc/rpc_request_processor.hpp>
 
 #include <boost/endian/conversion.hpp>
diff --git a/nano/secure/parallel_traversal.hpp b/nano/secure/parallel_traversal.hpp
index 3bc261f8..cf1a51ac 100644
--- a/nano/secure/parallel_traversal.hpp
+++ b/nano/secure/parallel_traversal.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <nano/lib/thread_roles.hpp>
 #include <nano/lib/threading.hpp>
 
 #include <thread>
diff --git a/nano/secure/store.cpp b/nano/secure/store.cpp
index 1aa93ad0..64bd19a2 100644
--- a/nano/secure/store.cpp
+++ b/nano/secure/store.cpp
@@ -1,4 +1,4 @@
-#include <nano/lib/threading.hpp>
+#include <nano/lib/thread_roles.hpp>
 #include <nano/lib/timer.hpp>
 #include <nano/secure/store.hpp>