Index: code/renderer/qgl.h
===================================================================
--- code/renderer/qgl.h	(revision 1498)
+++ code/renderer/qgl.h	(working copy)
@@ -27,7 +27,7 @@
 #define __QGL_H__
 
 #ifdef USE_LOCAL_HEADERS
-#	include "SDL_opengl.h"
+#	include "../SDL12/include/SDL_opengl.h"
 #else
 #	include <SDL_opengl.h>
 #endif
Index: code/sdl/sdl_gamma.c
===================================================================
--- code/sdl/sdl_gamma.c	(revision 1498)
+++ code/sdl/sdl_gamma.c	(working copy)
@@ -21,7 +21,7 @@
 */
 
 #ifdef USE_LOCAL_HEADERS
-#	include "SDL.h"
+#	include "../SDL12/include/SDL.h"
 #else
 #	include <SDL.h>
 #endif
Index: code/sdl/sdl_glimp.c
===================================================================
--- code/sdl/sdl_glimp.c	(revision 1498)
+++ code/sdl/sdl_glimp.c	(working copy)
@@ -21,7 +21,7 @@
 */
 
 #ifdef USE_LOCAL_HEADERS
-#	include "SDL.h"
+#	include "../SDL12/include/SDL.h"
 #else
 #	include <SDL.h>
 #endif
@@ -35,7 +35,7 @@
 
 #ifdef SMP
 #	ifdef USE_LOCAL_HEADERS
-#		include "SDL_thread.h"
+#		include "../SDL12/include/SDL_thread.h"
 #	else
 #		include <SDL_thread.h>
 #	endif
Index: code/sdl/sdl_input.c
===================================================================
--- code/sdl/sdl_input.c	(revision 1498)
+++ code/sdl/sdl_input.c	(working copy)
@@ -21,7 +21,7 @@
 */
 
 #ifdef USE_LOCAL_HEADERS
-#	include "SDL.h"
+#	include "../SDL12/include/SDL.h"
 #else
 #	include <SDL.h>
 #endif
Index: code/sdl/sdl_snd.c
===================================================================
--- code/sdl/sdl_snd.c	(revision 1498)
+++ code/sdl/sdl_snd.c	(working copy)
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #ifdef USE_LOCAL_HEADERS
-#	include "SDL.h"
+#	include "../SDL12/include/SDL.h"
 #else
 #	include <SDL.h>
 #endif
Index: code/sys/sys_loadlib.h
===================================================================
--- code/sys/sys_loadlib.h	(revision 1498)
+++ code/sys/sys_loadlib.h	(working copy)
@@ -36,8 +36,8 @@
 #	endif
 #else
 #	ifdef USE_LOCAL_HEADERS
-#		include "SDL.h"
-#		include "SDL_loadso.h"
+#		include "../SDL12/include/SDL.h"
+#		include "../SDL12/include/SDL_loadso.h"
 #	else
 #		include <SDL.h>
 #		include <SDL_loadso.h>
Index: code/sys/sys_main.c
===================================================================
--- code/sys/sys_main.c	(revision 1498)
+++ code/sys/sys_main.c	(working copy)
@@ -33,8 +33,8 @@
 
 #ifndef DEDICATED
 #ifdef USE_LOCAL_HEADERS
-#	include "SDL.h"
-#	include "SDL_cpuinfo.h"
+#	include "../SDL12/include/SDL.h"
+#	include "../SDL12/include/SDL_cpuinfo.h"
 #else
 #	include <SDL.h>
 #	include <SDL_cpuinfo.h>
Index: Makefile
===================================================================
--- Makefile	(revision 1498)
+++ Makefile	(working copy)
@@ -317,10 +317,6 @@
     CLIENT_LIBS += -lrt
   endif
 
-ifeq ($(USE_LOCAL_HEADERS),1)
-    BASE_CFLAGS += -I$(SDLHDIR)/include
-  endif
-
   ifeq ($(ARCH),i386)
     # linux32 make ...
     BASE_CFLAGS += -m32
@@ -387,10 +383,6 @@
 
   BASE_CFLAGS += -D_THREAD_SAFE=1
 
-  ifeq ($(USE_LOCAL_HEADERS),1)
-    BASE_CFLAGS += -I$(SDLHDIR)/include
-  endif
-
   # We copy sdlmain before ranlib'ing it so that subversion doesn't think
   #  the file has been modified by each build.
   LIBSDLMAIN=$(B)/libSDLmain.a
@@ -497,7 +489,6 @@
   # libmingw32 must be linked before libSDLmain
   CLIENT_LIBS += -lmingw32
   ifeq ($(USE_LOCAL_HEADERS),1)
-    BASE_CFLAGS += -I$(SDLHDIR)/include
     CLIENT_LIBS += $(LIBSDIR)/win32/libSDLmain.a \
                       $(LIBSDIR)/win32/libSDL.dll.a
   else