summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-31 05:21:38 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-31 05:21:38 +0300
commitaa7860dc0e2fa4c39ac1df6d25c4390d7d1de235 (patch)
treeac3bf734411f399a22994881df166822349f6057
parentb0128502ed9eb867e474ed03975d8b1971c48a9c (diff)
downloadmanaplus-aa7860dc0e2fa4c39ac1df6d25c4390d7d1de235.tar.gz
manaplus-aa7860dc0e2fa4c39ac1df6d25c4390d7d1de235.tar.bz2
manaplus-aa7860dc0e2fa4c39ac1df6d25c4390d7d1de235.tar.xz
manaplus-aa7860dc0e2fa4c39ac1df6d25c4390d7d1de235.zip
Remove extra includes.
-rw-r--r--src/fs/virtfs/virtfsdirrwops.cpp1
-rw-r--r--src/fs/virtfs/virtfsrwops.cpp2
-rw-r--r--src/fs/virtfs/virtfsrwops.h4
-rw-r--r--src/maingui.cpp1
4 files changed, 3 insertions, 5 deletions
diff --git a/src/fs/virtfs/virtfsdirrwops.cpp b/src/fs/virtfs/virtfsdirrwops.cpp
index f5fc3acd1..64ad474e2 100644
--- a/src/fs/virtfs/virtfsdirrwops.cpp
+++ b/src/fs/virtfs/virtfsdirrwops.cpp
@@ -23,7 +23,6 @@
#include "logger.h"
#include "fs/virtfs/virtfile.h"
-#include "fs/virtfs/virtfs.h"
#include <SDL_rwops.h>
diff --git a/src/fs/virtfs/virtfsrwops.cpp b/src/fs/virtfs/virtfsrwops.cpp
index 8b5dc57b0..101ce66b6 100644
--- a/src/fs/virtfs/virtfsrwops.cpp
+++ b/src/fs/virtfs/virtfsrwops.cpp
@@ -52,6 +52,8 @@
#include "utils/fuzzer.h"
+#include <SDL_rwops.h>
+
#include "debug.h"
SDL_RWops *VirtFs::create_rwops(VirtFile *const file)
diff --git a/src/fs/virtfs/virtfsrwops.h b/src/fs/virtfs/virtfsrwops.h
index 28990706e..3f0a7663f 100644
--- a/src/fs/virtfs/virtfsrwops.h
+++ b/src/fs/virtfs/virtfsrwops.h
@@ -47,11 +47,9 @@
#include "localconsts.h"
-#include "fs/virtfs/rwopstypes.h"
-
#include <string>
-#include <SDL_rwops.h>
+struct SDL_RWops;
struct VirtFile;
namespace VirtFs
diff --git a/src/maingui.cpp b/src/maingui.cpp
index 668f044e9..301b088a0 100644
--- a/src/maingui.cpp
+++ b/src/maingui.cpp
@@ -27,7 +27,6 @@
#include "settings.h"
#include "fs/virtfs/virtfs.h"
-#include "fs/virtfs/virtfsrwops.h"
#include "utils/delete2.h"
#ifdef ANDROID