diff --git a/src/addons/zip.cpp b/src/addons/zip.cpp
index e9c2bcb4e..2c5c44261 100644
--- a/src/addons/zip.cpp
+++ b/src/addons/zip.cpp
@@ -24,6 +24,7 @@
 #include "utils/log.hpp"
 #include "utils/string_utils.hpp"
 
+#include <IrrlichtDevice.h>
 #include <IWriteFile.h>
 using namespace irr;
 using namespace io;
diff --git a/src/font/font_drawer.cpp b/src/font/font_drawer.cpp
index bf4e2b644..41c8f8ac5 100644
--- a/src/font/font_drawer.cpp
+++ b/src/font/font_drawer.cpp
@@ -25,7 +25,9 @@
 #include "graphics/glwrap.hpp"
 #include "graphics/texture_shader.hpp"
 
+#include <IVideoDriver.h>
 #include <S3DVertex.h>
+#include <SMaterial.h>
 #include <irrArray.h>
 #include <map>
 #include <memory>
diff --git a/src/font/font_with_face.cpp b/src/font/font_with_face.cpp
index bbe8e4425..5667776ed 100644
--- a/src/font/font_with_face.cpp
+++ b/src/font/font_with_face.cpp
@@ -33,6 +33,7 @@
 #include "utils/utf8.h"
 
 #include "GlyphLayout.h"
+#include "IVideoDriver.h"
 #include <array>
 #ifndef SERVER_ONLY
 #include <ge_texture.hpp>
diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index bf213a775..c3f1336b2 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -26,6 +26,8 @@
 #include "graphics/texture_shader.hpp"
 #include "utils/cpp2011.hpp"
 
+#include <IVideoDriver.h>
+
 // ============================================================================
 class Primitive2DList : public TextureShader<Primitive2DList, 1, core::vector2df>
 {
diff --git a/src/graphics/abstract_renderer.cpp b/src/graphics/abstract_renderer.cpp
index 202f17e29..8708c470e 100644
--- a/src/graphics/abstract_renderer.cpp
+++ b/src/graphics/abstract_renderer.cpp
@@ -27,6 +27,7 @@ using namespace irr;
 #include <ISceneCollisionManager.h>
 #include <ISceneManager.h>
 #include <ISkinnedMesh.h>
+#include <IVideoDriver.h>
 
 void AbstractRenderer::drawDebugMeshes() const
 {
diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index 9903a3b2e..7330c3b74 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -40,6 +40,7 @@
 #include "utils/vs.hpp"
 
 #include "ISceneManager.h"
+#include "IVideoDriver.h"
 #include <algorithm>
 #include <cmath>
 
diff --git a/src/graphics/cpu_particle_manager.cpp b/src/graphics/cpu_particle_manager.cpp
index 29aec134d..765c9a8d8 100644
--- a/src/graphics/cpu_particle_manager.cpp
+++ b/src/graphics/cpu_particle_manager.cpp
@@ -29,6 +29,7 @@
 #ifndef SERVER_ONLY
 #include <ICameraSceneNode.h>
 #include <ISceneManager.h>
+#include <ITexture.h>
 
 #include "graphics/texture_shader.hpp"
 
diff --git a/src/graphics/fixed_pipeline_renderer.cpp b/src/graphics/fixed_pipeline_renderer.cpp
index 951cd0226..a3c688201 100644
--- a/src/graphics/fixed_pipeline_renderer.cpp
+++ b/src/graphics/fixed_pipeline_renderer.cpp
@@ -26,6 +26,7 @@
 #include "utils/profiler.hpp"
 
 #include <ISceneManager.h>
+#include <IVideoDriver.h>
 
 void FixedPipelineRenderer::onLoadWorld()
 {
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index e7f4883f0..d85a4648f 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -34,6 +34,8 @@
 #include <sstream>
 #include <ge_gl_utils.hpp>
 
+#include <IVideoDriver.h>
+
 #ifdef DEBUG
 #if !defined(__APPLE__) && !defined(ANDROID)
 #define ARB_DEBUG_OUTPUT
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index a9fab1881..715fc6eea 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -2494,3 +2494,21 @@ void IrrDriver::resizeWindow()
 #endif
 #endif
 }
+
+// ----------------------------------------------------------------------------
+const core::dimension2d<u32>& IrrDriver::getFrameSize() const
+{
+    return m_video_driver->getCurrentRenderTargetSize();
+}
+
+// ----------------------------------------------------------------------------
+unsigned int IrrDriver::getRealTime()
+{
+    return m_device->getTimer()->getRealTime();
+}
+
+// ----------------------------------------------------------------------------
+u32 IrrDriver::getDefaultFramebuffer() const
+{
+    return m_video_driver->getDefaultFramebuffer();
+}
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 1e6e5ab3f..7f0e20421 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -27,12 +27,6 @@
  * management, etc...)
  */
 
-#include <IVideoDriver.h>
-#include <vector2d.h>
-#include <dimension2d.h>
-#include <SColor.h>
-#include "IrrlichtDevice.h"
-#include "ISkinnedMesh.h"
 #include "graphics/abstract_renderer.hpp"
 #include "graphics/gl_headers.hpp"
 #include "graphics/wind.hpp"
@@ -45,6 +39,13 @@
 #include <string>
 #include <vector>
 
+#include <irrArray.h>
+#include <dimension2d.h>
+#include <position2d.h>
+#include <matrix4.h>
+#include <vector2d.h>
+#include <IEventReceiver.h>
+#include <SColor.h>
 
 namespace SP
 {
@@ -58,6 +59,9 @@ namespace irr
         class IMeshSceneNode; class IParticleSystemSceneNode; class ICameraSceneNode; class ILightSceneNode;
         class CLensFlareSceneNode; }
     namespace gui   { class IGUIEnvironment; class IGUIFont; }
+    namespace video { struct IRenderTarget; class ITexture; class IVideoDriver;
+                      class SMaterial; }
+    class IrrlichtDevice;
 }
 using namespace irr;
 
