Remove subdir SDL from SDL includes.

72 files changed, 94 insertions, 98 deletions

diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index e02c1ea2a..28d605a88 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -66,7 +66,7 @@
 #include <guichan/actionlistener.hpp>
 
 #ifdef ANDROID
-#include <SDL/SDL_screenkeyboard.h>
+#include <SDL_screenkeyboard.h>
 #endif
 
 #include "debug.h"
diff --git a/src/actorsprite.h b/src/actorsprite.h
index b5c42b771..badcb3b2d 100644
--- a/src/actorsprite.h
+++ b/src/actorsprite.h
@@ -28,7 +28,7 @@
 #include "map.h"
 #include "particlecontainer.h"
 
-#include <SDL/SDL_types.h>
+#include <SDL_types.h>
 
 #include <set>
 #include <list>
diff --git a/src/being.h b/src/being.h
index e5854b429..6911f830b 100644
--- a/src/being.h
+++ b/src/being.h
@@ -29,7 +29,7 @@
 
 #include <guichan/color.hpp>
 
-#include <SDL/SDL_types.h>
+#include <SDL_types.h>
 
 #include <map>
 #include <set>
diff --git a/src/client.cpp b/src/client.cpp
index 25989da59..4fcfaa081 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -110,17 +110,17 @@
 #include <CoreFoundation/CFBundle.h>
 #endif
 
-#include <SDL/SDL_image.h>
+#include <SDL_image.h>
 
 #ifdef WIN32
-#include <SDL/SDL_syswm.h>
+#include <SDL_syswm.h>
 #include "utils/specialfolder.h"
 #else
 #include <cerrno>
 #endif
 
 #ifdef ANDROID
-#include <SDL/SDL_screenkeyboard.h>
+#include <SDL_screenkeyboard.h>
 #endif
 
 #include <sys/stat.h>
diff --git a/src/client.h b/src/client.h
index e3536b841..8110349c5 100644
--- a/src/client.h
+++ b/src/client.h
@@ -29,8 +29,8 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include <SDL/SDL.h>
-#include <SDL/SDL_framerate.h>
+#include <SDL.h>
+#include <SDL_framerate.h>
 
 #include <string>
 
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index 5d29c5fbe..a191afc59 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -37,7 +37,7 @@
 
 #include "utils/dtor.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include "debug.h"
 
diff --git a/src/game.h b/src/game.h
index 5f13e0a7d..1e8f242b0 100644
--- a/src/game.h
+++ b/src/game.h
@@ -27,7 +27,7 @@
 
 #include "localconsts.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 static const int MAX_LASTKEYS = 10;
 
diff --git a/src/graphics.cpp b/src/graphics.cpp
index f6d879a1f..8f6b805cd 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -40,7 +40,7 @@
 #endif
 #endif
 
-#include <SDL/SDL_gfxBlitFunc.h>
+#include <SDL_gfxBlitFunc.h>
 
 #include "debug.h"
 
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index caef7579c..7628b19fc 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/SDL_android.h>
+#include <SDL_android.h>
 #else
 #include "GL/glx.h"
 #endif
@@ -52,7 +52,7 @@
 
 #include "test/testmain.h"
 
-#include <SDL/SDL_syswm.h>
+#include <SDL_syswm.h>
 
 #include "debug.h"
 
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index 942d2fa9c..fbea60980 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/SDL_opengl.h>
+#include <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/SDL_stdinc.h>
+#include <SDL_stdinc.h>
 
 #include <set>
 #include <string>
diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h
index 3fd674c66..aa9d58ff6 100644
--- a/src/graphicsvertexes.h
+++ b/src/graphicsvertexes.h
@@ -31,10 +31,10 @@
 #include <GLES/gl.h>
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL/SDL_opengl.h>
+#include <SDL_opengl.h>
 #endif
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include "mobileopenglgraphics.h"
 #include "normalopenglgraphics.h"
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index cf8415f25..ad5535559 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -22,8 +22,8 @@
 
 #include "gui/botcheckerwindow.h"
 
