diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c8b5c050a..8eb804f78 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -975,7 +975,6 @@ 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
@@ -1035,6 +1034,7 @@ set (PCH_SOURCES
 	common/textures/multipatchtexturebuilder.cpp
 	common/textures/skyboxtexture.cpp
 	common/textures/animtexture.cpp
+	common/textures/v_collection.cpp
 	common/textures/formats/automaptexture.cpp
 	common/textures/formats/brightmaptexture.cpp
 	common/textures/formats/buildtexture.cpp
@@ -1099,6 +1099,7 @@ set (PCH_SOURCES
 	common/filesystem/file_whres.cpp
 	common/filesystem/file_directory.cpp
 	common/filesystem/resourcefile.cpp
+	common/engine/cycler.cpp
 	common/engine/stats.cpp
 	common/engine/sc_man.cpp
 	common/engine/palettecontainer.cpp
@@ -1164,7 +1165,6 @@ set (PCH_SOURCES
 	utility/nodebuilder/nodebuild_extract.cpp
 	utility/nodebuilder/nodebuild_gl.cpp
 	utility/nodebuilder/nodebuild_utility.cpp
-	utility/v_collection.cpp
 )
 
 if( ${HAVE_VM_JIT} )
diff --git a/src/r_data/cycler.cpp b/src/common/engine/cycler.cpp
similarity index 100%
rename from src/r_data/cycler.cpp
rename to src/common/engine/cycler.cpp
diff --git a/src/r_data/cycler.h b/src/common/engine/cycler.h
similarity index 100%
rename from src/r_data/cycler.h
rename to src/common/engine/cycler.h
diff --git a/src/utility/v_collection.cpp b/src/common/textures/v_collection.cpp
similarity index 100%
rename from src/utility/v_collection.cpp
rename to src/common/textures/v_collection.cpp
diff --git a/src/utility/v_collection.h b/src/common/textures/v_collection.h
similarity index 98%
rename from src/utility/v_collection.h
rename to src/common/textures/v_collection.h
index f5df863bf..8574e5802 100644
--- a/src/utility/v_collection.h
+++ b/src/common/textures/v_collection.h
@@ -34,8 +34,8 @@
 #ifndef __V_COLLECTION_H__
 #define __V_COLLECTION_H__
 
-#include "doomtype.h"
-#include "r_defs.h"
+#include "tarray.h"
+#include "textureid.h"
 
 class FGameTexture;
 
diff --git a/src/utility/weightedlist.h b/src/common/utility/weightedlist.h
similarity index 99%
rename from src/utility/weightedlist.h
rename to src/common/utility/weightedlist.h
index 4582f6e0f..cd6a4ba0e 100644
--- a/src/utility/weightedlist.h
+++ b/src/common/utility/weightedlist.h
@@ -33,8 +33,7 @@
 */
 
 #include <stdlib.h>
-
-#include "doomtype.h"
+#include <stdint.h>
 
 class FRandom;
 
diff --git a/src/events.h b/src/events.h
index 52bf9ac21..c0ecb047b 100755
--- a/src/events.h
+++ b/src/events.h
@@ -8,6 +8,9 @@
 
 class DStaticEventHandler;
 struct EventManager;
+struct line_t;
+struct sector_t;
+struct FLevelLocals;
 
 enum class EventHandlerType
 {
diff --git a/src/playsim/a_dynlight.h b/src/playsim/a_dynlight.h
index 38f9019bd..d5be0438a 100644
--- a/src/playsim/a_dynlight.h
+++ b/src/playsim/a_dynlight.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "c_cvars.h"
 #include "actor.h"
-#include "r_data/cycler.h"
+#include "cycler.h"
 #include "g_levellocals.h"
 
 struct side_t;