Merge lp:~widelands-dev/widelands/io-dependency-fix into lp:widelands

[Arty]

Remove a few superfluous includes which also breaks a small dependency cycle

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4301. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/460550561.
Appveyor build 4094. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_io_dependency_fix-4094.

[kaputtnik (franku)]

Can you please set a 'Commit Message' to the merge proposal? This is used by bunnybot when merging into trunk :-)

[GunChleoc (gunchleoc)]

LGTM :)

@bunnybot merge

review: Approve

=== modified file 'src/io/filesystem/CMakeLists.txt'
--- src/io/filesystem/CMakeLists.txt	2018-05-16 13:51:48 +0000
+++ src/io/filesystem/CMakeLists.txt	2018-11-27 23:29:05 +0000
@@ -18,7 +18,6 @@
     base_log
     base_macros
     graphic_text_layout
-    io_fileread
     io_stream
     third_party_minizip
 )

=== modified file 'src/io/filesystem/disk_filesystem.cc'
--- src/io/filesystem/disk_filesystem.cc	2018-11-14 10:14:50 +0000
+++ src/io/filesystem/disk_filesystem.cc	2018-11-27 23:29:05 +0000
@@ -41,7 +41,6 @@
 #include <unistd.h>
 #endif
 
-#include "base/log.h"
 #include "base/macros.h"
 #include "base/wexception.h"
 #include "io/filesystem/filesystem_exceptions.h"

=== modified file 'src/io/filesystem/layered_filesystem.cc'
--- src/io/filesystem/layered_filesystem.cc	2018-05-17 05:01:45 +0000
+++ src/io/filesystem/layered_filesystem.cc	2018-11-27 23:29:05 +0000
@@ -22,9 +22,7 @@
 #include <cstdio>
 #include <memory>
 
-#include "base/log.h"
 #include "base/wexception.h"
-#include "io/fileread.h"
 #include "io/streamread.h"
 
 LayeredFileSystem* g_fs;