diff --git a/include/eepp/audio/audiodevice.hpp b/include/eepp/audio/audiodevice.hpp
index bf0147953..7a28fd6a2 100755
--- a/include/eepp/audio/audiodevice.hpp
+++ b/include/eepp/audio/audiodevice.hpp
@@ -1,6 +1,7 @@
 #ifndef EE_AUDIOCAUDIODEVICE_H
 #define EE_AUDIOCAUDIODEVICE_H
 
+#include <string>
 #include <eepp/audio/audiolistener.hpp>
 
 namespace EE { namespace Audio {
diff --git a/include/eepp/audio/audiolistener.hpp b/include/eepp/audio/audiolistener.hpp
index d0971844e..18219115f 100755
--- a/include/eepp/audio/audiolistener.hpp
+++ b/include/eepp/audio/audiolistener.hpp
@@ -1,7 +1,8 @@
 #ifndef EE_AUDIOCLISTENER_H
 #define EE_AUDIOCLISTENER_H
 
-#include <eepp/audio/base.hpp>
+#include <eepp/math/vector3.hpp>
+using namespace EE::Math;
 
 namespace EE { namespace Audio {
 
diff --git a/include/eepp/audio/base.hpp b/include/eepp/audio/base.hpp
index 4ce0eb6dc..568f690cf 100644
--- a/include/eepp/audio/base.hpp
+++ b/include/eepp/audio/base.hpp
@@ -3,16 +3,6 @@
 
 #include <eepp/core.hpp>
 
-#include <eepp/system/log.hpp>
-#include <eepp/system/pack.hpp>
-#include <eepp/system/thread.hpp>
-#include <eepp/system/filesystem.hpp>
-#include <eepp/system/time.hpp>
-using namespace EE::System;
-
-#include <eepp/math/vector3.hpp>
-using namespace EE::Math;
-
 /**
 This module is based on the sfml-audio module.
 
diff --git a/include/eepp/audio/soundbuffer.hpp b/include/eepp/audio/soundbuffer.hpp
index fd44519f7..7fa0def3d 100755
--- a/include/eepp/audio/soundbuffer.hpp
+++ b/include/eepp/audio/soundbuffer.hpp
@@ -1,8 +1,11 @@
 #ifndef EE_AUDIOCSOUNDBUFFER_H
 #define EE_AUDIOCSOUNDBUFFER_H
 
-#include <eepp/audio/base.hpp>
 #include <set>
+#include <eepp/system/time.hpp>
+#include <eepp/system/pack.hpp>
+using namespace EE::System;
+
 
 namespace EE { namespace Audio {
 
diff --git a/include/eepp/audio/soundstream.hpp b/include/eepp/audio/soundstream.hpp
index 7900d241e..aed70b1de 100755
--- a/include/eepp/audio/soundstream.hpp
+++ b/include/eepp/audio/soundstream.hpp
@@ -1,8 +1,9 @@
 #ifndef EE_AUDIOCSOUNDSTREAM_H
 #define EE_AUDIOCSOUNDSTREAM_H
 
-#include <eepp/audio/base.hpp>
 #include <eepp/audio/sound.hpp>
+#include <eepp/system/thread.hpp>
+using namespace EE::System;
 
 namespace EE { namespace Audio {
 
diff --git a/include/eepp/graphics/base.hpp b/include/eepp/graphics/base.hpp
index 6f3357d34..5df976c0c 100644
--- a/include/eepp/graphics/base.hpp
+++ b/include/eepp/graphics/base.hpp
@@ -9,20 +9,7 @@
 #include <eepp/math/math.hpp>
 using namespace EE::Math;
 
-#include <eepp/system/color.hpp>
-#include <eepp/system/bitop.hpp>
-#include <eepp/system/clock.hpp>
-#include <eepp/system/singleton.hpp>
-#include <eepp/system/log.hpp>
-#include <eepp/system/pack.hpp>
-#include <eepp/system/resourcemanager.hpp>
-#include <eepp/system/container.hpp>
-#include <eepp/system/filesystem.hpp>
-using namespace EE::System;
-
 #include <eepp/graphics/rendermode.hpp>
-#include <eepp/graphics/blendmode.hpp>
-#include <eepp/graphics/pixeldensity.hpp>
 
 #ifndef EE_MAX_TEXTURE_UNITS
 #define EE_MAX_TEXTURE_UNITS 4
diff --git a/include/eepp/graphics/batchrenderer.hpp b/include/eepp/graphics/batchrenderer.hpp
index 0f1799062..a28f3e99d 100755
--- a/include/eepp/graphics/batchrenderer.hpp
+++ b/include/eepp/graphics/batchrenderer.hpp
@@ -3,9 +3,13 @@
 
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/primitivetype.hpp>
+#include <eepp/graphics/blendmode.hpp>
 #include <eepp/math/polygon2.hpp>
 #include <eepp/math/originpoint.hpp>
 
+#include <eepp/system/color.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 struct eeTexCoord {
diff --git a/include/eepp/graphics/fontmanager.hpp b/include/eepp/graphics/fontmanager.hpp
index 49a023bad..2020ee989 100644
--- a/include/eepp/graphics/fontmanager.hpp
+++ b/include/eepp/graphics/fontmanager.hpp
@@ -4,6 +4,10 @@
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/font.hpp>
 
+#include <eepp/system/singleton.hpp>
+#include <eepp/system/resourcemanager.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 /** @brief The Font Manager is a singleton class that manages all the instance of fonts instanciated.
diff --git a/include/eepp/graphics/framebuffermanager.hpp b/include/eepp/graphics/framebuffermanager.hpp
index 1d767d50c..59b5a7547 100644
--- a/include/eepp/graphics/framebuffermanager.hpp
+++ b/include/eepp/graphics/framebuffermanager.hpp
@@ -4,6 +4,10 @@
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/framebuffer.hpp>
 
+#include <eepp/system/singleton.hpp>
+#include <eepp/system/container.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics { namespace Private {
 
 class EE_API FrameBufferManager : public Container<FrameBuffer> {
diff --git a/include/eepp/graphics/globalbatchrenderer.hpp b/include/eepp/graphics/globalbatchrenderer.hpp
index c96612780..723b37335 100755
--- a/include/eepp/graphics/globalbatchrenderer.hpp
+++ b/include/eepp/graphics/globalbatchrenderer.hpp
@@ -4,6 +4,9 @@
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/batchrenderer.hpp>
 
+#include <eepp/system/singleton.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 /** @brief The global Batch Renderer class. This class will be used by the engine for the rendering. */
diff --git a/include/eepp/graphics/globaltextureatlas.hpp b/include/eepp/graphics/globaltextureatlas.hpp
index 817556e94..0a2356f9a 100644
--- a/include/eepp/graphics/globaltextureatlas.hpp
+++ b/include/eepp/graphics/globaltextureatlas.hpp
@@ -4,6 +4,9 @@
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/textureatlas.hpp>
 
+#include <eepp/system/singleton.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 /** @brief Any SubTexture that doesn't belong to an specific TextureAtlas ( a real texture atlas texture ), goes here.
diff --git a/include/eepp/graphics/ninepatchmanager.hpp b/include/eepp/graphics/ninepatchmanager.hpp
index a44311f5b..2501be432 100644
--- a/include/eepp/graphics/ninepatchmanager.hpp
+++ b/include/eepp/graphics/ninepatchmanager.hpp
@@ -4,6 +4,10 @@
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/ninepatch.hpp>
 
+#include <eepp/system/singleton.hpp>
+#include <eepp/system/resourcemanager.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 class EE_API NinePatchManager : public ResourceManager<NinePatch> {
diff --git a/include/eepp/graphics/particle.hpp b/include/eepp/graphics/particle.hpp
index 2b809ebbe..02130c8c7 100755
--- a/include/eepp/graphics/particle.hpp
+++ b/include/eepp/graphics/particle.hpp
@@ -3,6 +3,9 @@
 
 #include <eepp/graphics/base.hpp>
 
+#include <eepp/system/color.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 /** @brief A simple particle class used by the particle system.
diff --git a/include/eepp/graphics/particlesystem.hpp b/include/eepp/graphics/particlesystem.hpp
index 27a73d1e4..c3f4f015b 100755
--- a/include/eepp/graphics/particlesystem.hpp
+++ b/include/eepp/graphics/particlesystem.hpp
@@ -3,6 +3,10 @@
 
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/particle.hpp>
+#include <eepp/graphics/blendmode.hpp>
+
+#include <eepp/system/time.hpp>
+using namespace EE::System;
 
 namespace EE { namespace Graphics {
 
diff --git a/include/eepp/graphics/primitives.hpp b/include/eepp/graphics/primitives.hpp
index 8c6cf7f6a..9f911618d 100755
--- a/include/eepp/graphics/primitives.hpp
+++ b/include/eepp/graphics/primitives.hpp
@@ -4,6 +4,10 @@
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/primitivetype.hpp>
 #include <eepp/math/polygon2.hpp>
+#include <eepp/graphics/blendmode.hpp>
+
+#include <eepp/system/color.hpp>
+using namespace EE::System;
 
 namespace EE { namespace Graphics {
 
diff --git a/include/eepp/graphics/scrollparallax.hpp b/include/eepp/graphics/scrollparallax.hpp
index 219585a53..d56779747 100755
--- a/include/eepp/graphics/scrollparallax.hpp
+++ b/include/eepp/graphics/scrollparallax.hpp
@@ -5,6 +5,9 @@
 #include <eepp/graphics/texture.hpp>
 #include <eepp/graphics/subtexture.hpp>
 
+#include <eepp/system/clock.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 /** @brief The scroll parallax renders a SubTexture to the screen from a position and a size specified. If the size is bigger than the SubTexture, the SubTexture is rendered as a repeated SubTexture until it covers all the size of the parallax, adding movement to more than one Scroll Parallax will generate the ilusion of depth.
diff --git a/include/eepp/graphics/shader.hpp b/include/eepp/graphics/shader.hpp
index 566c83f3b..60338f89a 100644
--- a/include/eepp/graphics/shader.hpp
+++ b/include/eepp/graphics/shader.hpp
@@ -3,6 +3,9 @@
 
 #include <eepp/graphics/base.hpp>
 
+#include <eepp/system/pack.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 /** @brief The basic shader class. */
diff --git a/include/eepp/graphics/shaderprogrammanager.hpp b/include/eepp/graphics/shaderprogrammanager.hpp
index 0441dbe2f..7f026f90c 100644
--- a/include/eepp/graphics/shaderprogrammanager.hpp
+++ b/include/eepp/graphics/shaderprogrammanager.hpp
@@ -4,6 +4,10 @@
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/shaderprogram.hpp>
 
+#include <eepp/system/singleton.hpp>
+#include <eepp/system/resourcemanager.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 /** @brief The Shader Program Manager is a singleton class that manages all the instances of Shader Programs instanciated.
diff --git a/include/eepp/graphics/sprite.hpp b/include/eepp/graphics/sprite.hpp
index a5c01e503..9c65f8e40 100755
--- a/include/eepp/graphics/sprite.hpp
+++ b/include/eepp/graphics/sprite.hpp
@@ -6,6 +6,9 @@
 #include <eepp/graphics/subtexture.hpp>
 #include <eepp/graphics/textureatlas.hpp>
 
+#include <eepp/system/time.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 /** @brief A Sprite controller class, can hold and control sprites animations. */
diff --git a/include/eepp/graphics/textureatlas.hpp b/include/eepp/graphics/textureatlas.hpp
index ec33064ab..373ca1b80 100644
--- a/include/eepp/graphics/textureatlas.hpp
+++ b/include/eepp/graphics/textureatlas.hpp
@@ -3,6 +3,8 @@
 
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/subtexture.hpp>
+#include <eepp/system/resourcemanager.hpp>
+using namespace EE::System;
 
 namespace EE { namespace Graphics {
 
diff --git a/include/eepp/graphics/textureatlasmanager.hpp b/include/eepp/graphics/textureatlasmanager.hpp
index 85685e8f8..76059bf32 100644
--- a/include/eepp/graphics/textureatlasmanager.hpp
+++ b/include/eepp/graphics/textureatlasmanager.hpp
@@ -5,6 +5,10 @@
 #include <eepp/graphics/subtexture.hpp>
 #include <eepp/graphics/textureatlas.hpp>
 
+#include <eepp/system/singleton.hpp>
+#include <eepp/system/pack.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 /** @brief The Texture Atlas Manager is a singleton class that manages all the instances of Texture Atlases instanciated.
diff --git a/include/eepp/graphics/texturefactory.hpp b/include/eepp/graphics/texturefactory.hpp
index 27c0efb8b..687bedd4a 100755
--- a/include/eepp/graphics/texturefactory.hpp
+++ b/include/eepp/graphics/texturefactory.hpp
@@ -1,9 +1,14 @@
 #ifndef EECTEXTUREFACTORY_H
 #define EECTEXTUREFACTORY_H
 
+#include <list>
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/texture.hpp>
+
+#include <eepp/system/pack.hpp>
+#include <eepp/system/singleton.hpp>
 #include <eepp/system/mutex.hpp>
+using namespace EE::System;
 
 namespace EE { namespace Graphics {
 
diff --git a/include/eepp/graphics/textureloader.hpp b/include/eepp/graphics/textureloader.hpp
index 5db1ae4e5..93851feae 100644
--- a/include/eepp/graphics/textureloader.hpp
+++ b/include/eepp/graphics/textureloader.hpp
@@ -5,6 +5,10 @@
 #include <eepp/graphics/texture.hpp>
 #include <eepp/system/objectloader.hpp>
 
+#include <eepp/system/pack.hpp>
+#include <eepp/system/clock.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 /** @brief The Texture loader loads a texture in synchronous or asynchronous mode.
diff --git a/include/eepp/graphics/texturepacker.hpp b/include/eepp/graphics/texturepacker.hpp
index a862c00cf..a4787479b 100644
--- a/include/eepp/graphics/texturepacker.hpp
+++ b/include/eepp/graphics/texturepacker.hpp
@@ -31,9 +31,11 @@
 ** Implementation differs from the original, but i used the base texture atlas algorithm.
 */
 
+#include <list>
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/packerhelper.hpp>
 #include <eepp/graphics/image.hpp>
+#include <eepp/graphics/pixeldensity.hpp>
 
 namespace EE { namespace Graphics {
 
diff --git a/include/eepp/graphics/vertexbuffer.hpp b/include/eepp/graphics/vertexbuffer.hpp
index 74e20a1e6..1a9134bfb 100644
--- a/include/eepp/graphics/vertexbuffer.hpp
+++ b/include/eepp/graphics/vertexbuffer.hpp
@@ -5,6 +5,9 @@
 #include <eepp/graphics/primitivetype.hpp>
 #include <eepp/graphics/vertexbufferhelper.hpp>
 
+#include <eepp/system/color.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics {
 
 /** @brief The vertex buffer class holds vertex data. The vertex position, colors, texture coordinates and indexes.
diff --git a/include/eepp/graphics/vertexbuffermanager.hpp b/include/eepp/graphics/vertexbuffermanager.hpp
index 8f5f0d2c1..694976d76 100644
--- a/include/eepp/graphics/vertexbuffermanager.hpp
+++ b/include/eepp/graphics/vertexbuffermanager.hpp
@@ -4,6 +4,10 @@
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/vertexbuffer.hpp>
 
+#include <eepp/system/singleton.hpp>
+#include <eepp/system/container.hpp>
+using namespace EE::System;
+
 namespace EE { namespace Graphics { namespace Private {
 
 class EE_API VertexBufferManager : public Container<VertexBuffer> {
diff --git a/include/eepp/physics/physicsmanager.hpp b/include/eepp/physics/physicsmanager.hpp
index 6e5e39890..b1bfcbf92 100644
--- a/include/eepp/physics/physicsmanager.hpp
+++ b/include/eepp/physics/physicsmanager.hpp
@@ -2,6 +2,7 @@
 #define EE_PHYSICS_PHYSICSMANAGER_HPP
 
 #include <eepp/physics/base.hpp>
+#include <list>
 
 CP_NAMESPACE_BEGIN
 
diff --git a/include/eepp/physics/space.hpp b/include/eepp/physics/space.hpp
index 26e02ef55..b89d3afac 100644
--- a/include/eepp/physics/space.hpp
+++ b/include/eepp/physics/space.hpp
@@ -1,6 +1,7 @@
 #ifndef EE_PHYSICS_CSPACE_HPP
 #define EE_PHYSICS_CSPACE_HPP
 
+#include <list>
 #include <eepp/physics/base.hpp>
 #include <eepp/physics/body.hpp>
 #include <eepp/physics/shape.hpp>
diff --git a/projects/linux/ee.files b/projects/linux/ee.files
index eb9efbdb0..49b3eea5d 100644
--- a/projects/linux/ee.files
+++ b/projects/linux/ee.files
@@ -29,6 +29,7 @@
 ../../include/eepp/graphics/vertexbufferhelper.hpp
 ../../include/eepp/math/interpolation1d.hpp
 ../../include/eepp/math/interpolation2d.hpp
+../../include/eepp/math/transform.hpp
 ../../include/eepp/system/color.hpp
 ../../include/eepp/system/directorypack.hpp
 ../../include/eepp/system/iostreampak.hpp
@@ -83,6 +84,7 @@
 ../../src/eepp/graphics/text.cpp
 ../../src/eepp/math/interpolation1d.cpp
 ../../src/eepp/math/interpolation2d.cpp
+../../src/eepp/math/transform.cpp
 ../../src/eepp/system/color.cpp
 ../../src/eepp/system/directorypack.cpp
 ../../src/eepp/system/iostreampak.cpp
diff --git a/src/eepp/audio/music.cpp b/src/eepp/audio/music.cpp
index f725ecdab..d1cbc81e7 100755
--- a/src/eepp/audio/music.cpp
+++ b/src/eepp/audio/music.cpp
@@ -1,6 +1,7 @@
 #include <eepp/audio/music.hpp>
 #include <eepp/audio/soundfile.hpp>
 #include <eepp/system/packmanager.hpp>
+#include <eepp/system/filesystem.hpp>
 
 namespace EE { namespace Audio {
 
diff --git a/src/eepp/audio/soundbuffer.cpp b/src/eepp/audio/soundbuffer.cpp
index 7172e31d0..7e378ddbf 100755
--- a/src/eepp/audio/soundbuffer.cpp
+++ b/src/eepp/audio/soundbuffer.cpp
@@ -2,8 +2,9 @@
 #include <eepp/audio/sound.hpp>
 #include <eepp/audio/soundfile.hpp>
 #include <eepp/audio/audiodevice.hpp>
-#include <eepp/system/packmanager.hpp>
 #include <eepp/audio/openal.hpp>
+#include <eepp/system/packmanager.hpp>
+#include <eepp/system/filesystem.hpp>
 #include <memory>
 
 namespace EE { namespace Audio {
diff --git a/src/eepp/audio/soundfile.hpp b/src/eepp/audio/soundfile.hpp
index 65db76055..ff53c6d6a 100755
--- a/src/eepp/audio/soundfile.hpp
+++ b/src/eepp/audio/soundfile.hpp
@@ -1,7 +1,9 @@
 #ifndef EE_AUDIOCSOUNDFILE_H
 #define EE_AUDIOCSOUNDFILE_H
 
-#include <eepp/audio/base.hpp>
+#include <eepp/core.hpp>
+#include <eepp/system/time.hpp>
+using namespace EE::System;
 
 namespace EE { namespace Audio {
 
diff --git a/src/eepp/graphics/console.cpp b/src/eepp/graphics/console.cpp
index 789795c7d..2bffacece 100755
--- a/src/eepp/graphics/console.cpp
+++ b/src/eepp/graphics/console.cpp
@@ -1,10 +1,12 @@
 #include <eepp/graphics/console.hpp>
 #include <eepp/window/engine.hpp>
 #include <eepp/graphics/renderer/renderer.hpp>
+#include <eepp/graphics/pixeldensity.hpp>
 #include <eepp/audio/audiolistener.hpp>
 #include <eepp/window/input.hpp>
 #include <eepp/window/cursormanager.hpp>
 #include <eepp/window/window.hpp>
+#include <eepp/system/filesystem.hpp>
 #include <algorithm>
 #include <cstdarg>
 
diff --git a/src/eepp/graphics/fonttruetype.cpp b/src/eepp/graphics/fonttruetype.cpp
index d6666ddaa..cff4dab85 100644
--- a/src/eepp/graphics/fonttruetype.cpp
+++ b/src/eepp/graphics/fonttruetype.cpp
@@ -2,6 +2,7 @@
 #include <eepp/system/iostream.hpp>
 #include <eepp/system/pack.hpp>
 #include <eepp/system/packmanager.hpp>
+#include <eepp/system/filesystem.hpp>
 #include <eepp/graphics/texturefactory.hpp>
 
 #include <ft2build.h>
diff --git a/src/eepp/graphics/ninepatch.cpp b/src/eepp/graphics/ninepatch.cpp
index 998f41b5d..651c5285d 100644
--- a/src/eepp/graphics/ninepatch.cpp
+++ b/src/eepp/graphics/ninepatch.cpp
@@ -1,5 +1,6 @@
 #include <eepp/graphics/ninepatch.hpp>
 #include <eepp/graphics/texturefactory.hpp>
+#include <eepp/graphics/pixeldensity.hpp>
 
 namespace EE { namespace Graphics {
 
diff --git a/src/eepp/graphics/renderer/renderergl3cp.cpp b/src/eepp/graphics/renderer/renderergl3cp.cpp
index 96e9edcbe..653b2d493 100644
--- a/src/eepp/graphics/renderer/renderergl3cp.cpp
+++ b/src/eepp/graphics/renderer/renderergl3cp.cpp
@@ -3,6 +3,8 @@
 
 #ifdef EE_GL3_ENABLED
 
+#include <eepp/system/log.hpp>
+#include <eepp/system/filesystem.hpp>
 #include <eepp/graphics/renderer/rendererstackhelper.hpp>
 
 namespace EE { namespace Graphics {
diff --git a/src/eepp/graphics/scrollparallax.cpp b/src/eepp/graphics/scrollparallax.cpp
index 5690a865d..678fa70fb 100755
--- a/src/eepp/graphics/scrollparallax.cpp
+++ b/src/eepp/graphics/scrollparallax.cpp
@@ -1,4 +1,5 @@
 #include <eepp/graphics/scrollparallax.hpp>
+#include <eepp/graphics/pixeldensity.hpp>
 
 namespace EE { namespace Graphics {
 
diff --git a/src/eepp/graphics/shader.cpp b/src/eepp/graphics/shader.cpp
index a7c043823..1e6a032eb 100644
--- a/src/eepp/graphics/shader.cpp
+++ b/src/eepp/graphics/shader.cpp
@@ -5,6 +5,8 @@
 #include <eepp/graphics/renderer/renderergl3cp.hpp>
 #include <eepp/graphics/renderer/renderergles2.hpp>
 #include <eepp/system/packmanager.hpp>
+#include <eepp/system/filesystem.hpp>
+#include <eepp/system/log.hpp>
 
 namespace EE { namespace Graphics {
 
diff --git a/src/eepp/graphics/subtexture.cpp b/src/eepp/graphics/subtexture.cpp
index e5e74dc83..a684b5fe0 100644
--- a/src/eepp/graphics/subtexture.cpp
+++ b/src/eepp/graphics/subtexture.cpp
@@ -5,6 +5,7 @@
 #include <jpeg-compressor/jpge.h>
 #include <eepp/graphics/texturesaver.hpp>
 #include <eepp/graphics/renderer/opengl.hpp>
+#include <eepp/graphics/pixeldensity.hpp>
 using namespace EE::Graphics::Private;
 
 namespace EE { namespace Graphics {
diff --git a/src/eepp/graphics/text.cpp b/src/eepp/graphics/text.cpp
index d3b168d72..fe2e1e861 100644
--- a/src/eepp/graphics/text.cpp
+++ b/src/eepp/graphics/text.cpp
@@ -4,6 +4,7 @@
 #include <eepp/graphics/renderer/opengl.hpp>
 #include <eepp/graphics/globalbatchrenderer.hpp>
 #include <eepp/graphics/texturefactory.hpp>
+#include <eepp/graphics/pixeldensity.hpp>
 #include <algorithm>
 #include <cmath>
 
diff --git a/src/eepp/graphics/texture.cpp b/src/eepp/graphics/texture.cpp
index 0008c40a4..e2fd48876 100755
--- a/src/eepp/graphics/texture.cpp
+++ b/src/eepp/graphics/texture.cpp
@@ -1,6 +1,7 @@
 #include <eepp/graphics/texture.hpp>
 #include <eepp/graphics/texturefactory.hpp>
 #include <eepp/graphics/globalbatchrenderer.hpp>
+#include <eepp/graphics/pixeldensity.hpp>
 #include <SOIL2/src/SOIL2/SOIL2.h>
 #include <eepp/graphics/renderer/openglext.hpp>
 #include <eepp/graphics/renderer/renderer.hpp>
diff --git a/src/eepp/graphics/textureatlasloader.cpp b/src/eepp/graphics/textureatlasloader.cpp
index 2e76309c4..ad747f4d1 100644
--- a/src/eepp/graphics/textureatlasloader.cpp
+++ b/src/eepp/graphics/textureatlasloader.cpp
@@ -6,6 +6,7 @@
 #include <eepp/system/packmanager.hpp>
 #include <eepp/system/iostreamfile.hpp>
 #include <eepp/system/iostreammemory.hpp>
+#include <eepp/system/filesystem.hpp>
 #include <eepp/graphics/packerhelper.hpp>
 #include <SOIL2/src/SOIL2/stb_image.h>
 
diff --git a/src/eepp/graphics/textureatlasmanager.cpp b/src/eepp/graphics/textureatlasmanager.cpp
index 3b2231c48..c7284e5e6 100644
--- a/src/eepp/graphics/textureatlasmanager.cpp
+++ b/src/eepp/graphics/textureatlasmanager.cpp
@@ -1,6 +1,8 @@
 #include <eepp/graphics/textureatlasmanager.hpp>
 #include <eepp/graphics/globaltextureatlas.hpp>
 #include <eepp/graphics/textureatlasloader.hpp>
+#include <eepp/system/filesystem.hpp>
+
 namespace EE { namespace Graphics {
 
 SINGLETON_DECLARE_IMPLEMENTATION(TextureAtlasManager)
diff --git a/src/eepp/graphics/texturefactory.cpp b/src/eepp/graphics/texturefactory.cpp
index f93c7841a..b3f1e47aa 100755
--- a/src/eepp/graphics/texturefactory.cpp
+++ b/src/eepp/graphics/texturefactory.cpp
@@ -3,6 +3,7 @@
 #include <eepp/graphics/renderer/openglext.hpp>
 #include <eepp/graphics/renderer/renderer.hpp>
 #include <eepp/graphics/texture.hpp>
+#include <eepp/system/filesystem.hpp>
 #include <SOIL2/src/SOIL2/stb_image.h>
 #include <SOIL2/src/SOIL2/SOIL2.h>
 #include <jpeg-compressor/jpge.h>
diff --git a/src/eepp/graphics/textureloader.cpp b/src/eepp/graphics/textureloader.cpp
index 8a3d66441..7c4eae9ab 100644
--- a/src/eepp/graphics/textureloader.cpp
+++ b/src/eepp/graphics/textureloader.cpp
@@ -6,6 +6,7 @@
 #include <eepp/graphics/renderer/renderer.hpp>
 #include <eepp/system/iostreamfile.hpp>
 #include <eepp/system/packmanager.hpp>
+#include <eepp/system/filesystem.hpp>
 #include <SOIL2/src/SOIL2/stb_image.h>
 #include <SOIL2/src/SOIL2/SOIL2.h>
 #include <jpeg-compressor/jpgd.h>
diff --git a/src/eepp/graphics/texturepacker.cpp b/src/eepp/graphics/texturepacker.cpp
index 4af2875a8..0a9d51d48 100644
--- a/src/eepp/graphics/texturepacker.cpp
+++ b/src/eepp/graphics/texturepacker.cpp
@@ -1,5 +1,7 @@
 #include <eepp/graphics/texturepacker.hpp>
 #include <eepp/system/iostreamfile.hpp>
+#include <eepp/system/filesystem.hpp>
+#include <eepp/system/sys.hpp>
 #include <eepp/graphics/texturepackernode.hpp>
 #include <eepp/graphics/texturepackertex.hpp>
 #include <SOIL2/src/SOIL2/stb_image.h>
diff --git a/src/eepp/ui/tools/textureatlaseditor.cpp b/src/eepp/ui/tools/textureatlaseditor.cpp
index 47a322b0d..705460760 100644
--- a/src/eepp/ui/tools/textureatlaseditor.cpp
+++ b/src/eepp/ui/tools/textureatlaseditor.cpp
@@ -7,6 +7,7 @@
 #include <eepp/ui/uicommondialog.hpp>
 #include <eepp/ui/uimessagebox.hpp>
 #include <eepp/ui/uiwidgetcreator.hpp>
+#include <eepp/system/filesystem.hpp>
 #include <algorithm>
 
 namespace EE { namespace UI { namespace Tools {
diff --git a/src/eepp/ui/uimanager.cpp b/src/eepp/ui/uimanager.cpp
index c71992a01..8f65513d7 100644
--- a/src/eepp/ui/uimanager.cpp
+++ b/src/eepp/ui/uimanager.cpp
@@ -5,6 +5,7 @@
 #include <eepp/graphics/framebuffer.hpp>
 #include <eepp/graphics/renderer/renderer.hpp>
 #include <eepp/system/packmanager.hpp>
+#include <eepp/system/filesystem.hpp>
 #include <pugixml/pugixml.hpp>
 #include <eepp/ui/uiwidgetcreator.hpp>
 #include <algorithm>
diff --git a/src/eepp/window/engine.cpp b/src/eepp/window/engine.cpp
index 8fcd69564..5a2b49969 100755
--- a/src/eepp/window/engine.cpp
+++ b/src/eepp/window/engine.cpp
@@ -2,6 +2,7 @@
 #include <eepp/system/packmanager.hpp>
 #include <eepp/system/virtualfilesystem.hpp>
 #include <eepp/system/inifile.hpp>
+#include <eepp/system/thread.hpp>
 #include <eepp/graphics/texturefactory.hpp>
 #include <eepp/graphics/fontmanager.hpp>
 #include <eepp/graphics/globalbatchrenderer.hpp>