From 24482d85f63d72ec6cde33067d1d15991b119f55 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Wed, 8 Feb 2017 13:19:04 +0300
Subject: [PATCH] Follow SDL2 include path conventions

Though these are broken and error prone, as they ignore the possibility
of conflicts between SDL, SDL2 and wrappers thereof discarding useful
include path prefix (SDL2/), since SDL and satellite libraries follow
these it's too hard to stay away.

So don't use prefixes for SDL include paths any longer.
---
 SDL2pp/AudioDevice.hh             | 4 ++--
 SDL2pp/AudioSpec.hh               | 2 +-
 SDL2pp/Chunk.hh                   | 2 +-
 SDL2pp/Exception.cc               | 2 +-
 SDL2pp/Font.cc                    | 2 +-
 SDL2pp/Font.hh                    | 2 +-
 SDL2pp/Mixer.hh                   | 4 ++--
 SDL2pp/Music.hh                   | 2 +-
 SDL2pp/Point.hh                   | 2 +-
 SDL2pp/RWops.hh                   | 2 +-
 SDL2pp/Rect.hh                    | 2 +-
 SDL2pp/Renderer.cc                | 2 +-
 SDL2pp/Renderer.hh                | 4 ++--
 SDL2pp/SDL.cc                     | 2 +-
 SDL2pp/SDL.hh                     | 2 +-
 SDL2pp/SDLImage.cc                | 2 +-
 SDL2pp/SDLMixer.cc                | 2 +-
 SDL2pp/SDLTTF.cc                  | 2 +-
 SDL2pp/Surface.cc                 | 4 ++--
 SDL2pp/Surface.hh                 | 4 ++--
 SDL2pp/SurfaceLock.cc             | 2 +-
 SDL2pp/Texture.cc                 | 4 ++--
 SDL2pp/Texture.hh                 | 4 ++--
 SDL2pp/TextureLock.cc             | 2 +-
 SDL2pp/Window.cc                  | 2 +-
 SDL2pp/Window.hh                  | 6 +++---
 cmake/FindSDL2.cmake              | 2 +-
 cmake/FindSDL2_image.cmake        | 2 +-
 cmake/FindSDL2_mixer.cmake        | 2 +-
 cmake/FindSDL2_ttf.cmake          | 2 +-
 examples/audio_sine.cc            | 2 +-
 examples/audio_wav.cc             | 2 +-
 examples/fill.cc                  | 4 ++--
 examples/image.cc                 | 4 ++--
 examples/lines.cc                 | 2 +-
 examples/mixer.cc                 | 4 ++--
 examples/mixer_effects.cc         | 4 ++--
 examples/mixer_music.cc           | 4 ++--
 examples/mixer_music_sine.cc      | 2 +-
 examples/rendertarget.cc          | 2 +-
 examples/sprites.cc               | 2 +-
 examples/ttf.cc                   | 2 +-
 tests/header_test.cc.in           | 2 +-
 tests/live_audiodevice.cc         | 2 +-
 tests/live_mixer.cc               | 2 +-
 tests/live_rendering.cc           | 4 ++--
 tests/live_window.cc              | 2 +-
 tests/test_error.cc               | 4 ++--
 tests/test_font.cc                | 2 +-
 tests/test_optional.cc            | 2 +-
 tests/test_pointrect.cc           | 2 +-
 tests/test_pointrect_constexpr.cc | 2 +-
 tests/test_rwops.cc               | 2 +-
 tests/test_surface.cc             | 2 +-
 tests/test_wav.cc                 | 2 +-
 55 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/SDL2pp/AudioDevice.hh b/SDL2pp/AudioDevice.hh
index a224078..c540caa 100644
--- a/SDL2pp/AudioDevice.hh
+++ b/SDL2pp/AudioDevice.hh
@@ -25,8 +25,8 @@
 #include <functional>
 #include <string>
 
