diff --git a/src/swrenderer/scene/r_things.h b/src/swrenderer/scene/r_things.h
index e972f62fd0..1b3186acb3 100644
--- a/src/swrenderer/scene/r_things.h
+++ b/src/swrenderer/scene/r_things.h
@@ -29,9 +29,6 @@
 struct particle_t;
 struct FVoxel;
 
-#define MINZ			double((2048*4) / double(1 << 20))
-#define BASEXCENTER		(160)
-#define BASEYCENTER 	(100)
 
 EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor);
 
@@ -47,8 +44,6 @@ void R_DrawSprites ();
 void R_ClearSprites ();
 void R_DrawMasked ();
 
-enum { DVF_OFFSCREEN = 1, DVF_SPANSONLY = 2, DVF_MIRRORED = 4 };
-
 void R_ClipVisSprite (vissprite_t *vis, int xl, int xh);
 
 extern bool DrewAVoxel;
diff --git a/src/swrenderer/things/r_playersprite.h b/src/swrenderer/things/r_playersprite.h
index a96b916661..c1a4b53b19 100644
--- a/src/swrenderer/things/r_playersprite.h
+++ b/src/swrenderer/things/r_playersprite.h
@@ -15,6 +15,9 @@
 
 #include "r_visiblesprite.h"
 
+#define BASEXCENTER (160)
+#define BASEYCENTER (100)
+
 namespace swrenderer
 {
 	void R_SetupPlayerSpriteScale();
diff --git a/src/swrenderer/things/r_visiblesprite.h b/src/swrenderer/things/r_visiblesprite.h
index 96eda392cd..db40aa1cdd 100644
--- a/src/swrenderer/things/r_visiblesprite.h
+++ b/src/swrenderer/things/r_visiblesprite.h
@@ -16,6 +16,8 @@
 #include "swrenderer/line/r_line.h"
 #include "swrenderer/scene/r_bsp.h"
 
+#define MINZ double((2048*4) / double(1 << 20))
+
 struct particle_t;
 struct FVoxel;
 
diff --git a/src/swrenderer/things/r_voxel.h b/src/swrenderer/things/r_voxel.h
index e3daa0d15a..7d566394d5 100644
--- a/src/swrenderer/things/r_voxel.h
+++ b/src/swrenderer/things/r_voxel.h
@@ -29,6 +29,8 @@ namespace swrenderer
 {
 	struct vissprite_t;
 
+	enum { DVF_OFFSCREEN = 1, DVF_SPANSONLY = 2, DVF_MIRRORED = 4 };
+
 	void R_DrawVisVoxel(vissprite_t *sprite, int minZ, int maxZ, short *cliptop, short *clipbottom);
 	void R_FillBox(DVector3 origin, double extentX, double extentY, int color, short *cliptop, short *clipbottom, bool viewspace, bool pixelstretch);
 	kvxslab_t *R_GetSlabStart(const FVoxelMipLevel &mip, int x, int y);