diff --git a/src/font/marked-up_text.hpp b/src/font/marked-up_text.hpp
index 727e100518e..715766e5f6e 100644
--- a/src/font/marked-up_text.hpp
+++ b/src/font/marked-up_text.hpp
@@ -25,7 +25,7 @@ class surface;
 #include <string>
 #include "serialization/unicode_types.hpp"
 
-#include <SDL.h>
+#include <SDL_rect.h>
 
 namespace font {
 
diff --git a/src/font/text_formatting.hpp b/src/font/text_formatting.hpp
index f3a2daa8ac0..b6cd2472ad5 100644
--- a/src/font/text_formatting.hpp
+++ b/src/font/text_formatting.hpp
@@ -20,7 +20,6 @@
 // standard color to be passed to span_color without an extra include.
 #include "font/standard_colors.hpp"
 
-#include <SDL.h>
 #include <string>
 
 /**
diff --git a/src/gui/core/event/message.hpp b/src/gui/core/event/message.hpp
index 79e3257ea32..973efc1414d 100644
--- a/src/gui/core/event/message.hpp
+++ b/src/gui/core/event/message.hpp
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/helper.hpp"
 
-#include <SDL.h>
+#include <SDL_rect.h>
 
 namespace gui2
 {
diff --git a/src/gui/dialogs/end_credits.hpp b/src/gui/dialogs/end_credits.hpp
index 9ff6dc1edac..0da1dea9b30 100644
--- a/src/gui/dialogs/end_credits.hpp
+++ b/src/gui/dialogs/end_credits.hpp
@@ -16,7 +16,7 @@
 
 #include "gui/dialogs/modal_dialog.hpp"
 
-#include <SDL.h>
+#include <SDL_keycode.h>
 #include <vector>
 
 class config;
diff --git a/src/gui/dialogs/tooltip.hpp b/src/gui/dialogs/tooltip.hpp
index 304a93a454c..4fdcfeefe7e 100644
--- a/src/gui/dialogs/tooltip.hpp
+++ b/src/gui/dialogs/tooltip.hpp
@@ -15,7 +15,7 @@
 #ifndef GUI_DIALOGS_TIP_HPP_INCLUDED
 #define GUI_DIALOGS_TIP_HPP_INCLUDED
 
-#include <SDL.h>
+#include <SDL_rect.h>
 #include <string>
 
 class CVideo;
diff --git a/src/help/help_text_area.cpp b/src/help/help_text_area.cpp
index 28b12a83581..ec9613795f2 100644
--- a/src/help/help_text_area.cpp
+++ b/src/help/help_text_area.cpp
@@ -27,7 +27,6 @@
 #include <algorithm>                    // for max, min, find_if
 #include <ostream>                      // for operator<<, stringstream, etc
 #include <vector>                       // for vector, etc
-#include <SDL.h>                        // for TTF_STYLE_BOLD, etc
 
 static lg::log_domain log_display("display");
 #define WRN_DP LOG_STREAM(warn, log_display)
diff --git a/src/map/label.hpp b/src/map/label.hpp
index 9d6d061ef25..e90d92f4a01 100644
--- a/src/map/label.hpp
+++ b/src/map/label.hpp
@@ -22,7 +22,7 @@
 
 #include <map>
 #include <string>
-#include <SDL.h>
+#include <SDL_rect.h>
 
 class config;
 class display;
diff --git a/src/tooltips.cpp b/src/tooltips.cpp
index c82f4df445a..9f979f181e1 100644
--- a/src/tooltips.cpp
+++ b/src/tooltips.cpp
@@ -23,7 +23,7 @@
 #include "resources.hpp"
 #include "video.hpp"
 
-#include <SDL.h> // Travis doesn't like this, although it works on my machine -> '#include <SDL_sound.h>
+#include <SDL_rect.h> // Travis doesn't like this, although it works on my machine -> '#include <SDL_sound.h>
 
 namespace {