diff --git a/Externals/GLew/src/visualinfo.c b/Externals/GLew/src/visualinfo.c
index f3ae91f2b4..177f765f6f 100644
--- a/Externals/GLew/src/visualinfo.c
+++ b/Externals/GLew/src/visualinfo.c
@@ -86,12 +86,12 @@ char* display = NULL;
 int visual = -1;
 
 FILE* file = 0;
-GLContext ctx;
 
 int 
 main (int argc, char** argv)
 {
   GLenum err;
+  GLContext ctx;
 
   /* ---------------------------------------------------------------------- */
   /* parse arguments */
diff --git a/Externals/SDL/SConscript b/Externals/SDL/SConscript
index dfc5e66928..73d4318846 100644
--- a/Externals/SDL/SConscript
+++ b/Externals/SDL/SConscript
@@ -17,13 +17,13 @@ files = [
 	#'src/audio/SDL_wave.c',
 	#'src/cdrom/SDL_cdrom.c',
 	#'src/cpuinfo/SDL_cpuinfo.c',
-	'src/events/SDL_active.c',
-	'src/events/SDL_events.c',
-	'src/events/SDL_expose.c',
-	'src/events/SDL_keyboard.c',
-	'src/events/SDL_mouse.c',
-	'src/events/SDL_quit.c',
-	'src/events/SDL_resize.c',
+	#'src/events/SDL_active.c',
+	#'src/events/SDL_events.c',
+	#'src/events/SDL_expose.c',
+	#'src/events/SDL_keyboard.c',
+	#'src/events/SDL_mouse.c',
+	#'src/events/SDL_quit.c',
+	#'src/events/SDL_resize.c',
 	#'src/file/SDL_rwops.c',
 	'src/joystick/SDL_joystick.c',
 	#'src/stdlib/SDL_getenv.c',
@@ -31,10 +31,8 @@ files = [
 	#'src/stdlib/SDL_malloc.c',
 	#'src/stdlib/SDL_qsort.c',
 	#'src/stdlib/SDL_stdlib.c',
-	'src/stdlib/SDL_string.c',
-	'src/thread/SDL_thread.c',
-	'src/timer/SDL_timer.c',
-	'src/timer/unix/SDL_systimer.c',
+	#'src/thread/SDL_thread.c',
+	#'src/timer/SDL_timer.c',
 	#'src/video/SDL_RLEaccel.c',
 	#'src/video/SDL_blit.c',
 	#'src/video/SDL_blit_0.c',
@@ -53,13 +51,6 @@ files = [
 	#'src/video/SDL_yuv_sw.c',
 	]
 
-files += [
-	'src/thread/generic/SDL_syscond.c',
-	'src/thread/generic/SDL_sysmutex.c',
-	'src/thread/generic/SDL_syssem.c',
-	'src/thread/generic/SDL_systhread.c',
-	]
-
 if sys.platform == 'darwin':
 	files += [
 		'src/joystick/darwin/SDL_sysjoystick.c',
@@ -67,6 +58,7 @@ if sys.platform == 'darwin':
 elif sys.platform == 'linux2':
 	files += [
 		'src/joystick/linux/SDL_sysjoystick.c',
+		'src/stdlib/SDL_string.c',
 		]
 else:
 	files += [
diff --git a/Externals/SDL/src/joystick/linux/SDL_sysjoystick.c b/Externals/SDL/src/joystick/linux/SDL_sysjoystick.c
index 0b09ffb466..e13c8cb115 100644
--- a/Externals/SDL/src/joystick/linux/SDL_sysjoystick.c
+++ b/Externals/SDL/src/joystick/linux/SDL_sysjoystick.c
@@ -500,25 +500,25 @@ int SDL_SYS_JoystickInit(void)
 }
 
 /* Function to get the device-dependent name of a joystick */
-const char *SDL_SYS_JoystickName(int index)
+const char *SDL_SYS_JoystickName(int jindex)
 {
 	int fd;
 	static char namebuf[128];
 	char *name;
-	SDL_logical_joydecl(int oindex = index);
+	SDL_logical_joydecl(int oindex = jindex);
 
 #ifndef NO_LOGICAL_JOYSTICKS
-	SDL_joylist_head(index, index);
+	SDL_joylist_head(jindex, jindex);
 #endif
 	name = NULL;
-	fd = open(SDL_joylist[index].fname, O_RDONLY, 0);
+	fd = open(SDL_joylist[jindex].fname, O_RDONLY, 0);
 	if ( fd >= 0 ) {
 		if ( 
 #if SDL_INPUT_LINUXEV
 		     (ioctl(fd, EVIOCGNAME(sizeof(namebuf)), namebuf) <= 0) &&
 #endif
 		     (ioctl(fd, JSIOCGNAME(sizeof(namebuf)), namebuf) <= 0) ) {
-			name = SDL_joylist[index].fname;
+			name = SDL_joylist[jindex].fname;
 		} else {
 			name = namebuf;
 		}
@@ -526,7 +526,7 @@ const char *SDL_SYS_JoystickName(int index)
 
 
 #ifndef NO_LOGICAL_JOYSTICKS
-		if (SDL_joylist[oindex].prev || SDL_joylist[oindex].next || index!=oindex)
+		if (SDL_joylist[oindex].prev || SDL_joylist[oindex].next || jindex!=oindex)
 		{
        		   LogicalSuffix(SDL_joylist[oindex].logicalno, namebuf, 128);
 		}