diff --git a/backends/twitter/Requests/CreateFriendRequest.h b/backends/twitter/Requests/CreateFriendRequest.h
index cf3fd04fb077a1e1c045964a0ff5159d240f4bef..bc8cc583dc0421c1143fb450a9a30d97d7e318fc 100644
--- a/backends/twitter/Requests/CreateFriendRequest.h
+++ b/backends/twitter/Requests/CreateFriendRequest.h
@@ -1,7 +1,7 @@
 #ifndef CREATE_FRIEND
 #define CREATE_FRIEND
 
-#include "../ThreadPool.h"
+#include "transport/threadpool.h"
 #include "../TwitterResponseParser.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "transport/logging.h"
diff --git a/backends/twitter/Requests/DestroyFriendRequest.h b/backends/twitter/Requests/DestroyFriendRequest.h
index f1706c4dd3de8f32c55d1f63a5b6735e7a52023e..031e4958c54b06cb08d9757179ecf6f6695f8497 100644
--- a/backends/twitter/Requests/DestroyFriendRequest.h
+++ b/backends/twitter/Requests/DestroyFriendRequest.h
@@ -1,7 +1,7 @@
 #ifndef DESTROY_FRIEND
 #define DESTROY_FRIEND
 
-#include "../ThreadPool.h"
+#include "transport/threadpool.h"
 #include "../TwitterResponseParser.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "transport/logging.h"
diff --git a/backends/twitter/Requests/DirectMessageRequest.h b/backends/twitter/Requests/DirectMessageRequest.h
index 6ae27f5c32f3279941fe25c3a4c64b2c3ab44b3c..19357759b0206989dfc1e279670fdfb2c152fc7d 100644
--- a/backends/twitter/Requests/DirectMessageRequest.h
+++ b/backends/twitter/Requests/DirectMessageRequest.h
@@ -1,7 +1,7 @@
 #ifndef DIRECT_MESSAGE
 #define DIRECT_MESSAGE
 
-#include "../ThreadPool.h"
+#include "transport/threadpool.h"
 #include "../TwitterResponseParser.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "transport/logging.h"
diff --git a/backends/twitter/Requests/FetchFriends.h b/backends/twitter/Requests/FetchFriends.h
index 936465cdf4b8f6ede7a1dd5f04331ecea0d7872d..7acc2819565ae9ca472ab7487b71ab95d0b1e2c9 100644
--- a/backends/twitter/Requests/FetchFriends.h
+++ b/backends/twitter/Requests/FetchFriends.h
@@ -1,7 +1,7 @@
 #ifndef FRIENDS_H
 #define FRIENDS_H
 
-#include "../ThreadPool.h"
+#include "transport/threadpool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "../TwitterResponseParser.h"
 #include "transport/logging.h"
diff --git a/backends/twitter/Requests/HelpMessageRequest.h b/backends/twitter/Requests/HelpMessageRequest.h
index c1c8b85b00c523fad0dcec1fdc194f65af9d1ada..14188eb3e14e95e35bfdb8498b71fec48e0facc9 100644
--- a/backends/twitter/Requests/HelpMessageRequest.h
+++ b/backends/twitter/Requests/HelpMessageRequest.h
@@ -1,7 +1,7 @@
 #ifndef HELPMESSAGE_H
 #define HELPMESSAGE_H
 
-#include "../ThreadPool.h"
+#include "transport/threadpool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "transport/networkplugin.h"
 #include "transport/logging.h"
diff --git a/backends/twitter/Requests/OAuthFlow.h b/backends/twitter/Requests/OAuthFlow.h
index bbc730c697689c12d7940b256c9a7a7585e4882a..cbf7d019fb06d1aae4dc6339342e1af9f342b280 100644
--- a/backends/twitter/Requests/OAuthFlow.h
+++ b/backends/twitter/Requests/OAuthFlow.h
@@ -1,7 +1,7 @@
 #ifndef OAUTH_FLOW
 #define OAUTH_FLOW
 
-#include "../ThreadPool.h"
+#include "transport/threadpool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "../TwitterPlugin.h"
 #include "transport/logging.h"
diff --git a/backends/twitter/Requests/PINExchangeProcess.h b/backends/twitter/Requests/PINExchangeProcess.h
index 6d94085cee180ecd742df3be788caa83397eb1ad..8007c305e074bb378d70a52ea2ec4460f1b83454 100644
--- a/backends/twitter/Requests/PINExchangeProcess.h
+++ b/backends/twitter/Requests/PINExchangeProcess.h
@@ -1,7 +1,7 @@
 #ifndef PIN_EXCHANGE
 #define PIN_EXCHANGE
 
