diff --git a/Algorithms/DouglasPeucker.h b/Algorithms/DouglasPeucker.h
index 64884d820..c1b63cdee 100644
--- a/Algorithms/DouglasPeucker.h
+++ b/Algorithms/DouglasPeucker.h
@@ -22,7 +22,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #define DOUGLASPEUCKER_H_
 
 #include <cfloat>
-#include "../DataStructures/SimpleStack.h"
+
+#include <stack>
 
 /*This class object computes the bitvector of indicating generalized input points
  * according to the (Ramer-)Douglas-Peucker algorithm.
diff --git a/DataStructures/ExtractorStructs.h b/DataStructures/ExtractorStructs.h
index dc4488be0..03c87ccf7 100644
--- a/DataStructures/ExtractorStructs.h
+++ b/DataStructures/ExtractorStructs.h
@@ -24,6 +24,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <climits>
 #include <string>
 #include <boost/unordered_map.hpp>
+#include "../DataStructures/HashTable.h"
 #include "../typedefs.h"
 #include "Util.h"
 
diff --git a/DataStructures/NodeCoords.h b/DataStructures/NodeCoords.h
index 7f1d964b3..30e5f6c34 100644
--- a/DataStructures/NodeCoords.h
+++ b/DataStructures/NodeCoords.h
@@ -24,6 +24,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <cassert>
 #include <cstddef>
 #include <climits>
+#include <limits>
 
 #include "../typedefs.h"
 
diff --git a/typedefs.h b/typedefs.h
index 683c17c2b..e03e165a8 100644
--- a/typedefs.h
+++ b/typedefs.h
@@ -26,8 +26,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #endif
 
 #include <climits>
-#include <cstring>
-#include <string>
 
 using namespace std;
 
@@ -47,7 +45,6 @@ using namespace std;
 #define DEBUG(x) do {std::cout << "[debug " << __FILE__ << ":" << __LINE__ << "] " << x << std::endl;} while(0);
 #define GUARANTEE(x,y) do { {do{ if(false == (x)) { ERR(y) } } while(0);} } while(0);
 #endif
-//#define DELETE(x) do { if(NULL != x) { delete x; x = NULL; } }while(0);
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
@@ -65,20 +62,10 @@ typedef unsigned int EdgeWeight;
 static const NodeID SPECIAL_NODEID = UINT_MAX;
 static const EdgeID SPECIAL_EDGEID = UINT_MAX;
 
-#ifndef _ONLYTYPEDEFS
-#include <boost/thread.hpp>
-#include <libxml/xmlreader.h>
-#include "DataStructures/Util.h"
-#endif //_ONLYTYPEDEFS
-
-#include "DataStructures/HashTable.h"
 #include "DataStructures/NodeCoords.h"
 typedef NodeCoords<NodeID> NodeInfo;
 #include "DataStructures/NodeInformationHelpDesk.h"
-#include "DataStructures/BinaryHeap.h"
-#include "Contractor/Contractor.h"
 #include "Contractor/ContractionCleanup.h"
 typedef ContractionCleanup::Edge::EdgeData EdgeData;
-#include "DataStructures/DynamicGraph.h"
 
 #endif /* TYPEDEFS_H_ */