diff --git a/include/common/color_utils.hpp b/include/common/color_utils.hpp
index 3268d43a..59459956 100644
--- a/include/common/color_utils.hpp
+++ b/include/common/color_utils.hpp
@@ -1,7 +1,10 @@
 #pragma once
-#include <SFML/Graphics.hpp>
+
 #include "common/math.hpp"
 #include "common/number_generator.hpp"
+#include "common/utils.hpp"
+
+#include <SFML/Graphics.hpp>
 
 
 struct ColorUtils
diff --git a/include/common/double_buffer.hpp b/include/common/double_buffer.hpp
index dccb29d9..5aceec1a 100644
--- a/include/common/double_buffer.hpp
+++ b/include/common/double_buffer.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdint>
+
+
 template<typename T>
 struct DoubleObject
 {
diff --git a/include/common/grid.hpp b/include/common/grid.hpp
index bf8d96d9..df9725d8 100644
--- a/include/common/grid.hpp
+++ b/include/common/grid.hpp
@@ -1,8 +1,13 @@
 #pragma once
-#include <vector>
-#include <list>
+
+#include "common/utils.hpp"
+
 #include <SFML/System.hpp>
 
+#include <cstdint>
+#include <list>
+#include <vector>
+
 
 template<typename T>
 struct Grid
diff --git a/include/common/index_vector.hpp b/include/common/index_vector.hpp
index aef0a8dc..e2438c04 100644
--- a/include/common/index_vector.hpp
+++ b/include/common/index_vector.hpp
@@ -1,4 +1,6 @@
 #pragma once
+
+#include <cstdint>
 #include <vector>
 
 
diff --git a/include/common/math.hpp b/include/common/math.hpp
index fd1f3360..82392949 100644
--- a/include/common/math.hpp
+++ b/include/common/math.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cmath>
+
+
 struct Math
 {
     static constexpr float PI = 3.141592653f;
diff --git a/include/common/utils.hpp b/include/common/utils.hpp
index 0867b1f1..faacdab1 100644
--- a/include/common/utils.hpp
+++ b/include/common/utils.hpp
@@ -1,6 +1,9 @@
 #pragma once
+
 #include <SFML/Graphics.hpp>
+
 #include <cmath>
+#include <memory>
 #include <sstream>
 
 
diff --git a/include/editor/GUI/container.hpp b/include/editor/GUI/container.hpp
index 6f5bd31f..b72081db 100644
--- a/include/editor/GUI/container.hpp
+++ b/include/editor/GUI/container.hpp
@@ -1,7 +1,10 @@
 #pragma once
-#include "editor/GUI/item.hpp"
+
 #include "common/color_utils.hpp"
 
+#include "editor/GUI/item.hpp"
+#include "editor/GUI/utils.hpp"
+
 
 namespace GUI
 {
diff --git a/include/editor/GUI/empty_item.hpp b/include/editor/GUI/empty_item.hpp
index d1657d1a..99f2fde9 100644
--- a/include/editor/GUI/empty_item.hpp
+++ b/include/editor/GUI/empty_item.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "item.hpp"
+
 
 namespace GUI
 {
diff --git a/include/editor/GUI/item.cpp b/include/editor/GUI/item.cpp
deleted file mode 100644
index 6ec3b680..00000000
--- a/include/editor/GUI/item.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "item.hpp"
-
-float GUI::Item::SCALE = 1.0f;
diff --git a/include/editor/GUI/item.hpp b/include/editor/GUI/item.hpp
index a72395d4..eb9a7599 100644
--- a/include/editor/GUI/item.hpp
+++ b/include/editor/GUI/item.hpp
@@ -1,7 +1,10 @@
 #pragma once
+
+#include "common/utils.hpp"
+#include "common/event_manager.hpp"
+#include "simulation/config.hpp"
+
 #include <SFML/Graphics.hpp>
-#include <common/event_manager.hpp>
-#include "utils.hpp"
 
 
 namespace GUI
diff --git a/include/editor/GUI/utils.hpp b/include/editor/GUI/utils.hpp
index 59dd496b..b7f20e3b 100644
--- a/include/editor/GUI/utils.hpp
+++ b/include/editor/GUI/utils.hpp
@@ -1,7 +1,11 @@
 #pragma once
-#include <common/utils.hpp>
+
+#include "common/utils.hpp"
+
 #include <SFML/Graphics.hpp>
 
+#include <functional>
+
 
 template<typename T>
 sf::Vector2f toVector2f(sf::Vector2<T> v)
diff --git a/include/editor/colony_creator/colony_stats.hpp b/include/editor/colony_creator/colony_stats.hpp
index 105dc1de..ab08b1ce 100644
--- a/include/editor/colony_creator/colony_stats.hpp
+++ b/include/editor/colony_creator/colony_stats.hpp
@@ -1,7 +1,13 @@
 #pragma once
+
 #include "editor/GUI/named_container.hpp"
+#include "editor/control_state.hpp"
+
+#include "common/index_vector.hpp"
 #include "common/graph.hpp"
 
+#include "simulation/colony/colony.hpp"
+
 
 struct ColonyChart : public GUI::Item
 {
diff --git a/include/editor/colony_creator/colony_tool.hpp b/include/editor/colony_creator/colony_tool.hpp
index 17dd7886..11c2551a 100644
--- a/include/editor/colony_creator/colony_tool.hpp
+++ b/include/editor/colony_creator/colony_tool.hpp
@@ -1,11 +1,16 @@
 #pragma once
+
+#include "colony_stats.hpp"
+
 #include "editor/GUI/container.hpp"
 #include "editor/GUI/button.hpp"
 #include "editor/GUI/rounded_rectangle.hpp"
+#include "editor/GUI/toggle.hpp"
 #include "editor/color_picker/color_picker.hpp"
 #include "editor/control_state.hpp"
+
 #include "common/color_utils.hpp"
-#include "colony_stats.hpp"
+
 
 
 struct ColonyTool : GUI::Container
diff --git a/include/editor/color_saver.hpp b/include/editor/color_saver.hpp
index b4371faf..b0ba1279 100644
--- a/include/editor/color_saver.hpp
+++ b/include/editor/color_saver.hpp
@@ -1,7 +1,10 @@
 #pragma once
-#include "GUI/item.hpp"
-#include "GUI/grid_container.hpp"
+
 #include "GUI/button.hpp"
+#include "GUI/container.hpp"
+#include "GUI/grid_container.hpp"
+#include "GUI/item.hpp"
+
 #include "transition.hpp"
 
 
diff --git a/include/editor/control_state.hpp b/include/editor/control_state.hpp
index 914dc343..bd78a287 100644
--- a/include/editor/control_state.hpp
+++ b/include/editor/control_state.hpp
@@ -1,7 +1,12 @@
 #pragma once
-#include <functional>
-#include <SFML/Graphics.hpp>
+
+#include "common/viewport_handler.hpp"
 #include "editor/transition.hpp"
+#include "simulation/simulation.hpp"
+
+#include <SFML/Graphics.hpp>
+
+#include <functional>
 
 
 struct ControlState
diff --git a/include/editor/slider.hpp b/include/editor/slider.hpp
index ee3f340c..b647699b 100644
--- a/include/editor/slider.hpp
+++ b/include/editor/slider.hpp
@@ -1,4 +1,9 @@
+#pragma once
+
+#include "GUI/container.hpp"
 #include "GUI/item.hpp"
+#include "GUI/rounded_rectangle.hpp"
+#include "GUI/text_label.hpp"
 
 
 namespace edtr
diff --git a/include/editor/tool_selector.hpp b/include/editor/tool_selector.hpp
index 2a276f98..cf57d95c 100644
--- a/include/editor/tool_selector.hpp
+++ b/include/editor/tool_selector.hpp
@@ -1,8 +1,12 @@
 #pragma once
-#include "GUI/container.hpp"
+
 #include "GUI/button.hpp"
+#include "GUI/container.hpp"
+#include "GUI/named_container.hpp"
+
 #include "control_state.hpp"
 #include "simulation/simulation.hpp"
+
 #include <future>
 
 
diff --git a/include/simulation/config.hpp b/include/simulation/config.hpp
index 015f211a..937648bd 100644
--- a/include/simulation/config.hpp
+++ b/include/simulation/config.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
-#include <memory>
 #include <SFML/Graphics.hpp>
 
+#include <memory>
+#include <fstream>
+
 
 template<typename T>
 struct DefaultConf