-#include "../ThreadPool.h"
+#include "transport/threadpool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "../TwitterPlugin.h"
 #include "transport/networkplugin.h"
diff --git a/backends/twitter/Requests/ProfileImageRequest.h b/backends/twitter/Requests/ProfileImageRequest.h
index 1a1721174ef04de8150d0a5e4d0dffc9c2ca7308..fb26e20427e39de2608a82008b1cc0191b28374c 100644
--- a/backends/twitter/Requests/ProfileImageRequest.h
+++ b/backends/twitter/Requests/ProfileImageRequest.h
@@ -1,7 +1,7 @@
 #ifndef PROFILEIMAGE_H
 #define PROFILEIMAGE_H
 
-#include "../ThreadPool.h"
+#include "transport/threadpool.h"
 #include "../TwitterResponseParser.h"
 #include "transport/logging.h"
 #include "transport/config.h"
diff --git a/backends/twitter/Requests/RetweetRequest.h b/backends/twitter/Requests/RetweetRequest.h
index 04a48ffcdc9d91b92ab0160fae67932ac9701b91..b514b94dc0830173aff29a2fc97205ad04cfcb7d 100644
--- a/backends/twitter/Requests/RetweetRequest.h
+++ b/backends/twitter/Requests/RetweetRequest.h
@@ -1,7 +1,7 @@
 #ifndef RETWEET_H
 #define RETWEET_H
 
-#include "../ThreadPool.h"
+#include "transport/threadpool.h"
 #include "../TwitterResponseParser.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "transport/networkplugin.h"
diff --git a/backends/twitter/Requests/StatusUpdateRequest.h b/backends/twitter/Requests/StatusUpdateRequest.h
index f2dd8f404b3ca03054a75d0e9db45071f60cc61d..8491abb18e0c944852a6cb41d09d1b8772d2626b 100644
--- a/backends/twitter/Requests/StatusUpdateRequest.h
+++ b/backends/twitter/Requests/StatusUpdateRequest.h
@@ -1,7 +1,7 @@
 #ifndef STATUS_UPDATE
 #define STATUS_UPDATE
 
-#include "../ThreadPool.h"
+#include "transport/threadpool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "transport/networkplugin.h"
 #include "transport/logging.h"
diff --git a/backends/twitter/Requests/TimelineRequest.h b/backends/twitter/Requests/TimelineRequest.h
index de39aa524379825100049e52f90e672c0d831ea2..05bcc8c0b9b0e93d91f580327d831901833331e4 100644
--- a/backends/twitter/Requests/TimelineRequest.h
+++ b/backends/twitter/Requests/TimelineRequest.h
@@ -1,7 +1,7 @@
 #ifndef TIMELINE_H
 #define TIMELINE_H
 
-#include "../ThreadPool.h"
+#include "transport/threadpool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "../TwitterResponseParser.h"
 #include "transport/logging.h"
diff --git a/backends/twitter/TwitterPlugin.h b/backends/twitter/TwitterPlugin.h
index e470723a4833bd50f3017c14eafe3d7ce33fa3bd..41bfc8ca54d5939b189d08daf45d0534ea7cc55d 100644
--- a/backends/twitter/TwitterPlugin.h
+++ b/backends/twitter/TwitterPlugin.h
@@ -8,6 +8,7 @@
 #include "transport/mysqlbackend.h"
 #include "transport/pqxxbackend.h"
 #include "transport/storagebackend.h"
+#include "transport/threadpool.h"
 
 #include "Swiften/Swiften.h"
 #include "unistd.h"
@@ -31,7 +32,6 @@
 #include <set>
 #include <cstdio>
 
-#include "ThreadPool.h"
 #include "Swiften/StringCodecs/SHA1.h"
 
 using namespace boost::filesystem;
diff --git a/backends/twitter/ThreadPool.h b/include/transport/threadpool.h
similarity index 100%
rename from backends/twitter/ThreadPool.h
rename to include/transport/threadpool.h
diff --git a/backends/twitter/ThreadPool.cpp b/src/threadpool.cpp
similarity index 98%
rename from backends/twitter/ThreadPool.cpp
rename to src/threadpool.cpp
index a7344dbcb7ec9f5df773adf136da5d9bcc383e61..23f6be5213fd21919c112323b6f6bdcee9ca9344 100644
--- a/backends/twitter/ThreadPool.cpp
+++ b/src/threadpool.cpp
@@ -1,4 +1,4 @@
-#include "ThreadPool.h"
+#include "transport/threadpool.h"
 DEFINE_LOGGER(logger, "ThreadPool")
 boost::signals2::signal< void (Thread*, int) > onWorkCompleted;