fix SDL includes.

67 files changed, 87 insertions, 91 deletions

diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 28d605a88..e02c1ea2a 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -66,7 +66,7 @@
 #include <guichan/actionlistener.hpp>
 
 #ifdef ANDROID
-#include <SDL_screenkeyboard.h>
+#include <SDL/SDL_screenkeyboard.h>
 #endif
 
 #include "debug.h"
diff --git a/src/actorsprite.h b/src/actorsprite.h
index badcb3b2d..b5c42b771 100644
--- a/src/actorsprite.h
+++ b/src/actorsprite.h
@@ -28,7 +28,7 @@
 #include "map.h"
 #include "particlecontainer.h"
 
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 
 #include <set>
 #include <list>
diff --git a/src/being.h b/src/being.h
index 6911f830b..e5854b429 100644
--- a/src/being.h
+++ b/src/being.h
@@ -29,7 +29,7 @@
 
 #include <guichan/color.hpp>
 
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 
 #include <map>
 #include <set>
diff --git a/src/client.cpp b/src/client.cpp
index 4fcfaa081..25989da59 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -110,17 +110,17 @@
 #include <CoreFoundation/CFBundle.h>
 #endif
 
-#include <SDL_image.h>
+#include <SDL/SDL_image.h>
 
 #ifdef WIN32
-#include <SDL_syswm.h>
+#include <SDL/SDL_syswm.h>
 #include "utils/specialfolder.h"
 #else
 #include <cerrno>
 #endif
 
 #ifdef ANDROID
-#include <SDL_screenkeyboard.h>
+#include <SDL/SDL_screenkeyboard.h>
 #endif
 
 #include <sys/stat.h>
diff --git a/src/client.h b/src/client.h
index 8110349c5..e3536b841 100644
--- a/src/client.h
+++ b/src/client.h
@@ -29,8 +29,8 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include <SDL.h>
-#include <SDL_framerate.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_framerate.h>
 
 #include <string>
 
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index a191afc59..5d29c5fbe 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -37,7 +37,7 @@
 
 #include "utils/dtor.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #include "debug.h"
 
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 8f6b805cd..f6d879a1f 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -40,7 +40,7 @@
 #endif
 #endif
 
-#include <SDL_gfxBlitFunc.h>
+#include <SDL/SDL_gfxBlitFunc.h>
 
 #include "debug.h"
 
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 7628b19fc..caef7579c 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -27,7 +27,7 @@
 #include <GLES2/gl2.h>
 #include <GLES/glext.h>
 #include <EGL/egl.h>
-#include <SDL_android.h>
+#include <SDL/SDL_android.h>
 #else
 #include "GL/glx.h"
 #endif
@@ -52,7 +52,7 @@
 
 #include "test/testmain.h"
 
-#include <SDL_syswm.h>
+#include <SDL/SDL_syswm.h>
 
 #include "debug.h"
 
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index fbea60980..942d2fa9c 100644
--- a/src/graphicsmanager.h
+++ b/src/graphicsmanager.h
@@ -29,7 +29,7 @@
 #include <GLES/gl.h>
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL_opengl.h>
+#include <SDL/SDL_opengl.h>
 // hack to hide warnings
 #undef GL_GLEXT_VERSION
 #undef GL_GLEXT_PROTOTYPES
@@ -39,7 +39,7 @@
 
 #include "utils/stringvector.h"
 
-#include <SDL_stdinc.h>
+#include <SDL/SDL_stdinc.h>
 
 #include <set>
 #include <string>
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index ad5535559..cf8415f25 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -22,8 +22,8 @@
 
 #include "gui/botcheckerwindow.h"
 
-#include <SDL.h>
-#include <SDL_thread.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_thread.h>
 #include <vector>
 #include <algorithm>
 
diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h
index 6863abb83..cf1b156fd 100644
--- a/src/gui/sdlfont.h
+++ b/src/gui/sdlfont.h
@@ -30,7 +30,7 @@
 #ifdef __WIN32__
 #include <SDL/SDL_ttf.h>
 #else