-#include <SDL/SDL.h>
-#include <SDL/SDL_thread.h>
+#include <SDL.h>
+#include <SDL_thread.h>
 #include <vector>
 #include <algorithm>
 
diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h
index cf1b156fd..48e6c404f 100644
--- a/src/gui/sdlfont.h
+++ b/src/gui/sdlfont.h
@@ -27,11 +27,7 @@
 #include <guichan/color.hpp>
 #include <guichan/font.hpp>
 
-#ifdef __WIN32__
-#include <SDL/SDL_ttf.h>
-#else
-#include <SDL/SDL_ttf.h>
-#endif
+#include <SDL_ttf.h>
 
 #include <list>
 #include <map>
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 5d632142f..aa02e9554 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -61,7 +61,7 @@
 
 #include "keyinput.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include <guichan/input.hpp>
 #include <guichan/keyinput.hpp>
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index 9558c4322..7a5cf65d1 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/SDL_types.h>
+#include <SDL_types.h>
 
 class Button;
 class Item;
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index 6379b3131..fa77996dd 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -39,7 +39,7 @@
 
 #include <guichan/listmodel.hpp>
 
-#include <SDL/SDL_keyboard.h>
+#include <SDL_keyboard.h>
 
 #include "debug.h"
 
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 559684143..4e62d5445 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/SDL.h>
+#include <SDL.h>
 
 #include <algorithm>
 
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index eaf6e3322..7b3703cfb 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -45,8 +45,8 @@
 
 #include "resources/iteminfo.h"
 
-#include <SDL/SDL.h>
-#include <SDL/SDL_thread.h>
+#include <SDL.h>
+#include <SDL_thread.h>
 #include <algorithm>
 
 #include "debug.h"
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index 037cac76a..3e101338e 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -46,8 +46,8 @@
 
 #include "utils/gettext.h"
 
-#include <SDL/SDL.h>
-#include <SDL/SDL_thread.h>
+#include <SDL.h>
+#include <SDL_thread.h>
 #include <vector>
 #include <algorithm>
 
diff --git a/src/inputmanager.h b/src/inputmanager.h
index 9994b8fce..71f1f8a72 100644
--- a/src/inputmanager.h
+++ b/src/inputmanager.h
@@ -27,7 +27,7 @@
 #include <string>
 #include <map>
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 const unsigned int KeyFunctionSize = 3;
 
diff --git a/src/joystick.h b/src/joystick.h
index b014f380c..174c61e6c 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -25,7 +25,7 @@
 
 #include "inputevent.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include <string>
 #include <vector>
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 69e3bd47e..9c54926d4 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -28,7 +28,7 @@
 
 #include "utils/gettext.h"
 
-#include <SDL/SDL_events.h>
+#include <SDL_events.h>
 
 #include "debug.h"
 
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index b490f23e9..569ae95b5 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -23,8 +23,8 @@
 #ifndef KEYBOARDCONFIG_H
 #define KEYBOARDCONFIG_H
 
-#include <SDL/SDL_types.h>
-#include <SDL/SDL_keyboard.h>
+#include <SDL_types.h>
+#include <SDL_keyboard.h>
 
 #include "inputevent.h"
 
diff --git a/src/mgl.h b/src/mgl.h
index 4667c80ce..d6165dc0d 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/SDL_opengl.h>
+#include <SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
diff --git a/src/mobileopenglgraphics.cpp b/src/mobileopenglgraphics.cpp
index 8787524dd..4a8125e3e 100644
--- a/src/mobileopenglgraphics.cpp
+++ b/src/mobileopenglgraphics.cpp
@@ -36,7 +36,7 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include "debug.h"
 
diff --git a/src/mobileopenglgraphics.h b/src/mobileopenglgraphics.h
index 6d9e8ef9b..4f96ce1df 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/SDL_opengl.h>
+#include <SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index 06387cdf5..0b067ff42 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <SDL/SDL_syswm.h>
+#include <SDL_syswm.h>
 
 #ifndef WIN32
 #include <sys/mman.h>
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 9a47aa4cf..a8f0e1c0c 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -28,8 +28,8 @@
 
 #include <curl/curl.h>
 
