db/simple: create dedicated directory

8 files changed, 13 insertions, 13 deletions

diff --git a/src/db/update/Archive.cxx b/src/db/update/Archive.cxx
index 54f27a30e..fc8f1fcbf 100644
--- a/src/db/update/Archive.cxx
+++ b/src/db/update/Archive.cxx
@@ -21,8 +21,8 @@
 #include "Walk.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseLock.hxx"
-#include "db/Directory.hxx"
-#include "db/Song.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
 #include "storage/StorageInterface.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "storage/FileInfo.hxx"
diff --git a/src/db/update/Container.cxx b/src/db/update/Container.cxx
index aedcf42ac..9f8d84839 100644
--- a/src/db/update/Container.cxx
+++ b/src/db/update/Container.cxx
@@ -21,8 +21,8 @@
 #include "Walk.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseLock.hxx"
-#include "db/Directory.hxx"
-#include "db/Song.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
 #include "storage/StorageInterface.hxx"
 #include "decoder/DecoderPlugin.hxx"
 #include "decoder/DecoderList.hxx"
diff --git a/src/db/update/Editor.cxx b/src/db/update/Editor.cxx
index c8f58931f..c3c1a23d6 100644
--- a/src/db/update/Editor.cxx
+++ b/src/db/update/Editor.cxx
@@ -21,9 +21,9 @@
 #include "Editor.hxx"
 #include "Remove.hxx"
 #include "db/PlaylistVector.hxx"
-#include "db/Directory.hxx"
-#include "db/Song.hxx"
 #include "db/DatabaseLock.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
 
 #include <assert.h>
 #include <stddef.h>
diff --git a/src/db/update/Remove.cxx b/src/db/update/Remove.cxx
index 102347905..dfada05b2 100644
--- a/src/db/update/Remove.cxx
+++ b/src/db/update/Remove.cxx
@@ -20,7 +20,7 @@
 #include "config.h" /* must be first for large file support */
 #include "Remove.hxx"
 #include "UpdateDomain.hxx"
-#include "db/Song.hxx"
+#include "db/plugins/simple/Song.hxx"
 #include "db/LightSong.hxx"
 #include "db/DatabaseListener.hxx"
 #include "Log.hxx"
diff --git a/src/db/update/UpdateGlue.cxx b/src/db/update/UpdateGlue.cxx
index c1d563ffd..df0e87144 100644
--- a/src/db/update/UpdateGlue.cxx
+++ b/src/db/update/UpdateGlue.cxx
@@ -21,7 +21,7 @@
 #include "Service.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseListener.hxx"
-#include "db/plugins/SimpleDatabasePlugin.hxx"
+#include "db/plugins/simple/SimpleDatabasePlugin.hxx"
 #include "Idle.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
diff --git a/src/db/update/UpdateIO.cxx b/src/db/update/UpdateIO.cxx
index 73295cb02..fa19a8b5a 100644
--- a/src/db/update/UpdateIO.cxx
+++ b/src/db/update/UpdateIO.cxx
@@ -20,7 +20,7 @@
 #include "config.h" /* must be first for large file support */
 #include "UpdateIO.hxx"
 #include "UpdateDomain.hxx"
-#include "db/Directory.hxx"
+#include "db/plugins/simple/Directory.hxx"
 #include "storage/FileInfo.hxx"
 #include "storage/StorageInterface.hxx"
 #include "fs/Traits.hxx"
diff --git a/src/db/update/UpdateSong.cxx b/src/db/update/UpdateSong.cxx
index 804aea952..6b24276fd 100644
--- a/src/db/update/UpdateSong.cxx
+++ b/src/db/update/UpdateSong.cxx
@@ -22,8 +22,8 @@
 #include "UpdateIO.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseLock.hxx"
-#include "db/Directory.hxx"
-#include "db/Song.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
 #include "decoder/DecoderList.hxx"
 #include "storage/FileInfo.hxx"
 #include "Log.hxx"
diff --git a/src/db/update/Walk.cxx b/src/db/update/Walk.cxx
index 2cb360bf6..c65480873 100644
--- a/src/db/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@@ -23,10 +23,10 @@
 #include "Editor.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseLock.hxx"
-#include "db/Directory.hxx"
-#include "db/Song.hxx"
 #include "db/PlaylistVector.hxx"
 #include "db/Uri.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
 #include "storage/StorageInterface.hxx"
 #include "playlist/PlaylistRegistry.hxx"
 #include "ExcludeList.hxx"