diff --git a/include/QF/progs.h b/include/QF/progs.h
index 0dd2a5be8..0cd31a021 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -26,8 +26,8 @@
 	$Id$
 */
 
-#ifndef _PROGS_H
-#define _PROGS_H
+#ifndef __QF_progs_h
+#define __QF_progs_h
 
 #include "QF/link.h"
 #include "QF/vfile.h"
@@ -291,4 +291,4 @@ struct progs_s {
 	} fields;
 };
 
-#endif // _PROGS_H
+#endif//__QF_progs_h
diff --git a/libs/video/renderer/sw32/sw32_skin.c b/libs/video/renderer/sw32/sw32_skin.c
index 7d3ab8bcd..c1bb79fac 100644
--- a/libs/video/renderer/sw32/sw32_skin.c
+++ b/libs/video/renderer/sw32/sw32_skin.c
@@ -49,107 +49,105 @@ void
 Skin_Set_Translate (int top, int bottom, void *_dest)
 {
 	int         i, j;
-	byte *dest2; // FIXME: bleargh, this needs cleaning up
 
 	top = bound (0, top, 13) * 16;
 	bottom = bound (0, bottom, 13) * 16;
 
 	switch(r_pixbytes) {
-	case 1:
-	{
-		byte *source;
-		byte *dest = (byte *) _dest;
+		case 1:
+			{
+				byte *source;
+				byte *dest = (byte *) _dest;
 
-		source = vid.colormap8;
-		memcpy (dest, vid.colormap8, VID_GRADES * 256);
+				source = vid.colormap8;
+				memcpy (dest, vid.colormap8, VID_GRADES * 256);
 
-		for (i = 0; i < VID_GRADES; i++, dest += 256, source += 256) {
-			if (top < 128)				// the artists made some backwards
-										// ranges.  sigh.
-				memcpy (dest + TOP_RANGE, source + top, 16);
-			else
-				for (j = 0; j < 16; j++)
-					dest[TOP_RANGE + j] = source[top + 15 - j];
+				for (i = 0; i < VID_GRADES; i++, dest += 256, source += 256) {
+					if (top < 128)	// the artists made some backwards ranges.
+						memcpy (dest + TOP_RANGE, source + top, 16);
+					else
+						for (j = 0; j < 16; j++)
+							dest[TOP_RANGE + j] = source[top + 15 - j];
 
-			if (bottom < 128)
-				memcpy (dest + BOTTOM_RANGE, source + bottom, 16);
-			else
-				for (j = 0; j < 16; j++)
-					dest[BOTTOM_RANGE + j] = source[bottom + 15 - j];
-		}
+					if (bottom < 128)
+						memcpy (dest + BOTTOM_RANGE, source + bottom, 16);
+					else
+						for (j = 0; j < 16; j++)
+							dest[BOTTOM_RANGE + j] = source[bottom + 15 - j];
+				}
+			}
+			break;
+		case 2:
+			{
+				unsigned short *source;
+				unsigned short *dest = (unsigned short *) _dest;
+
+				source = vid.colormap16;
+				memcpy (dest, vid.colormap16, 2 * VID_GRADES * 256);
+
+				for (i = 0; i < VID_GRADES; i++, dest += 256, source += 256) {
+					if (top < 128)
+					{
+						for (j = 0; j < 16; j++)
+							dest[TOP_RANGE + j] = source[top + j];
+					}
+					else
+					{
+						for (j = 0; j < 16; j++)
+							dest[TOP_RANGE + j] = source[top + 15 - j];
+					}
+
+					if (bottom < 128)
+					{
+						for (j = 0; j < 16; j++)
+							dest[BOTTOM_RANGE + j] = source[bottom + j];
+					}
+					else
+					{
+						for (j = 0; j < 16; j++)
+							dest[BOTTOM_RANGE + j] = source[bottom + 15 - j];
+					}
+				}
+			}
+			break;
+		case 4:
+			{
+				unsigned int *source;
+				unsigned int *dest = (unsigned int *) _dest;
+
+				source = vid.colormap32;
+				memcpy (dest, vid.colormap32, 4 * VID_GRADES * 256);
+
+				for (i = 0; i < VID_GRADES; i++, dest += 256, source += 256) {
+					if (top < 128)
+					{
+						for (j = 0; j < 16; j++)
+							dest[TOP_RANGE + j] = source[top + j];
+					}
+					else
+					{
+						for (j = 0; j < 16; j++)
+							dest[TOP_RANGE + j] = source[top + 15 - j];
+					}
+
+					if (bottom < 128)
+					{
+						for (j = 0; j < 16; j++)
+							dest[BOTTOM_RANGE + j] = source[bottom + j];
+					}
+					else
+					{
+						for (j = 0; j < 16; j++)
+							dest[BOTTOM_RANGE + j] = source[bottom + 15 - j];
+					}
+				}
+			}
+			break;
+		default:
+			Sys_Error("Skin_Set_Translate: unsupported r_pixbytes %i\n",
+					  r_pixbytes);
 	}
-	break;
-	case 2:
-	{
-		unsigned short *source;
-		unsigned short *dest = (unsigned short *) _dest;
-
-		source = vid.colormap16;
-		memcpy (dest, vid.colormap16, 2 * VID_GRADES * 256);
-
-		for (i = 0; i < VID_GRADES; i++, dest += 256, source += 256) {
-			if (top < 128)
-			{
-				for (j = 0; j < 16; j++)
-					dest[TOP_RANGE + j] = source[top + j];
-			}
-			else
-			{
-				for (j = 0; j < 16; j++)
-					dest[TOP_RANGE + j] = source[top + 15 - j];
-			}
-
-			if (bottom < 128)
-			{
-				for (j = 0; j < 16; j++)
-					dest[BOTTOM_RANGE + j] = source[bottom + j];
-			}
-			else
-			{
-				for (j = 0; j < 16; j++)
-					dest[BOTTOM_RANGE + j] = source[bottom + 15 - j];
-			}
-		}
-	}
-	break;
-	case 4:
-	{
-		unsigned int *source;
-		unsigned int *dest = (unsigned int *) _dest;
-
-		source = vid.colormap32;
-		memcpy (dest, vid.colormap32, 4 * VID_GRADES * 256);
-
-		for (i = 0; i < VID_GRADES; i++, dest += 256, source += 256) {
-			if (top < 128)
-			{
-				for (j = 0; j < 16; j++)
-					dest[TOP_RANGE + j] = source[top + j];
-			}
-			else
-			{
-				for (j = 0; j < 16; j++)
-					dest[TOP_RANGE + j] = source[top + 15 - j];
-			}
-
-			if (bottom < 128)
-			{
-				for (j = 0; j < 16; j++)
-					dest[BOTTOM_RANGE + j] = source[bottom + j];
-			}
-			else
-			{
-				for (j = 0; j < 16; j++)
-					dest[BOTTOM_RANGE + j] = source[bottom + 15 - j];
-			}
-		}
-	}
-	break;
-	default:
-		Sys_Error("Skin_Set_Translate: unsupported r_pixbytes %i\n",
-				  r_pixbytes);
-	}
-
+/*
 	dest2 = (byte *) _dest;
 
 	for (j = 0;j < 256;j++)
@@ -170,6 +168,7 @@ Skin_Set_Translate (int top, int bottom, void *_dest)
 		for (j = 0; j < 16; j++)
 			dest2[BOTTOM_RANGE + j] = d_8to24table[bottom + 15 - j];
 	}
+*/
 }
 
 void
