diff --git a/include/Application.h b/include/Application.h
index 4f24e0d..bc1f30d 100644
--- a/include/Application.h
+++ b/include/Application.h
@@ -1,4 +1,8 @@
 #pragma once
+
+// As if hardware is ever going to move away from 1.2
+#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
+
 #ifdef linux
 #include <CL/cl.h>
 #include <CL/opencl.h>
@@ -7,9 +11,6 @@
 // Good lord, windows.h overwrote the std::min() max() definitions
 #define NOMINMAX
 #include <windows.h>
-
-// As if hardware is ever going to move away from 1.2
-#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
 #include <CL/cl.h>
 #include <CL/opencl.h>
 
@@ -20,17 +21,15 @@
 #include <OpenCL/cl_gl_ext.h>
 #include <OpenCL/cl_ext.h>
 #endif
-
-#include "util.hpp"
+#pragma once
+#include <chrono>
 #include <SFML/Graphics.hpp>
-//#include "CLCaster.h"
 #include "Camera.h"
 #include "Input.h"
 #include "LightController.h"
 #include "LightHandle.h"
 #include "map/Map.h"
-#include <chrono>
-#include "imgui/imgui-SFML.h"
+#include "util.hpp"
 
 // Srsly people who macro error codes are the devil
 #undef ERROR
diff --git a/include/CLCaster.h b/include/CLCaster.h
index a80acb6..86168ca 100644
--- a/include/CLCaster.h
+++ b/include/CLCaster.h
@@ -1,19 +1,17 @@
 #pragma once
-#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
-#include <Vector4.hpp>
-#include <vector>
+#include <GL/glew.h>
 #include <iostream>
 #include <map>
-#include <GL/glew.h>
 #include <string.h>
-#include "LightController.h"
-#include "Camera.h"
-//#include <GL/glew.h>
-#include <Application.h>
 #include <unordered_map>
+#include <vector>
+#include "Application.h"
+#include "Camera.h"
+#include "Gui.h"
+#include "LightController.h"
 #include "Logger.h"
 #include "map/Map.h"
-#include "Gui.h"
+#include "Vector4.hpp"
 
 #ifdef linux
 #include <CL/cl.h>
diff --git a/include/Camera.h b/include/Camera.h
index 897406e..86c7392 100644
--- a/include/Camera.h
+++ b/include/Camera.h
@@ -1,10 +1,10 @@
 #pragma once
+#include <cmath>
 #include <SFML/System/Vector3.hpp>
 #include <SFML/System/Vector2.hpp>
-#include "util.hpp"
-#include "Pub_Sub.h"
-#include <cmath>
 #include "Gui.h"
+#include "Pub_Sub.h"
+#include "util.hpp"
 
 
 
diff --git a/include/ConfigDB.h b/include/ConfigDB.h
index 40fc61f..fba7c25 100644
--- a/include/ConfigDB.h
+++ b/include/ConfigDB.h
@@ -1,6 +1,7 @@
 #pragma once
-#include <string>
 #include <experimental/filesystem>
