diff --git a/.gitignore b/.gitignore
index 35157c8..7a3414a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ bld
 build/
 .vs/*
 make/
+subprojects/
\ No newline at end of file
diff --git a/src/PATCHES/SONYDRV.c b/src/PATCHES/SONYDRV.c
index e22df42..f6cfb62 100644
--- a/src/PATCHES/SONYDRV.c
+++ b/src/PATCHES/SONYDRV.c
@@ -22,6 +22,7 @@
 INCBIN(SonyDriver, "rsrc/SONYDRV.bin");
 INCBIN(SonyIcon, "rsrc/SONYICO.bin");
 
+#ifdef gSonyDriverData
 void Sony_LoadDriver(uint8_t *pto, int *size)
 {
 	memcpy(pto, gSonyDriverData, gSonyDriverSize);
@@ -73,3 +74,10 @@ void Sony_Install(void)
 	// currently broken
 	//ScreenHack_Install(&pto);
 }
+#else
+// Can't load patches; just stub this out for now
+void Sony_Install(void)
+{
+	return;
+}
+#endif
\ No newline at end of file
diff --git a/src/UI/CONTROLM.c b/src/UI/CONTROLM.c
index 15696d0..58cdaf8 100644
--- a/src/UI/CONTROLM.c
+++ b/src/UI/CONTROLM.c
@@ -30,7 +30,7 @@
 #include "UTIL/ENDIANAC.h"
 
 #include "UI/CONTROLM.h"
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "UI/SDL2/OSGLUSD2.h"
 
 /* Constants and globals */
diff --git a/src/UI/SDL2/DRIVES.c b/src/UI/SDL2/DRIVES.c
index 263b5da..0e50a6d 100644
--- a/src/UI/SDL2/DRIVES.c
+++ b/src/UI/SDL2/DRIVES.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "CNFGRAPI.h"
 #include "EMCONFIG.h"
 #include "SYSDEPNS.h"
diff --git a/src/UI/SDL2/KEYBOARD.c b/src/UI/SDL2/KEYBOARD.c
index 4869672..0ae5eb0 100644
--- a/src/UI/SDL2/KEYBOARD.c
+++ b/src/UI/SDL2/KEYBOARD.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "CNFGRAPI.h"
 #include "EMCONFIG.h"
 #include "SYSDEPNS.h"
diff --git a/src/UI/SDL2/MOUSE.c b/src/UI/SDL2/MOUSE.c
index c610f3d..dcec4a9 100644
--- a/src/UI/SDL2/MOUSE.c
+++ b/src/UI/SDL2/MOUSE.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
 #include "UTIL/ENDIANAC.h"
diff --git a/src/UI/SDL2/OSGLUSD2.c b/src/UI/SDL2/OSGLUSD2.c
index 56d35b1..9e34e5e 100644
--- a/src/UI/SDL2/OSGLUSD2.c
+++ b/src/UI/SDL2/OSGLUSD2.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
 #include "UTIL/ENDIANAC.h"
diff --git a/src/UI/SDL2/OSGLUSD2.h b/src/UI/SDL2/OSGLUSD2.h
index 8a09cb4..637cbb4 100644
--- a/src/UI/SDL2/OSGLUSD2.h
+++ b/src/UI/SDL2/OSGLUSD2.h
@@ -2,7 +2,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "UI/MYOSGLUE.h"
 
 /* --- defines and macros and such --- */
diff --git a/src/UI/SDL2/SOUND.c b/src/UI/SDL2/SOUND.c
index c0e5fb8..a81128f 100644
--- a/src/UI/SDL2/SOUND.c
+++ b/src/UI/SDL2/SOUND.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
 #include "UTIL/ENDIANAC.h"
diff --git a/src/UI/SDL2/TIMEDATE.c b/src/UI/SDL2/TIMEDATE.c
index 42ec8f9..5664344 100644
--- a/src/UI/SDL2/TIMEDATE.c
+++ b/src/UI/SDL2/TIMEDATE.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdint.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
 #include "UTIL/ENDIANAC.h"
diff --git a/src/UI/SDL2/VIDEO.c b/src/UI/SDL2/VIDEO.c
index 7755292..b242080 100644
--- a/src/UI/SDL2/VIDEO.c
+++ b/src/UI/SDL2/VIDEO.c
@@ -2,8 +2,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_pixels.h>
+#include <SDL.h>
+#include <SDL_pixels.h>
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
 #include "UTIL/ENDIANAC.h"