diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a38f58e168..d94f0877dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -942,7 +942,6 @@ set (PCH_SOURCES
 	rendering/hwrenderer/data/hw_vertexbuilder.cpp
 	rendering/hwrenderer/dynlights/doom_aabbtree.cpp
 	rendering/hwrenderer/models/hw_models.cpp
-	rendering/hwrenderer/scene/hw_skydome.cpp
 	rendering/hwrenderer/scene/hw_drawlistadd.cpp
 	rendering/hwrenderer/scene/hw_renderstate.cpp
 	rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp
@@ -1127,6 +1126,7 @@ set (PCH_SOURCES
 	common/rendering/v_framebuffer.cpp
 	common/rendering/v_video.cpp
 	common/rendering/r_videoscale.cpp
+	common/rendering/hwrenderer/data/hw_skydome.cpp
 	common/rendering/hwrenderer/data/flatvertices.cpp
 	common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
 	common/rendering/hwrenderer/data/hw_modelvertexbuffer.cpp
diff --git a/src/rendering/hwrenderer/scene/hw_skydome.cpp b/src/common/rendering/hwrenderer/data/hw_skydome.cpp
similarity index 99%
rename from src/rendering/hwrenderer/scene/hw_skydome.cpp
rename to src/common/rendering/hwrenderer/data/hw_skydome.cpp
index a2deb4998d..7e882acd07 100644
--- a/src/rendering/hwrenderer/scene/hw_skydome.cpp
+++ b/src/common/rendering/hwrenderer/data/hw_skydome.cpp
@@ -60,7 +60,7 @@
 #include "hw_material.h"
 #include "hw_skydome.h"
 #include "hw_renderstate.h"
-#include "hw_drawinfo.h"
+#include "v_video.h"
 #include "hwrenderer/data/buffers.h"
 
 // 57 world units roughly represent one sky texel for the glTranslate call.
diff --git a/src/rendering/hwrenderer/scene/hw_skydome.h b/src/common/rendering/hwrenderer/data/hw_skydome.h
similarity index 100%
rename from src/rendering/hwrenderer/scene/hw_skydome.h
rename to src/common/rendering/hwrenderer/data/hw_skydome.h
diff --git a/src/rendering/gl/renderer/gl_renderer.cpp b/src/rendering/gl/renderer/gl_renderer.cpp
index 15e151739c..2f2f5ebaa6 100644
--- a/src/rendering/gl/renderer/gl_renderer.cpp
+++ b/src/rendering/gl/renderer/gl_renderer.cpp
@@ -52,7 +52,7 @@
 #include "gl_shaderprogram.h"
 #include "hw_vrmodes.h"
 #include "flatvertices.h"
-#include "hwrenderer/scene/hw_skydome.h"
+#include "hw_skydome.h"
 #include "hwrenderer/scene/hw_fakeflat.h"
 #include "gl_samplers.h"
 #include "hw_lightbuffer.h"
diff --git a/src/rendering/gl/system/gl_framebuffer.cpp b/src/rendering/gl/system/gl_framebuffer.cpp
index 37e7478384..2cff171e0f 100644
--- a/src/rendering/gl/system/gl_framebuffer.cpp
+++ b/src/rendering/gl/system/gl_framebuffer.cpp
@@ -47,7 +47,7 @@
 #include "hwrenderer/utility/hw_clock.h"
 #include "hw_vrmodes.h"
 #include "hwrenderer/models/hw_models.h"
-#include "hwrenderer/scene/hw_skydome.h"
+#include "hw_skydome.h"
 #include "hwrenderer/scene/hw_fakeflat.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hw_lightbuffer.h"
diff --git a/src/rendering/hwrenderer/scene/hw_skyportal.cpp b/src/rendering/hwrenderer/scene/hw_skyportal.cpp
index 58848a30f7..f02ce5a29c 100644
--- a/src/rendering/hwrenderer/scene/hw_skyportal.cpp
+++ b/src/rendering/hwrenderer/scene/hw_skyportal.cpp
@@ -26,7 +26,7 @@
 #include "r_state.h"
 #include "r_utility.h"
 #include "g_levellocals.h"
-#include "hwrenderer/scene/hw_skydome.h"
+#include "hw_skydome.h"
 #include "hwrenderer/scene/hw_portal.h"
 #include "hw_renderstate.h"
 #include "skyboxtexture.h"
diff --git a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
index 487cc4160d..5693c2cff9 100644
--- a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
+++ b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
@@ -34,7 +34,7 @@
 #include "hw_vrmodes.h"
 #include "hw_cvars.h"
 #include "hwrenderer/models/hw_models.h"
-#include "hwrenderer/scene/hw_skydome.h"
+#include "hw_skydome.h"
 #include "hwrenderer/scene/hw_fakeflat.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_portal.h"
diff --git a/src/rendering/polyrenderer/backend/poly_renderstate.cpp b/src/rendering/polyrenderer/backend/poly_renderstate.cpp
index 5f4cf463d4..830a344e7d 100644
--- a/src/rendering/polyrenderer/backend/poly_renderstate.cpp
+++ b/src/rendering/polyrenderer/backend/poly_renderstate.cpp
@@ -26,7 +26,7 @@
 #include "templates.h"
 #include "doomstat.h"
 #include "r_data/colormaps.h"
-#include "hwrenderer/scene/hw_skydome.h"
+#include "hw_skydome.h"
 #include "hw_viewpointuniforms.h"
 #include "hw_lightbuffer.h"
 #include "hw_cvars.h"
diff --git a/src/rendering/vulkan/renderer/vk_renderstate.cpp b/src/rendering/vulkan/renderer/vk_renderstate.cpp
index 8a0223552a..a3ae824f08 100644
--- a/src/rendering/vulkan/renderer/vk_renderstate.cpp
+++ b/src/rendering/vulkan/renderer/vk_renderstate.cpp
@@ -29,7 +29,7 @@
 #include "templates.h"
 #include "doomstat.h"
 #include "r_data/colormaps.h"
-#include "hwrenderer/scene/hw_skydome.h"
+#include "hw_skydome.h"
 #include "hw_viewpointuniforms.h"
 #include "hw_lightbuffer.h"
 #include "hw_cvars.h"
diff --git a/src/rendering/vulkan/system/vk_framebuffer.cpp b/src/rendering/vulkan/system/vk_framebuffer.cpp
index 27a53ed956..f7af67ea19 100644
--- a/src/rendering/vulkan/system/vk_framebuffer.cpp
+++ b/src/rendering/vulkan/system/vk_framebuffer.cpp
@@ -37,7 +37,7 @@
 #include "hw_vrmodes.h"
 #include "hw_cvars.h"
 #include "hwrenderer/models/hw_models.h"
-#include "hwrenderer/scene/hw_skydome.h"
+#include "hw_skydome.h"
 #include "hwrenderer/scene/hw_fakeflat.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_portal.h"