diff --git a/src/gl/scene/gl_swscene.cpp b/src/gl/scene/gl_swscene.cpp
index 4281a2cc96..965a2f8dd0 100644
--- a/src/gl/scene/gl_swscene.cpp
+++ b/src/gl/scene/gl_swscene.cpp
@@ -25,17 +25,17 @@
 **
 */
 
-#include "gl/system/gl_system.h"
-#include "gl/system/gl_debug.h"
-#include "gl/data/gl_vertexbuffer.h"
-#include "gl/shaders/gl_shader.h"
 #include "hwrenderer/textures/hw_ihwtexture.h"
+#include "hwrenderer/textures/hw_material.h"
+#include "r_renderer.h"
 #include "gl_swscene.h"
 #include "w_wad.h"
 #include "d_player.h"
 #include "textures/bitmap.h"
 #include "swrenderer/scene/r_light.h"
 
+#include "gl/renderer/gl_renderer.h"
+
 // [RH] Base blending values (for e.g. underwater)
 int BaseBlendR, BaseBlendG, BaseBlendB;
 float BaseBlendA;
diff --git a/src/gl/scene/gl_swscene.h b/src/gl/scene/gl_swscene.h
index f4fbb00a30..f54b2f3ed0 100644
--- a/src/gl/scene/gl_swscene.h
+++ b/src/gl/scene/gl_swscene.h
@@ -4,9 +4,6 @@
 #include "r_defs.h"
 #include "m_fixed.h"
 #include "hwrenderer/scene/hw_clipper.h"
-#include "gl_portal.h"
-#include "gl/renderer/gl_lightdata.h"
-#include "gl/renderer/gl_renderer.h"
 #include "r_utility.h"
 #include "c_cvars.h"
 
@@ -18,12 +15,6 @@ class SWSceneDrawer
 	FSWSceneTexture *FBTexture = nullptr;
 	bool FBIsTruecolor = false;
 
-	
-	void BlendView (player_t *CPlayer, float blend[4]);
-	bool CreateResources();
-	void BindFBBuffer();
-
-
 public:
 	SWSceneDrawer();
 	~SWSceneDrawer();