further include untangling, chops 5sec compile time

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)

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;

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)

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())

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
 {