diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index da9b92dda..ffc8aa441 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1050,7 +1050,6 @@ set (PCH_SOURCES
 	gl/textures/gl_hwtexture.cpp
 	gl/textures/gl_samplers.cpp
 	hwrenderer/data/hw_vertexbuilder.cpp
-	hwrenderer/data/hw_sections.cpp
 	hwrenderer/data/flatvertices.cpp
 	hwrenderer/data/hw_viewpointbuffer.cpp
 	hwrenderer/dynlights/hw_aabbtree.cpp
@@ -1143,6 +1142,7 @@ set (PCH_SOURCES
 	r_data/renderstyle.cpp
 	r_data/r_interpolate.cpp
 	r_data/r_vanillatrans.cpp
+	r_data/r_sections.cpp
 	r_data/models/models_md3.cpp
 	r_data/models/models_md2.cpp
 	r_data/models/models_voxel.cpp
diff --git a/src/g_levellocals.h b/src/g_levellocals.h
index 6a42c12c5..1e3aed96f 100644
--- a/src/g_levellocals.h
+++ b/src/g_levellocals.h
@@ -42,7 +42,7 @@
 #include "p_blockmap.h"
 #include "p_local.h"
 #include "p_destructible.h"
-#include "hwrenderer/data/hw_sections.h"
+#include "r_data/r_sections.h"
 
 struct FLevelLocals
 {
diff --git a/src/hwrenderer/data/hw_sections.cpp b/src/r_data/r_sections.cpp
similarity index 99%
rename from src/hwrenderer/data/hw_sections.cpp
rename to src/r_data/r_sections.cpp
index c37b37395..fcc273d33 100644
--- a/src/hwrenderer/data/hw_sections.cpp
+++ b/src/r_data/r_sections.cpp
@@ -28,13 +28,12 @@
 #include "c_dispatch.h"
 #include "r_defs.h"
 #include "g_levellocals.h"
-#include "hw_sections.h"
+#include "r_sections.h"
 #include "earcut.hpp"
 #include "stats.h"
 #include "p_setup.h"
 #include "c_dispatch.h"
 #include "memarena.h"
-#include "flatvertices.h"
 
 using DoublePoint = std::pair<DVector2, DVector2>;
 
diff --git a/src/hwrenderer/data/hw_sections.h b/src/r_data/r_sections.h
similarity index 100%
rename from src/hwrenderer/data/hw_sections.h
rename to src/r_data/r_sections.h