diff --git a/source/qw_client.dsp b/source/qw_client.dsp
index 4e0ed27..f8ca325 100644
--- a/source/qw_client.dsp
+++ b/source/qw_client.dsp
@@ -194,25 +194,6 @@ SOURCE=.\cl_misc.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\cl_model.c
-
-!IF  "$(CFG)" == "qw_client - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "qw_client - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "qw_client - Win32 GLDebug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "qw_client - Win32 GLRelease"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\cl_parse.c
 # End Source File
 # Begin Source File
@@ -565,7 +546,64 @@ SOURCE=.\gl_mesh.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\gl_model.c
+SOURCE=.\gl_model_alias.c
+
+!IF  "$(CFG)" == "qw_client - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLDebug"
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLRelease"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\gl_model_brush.c
+
+!IF  "$(CFG)" == "qw_client - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLDebug"
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLRelease"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\gl_model_fullbright.c
+
+!IF  "$(CFG)" == "qw_client - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLDebug"
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLRelease"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\gl_model_sprite.c
 
 !IF  "$(CFG)" == "qw_client - Win32 Release"
 
@@ -822,21 +860,18 @@ SOURCE=.\menu.c
 # Begin Source File
 
 SOURCE=.\model.c
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "qw_client - Win32 Release"
+SOURCE=.\model_alias.c
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "qw_client - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "qw_client - Win32 GLDebug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "qw_client - Win32 GLRelease"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
+SOURCE=.\model_brush.c
+# End Source File
+# Begin Source File
 
+SOURCE=.\model_sprite.c
 # End Source File
 # Begin Source File
 
@@ -1197,6 +1232,63 @@ SOURCE=.\snd_win.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\sw_model_alias.c
+
+!IF  "$(CFG)" == "qw_client - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLDebug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLRelease"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sw_model_brush.c
+
+!IF  "$(CFG)" == "qw_client - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLDebug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLRelease"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sw_model_sprite.c
+
+!IF  "$(CFG)" == "qw_client - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLDebug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "qw_client - Win32 GLRelease"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\sw_view.c
 
 !IF  "$(CFG)" == "qw_client - Win32 Release"
diff --git a/source/qw_server.dsp b/source/qw_server.dsp
index 89942c2..53da8e1 100644
--- a/source/qw_server.dsp
+++ b/source/qw_server.dsp
@@ -139,6 +139,10 @@ SOURCE=.\model.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\model_brush.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\msg.c
 # End Source File
 # Begin Source File
diff --git a/source/sw_model_alias.c b/source/sw_model_alias.c
index 6a2f552..ce5f1ca 100644
--- a/source/sw_model_alias.c
+++ b/source/sw_model_alias.c
@@ -64,9 +64,9 @@ extern int                     posenum;
 
 void *Mod_LoadSkin (byte *skin, int skinsize, int *pskinindex, int snum, int gnum)
 {
-	byte	*pskin;
-	ushort	*pusskin;
-	int		i;
+	byte			*pskin;
+	unsigned short	*pusskin;
+	int				i;
 
 	pskin = Hunk_AllocName (skinsize * r_pixbytes, loadname);
 	*pskinindex = (byte *)pskin - (byte *)pheader;
@@ -76,7 +76,7 @@ void *Mod_LoadSkin (byte *skin, int skinsize, int *pskinindex, int snum, int gnu
 		memcpy (pskin, skin, skinsize);
 		break;
 	case 2:
-		pusskin = (ushort*)skin;
+		pusskin = (unsigned short*)skin;
 		for (i=0; i<skinsize; i++)
 			pusskin[i] = d_8to16table[skin[i]];
 		break;