diff --git a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
index 4d41fb0da4..bc02d501aa 100644
--- a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
+++ b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
@@ -25,7 +25,6 @@
 #include "templates.h"
 #include "r_videoscale.h"
 #include "i_time.h"
-#include "g_game.h"
 #include "v_text.h"
 #include "i_video.h"
 #include "v_draw.h"
@@ -33,19 +32,13 @@
 #include "hw_clock.h"
 #include "hw_vrmodes.h"
 #include "hw_cvars.h"
-#include "hw_models.h"
 #include "hw_skydome.h"
-#include "hwrenderer/scene/hw_fakeflat.h"
-#include "hwrenderer/scene/hw_drawinfo.h"
-#include "hwrenderer/scene/hw_portal.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "flatvertices.h"
 #include "hwrenderer/data/shaderuniforms.h"
 #include "hw_lightbuffer.h"
 #include "hwrenderer/postprocessing/hw_postprocess.h"
 
-#include "swrenderer/r_swscene.h"
-
 #include "poly_framebuffer.h"
 #include "poly_buffers.h"
 #include "poly_renderstate.h"
@@ -54,11 +47,6 @@
 
 void Draw2D(F2DDrawer *drawer, FRenderState &state);
 
-EXTERN_CVAR(Bool, r_drawvoxels)
-EXTERN_CVAR(Int, gl_tonemap)
-EXTERN_CVAR(Int, screenblocks)
-EXTERN_CVAR(Bool, cl_capfps)
-
 extern int rendered_commandbuffers;
 extern int current_rendered_commandbuffers;
 
diff --git a/src/rendering/polyrenderer/backend/poly_hwtexture.cpp b/src/rendering/polyrenderer/backend/poly_hwtexture.cpp
index 2971665142..0e56303fe7 100644
--- a/src/rendering/polyrenderer/backend/poly_hwtexture.cpp
+++ b/src/rendering/polyrenderer/backend/poly_hwtexture.cpp
@@ -22,7 +22,6 @@
 
 #include "templates.h"
 #include "c_cvars.h"
-#include "r_data/colormaps.h"
 #include "hw_material.h"
 #include "hw_cvars.h"
 #include "hw_renderstate.h"
diff --git a/src/rendering/polyrenderer/backend/poly_renderstate.cpp b/src/rendering/polyrenderer/backend/poly_renderstate.cpp
index af15229523..6c22b99b02 100644
--- a/src/rendering/polyrenderer/backend/poly_renderstate.cpp
+++ b/src/rendering/polyrenderer/backend/poly_renderstate.cpp
@@ -24,8 +24,6 @@
 #include "polyrenderer/backend/poly_framebuffer.h"
 #include "polyrenderer/backend/poly_hwtexture.h"
 #include "templates.h"
-#include "doomstat.h"
-#include "r_data/colormaps.h"
 #include "hw_skydome.h"
 #include "hw_viewpointuniforms.h"
 #include "hw_lightbuffer.h"
@@ -34,7 +32,6 @@
 #include "flatvertices.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/data/shaderuniforms.h"
-#include "swrenderer/r_swcolormaps.h"
 
 static PolyDrawMode dtToDrawMode[] =
 {
diff --git a/src/rendering/swrenderer/r_memory.cpp b/src/rendering/swrenderer/r_memory.cpp
index 4177e56211..0a29a5314b 100644
--- a/src/rendering/swrenderer/r_memory.cpp
+++ b/src/rendering/swrenderer/r_memory.cpp
@@ -20,22 +20,6 @@
 
 #include <stdlib.h>
 #include "templates.h"
-#include "doomdef.h"
-#include "m_bbox.h"
-
-#include "p_lnspec.h"
-#include "p_setup.h"
-#include "swrenderer/drawers/r_draw.h"
-#include "swrenderer/plane/r_visibleplane.h"
-#include "a_sharedglobal.h"
-#include "g_level.h"
-#include "p_effect.h"
-#include "doomstat.h"
-#include "r_state.h"
-#include "v_palette.h"
-#include "r_sky.h"
-#include "po_man.h"
-#include "r_data/colormaps.h"
 #include "r_memory.h"
 #include <stdlib.h>