diff --git a/src/swrenderer/line/r_line.cpp b/src/swrenderer/line/r_line.cpp
index 60107f2a1a..b2a1a3fa2e 100644
--- a/src/swrenderer/line/r_line.cpp
+++ b/src/swrenderer/line/r_line.cpp
@@ -25,6 +25,10 @@
 
 namespace swrenderer
 {
+	seg_t *curline;
+	side_t *sidedef;
+	line_t *linedef;
+
 	FWallCoords WallC;
 	FWallTmapVals WallT;
 
diff --git a/src/swrenderer/line/r_line.h b/src/swrenderer/line/r_line.h
index 345b5e9942..d4be544936 100644
--- a/src/swrenderer/line/r_line.h
+++ b/src/swrenderer/line/r_line.h
@@ -23,6 +23,10 @@ namespace swrenderer
 		void InitFromLine(const DVector2 &left, const DVector2 &right);
 	};
 
+	extern seg_t *curline;
+	extern side_t *sidedef;
+	extern line_t *linedef;
+
 	extern FWallCoords WallC;
 	extern FWallTmapVals WallT;
 
diff --git a/src/swrenderer/scene/r_bsp.cpp b/src/swrenderer/scene/r_bsp.cpp
index 111f09c1c9..6c0c1be1cc 100644
--- a/src/swrenderer/scene/r_bsp.cpp
+++ b/src/swrenderer/scene/r_bsp.cpp
@@ -62,9 +62,6 @@ namespace swrenderer
 {
 	using namespace drawerargs;
 
-seg_t*			curline;
-side_t* 		sidedef;
-line_t* 		linedef;
 sector_t*		frontsector;
 sector_t*		backsector;
 
diff --git a/src/swrenderer/scene/r_bsp.h b/src/swrenderer/scene/r_bsp.h
index 3ab94b2882..7530718b84 100644
--- a/src/swrenderer/scene/r_bsp.h
+++ b/src/swrenderer/scene/r_bsp.h
@@ -46,9 +46,6 @@ enum
 
 extern subsector_t *InSubsector;
 
-extern seg_t*		curline;
-extern side_t*		sidedef;
-extern line_t*		linedef;
 extern sector_t*	frontsector;
 extern sector_t*	backsector;