Minor C++ include fixes

DataStructures/ExtractorStructs.h

@@ -24,8 +24,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <climits>
 #include <cmath>
 #include <string>
-#include <libxml/xmlreader.h>
-
+#include "HashTable.h"
 #include "Util.h"
 
 /*     Default Speed Profile:
@@ -45,7 +44,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
         ferry           5
  */
 
-typedef google::dense_hash_map<string, NodeID> StringMap;
+typedef HashTable<std::string, NodeID> StringMap;
 
 std::string names[14] = { "motorway", "motorway_link", "trunk", "trunk_link", "primary", "primary_link", "secondary", "secondary_link", "tertiary", "unclassified", "residential", "living_street", "service", "ferry" };
 double speeds[14] = { 110, 90, 90, 70, 70, 60, 60, 50, 55, 25, 40 , 10, 30, 5};

DataStructures/Util.h

@@ -25,6 +25,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <cmath>
 #include <cstdlib>
 #include <sys/time.h>
+#include <tr1/functional_hash.h>
+#include <boost/thread.hpp>
 
 /** Returns a timestamp (now) in seconds (incl. a fractional part). */
 inline double get_timestamp()

typedefs.h

@@ -30,7 +30,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <string>
 
 #include <boost/thread.hpp>
-
+#include <libxml/xmlreader.h>
 using namespace std;
 
 #define VERBOSE(x) x