diff --git a/src/swrenderer/scene/r_bsp.cpp b/src/swrenderer/scene/r_bsp.cpp
index 2b3054e4f..d154e3968 100644
--- a/src/swrenderer/scene/r_bsp.cpp
+++ b/src/swrenderer/scene/r_bsp.cpp
@@ -38,7 +38,7 @@
 #include "r_things.h"
 #include "r_3dfloors.h"
 #include "r_clip_segment.h"
-#include "r_portal_segment.h"
+#include "r_portal.h"
 #include "a_sharedglobal.h"
 #include "g_level.h"
 #include "p_effect.h"
diff --git a/src/swrenderer/scene/r_plane.cpp b/src/swrenderer/scene/r_plane.cpp
index b13af8b76..3eb619228 100644
--- a/src/swrenderer/scene/r_plane.cpp
+++ b/src/swrenderer/scene/r_plane.cpp
@@ -64,7 +64,7 @@
 #include "r_walldraw.h"
 #include "r_clip_segment.h"
 #include "r_draw_segment.h"
-#include "r_portal_segment.h"
+#include "r_portal.h"
 #include "swrenderer\r_memory.h"
 
 #ifdef _MSC_VER
diff --git a/src/swrenderer/scene/r_portal.cpp b/src/swrenderer/scene/r_portal.cpp
index ccd27236f..638f99a84 100644
--- a/src/swrenderer/scene/r_portal.cpp
+++ b/src/swrenderer/scene/r_portal.cpp
@@ -49,6 +49,10 @@ CVAR(Bool, r_skyboxes, true, 0)
 
 namespace swrenderer
 {
+	PortalDrawseg *CurrentPortal = nullptr;
+	int CurrentPortalUniq = 0;
+	bool CurrentPortalInSkybox = false;
+
 	namespace
 	{
 		int numskyboxes; // For ADD_STAT(skyboxes)
diff --git a/src/swrenderer/scene/r_portal.h b/src/swrenderer/scene/r_portal.h
index d7c7f948a..f13c760b3 100644
--- a/src/swrenderer/scene/r_portal.h
+++ b/src/swrenderer/scene/r_portal.h
@@ -5,6 +5,10 @@
 
 namespace swrenderer
 {
+	extern PortalDrawseg* CurrentPortal;
+	extern int CurrentPortalUniq;
+	extern bool CurrentPortalInSkybox;
+
 	void R_DrawPortals();
 	void R_DrawWallPortals();
 	void R_EnterPortal(PortalDrawseg* pds, int depth);
diff --git a/src/swrenderer/scene/r_portal_segment.cpp b/src/swrenderer/scene/r_portal_segment.cpp
index 5e698f0c7..e81757670 100644
--- a/src/swrenderer/scene/r_portal_segment.cpp
+++ b/src/swrenderer/scene/r_portal_segment.cpp
@@ -26,9 +26,5 @@
 
 namespace swrenderer
 {
-	PortalDrawseg *CurrentPortal = nullptr;
-	int CurrentPortalUniq = 0;
-	bool CurrentPortalInSkybox = false;
-	
 	TArray<PortalDrawseg> WallPortals(1000);	// note: this array needs to go away as reallocation can cause crashes.
 }
diff --git a/src/swrenderer/scene/r_portal_segment.h b/src/swrenderer/scene/r_portal_segment.h
index a1e341df1..dc4f50152 100644
--- a/src/swrenderer/scene/r_portal_segment.h
+++ b/src/swrenderer/scene/r_portal_segment.h
@@ -19,8 +19,5 @@ namespace swrenderer
 		bool mirror; // true if this is a mirror (src should equal dst)
 	};
 	
-	extern PortalDrawseg* CurrentPortal;
-	extern int CurrentPortalUniq;
-	extern bool CurrentPortalInSkybox;
 	extern TArray<PortalDrawseg> WallPortals;
 }
diff --git a/src/swrenderer/scene/r_segs.cpp b/src/swrenderer/scene/r_segs.cpp
index 079700d88..0ae558e0f 100644
--- a/src/swrenderer/scene/r_segs.cpp
+++ b/src/swrenderer/scene/r_segs.cpp
@@ -50,7 +50,7 @@
 #include "r_data/colormaps.h"
 #include "r_walldraw.h"
 #include "r_draw_segment.h"
-#include "r_portal_segment.h"
+#include "r_portal.h"
 #include "swrenderer\r_memory.h"
 
 #define WALLYREPEAT 8
diff --git a/src/swrenderer/scene/r_things.cpp b/src/swrenderer/scene/r_things.cpp
index 3a6e7dff1..246fbb415 100644
--- a/src/swrenderer/scene/r_things.cpp
+++ b/src/swrenderer/scene/r_things.cpp
@@ -69,7 +69,7 @@
 #include "p_maputl.h"
 #include "r_voxel.h"
 #include "r_draw_segment.h"
-#include "r_portal_segment.h"
+#include "r_portal.h"
 #include "swrenderer\r_memory.h"
 
 EXTERN_CVAR(Bool, st_scale)