diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp
index e6cce3a44..6eaa9b443 100644
--- a/Contractor/EdgeBasedGraphFactory.cpp
+++ b/Contractor/EdgeBasedGraphFactory.cpp
@@ -25,10 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "EdgeBasedGraphFactory.h"
 
+#include "EdgeBasedGraphFactory.h"
 #include "../Util/ComputeAngle.h"
 
+#include <boost/assert.hpp>
+#include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
+
 //TODO: CompressionWorker
 //TODO: EdgeBasedEdgeGenerator
 
diff --git a/Contractor/EdgeBasedGraphFactory.h b/Contractor/EdgeBasedGraphFactory.h
index 3126fb155..191b59998 100644
--- a/Contractor/EdgeBasedGraphFactory.h
+++ b/Contractor/EdgeBasedGraphFactory.h
@@ -46,9 +46,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "GeometryCompressor.h"
 
-#include <boost/assert.hpp>
-#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/unordered_map.hpp>
diff --git a/routed.cpp b/routed.cpp
index 646b542f7..ddfef5739 100644
--- a/routed.cpp
+++ b/routed.cpp
@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Util/UUID.h"
 
 #ifdef __linux__
-#include "Util/LinuxStackTrace.h"
 #include <sys/mman.h>
 #endif
 
@@ -76,7 +75,6 @@ int main (int argc, const char * argv[]) {
             SimpleLogger().Write(logWARNING) <<
                 "Process " << argv[0] << " could not be locked to RAM";
         }
-        installCrashHandler(argv[0]);
 #endif
         bool use_shared_memory = false;
         std::string ip_address;
diff --git a/typedefs.h b/typedefs.h
index cfccf98fa..a3a6362fe 100644
--- a/typedefs.h
+++ b/typedefs.h
@@ -28,20 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TYPEDEFS_H_
 #define TYPEDEFS_H_
 
-#include <climits>
-#include <cstdlib>
-
 // To fix long and long long woes
 #include <boost/integer.hpp>
 #include <boost/integer_traits.hpp>
 
-#ifdef __APPLE__
-#include <signal.h>
-#endif
-
-#include <iostream>
-#include <ostream>
-
 // Necessary workaround for Windows as VS doesn't implement C99
 #ifdef _MSC_VER
 #ifndef M_PI