-#include <SDL_ttf.h>
+#include <SDL/SDL_ttf.h>
 #endif
 
 #include <list>
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index 7a5cf65d1..9558c4322 100644
--- a/src/gui/selldialog.h
+++ b/src/gui/selldialog.h
@@ -28,7 +28,7 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 
 class Button;
 class Item;
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index fa77996dd..6379b3131 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -39,7 +39,7 @@
 
 #include <guichan/listmodel.hpp>
 
-#include <SDL_keyboard.h>
+#include <SDL/SDL_keyboard.h>
 
 #include "debug.h"
 
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 4e62d5445..559684143 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -54,7 +54,7 @@
 #include <guichan/key.hpp>
 #include <guichan/listmodel.hpp>
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #include <algorithm>
 
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 7b3703cfb..eaf6e3322 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -45,8 +45,8 @@
 
 #include "resources/iteminfo.h"
 
-#include <SDL.h>
-#include <SDL_thread.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_thread.h>
 #include <algorithm>
 
 #include "debug.h"
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index 3e101338e..037cac76a 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -46,8 +46,8 @@
 
 #include "utils/gettext.h"
 
-#include <SDL.h>
-#include <SDL_thread.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_thread.h>
 #include <vector>
 #include <algorithm>
 
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 9c54926d4..69e3bd47e 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -28,7 +28,7 @@
 
 #include "utils/gettext.h"
 
-#include <SDL_events.h>
+#include <SDL/SDL_events.h>
 
 #include "debug.h"
 
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 569ae95b5..b490f23e9 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -23,8 +23,8 @@
 #ifndef KEYBOARDCONFIG_H
 #define KEYBOARDCONFIG_H
 
-#include <SDL_types.h>
-#include <SDL_keyboard.h>
+#include <SDL/SDL_types.h>
+#include <SDL/SDL_keyboard.h>
 
 #include "inputevent.h"
 
diff --git a/src/mgl.h b/src/mgl.h
index d6165dc0d..4667c80ce 100644
--- a/src/mgl.h
+++ b/src/mgl.h
@@ -30,7 +30,7 @@
 #define APIENTRY GL_APIENTRY
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL_opengl.h>
+#include <SDL/SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
diff --git a/src/mobileopenglgraphics.cpp b/src/mobileopenglgraphics.cpp
index 4a8125e3e..8787524dd 100644
--- a/src/mobileopenglgraphics.cpp
+++ b/src/mobileopenglgraphics.cpp
@@ -36,7 +36,7 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #include "debug.h"
 
diff --git a/src/mobileopenglgraphics.h b/src/mobileopenglgraphics.h
index 4f96ce1df..6d9e8ef9b 100644
--- a/src/mobileopenglgraphics.h
+++ b/src/mobileopenglgraphics.h
@@ -37,7 +37,7 @@
 #include <GLES2/gl2.h>
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL_opengl.h>
+#include <SDL/SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index dda73014e..a96fcfe3e 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <SDL_syswm.h>
+#include <SDL/SDL_syswm.h>
 
 #ifndef WIN32
 #include <sys/mman.h>
diff --git a/src/net/download.cpp b/src/net/download.cpp
index a8f0e1c0c..9a47aa4cf 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -28,8 +28,8 @@
 
 #include <curl/curl.h>
 
-#include <SDL.h>
-#include <SDL_thread.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_thread.h>
 
 #include <zlib.h>
 
diff --git a/src/net/download.h b/src/net/download.h
index d0025c2b3..9e52b190f 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -23,7 +23,7 @@
 #ifndef NET_DOWNLOAD_H
 #define NET_DOWNLOAD_H
 
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 
 #include <stdio.h>
 #include <string>
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 2f8a1c0d1..1c7f3a8e6 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -30,7 +30,7 @@
 
 #include "net/sdltcpnet.h"
 
-#include <SDL_thread.h>
+#include <SDL/SDL_thread.h>
 
 #include <map>
 #include <string>
diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h
index aafac96ea..314a1ab28 100644
--- a/src/net/eathena/messagehandler.h
+++ b/src/net/eathena/messagehandler.h
@@ -27,7 +27,7 @@
 
 #include "net/eathena/messageout.h"
 
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 
 #include <memory>
 
diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp
index 1acbd4665..953dac4d2 100644
--- a/src/net/eathena/messagein.cpp
+++ b/src/net/eathena/messagein.cpp
@@ -28,8 +28,8 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL.h>
-#include <SDL_endian.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_endian.h>
 
 #include "debug.h"
 
diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h
index 49f8a36f1..b80ba40df 100644
--- a/src/net/eathena/messagein.h
+++ b/src/net/eathena/messagein.h
@@ -25,7 +25,7 @@
 
 #include "net/messagein.h"
 
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 #include <string>
 
 #include "localconsts.h"
diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp
index 6dc2e00f4..8772ac3a0 100644
--- a/src/net/eathena/messageout.cpp
+++ b/src/net/eathena/messageout.cpp
@@ -28,8 +28,8 @@
 
 #include "logger.h"
 
-#include <SDL.h>
-#include <SDL_endian.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_endian.h>
 
 #include <cstring>
 #include <string>
diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h
index 0e8364131..0a470faf8 100644
--- a/src/net/eathena/messageout.h
+++ b/src/net/eathena/messageout.h
@@ -26,7 +26,7 @@
 #include "net/messageout.h"
 
 #include <iosfwd>
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 
 #include "localconsts.h"
 
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index c438ed679..9b732bb99 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -25,7 +25,7 @@
 
 #include "net/messagein.h"
 
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 
 #include <memory>
 
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 3ed723360..c41227ab4 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -23,7 +23,7 @@
 #ifndef NET_MESSAGEIN_H
 #define NET_MESSAGEIN_H
 
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 
 #include <string>
 
diff --git a/src/net/messageout.h b/src/net/messageout.h
index f4b32191b..2cf27f72e 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -23,7 +23,7 @@
 #ifndef NET_MESSAGEOUT_H
 #define NET_MESSAGEOUT_H
 
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 
 #include <iosfwd>
 #include <string>
diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h
index 1d83b04fc..22273b447 100644
--- a/src/net/sdltcpnet.h
+++ b/src/net/sdltcpnet.h
@@ -21,7 +21,7 @@
 #ifndef NET_SDLTCPNET_H
 #define NET_SDLTCPNET_H
 
-#include <SDL_net.h>
+#include <SDL/SDL_net.h>
 
 #include <string>
 
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 515595f1f..c678fef39 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -25,7 +25,7 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL_stdinc.h>
+#include <SDL/SDL_stdinc.h>
 
 #include <string>
 #include <vector>
diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h
index 5afe28bff..daa1ed082 100644
--- a/src/net/tmwa/messagehandler.h
+++ b/src/net/tmwa/messagehandler.h
@@ -27,7 +27,7 @@
 
 #include "net/tmwa/messageout.h"
 
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 
 #include <memory>
 
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index 67cacf504..f4974ad03 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -28,8 +28,8 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL.h>
-#include <SDL_endian.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_endian.h>
 
 #include "debug.h"
 
diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h
index 75e85b044..038252a4c 100644
--- a/src/net/tmwa/messagein.h
+++ b/src/net/tmwa/messagein.h
@@ -25,7 +25,7 @@
 
 #include "net/messagein.h"
 
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 #include <string>
 
 #include "localconsts.h"
diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp
index 2fc0ff2d9..edee92a68 100644
--- a/src/net/tmwa/messageout.cpp
+++ b/src/net/tmwa/messageout.cpp
@@ -28,8 +28,8 @@
 
 #include "logger.h"
 
-#include <SDL.h>
-#include <SDL_endian.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_endian.h>
 
 #include <cstring>
 #include <string>
diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h
index 1d7b76800..7e8bd13d5 100644
--- a/src/net/tmwa/messageout.h
+++ b/src/net/tmwa/messageout.h
@@ -26,7 +26,7 @@
 #include "net/messageout.h"
 
 #include <iosfwd>
-#include <SDL_types.h>
+#include <SDL/SDL_types.h>
 
 #include "localconsts.h"
 
