diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 087794b09..c54a9b6dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -825,8 +825,6 @@ set( FASTMATH_SOURCES
 	textures/hires/xbr/xbrz.cpp
 	textures/hires/xbr/xbrz_old.cpp
 	gl/scene/gl_bsp.cpp
-	gl/scene/gl_fakeflat.cpp
-	gl/scene/gl_clipper.cpp
 	gl/scene/gl_decal.cpp
 	gl/scene/gl_drawinfo.cpp
 	gl/scene/gl_flats.cpp
@@ -845,6 +843,8 @@ set( FASTMATH_SOURCES
 	gl_load/gl_load.c
 	gl/models/gl_models.cpp
 	hwrenderer/dynlights/hw_dynlightdata.cpp
+	hwrenderer/scene/hw_fakeflat.cpp
+	hwrenderer/scene/hw_clipper.cpp
 	r_data/models/models.cpp
 	r_data/matrix.cpp
 	sound/adlmidi/adldata.cpp
diff --git a/src/gl/renderer/gl_renderer.h b/src/gl/renderer/gl_renderer.h
index 0fb7f0bdc..583943a3f 100644
--- a/src/gl/renderer/gl_renderer.h
+++ b/src/gl/renderer/gl_renderer.h
@@ -234,19 +234,7 @@ public:
 	static float GetZFar() { return 65536.f; }
 };
 
-enum area_t
-{
-	area_normal,
-	area_below,
-	area_above,
-	area_default
-};
-
-
-// Global functions. Make them members of GLRenderer later?
-bool gl_CheckClip(side_t * sidedef, sector_t * frontsector, sector_t * backsector);
-sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool back);
-area_t gl_CheckViewArea(area_t in_area, vertex_t *v1, vertex_t *v2, sector_t *frontsector, sector_t *backsector);
+#include "hwrenderer/scene/hw_fakeflat.h"
 
 struct TexFilter_s
 {
diff --git a/src/gl/scene/gl_portal.cpp b/src/gl/scene/gl_portal.cpp
index 798e9c972..f3c45c508 100644
--- a/src/gl/scene/gl_portal.cpp
+++ b/src/gl/scene/gl_portal.cpp
@@ -46,7 +46,7 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_quaddrawer.h"
 #include "gl/data/gl_vertexbuffer.h"
-#include "gl/scene/gl_clipper.h"
+#include "hwrenderer/scene/hw_clipper.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"
diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp
index 1b1f1d28b..2b2ee78b2 100644
--- a/src/gl/scene/gl_scene.cpp
+++ b/src/gl/scene/gl_scene.cpp
@@ -55,7 +55,7 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/data/gl_vertexbuffer.h"
-#include "gl/scene/gl_clipper.h"
+#include "hwrenderer/scene/hw_clipper.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"
diff --git a/src/gl/scene/gl_scenedrawer.h b/src/gl/scene/gl_scenedrawer.h
index ec3b86d8e..1f6336802 100644
--- a/src/gl/scene/gl_scenedrawer.h
+++ b/src/gl/scene/gl_scenedrawer.h
@@ -2,7 +2,7 @@
 
 #include "r_defs.h"
 #include "m_fixed.h"
-#include "gl_clipper.h"
+#include "hwrenderer/scene/hw_clipper.h"
 #include "gl_portal.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderer.h"
diff --git a/src/gl/scene/gl_swscene.h b/src/gl/scene/gl_swscene.h
index 67be5974f..f4fbb00a3 100644
--- a/src/gl/scene/gl_swscene.h
+++ b/src/gl/scene/gl_swscene.h
@@ -3,7 +3,7 @@
 
 #include "r_defs.h"
 #include "m_fixed.h"
-#include "gl_clipper.h"
+#include "hwrenderer/scene/hw_clipper.h"
 #include "gl_portal.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderer.h"
diff --git a/src/gl/scene/gl_clipper.cpp b/src/hwrenderer/scene/hw_clipper.cpp
similarity index 99%
rename from src/gl/scene/gl_clipper.cpp
rename to src/hwrenderer/scene/hw_clipper.cpp
index f21cac634..e1811dd8c 100644
--- a/src/gl/scene/gl_clipper.cpp
+++ b/src/hwrenderer/scene/hw_clipper.cpp
@@ -35,7 +35,7 @@
 **
 */
 
-#include "gl/scene/gl_clipper.h"
+#include "hw_clipper.h"
 #include "g_levellocals.h"
 
 unsigned Clipper::starttime;
diff --git a/src/gl/scene/gl_clipper.h b/src/hwrenderer/scene/hw_clipper.h
similarity index 100%
rename from src/gl/scene/gl_clipper.h
rename to src/hwrenderer/scene/hw_clipper.h
diff --git a/src/gl/scene/gl_fakeflat.cpp b/src/hwrenderer/scene/hw_fakeflat.cpp
similarity index 99%
rename from src/gl/scene/gl_fakeflat.cpp
rename to src/hwrenderer/scene/hw_fakeflat.cpp
index 67ba1cfef..1c8c302bd 100644
--- a/src/gl/scene/gl_fakeflat.cpp
+++ b/src/hwrenderer/scene/hw_fakeflat.cpp
@@ -30,8 +30,7 @@
 #include "g_levellocals.h"
 #include "a_sharedglobal.h"
 #include "r_sky.h"
-#include "gl/renderer/gl_renderer.h"
-#include "gl/scene/gl_scenedrawer.h"
+#include "hw_fakeflat.h"
 
 
 //==========================================================================
diff --git a/src/hwrenderer/scene/hw_fakeflat.h b/src/hwrenderer/scene/hw_fakeflat.h
new file mode 100644
index 000000000..a33e00549
--- /dev/null
+++ b/src/hwrenderer/scene/hw_fakeflat.h
@@ -0,0 +1,16 @@
+#pragma once
+
+enum area_t
+{
+	area_normal,
+	area_below,
+	area_above,
+	area_default
+};
+
+
+// Global functions. Make them members of GLRenderer later?
+bool gl_CheckClip(side_t * sidedef, sector_t * frontsector, sector_t * backsector);
+sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool back);
+area_t gl_CheckViewArea(area_t in_area, vertex_t *v1, vertex_t *v2, sector_t *frontsector, sector_t *backsector);
+