diff --git a/Algorithms/DouglasPeucker.cpp b/Algorithms/DouglasPeucker.cpp
index cd0e1be84..91a557341 100644
--- a/Algorithms/DouglasPeucker.cpp
+++ b/Algorithms/DouglasPeucker.cpp
@@ -36,7 +36,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cmath>
 
 #include <algorithm>
-#include <limits>
 
 struct CoordinatePairCalculator
 {
diff --git a/Algorithms/DouglasPeucker.h b/Algorithms/DouglasPeucker.h
index f8bc45087..d0f295cc6 100644
--- a/Algorithms/DouglasPeucker.h
+++ b/Algorithms/DouglasPeucker.h
@@ -29,6 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define DOUGLASPEUCKER_H_
 
 #include <stack>
+#include <utility>
 #include <vector>
 
 /* This class object computes the bitvector of indicating generalized input
@@ -38,7 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * bit indicating if the points is present in the generalization.
  * Note: points may also be pre-selected*/
 
-struct FixedPointCoordinate;
 struct SegmentInformation;
 
 class DouglasPeucker
diff --git a/Algorithms/PolylineCompressor.cpp b/Algorithms/PolylineCompressor.cpp
index c8e053829..cdaf2fbf6 100644
--- a/Algorithms/PolylineCompressor.cpp
+++ b/Algorithms/PolylineCompressor.cpp
@@ -26,7 +26,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "PolylineCompressor.h"
-#include "../Util/StringUtil.h"
+#include "../DataStructures/SegmentInformation.h"
+
+#include <osrm/Coordinate.h>
 
 void PolylineCompressor::encodeVectorSignedNumber(std::vector<int> &numbers, std::string &output)
     const
diff --git a/Algorithms/PolylineCompressor.h b/Algorithms/PolylineCompressor.h
index ac6c2bf65..5472bd808 100644
--- a/Algorithms/PolylineCompressor.h
+++ b/Algorithms/PolylineCompressor.h
@@ -28,8 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef POLYLINECOMPRESSOR_H_
 #define POLYLINECOMPRESSOR_H_
 
+struct SegmentInformation;
+
 #include "../DataStructures/JSONContainer.h"
-#include "../DataStructures/SegmentInformation.h"
 
 #include <string>
 #include <vector>
diff --git a/DataStructures/ImportEdge.cpp b/DataStructures/ImportEdge.cpp
index ee6ee3a9b..0d04b9fb0 100644
--- a/DataStructures/ImportEdge.cpp
+++ b/DataStructures/ImportEdge.cpp
@@ -27,6 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "ImportEdge.h"
 
+#include <boost/assert.hpp>
+
 bool NodeBasedEdge::operator<(const NodeBasedEdge &other) const
 {
     if (source == other.source)
diff --git a/DataStructures/ImportEdge.h b/DataStructures/ImportEdge.h
index e7d225515..f79a484f8 100644
--- a/DataStructures/ImportEdge.h
+++ b/DataStructures/ImportEdge.h
@@ -28,11 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef IMPORT_EDGE_H
 #define IMPORT_EDGE_H
 
-#include "../Util/OSRMException.h"
 #include "../typedefs.h"
 
-#include <boost/assert.hpp>
-
 struct NodeBasedEdge
 {
     bool operator<(const NodeBasedEdge &e) const;
diff --git a/DataStructures/ImportNode.cpp b/DataStructures/ImportNode.cpp
index 787160b1b..d6e00ca77 100644
--- a/DataStructures/ImportNode.cpp
+++ b/DataStructures/ImportNode.cpp
@@ -29,7 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <limits>
 
-
 ExternalMemoryNode::ExternalMemoryNode(
     int lat, int lon, unsigned int node_id, bool bollard, bool traffic_light)
     : NodeInfo(lat, lon, node_id), bollard(bollard), trafficLight(traffic_light)
diff --git a/DataStructures/SearchEngineData.cpp b/DataStructures/SearchEngineData.cpp
index 8db7e4530..a5e4bfcd8 100644
--- a/DataStructures/SearchEngineData.cpp
+++ b/DataStructures/SearchEngineData.cpp
@@ -27,6 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "SearchEngineData.h"
 
+#include "BinaryHeap.h"
+
 void SearchEngineData::InitializeOrClearFirstThreadLocalStorage(const unsigned number_of_nodes)
 {
     if (forwardHeap.get())
diff --git a/DataStructures/SearchEngineData.h b/DataStructures/SearchEngineData.h
index bbfe06634..f0621e677 100644
--- a/DataStructures/SearchEngineData.h
+++ b/DataStructures/SearchEngineData.h
@@ -28,15 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SEARCH_ENGINE_DATA_H
 #define SEARCH_ENGINE_DATA_H
 
-#include "BinaryHeap.h"
-#include "QueryEdge.h"
-#include "StaticGraph.h"
+#include <boost/thread/tss.hpp>
 
 #include "../typedefs.h"
-
-#include <boost/thread.hpp>
-
-#include <vector>
+#include "BinaryHeap.h"
 
 struct HeapData
 {
diff --git a/Descriptors/DescriptionFactory.cpp b/Descriptors/DescriptionFactory.cpp
index 017725310..da24a5e7f 100644
--- a/Descriptors/DescriptionFactory.cpp
+++ b/Descriptors/DescriptionFactory.cpp
@@ -27,6 +27,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "DescriptionFactory.h"
 
+#include <osrm/Coordinate.h>
+
+#include "../typedefs.h"
+#include "../Algorithms/PolylineCompressor.h"
+#include "../DataStructures/PhantomNodes.h"
+#include "../DataStructures/RawRouteData.h"
+#include "../DataStructures/SegmentInformation.h"
+#include "../DataStructures/TurnInstructions.h"
+
 DescriptionFactory::DescriptionFactory() : entireLength(0)
 {
     via_indices.push_back(0);
diff --git a/Descriptors/DescriptionFactory.h b/Descriptors/DescriptionFactory.h
index 2964f0288..e0068ccbb 100644
--- a/Descriptors/DescriptionFactory.h
+++ b/Descriptors/DescriptionFactory.h
@@ -31,10 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Algorithms/DouglasPeucker.h"
 #include "../Algorithms/PolylineCompressor.h"
 #include "../DataStructures/PhantomNodes.h"
-#include "../DataStructures/RawRouteData.h"
 #include "../DataStructures/SegmentInformation.h"
 #include "../DataStructures/TurnInstructions.h"
-#include "../Util/SimpleLogger.h"
 #include "../typedefs.h"
 
 #include <osrm/Coordinate.h>
@@ -42,6 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <limits>
 #include <vector>
 
+struct PathData;
 /* This class is fed with all way segments in consecutive order
  *  and produces the description plus the encoded polyline */
 
diff --git a/Library/OSRM_impl.cpp b/Library/OSRM_impl.cpp
index 1ca4ccdd5..e93646e37 100644
--- a/Library/OSRM_impl.cpp
+++ b/Library/OSRM_impl.cpp
@@ -25,22 +25,36 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+namespace boost { namespace interprocess { class named_mutex; } }
+
 #include "OSRM_impl.h"
 #include "OSRM.h"
 
+#include <osrm/Reply.h>
+#include <osrm/RouteParameters.h>
+#include <osrm/ServerPaths.h>
+
+#include "../Plugins/BasePlugin.h"
 #include "../Plugins/DistanceTablePlugin.h"
 #include "../Plugins/HelloWorldPlugin.h"
 #include "../Plugins/LocatePlugin.h"
 #include "../Plugins/NearestPlugin.h"
 #include "../Plugins/TimestampPlugin.h"
 #include "../Plugins/ViaRoutePlugin.h"
-
 #include "../Server/DataStructures/BaseDataFacade.h"
 #include "../Server/DataStructures/InternalDataFacade.h"
 #include "../Server/DataStructures/SharedBarriers.h"
 #include "../Server/DataStructures/SharedDataFacade.h"
+#include "../Util/SimpleLogger.h"
 
 #include <boost/assert.hpp>
+#include <boost/interprocess/sync/named_condition.hpp>
+#include <boost/interprocess/sync/scoped_lock.hpp>
+
+#include <algorithm>
+#include <fstream>
+#include <utility>
+#include <vector>
 
 OSRM_impl::OSRM_impl(const ServerPaths &server_paths, const bool use_shared_memory)
     : use_shared_memory(use_shared_memory)
diff --git a/Library/OSRM_impl.h b/Library/OSRM_impl.h
index d201a61b0..8ad98bbda 100644
--- a/Library/OSRM_impl.h
+++ b/Library/OSRM_impl.h
@@ -28,13 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef OSRM_IMPL_H
 #define OSRM_IMPL_H
 
-#include <osrm/Reply.h>
-#include <osrm/RouteParameters.h>
+class BasePlugin;
+namespace http { class Reply; }
+struct RouteParameters;
+
 #include <osrm/ServerPaths.h>
 
 #include "../DataStructures/QueryEdge.h"
-#include "../Plugins/BasePlugin.h"
-#include "../Util/ProgramOptions.h"
 
 #include <unordered_map>
 #include <string>
diff --git a/Util/FingerPrint.cpp.in b/Util/FingerPrint.cpp.in
index b17b447f0..d106a99dd 100644
--- a/Util/FingerPrint.cpp.in
+++ b/Util/FingerPrint.cpp.in
@@ -29,13 +29,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "OSRMException.h"
 
-#include <boost/uuid/uuid_generators.hpp> // generators
-#include <boost/uuid/uuid_io.hpp>         // streaming operators etc.
+#include <boost/uuid/name_generator.hpp>
 
 #include <cstring>
 
 #include <algorithm>
-#include <iostream>
 #include <string>
 
 #cmakedefine01 HAS64BITS
diff --git a/datastore.cpp b/datastore.cpp
index 2b259b87a..dfd6ce95c 100644
--- a/datastore.cpp
+++ b/datastore.cpp
@@ -26,12 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "DataStructures/OriginalEdgeData.h"
-#include "DataStructures/QueryEdge.h"
 #include "DataStructures/SharedMemoryFactory.h"
-#include "DataStructures/SharedMemoryVectorWrapper.h"
-#include "DataStructures/StaticGraph.h"
-#include "DataStructures/StaticRTree.h"
-#include "Server/DataStructures/BaseDataFacade.h"
 #include "Server/DataStructures/SharedDataType.h"
 #include "Server/DataStructures/SharedBarriers.h"
 #include "Util/BoostFileSystemFix.h"
@@ -51,7 +46,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <fstream>
 #include <string>
-#include <vector>
 
 int main(const int argc, const char *argv[])
 {
@@ -434,7 +428,7 @@ int main(const int argc, const char *argv[])
             static_cast<char *>(shared_memory_ptr + shared_layout_ptr->GetRSearchTreeOffset());
 
         if (tree_size > 0)
-        { 
+        {
              tree_node_file.read(rtree_ptr, sizeof(RTreeNode) * tree_size);
         }
         tree_node_file.close();