-#include <SDL2/SDL_audio.h>
-#include <SDL2/SDL_version.h>
+#include <SDL_audio.h>
+#include <SDL_version.h>
 
 #include <SDL2pp/Optional.hh>
 #include <SDL2pp/Config.hh>
diff --git a/SDL2pp/AudioSpec.hh b/SDL2pp/AudioSpec.hh
index ef1ab5d..572b1c4 100644
--- a/SDL2pp/AudioSpec.hh
+++ b/SDL2pp/AudioSpec.hh
@@ -22,7 +22,7 @@
 #ifndef SDL2PP_AUDIOSPEC_HH
 #define SDL2PP_AUDIOSPEC_HH
 
-#include <SDL2/SDL_audio.h>
+#include <SDL_audio.h>
 
 #include <SDL2pp/Export.hh>
 
diff --git a/SDL2pp/Chunk.hh b/SDL2pp/Chunk.hh
index bed45fb..c249d7f 100644
--- a/SDL2pp/Chunk.hh
+++ b/SDL2pp/Chunk.hh
@@ -24,7 +24,7 @@
 
 #include <string>
 
-#include <SDL2/SDL_mixer.h>
+#include <SDL_mixer.h>
 
 #include <SDL2pp/Export.hh>
 
diff --git a/SDL2pp/Exception.cc b/SDL2pp/Exception.cc
index 8386974..cbbf53e 100644
--- a/SDL2pp/Exception.cc
+++ b/SDL2pp/Exception.cc
@@ -19,7 +19,7 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <SDL2pp/Exception.hh>
 
diff --git a/SDL2pp/Font.cc b/SDL2pp/Font.cc
index 5d2a181..705f9fa 100644
--- a/SDL2pp/Font.cc
+++ b/SDL2pp/Font.cc
@@ -21,7 +21,7 @@
 
 #include <vector>
 
-#include <SDL2/SDL_ttf.h>
+#include <SDL_ttf.h>
 
 #include <SDL2pp/Font.hh>
 #include <SDL2pp/RWops.hh>
diff --git a/SDL2pp/Font.hh b/SDL2pp/Font.hh
index 32abb8f..44587e1 100644
--- a/SDL2pp/Font.hh
+++ b/SDL2pp/Font.hh
@@ -24,7 +24,7 @@
 
 #include <string>
 
-#include <SDL2/SDL_ttf.h>
+#include <SDL_ttf.h>
 
 #include <SDL2pp/Optional.hh>
 #include <SDL2pp/Point.hh>
diff --git a/SDL2pp/Mixer.hh b/SDL2pp/Mixer.hh
index b1609c6..5d9566c 100644
--- a/SDL2pp/Mixer.hh
+++ b/SDL2pp/Mixer.hh
@@ -25,8 +25,8 @@
 #include <functional>
 #include <memory>
 
-#include <SDL2/SDL_stdinc.h>
-#include <SDL2/SDL_mixer.h>
+#include <SDL_stdinc.h>
+#include <SDL_mixer.h>
 
 #include <SDL2pp/Export.hh>
 
diff --git a/SDL2pp/Music.hh b/SDL2pp/Music.hh
index 3a1a7b5..62d3797 100644
--- a/SDL2pp/Music.hh
+++ b/SDL2pp/Music.hh
@@ -24,7 +24,7 @@
 
 #include <string>
 
-#include <SDL2/SDL_mixer.h>
+#include <SDL_mixer.h>
 
 #include <SDL2pp/Export.hh>
 
diff --git a/SDL2pp/Point.hh b/SDL2pp/Point.hh
index 3d7bffb..e507ed2 100644
--- a/SDL2pp/Point.hh
+++ b/SDL2pp/Point.hh
@@ -25,7 +25,7 @@
 #include <iostream>
 #include <functional>
 
-#include <SDL2/SDL_rect.h>
+#include <SDL_rect.h>
 
 #include <SDL2pp/Export.hh>
 