+#include <iostream>
+#include <string>
 
 class ConfigDB {
 	
diff --git a/include/FrameWatcher.h b/include/FrameWatcher.h
index 7fac42c..df74ca6 100644
--- a/include/FrameWatcher.h
+++ b/include/FrameWatcher.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <chrono>
 #include "Pub_Sub.h"
 
 class FrameWatcher : public VrEventPublisher{
diff --git a/include/Gui.h b/include/Gui.h
index 635d4e4..80c7e89 100644
--- a/include/Gui.h
+++ b/include/Gui.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <list>
 #include <mutex>
-#include <Logger.h>
+#include "Logger.h"
 
 /**
  *
diff --git a/include/Input.h b/include/Input.h
index 24c59d1..bc6dddf 100644
--- a/include/Input.h
+++ b/include/Input.h
@@ -5,11 +5,11 @@
 #include <string>
 #include <SFML/Graphics.hpp>
 #include "Event.hpp"
-#include "Pub_Sub.h"
 #include "Gui.h"
-#include "Logger.h"
 #include "LightHandle.h"
-
+#include "Logger.h"
+#include "Pub_Sub.h"
+#include <imgui/imgui-SFML.h>
 /**
  *
  * Input
diff --git a/include/NetworkInput.h b/include/NetworkInput.h
index 1a30bdf..3c7f569 100644
--- a/include/NetworkInput.h
+++ b/include/NetworkInput.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstring>
 #include <list>
 #include <thread>
 #include <SFML/Network.hpp>
diff --git a/include/Pub_Sub.h b/include/Pub_Sub.h
index dc47540..f652451 100644
--- a/include/Pub_Sub.h
+++ b/include/Pub_Sub.h
@@ -2,6 +2,7 @@
 #include <iostream>
 #include <memory>
 #include <set>
+#include <vector>
 #include <SFML/Graphics.hpp>
 #include "Event.hpp"
 
diff --git a/include/map/Map.h b/include/map/Map.h
index a8decce..940bb38 100644
--- a/include/map/Map.h
+++ b/include/map/Map.h
@@ -5,9 +5,10 @@
 #include <time.h>
 #include <SFML/System/Clock.hpp>
 #include <SFML/System/Vector3.hpp>
-#include "util.hpp"
+#include "Logger.h"
 #include "map/ArrayMap.h"
 #include "map/Octree.h"
+#include "util.hpp"
 
 #define _USE_MATH_DEFINES
 #include <math.h>
diff --git a/src/Camera.cpp b/src/Camera.cpp
index 1e7ddef..c88f001 100644
--- a/src/Camera.cpp
+++ b/src/Camera.cpp
@@ -1,5 +1,4 @@
 #include "Camera.h"
-#include "Pub_Sub.h"
 
 
 Camera::Camera() {}
diff --git a/src/ConfigDB.cpp b/src/ConfigDB.cpp
index abcc5cc..5769abb 100644
--- a/src/ConfigDB.cpp
+++ b/src/ConfigDB.cpp
@@ -1,5 +1,5 @@
 #include "ConfigDB.h"
-#include <iostream>
+
 
 ConfigDB::ConfigDB()
 {
diff --git a/src/FrameWatcher.cpp b/src/FrameWatcher.cpp
index f90a9e3..8646b00 100644
--- a/src/FrameWatcher.cpp
+++ b/src/FrameWatcher.cpp
@@ -1,5 +1,5 @@
 #include "FrameWatcher.h"
-#include <chrono>
+
 
 FrameWatcher::FrameWatcher() {
 
diff --git a/src/Input.cpp b/src/Input.cpp
index ea187c9..5f79ec6 100644
--- a/src/Input.cpp
+++ b/src/Input.cpp
@@ -1,6 +1,4 @@
-#pragma once
-#include <imgui/imgui-SFML.h>
-#include "Input.h"
+#include "Input.h"
 
 
 Input::Input() {
diff --git a/src/NetworkInput.cpp b/src/NetworkInput.cpp
index b3b59e9..3014905 100644
--- a/src/NetworkInput.cpp
+++ b/src/NetworkInput.cpp
@@ -1,7 +1,4 @@
 #include "NetworkInput.h"
-#include <iostream>
-#include <cstring>
-#include <memory>
 
 NetworkInput::NetworkInput() {
 
diff --git a/src/Pub_Sub.cpp b/src/Pub_Sub.cpp
index d8168b2..506c619 100644
--- a/src/Pub_Sub.cpp
+++ b/src/Pub_Sub.cpp
@@ -1,5 +1,3 @@
-#include <vector>
-#include "Event.hpp"
 #include "Pub_Sub.h"
 
 
diff --git a/src/Ray.cpp b/src/Ray.cpp
index 167651c..9c2e60f 100644
--- a/src/Ray.cpp
+++ b/src/Ray.cpp
@@ -1,8 +1,4 @@
-#include <SFML/Graphics.hpp>
-#include <iostream>
-#include "map/Map.h"
 #include <Ray.h>
-#include "util.hpp"
 
 Ray::Ray(
         Map *map,
diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 689a43e..5db86d3 100644
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -1,5 +1,5 @@
 #include "map/Map.h"
-#include "Logger.h"
+
 
 
 Map::Map(uint32_t dimensions) : array_map(sf::Vector3i(dimensions, dimensions, dimensions)) {