storage/Interface: include cleanup

7 files changed, 11 insertions, 2 deletions

diff --git a/src/SongPrint.cxx b/src/SongPrint.cxx
index 0c1b93265..05d462b6d 100644
--- a/src/SongPrint.cxx
+++ b/src/SongPrint.cxx
@@ -25,6 +25,7 @@
 #include "TimePrint.hxx"
 #include "TagPrint.hxx"
 #include "client/Client.hxx"
+#include "fs/Traits.hxx"
 #include "util/UriUtil.hxx"
 
 #define SONG_FILE "file: "
diff --git a/src/command/FileCommands.cxx b/src/command/FileCommands.cxx
index 0a4f9592a..1b6a11cf5 100644
--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@@ -36,6 +36,7 @@
 #include "storage/StorageInterface.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
+#include "fs/DirectoryReader.hxx"
 #include "TimePrint.hxx"
 #include "ls.hxx"
 
diff --git a/src/db/DatabaseSong.cxx b/src/db/DatabaseSong.cxx
index 699213835..dd27aa8b3 100644
--- a/src/db/DatabaseSong.cxx
+++ b/src/db/DatabaseSong.cxx
@@ -24,6 +24,8 @@
 #include "DetachedSong.hxx"
 #include "storage/StorageInterface.hxx"
 
+#include <assert.h>
+
 DetachedSong
 DatabaseDetachSong(const Storage &storage, const LightSong &song)
 {
diff --git a/src/db/update/UpdateIO.cxx b/src/db/update/UpdateIO.cxx
index fa19a8b5a..9e43d1289 100644
--- a/src/db/update/UpdateIO.cxx
+++ b/src/db/update/UpdateIO.cxx
@@ -25,6 +25,7 @@
 #include "storage/StorageInterface.hxx"
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
+#include "fs/AllocatedPath.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
 
diff --git a/src/storage/CompositeStorage.cxx b/src/storage/CompositeStorage.cxx
index ac6fcecd9..bd093e459 100644
--- a/src/storage/CompositeStorage.cxx
+++ b/src/storage/CompositeStorage.cxx
@@ -20,11 +20,14 @@
 #include "config.h"
 #include "CompositeStorage.hxx"
 #include "FileInfo.hxx"
+#include "fs/AllocatedPath.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 
 #include <set>
 
+#include <string.h>
+
 static constexpr Domain composite_domain("composite");
 
 /**
diff --git a/src/storage/StorageInterface.hxx b/src/storage/StorageInterface.hxx
index 892e8e43b..4484815bc 100644
--- a/src/storage/StorageInterface.hxx
+++ b/src/storage/StorageInterface.hxx
@@ -21,13 +21,13 @@
 #define MPD_STORAGE_INTERFACE_HXX
 
 #include "check.h"
-#include "fs/AllocatedPath.hxx"
-#include "fs/DirectoryReader.hxx"
+#include "Compiler.h"
 
 #include <string>
 
 struct FileInfo;
 class AllocatedPath;
+class Error;
 
 class StorageDirectoryReader {
 public:
diff --git a/src/storage/plugins/SmbclientStorage.cxx b/src/storage/plugins/SmbclientStorage.cxx
index a73c8d65c..9a181de89 100644
--- a/src/storage/plugins/SmbclientStorage.cxx
+++ b/src/storage/plugins/SmbclientStorage.cxx
@@ -24,6 +24,7 @@
 #include "storage/FileInfo.hxx"
 #include "lib/smbclient/Init.hxx"
 #include "lib/smbclient/Mutex.hxx"
+#include "fs/Traits.hxx"
 #include "util/Error.hxx"
 #include "thread/Mutex.hxx"