diff --git a/code/qcommon/vm_interpreted.c b/code/qcommon/vm_interpreted.c
index 7183e245..6b303d85 100644
--- a/code/qcommon/vm_interpreted.c
+++ b/code/qcommon/vm_interpreted.c
@@ -480,7 +480,7 @@ nextInstruction2:
 		case OP_BLOCK_COPY:
 			{
 				int		*src, *dest;
-				int		i, count, srci, desti;
+				int		count, srci, desti;
 
 				count = r2;
 				// MrE: copy range check
diff --git a/code/sys/sys_loadlib.h b/code/sys/sys_loadlib.h
index a7e854c6..994c5d3f 100644
--- a/code/sys/sys_loadlib.h
+++ b/code/sys/sys_loadlib.h
@@ -33,10 +33,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #		define Sys_UnloadLibrary(h) dlclose(h)
 #		define Sys_LoadFunction(h,fn) dlsym(h,fn)
 #		define Sys_LibraryError() dlerror()
-#endif
+#	endif
 #else
-#	include "SDL.h"
-#	include "SDL_loadso.h"
+#	ifdef USE_LOCAL_HEADERS
+#		include "SDL.h"
+#		include "SDL_loadso.h"
+#	else
+#		include <SDL.h>
+#		include <SDL_loadso.h>
+#	endif
 #	define Sys_LoadLibrary(f) SDL_LoadObject(f)
 #	define Sys_UnloadLibrary(h) SDL_UnloadObject(h)
 #	define Sys_LoadFunction(h,fn) SDL_LoadFunction(h,fn)