diff --git a/src/g_shared/a_dynlight.cpp b/src/g_shared/a_dynlight.cpp
index 69c798fd2c..aab54d24b5 100644
--- a/src/g_shared/a_dynlight.cpp
+++ b/src/g_shared/a_dynlight.cpp
@@ -55,26 +55,14 @@
 **
 */
 
-#include "templates.h"
-#include "m_random.h"
-#include "p_local.h"
 #include "c_dispatch.h"
-#include "g_level.h"
 #include "thingdef.h"
-#include "i_system.h"
-#include "templates.h"
-#include "doomdata.h"
 #include "r_utility.h"
-#include "p_local.h"
-#include "portal.h"
 #include "doomstat.h"
 #include "serializer.h"
 #include "g_levellocals.h"
 #include "a_dynlight.h"
 #include "actorinlines.h"
-#include "c_cvars.h"
-#include "gl/system//gl_interface.h"
-#include "vm.h"
 
 
 CUSTOM_CVAR (Bool, gl_lights, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
diff --git a/src/g_shared/a_dynlight.h b/src/g_shared/a_dynlight.h
index 1498b85eb5..a0aede1920 100644
--- a/src/g_shared/a_dynlight.h
+++ b/src/g_shared/a_dynlight.h
@@ -6,6 +6,9 @@
 EXTERN_CVAR(Bool, gl_lights)
 EXTERN_CVAR(Bool, gl_attachedlights)
 
+struct side_t;
+struct seg_t;
+
 class ADynamicLight;
 class FSerializer;
 
diff --git a/src/hwrenderer/dynlights/hw_dynlightdata.cpp b/src/hwrenderer/dynlights/hw_dynlightdata.cpp
index c47a331243..e26bd06544 100644
--- a/src/hwrenderer/dynlights/hw_dynlightdata.cpp
+++ b/src/hwrenderer/dynlights/hw_dynlightdata.cpp
@@ -26,12 +26,7 @@
 **/
 
 #include "gl/system/gl_system.h"
-#include "c_dispatch.h"
-#include "p_local.h"
-#include "vectors.h"
-#include "g_level.h"
 #include "actorinlines.h"
-#include "a_dynlight.h"
 
 #include "hw_dynlightdata.h"
 
diff --git a/src/hwrenderer/dynlights/hw_dynlightdata.h b/src/hwrenderer/dynlights/hw_dynlightdata.h
index cfa47bc69d..e63ade4fb8 100644
--- a/src/hwrenderer/dynlights/hw_dynlightdata.h
+++ b/src/hwrenderer/dynlights/hw_dynlightdata.h
@@ -23,7 +23,6 @@
 #ifndef __GLC_DYNLIGHT_H
 #define __GLC_DYNLIGHT_H
 
-#include "c_cvars.h"
 #include "a_dynlight.h"
 
 
diff --git a/src/r_data/a_dynlightdata.cpp b/src/r_data/a_dynlightdata.cpp
index 6cab5d02c0..2f69728d05 100644
--- a/src/r_data/a_dynlightdata.cpp
+++ b/src/r_data/a_dynlightdata.cpp
@@ -33,25 +33,9 @@
 **
 */
 
-
-#include <ctype.h>
-#include "i_system.h"
-#include "doomtype.h"
-#include "c_cvars.h"
-#include "c_dispatch.h"
-#include "m_random.h"
-#include "sc_man.h"
-#include "templates.h"
-#include "w_wad.h"
-#include "gi.h"
 #include "r_state.h"
-#include "stats.h"
-#include "zstring.h"
-#include "d_dehacked.h"
-#include "v_text.h"
 #include "g_levellocals.h"
 #include "a_dynlight.h"
-#include "textures/skyboxtexture.h"
 
 
 //==========================================================================