29 files changed, 20 insertions, 20 deletions
diff --git a/src/update/InotifyDomain.cxx b/src/db/update/InotifyDomain.cxx
index 4a3ab2d79..4a3ab2d79 100644
--- a/src/update/InotifyDomain.cxx
+++ b/src/db/update/InotifyDomain.cxx
diff --git a/src/update/InotifyDomain.hxx b/src/db/update/InotifyDomain.hxx
index ad6202361..ad6202361 100644
--- a/src/update/InotifyDomain.hxx
+++ b/src/db/update/InotifyDomain.hxx
diff --git a/src/update/InotifyQueue.cxx b/src/db/update/InotifyQueue.cxx
index f4bccf7ae..f4bccf7ae 100644
--- a/src/update/InotifyQueue.cxx
+++ b/src/db/update/InotifyQueue.cxx
diff --git a/src/update/InotifyQueue.hxx b/src/db/update/InotifyQueue.hxx
index 99e2635b1..99e2635b1 100644
--- a/src/update/InotifyQueue.hxx
+++ b/src/db/update/InotifyQueue.hxx
diff --git a/src/update/InotifySource.cxx b/src/db/update/InotifySource.cxx
index c2783690e..c2783690e 100644
--- a/src/update/InotifySource.cxx
+++ b/src/db/update/InotifySource.cxx
diff --git a/src/update/InotifySource.hxx b/src/db/update/InotifySource.hxx
index 77c11093c..77c11093c 100644
--- a/src/update/InotifySource.hxx
+++ b/src/db/update/InotifySource.hxx
diff --git a/src/update/InotifyUpdate.cxx b/src/db/update/InotifyUpdate.cxx
index 7515990d7..7515990d7 100644
--- a/src/update/InotifyUpdate.cxx
+++ b/src/db/update/InotifyUpdate.cxx
diff --git a/src/update/InotifyUpdate.hxx b/src/db/update/InotifyUpdate.hxx
index 2d7d4e3b4..2d7d4e3b4 100644
--- a/src/update/InotifyUpdate.hxx
+++ b/src/db/update/InotifyUpdate.hxx
diff --git a/src/update/UpdateArchive.cxx b/src/db/update/UpdateArchive.cxx
index ec46a4e17..5e733202d 100644
--- a/src/update/UpdateArchive.cxx
+++ b/src/db/update/UpdateArchive.cxx
@@ -21,9 +21,9 @@
 #include "UpdateArchive.hxx"
 #include "UpdateInternal.hxx"
 #include "UpdateDomain.hxx"
-#include "DatabaseLock.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
 #include "Mapper.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "archive/ArchiveList.hxx"
diff --git a/src/update/UpdateArchive.hxx b/src/db/update/UpdateArchive.hxx
index 1fc9af349..1fc9af349 100644
--- a/src/update/UpdateArchive.hxx
+++ b/src/db/update/UpdateArchive.hxx
diff --git a/src/update/UpdateContainer.cxx b/src/db/update/UpdateContainer.cxx
index 0417aa999..c03d88748 100644
--- a/src/update/UpdateContainer.cxx
+++ b/src/db/update/UpdateContainer.cxx
@@ -22,9 +22,9 @@
 #include "UpdateInternal.hxx"
 #include "UpdateDatabase.hxx"
 #include "UpdateDomain.hxx"
-#include "DatabaseLock.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
 #include "decoder/DecoderPlugin.hxx"
 #include "decoder/DecoderList.hxx"
 #include "Mapper.hxx"
diff --git a/src/update/UpdateContainer.hxx b/src/db/update/UpdateContainer.hxx
index 8125f71ee..8125f71ee 100644
--- a/src/update/UpdateContainer.hxx
+++ b/src/db/update/UpdateContainer.hxx
diff --git a/src/update/UpdateDatabase.cxx b/src/db/update/UpdateDatabase.cxx
index fe49a90fb..8ef0b6d82 100644
--- a/src/update/UpdateDatabase.cxx
+++ b/src/db/update/UpdateDatabase.cxx
@@ -21,9 +21,9 @@
 #include "UpdateDatabase.hxx"
 #include "UpdateRemove.hxx"
 #include "PlaylistVector.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
-#include "DatabaseLock.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
+#include "db/DatabaseLock.hxx"
 
 #include <assert.h>
 #include <stddef.h>
