diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1c8cb8f1a..0e20c70eb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -882,7 +882,6 @@ set (PCH_SOURCES
 	sound/s_reverbedit.cpp
 	sound/s_sndseq.cpp
 	sound/s_doomsound.cpp
-	serializer.cpp
 	serializer_doom.cpp
 	scriptutil.cpp
 	st_stuff.cpp
@@ -1148,6 +1147,7 @@ set (PCH_SOURCES
 	common/engine/i_interface.cpp
 	common/engine/renderstyle.cpp
 	common/engine/v_colortables.cpp
+	common/engine/serializer.cpp
 	common/objects/dobject.cpp
 	common/objects/dobjgc.cpp
 	common/objects/dobjtype.cpp
@@ -1445,8 +1445,14 @@ source_group("Common\\Audio\\Music" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_
 source_group("Common\\Console" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/console/.+")
 source_group("Common\\Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/utility/.+")
 source_group("Common\\Engine" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/engine/.+")
+source_group("Common\\Objects" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/objects/.+")
 source_group("Common\\Fonts" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/fonts/.+")
 source_group("Common\\File System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/filesystem/.+")
+source_group("Common\\Scripting" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/.+")
+source_group("Common\\Scripting\\Core" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/core/.+")
+source_group("Common\\Scripting\\JIT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/jit/.+")
+source_group("Common\\Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/vm/.+")
+source_group("Common\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/.+")
 source_group("Common\\Textures\\Hires" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/.+")
 source_group("Common\\Textures\\Hires\\HQ Resize" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/hqnx/.+")
 source_group("Common\\Textures\\Hires\\HQ Resize MMX version" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/hqnx_asm/.+")
diff --git a/src/serialize_obj.h b/src/common/engine/serialize_obj.h
similarity index 100%
rename from src/serialize_obj.h
rename to src/common/engine/serialize_obj.h
diff --git a/src/serializer.cpp b/src/common/engine/serializer.cpp
similarity index 99%
rename from src/serializer.cpp
rename to src/common/engine/serializer.cpp
index dca403250..263df178f 100644
--- a/src/serializer.cpp
+++ b/src/common/engine/serializer.cpp
@@ -43,25 +43,19 @@
 #include "rapidjson/prettywriter.h"
 #include "rapidjson/document.h"
 #include "serializer.h"
-#include "r_data/r_interpolate.h"
-#include "r_state.h"
-#include "p_lnspec.h"
+#include "dobject.h"
 #include "filesystem.h"
-#include "p_terrain.h"
-#include "p_setup.h"
-#include "p_conversation.h"
-#include "dsectoreffect.h"
-#include "d_player.h"
-#include "a_sharedglobal.h"
-#include "po_man.h"
 #include "v_font.h"
-#include "engineerrors.h"
 #include "v_text.h"
 #include "cmdlib.h"
-#include "g_levellocals.h"
 #include "utf8.h"
+#include "printf.h"
+#include "s_soundinternal.h"
+#include "engineerrors.h"
+#include "textures.h"
 #include "texturemanager.h"
 
+extern DObject *WP_NOCHANGE;
 bool save_full = false;	// for testing. Should be removed afterward.
 
 #include "serializer_internal.h"
diff --git a/src/serializer.h b/src/common/engine/serializer.h
similarity index 100%
rename from src/serializer.h
rename to src/common/engine/serializer.h
diff --git a/src/serializer_internal.h b/src/common/engine/serializer_internal.h
similarity index 100%
rename from src/serializer_internal.h
rename to src/common/engine/serializer_internal.h