diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 79c4856fa3..07749530df 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -822,7 +822,6 @@ set( FASTMATH_SOURCES
 	gl/scene/gl_walls.cpp
 	gl/scene/gl_sprite.cpp
 	gl/scene/gl_skydome.cpp
-	gl/scene/gl_renderhacks.cpp
 	gl/scene/gl_weapon.cpp
 	gl/scene/gl_scene.cpp
 	gl/scene/gl_swscene.cpp
@@ -834,6 +833,7 @@ set( FASTMATH_SOURCES
 	gl_load/gl_load.c
 	gl/models/gl_models.cpp
 	hwrenderer/dynlights/hw_dynlightdata.cpp
+	hwrenderer/scene/hw_renderhacks.cpp
 	r_data/models/models.cpp
 	r_data/matrix.cpp
 	sound/adlmidi/adldata.cpp
diff --git a/src/gl/scene/gl_drawinfo.h b/src/gl/scene/gl_drawinfo.h
index 5643fc90ce..61297124a0 100644
--- a/src/gl/scene/gl_drawinfo.h
+++ b/src/gl/scene/gl_drawinfo.h
@@ -2,7 +2,7 @@
 #define __GL_DRAWINFO_H
 
 #include "gl/scene/gl_wall.h"
-#include "hw_drawinfo.h"
+#include "hwrenderer/scene/hw_drawinfo.h"
 
 enum GLDrawItemType
 {
diff --git a/src/gl/scene/hw_drawinfo.h b/src/hwrenderer/scene/hw_drawinfo.h
similarity index 100%
rename from src/gl/scene/hw_drawinfo.h
rename to src/hwrenderer/scene/hw_drawinfo.h
diff --git a/src/gl/scene/gl_renderhacks.cpp b/src/hwrenderer/scene/hw_renderhacks.cpp
similarity index 99%
rename from src/gl/scene/gl_renderhacks.cpp
rename to src/hwrenderer/scene/hw_renderhacks.cpp
index ad35195cda..2ae37e37b4 100644
--- a/src/gl/scene/gl_renderhacks.cpp
+++ b/src/hwrenderer/scene/hw_renderhacks.cpp
@@ -31,7 +31,7 @@
 #include "g_level.h"
 #include "g_levellocals.h"
 
-#include "hw_drawinfo.h"
+#include "hwrenderer/scene/hw_drawinfo.h"
 #include "gl/utility/gl_clock.h"
 
 sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool back);