diff --git a/src/gl/data/gl_data.cpp b/src/gl/data/gl_data.cpp
index fbebcf9547..d69d491f88 100644
--- a/src/gl/data/gl_data.cpp
+++ b/src/gl/data/gl_data.cpp
@@ -44,6 +44,7 @@
 #include "colormatcher.h"
 #include "i_system.h"
 #include "p_local.h"
+#include "p_tags.h"
 #include "p_lnspec.h"
 #include "c_dispatch.h"
 #include "r_sky.h"
diff --git a/src/gl/data/gl_setup.cpp b/src/gl/data/gl_setup.cpp
index c42a2c19cb..7eeabaa339 100644
--- a/src/gl/data/gl_setup.cpp
+++ b/src/gl/data/gl_setup.cpp
@@ -44,6 +44,7 @@
 #include "colormatcher.h"
 #include "i_system.h"
 #include "p_local.h"
+#include "p_spec.h"
 #include "p_lnspec.h"
 #include "c_dispatch.h"
 #include "r_sky.h"
diff --git a/src/gl/data/gl_vertexbuffer.cpp b/src/gl/data/gl_vertexbuffer.cpp
index 0e90655575..87b600d4b2 100644
--- a/src/gl/data/gl_vertexbuffer.cpp
+++ b/src/gl/data/gl_vertexbuffer.cpp
@@ -41,6 +41,7 @@
 #include "gl/system/gl_system.h"
 #include "doomtype.h"
 #include "p_local.h"
+#include "r_state.h"
 #include "m_argv.h"
 #include "c_cvars.h"
 #include "gl/system/gl_interface.h"
diff --git a/src/gl/dynlights/a_dynlight.cpp b/src/gl/dynlights/a_dynlight.cpp
index 3e1cace46f..93000e83ac 100644
--- a/src/gl/dynlights/a_dynlight.cpp
+++ b/src/gl/dynlights/a_dynlight.cpp
@@ -43,6 +43,8 @@
 #include "thingdef/thingdef.h"
 #include "i_system.h"
 #include "templates.h"
+#include "doomdata.h"
+#include "r_utility.h"
 
 
 #include "gl/renderer/gl_renderer.h"
diff --git a/src/gl/scene/gl_bsp.cpp b/src/gl/scene/gl_bsp.cpp
index ef7af4d21e..613493e2c4 100644
--- a/src/gl/scene/gl_bsp.cpp
+++ b/src/gl/scene/gl_bsp.cpp
@@ -44,6 +44,7 @@
 #include "r_sky.h"
 #include "p_effect.h"
 #include "po_man.h"
+#include "doomdata.h"
 
 #include "gl/renderer/gl_renderer.h"
 #include "gl/data/gl_data.h"
diff --git a/src/gl/scene/gl_flats.cpp b/src/gl/scene/gl_flats.cpp
index 1044529538..b996aa97c1 100644
--- a/src/gl/scene/gl_flats.cpp
+++ b/src/gl/scene/gl_flats.cpp
@@ -46,6 +46,7 @@
 #include "g_level.h"
 #include "doomstat.h"
 #include "d_player.h"
+#include "portal.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_cvars.h"
diff --git a/src/gl/scene/gl_portal.cpp b/src/gl/scene/gl_portal.cpp
index 5ce683f571..d088d9d701 100644
--- a/src/gl/scene/gl_portal.cpp
+++ b/src/gl/scene/gl_portal.cpp
@@ -47,6 +47,8 @@
 #include "a_sharedglobal.h"
 #include "r_sky.h"
 #include "portal.h"
+#include "p_maputl.h"
+#include "d_player.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
diff --git a/src/gl/scene/gl_sky.cpp b/src/gl/scene/gl_sky.cpp
index 0a26e285d9..ca235c0e70 100644
--- a/src/gl/scene/gl_sky.cpp
+++ b/src/gl/scene/gl_sky.cpp
@@ -45,6 +45,7 @@
 #include "r_state.h"
 #include "r_utility.h"
 #include "doomdata.h"
+#include "portal.h"
 #include "gl/gl_functions.h"
 
 #include "gl/data/gl_data.h"
diff --git a/src/gl/scene/gl_sprite.cpp b/src/gl/scene/gl_sprite.cpp
index 81c9cc3cd0..5d8e7436ef 100644
--- a/src/gl/scene/gl_sprite.cpp
+++ b/src/gl/scene/gl_sprite.cpp
@@ -46,6 +46,8 @@
 #include "r_defs.h"
 #include "r_sky.h"
 #include "r_utility.h"
+#include "a_pickups.h"
+#include "d_player.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
diff --git a/src/gl/scene/gl_walls.cpp b/src/gl/scene/gl_walls.cpp
index 32d4ff98a0..985cd13536 100644
--- a/src/gl/scene/gl_walls.cpp
+++ b/src/gl/scene/gl_walls.cpp
@@ -47,6 +47,9 @@
 #include "vectors.h"
 #include "r_defs.h"
 #include "r_sky.h"
+#include "r_utility.h"
+#include "p_maputl.h"
+#include "doomdata.h"
 #include "portal.h"
 
 #include "gl/system/gl_cvars.h"