diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db6b79cde..6244225ca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -907,7 +907,6 @@ set (PCH_SOURCES
 	c_expr.cpp
 	c_functions.cpp
 	ct_chat.cpp
-	cycler.cpp
 	d_iwad.cpp
 	d_main.cpp
 	d_anonstats.cpp
@@ -960,7 +959,6 @@ set (PCH_SOURCES
 	serializer.cpp
 	scriptutil.cpp
 	st_stuff.cpp
-	statistics.cpp
 	v_framebuffer.cpp
 	v_palette.cpp
 	v_video.cpp
@@ -979,6 +977,7 @@ set (PCH_SOURCES
 	gamedata/info.cpp
 	gamedata/keysections.cpp
 	gamedata/p_terrain.cpp
+	gamedata/statistics.cpp
 	gamedata/teaminfo.cpp
 	g_shared/a_pickups.cpp
 	g_shared/a_action.cpp
@@ -1143,6 +1142,7 @@ set (PCH_SOURCES
 	intermission/intermission.cpp
 	intermission/intermission_parse.cpp
 	r_data/colormaps.cpp
+	r_data/cycler.cpp
 	r_data/gldefs.cpp
 	r_data/a_dynlightdata.cpp
 	r_data/r_translate.cpp
diff --git a/src/g_shared/a_dynlight.h b/src/g_shared/a_dynlight.h
index 54da9e7d5..2a681a71d 100644
--- a/src/g_shared/a_dynlight.h
+++ b/src/g_shared/a_dynlight.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "c_cvars.h"
 #include "actor.h"
-#include "cycler.h"
+#include "r_data/cycler.h"
 #include "g_levellocals.h"
 
 struct side_t;
diff --git a/src/statistics.cpp b/src/gamedata/statistics.cpp
similarity index 100%
rename from src/statistics.cpp
rename to src/gamedata/statistics.cpp
diff --git a/src/cycler.cpp b/src/r_data/cycler.cpp
similarity index 100%
rename from src/cycler.cpp
rename to src/r_data/cycler.cpp
diff --git a/src/cycler.h b/src/r_data/cycler.h
similarity index 100%
rename from src/cycler.h
rename to src/r_data/cycler.h
diff --git a/src/doomerrors.h b/src/utility/doomerrors.h
similarity index 100%
rename from src/doomerrors.h
rename to src/utility/doomerrors.h