diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95dba3dc3..4e59452f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,6 +156,7 @@ macro( use_fast_math )
 	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ZD_FASTMATH_FLAG}" )
 endmacro()
 
+
 include( CheckFunctionExists )
 
 macro( require_stricmp )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 02228a118..126a5fe32 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -620,6 +620,15 @@ file( GLOB HEADER_FILES
 	common/rendering/*.h
 	common/rendering/gl_load/*.h
 	common/rendering/hwrenderer/data/*.h
+	common/rendering/polyrenderer/*.h
+	common/rendering/polyrenderer/math/*.h
+	common/rendering/polyrenderer/drawers/*.h
+	common/rendering/polyrenderer/backend/*.h
+	common/rendering/vulkan/*.h
+	common/rendering/vulkan/system/*.h
+	common/rendering/vulkan/renderer/*.h
+	common/rendering/vulkan/shaders/*.h
+	common/rendering/vulkan/textures/*.h
 	common/scripting/core/*h
 	common/scripting/vm/*h
 	common/scripting/jit/*h
@@ -643,17 +652,8 @@ file( GLOB HEADER_FILES
 	rendering/swrenderer/plane/*.h
 	rendering/swrenderer/things/*.h
 	rendering/swrenderer/viewport/*.h
-	rendering/polyrenderer/*.h
-	rendering/polyrenderer/math/*.h
-	rendering/polyrenderer/drawers/*.h
-	rendering/polyrenderer/backend/*.h
 	rendering/hwrenderer/*.h
 	rendering/hwrenderer/scene/*.h
-	rendering/vulkan/*.h
-	rendering/vulkan/system/*.h
-	rendering/vulkan/renderer/*.h
-	rendering/vulkan/shaders/*.h
-	rendering/vulkan/textures/*.h
 	*.h
 )
 
@@ -664,7 +664,6 @@ set ( SWRENDER_SOURCES
 	rendering/swrenderer/drawers/r_draw.cpp
 	rendering/swrenderer/drawers/r_draw_pal.cpp
 	rendering/swrenderer/drawers/r_draw_rgba.cpp
-	rendering/swrenderer/drawers/r_thread.cpp
 	rendering/swrenderer/scene/r_3dfloors.cpp
 	rendering/swrenderer/scene/r_light.cpp
 	rendering/swrenderer/scene/r_opaque_pass.cpp
@@ -704,12 +703,12 @@ set ( SWRENDER_SOURCES
 )
 
 set( POLYRENDER_SOURCES
-	rendering/polyrenderer/drawers/poly_triangle.cpp
-	rendering/polyrenderer/drawers/poly_thread.cpp
-	rendering/polyrenderer/drawers/screen_triangle.cpp
-	rendering/polyrenderer/drawers/screen_scanline_setup.cpp
-	rendering/polyrenderer/drawers/screen_shader.cpp
-	rendering/polyrenderer/drawers/screen_blend.cpp
+	common/rendering/polyrenderer/drawers/poly_triangle.cpp
+	common/rendering/polyrenderer/drawers/poly_thread.cpp
+	common/rendering/polyrenderer/drawers/screen_triangle.cpp
+	common/rendering/polyrenderer/drawers/screen_scanline_setup.cpp
+	common/rendering/polyrenderer/drawers/screen_shader.cpp
+	common/rendering/polyrenderer/drawers/screen_blend.cpp
 )
 
 # These files will be flagged as "headers" so that they appear in project files
@@ -749,7 +748,7 @@ set( VM_JIT_SOURCES
 set( FASTMATH_SOURCES
 	rendering/swrenderer/r_all.cpp
 	rendering/swrenderer/r_swscene.cpp
-	rendering/polyrenderer/poly_all.cpp
+	common/rendering/polyrenderer/poly_all.cpp
 	common/textures/hires/hqnx/init.cpp
 	common/textures/hires/hqnx/hq2x.cpp
 	common/textures/hires/hqnx/hq3x.cpp
@@ -779,22 +778,22 @@ set( FASTMATH_SOURCES
 	
 #Vulkan stuff must go into a separate list because it needs to be disabled for some platforms
 set (VULKAN_SOURCES
-	rendering/vulkan/system/vk_device.cpp
-	rendering/vulkan/system/vk_swapchain.cpp
-	rendering/vulkan/system/vk_builders.cpp
-	rendering/vulkan/system/vk_framebuffer.cpp
-	rendering/vulkan/system/vk_buffers.cpp
-	rendering/vulkan/renderer/vk_renderstate.cpp
-	rendering/vulkan/renderer/vk_renderpass.cpp
-	rendering/vulkan/renderer/vk_streambuffer.cpp
-	rendering/vulkan/renderer/vk_postprocess.cpp
-	rendering/vulkan/renderer/vk_renderbuffers.cpp
-	rendering/vulkan/shaders/vk_shader.cpp
-	rendering/vulkan/textures/vk_samplers.cpp
-	rendering/vulkan/textures/vk_hwtexture.cpp
-	rendering/vulkan/textures/vk_imagetransition.cpp
-	rendering/vulkan/thirdparty/volk/volk.c
-	rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.cpp
+	common/rendering/vulkan/system/vk_device.cpp
+	common/rendering/vulkan/system/vk_swapchain.cpp
+	common/rendering/vulkan/system/vk_builders.cpp
+	common/rendering/vulkan/system/vk_framebuffer.cpp
+	common/rendering/vulkan/system/vk_buffers.cpp
+	common/rendering/vulkan/renderer/vk_renderstate.cpp
+	common/rendering/vulkan/renderer/vk_renderpass.cpp
+	common/rendering/vulkan/renderer/vk_streambuffer.cpp
+	common/rendering/vulkan/renderer/vk_postprocess.cpp
+	common/rendering/vulkan/renderer/vk_renderbuffers.cpp
+	common/rendering/vulkan/shaders/vk_shader.cpp
+	common/rendering/vulkan/textures/vk_samplers.cpp
+	common/rendering/vulkan/textures/vk_hwtexture.cpp
+	common/rendering/vulkan/textures/vk_imagetransition.cpp
+	common/rendering/vulkan/thirdparty/volk/volk.c
+	common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.cpp
 )
 
 if (HAVE_VULKAN)
@@ -802,10 +801,10 @@ if (HAVE_VULKAN)
 endif()
 
 set (POLYBACKEND_SOURCES
-	rendering/polyrenderer/backend/poly_framebuffer.cpp
-	rendering/polyrenderer/backend/poly_buffers.cpp
-	rendering/polyrenderer/backend/poly_hwtexture.cpp
-	rendering/polyrenderer/backend/poly_renderstate.cpp
+	common/rendering/polyrenderer/backend/poly_framebuffer.cpp
+	common/rendering/polyrenderer/backend/poly_buffers.cpp
+	common/rendering/polyrenderer/backend/poly_hwtexture.cpp
+	common/rendering/polyrenderer/backend/poly_renderstate.cpp
 )
 set (FASTMATH_SOURCES ${FASTMATH_SOURCES} ${POLYBACKEND_SOURCES})
 
@@ -1113,6 +1112,7 @@ set (PCH_SOURCES
 	common/objects/dobjtype.cpp
 	common/rendering/v_framebuffer.cpp
 	common/rendering/v_video.cpp
+	common/rendering/r_thread.cpp
 	common/rendering/r_videoscale.cpp
 	common/rendering/hwrenderer/data/hw_clock.cpp
 	common/rendering/hwrenderer/data/hw_skydome.cpp
@@ -1252,6 +1252,9 @@ include_directories( .
 	common/rendering/hwrenderer/data
 	common/rendering/gl_load
 	common/rendering/gl
+	common/rendering/vulkan/thirdparty
+	common/rendering/polyrenderer/backend
+	common/rendering/polyrenderer/drawers
 	common/scripting/vm
 	common/scripting/jit
 	common/scripting/core
@@ -1278,7 +1281,6 @@ include_directories( .
 	scripting
 	scripting/zscript
 	rendering
-	rendering/vulkan/thirdparty
 	../libraries/gdtoa
 	../libraries/glslang/glslang/Public
 	../libraries/glslang/spirv
@@ -1347,7 +1349,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
 	# Need to enable intrinsics for these files.
 	if( SSE_MATTERS )
 		set_property( SOURCE
-			rendering/polyrenderer/poly_all.cpp
+			common/rendering/polyrenderer/poly_all.cpp
 			rendering/swrenderer/r_all.cpp
 			utility/palette.cpp
 			utility/x86.cpp
@@ -1396,13 +1398,6 @@ source_group("Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/render
 source_group("Rendering\\2D" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/2d/.+")
 source_group("Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/.+")
 source_group("Rendering\\Hardware Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/scene/.+")
-source_group("Rendering\\Vulkan Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/system/.+")
-source_group("Rendering\\Vulkan Renderer\\Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/renderer/.+")
-source_group("Rendering\\Vulkan Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/shaders/.+")
-source_group("Rendering\\Vulkan Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/textures/.+")
-source_group("Rendering\\Vulkan Renderer\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/.+")
-source_group("Rendering\\Vulkan Renderer\\Third Party\\Volk" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/volk/.+")
-source_group("Rendering\\Vulkan Renderer\\Third Party\\Vk_Mem_Alloc" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/vk_mem_alloc.+")
 source_group("Rendering\\Software Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/.+")
 source_group("Rendering\\Software Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/drawers/.+")
 source_group("Rendering\\Software Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/scene/.+")
@@ -1411,10 +1406,6 @@ source_group("Rendering\\Software Renderer\\Line" REGULAR_EXPRESSION "^${CMAKE_C
 source_group("Rendering\\Software Renderer\\Plane" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/plane/.+")
 source_group("Rendering\\Software Renderer\\Things" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/things/.+")
 source_group("Rendering\\Software Renderer\\Viewport" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/viewport/.+")
-source_group("Rendering\\Poly Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/polyrenderer/.+")
-source_group("Rendering\\Poly Renderer\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/polyrenderer/math/.+")
-source_group("Rendering\\Poly Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/polyrenderer/drawers/.+")
-source_group("Rendering\\Poly Renderer\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/polyrenderer/backend/.+")
 source_group("Render Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+")
 source_group("Render Interface" FILES r_defs.h r_renderer.h r_sky.cpp r_sky.h r_state.h r_utility.cpp r_utility.h)
 source_group("Platforms\\POSIX Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/.+")
@@ -1454,6 +1445,16 @@ source_group("Common\\Rendering\\Hardware Renderer\\Data" REGULAR_EXPRESSION "^$
 source_group("Common\\Rendering\\Hardware Renderer\\Postprocessing" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/postprocessing/.+")
 source_group("Common\\Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl_load/.+")
 source_group("Common\\Rendering\\OpenGL Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl/.+")
+source_group("Common\\Rendering\\Vulkan Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/system/.+")
+source_group("Common\\Rendering\\Vulkan Renderer\\Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/renderer/.+")
+source_group("Common\\Rendering\\Vulkan Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/shaders/.+")
+source_group("Common\\Rendering\\Vulkan Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/textures/.+")
+source_group("Common\\Rendering\\Vulkan Renderer\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/thirdparty/.+")
+source_group("Common\\Rendering\\Vulkan Renderer\\Third Party\\Volk" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/thirdparty/volk/.+")
+source_group("Common\\Rendering\\Vulkan Renderer\\Third Party\\Vk_Mem_Alloc" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/thirdparty/vk_mem_alloc.+")
+source_group("Common\\Rendering\\Poly Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/polyrenderer/.+")
+source_group("Common\\Rendering\\Poly Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/polyrenderer/drawers/.+")
+source_group("Common\\Rendering\\Poly Renderer\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/polyrenderer/backend/.+")
 source_group("Common\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/models/.+")
 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/.+")
diff --git a/src/common/platform/posix/cocoa/i_video.mm b/src/common/platform/posix/cocoa/i_video.mm
index 1f2056ab5..a7465cfab 100644
--- a/src/common/platform/posix/cocoa/i_video.mm
+++ b/src/common/platform/posix/cocoa/i_video.mm
@@ -58,7 +58,7 @@
 #include "vulkan/system/vk_framebuffer.h"
 #endif
 #ifdef HAVE_SOFTPOLY
-#include "rendering/polyrenderer/backend/poly_framebuffer.h"
+#include "poly_framebuffer.h"
 #endif
 
 extern bool ToggleFullscreen;
diff --git a/src/common/platform/posix/sdl/sdlglvideo.cpp b/src/common/platform/posix/sdl/sdlglvideo.cpp
index 65133a792..ead04b73c 100644
--- a/src/common/platform/posix/sdl/sdlglvideo.cpp
+++ b/src/common/platform/posix/sdl/sdlglvideo.cpp
@@ -55,7 +55,7 @@
 #endif
 
 #ifdef HAVE_SOFTPOLY
-#include "rendering/polyrenderer/backend/poly_framebuffer.h"
+#include "poly_framebuffer.h"
 #endif
 
 // MACROS ------------------------------------------------------------------
diff --git a/src/common/platform/win32/win32polyvideo.h b/src/common/platform/win32/win32polyvideo.h
index 6d1648d0c..3a1c36242 100644
--- a/src/common/platform/win32/win32polyvideo.h
+++ b/src/common/platform/win32/win32polyvideo.h
@@ -2,7 +2,7 @@
 
 #include "win32basevideo.h"
 #include "c_cvars.h"
-#include "rendering/polyrenderer/backend/poly_framebuffer.h"
+#include "poly_framebuffer.h"
 
 EXTERN_CVAR(Bool, vid_fullscreen)
 
diff --git a/src/common/platform/win32/win32vulkanvideo.h b/src/common/platform/win32/win32vulkanvideo.h
index c34c41d72..2654597c7 100644
--- a/src/common/platform/win32/win32vulkanvideo.h
+++ b/src/common/platform/win32/win32vulkanvideo.h
@@ -2,7 +2,7 @@
 
 #include "win32basevideo.h"
 #include "c_cvars.h"
-#include "rendering/vulkan/system/vk_framebuffer.h"
+#include "vulkan/system/vk_framebuffer.h"
 
 
 EXTERN_CVAR(Bool, vid_fullscreen)
diff --git a/src/rendering/polyrenderer/backend/poly_buffers.cpp b/src/common/rendering/polyrenderer/backend/poly_buffers.cpp
similarity index 98%
rename from src/rendering/polyrenderer/backend/poly_buffers.cpp
rename to src/common/rendering/polyrenderer/backend/poly_buffers.cpp
index 32be46eff..599c9e088 100644
--- a/src/rendering/polyrenderer/backend/poly_buffers.cpp
+++ b/src/common/rendering/polyrenderer/backend/poly_buffers.cpp
@@ -23,7 +23,7 @@
 #include "poly_buffers.h"
 #include "poly_framebuffer.h"
 #include "poly_renderstate.h"
-#include "rendering/polyrenderer/drawers/poly_thread.h"
+#include "poly_thread.h"
 #include "engineerrors.h"
 
 PolyBuffer *PolyBuffer::First = nullptr;
diff --git a/src/rendering/polyrenderer/backend/poly_buffers.h b/src/common/rendering/polyrenderer/backend/poly_buffers.h
similarity index 100%
rename from src/rendering/polyrenderer/backend/poly_buffers.h
rename to src/common/rendering/polyrenderer/backend/poly_buffers.h
diff --git a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp b/src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp
similarity index 100%
rename from src/rendering/polyrenderer/backend/poly_framebuffer.cpp
rename to src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp
diff --git a/src/rendering/polyrenderer/backend/poly_framebuffer.h b/src/common/rendering/polyrenderer/backend/poly_framebuffer.h
similarity index 97%
rename from src/rendering/polyrenderer/backend/poly_framebuffer.h
rename to src/common/rendering/polyrenderer/backend/poly_framebuffer.h
index 8ba659272..38b8974f8 100644
--- a/src/rendering/polyrenderer/backend/poly_framebuffer.h
+++ b/src/common/rendering/polyrenderer/backend/poly_framebuffer.h
@@ -3,7 +3,7 @@
 #include "gl_sysfb.h"
 #include "r_memory.h"
 #include "r_thread.h"
-#include "rendering/polyrenderer/drawers/poly_triangle.h"
+#include "poly_triangle.h"
 
 struct FRenderViewpoint;
 class PolyDataBuffer;
diff --git a/src/rendering/polyrenderer/backend/poly_hwtexture.cpp b/src/common/rendering/polyrenderer/backend/poly_hwtexture.cpp
similarity index 100%
rename from src/rendering/polyrenderer/backend/poly_hwtexture.cpp
rename to src/common/rendering/polyrenderer/backend/poly_hwtexture.cpp
diff --git a/src/rendering/polyrenderer/backend/poly_hwtexture.h b/src/common/rendering/polyrenderer/backend/poly_hwtexture.h
similarity index 100%
rename from src/rendering/polyrenderer/backend/poly_hwtexture.h
rename to src/common/rendering/polyrenderer/backend/poly_hwtexture.h
diff --git a/src/rendering/polyrenderer/backend/poly_renderstate.cpp b/src/common/rendering/polyrenderer/backend/poly_renderstate.cpp
similarity index 100%
rename from src/rendering/polyrenderer/backend/poly_renderstate.cpp
rename to src/common/rendering/polyrenderer/backend/poly_renderstate.cpp
diff --git a/src/rendering/polyrenderer/backend/poly_renderstate.h b/src/common/rendering/polyrenderer/backend/poly_renderstate.h
similarity index 97%
rename from src/rendering/polyrenderer/backend/poly_renderstate.h
rename to src/common/rendering/polyrenderer/backend/poly_renderstate.h
index a99a9eab5..f539bc7c2 100644
--- a/src/rendering/polyrenderer/backend/poly_renderstate.h
+++ b/src/common/rendering/polyrenderer/backend/poly_renderstate.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "polyrenderer/backend/poly_buffers.h"
-#include "rendering/polyrenderer/drawers/poly_triangle.h"
+#include "poly_triangle.h"
 
 #include "name.h"
 
diff --git a/src/rendering/polyrenderer/drawers/poly_thread.cpp b/src/common/rendering/polyrenderer/drawers/poly_thread.cpp
similarity index 100%
rename from src/rendering/polyrenderer/drawers/poly_thread.cpp
rename to src/common/rendering/polyrenderer/drawers/poly_thread.cpp
diff --git a/src/rendering/polyrenderer/drawers/poly_thread.h b/src/common/rendering/polyrenderer/drawers/poly_thread.h
similarity index 100%
rename from src/rendering/polyrenderer/drawers/poly_thread.h
rename to src/common/rendering/polyrenderer/drawers/poly_thread.h
diff --git a/src/rendering/polyrenderer/drawers/poly_triangle.cpp b/src/common/rendering/polyrenderer/drawers/poly_triangle.cpp
similarity index 100%
rename from src/rendering/polyrenderer/drawers/poly_triangle.cpp
rename to src/common/rendering/polyrenderer/drawers/poly_triangle.cpp
diff --git a/src/rendering/polyrenderer/drawers/poly_triangle.h b/src/common/rendering/polyrenderer/drawers/poly_triangle.h
similarity index 100%
rename from src/rendering/polyrenderer/drawers/poly_triangle.h
rename to src/common/rendering/polyrenderer/drawers/poly_triangle.h
diff --git a/src/rendering/polyrenderer/drawers/poly_vertex_shader.h b/src/common/rendering/polyrenderer/drawers/poly_vertex_shader.h
similarity index 100%
rename from src/rendering/polyrenderer/drawers/poly_vertex_shader.h
rename to src/common/rendering/polyrenderer/drawers/poly_vertex_shader.h
diff --git a/src/rendering/polyrenderer/drawers/screen_blend.cpp b/src/common/rendering/polyrenderer/drawers/screen_blend.cpp
similarity index 100%
rename from src/rendering/polyrenderer/drawers/screen_blend.cpp
rename to src/common/rendering/polyrenderer/drawers/screen_blend.cpp
diff --git a/src/rendering/polyrenderer/drawers/screen_blend.h b/src/common/rendering/polyrenderer/drawers/screen_blend.h
similarity index 100%
rename from src/rendering/polyrenderer/drawers/screen_blend.h
rename to src/common/rendering/polyrenderer/drawers/screen_blend.h
diff --git a/src/rendering/polyrenderer/drawers/screen_scanline_setup.cpp b/src/common/rendering/polyrenderer/drawers/screen_scanline_setup.cpp
similarity index 100%
rename from src/rendering/polyrenderer/drawers/screen_scanline_setup.cpp
rename to src/common/rendering/polyrenderer/drawers/screen_scanline_setup.cpp
diff --git a/src/rendering/polyrenderer/drawers/screen_scanline_setup.h b/src/common/rendering/polyrenderer/drawers/screen_scanline_setup.h
similarity index 100%
rename from src/rendering/polyrenderer/drawers/screen_scanline_setup.h
rename to src/common/rendering/polyrenderer/drawers/screen_scanline_setup.h
diff --git a/src/rendering/polyrenderer/drawers/screen_shader.cpp b/src/common/rendering/polyrenderer/drawers/screen_shader.cpp
similarity index 100%
rename from src/rendering/polyrenderer/drawers/screen_shader.cpp
rename to src/common/rendering/polyrenderer/drawers/screen_shader.cpp
diff --git a/src/rendering/polyrenderer/drawers/screen_shader.h b/src/common/rendering/polyrenderer/drawers/screen_shader.h
similarity index 100%
rename from src/rendering/polyrenderer/drawers/screen_shader.h
rename to src/common/rendering/polyrenderer/drawers/screen_shader.h
diff --git a/src/rendering/polyrenderer/drawers/screen_triangle.cpp b/src/common/rendering/polyrenderer/drawers/screen_triangle.cpp
similarity index 100%
rename from src/rendering/polyrenderer/drawers/screen_triangle.cpp
rename to src/common/rendering/polyrenderer/drawers/screen_triangle.cpp
diff --git a/src/rendering/polyrenderer/drawers/screen_triangle.h b/src/common/rendering/polyrenderer/drawers/screen_triangle.h
similarity index 100%
rename from src/rendering/polyrenderer/drawers/screen_triangle.h
rename to src/common/rendering/polyrenderer/drawers/screen_triangle.h
diff --git a/src/rendering/polyrenderer/poly_all.cpp b/src/common/rendering/polyrenderer/poly_all.cpp
similarity index 82%
rename from src/rendering/polyrenderer/poly_all.cpp
rename to src/common/rendering/polyrenderer/poly_all.cpp
index 97fda79d1..64098aa8e 100644
--- a/src/rendering/polyrenderer/poly_all.cpp
+++ b/src/common/rendering/polyrenderer/poly_all.cpp
@@ -1,4 +1,3 @@
-#include "../swrenderer/textures/r_swtexture.h"
 #include "drawers/poly_triangle.cpp"
 #include "drawers/poly_thread.cpp"
 #include "drawers/screen_triangle.cpp"
diff --git a/src/rendering/swrenderer/drawers/r_thread.cpp b/src/common/rendering/r_thread.cpp
similarity index 98%
rename from src/rendering/swrenderer/drawers/r_thread.cpp
rename to src/common/rendering/r_thread.cpp
index e5c4f698c..0415bd40c 100644
--- a/src/rendering/swrenderer/drawers/r_thread.cpp
+++ b/src/common/rendering/r_thread.cpp
@@ -22,17 +22,13 @@
 
 #include <stddef.h>
 #include "templates.h"
-#include "doomdef.h"
 #include "i_system.h"
 #include "filesystem.h"
 #include "v_video.h"
-#include "doomstat.h"
-#include "st_stuff.h"
-#include "g_game.h"
-#include "g_level.h"
 #include "r_thread.h"
 #include "r_memory.h"
-#include "swrenderer/r_renderthread.h"
+#include "poly_thread.h"
+#include "printf.h"
 #include "polyrenderer/drawers/poly_triangle.h"
 #include <chrono>
 
diff --git a/src/rendering/vulkan/renderer/vk_postprocess.cpp b/src/common/rendering/vulkan/renderer/vk_postprocess.cpp
similarity index 99%
rename from src/rendering/vulkan/renderer/vk_postprocess.cpp
rename to src/common/rendering/vulkan/renderer/vk_postprocess.cpp
index b2b7d1ae4..c1c4148ca 100644
--- a/src/rendering/vulkan/renderer/vk_postprocess.cpp
+++ b/src/common/rendering/vulkan/renderer/vk_postprocess.cpp
@@ -36,6 +36,7 @@
 #include "flatvertices.h"
 #include "r_videoscale.h"
 #include "filesystem.h"
+#include "templates.h"
 
 EXTERN_CVAR(Int, gl_dither_bpc)
 
diff --git a/src/rendering/vulkan/renderer/vk_postprocess.h b/src/common/rendering/vulkan/renderer/vk_postprocess.h
similarity index 100%
rename from src/rendering/vulkan/renderer/vk_postprocess.h
rename to src/common/rendering/vulkan/renderer/vk_postprocess.h
diff --git a/src/rendering/vulkan/renderer/vk_renderbuffers.cpp b/src/common/rendering/vulkan/renderer/vk_renderbuffers.cpp
similarity index 100%
rename from src/rendering/vulkan/renderer/vk_renderbuffers.cpp
rename to src/common/rendering/vulkan/renderer/vk_renderbuffers.cpp
diff --git a/src/rendering/vulkan/renderer/vk_renderbuffers.h b/src/common/rendering/vulkan/renderer/vk_renderbuffers.h
similarity index 100%
rename from src/rendering/vulkan/renderer/vk_renderbuffers.h
rename to src/common/rendering/vulkan/renderer/vk_renderbuffers.h
diff --git a/src/rendering/vulkan/renderer/vk_renderpass.cpp b/src/common/rendering/vulkan/renderer/vk_renderpass.cpp
similarity index 100%
rename from src/rendering/vulkan/renderer/vk_renderpass.cpp
rename to src/common/rendering/vulkan/renderer/vk_renderpass.cpp
diff --git a/src/rendering/vulkan/renderer/vk_renderpass.h b/src/common/rendering/vulkan/renderer/vk_renderpass.h
similarity index 100%
rename from src/rendering/vulkan/renderer/vk_renderpass.h
rename to src/common/rendering/vulkan/renderer/vk_renderpass.h
diff --git a/src/rendering/vulkan/renderer/vk_renderstate.cpp b/src/common/rendering/vulkan/renderer/vk_renderstate.cpp
similarity index 100%
rename from src/rendering/vulkan/renderer/vk_renderstate.cpp
rename to src/common/rendering/vulkan/renderer/vk_renderstate.cpp
diff --git a/src/rendering/vulkan/renderer/vk_renderstate.h b/src/common/rendering/vulkan/renderer/vk_renderstate.h
similarity index 98%
rename from src/rendering/vulkan/renderer/vk_renderstate.h
rename to src/common/rendering/vulkan/renderer/vk_renderstate.h
index 71e467f19..d4df3a774 100644
--- a/src/rendering/vulkan/renderer/vk_renderstate.h
+++ b/src/common/rendering/vulkan/renderer/vk_renderstate.h
@@ -8,7 +8,6 @@
 
 #include "name.h"
 
-#include "hwrenderer/scene/hw_drawstructs.h"
 #include "hw_renderstate.h"
 #include "hw_material.h"
 
diff --git a/src/rendering/vulkan/renderer/vk_streambuffer.cpp b/src/common/rendering/vulkan/renderer/vk_streambuffer.cpp
similarity index 100%
rename from src/rendering/vulkan/renderer/vk_streambuffer.cpp
rename to src/common/rendering/vulkan/renderer/vk_streambuffer.cpp
diff --git a/src/rendering/vulkan/renderer/vk_streambuffer.h b/src/common/rendering/vulkan/renderer/vk_streambuffer.h
similarity index 100%
rename from src/rendering/vulkan/renderer/vk_streambuffer.h
rename to src/common/rendering/vulkan/renderer/vk_streambuffer.h
diff --git a/src/rendering/vulkan/shaders/vk_shader.cpp b/src/common/rendering/vulkan/shaders/vk_shader.cpp
similarity index 100%
rename from src/rendering/vulkan/shaders/vk_shader.cpp
rename to src/common/rendering/vulkan/shaders/vk_shader.cpp
diff --git a/src/rendering/vulkan/shaders/vk_shader.h b/src/common/rendering/vulkan/shaders/vk_shader.h
similarity index 100%
rename from src/rendering/vulkan/shaders/vk_shader.h
rename to src/common/rendering/vulkan/shaders/vk_shader.h
diff --git a/src/rendering/vulkan/system/vk_buffers.cpp b/src/common/rendering/vulkan/system/vk_buffers.cpp
similarity index 100%
rename from src/rendering/vulkan/system/vk_buffers.cpp
rename to src/common/rendering/vulkan/system/vk_buffers.cpp
diff --git a/src/rendering/vulkan/system/vk_buffers.h b/src/common/rendering/vulkan/system/vk_buffers.h
similarity index 100%
rename from src/rendering/vulkan/system/vk_buffers.h
rename to src/common/rendering/vulkan/system/vk_buffers.h
diff --git a/src/rendering/vulkan/system/vk_builders.cpp b/src/common/rendering/vulkan/system/vk_builders.cpp
similarity index 100%
rename from src/rendering/vulkan/system/vk_builders.cpp
rename to src/common/rendering/vulkan/system/vk_builders.cpp
diff --git a/src/rendering/vulkan/system/vk_builders.h b/src/common/rendering/vulkan/system/vk_builders.h
similarity index 100%
rename from src/rendering/vulkan/system/vk_builders.h
rename to src/common/rendering/vulkan/system/vk_builders.h
diff --git a/src/rendering/vulkan/system/vk_device.cpp b/src/common/rendering/vulkan/system/vk_device.cpp
similarity index 100%
rename from src/rendering/vulkan/system/vk_device.cpp
rename to src/common/rendering/vulkan/system/vk_device.cpp
diff --git a/src/rendering/vulkan/system/vk_device.h b/src/common/rendering/vulkan/system/vk_device.h
similarity index 100%
rename from src/rendering/vulkan/system/vk_device.h
rename to src/common/rendering/vulkan/system/vk_device.h
diff --git a/src/rendering/vulkan/system/vk_framebuffer.cpp b/src/common/rendering/vulkan/system/vk_framebuffer.cpp
similarity index 99%
rename from src/rendering/vulkan/system/vk_framebuffer.cpp
rename to src/common/rendering/vulkan/system/vk_framebuffer.cpp
index f750b4f39..8cc0046ea 100644
--- a/src/rendering/vulkan/system/vk_framebuffer.cpp
+++ b/src/common/rendering/vulkan/system/vk_framebuffer.cpp
@@ -27,7 +27,6 @@
 #include "templates.h"
 #include "r_videoscale.h"
 #include "i_time.h"
-#include "g_game.h"
 #include "v_text.h"
 #include "version.h"
 #include "v_draw.h"
@@ -35,7 +34,6 @@
 #include "hw_clock.h"
 #include "hw_vrmodes.h"
 #include "hw_cvars.h"
-#include "hw_models.h"
 #include "hw_skydome.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "flatvertices.h"
diff --git a/src/rendering/vulkan/system/vk_framebuffer.h b/src/common/rendering/vulkan/system/vk_framebuffer.h
similarity index 100%
rename from src/rendering/vulkan/system/vk_framebuffer.h
rename to src/common/rendering/vulkan/system/vk_framebuffer.h
diff --git a/src/rendering/vulkan/system/vk_objects.h b/src/common/rendering/vulkan/system/vk_objects.h
similarity index 100%
rename from src/rendering/vulkan/system/vk_objects.h
rename to src/common/rendering/vulkan/system/vk_objects.h
diff --git a/src/rendering/vulkan/system/vk_swapchain.cpp b/src/common/rendering/vulkan/system/vk_swapchain.cpp
similarity index 100%
rename from src/rendering/vulkan/system/vk_swapchain.cpp
rename to src/common/rendering/vulkan/system/vk_swapchain.cpp
diff --git a/src/rendering/vulkan/system/vk_swapchain.h b/src/common/rendering/vulkan/system/vk_swapchain.h
similarity index 100%
rename from src/rendering/vulkan/system/vk_swapchain.h
rename to src/common/rendering/vulkan/system/vk_swapchain.h
diff --git a/src/rendering/vulkan/textures/vk_hwtexture.cpp b/src/common/rendering/vulkan/textures/vk_hwtexture.cpp
similarity index 100%
rename from src/rendering/vulkan/textures/vk_hwtexture.cpp
rename to src/common/rendering/vulkan/textures/vk_hwtexture.cpp
diff --git a/src/rendering/vulkan/textures/vk_hwtexture.h b/src/common/rendering/vulkan/textures/vk_hwtexture.h
similarity index 100%
rename from src/rendering/vulkan/textures/vk_hwtexture.h
rename to src/common/rendering/vulkan/textures/vk_hwtexture.h
diff --git a/src/rendering/vulkan/textures/vk_imagetransition.cpp b/src/common/rendering/vulkan/textures/vk_imagetransition.cpp
similarity index 100%
rename from src/rendering/vulkan/textures/vk_imagetransition.cpp
rename to src/common/rendering/vulkan/textures/vk_imagetransition.cpp
diff --git a/src/rendering/vulkan/textures/vk_imagetransition.h b/src/common/rendering/vulkan/textures/vk_imagetransition.h
similarity index 100%
rename from src/rendering/vulkan/textures/vk_imagetransition.h
rename to src/common/rendering/vulkan/textures/vk_imagetransition.h
diff --git a/src/rendering/vulkan/textures/vk_samplers.cpp b/src/common/rendering/vulkan/textures/vk_samplers.cpp
similarity index 100%
rename from src/rendering/vulkan/textures/vk_samplers.cpp
rename to src/common/rendering/vulkan/textures/vk_samplers.cpp
diff --git a/src/rendering/vulkan/textures/vk_samplers.h b/src/common/rendering/vulkan/textures/vk_samplers.h
similarity index 90%
rename from src/rendering/vulkan/textures/vk_samplers.h
rename to src/common/rendering/vulkan/textures/vk_samplers.h
index 0a088cf74..cd1b8462f 100644
--- a/src/rendering/vulkan/textures/vk_samplers.h
+++ b/src/common/rendering/vulkan/textures/vk_samplers.h
@@ -1,7 +1,7 @@
 #ifndef __VK_SAMPLERS_H
 #define __VK_SAMPLERS_H
 
-#include "rendering/vulkan/system/vk_objects.h"
+#include "vulkan/system/vk_objects.h"
 
 class VulkanDevice;
 
diff --git a/src/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.cpp b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.cpp
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.cpp
rename to src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.cpp
diff --git a/src/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
rename to src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
diff --git a/src/rendering/vulkan/thirdparty/volk/volk.c b/src/common/rendering/vulkan/thirdparty/volk/volk.c
similarity index 100%
rename from src/rendering/vulkan/thirdparty/volk/volk.c
rename to src/common/rendering/vulkan/thirdparty/volk/volk.c
diff --git a/src/rendering/vulkan/thirdparty/volk/volk.h b/src/common/rendering/vulkan/thirdparty/volk/volk.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/volk/volk.h
rename to src/common/rendering/vulkan/thirdparty/volk/volk.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vk_icd.h b/src/common/rendering/vulkan/thirdparty/vulkan/vk_icd.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vk_icd.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vk_icd.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vk_layer.h b/src/common/rendering/vulkan/thirdparty/vulkan/vk_layer.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vk_layer.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vk_layer.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vk_layer_dispatch_table.h b/src/common/rendering/vulkan/thirdparty/vulkan/vk_layer_dispatch_table.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vk_layer_dispatch_table.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vk_layer_dispatch_table.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vk_platform.h b/src/common/rendering/vulkan/thirdparty/vulkan/vk_platform.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vk_platform.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vk_platform.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vk_sdk_platform.h b/src/common/rendering/vulkan/thirdparty/vulkan/vk_sdk_platform.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vk_sdk_platform.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vk_sdk_platform.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_android.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_android.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_android.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_android.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_core.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_core.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_core.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_core.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_fuchsia.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_fuchsia.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_fuchsia.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_fuchsia.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_ggp.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_ggp.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_ggp.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_ggp.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_ios.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_ios.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_ios.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_ios.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_macos.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_macos.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_macos.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_macos.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_metal.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_metal.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_metal.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_metal.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_mir.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_mir.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_mir.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_mir.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_vi.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_vi.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_vi.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_vi.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_wayland.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_wayland.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_wayland.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_wayland.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_win32.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_win32.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_win32.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_win32.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_xcb.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_xcb.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_xcb.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_xcb.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_xlib.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_xlib.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_xlib.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_xlib.h
diff --git a/src/rendering/vulkan/thirdparty/vulkan/vulkan_xlib_xrandr.h b/src/common/rendering/vulkan/thirdparty/vulkan/vulkan_xlib_xrandr.h
similarity index 100%
rename from src/rendering/vulkan/thirdparty/vulkan/vulkan_xlib_xrandr.h
rename to src/common/rendering/vulkan/thirdparty/vulkan/vulkan_xlib_xrandr.h
diff --git a/src/common/scripting/backend/codegen.cpp b/src/common/scripting/backend/codegen.cpp
index 8368220d3..1c9209c58 100644
--- a/src/common/scripting/backend/codegen.cpp
+++ b/src/common/scripting/backend/codegen.cpp
@@ -18,10 +18,6 @@
 **    documentation and/or other materials provided with the distribution.
 ** 3. The name of the author may not be used to endorse or promote products
 **    derived from this software without specific prior written permission.
-** 4. When not used as part of ZDoom or a ZDoom derivative, this code will be
-**    covered by the terms of the GNU General Public License as published by
-**    the Free Software Foundation; either version 2 of the License, or (at
-**    your option) any later version.
 **
 ** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 ** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/src/common/scripting/core/dynarrays.cpp b/src/common/scripting/core/dynarrays.cpp
index daedd60e6..16bb57ca8 100644
--- a/src/common/scripting/core/dynarrays.cpp
+++ b/src/common/scripting/core/dynarrays.cpp
@@ -18,10 +18,6 @@
 **    documentation and/or other materials provided with the distribution.
 ** 3. The name of the author may not be used to endorse or promote products
 **    derived from this software without specific prior written permission.
-** 4. When not used as part of ZDoom or a ZDoom derivative, this code will be
-**    covered by the terms of the GNU General Public License as published by
-**    the Free Software Foundation; either version 2 of the License, or (at
-**    your option) any later version.
 **
 ** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 ** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/src/common/scripting/core/imports.cpp b/src/common/scripting/core/imports.cpp
index 2b4d56756..0c277c964 100644
--- a/src/common/scripting/core/imports.cpp
+++ b/src/common/scripting/core/imports.cpp
@@ -19,10 +19,6 @@
 **    documentation and/or other materials provided with the distribution.
 ** 3. The name of the author may not be used to endorse or promote products
 **    derived from this software without specific prior written permission.
-** 4. When not used as part of ZDoom or a ZDoom derivative, this code will be
-**    covered by the terms of the GNU General Public License as published by
-**    the Free Software Foundation; either version 2 of the License, or (at
-**    your option) any later version.
 **
 ** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 ** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/src/common/scripting/interface/stringformat.cpp b/src/common/scripting/interface/stringformat.cpp
index b4d0bc4d8..8e0bf0c75 100644
--- a/src/common/scripting/interface/stringformat.cpp
+++ b/src/common/scripting/interface/stringformat.cpp
@@ -19,10 +19,6 @@
 **    documentation and/or other materials provided with the distribution.
 ** 3. The name of the author may not be used to endorse or promote products
 **    derived from this software without specific prior written permission.
-** 4. When not used as part of ZDoom or a ZDoom derivative, this code will be
-**    covered by the terms of the GNU General Public License as published by
-**    the Free Software Foundation; either version 2 of the License, or (at
-**    your option) any later version.
 **
 ** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 ** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/src/rendering/swrenderer/r_all.cpp b/src/rendering/swrenderer/r_all.cpp
index a15525ecd..91142a1df 100644
--- a/src/rendering/swrenderer/r_all.cpp
+++ b/src/rendering/swrenderer/r_all.cpp
@@ -5,7 +5,6 @@
 #include "drawers/r_draw.cpp"
 #include "drawers/r_draw_pal.cpp"
 #include "drawers/r_draw_rgba.cpp"
-#include "drawers/r_thread.cpp"
 #include "line/r_fogboundary.cpp"
 #include "line/r_line.cpp"
 #include "line/r_farclip_line.cpp"