diff --git a/SDL2pp/RWops.hh b/SDL2pp/RWops.hh
index 4b8c3e2..05c9944 100644
--- a/SDL2pp/RWops.hh
+++ b/SDL2pp/RWops.hh
@@ -24,7 +24,7 @@
 
 #include <string>
 
-#include <SDL2/SDL_rwops.h>
+#include <SDL_rwops.h>
 #include <SDL2pp/Exception.hh>
 #include <SDL2pp/Export.hh>
 
diff --git a/SDL2pp/Rect.hh b/SDL2pp/Rect.hh
index 90f949f..7507ca2 100644
--- a/SDL2pp/Rect.hh
+++ b/SDL2pp/Rect.hh
@@ -24,7 +24,7 @@
 
 #include <functional>
 
-#include <SDL2/SDL_rect.h>
+#include <SDL_rect.h>
 
 #include <SDL2pp/Optional.hh>
 #include <SDL2pp/Point.hh>
diff --git a/SDL2pp/Renderer.cc b/SDL2pp/Renderer.cc
index f1f198b..f0a2a39 100644
--- a/SDL2pp/Renderer.cc
+++ b/SDL2pp/Renderer.cc
@@ -21,7 +21,7 @@
 
 #include <vector>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <SDL2pp/Renderer.hh>
 #include <SDL2pp/Window.hh>
diff --git a/SDL2pp/Renderer.hh b/SDL2pp/Renderer.hh
index 4635bfc..970456f 100644
--- a/SDL2pp/Renderer.hh
+++ b/SDL2pp/Renderer.hh
@@ -22,8 +22,8 @@
 #ifndef SDL2PP_RENDERER_HH
 #define SDL2PP_RENDERER_HH
 
-#include <SDL2/SDL_stdinc.h>
-#include <SDL2/SDL_blendmode.h>
+#include <SDL_stdinc.h>
+#include <SDL_blendmode.h>
 
 #include <SDL2pp/Config.hh>
 #include <SDL2pp/Optional.hh>
diff --git a/SDL2pp/SDL.cc b/SDL2pp/SDL.cc
index 3976a8c..2adab2f 100644
--- a/SDL2pp/SDL.cc
+++ b/SDL2pp/SDL.cc
@@ -19,7 +19,7 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/Exception.hh>
diff --git a/SDL2pp/SDL.hh b/SDL2pp/SDL.hh
index df95549..c655d8f 100644
--- a/SDL2pp/SDL.hh
+++ b/SDL2pp/SDL.hh
@@ -22,7 +22,7 @@
 #ifndef SDL2PP_SDL_HH
 #define SDL2PP_SDL_HH
 
-#include <SDL2/SDL_stdinc.h>
+#include <SDL_stdinc.h>
 
 #include <SDL2pp/Export.hh>
 
diff --git a/SDL2pp/SDLImage.cc b/SDL2pp/SDLImage.cc
index 6da2d56..a36c4fb 100644
--- a/SDL2pp/SDLImage.cc
+++ b/SDL2pp/SDLImage.cc
@@ -19,7 +19,7 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <SDL2/SDL_image.h>
+#include <SDL_image.h>
 
 #include <SDL2pp/SDLImage.hh>
 #include <SDL2pp/Exception.hh>
diff --git a/SDL2pp/SDLMixer.cc b/SDL2pp/SDLMixer.cc
index fd8551f..e65cd98 100644
--- a/SDL2pp/SDLMixer.cc
+++ b/SDL2pp/SDLMixer.cc
@@ -19,7 +19,7 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <SDL2/SDL_mixer.h>
+#include <SDL_mixer.h>
 
 #include <SDL2pp/SDLMixer.hh>
 #include <SDL2pp/Exception.hh>
diff --git a/SDL2pp/SDLTTF.cc b/SDL2pp/SDLTTF.cc
index 0eb187d..dfc067b 100644
--- a/SDL2pp/SDLTTF.cc
+++ b/SDL2pp/SDLTTF.cc
@@ -19,7 +19,7 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <SDL2/SDL_ttf.h>
+#include <SDL_ttf.h>
 
 #include <SDL2pp/SDLTTF.hh>
 #include <SDL2pp/Exception.hh>
