7 files changed, 2 insertions, 18 deletions
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
index bb69539e1..88fe8bf8f 100644
--- a/src/utils/base64.cpp
+++ b/src/utils/base64.cpp
@@ -29,8 +29,6 @@
 
 #include "utils/base64.h"
 
-#include <string>
-
 #include "debug.h"
 
 static char base64_table[] =
diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp
index 45130ced8..4ee5b6610 100644
--- a/src/utils/chatutils.cpp
+++ b/src/utils/chatutils.cpp
@@ -21,8 +21,9 @@
 #include "utils/chatutils.h"
 
 #include "actormanager.h"
-#include "guild.h"
+#ifdef TMWA_SUPPORT
 #include "guildmanager.h"
+#endif
 #include "party.h"
 
 #include "being/localplayer.h"
diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp
index e30b17854..86ba8d137 100644
--- a/src/utils/mkdir.cpp
+++ b/src/utils/mkdir.cpp
@@ -21,8 +21,6 @@
 
 #include "utils/mkdir.h"
 
-#include <cstring>
-
 #if defined WIN32
 #include <limits.h>
 #include <windows.h>
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index c9142da62..ced374d49 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -20,9 +20,6 @@
 
 #include "utils/process.h"
 
-#include <cstdarg>
-#include <cstdio>
-
 #include <unistd.h>
 
 #include "localconsts.h"
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index aa881cfd7..dac6dd7f2 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -22,13 +22,7 @@
 
 #include "utils/stringutils.h"
 
-#include <string>
 #include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <cctype>
-#include <list>
-#include <ctime>
 
 #include "debug.h"
 
diff --git a/src/utils/translation/podict.cpp b/src/utils/translation/podict.cpp
index 700157adf..ce9bc8aac 100644
--- a/src/utils/translation/podict.cpp
+++ b/src/utils/translation/podict.cpp
@@ -20,8 +20,6 @@
 
 #include "utils/translation/podict.h"
 
-#include "localconsts.h"
-
 #include "debug.h"
 
 std::string empty;
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 1cdb4678b..33173b3ee 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -30,8 +30,6 @@
 
 #include "utils/translation/podict.h"
 
-#include <fstream>
-
 #include "debug.h"
 
 namespace