9 files changed, 11 insertions, 8 deletions
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 85bec5650..ad86253a2 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -25,7 +25,6 @@
 
 #include <algorithm>
 #include <functional>
-#include <utility>
 
 #include "localconsts.h"
 
diff --git a/src/utils/files.h b/src/utils/files.h
index 1addab440..42af06874 100644
--- a/src/utils/files.h
+++ b/src/utils/files.h
@@ -23,8 +23,6 @@
 
 #include "utils/stringvector.h"
 
-#include <string>
-
 #include "localconsts.h"
 
 namespace Files
diff --git a/src/utils/gettexthelper.h b/src/utils/gettexthelper.h
index f233dc236..49d45c55b 100644
--- a/src/utils/gettexthelper.h
+++ b/src/utils/gettexthelper.h
@@ -21,6 +21,10 @@
 #ifndef UTILS_GETTEXTHELPER_H
 #define UTILS_GETTEXTHELPER_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "localconsts.h"
 
 class GettextHelper final
diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h
index 759049c42..69267186c 100644
--- a/src/utils/mathutils.h
+++ b/src/utils/mathutils.h
@@ -24,7 +24,6 @@
 #define UTILS_MATHUTILS_H
 
 #include <string>
-#include <cstring>
 
 #include "localconsts.h"
 
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index b3549a770..7fe3ad69c 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -25,8 +25,6 @@
 
 #include "logger.h"
 
-#include <SDL_thread.h>
-
 /**
  * A mutex provides mutual exclusion of access to certain data that is
  * accessed by multiple threads.
diff --git a/src/utils/sdlhelper.h b/src/utils/sdlhelper.h
index 87c01e159..3b3069ca7 100644
--- a/src/utils/sdlhelper.h
+++ b/src/utils/sdlhelper.h
@@ -21,6 +21,8 @@
 #ifndef UTILS_SDLHELPER_H
 #define UTILS_SDLHELPER_H
 
+#include "main.h"
+
 #ifdef USE_SDL2
 #include "utils/sdl2helper.h"
 
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index dac6dd7f2..cde03d1b1 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -24,6 +24,10 @@
 
 #include <algorithm>
 
+#ifdef WIN32
+#include <sys/time.h>
+#endif
+
 #include "debug.h"
 
 static size_t UTF8_MAX_SIZE = 10;
diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h
index 395428098..991a6934c 100644
--- a/src/utils/translation/podict.h
+++ b/src/utils/translation/podict.h
@@ -21,8 +21,8 @@
 #ifndef UTILS_TRANSLATION_PODICT_H
 #define UTILS_TRANSLATION_PODICT_H
 
-#include <string>
 #include <map>
+#include <string>
 
 #include "localconsts.h"
 
diff --git a/src/utils/translation/poparser.h b/src/utils/translation/poparser.h
index a51dba13d..bb7816161 100644
--- a/src/utils/translation/poparser.h
+++ b/src/utils/translation/poparser.h
@@ -24,7 +24,6 @@
 #include "localconsts.h"
 
 #include <sstream>
-#include <string>
 
 class PoDict;