diff --git a/src/doomstat.h b/src/doomstat.h
index b5c0ea4f7..ef5ed8a82 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -113,6 +113,23 @@ extern preciptype_t curWeather;
 /** Time attack information, currently a very small structure.
   */
 
+struct skinrecord_t
+{
+	UINT32 wins;
+};
+
+struct unloaded_skin_t
+{
+	char name[SKINNAMESIZE+1];
+	UINT32 namehash;
+
+	skinrecord_t records;
+
+	unloaded_skin_t *next;
+};
+
+extern unloaded_skin_t *unloadedskins;
+
 // mapvisited is now a set of flags that says what we've done in the map.
 #define MV_VISITED      	(1)
 #define MV_BEATEN       	(1<<1)
diff --git a/src/r_skins.h b/src/r_skins.h
index ec393b744..9a1c45ce6 100644
--- a/src/r_skins.h
+++ b/src/r_skins.h
@@ -34,11 +34,6 @@ extern "C" {
 #define DEFAULTSKIN3 "sonic" // third player
 #define DEFAULTSKIN4 "knuckles" // fourth player
 
-struct skinrecord_t
-{
-	UINT32 wins;
-};
-
 /// The skin_t struct
 struct skin_t
 {
@@ -76,18 +71,6 @@ struct skin_t
 	spriteinfo_t sprinfo[NUMPLAYERSPRITES*2];
 };
 
-struct unloaded_skin_t
-{
-	char name[SKINNAMESIZE+1];
-	UINT32 namehash;
-
-	skinrecord_t records;
-
-	unloaded_skin_t *next;
-};
-
-extern unloaded_skin_t *unloadedskins;
-
 enum facepatches {
 	FACE_RANK = 0,
 	FACE_WANTED,
diff --git a/src/typedef.h b/src/typedef.h
index e8567f3ed..771313e1c 100644
--- a/src/typedef.h
+++ b/src/typedef.h
@@ -113,6 +113,8 @@ TYPEDEF (skincolor_t);
 
 // doomstat.h
 TYPEDEF (precipprops_t);
+TYPEDEF (skinrecord_t);
+TYPEDEF (unloaded_skin_t);
 TYPEDEF (recorddata_t);
 TYPEDEF (cupwindata_t);
 TYPEDEF (scene_t);
@@ -385,9 +387,7 @@ TYPEDEF (visffloor_t);
 TYPEDEF (portal_t);
 
 // r_skins.h
-TYPEDEF (skinrecord_t);
 TYPEDEF (skin_t);
-TYPEDEF (unloaded_skin_t);
 
 // r_splats.h
 TYPEDEF (floorsplat_t);