diff --git a/services/tunnelbroker/src/Amqp/AmqpManager.cpp b/services/tunnelbroker/src/Amqp/AmqpManager.cpp
--- a/services/tunnelbroker/src/Amqp/AmqpManager.cpp
+++ b/services/tunnelbroker/src/Amqp/AmqpManager.cpp
@@ -3,7 +3,6 @@
 #include "Constants.h"
 #include "DeliveryBroker.h"
 #include "GlobalTools.h"
-#include "Tools.h"
 
 #include <glog/logging.h>
 
diff --git a/services/tunnelbroker/src/Tools/CryptoTools.cpp b/services/tunnelbroker/src/Tools/CryptoTools.cpp
--- a/services/tunnelbroker/src/Tools/CryptoTools.cpp
+++ b/services/tunnelbroker/src/Tools/CryptoTools.cpp
@@ -1,10 +1,7 @@
 #include "CryptoTools.h"
 
 #include <cryptopp/base64.h>
-#include <cryptopp/cryptlib.h>
 #include <cryptopp/filters.h>
-#include <cryptopp/modes.h>
-#include <cryptopp/pssr.h>
 #include <cryptopp/rsa.h>
 #include <glog/logging.h>
 
diff --git a/services/tunnelbroker/src/Tools/Tools.cpp b/services/tunnelbroker/src/Tools/Tools.cpp
--- a/services/tunnelbroker/src/Tools/Tools.cpp
+++ b/services/tunnelbroker/src/Tools/Tools.cpp
@@ -3,7 +3,6 @@
 #include "Constants.h"
 
 #include <glog/logging.h>
-#include <boost/lexical_cast.hpp>
 
 #include <chrono>
 #include <random>
diff --git a/services/tunnelbroker/src/server.cpp b/services/tunnelbroker/src/server.cpp
--- a/services/tunnelbroker/src/server.cpp
+++ b/services/tunnelbroker/src/server.cpp
@@ -1,6 +1,5 @@
 #include "AmqpManager.h"
 #include "ConfigManager.h"
-#include "Constants.h"
 #include "GlobalTools.h"
 #include "TunnelbrokerServiceImpl.h"