-#include <SDL/SDL.h>
-#include <SDL/SDL_thread.h>
+#include <SDL.h>
+#include <SDL_thread.h>
 
 #include <zlib.h>
 
diff --git a/src/net/download.h b/src/net/download.h
index 9e52b190f..d0025c2b3 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/SDL_types.h>
+#include <SDL_types.h>
 
 #include <stdio.h>
 #include <string>
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 1c7f3a8e6..2f8a1c0d1 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -30,7 +30,7 @@
 
 #include "net/sdltcpnet.h"
 
-#include <SDL/SDL_thread.h>
+#include <SDL_thread.h>
 
 #include <map>
 #include <string>
diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h
index 314a1ab28..aafac96ea 100644
--- a/src/net/eathena/messagehandler.h
+++ b/src/net/eathena/messagehandler.h
@@ -27,7 +27,7 @@
 
 #include "net/eathena/messageout.h"
 
-#include <SDL/SDL_types.h>
+#include <SDL_types.h>
 
 #include <memory>
 
diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp
index 953dac4d2..1acbd4665 100644
--- a/src/net/eathena/messagein.cpp
+++ b/src/net/eathena/messagein.cpp
@@ -28,8 +28,8 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL/SDL.h>
-#include <SDL/SDL_endian.h>
+#include <SDL.h>
+#include <SDL_endian.h>
 
 #include "debug.h"
 
diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h
index b80ba40df..49f8a36f1 100644
--- a/src/net/eathena/messagein.h
+++ b/src/net/eathena/messagein.h
@@ -25,7 +25,7 @@
 
 #include "net/messagein.h"
 
-#include <SDL/SDL_types.h>
+#include <SDL_types.h>
 #include <string>
 
 #include "localconsts.h"
diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp
index 8772ac3a0..6dc2e00f4 100644
--- a/src/net/eathena/messageout.cpp
+++ b/src/net/eathena/messageout.cpp
@@ -28,8 +28,8 @@
 
 #include "logger.h"
 
-#include <SDL/SDL.h>
-#include <SDL/SDL_endian.h>
+#include <SDL.h>
+#include <SDL_endian.h>
 
 #include <cstring>
 #include <string>
diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h
index 0a470faf8..0e8364131 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/SDL_types.h>
+#include <SDL_types.h>
 
 #include "localconsts.h"
 
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index 9b732bb99..c438ed679 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -25,7 +25,7 @@
 
 #include "net/messagein.h"
 
-#include <SDL/SDL_types.h>
+#include <SDL_types.h>
 
 #include <memory>
 
diff --git a/src/net/messagein.h b/src/net/messagein.h
index c41227ab4..3ed723360 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/SDL_types.h>
+#include <SDL_types.h>
 
 #include <string>
 
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 2cf27f72e..f4b32191b 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/SDL_types.h>
+#include <SDL_types.h>
 
 #include <iosfwd>
 #include <string>
diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h
index 22273b447..1d83b04fc 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/SDL_net.h>
+#include <SDL_net.h>
 
 #include <string>
 
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index c678fef39..515595f1f 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -25,7 +25,7 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL/SDL_stdinc.h>
+#include <SDL_stdinc.h>
 
 #include <string>
 #include <vector>
diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h
index daa1ed082..5afe28bff 100644
--- a/src/net/tmwa/messagehandler.h
+++ b/src/net/tmwa/messagehandler.h
@@ -27,7 +27,7 @@
 
 #include "net/tmwa/messageout.h"
 
-#include <SDL/SDL_types.h>
+#include <SDL_types.h>
 
 #include <memory>
 
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index f4974ad03..67cacf504 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -28,8 +28,8 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL/SDL.h>
-#include <SDL/SDL_endian.h>
+#include <SDL.h>
+#include <SDL_endian.h>
 
 #include "debug.h"
 
diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h
index 038252a4c..75e85b044 100644
--- a/src/net/tmwa/messagein.h
+++ b/src/net/tmwa/messagein.h
@@ -25,7 +25,7 @@
 
 #include "net/messagein.h"
 
-#include <SDL/SDL_types.h>
+#include <SDL_types.h>
 #include <string>
 
 #include "localconsts.h"
diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp
index edee92a68..2fc0ff2d9 100644
--- a/src/net/tmwa/messageout.cpp
+++ b/src/net/tmwa/messageout.cpp
@@ -28,8 +28,8 @@
 
 #include "logger.h"
 
-#include <SDL/SDL.h>
-#include <SDL/SDL_endian.h>
+#include <SDL.h>
+#include <SDL_endian.h>
 
 #include <cstring>
 #include <string>
diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h
index 7e8bd13d5..1d7b76800 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/SDL_types.h>
+#include <SDL_types.h>
 
 #include "localconsts.h"
 
diff --git a/src/normalopenglgraphics.cpp b/src/normalopenglgraphics.cpp
index dc7524761..af13d0a4f 100644
--- a/src/normalopenglgraphics.cpp
+++ b/src/normalopenglgraphics.cpp
@@ -35,7 +35,7 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include "debug.h"
 
diff --git a/src/normalopenglgraphics.h b/src/normalopenglgraphics.h
index e0f4e3b6b..9da63c32c 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/SDL_opengl.h>
+#include <SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
diff --git a/src/nullopenglgraphics.cpp b/src/nullopenglgraphics.cpp
index 50c94f6f1..a74a89a0b 100644
--- a/src/nullopenglgraphics.cpp
+++ b/src/nullopenglgraphics.cpp
@@ -35,7 +35,7 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include "debug.h"
 
diff --git a/src/nullopenglgraphics.h b/src/nullopenglgraphics.h
index 9d92d4772..7f58e1242 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/SDL_opengl.h>
+#include <SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h
index ac53a1a54..8b2baef17 100644
--- a/src/resources/atlasmanager.h
+++ b/src/resources/atlasmanager.h
@@ -27,7 +27,7 @@
 
 #include "utils/stringvector.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 class Resource;
 
diff --git a/src/resources/dyecolor.h b/src/resources/dyecolor.h
index 0bade48f6..e9a6a5950 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/SDL_stdinc.h>
+#include <SDL_stdinc.h>
 
 #include "localconsts.h"
 
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h
index 94bad8d15..20fef77e3 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/SDL_opengl.h>
+#include <SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 5896f1081..88360c870 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/SDL_image.h>
-#include <SDL/SDL_rotozoom.h>
+#include <SDL_image.h>
+#include <SDL_rotozoom.h>
 
 #include "debug.h"
 
diff --git a/src/resources/image.h b/src/resources/image.h
index a49d7efff..78eb07d7f 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -28,7 +28,7 @@
 
 #include "resources/resource.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #ifdef USE_OPENGL
 
@@ -36,7 +36,7 @@
 #include <GLES/gl.h>
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL/SDL_opengl.h>
+#include <SDL_opengl.h>
 #endif
 #endif
 
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp
index efc4bfb59..6a4a47505 100644
--- a/src/resources/imagehelper.cpp
+++ b/src/resources/imagehelper.cpp
@@ -31,8 +31,8 @@
 
 #include "resources/image.h"
 
-#include <SDL/SDL_image.h>
-#include <SDL/SDL_rotozoom.h>
+#include <SDL_image.h>
+#include <SDL_rotozoom.h>
 
 #include "debug.h"
 
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h
index 8044cc569..cf01a3f1e 100644
--- a/src/resources/imagehelper.h
+++ b/src/resources/imagehelper.h
@@ -27,7 +27,7 @@
 
 #include "resources/resource.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 class Dye;
 class Image;
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index 9c7765d18..ef0b48dc2 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -25,7 +25,7 @@
 #include "logger.h"
 
 #include <png.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include <string>
 
 #include "debug.h"
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index f0c165d5d..a107b0099 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -39,8 +39,8 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL/SDL_image.h>
-#include <SDL/SDL_rotozoom.h>
+#include <SDL_image.h>
+#include <SDL_rotozoom.h>
 
 #include "debug.h"
 
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 85a094fd3..e19c5e735 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -37,14 +37,14 @@
 
 #include "resources/imagehelper.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #ifdef ANDROID
 #include <GLES/gl.h>
 #define GL_RGBA8 GL_RGBA8_OES
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL/SDL_opengl.h>
+#include <SDL_opengl.h>
 #endif
 
 class Dye;
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 789d84573..83beb8e9c 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/SDL_image.h>
+#include <SDL_image.h>
 #include <cassert>
 #include <dirent.h>
 #include <fstream>
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index ad62cec54..881368fd3 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -31,8 +31,8 @@
 
 #include "resources/image.h"
 