diff --git a/src/normalopenglgraphics.cpp b/src/normalopenglgraphics.cpp
index af13d0a4f..dc7524761 100644
--- a/src/normalopenglgraphics.cpp
+++ b/src/normalopenglgraphics.cpp
@@ -35,7 +35,7 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #include "debug.h"
 
diff --git a/src/normalopenglgraphics.h b/src/normalopenglgraphics.h
index 9da63c32c..e0f4e3b6b 100644
--- a/src/normalopenglgraphics.h
+++ b/src/normalopenglgraphics.h
@@ -37,7 +37,7 @@
 #include <GLES2/gl2.h>
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL_opengl.h>
+#include <SDL/SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
diff --git a/src/nullopenglgraphics.cpp b/src/nullopenglgraphics.cpp
index a74a89a0b..50c94f6f1 100644
--- a/src/nullopenglgraphics.cpp
+++ b/src/nullopenglgraphics.cpp
@@ -35,7 +35,7 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #include "debug.h"
 
diff --git a/src/nullopenglgraphics.h b/src/nullopenglgraphics.h
index 7f58e1242..9d92d4772 100644
--- a/src/nullopenglgraphics.h
+++ b/src/nullopenglgraphics.h
@@ -37,7 +37,7 @@
 #include <GLES2/gl2.h>
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL_opengl.h>
+#include <SDL/SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
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
diff --git a/src/safeopenglgraphics.cpp b/src/safeopenglgraphics.cpp
index 35748f539..3081a122f 100644
--- a/src/safeopenglgraphics.cpp
+++ b/src/safeopenglgraphics.cpp
@@ -33,7 +33,7 @@
 #include "resources/image.h"
 #include "resources/openglimagehelper.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #include "debug.h"
 
diff --git a/src/safeopenglgraphics.h b/src/safeopenglgraphics.h
index c134caa2d..d13d72ef1 100644
--- a/src/safeopenglgraphics.h
+++ b/src/safeopenglgraphics.h
@@ -35,7 +35,7 @@
 #include <GLES/glext.h>
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL_opengl.h>
+#include <SDL/SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index 72a7d26c2..8cb171975 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -29,7 +29,7 @@
 #include "resources/resourcemanager.h"
 #include "resources/soundeffect.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #include "debug.h"
 
diff --git a/src/soundmanager.h b/src/soundmanager.h
index 09e424238..3767ae8dc 100644
--- a/src/soundmanager.h
+++ b/src/soundmanager.h
@@ -23,7 +23,7 @@
 #ifndef SOUNDMANAGER_H
 #define SOUNDMANAGER_H
 
-#include <SDL_mixer.h>
+#include <SDL/SDL_mixer.h>
 
 #include "configlistener.h"
 
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index a28c7889e..db14dd3c7 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -35,7 +35,7 @@
 
 #include "utils/copynpaste.h"
 
-#include <SDL_syswm.h>
+#include <SDL/SDL_syswm.h>
 
 #include "debug.h"
 
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 37c889e02..116aa0b21 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -25,7 +25,7 @@
 
 #include "logger.h"
 
-#include <SDL_thread.h>
+#include <SDL/SDL_thread.h>
 
 /**
  * A mutex provides mutual exclusion of access to certain data that is
diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h
index fb0285e0a..08e7c45e8 100644
--- a/src/utils/physfsrwops.h
+++ b/src/utils/physfsrwops.h
@@ -25,7 +25,7 @@
 #ifndef UTILS_PHYSFSRWOPS_H
 #define UTILS_PHYSFSRWOPS_H
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #include "utils/physfstools.h"
 
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index 4a447848c..f042e5f66 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -238,7 +238,7 @@ bool openBrowser(std::string url)
         nullptr, nullptr, SW_SHOWNORMAL)) > 32;
 }
 #elif defined ANDROID
-#include <SDL_screenkeyboard.h>
+#include <SDL/SDL_screenkeyboard.h>
 bool openBrowser(std::string url)
 {
     SDL_ANDROID_OpenBrowser(replaceAll(url, " ", "").c_str());