diff --git a/CMakeLists.txt b/CMakeLists.txt
index 190e2ba..3163cf4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,14 +75,14 @@ add_custom_target(
 	eval
 	COMMAND make
 	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}//eval
-	)
+)
 
 # handles install target
 install(
 	FILES pfaedle.cfg DESTINATION etc/${PROJECT_NAME} COMPONENT config PERMISSIONS WORLD_READ
-	)
+)
 
 install(
 	FILES build/pfaedle DESTINATION bin
 	PERMISSIONS WORLD_EXECUTE COMPONENT binaries
-	)
+)
diff --git a/src/pfaedle/router/ShapeBuilder.cpp b/src/pfaedle/router/ShapeBuilder.cpp
index 67073b8..ffc56f2 100644
--- a/src/pfaedle/router/ShapeBuilder.cpp
+++ b/src/pfaedle/router/ShapeBuilder.cpp
@@ -12,6 +12,7 @@
 #include <exception>
 #include <map>
 #include <mutex>
+#include <stdexcept>
 #include <unordered_map>
 #include <utility>
 #include "ad/cppgtfs/gtfs/Feed.h"
diff --git a/src/pfaedle/trgraph/Normalizer.cpp b/src/pfaedle/trgraph/Normalizer.cpp
index 9db38d0..173444e 100644
--- a/src/pfaedle/trgraph/Normalizer.cpp
+++ b/src/pfaedle/trgraph/Normalizer.cpp
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <regex>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/util/geo/Geo.h b/src/util/geo/Geo.h
index c4e3c5d..679d9cd 100644
--- a/src/util/geo/Geo.h
+++ b/src/util/geo/Geo.h
@@ -12,6 +12,7 @@
 #include <cassert>
 #include <iostream>
 #include <sstream>
+#include <stdexcept>
 #include "util/Misc.h"
 #include "util/String.h"
 #include "util/geo/Box.h"
diff --git a/src/util/http/Server.cpp b/src/util/http/Server.cpp
index 87957c2..dacee83 100644
--- a/src/util/http/Server.cpp
+++ b/src/util/http/Server.cpp
@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <memory>
 #include <sstream>
+#include <stdexcept>
 #include <thread>
 #include <unordered_map>
 #ifdef ZLIB_FOUND
@@ -108,8 +109,7 @@ void HttpServer::handle() {
       answ = Answer(err.what(), err.what());
     } catch (...) {
       // catch everything to make sure the server continues running
-      answ = Answer(
-          "500 Internal Server Error", "500 Internal Server Error");
+      answ = Answer("500 Internal Server Error", "500 Internal Server Error");
     }
 
     send(connection, &answ);
@@ -146,8 +146,8 @@ Req HttpServer::getReq(int connection) {
   int64_t curRcvd = 0;
   HeaderState state = NONE;
   Req ret;
-  char *tmp = 0;
-  char *tmp2 = 0;
+  char* tmp = 0;
+  char* tmp2 = 0;
   char* brk = 0;
 
   while ((curRcvd = read(connection, buf + rcvd, BSIZE - rcvd))) {