diff --git a/Makefile.win32 b/Makefile.win32
index 0e717c06c6..cd56da6e8e 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -6,7 +6,7 @@ CXX = g++
 
 HAVE_SRC = 1
 HAVE_SDL = 1
-libsnes = -lsnes
+libsnes ?= -lsnes
 
 LIBS =
 DEFINES = -I. -DHAVE_SRC -DHAVE_SDL
@@ -14,6 +14,7 @@ LDFLAGS = -L.
 
 SRC_LIBS = -lsamplerate-0
 SDL_LIBS = -lSDLmain -lSDL
+SDL_CFLAGS = -ISDL
 
 ifeq ($(HAVE_SRC), 1)
    LIBS += $(SRC_LIBS)
@@ -38,13 +39,6 @@ $(TARGET): $(OBJ)
 %.o: %.c
 	$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
 
-install: $(TARGET)
-	install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin 
-	install -m644 ssnes.cfg $(DESTDIR)/etc/ssnes.cfg
-
-uninstall: $(TARGET)
-	rm -rf $(DESTDIR)/$(PREFIX)/bin/$(TARGET)
-
 clean:
 	rm -f *.o 
 	rm -f audio/*.o
diff --git a/audio/sdl.c b/audio/sdl.c
index 821e822a9d..2c3eb279f3 100644
--- a/audio/sdl.c
+++ b/audio/sdl.c
@@ -23,9 +23,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <SDL/SDL.h>
-#include <SDL/SDL_audio.h>
-#include <SDL/SDL_thread.h>
+#include "SDL.h"
+#include "SDL_audio.h"
+#include "SDL_thread.h"
 #include "general.h"
 #include "buffer.h"
 
diff --git a/gfx/gl.c b/gfx/gl.c
index 1044615bf8..fd77397af9 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -30,9 +30,9 @@
 #endif
 
 #define NO_SDL_GLEXT
-#include <SDL/SDL.h>
-#include <SDL/SDL_opengl.h>
-#include "input/sdl_input.h"
+#include "SDL.h"
+#include "SDL_opengl.h"
+#include "input/ssnes_sdl_input.h"
 
 #define GL_GLEXT_PROTOTYPES
 #include <GL/glext.h>
diff --git a/gfx/shader_glsl.c b/gfx/shader_glsl.c
index b6b120472f..1aeab39b92 100644
--- a/gfx/shader_glsl.c
+++ b/gfx/shader_glsl.c
@@ -25,8 +25,8 @@
 
 #define NO_SDL_GLEXT
 #include <GL/gl.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_opengl.h>
+#include "SDL.h"
+#include "SDL_opengl.h"
 #include <stdlib.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
diff --git a/input/sdl.c b/input/sdl.c
index b4300fade7..a2260ebe2e 100644
--- a/input/sdl.c
+++ b/input/sdl.c
@@ -17,13 +17,13 @@
 
 #include "driver.h"
 
-#include <SDL/SDL.h>
+#include "SDL.h"
 #include <stdbool.h>
 #include "general.h"
 #include <stdint.h>
 #include <stdlib.h>
 #include <libsnes.hpp>
-#include "sdl_input.h"
+#include "ssnes_sdl_input.h"
 
 static void* sdl_input_init(void)
 {
diff --git a/input/sdl_input.h b/input/ssnes_sdl_input.h
similarity index 98%
rename from input/sdl_input.h
rename to input/ssnes_sdl_input.h
index d934a8712d..5833396e3f 100644
--- a/input/sdl_input.h
+++ b/input/ssnes_sdl_input.h
@@ -18,7 +18,7 @@
 #ifndef __SSNES_SDL_INPUT_H
 #define __SSNES_SDL_INPUT_H
 
-#include <SDL/SDL.h>
+#include "SDL.h"
 typedef struct sdl_input
 {
    SDL_Joystick *joysticks[2];