diff --git a/engine/common/com_mesh.c b/engine/common/com_mesh.c
index 38ad02dc..f5ee1915 100644
--- a/engine/common/com_mesh.c
+++ b/engine/common/com_mesh.c
@@ -1463,7 +1463,6 @@ static void Alias_BuildSkeletalVPositionsPose(float *xyzout, skeltype_t bonetype
 #ifndef SERVERONLY
 #ifdef GLQUAKE
 #include "glquake.h"
-#endif
 static void Alias_DrawSkeletalBones(galiasbone_t *bones, float *bonepose, int bonecount, int basebone)
 {
 #ifndef GLQUAKE
@@ -1593,6 +1592,7 @@ static void Alias_DrawSkeletalBones(galiasbone_t *bones, float *bonepose, int bo
 	}
 #endif
 }
+#endif
 #endif	//!SERVERONLY
 #endif	//SKELETALMODELS
 
diff --git a/engine/d3d/vid_d3d.c b/engine/d3d/vid_d3d.c
index f6d0c709..69cae858 100644
--- a/engine/d3d/vid_d3d.c
+++ b/engine/d3d/vid_d3d.c
@@ -1108,6 +1108,7 @@ static void	(D3D9_R_Init)					(void)
 }
 static void	(D3D9_R_DeInit)					(void)
 {
+	R_GAliasFlushSkinCache(true);
 	Surf_DeInit();
 	Shader_Shutdown();
 	D3D9_Image_Shutdown();
diff --git a/engine/d3d/vid_d3d11.c b/engine/d3d/vid_d3d11.c
index 869e9bff..4feceb51 100644
--- a/engine/d3d/vid_d3d11.c
+++ b/engine/d3d/vid_d3d11.c
@@ -1296,7 +1296,7 @@ static void	(D3D11_R_Init)					(void)
 }
 static void	(D3D11_R_DeInit)					(void)
 {
-	GL_GAliasFlushSkinCache();
+	R_GAliasFlushSkinCache(true);
 	Surf_DeInit();
 	Shader_Shutdown();
 	D3D11_Image_Shutdown();