15 files changed, 21 insertions, 25 deletions
diff --git a/src/resources/dyecolor.h b/src/resources/dyecolor.h
index e9a6a5950..0bade48f6 100644
--- a/src/resources/dyecolor.h
+++ b/src/resources/dyecolor.h
@@ -21,7 +21,7 @@
 #ifndef RESOURCES_DYECOLOR_H
 #define RESOURCES_DYECOLOR_H
 
-#include <SDL_stdinc.h>
+#include <SDL/SDL_stdinc.h>
 
 #include "localconsts.h"
 
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h
index 20fef77e3..94bad8d15 100644
--- a/src/resources/fboinfo.h
+++ b/src/resources/fboinfo.h
@@ -32,7 +32,7 @@
 #include <GLES/gl.h>
 #include <GLES/glext.h>
 #else
-#include <SDL_opengl.h>
+#include <SDL/SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 88360c870..5896f1081 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -39,8 +39,8 @@
 #include "resources/sdlimagehelper.h"
 #include "resources/subimage.h"
 
-#include <SDL_image.h>
-#include <SDL_rotozoom.h>
+#include <SDL/SDL_image.h>
+#include <SDL/SDL_rotozoom.h>
 
 #include "debug.h"
 
diff --git a/src/resources/image.h b/src/resources/image.h
index 78eb07d7f..a49d7efff 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -28,7 +28,7 @@
 
 #include "resources/resource.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #ifdef USE_OPENGL
 
@@ -36,7 +36,7 @@
 #include <GLES/gl.h>
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL_opengl.h>
+#include <SDL/SDL_opengl.h>
 #endif
 #endif
 
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp
index 6a4a47505..efc4bfb59 100644
--- a/src/resources/imagehelper.cpp
+++ b/src/resources/imagehelper.cpp
@@ -31,8 +31,8 @@
 
 #include "resources/image.h"
 
-#include <SDL_image.h>
-#include <SDL_rotozoom.h>
+#include <SDL/SDL_image.h>
+#include <SDL/SDL_rotozoom.h>
 
 #include "debug.h"
 
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h
index cf01a3f1e..8044cc569 100644
--- a/src/resources/imagehelper.h
+++ b/src/resources/imagehelper.h
@@ -27,7 +27,7 @@
 
 #include "resources/resource.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 class Dye;
 class Image;
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index 0b81a5f11..9c7765d18 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -25,11 +25,7 @@
 #include "logger.h"
 
 #include <png.h>
-#if defined __OpenBSD__
 #include <SDL/SDL.h>
-#else
-#include <SDL.h>
-#endif
 #include <string>
 
 #include "debug.h"
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index a107b0099..f0c165d5d 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -39,8 +39,8 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL_image.h>
-#include <SDL_rotozoom.h>
+#include <SDL/SDL_image.h>
+#include <SDL/SDL_rotozoom.h>
 
 #include "debug.h"
 
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index e19c5e735..85a094fd3 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -37,14 +37,14 @@
 
 #include "resources/imagehelper.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #ifdef ANDROID
 #include <GLES/gl.h>
 #define GL_RGBA8 GL_RGBA8_OES
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL_opengl.h>
+#include <SDL/SDL_opengl.h>
 #endif
 
 class Dye;
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 83beb8e9c..789d84573 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -43,7 +43,7 @@
 #include "utils/mkdir.h"
 #include "utils/physfsrwops.h"
 
-#include <SDL_image.h>
+#include <SDL/SDL_image.h>
 #include <cassert>
 #include <dirent.h>
 #include <fstream>
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index 881368fd3..ad62cec54 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -31,8 +31,8 @@
 
 #include "resources/image.h"
 
-#include <SDL_image.h>
-#include <SDL_rotozoom.h>
+#include <SDL/SDL_image.h>
+#include <SDL/SDL_rotozoom.h>
 
 #include "debug.h"
 
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index 291345164..fbc6c4451 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -27,7 +27,7 @@
 
 #include "resources/imagehelper.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 class Dye;
 class Image;
diff --git a/src/resources/sdlmusic.h b/src/resources/sdlmusic.h
index 05a5528b7..da092c1a6 100644
--- a/src/resources/sdlmusic.h
+++ b/src/resources/sdlmusic.h
@@ -25,7 +25,7 @@
 
 #include "resources/resource.h"
 
-#include <SDL_mixer.h>
+#include <SDL/SDL_mixer.h>
 
 #include "localconsts.h"
 
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 3b6724820..f9fbfa6a1 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -25,7 +25,7 @@
 
 #include "resources/resource.h"
 
-#include <SDL_mixer.h>
+#include <SDL/SDL_mixer.h>
 
 #include "localconsts.h"
 
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index 8dae594f6..292fbdc0f 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -26,7 +26,7 @@
 #include "localconsts.h"
 #include "main.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #ifdef USE_OPENGL
 
@@ -34,7 +34,7 @@
 #include <GLES/gl.h>
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL_opengl.h>
+#include <SDL/SDL_opengl.h>
 #endif
 
 #endif