diff --git a/src/hardware/r_opengl/r_opengl.h b/src/hardware/r_opengl/r_opengl.h
index 7ffefbb58..b4dd284ad 100644
--- a/src/hardware/r_opengl/r_opengl.h
+++ b/src/hardware/r_opengl/r_opengl.h
@@ -26,7 +26,7 @@
 #pragma warning(disable : 4214 4244)
 #endif
 
-#include "SDL_opengl.h" //Alam_GBC: Simple, yes?
+#include <SDL2/SDL_opengl.h> //Alam_GBC: Simple, yes?
 
 #ifdef _MSC_VER
 #pragma warning(default : 4214 4244)
diff --git a/src/sdl/IMG_xpm.c b/src/sdl/IMG_xpm.c
index e08736d66..de356166e 100644
--- a/src/sdl/IMG_xpm.c
+++ b/src/sdl/IMG_xpm.c
@@ -50,7 +50,7 @@
 #include <string.h>
 #include <ctype.h>
 
-//#include "SDL_image.h"
+#include <SDL2/SDL_image.h>
 
 
 #ifdef LOAD_XPM
@@ -499,7 +499,7 @@ SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src)
 }
 #endif
 
-static inline SDL_Surface *IMG_ReadXPMFromArray(const char **xpm)
+extern DECLSPEC SDL_Surface *IMG_ReadXPMFromArray(char **xpm)
 {
     return NULL;
 }
diff --git a/src/sdl/hwsym_sdl.c b/src/sdl/hwsym_sdl.c
index 54f5da3a0..65177248d 100644
--- a/src/sdl/hwsym_sdl.c
+++ b/src/sdl/hwsym_sdl.c
@@ -31,7 +31,7 @@
 
 #ifdef HAVE_SDL
 
-#include "SDL.h"
+#include <SDL2/SDL.h>
 
 #ifdef _MSC_VER
 #pragma warning(default : 4214 4244)
@@ -42,7 +42,7 @@
 #endif
 
 #if SDL_VERSION_ATLEAST(1,2,6) && !defined (NOLOADSO)
-#include "SDL_loadso.h" // 1.2.6+
+#include <SDL2/SDL_loadso.h> // 1.2.6+
 #elif !defined (NOLOADSO)
 #define NOLOADSO
 #endif
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 66e1ece18..3bfe23eee 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -81,7 +81,7 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
 
 #ifdef HAVE_SDL
 
-#include "SDL.h"
+#include <SDL2/SDL.h>
 
 #ifdef HAVE_TTF
 #include "i_ttf.h"
@@ -92,7 +92,7 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
 #endif
 
 #if SDL_VERSION_ATLEAST(1,2,7) && !defined (DC)
-#include "SDL_cpuinfo.h" // 1.2.7 or greater
+#include <SDL2/SDL_cpuinfo.h> // 1.2.7 or greater
 #define HAVE_SDLCPUINFO
 #endif
 
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index faee1bc69..d35838712 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -27,7 +27,7 @@
 
 #ifdef HAVE_SDL
 
-#include "SDL.h"
+#include <SDL2/SDL.h>
 
 #ifdef _MSC_VER
 #pragma warning(default : 4214 4244)
@@ -56,7 +56,7 @@
 #include "../doomdef.h"
 
 #if defined (_WIN32)
-#include "SDL_syswm.h"
+#include <SDL2/SDL_syswm.h>
 #endif
 
 #include "../doomstat.h"
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 71969209c..a7ee5bc7e 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -15,12 +15,12 @@
 #ifdef _MSC_VER
 #pragma warning(disable : 4214 4244)
 #endif
-#include "SDL.h"
+#include <SDL2/SDL.h>
 #ifdef _MSC_VER
 #pragma warning(default : 4214 4244)
 #endif
 
-#include "SDL_mixer.h"
+#include <SDL2/SDL_mixer.h>
 
 /* This is the version number macro for the current SDL_mixer version: */
 #ifndef SDL_MIXER_COMPILEDVERSION
diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c
index ba7e65176..b918c9a87 100644
--- a/src/sdl/ogl_sdl.c
+++ b/src/sdl/ogl_sdl.c
@@ -23,7 +23,7 @@
 
 #ifdef HAVE_SDL
 
-#include "SDL.h"
+#include <SDL2/SDL.h>
 
 #include "sdlmain.h"