diff --git a/src/update/UpdateDatabase.hxx b/src/db/update/UpdateDatabase.hxx
index bd7c395f2..bd7c395f2 100644
--- a/src/update/UpdateDatabase.hxx
+++ b/src/db/update/UpdateDatabase.hxx
diff --git a/src/update/UpdateDomain.cxx b/src/db/update/UpdateDomain.cxx
index 80ad4fd22..80ad4fd22 100644
--- a/src/update/UpdateDomain.cxx
+++ b/src/db/update/UpdateDomain.cxx
diff --git a/src/update/UpdateDomain.hxx b/src/db/update/UpdateDomain.hxx
index a6e994390..a6e994390 100644
--- a/src/update/UpdateDomain.hxx
+++ b/src/db/update/UpdateDomain.hxx
diff --git a/src/update/UpdateGlue.cxx b/src/db/update/UpdateGlue.cxx
index 29e5f3ca7..d18747ba1 100644
--- a/src/update/UpdateGlue.cxx
+++ b/src/db/update/UpdateGlue.cxx
@@ -24,7 +24,7 @@
 #include "UpdateRemove.hxx"
 #include "UpdateDomain.hxx"
 #include "Mapper.hxx"
-#include "DatabaseSimple.hxx"
+#include "db/DatabaseSimple.hxx"
 #include "Idle.hxx"
 #include "GlobalEvents.hxx"
 #include "util/Error.hxx"
diff --git a/src/update/UpdateGlue.hxx b/src/db/update/UpdateGlue.hxx
index 6e247414e..6e247414e 100644
--- a/src/update/UpdateGlue.hxx
+++ b/src/db/update/UpdateGlue.hxx
diff --git a/src/update/UpdateIO.cxx b/src/db/update/UpdateIO.cxx
index 8e4406dc8..f91caf359 100644
--- a/src/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 "Directory.hxx"
+#include "db/Directory.hxx"
 #include "Mapper.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
diff --git a/src/update/UpdateIO.hxx b/src/db/update/UpdateIO.hxx
index 819879422..819879422 100644
--- a/src/update/UpdateIO.hxx
+++ b/src/db/update/UpdateIO.hxx
diff --git a/src/update/UpdateInternal.hxx b/src/db/update/UpdateInternal.hxx
index 2e373bd06..2e373bd06 100644
--- a/src/update/UpdateInternal.hxx
+++ b/src/db/update/UpdateInternal.hxx
diff --git a/src/update/UpdateQueue.cxx b/src/db/update/UpdateQueue.cxx
index a6002f854..a6002f854 100644
--- a/src/update/UpdateQueue.cxx
+++ b/src/db/update/UpdateQueue.cxx
diff --git a/src/update/UpdateQueue.hxx b/src/db/update/UpdateQueue.hxx
index e4228f5ed..e4228f5ed 100644
--- a/src/update/UpdateQueue.hxx
+++ b/src/db/update/UpdateQueue.hxx
diff --git a/src/update/UpdateRemove.cxx b/src/db/update/UpdateRemove.cxx
index 30898b00b..c57758aef 100644
--- a/src/update/UpdateRemove.cxx
+++ b/src/db/update/UpdateRemove.cxx
@@ -23,8 +23,8 @@
 #include "GlobalEvents.hxx"
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
-#include "Song.hxx"
-#include "LightSong.hxx"
+#include "db/Song.hxx"
+#include "db/LightSong.hxx"
 #include "Main.hxx"
 #include "Instance.hxx"
 #include "Log.hxx"
diff --git a/src/update/UpdateRemove.hxx b/src/db/update/UpdateRemove.hxx
index d54e3aa80..d54e3aa80 100644
--- a/src/update/UpdateRemove.hxx
+++ b/src/db/update/UpdateRemove.hxx
diff --git a/src/update/UpdateSong.cxx b/src/db/update/UpdateSong.cxx
index 2db85a674..ac2d01cd2 100644
--- a/src/update/UpdateSong.cxx
+++ b/src/db/update/UpdateSong.cxx
@@ -24,9 +24,9 @@
 #include "UpdateDatabase.hxx"
 #include "UpdateContainer.hxx"
 #include "UpdateDomain.hxx"
-#include "DatabaseLock.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
 #include "decoder/DecoderList.hxx"
 #include "Log.hxx"
 
diff --git a/src/update/UpdateSong.hxx b/src/db/update/UpdateSong.hxx
index 5feb01928..5feb01928 100644
--- a/src/update/UpdateSong.hxx
+++ b/src/db/update/UpdateSong.hxx
diff --git a/src/update/UpdateWalk.cxx b/src/db/update/UpdateWalk.cxx
index 21754b31d..c5a9936e9 100644
--- a/src/update/UpdateWalk.cxx
+++ b/src/db/update/UpdateWalk.cxx
@@ -24,10 +24,10 @@
 #include "UpdateSong.hxx"
 #include "UpdateArchive.hxx"
 #include "UpdateDomain.hxx"
-#include "DatabaseLock.hxx"
-#include "DatabaseSimple.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/DatabaseSimple.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
 #include "PlaylistVector.hxx"
 #include "playlist/PlaylistRegistry.hxx"
 #include "Mapper.hxx"
diff --git a/src/update/UpdateWalk.hxx b/src/db/update/UpdateWalk.hxx
index e908829e3..e908829e3 100644
--- a/src/update/UpdateWalk.hxx
+++ b/src/db/update/UpdateWalk.hxx