-#include <SDL/SDL_image.h>
-#include <SDL/SDL_rotozoom.h>
+#include <SDL_image.h>
+#include <SDL_rotozoom.h>
 
 #include "debug.h"
 
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index fbc6c4451..291345164 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -27,7 +27,7 @@
 
 #include "resources/imagehelper.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 class Dye;
 class Image;
diff --git a/src/resources/sdlmusic.h b/src/resources/sdlmusic.h
index da092c1a6..05a5528b7 100644
--- a/src/resources/sdlmusic.h
+++ b/src/resources/sdlmusic.h
@@ -25,7 +25,7 @@
 
 #include "resources/resource.h"
 
-#include <SDL/SDL_mixer.h>
+#include <SDL_mixer.h>
 
 #include "localconsts.h"
 
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index f9fbfa6a1..3b6724820 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -25,7 +25,7 @@
 
 #include "resources/resource.h"
 
-#include <SDL/SDL_mixer.h>
+#include <SDL_mixer.h>
 
 #include "localconsts.h"
 
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index 292fbdc0f..8dae594f6 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -26,7 +26,7 @@
 #include "localconsts.h"
 #include "main.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #ifdef USE_OPENGL
 
@@ -34,7 +34,7 @@
 #include <GLES/gl.h>
 #else
 #define GL_GLEXT_PROTOTYPES 1
-#include <SDL/SDL_opengl.h>
+#include <SDL_opengl.h>
 #endif
 
 #endif
diff --git a/src/safeopenglgraphics.cpp b/src/safeopenglgraphics.cpp
index 3081a122f..35748f539 100644
--- a/src/safeopenglgraphics.cpp
+++ b/src/safeopenglgraphics.cpp
@@ -33,7 +33,7 @@
 #include "resources/image.h"
 #include "resources/openglimagehelper.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include "debug.h"
 
diff --git a/src/safeopenglgraphics.h b/src/safeopenglgraphics.h
index d13d72ef1..c134caa2d 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/SDL_opengl.h>
+#include <SDL_opengl.h>
 #include <GL/glext.h>
 #endif
 
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index 8cb171975..72a7d26c2 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -29,7 +29,7 @@
 #include "resources/resourcemanager.h"
 #include "resources/soundeffect.h"
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include "debug.h"
 
diff --git a/src/soundmanager.h b/src/soundmanager.h
index 3767ae8dc..09e424238 100644
--- a/src/soundmanager.h
+++ b/src/soundmanager.h
@@ -23,7 +23,7 @@
 #ifndef SOUNDMANAGER_H
 #define SOUNDMANAGER_H
 
-#include <SDL/SDL_mixer.h>
+#include <SDL_mixer.h>
 
 #include "configlistener.h"
 
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 116aa0b21..37c889e02 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -25,7 +25,7 @@
 
 #include "logger.h"
 
-#include <SDL/SDL_thread.h>
+#include <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 08e7c45e8..fb0285e0a 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/SDL.h>
+#include <SDL.h>
 
 #include "utils/physfstools.h"
 
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index f042e5f66..4a447848c 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/SDL_screenkeyboard.h>
+#include <SDL_screenkeyboard.h>
 bool openBrowser(std::string url)
 {
     SDL_ANDROID_OpenBrowser(replaceAll(url, " ", "").c_str());