diff --git a/SDL2pp/Surface.cc b/SDL2pp/Surface.cc
index 214d92c..b288870 100644
--- a/SDL2pp/Surface.cc
+++ b/SDL2pp/Surface.cc
@@ -23,9 +23,9 @@
 
 #include <SDL2pp/Config.hh>
 
-#include <SDL2/SDL_surface.h>
+#include <SDL_surface.h>
 #ifdef SDL2PP_WITH_IMAGE
-#	include <SDL2/SDL_image.h>
+#	include <SDL_image.h>
 #endif
 
 #include <SDL2pp/Surface.hh>
diff --git a/SDL2pp/Surface.hh b/SDL2pp/Surface.hh
index 4eb1620..dc635ec 100644
--- a/SDL2pp/Surface.hh
+++ b/SDL2pp/Surface.hh
@@ -22,8 +22,8 @@
 #ifndef SDL2PP_SURFACE_HH
 #define SDL2PP_SURFACE_HH
 
-#include <SDL2/SDL_stdinc.h>
-#include <SDL2/SDL_blendmode.h>
+#include <SDL_stdinc.h>
+#include <SDL_blendmode.h>
 
 #include <SDL2pp/Config.hh>
 #include <SDL2pp/Optional.hh>
diff --git a/SDL2pp/SurfaceLock.cc b/SDL2pp/SurfaceLock.cc
index 3504363..3f63de0 100644
--- a/SDL2pp/SurfaceLock.cc
+++ b/SDL2pp/SurfaceLock.cc
@@ -19,7 +19,7 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <SDL2/SDL_surface.h>
+#include <SDL_surface.h>
 
 #include <SDL2pp/Exception.hh>
 
diff --git a/SDL2pp/Texture.cc b/SDL2pp/Texture.cc
index f7e5711..8c3f353 100644
--- a/SDL2pp/Texture.cc
+++ b/SDL2pp/Texture.cc
@@ -24,9 +24,9 @@
 
 #include <SDL2pp/Config.hh>
 
-#include <SDL2/SDL_render.h>
+#include <SDL_render.h>
 #ifdef SDL2PP_WITH_IMAGE
-#	include <SDL2/SDL_image.h>
+#	include <SDL_image.h>
 #endif
 
 #include <SDL2pp/Texture.hh>
diff --git a/SDL2pp/Texture.hh b/SDL2pp/Texture.hh
index bf27aa2..01728c8 100644
--- a/SDL2pp/Texture.hh
+++ b/SDL2pp/Texture.hh
@@ -24,8 +24,8 @@
 
 #include <string>
 
-#include <SDL2/SDL_stdinc.h>
-#include <SDL2/SDL_blendmode.h>
+#include <SDL_stdinc.h>
+#include <SDL_blendmode.h>
 
 #include <SDL2pp/Optional.hh>
 #include <SDL2pp/Rect.hh>
diff --git a/SDL2pp/TextureLock.cc b/SDL2pp/TextureLock.cc
index 9a7ddd2..90ccec9 100644
--- a/SDL2pp/TextureLock.cc
+++ b/SDL2pp/TextureLock.cc
@@ -19,7 +19,7 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <SDL2/SDL_render.h>
+#include <SDL_render.h>
 
 #include <SDL2pp/Exception.hh>
 #include <SDL2pp/Rect.hh>
diff --git a/SDL2pp/Window.cc b/SDL2pp/Window.cc
index ae2b4bd..bb9ea53 100644
--- a/SDL2pp/Window.cc
+++ b/SDL2pp/Window.cc
@@ -19,7 +19,7 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <SDL2pp/Window.hh>
 #include <SDL2pp/Surface.hh>