diff --git a/nq/source/sv_progs.c b/nq/source/sv_progs.c
index 766bcf03a..f91de31c5 100644
--- a/nq/source/sv_progs.c
+++ b/nq/source/sv_progs.c
@@ -45,8 +45,6 @@
 #include "sv_progs.h"
 #include "world.h"
 
-#define PROGHEADER_CRC 5927
-
 progs_t     sv_pr_state;
 sv_globals_t sv_globals;
 sv_funcs_t sv_funcs;
diff --git a/qw/include/client.h b/qw/include/client.h
index 23cecaef5..010baf950 100644
--- a/qw/include/client.h
+++ b/qw/include/client.h
@@ -93,6 +93,7 @@ typedef struct player_info_s
 
 	int		spectator;
 	byte	translations[4*VID_GRADES*256];	// space for colormap32
+	int		translationcolor[256];
 	struct skin_s	*skin;
 } player_info_t;
 
diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c
index de134e550..f2e11653d 100644
--- a/qw/source/sv_progs.c
+++ b/qw/source/sv_progs.c
@@ -45,8 +45,6 @@
 #include "sv_progs.h"
 #include "world.h"
 
-#define PROGHEADER_CRC 54730
-
 sv_globals_t sv_globals;
 sv_funcs_t sv_funcs;
 sv_fields_t sv_fields;