@@ -299,8 +303,7 @@ public:
     const std::vector<VideoMode>& getVideoModes() const { return m_modes; }
     // ------------------------------------------------------------------------
     /** Returns the frame size. */
-    const core::dimension2d<u32>& getFrameSize() const
-                       { return m_video_driver->getCurrentRenderTargetSize(); }
+    const core::dimension2d<u32>& getFrameSize() const;
     // ------------------------------------------------------------------------
     /** Returns the irrlicht device. */
     IrrlichtDevice       *getDevice()       const { return m_device;        }
@@ -316,7 +319,7 @@ public:
     // ------------------------------------------------------------------------
     /** Returns the current real time, which might not be 0 at start of the
      *  application. Value in msec. */
-    unsigned int getRealTime() {return m_device->getTimer()->getRealTime(); }
+    unsigned int getRealTime();
     // ------------------------------------------------------------------------
     /** Use motion blur for a short time */
     void giveBoost(unsigned int cam_index) { m_renderer->giveBoost(cam_index);}
@@ -521,8 +524,7 @@ public:
     void uploadLightingData();
     void sameRestart()             { m_resolution_changing = RES_CHANGE_SAME; }
     // ------------------------------------------------------------------------
-    u32 getDefaultFramebuffer() const
-                            { return m_video_driver->getDefaultFramebuffer(); }
+    u32 getDefaultFramebuffer() const;
     // ------------------------------------------------------------------------
     void handleWindowResize();
 };   // IrrDriver
diff --git a/src/graphics/material.cpp b/src/graphics/material.cpp
index a0ae72c63..cf758beee 100644
--- a/src/graphics/material.cpp
+++ b/src/graphics/material.cpp
@@ -43,6 +43,7 @@
 
 #include <IMaterialRendererServices.h>
 #include <ISceneNode.h>
+#include <IVideoDriver.h>
 #include <mini_glm.hpp>
 
 #ifndef SERVER_ONLY
diff --git a/src/graphics/particle_emitter.cpp b/src/graphics/particle_emitter.cpp
index 256f0fc2d..09609e431 100644
--- a/src/graphics/particle_emitter.cpp
+++ b/src/graphics/particle_emitter.cpp
@@ -33,6 +33,8 @@
 
 #include <algorithm>
 
