diff --git a/src/doomdef.h b/src/doomdef.h
index fe29374f3..78208a25c 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -208,6 +208,7 @@ extern char logfilename[1024];
 #define MAXGAMEPADS (MAXSPLITSCREENPLAYERS * 2) // Number of gamepads we'll be allowing
 
 #define MAXSKINS UINT8_MAX
+#define SKINNAMESIZE 16	// Moved from r_skins.h as including that particular header causes issues later down the line.
 
 #define COLORRAMPSIZE 16
 #define MAXCOLORNAME 32
diff --git a/src/k_follower.h b/src/k_follower.h
index 363b272bc..5f457fe90 100644
--- a/src/k_follower.h
+++ b/src/k_follower.h
@@ -15,7 +15,6 @@
 
 #include "doomdef.h"
 #include "doomstat.h"
-#include "r_skins.h"
 
 #define FOLLOWERCOLOR_MATCH UINT16_MAX
 #define FOLLOWERCOLOR_OPPOSITE (UINT16_MAX-1)
diff --git a/src/r_skins.h b/src/r_skins.h
index cffd54da8..ded45a71f 100644
--- a/src/r_skins.h
+++ b/src/r_skins.h
@@ -22,7 +22,6 @@
 #include "r_defs.h" // spritedef_t
 
 /// Defaults
-#define SKINNAMESIZE 16
 #define SKINRIVALS 3
 // should be all lowercase!! S_SKIN processing does a strlwr
 #define DEFAULTSKIN "eggman"