summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/windowmanager.cpp1
-rw-r--r--src/resources/beingcommon.h2
-rw-r--r--src/utils/files.cpp6
-rw-r--r--src/utils/virtfstools.h2
4 files changed, 4 insertions, 7 deletions
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index aa61bcb09..28a57e7e0 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -57,7 +57,6 @@
#include "input/touch/touchmanager.h"
#include "utils/delete2.h"
-#include "utils/files.h"
#include "utils/sdlcheckutils.h"
#include "utils/sdlhelper.h"
#include "utils/virtfstools.h"
diff --git a/src/resources/beingcommon.h b/src/resources/beingcommon.h
index 2b3d8c230..e2d39f958 100644
--- a/src/resources/beingcommon.h
+++ b/src/resources/beingcommon.h
@@ -27,6 +27,8 @@
#include "localconsts.h"
+UTILS_VIRTFSTOOLS_H
+
class BeingInfo;
struct SpriteDisplay;
diff --git a/src/utils/files.cpp b/src/utils/files.cpp
index 87c1b7b0b..deb3acb79 100644
--- a/src/utils/files.cpp
+++ b/src/utils/files.cpp
@@ -27,15 +27,13 @@
#endif // defined(ANDROID) || defined(__native_client__)
#include "utils/mkdir.h"
+#if defined(ANDROID) || defined(__native_client__)
#include "utils/paths.h"
#include "utils/virtfs.h"
#include "utils/virtfstools.h"
-#include "utils/virtlist.h"
-#include "utils/stringutils.h"
+#endif // defined(ANDROID) || defined(__native_client__)
-#include <algorithm>
#include <dirent.h>
-#include <sstream>
#include "debug.h"
diff --git a/src/utils/virtfstools.h b/src/utils/virtfstools.h
index 14cf302fe..f678d1e52 100644
--- a/src/utils/virtfstools.h
+++ b/src/utils/virtfstools.h
@@ -27,8 +27,6 @@
#include "localconsts.h"
-#include <string>
-
struct VirtFile;
namespace VirtFs