diff --git a/SDL2pp/Window.hh b/SDL2pp/Window.hh
index 5c76256..e16aeea 100644
--- a/SDL2pp/Window.hh
+++ b/SDL2pp/Window.hh
@@ -24,9 +24,9 @@
 
 #include <string>
 
-#include <SDL2/SDL_version.h>
-#include <SDL2/SDL_stdinc.h>
-#include <SDL2/SDL_video.h>
+#include <SDL_version.h>
+#include <SDL_stdinc.h>
+#include <SDL_video.h>
 
 #include <SDL2pp/Point.hh>
 #include <SDL2pp/Export.hh>
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
index 7514f34..b4b65b9 100644
--- a/cmake/FindSDL2.cmake
+++ b/cmake/FindSDL2.cmake
@@ -6,7 +6,7 @@
 #  SDL2_FOUND
 #
 
-FIND_PATH(SDL2_INCLUDE_DIR NAMES SDL2/SDL.h)
+FIND_PATH(SDL2_INCLUDE_DIR NAMES SDL.h PATH_SUFFIXES SDL2)
 
 FIND_LIBRARY(SDL2_LIBRARY NAMES SDL2)
 FIND_LIBRARY(SDL2MAIN_LIBRARY NAMES SDL2main)
diff --git a/cmake/FindSDL2_image.cmake b/cmake/FindSDL2_image.cmake
index 815932f..6662119 100644
--- a/cmake/FindSDL2_image.cmake
+++ b/cmake/FindSDL2_image.cmake
@@ -6,7 +6,7 @@
 #  SDL2_IMAGE_FOUND
 #
 
-FIND_PATH(SDL2_IMAGE_INCLUDE_DIR NAMES SDL2/SDL_image.h)
+FIND_PATH(SDL2_IMAGE_INCLUDE_DIR NAMES SDL_image.h PATH_SUFFIXES SDL2)
 
 FIND_LIBRARY(SDL2_IMAGE_LIBRARY NAMES SDL2_image)
 
diff --git a/cmake/FindSDL2_mixer.cmake b/cmake/FindSDL2_mixer.cmake
index d42e3b8..828d254 100644
--- a/cmake/FindSDL2_mixer.cmake
+++ b/cmake/FindSDL2_mixer.cmake
@@ -6,7 +6,7 @@
 #  SDL2_MIXER_FOUND
 #
 
-FIND_PATH(SDL2_MIXER_INCLUDE_DIR NAMES SDL2/SDL_mixer.h)
+FIND_PATH(SDL2_MIXER_INCLUDE_DIR NAMES SDL_mixer.h PATH_SUFFIXES SDL2)
 
 FIND_LIBRARY(SDL2_MIXER_LIBRARY NAMES SDL2_mixer)
 
diff --git a/cmake/FindSDL2_ttf.cmake b/cmake/FindSDL2_ttf.cmake
index 5cfc67d..1df5173 100644
--- a/cmake/FindSDL2_ttf.cmake
+++ b/cmake/FindSDL2_ttf.cmake
@@ -6,7 +6,7 @@
 #  SDL2_TTF_FOUND
 #
 
-FIND_PATH(SDL2_TTF_INCLUDE_DIR NAMES SDL2/SDL_ttf.h)
+FIND_PATH(SDL2_TTF_INCLUDE_DIR NAMES SDL_ttf.h PATH_SUFFIXES SDL2)
 
 FIND_LIBRARY(SDL2_TTF_LIBRARY NAMES SDL2_ttf)
 
diff --git a/examples/audio_sine.cc b/examples/audio_sine.cc
index 4ef531c..13724bd 100644
--- a/examples/audio_sine.cc
+++ b/examples/audio_sine.cc
@@ -22,7 +22,7 @@
 #include <cmath>
 #include <iostream>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/AudioDevice.hh>
diff --git a/examples/audio_wav.cc b/examples/audio_wav.cc
index b26cb6f..3823abb 100644
--- a/examples/audio_wav.cc
+++ b/examples/audio_wav.cc
@@ -23,7 +23,7 @@
 #include <stdexcept>
 #include <algorithm>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/AudioDevice.hh>
