diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 250abe03de..2e3c143851 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1043,7 +1043,6 @@ set (PCH_SOURCES
 	g_statusbar/sbar_mugshot.cpp
 	g_statusbar/shared_sbar.cpp
 	gl/compatibility/gl_20.cpp
-	gl/data/gl_portaldata.cpp
 	gl/data/gl_setup.cpp
 	gl/data/gl_vertexbuffer.cpp
 	gl/dynlights/gl_glow.cpp
@@ -1149,6 +1148,7 @@ set (PCH_SOURCES
 	r_data/colormaps.cpp
 	r_data/r_translate.cpp
 	r_data/sprites.cpp
+	r_data/portalgroups.cpp
 	r_data/voxels.cpp
 	r_data/renderstyle.cpp
 	r_data/r_interpolate.cpp
diff --git a/src/gl/data/gl_portaldata.cpp b/src/r_data/portalgroups.cpp
similarity index 97%
rename from src/gl/data/gl_portaldata.cpp
rename to src/r_data/portalgroups.cpp
index 97c236b926..a7f1b6daea 100644
--- a/src/gl/data/gl_portaldata.cpp
+++ b/src/r_data/portalgroups.cpp
@@ -19,12 +19,6 @@
 //
 //--------------------------------------------------------------------------
 //
-/*
-** gl_setup.cpp
-** Initializes the data structures required by the GL renderer to handle
-** a level
-**
-**/
 
 #include "doomtype.h"
 #include "colormatcher.h"
@@ -39,15 +33,8 @@
 #include "g_level.h"
 #include "a_sharedglobal.h"
 #include "g_levellocals.h"
+#include "r_utility.h"
 
-#include "gl/renderer/gl_renderer.h"
-#include "gl/data/gl_data.h"
-#include "gl/data/gl_vertexbuffer.h"
-#include "gl/scene/gl_clipper.h"
-#include "gl/scene/gl_portal.h"
-#include "gl/dynlights/gl_dynlight.h"
-#include "gl/dynlights/gl_glow.h"
-#include "gl/utility/gl_clock.h"
 
 //==========================================================================
 //