diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a4a1e0faa..8a055bda2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -819,7 +819,6 @@ set( FASTMATH_SOURCES
 	textures/hires/hqnx/hq4x.cpp
 	textures/hires/xbr/xbrz.cpp
 	textures/hires/xbr/xbrz_old.cpp
-	gl/scene/gl_scene.cpp
 	gl_load/gl_load.c
 	hwrenderer/postprocessing/hw_postprocess_cvars.cpp
 	hwrenderer/postprocessing/hw_postprocessshader.cpp
@@ -829,12 +828,10 @@ set( FASTMATH_SOURCES
 	hwrenderer/scene/hw_decal.cpp
 	hwrenderer/scene/hw_drawinfo.cpp
 	hwrenderer/scene/hw_drawlist.cpp
-	hwrenderer/scene/hw_drawlistadd.cpp
 	hwrenderer/scene/hw_clipper.cpp
 	hwrenderer/scene/hw_flats.cpp
 	hwrenderer/scene/hw_portal.cpp
 	hwrenderer/scene/hw_renderhacks.cpp
-	hwrenderer/scene/hw_renderstate.cpp
 	hwrenderer/scene/hw_sky.cpp
 	hwrenderer/scene/hw_skyportal.cpp
 	hwrenderer/scene/hw_sprites.cpp
@@ -1041,6 +1038,7 @@ set (PCH_SOURCES
 	gl/renderer/gl_postprocess.cpp
 	gl/renderer/gl_postprocessstate.cpp
 	gl/renderer/gl_stereo3d.cpp
+	gl/renderer/gl_scene.cpp
 	gl/shaders/gl_shader.cpp
 	gl/shaders/gl_shaderprogram.cpp
 	gl/shaders/gl_postprocessshader.cpp
@@ -1057,6 +1055,8 @@ set (PCH_SOURCES
 	hwrenderer/dynlights/hw_lightbuffer.cpp
 	hwrenderer/models/hw_models.cpp
 	hwrenderer/scene/hw_skydome.cpp
+	hwrenderer/scene/hw_drawlistadd.cpp
+	hwrenderer/scene/hw_renderstate.cpp
 	hwrenderer/postprocessing/hw_postprocess.cpp
 	hwrenderer/postprocessing/hw_postprocess_cvars.cpp
 	hwrenderer/postprocessing/hw_postprocessshader.cpp
diff --git a/src/gl/renderer/gl_renderer.cpp b/src/gl/renderer/gl_renderer.cpp
index da876c1d0..64fdccf67 100644
--- a/src/gl/renderer/gl_renderer.cpp
+++ b/src/gl/renderer/gl_renderer.cpp
@@ -47,7 +47,6 @@
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_renderbuffers.h"
-#include "gl/scene/gl_drawinfo.h"
 #include "hwrenderer/utility/hw_vrmodes.h"
 #include "hwrenderer/postprocessing/hw_presentshader.h"
 #include "hwrenderer/postprocessing/hw_present3dRowshader.h"
diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/renderer/gl_scene.cpp
similarity index 99%
rename from src/gl/scene/gl_scene.cpp
rename to src/gl/renderer/gl_scene.cpp
index 92e083391..dcf83fe29 100644
--- a/src/gl/scene/gl_scene.cpp
+++ b/src/gl/renderer/gl_scene.cpp
@@ -54,7 +54,6 @@
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/scene/hw_clipper.h"
 #include "hwrenderer/scene/hw_portal.h"
-#include "gl/scene/gl_drawinfo.h"
 #include "hwrenderer/utility/hw_vrmodes.h"
 #include "gl/renderer/gl_renderer.h"
 
diff --git a/src/gl/scene/gl_drawinfo.h b/src/gl/scene/gl_drawinfo.h
deleted file mode 100644
index b4e8020e6..000000000
--- a/src/gl/scene/gl_drawinfo.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-#ifndef __GL_DRAWINFO_H
-#define __GL_DRAWINFO_H
-
-#include "hwrenderer/scene/hw_drawinfo.h"
-#include "hwrenderer/scene/hw_weapon.h"
-#include "hwrenderer/scene/hw_viewpointuniforms.h"
-
-#include "gl/renderer/gl_renderstate.h"	// temporary
-
-#ifdef _MSC_VER
-#pragma warning(disable:4244)
-#endif
-
-struct FDrawInfo : public HWDrawInfo
-{
-};
-#endif
-*/
\ No newline at end of file
diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp
index 47965d9e4..bf073a923 100644
--- a/src/gl/system/gl_framebuffer.cpp
+++ b/src/gl/system/gl_framebuffer.cpp
@@ -43,7 +43,6 @@
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/dynlights/hw_lightbuffer.h"
 #include "gl/shaders/gl_shaderprogram.h"
-#include "gl/scene/gl_drawinfo.h"
 #include "gl_debug.h"
 #include "r_videoscale.h"
 #include "gl_buffers.h"