+#include <ITexture.h>
+
 //-----------------------------------------------------------------------------
 ParticleEmitter::ParticleEmitter(const ParticleKind* type,
                                  const Vec3 &position,
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 94a69709b..ff977e9ff 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -46,6 +46,7 @@
 #include "utils/profiler.hpp"
 #include "utils/cpp2011.hpp"
 
+#include <IrrlichtDevice.h>
 #include <ISceneManager.h>
 #include <SViewFrustum.h>
 #include <ge_texture.hpp>
diff --git a/src/graphics/referee.cpp b/src/graphics/referee.cpp
index f967b1a66..5f43993a3 100644
--- a/src/graphics/referee.cpp
+++ b/src/graphics/referee.cpp
@@ -33,6 +33,8 @@
 #include "utils/log.hpp"
 #include "utils/string_utils.hpp"
 
+#include <ITexture.h>
+
 int                   Referee::m_st_first_start_frame  = 1;
 int                   Referee::m_st_last_start_frame   = 1;
 int                   Referee::m_st_first_rescue_frame = 1;
diff --git a/src/graphics/render_target.cpp b/src/graphics/render_target.cpp
index 6767bb871..06e6db7fd 100644
--- a/src/graphics/render_target.cpp
+++ b/src/graphics/render_target.cpp
@@ -25,6 +25,7 @@
 #include "graphics/shader_based_renderer.hpp"
 
 #include <ISceneManager.h>
+#include <IVideoDriver.h>
 
 //-----------------------------------------------------------------------------
 GL1RenderTarget::GL1RenderTarget(const irr::core::dimension2du &dimension,
diff --git a/src/graphics/shader_based_renderer.cpp b/src/graphics/shader_based_renderer.cpp
index 963c26e74..043b6e5fa 100644
--- a/src/graphics/shader_based_renderer.cpp
+++ b/src/graphics/shader_based_renderer.cpp
@@ -48,6 +48,7 @@
 
 #include "../../lib/irrlicht/source/Irrlicht/CSceneManager.h"
 #include "../../lib/irrlicht/source/Irrlicht/os.h"
+#include <IVideoDriver.h>
 #include <algorithm> 
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/skybox.cpp b/src/graphics/skybox.cpp
index c59cc289d..c4e64fbfc 100644
--- a/src/graphics/skybox.cpp
+++ b/src/graphics/skybox.cpp
@@ -25,6 +25,8 @@
 #include <algorithm>
 #include <cassert>
 
+#include <IImage.h>
+
 using namespace irr;
 
 
diff --git a/src/graphics/skybox.hpp b/src/graphics/skybox.hpp
index 8c3056207..06e91b914 100644
--- a/src/graphics/skybox.hpp
+++ b/src/graphics/skybox.hpp
@@ -20,11 +20,20 @@
 #define HEADER_SKYBOX_HPP
 
 #include "graphics/gl_headers.hpp"
-#include <ICameraSceneNode.h>
-#include <ITexture.h>
-#include <IVideoDriver.h>
 #include <vector>
 
+namespace irr
+{
+    namespace scene
+    {
+        class ISceneNode; class ICameraSceneNode;
+    }
+    namespace video
+    {
+        class IImage; class ITexture;
+    }
+}
+
 class Skybox
 {
 private:
diff --git a/src/graphics/sp/sp_base.cpp b/src/graphics/sp/sp_base.cpp
index 1b5259fda..335029110 100644
--- a/src/graphics/sp/sp_base.cpp
+++ b/src/graphics/sp/sp_base.cpp
@@ -58,6 +58,9 @@
 #include <vector>
 
 #include <ge_main.hpp>
+
+#include <IrrlichtDevice.h>
+
 using namespace GE;
 
 namespace SP
diff --git a/src/graphics/sp/sp_texture.cpp b/src/graphics/sp/sp_texture.cpp
index 2298ddcb2..04feb2950 100644
--- a/src/graphics/sp/sp_texture.cpp
+++ b/src/graphics/sp/sp_texture.cpp
@@ -30,6 +30,7 @@
 #include "utils/string_utils.hpp"
 
 #include <IImageLoader.h>
+#include <IVideoDriver.h>
 #include <IWriteFile.h>
 
 #if !(defined(SERVER_ONLY) || defined(MOBILE_STK))
diff --git a/src/graphics/stk_particle.cpp b/src/graphics/stk_particle.cpp
index 5b14c79e2..19091d0a3 100644
--- a/src/graphics/stk_particle.cpp
+++ b/src/graphics/stk_particle.cpp
@@ -26,6 +26,7 @@
 #include <cmath>
 #include "../../lib/irrlicht/source/Irrlicht/os.h"
 #include <ISceneManager.h>
+#include <IVideoDriver.h>
 
 // ----------------------------------------------------------------------------
 std::vector<float> STKParticle::m_flips_data;
diff --git a/src/graphics/stk_text_billboard.cpp b/src/graphics/stk_text_billboard.cpp
index 7f515fcf1..ef3e37323 100644
--- a/src/graphics/stk_text_billboard.cpp
+++ b/src/graphics/stk_text_billboard.cpp
@@ -31,6 +31,7 @@
 #include <IMeshSceneNode.h>
 #include <ISceneManager.h>
 #include <ITexture.h>
+#include <IVideoDriver.h>
 #include <SMeshBuffer.h>
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/wind.cpp b/src/graphics/wind.cpp
index 1ac0cae6d..cae31d127 100644
--- a/src/graphics/wind.cpp
+++ b/src/graphics/wind.cpp
@@ -19,6 +19,8 @@
 #include "graphics/wind.hpp"
 #include "utils/helpers.hpp"
 
+#include <IrrlichtDevice.h>
+
 Wind::Wind()
 {
     m_seed = (float)((rand() % 1000) - 500);
diff --git a/src/guiengine/engine.cpp b/src/guiengine/engine.cpp
index d39776997..272ed60e7 100644
--- a/src/guiengine/engine.cpp
+++ b/src/guiengine/engine.cpp
@@ -703,7 +703,9 @@ namespace GUIEngine
 #include <assert.h>
 #include <mutex>
 
+#include <IrrlichtDevice.h>
 #include <IGUIEnvironment.h>
+#include <IVideoDriver.h>
 
 using namespace irr::gui;
 using namespace irr::video;
diff --git a/src/guiengine/layout_manager.cpp b/src/guiengine/layout_manager.cpp
index e23a130a0..2615234cc 100644
--- a/src/guiengine/layout_manager.cpp
+++ b/src/guiengine/layout_manager.cpp
@@ -19,6 +19,7 @@
 
 #include <iostream>
 
+#include <IrrlichtDevice.h>
 #include <IGUIFont.h>
 #include <ITexture.h>
 
diff --git a/src/guiengine/message_queue.cpp b/src/guiengine/message_queue.cpp
index 3acd73473..30d6ceefe 100644
--- a/src/guiengine/message_queue.cpp
+++ b/src/guiengine/message_queue.cpp
@@ -24,6 +24,7 @@
 #include "utils/synchronised.hpp"
 
 #include "GlyphLayout.h"
+#include <IrrlichtDevice.h>
 #include <atomic>
 #include <memory>
 
diff --git a/src/guiengine/modaldialog.cpp b/src/guiengine/modaldialog.cpp
index f927e01f8..5732a4100 100644
--- a/src/guiengine/modaldialog.cpp
+++ b/src/guiengine/modaldialog.cpp
@@ -26,8 +26,10 @@
 #include "io/file_manager.hpp"
 #include "utils/log.hpp"
 
+#include <IrrlichtDevice.h>
 #include <IGUIEnvironment.h>
 #include <IGUIButton.h>
+#include <IVideoDriver.h>
 
 using namespace irr;
 using namespace core;
diff --git a/src/guiengine/screen_keyboard.cpp b/src/guiengine/screen_keyboard.cpp
index 895c6f416..52c8a68ac 100644
--- a/src/guiengine/screen_keyboard.cpp
+++ b/src/guiengine/screen_keyboard.cpp
@@ -31,6 +31,7 @@
 
 #include <algorithm>
 #include <string>
+#include <IrrlichtDevice.h>
 #include <IGUIEnvironment.h>
 
 using namespace GUIEngine;
diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index 4bb6fd10b..2864bb9ef 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -36,6 +36,9 @@
 #include "utils/log.hpp"
 #include "utils/string_utils.hpp"
 
+#include <IrrlichtDevice.h>
+#include <IVideoDriver.h>
+
 using namespace GUIEngine;
 using namespace irr;
 using namespace core;
diff --git a/src/guiengine/widgets/CGUIEditBox.cpp b/src/guiengine/widgets/CGUIEditBox.cpp
index 09f1bbc2c..ca9880750 100644
--- a/src/guiengine/widgets/CGUIEditBox.cpp
+++ b/src/guiengine/widgets/CGUIEditBox.cpp
@@ -24,6 +24,7 @@
 
 #include "../../../lib/irrlicht/include/IrrCompileConfig.h"
 #include "../../../lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h"
+#include <IrrlichtDevice.h>
 
 #include <algorithm>
 #include <cstdlib>
diff --git a/src/guiengine/widgets/dynamic_ribbon_widget.cpp b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
index 3a21fad5c..07219fbf3 100644
--- a/src/guiengine/widgets/dynamic_ribbon_widget.cpp
+++ b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
@@ -26,6 +26,7 @@
 #include "states_screens/state_manager.hpp"
 #include "utils/vs.hpp"
 
+#include <IrrlichtDevice.h>
 #include <IGUIEnvironment.h>
 #include <iostream>
 #include <algorithm>
diff --git a/src/guiengine/widgets/icon_button_widget.cpp b/src/guiengine/widgets/icon_button_widget.cpp
index de6471299..58c58e041 100644
--- a/src/guiengine/widgets/icon_button_widget.cpp
+++ b/src/guiengine/widgets/icon_button_widget.cpp
@@ -30,6 +30,7 @@
 #include <IGUIEnvironment.h>
 #include <IGUIButton.h>
 #include <IGUIStaticText.h>
+#include <IVideoDriver.h>
 #include <algorithm>
 #ifndef SERVER_ONLY
 #include <ge_texture.hpp>
diff --git a/src/guiengine/widgets/ribbon_widget.cpp b/src/guiengine/widgets/ribbon_widget.cpp
index 0ea125d47..dc601c39d 100644
--- a/src/guiengine/widgets/ribbon_widget.cpp
+++ b/src/guiengine/widgets/ribbon_widget.cpp
@@ -34,6 +34,7 @@
 #include <IGUIElement.h>
 #include <IGUIEnvironment.h>
 #include <IGUIButton.h>
+#include <ITexture.h>
 
 using namespace GUIEngine;
 using namespace irr::core;
diff --git a/src/guiengine/widgets/spinner_widget.cpp b/src/guiengine/widgets/spinner_widget.cpp
index 2991f551e..9f7ee5493 100644
--- a/src/guiengine/widgets/spinner_widget.cpp
+++ b/src/guiengine/widgets/spinner_widget.cpp
@@ -32,6 +32,7 @@
 
 #include "../../../lib/irrlicht/source/Irrlicht/CGUIButton.h"
 #include <IGUIStaticText.h>
+#include <ITexture.h>
 
 using namespace GUIEngine;
 using namespace irr::core;
diff --git a/src/input/device_manager.cpp b/src/input/device_manager.cpp
index 094eb08c2..6a423b516 100644
--- a/src/input/device_manager.cpp
+++ b/src/input/device_manager.cpp
@@ -35,6 +35,8 @@
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
+#include <IrrlichtDevice.h>
+
 #define INPUT_MODE_DEBUG 0
 
 static const char  INPUT_FILE_NAME[]  = "input.xml";
diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index f214b0b56..08b390088 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -57,9 +57,11 @@
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
+#include <IrrlichtDevice.h>
 #include <ISceneManager.h>
 #include <ICameraSceneNode.h>
 #include <ISceneNode.h>
+#include <ITexture.h>
 
 #include <map>
 #include <vector>
diff --git a/src/input/multitouch_device.cpp b/src/input/multitouch_device.cpp
index aeca048b6..95317d369 100644
--- a/src/input/multitouch_device.cpp
+++ b/src/input/multitouch_device.cpp
@@ -27,6 +27,8 @@
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/screen_keyboard.hpp"
 
+#include <IrrlichtDevice.h>
+
 // ----------------------------------------------------------------------------
 /** The multitouch device constructor
  */
diff --git a/src/items/attachment_manager.cpp b/src/items/attachment_manager.cpp
index 937cfbd3e..6fc17f6a9 100644
--- a/src/items/attachment_manager.cpp
+++ b/src/items/attachment_manager.cpp
@@ -26,6 +26,8 @@
 #include "guiengine/skin.hpp"
 #include "io/file_manager.hpp"
 
+#include <IAnimatedMesh.h>
+
 AttachmentManager *attachment_manager = 0;
 
 struct  initAttachmentType {Attachment::AttachmentType attachment;
diff --git a/src/items/powerup_manager.cpp b/src/items/powerup_manager.cpp
index 1351a52a0..e818e7d37 100644
--- a/src/items/powerup_manager.cpp
+++ b/src/items/powerup_manager.cpp
@@ -39,6 +39,8 @@
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"
 
+#include <IMesh.h>
+
 PowerupManager* powerup_manager=0;
 
 //-----------------------------------------------------------------------------
diff --git a/src/main.cpp b/src/main.cpp
index 8854b2dc8..fec98ddc7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -293,6 +293,8 @@ extern "C" {
 #include "utils/translation.hpp"
 #include "io/rich_presence.hpp"
 
+#include <IrrlichtDevice.h>
+
 static void cleanSuperTuxKart();
 static void cleanUserConfig();
 void runUnitTests();
diff --git a/src/main_loop.cpp b/src/main_loop.cpp
index 091dad62d..e607a9e2a 100644
--- a/src/main_loop.cpp
+++ b/src/main_loop.cpp
@@ -60,6 +60,8 @@
 
 #include <thread>
 
+#include <IrrlichtDevice.h>
+
 #ifndef WIN32
 #include <unistd.h>
 #endif
diff --git a/src/modes/profile_world.cpp b/src/modes/profile_world.cpp
index dda5b9b20..29589702d 100644
--- a/src/modes/profile_world.cpp
+++ b/src/modes/profile_world.cpp
@@ -26,6 +26,7 @@
 #include "tracks/track.hpp"
 
 #include <ISceneManager.h>
+#include <IVideoDriver.h>
 
 #include <iomanip>
 #include <iostream>
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index 5af5fd650..5cb55833c 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -88,6 +88,7 @@
 #include <sstream>
 #include <stdexcept>
 
+#include <IrrlichtDevice.h>
 #include <ISceneManager.h>
 
 World* World::m_world[PT_COUNT];
diff --git a/src/modes/world_status.cpp b/src/modes/world_status.cpp
index f886796e6..231ee1256 100644
--- a/src/modes/world_status.cpp
+++ b/src/modes/world_status.cpp
@@ -35,6 +35,8 @@
 #include "tracks/track.hpp"
 #include "utils/stk_process.hpp"
 
+#include <IrrlichtDevice.h>
+
 //-----------------------------------------------------------------------------
 WorldStatus::WorldStatus() : m_process_type(STKProcess::getType()), m_started_at(StkTime::getMonoTimeMs())
 {
diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp
index c24c7c4c9..4cd1f0816 100644
--- a/src/physics/physical_object.cpp
+++ b/src/physics/physical_object.cpp
@@ -42,6 +42,7 @@
 #include <IMeshManipulator.h>
 #include <IMeshSceneNode.h>
 #include <ITexture.h>
+#include <IVideoDriver.h>
 using namespace irr;
 
 #include <algorithm>
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index e857af459..ded8a5346 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -45,6 +45,8 @@
 #include "utils/profiler.hpp"
 #include "utils/stk_process.hpp"
 
+#include <IVideoDriver.h>
+
 //=============================================================================
 Physics* g_physics[PT_COUNT];
 // ----------------------------------------------------------------------------
diff --git a/src/race/race_manager.cpp b/src/race/race_manager.cpp
index 3e3b3f908..25bd7c77d 100644
--- a/src/race/race_manager.cpp
+++ b/src/race/race_manager.cpp
@@ -66,6 +66,8 @@
 #include "utils/translation.hpp"
 #include "io/rich_presence.hpp"
 
+#include <IrrlichtDevice.h>
+
 #ifdef __SWITCH__
 extern "C" {
   #define u64 uint64_t
diff --git a/src/states_screens/dialogs/addons_loading.cpp b/src/states_screens/dialogs/addons_loading.cpp
index b72ded538..1d0d96926 100644
--- a/src/states_screens/dialogs/addons_loading.cpp
+++ b/src/states_screens/dialogs/addons_loading.cpp
@@ -39,6 +39,8 @@
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
+#include <ITexture.h>
+
 using namespace GUIEngine;
 using namespace Online;
 using namespace irr::gui;
diff --git a/src/states_screens/dialogs/init_android_dialog.cpp b/src/states_screens/dialogs/init_android_dialog.cpp
index 6f4dc2c41..a3924ed52 100644
--- a/src/states_screens/dialogs/init_android_dialog.cpp
+++ b/src/states_screens/dialogs/init_android_dialog.cpp
@@ -27,9 +27,9 @@
 #include "input/multitouch_device.hpp"
 #include "utils/translation.hpp"
 
+#include <IrrlichtDevice.h>
 #include <IGUIEnvironment.h>
 
-
 using namespace GUIEngine;
 using namespace irr;
 using namespace irr::core;
diff --git a/src/states_screens/dialogs/multitouch_settings_dialog.cpp b/src/states_screens/dialogs/multitouch_settings_dialog.cpp
index e04962f3c..8d1918ee7 100644
--- a/src/states_screens/dialogs/multitouch_settings_dialog.cpp
+++ b/src/states_screens/dialogs/multitouch_settings_dialog.cpp
@@ -28,9 +28,9 @@
 #include "states_screens/race_gui_multitouch.hpp"
 #include "utils/translation.hpp"
 
+#include <IrrlichtDevice.h>
 #include <IGUIEnvironment.h>
 
-
 using namespace GUIEngine;
 using namespace irr;
 using namespace irr::core;
diff --git a/src/states_screens/dialogs/race_paused_dialog.cpp b/src/states_screens/dialogs/race_paused_dialog.cpp
index f375831f4..1f60e0326 100644
--- a/src/states_screens/dialogs/race_paused_dialog.cpp
+++ b/src/states_screens/dialogs/race_paused_dialog.cpp
@@ -51,6 +51,8 @@
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
+#include <IrrlichtDevice.h>
+
 using namespace GUIEngine;
 using namespace irr::core;
 using namespace irr::gui;
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index 0496871eb..8924bb190 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -25,7 +25,6 @@
 #include "config/stk_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/lod_node.hpp"
-#include <ge_render_info.hpp>
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/widgets/button_widget.hpp"
@@ -45,12 +44,15 @@
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
+#include <ge_render_info.hpp>
+
 #include <ICameraSceneNode.h>
 #include <IGUIEnvironment.h>
 #include <IGUIImage.h>
 #include <ILightSceneNode.h>
 #include <IMeshSceneNode.h>
 #include <ISceneManager.h>
+#include <IVideoDriver.h>
 #include <SColor.h>
 
 #include <iostream>
diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index b33239975..6767b4c16 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -45,6 +45,7 @@
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
+#include <IrrlichtDevice.h>
 #include <IGUIEnvironment.h>
 #include <IGUIButton.h>
 
diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
index 10cd503c1..907df460c 100644
--- a/src/states_screens/main_menu_screen.cpp
+++ b/src/states_screens/main_menu_screen.cpp
@@ -68,6 +68,7 @@
 
 #include <string>
 
+#include <IrrlichtDevice.h>
 
 using namespace GUIEngine;
 using namespace Online;
diff --git a/src/states_screens/options/options_screen_general.cpp b/src/states_screens/options/options_screen_general.cpp
index 3a64f9899..f66f4a193 100644
--- a/src/states_screens/options/options_screen_general.cpp
+++ b/src/states_screens/options/options_screen_general.cpp
@@ -57,6 +57,8 @@
 #include <iostream>
 #include <sstream>
 
+#include <IrrlichtDevice.h>
+
 using namespace GUIEngine;
 using namespace Online;
 
diff --git a/src/states_screens/options/options_screen_input.cpp b/src/states_screens/options/options_screen_input.cpp
index fdb2a0f79..6609a55a0 100644
--- a/src/states_screens/options/options_screen_input.cpp
+++ b/src/states_screens/options/options_screen_input.cpp
@@ -47,6 +47,8 @@
 #include <set>
 #include <algorithm>
 
+#include <IrrlichtDevice.h>
+
 using namespace GUIEngine;
 
 // -----------------------------------------------------------------------------
diff --git a/src/states_screens/options/options_screen_ui.cpp b/src/states_screens/options/options_screen_ui.cpp
index 54f606407..b08ae6209 100644
--- a/src/states_screens/options/options_screen_ui.cpp
+++ b/src/states_screens/options/options_screen_ui.cpp
@@ -62,6 +62,8 @@
 #include <iostream>
 #include <sstream>
 
+#include <IrrlichtDevice.h>
+
 using namespace GUIEngine;
 using namespace Online;
 
diff --git a/src/states_screens/options/options_screen_video.cpp b/src/states_screens/options/options_screen_video.cpp
index d354e6451..9248a7a2e 100644
--- a/src/states_screens/options/options_screen_video.cpp
+++ b/src/states_screens/options/options_screen_video.cpp
@@ -49,6 +49,8 @@
 #include "../../lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.h"
 #endif
 
+#include <IrrlichtDevice.h>
+
 #include <functional>
 #include <iostream>
 #include <iterator>
diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index 9a9637cc3..2f3a4f71d 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -64,6 +64,8 @@ using namespace irr;
 
 #include <algorithm>
 
+#include <IrrlichtDevice.h>
+
 /** The constructor is called before anything is attached to the scene node.
  *  So rendering to a texture can be done here. But world is not yet fully
  *  created, so only the race manager can be accessed safely.
diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp
index 8f81f7a9f..8d1a57e7b 100644
--- a/src/states_screens/race_gui_base.cpp
+++ b/src/states_screens/race_gui_base.cpp
@@ -53,6 +53,7 @@
 #include "utils/translation.hpp"
 
 #include <GlyphLayout.h>
+#include <IrrlichtDevice.h>
 #include <ICameraSceneNode.h>
 
 namespace irr
diff --git a/src/states_screens/race_gui_multitouch.cpp b/src/states_screens/race_gui_multitouch.cpp
index e1364949a..d68610616 100644
--- a/src/states_screens/race_gui_multitouch.cpp
+++ b/src/states_screens/race_gui_multitouch.cpp
@@ -37,6 +37,7 @@ using namespace irr;
 #include "network/protocols/client_lobby.hpp"
 #include "states_screens/race_gui_base.hpp"
 
+#include <IrrlichtDevice.h>
 
 //-----------------------------------------------------------------------------
 /** The multitouch GUI constructor
diff --git a/src/states_screens/race_gui_multitouch.hpp b/src/states_screens/race_gui_multitouch.hpp
index b96e3d9b9..2b4c7f704 100644
--- a/src/states_screens/race_gui_multitouch.hpp
+++ b/src/states_screens/race_gui_multitouch.hpp
@@ -21,8 +21,14 @@
 #include <irrString.h>
 #include <rect.h>
 #include <vector2d.h>
-#include <IVideoDriver.h>
 
+namespace irr
+{
+    namespace video
+    {
+        class ITexture;
+    }
+}
 using namespace irr;
 
 class AbstractKart;
diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index ca63185a8..b57932b21 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -55,6 +55,7 @@
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
+#include <IrrlichtDevice.h>
 #include <ISceneCollisionManager.h>
 #include <ISceneManager.h>
 using namespace irr;
diff --git a/src/states_screens/soccer_setup_screen.cpp b/src/states_screens/soccer_setup_screen.cpp
index de6e8b29f..8e723a548 100644
--- a/src/states_screens/soccer_setup_screen.cpp
+++ b/src/states_screens/soccer_setup_screen.cpp
@@ -37,6 +37,8 @@
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
+#include <IrrlichtDevice.h>
+
 using namespace GUIEngine;
 
 #define KART_CONTINUOUS_ROTATION_SPEED      35.f
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index fba953305..366be7ae3 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -89,6 +89,7 @@
 #include <IMeshManipulator.h>
 #include <IMeshSceneNode.h>
 #include <ISceneManager.h>
+#include <IVideoDriver.h>
 #include <SMeshBuffer.h>
 
 #include <algorithm>
diff --git a/src/tracks/track_manager.cpp b/src/tracks/track_manager.cpp
index b5835c10c..4b81f1fd8 100644
--- a/src/tracks/track_manager.cpp
+++ b/src/tracks/track_manager.cpp
@@ -29,6 +29,9 @@
 #include <stdexcept>
 #include <stdio.h>
 
+#include <ITexture.h>
+#include <IVideoDriver.h>
+
 TrackManager* track_manager = 0;
 std::vector<std::string>  TrackManager::m_track_search_path;
 
diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index 1469f95c0..3d64983bc 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -66,6 +66,7 @@
 #include "utils/profiler.hpp"
 #include "utils/string_utils.hpp"
 
+#include <IrrlichtDevice.h>
 #include <IGUIEnvironment.h>
 #include <IGUIContextMenu.h>
 
diff --git a/src/utils/profiler.cpp b/src/utils/profiler.cpp
index 481ad896d..b33bcb25b 100644
--- a/src/utils/profiler.cpp
+++ b/src/utils/profiler.cpp
@@ -37,6 +37,8 @@
 #include <stack>
 #include <sstream>
 
+#include <IVideoDriver.h>
+
 Profiler profiler;
 
 // Unit is in pencentage of the screen dimensions
diff --git a/src/utils/time.cpp b/src/utils/time.cpp
index 07bdf9437..2865556c7 100644
--- a/src/utils/time.cpp
+++ b/src/utils/time.cpp
@@ -23,6 +23,7 @@
 #include "utils/translation.hpp"
 
 #include <ctime>
+#include <IrrlichtDevice.h>
 
 irr::ITimer *StkTime::m_timer = NULL;
 std::chrono::steady_clock::time_point