--- src/qmass/p_client.c.orig	Sat Apr  8 06:51:19 2006
+++ src/qmass/p_client.c	Fri Jun 16 05:06:09 2006
@@ -850,6 +850,9 @@
 	client_persistant_t saved;
 	client_respawn_t resp;
 	
+	// deathmatch wipes most client data every spawn
+	char userinfo[MAX_INFO_STRING];
+	
 	// find a spawn point
 	// do it before setting health back up, so farthest
 	// ranging doesn't count this client
@@ -857,9 +860,6 @@
 	
 	index = ent - g_edicts - 1;
 	client = ent->client;
-	
-	// deathmatch wipes most client data every spawn
-	char userinfo[MAX_INFO_STRING];
 	
 	resp = client->resp;
 	memcpy(userinfo, client->pers.userinfo, sizeof(userinfo));
--- src/qmass/p_hud.c.orig	Sat Apr  8 06:51:19 2006
+++ src/qmass/p_hud.c	Fri Jun 16 05:07:20 2006
@@ -65,6 +65,7 @@
 void BeginIntermission(edict_t *targ){
 	int i;
 	edict_t *ent, *client;
+	char *sound;
 	
 	if(level.intermissiontime)
 		return;  // already activated
@@ -110,7 +111,7 @@
 		MoveClientToIntermission(client);
 	}
 	
-	char *sound = sv_inter_sound->string;  //play intermission sound
+	sound = sv_inter_sound->string;  //play intermission sound
 	gi.sound(ent, CHAN_NO_PHS_ADD, gi.soundindex(sound),
 			 1, ATTN_NONE, 0);
 }
--- src/vid_glx.c.orig	Tue Apr 11 08:56:53 2006
+++ src/vid_glx.c	Fri Jun 16 04:53:40 2006
@@ -785,6 +785,9 @@
 	XSizeHints *sizehints;
 	XWMHints *wmhints;
 	unsigned long mask;
+#ifdef HAVE_XF86_VIDMODE
+	int num_vidmodes = 0;
+#endif
 	
 	window_width = width;
 	window_height = height;
@@ -817,8 +820,6 @@
 	gl_state.hwgamma = false;
 	
 #ifdef HAVE_XF86_VIDMODE
-	int num_vidmodes = 0;
-	
 	XF86VidModeGetAllModeLines(dpy, screen, &num_vidmodes, &vidmodes);
 	
 	if(fullscreen){
--- src/vid_softx.c.orig	Sat Apr 22 19:54:36 2006
+++ src/vid_softx.c	Fri Jun 16 04:50:02 2006
@@ -747,6 +747,11 @@
 	XSizeHints *sizehints;
 	XWMHints *wmhints;
 	unsigned long mask;
+	int i;
+#ifdef HAVE_XF86_VIDMODE
+	int num_vidmodes = 0;
+#endif
+	XGCValues vals;
 	
 	// destroy existing window
 	SWimp_Shutdown();
@@ -768,8 +773,6 @@
 	}
 	
 #ifdef HAVE_XF86_VIDMODE
-	int num_vidmodes = 0;
-	
 	XF86VidModeGetAllModeLines(dpy, screen, &num_vidmodes, &vidmodes);
 	
 	if(fullscreen){
@@ -894,7 +897,6 @@
 	}
 #endif // HAVE_XF86_VIDMODE
 	
-	XGCValues vals;
 	vals.graphics_exposures = False;
 	gc = XCreateGC(dpy, win, GCGraphicsExposures, &vals);
 	
@@ -906,7 +908,7 @@
 	}
 	
 	viddef.height = height; viddef.width = width;
-	int i = ((viddef.width * 4 + 7) & ~7) * viddef.height;
+	i = ((viddef.width * 4 + 7) & ~7) * viddef.height;
 	
 	x_framebuffer = XCreateImage(dpy,
 			visinfo->visual,
--- src/tga.c.orig	Wed Apr 26 23:26:50 2006
+++ src/tga.c	Fri Jun 16 04:52:35 2006
@@ -35,6 +35,9 @@
 	byte *targa_rgba;
 	byte tmp[2];
 	
+	byte red, green, blue, alpha;
+	byte packet_header, packet_size, j;
+	
 	*pic = NULL;
 	
 	if(!strstr(name, "env/") && !gl_loadtga->value)
@@ -91,9 +94,6 @@
 	
 	if(targa_header.id_length != 0)  // skip header comment
 		buffer += targa_header.id_length;
-	
-	byte red, green, blue, alpha;
-	byte packet_header, packet_size, j;
 	
 	red = green = blue = alpha = 0;
 	packet_header = packet_size = j = 0;
--- src/cl_parse.c.orig	Thu Jun 22 10:26:09 2006
+++ src/cl_parse.c	Thu Jul  6 09:38:33 2006
@@ -559,11 +559,12 @@
 * Returns true of msg should be discarded, according to cl_ignore.
 */
 qboolean CL_IgnoreChatMessage(char *msg){
+	char *s;
 	
 	if(!*cl_ignore->string || strlen(cl_ignore->string) < 1)
 		return false;  // nothing currently filtered
 	
-	char *s = strtok(cl_ignore->string, " ");
+	s = strtok(cl_ignore->string, " ");
 	while(s){
 		if(strstr(msg, s))
 			return true;
--- src/common.c.orig	Fri Jun 30 09:23:25 2006
+++ src/common.c	Thu Jul  6 09:38:37 2006
@@ -1188,6 +1188,7 @@
 */
 void Qcommon_Init(int argc, char **argv){
 	char *s;
+	#include "binds.h"
 	
 	if(setjmp(abortframe))
 		Sys_Error("Error during initialization");
@@ -1215,7 +1216,6 @@
 	
 	FS_InitFilesystem();
 	
-	#include "binds.h"
 	Cbuf_AddText(DEFAULT_BINDS);
 	Cbuf_AddText("exec quetoo.cfg\n");
 	
