11 files changed, 17 insertions, 11 deletions
diff --git a/src/utils/booleanoptions.h b/src/utils/booleanoptions.h
index 9b54eee58..b3ba113b8 100644
--- a/src/utils/booleanoptions.h
+++ b/src/utils/booleanoptions.h
@@ -23,6 +23,8 @@
 
 #include "utils/gettext.h"
 
+UTILS_GETTEXT_H
+
 // TRANSLATORS: chat option changed message
 #define BOOLEAN_OPTIONS _("Options to /%s are \"yes\", \"no\", \"true\", "\
 "\"false\", \"1\", \"0\".")
diff --git a/src/utils/cpu.cpp b/src/utils/cpu.cpp
index 5fb0195a6..672cc115f 100644
--- a/src/utils/cpu.cpp
+++ b/src/utils/cpu.cpp
@@ -22,7 +22,10 @@
 
 #include "logger.h"
 
-#if defined(__linux__) || defined(__linux)
+#if (defined(__amd64__) || defined(__i386__)) && defined(__GNUC__) \
+    && (GCC_VERSION >= 40800) && !defined(ANDROID)
+// nothing
+#elif defined(__linux__) || defined(__linux)
 #include "utils/stringutils.h"
 #endif
 
diff --git a/src/utils/glxhelper.cpp b/src/utils/glxhelper.cpp
index 65cca1166..eb78ddead 100644
--- a/src/utils/glxhelper.cpp
+++ b/src/utils/glxhelper.cpp
@@ -25,12 +25,8 @@
 #include "logger.h"
 
 #include "render/opengl/mglcheck.h"
-#include "render/opengl/mgldefines.h"
 
 #include "render/openglx/mglx.h"
-#include "render/openglx/mglxtypes.h"
-
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/utils/glxhelper.h b/src/utils/glxhelper.h
index 5ac35af96..f0aa9022c 100644
--- a/src/utils/glxhelper.h
+++ b/src/utils/glxhelper.h
@@ -21,8 +21,6 @@
 #ifndef UTILS_GLXHELPER_H
 #define UTILS_GLXHELPER_H
 
-#include "main.h"
-
 #if defined(USE_OPENGL) && defined(USE_X11)
 
 #include "localconsts.h"
diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h
index e1226f3b4..1a03b7a2f 100644
--- a/src/utils/physfsrwops.h
+++ b/src/utils/physfsrwops.h
@@ -30,6 +30,7 @@
 #pragma GCC diagnostic ignored "-Wswitch-default"
 #endif
 #include <SDL_stdinc.h>
+_SDL_stdinc_h
 #ifdef USE_SDL2
 #pragma GCC diagnostic pop
 #endif
diff --git a/src/utils/sdlhelper.cpp b/src/utils/sdlhelper.cpp
index bc5e75a56..bdb6dbd4e 100644
--- a/src/utils/sdlhelper.cpp
+++ b/src/utils/sdlhelper.cpp
@@ -23,7 +23,6 @@
 #include "utils/sdlhelper.h"
 
 #include "logger.h"
-#include "main.h"
 
 #include "utils/stringutils.h"
 
diff --git a/src/utils/sdlhelper.h b/src/utils/sdlhelper.h
index 081494953..89cd3f789 100644
--- a/src/utils/sdlhelper.h
+++ b/src/utils/sdlhelper.h
@@ -21,8 +21,6 @@
 #ifndef UTILS_SDLHELPER_H
 #define UTILS_SDLHELPER_H
 
-#include "main.h"
-
 #ifdef USE_SDL2
 #include "utils/sdl2helper.h"
 
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 556455f7b..748bec0e0 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -27,4 +27,6 @@
 #include "utils/xml/libxml.h"
 #endif  // ENABLE_PUGIXML
 
+XML_INCLUDE_DEFINE
+
 #endif  // UTILS_XML_H
diff --git a/src/utils/xml/libxml.h b/src/utils/xml/libxml.h
index 49968123e..1f5233ea0 100644
--- a/src/utils/xml/libxml.h
+++ b/src/utils/xml/libxml.h
@@ -25,13 +25,14 @@
 
 #ifdef ENABLE_LIBXML
 
+#define XML_INCLUDE_DEFINE
+
 #include "enums/simpletypes/skiperror.h"
 #include "enums/simpletypes/useresman.h"
 
 #include "utils/xml/libxml.inc"
 
 #include <libxml/tree.h>
-#include <libxml/xmlwriter.h>
 
 #include <string>
 
diff --git a/src/utils/xml/libxml.inc b/src/utils/xml/libxml.inc
index 238eafec9..ea847b88f 100644
--- a/src/utils/xml/libxml.inc
+++ b/src/utils/xml/libxml.inc
@@ -23,6 +23,10 @@
 
 #ifdef ENABLE_LIBXML
 
+#include <libxml/xmlwriter.h>
+
+__XML_XMLWRITER_H__
+
 #define XmlNodePtr xmlNodePtr
 #define XmlNodePtrConst xmlNode *const
 #define XmlStrEqual(str1, str2) xmlStrEqual(str1, \
diff --git a/src/utils/xml/pugixml.h b/src/utils/xml/pugixml.h
index ed4456bb7..ef7b3e798 100644
--- a/src/utils/xml/pugixml.h
+++ b/src/utils/xml/pugixml.h
@@ -25,6 +25,8 @@
 
 #ifdef ENABLE_PUGIXML
 
+#define XML_INCLUDE_DEFINE
+
 #include "enums/simpletypes/skiperror.h"
 #include "enums/simpletypes/useresman.h"