diff --git a/examples/fill.cc b/examples/fill.cc
index 6fc2b5f..b43d636 100644
--- a/examples/fill.cc
+++ b/examples/fill.cc
@@ -22,8 +22,8 @@
 #include <iostream>
 #include <cmath>
 
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
+#include <SDL.h>
+#include <SDL_image.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLImage.hh>
diff --git a/examples/image.cc b/examples/image.cc
index 8a0a0b5..a0f5e22 100644
--- a/examples/image.cc
+++ b/examples/image.cc
@@ -22,8 +22,8 @@
 #include <cmath>
 #include <iostream>
 
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
+#include <SDL.h>
+#include <SDL_image.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLImage.hh>
diff --git a/examples/lines.cc b/examples/lines.cc
index ce0ed32..778ab13 100644
--- a/examples/lines.cc
+++ b/examples/lines.cc
@@ -21,7 +21,7 @@
 
 #include <iostream>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/Window.hh>
diff --git a/examples/mixer.cc b/examples/mixer.cc
index fcac379..160953c 100644
--- a/examples/mixer.cc
+++ b/examples/mixer.cc
@@ -21,8 +21,8 @@
 
 #include <iostream>
 
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_mixer.h>
+#include <SDL.h>
+#include <SDL_mixer.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLMixer.hh>
diff --git a/examples/mixer_effects.cc b/examples/mixer_effects.cc
index b99a52c..bcab4e4 100644
--- a/examples/mixer_effects.cc
+++ b/examples/mixer_effects.cc
@@ -21,8 +21,8 @@
 
 #include <iostream>
 
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_mixer.h>
+#include <SDL.h>
+#include <SDL_mixer.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLMixer.hh>
diff --git a/examples/mixer_music.cc b/examples/mixer_music.cc
index a61963a..e1f3c72 100644
--- a/examples/mixer_music.cc
+++ b/examples/mixer_music.cc
@@ -21,8 +21,8 @@
 
 #include <iostream>
 
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_mixer.h>
+#include <SDL.h>
+#include <SDL_mixer.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLMixer.hh>
diff --git a/examples/mixer_music_sine.cc b/examples/mixer_music_sine.cc
index ab9a118..3bc75a7 100644
--- a/examples/mixer_music_sine.cc
+++ b/examples/mixer_music_sine.cc
@@ -22,7 +22,7 @@
 #include <cmath>
 #include <iostream>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/Mixer.hh>
diff --git a/examples/rendertarget.cc b/examples/rendertarget.cc
index 6bf1a1c..550b019 100644
--- a/examples/rendertarget.cc
+++ b/examples/rendertarget.cc
@@ -21,7 +21,7 @@
 
 #include <iostream>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/Window.hh>
diff --git a/examples/sprites.cc b/examples/sprites.cc
index e5ea6a5..22adcb9 100644
--- a/examples/sprites.cc
+++ b/examples/sprites.cc
@@ -21,7 +21,7 @@
 
 #include <iostream>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/Window.hh>
diff --git a/examples/ttf.cc b/examples/ttf.cc
index 06a0b57..82eb662 100644
--- a/examples/ttf.cc
+++ b/examples/ttf.cc
@@ -22,7 +22,7 @@
 #include <iostream>
 #include <vector>
 
-#include <SDL2/SDL_stdinc.h>
+#include <SDL_stdinc.h>
 
 #include <SDL2pp/SDL.hh>
 #include <SDL2pp/SDLTTF.hh>
