diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc
index 6c066dd0a1e..4057a32b20e 100644
--- a/source/blender/draw/intern/draw_manager_c.cc
+++ b/source/blender/draw/intern/draw_manager_c.cc
@@ -59,6 +59,7 @@
 
 #include "GPU_capabilities.hh"
 #include "GPU_framebuffer.hh"
+#include "GPU_immediate.hh"
 #include "GPU_matrix.hh"
 #include "GPU_platform.hh"
 #include "GPU_shader_shared.hh"
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index c32207a87f0..63dfe43680f 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -26,6 +26,7 @@
 
 #include "GPU_context.hh"
 #include "GPU_material.hh"
+#include "DNA_material_types.h"
 #include "draw_manager.hh"
 
 #include "BL_Shader.h"
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 612a29ef01e..71f5bef67d7 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -38,13 +38,17 @@
 
 #include "KX_GameObject.h"
 
+#include "BKE_context.hh"
+#include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_mball.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "DEG_depsgraph_query.hh"
 #include "DNA_mesh_types.h"
-#include "DRW_render.hh"
+#include "DNA_scene_types.h"
 #include "WM_api.hh"
 
 #include "BL_Action.h"
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index cce7519d341..171a41c997f 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -38,6 +38,7 @@
 
 #include <boost/format.hpp>
 
+#include "BKE_context.hh"
 #include "BLI_rect.h"
 #include "../draw/intern/draw_command.hh"
 #include "DRW_render.hh"
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 63526d2789f..3e8cb231d2b 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -37,11 +37,14 @@
 #include "KX_Scene.h"
 
 #include "BKE_duplilist.hh"
+#include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_mball.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
+#include "BKE_scene.hh"
 #include "BKE_screen.hh"
+#include "BLI_math_matrix.h"
 #include "BLI_task.h"
 #include "DEG_depsgraph_query.hh"
 #include "DNA_camera_types.h"
diff --git a/source/gameengine/Rasterizer/RAS_2DFilter.cpp b/source/gameengine/Rasterizer/RAS_2DFilter.cpp
index 655b2a37d46..65c9c725b9f 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilter.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilter.cpp
@@ -22,8 +22,7 @@
 
 #include "RAS_2DFilter.h"
 
-#include "DRW_render.hh"
-
+#include "GPU_framebuffer.hh"
 #include "GPU_immediate.hh"
 #include <epoxy/gl.h>
 
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
index 97566504ac7..b2e9866cc4a 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@@ -26,7 +26,7 @@
 
 #include "RAS_2DFilterManager.h"
 
-#include "DRW_render.hh"
+#include "GPU_framebuffer.hh"
 
 #include "CM_Message.h"
 #include "RAS_2DFilter.h"
diff --git a/source/gameengine/Rasterizer/RAS_Rasterizer.cpp b/source/gameengine/Rasterizer/RAS_Rasterizer.cpp
index 169691f9239..9e19ebe1b6f 100644
--- a/source/gameengine/Rasterizer/RAS_Rasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_Rasterizer.cpp
@@ -39,7 +39,8 @@
 #include "RAS_OpenGLRasterizer.h"
 #include "RAS_Polygon.h"
 
-#include "DRW_render.hh"
+#include "BLI_math_matrix.h"
+#include "GPU_framebuffer.hh"
 #include "GPU_immediate.hh"
 #include "GPU_matrix.hh"