diff --git a/src/game_config.cpp b/src/game_config.cpp
index e3e40201106..d767bc84d3c 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -14,13 +14,15 @@
 
 #include "global.hpp"
 
+#include "color_range.hpp"
 #include "config.hpp"
 #include "log.hpp"
 #include "gettext.hpp"
 #include "game_config.hpp"
 #include "util.hpp"
-#include "wesconfig.h"
 #include "serialization/string_utils.hpp"
+#include "tstring.hpp"
+#include "wesconfig.h"
 
 #include <cstdlib>
 #include <sstream>
diff --git a/src/game_config.hpp b/src/game_config.hpp
index 90ddc69433b..6fc59e4a563 100644
--- a/src/game_config.hpp
+++ b/src/game_config.hpp
@@ -14,10 +14,11 @@
 #ifndef GAME_CONFIG_H_INCLUDED
 #define GAME_CONFIG_H_INCLUDED
 
+class color_range;
 class config;
+class t_string;
 
-#include "color_range.hpp"
-#include "tstring.hpp"
+#include "SDL_types.h"
 
 #include <string>
 #include <vector>
diff --git a/src/image.cpp b/src/image.cpp
index 85bfd7eb407..166920c0460 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -17,6 +17,7 @@
 
 #include "global.hpp"
 
+#include "color_range.hpp"
 #include "config.hpp"
 #include "filesystem.hpp"
 #include "game_config.hpp"