diff --git a/tests/header_test.cc.in b/tests/header_test.cc.in
index 4126edf..eb1e944 100644
--- a/tests/header_test.cc.in
+++ b/tests/header_test.cc.in
@@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 #include <@HEADER@>
 
 int main(int, char*[]) {
diff --git a/tests/live_audiodevice.cc b/tests/live_audiodevice.cc
index 1d616ed..7d196f6 100644
--- a/tests/live_audiodevice.cc
+++ b/tests/live_audiodevice.cc
@@ -2,7 +2,7 @@
 #include <algorithm>
 #include <vector>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL2pp.hh>
 
 #include "testing.h"
diff --git a/tests/live_mixer.cc b/tests/live_mixer.cc
index 13685c1..34baa8a 100644
--- a/tests/live_mixer.cc
+++ b/tests/live_mixer.cc
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL2pp.hh>
 
 #include "testing.h"
diff --git a/tests/live_rendering.cc b/tests/live_rendering.cc
index 0674ac3..1418902 100644
--- a/tests/live_rendering.cc
+++ b/tests/live_rendering.cc
@@ -1,10 +1,10 @@
 #include <vector>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL2pp.hh>
 
 #ifdef SDL2PP_WITH_IMAGE
-#	include <SDL2/SDL_image.h>
+#	include <SDL_image.h>
 #endif
 
 #include "testing.h"
diff --git a/tests/live_window.cc b/tests/live_window.cc
index 03985db..416cdc6 100644
--- a/tests/live_window.cc
+++ b/tests/live_window.cc
@@ -1,6 +1,6 @@
 #include <ios>
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <SDL2pp/SDL2pp.hh>
 
 #include "testing.h"
diff --git a/tests/test_error.cc b/tests/test_error.cc
index d6f14fb..471a4bc 100644
--- a/tests/test_error.cc
+++ b/tests/test_error.cc
@@ -1,5 +1,5 @@
-#include <SDL2/SDL_main.h>
-#include <SDL2/SDL_error.h>
+#include <SDL_main.h>
+#include <SDL_error.h>
 
 #include <SDL2pp/Exception.hh>
 
diff --git a/tests/test_font.cc b/tests/test_font.cc
index e5dae58..c0ec221 100644
--- a/tests/test_font.cc
+++ b/tests/test_font.cc
@@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 
 #include <SDL2pp/SDLTTF.hh>
 #include <SDL2pp/Font.hh>
diff --git a/tests/test_optional.cc b/tests/test_optional.cc
index 3905641..cc81e0c 100644
--- a/tests/test_optional.cc
+++ b/tests/test_optional.cc
@@ -1,6 +1,6 @@
 #include <string>
 
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 
 #include <SDL2pp/Optional.hh>
 
diff --git a/tests/test_pointrect.cc b/tests/test_pointrect.cc
index 654cde0..426d67d 100644
--- a/tests/test_pointrect.cc
+++ b/tests/test_pointrect.cc
@@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 
 #include <SDL2pp/Point.hh>
 #include <SDL2pp/Rect.hh>
diff --git a/tests/test_pointrect_constexpr.cc b/tests/test_pointrect_constexpr.cc
index 73b3a1e..cd90720 100644
--- a/tests/test_pointrect_constexpr.cc
+++ b/tests/test_pointrect_constexpr.cc
@@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 
 #include <SDL2pp/Point.hh>
 #include <SDL2pp/Rect.hh>
diff --git a/tests/test_rwops.cc b/tests/test_rwops.cc
index 69bbd3f..b2767ae 100644
--- a/tests/test_rwops.cc
+++ b/tests/test_rwops.cc
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 
 #include <SDL2pp/Exception.hh>
 #include <SDL2pp/ContainerRWops.hh>
diff --git a/tests/test_surface.cc b/tests/test_surface.cc
index 6210d2e..a448240 100644
--- a/tests/test_surface.cc
+++ b/tests/test_surface.cc
@@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 
 #include <SDL2pp/Surface.hh>
 
diff --git a/tests/test_wav.cc b/tests/test_wav.cc
index 1604de1..dd6c212 100644
--- a/tests/test_wav.cc
+++ b/tests/test_wav.cc
@@ -1,4 +1,4 @@
-#include <SDL2/SDL_main.h>
+#include <SDL_main.h>
 
 #include <SDL2pp/Wav.hh>