96 files changed, 56 insertions, 56 deletions
diff --git a/src/DatabaseError.cxx b/src/db/DatabaseError.cxx
index e0cbdd6a3..e0cbdd6a3 100644
--- a/src/DatabaseError.cxx
+++ b/src/db/DatabaseError.cxx
diff --git a/src/DatabaseError.hxx b/src/db/DatabaseError.hxx
index 1485a21b6..1485a21b6 100644
--- a/src/DatabaseError.hxx
+++ b/src/db/DatabaseError.hxx
diff --git a/src/DatabaseGlue.cxx b/src/db/DatabaseGlue.cxx
index ce53ec184..3734e156c 100644
--- a/src/DatabaseGlue.cxx
+++ b/src/db/DatabaseGlue.cxx
@@ -20,14 +20,14 @@
 #include "config.h"
 #include "DatabaseGlue.hxx"
 #include "DatabaseSimple.hxx"
-#include "DatabaseRegistry.hxx"
+#include "Registry.hxx"
 #include "DatabaseError.hxx"
 #include "Directory.hxx"
 #include "util/Error.hxx"
 #include "config/ConfigData.hxx"
 #include "Stats.hxx"
 #include "DatabasePlugin.hxx"
-#include "db/SimpleDatabasePlugin.hxx"
+#include "plugins/SimpleDatabasePlugin.hxx"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/DatabaseGlue.hxx b/src/db/DatabaseGlue.hxx
index 78032edb2..78032edb2 100644
--- a/src/DatabaseGlue.hxx
+++ b/src/db/DatabaseGlue.hxx
diff --git a/src/DatabaseListener.hxx b/src/db/DatabaseListener.hxx
index 4da458866..4da458866 100644
--- a/src/DatabaseListener.hxx
+++ b/src/db/DatabaseListener.hxx
diff --git a/src/DatabaseLock.cxx b/src/db/DatabaseLock.cxx
index c0b5e4844..c0b5e4844 100644
--- a/src/DatabaseLock.cxx
+++ b/src/db/DatabaseLock.cxx
diff --git a/src/DatabaseLock.hxx b/src/db/DatabaseLock.hxx
index 9d0b0c152..9d0b0c152 100644
--- a/src/DatabaseLock.hxx
+++ b/src/db/DatabaseLock.hxx
diff --git a/src/DatabasePlaylist.cxx b/src/db/DatabasePlaylist.cxx
index 58742ca64..64b365d2a 100644
--- a/src/DatabasePlaylist.cxx
+++ b/src/db/DatabasePlaylist.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "DatabasePlaylist.hxx"
-#include "DatabaseSelection.hxx"
+#include "Selection.hxx"
 #include "PlaylistFile.hxx"
 #include "DatabaseGlue.hxx"
 #include "DatabasePlugin.hxx"
diff --git a/src/DatabasePlaylist.hxx b/src/db/DatabasePlaylist.hxx
index 1ee7584d3..1ee7584d3 100644
--- a/src/DatabasePlaylist.hxx
+++ b/src/db/DatabasePlaylist.hxx
diff --git a/src/DatabasePlugin.hxx b/src/db/DatabasePlugin.hxx
index 2ded7f736..b0cb41502 100644
--- a/src/DatabasePlugin.hxx
+++ b/src/db/DatabasePlugin.hxx
@@ -26,7 +26,7 @@
 #ifndef MPD_DATABASE_PLUGIN_HXX
 #define MPD_DATABASE_PLUGIN_HXX
 
-#include "DatabaseVisitor.hxx"
+#include "Visitor.hxx"
 #include "tag/TagType.h"
 #include "Compiler.h"
 
diff --git a/src/DatabasePrint.cxx b/src/db/DatabasePrint.cxx
index b22141aef..9ed0b0826 100644
--- a/src/DatabasePrint.cxx
+++ b/src/db/DatabasePrint.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "DatabasePrint.hxx"
-#include "DatabaseSelection.hxx"
+#include "Selection.hxx"
 #include "SongFilter.hxx"
 #include "SongPrint.hxx"
 #include "TimePrint.hxx"
diff --git a/src/DatabasePrint.hxx b/src/db/DatabasePrint.hxx
index 2007e256b..2007e256b 100644
--- a/src/DatabasePrint.hxx
+++ b/src/db/DatabasePrint.hxx
diff --git a/src/DatabaseQueue.cxx b/src/db/DatabaseQueue.cxx
index ee1dbd57c..ee1dbd57c 100644
--- a/src/DatabaseQueue.cxx
+++ b/src/db/DatabaseQueue.cxx
diff --git a/src/DatabaseQueue.hxx b/src/db/DatabaseQueue.hxx
index e653f973c..e653f973c 100644
--- a/src/DatabaseQueue.hxx
+++ b/src/db/DatabaseQueue.hxx
diff --git a/src/DatabaseSave.cxx b/src/db/DatabaseSave.cxx
index e9c81442b..e9c81442b 100644
--- a/src/DatabaseSave.cxx
+++ b/src/db/DatabaseSave.cxx
diff --git a/src/DatabaseSave.hxx b/src/db/DatabaseSave.hxx
index 3bd3377ae..3bd3377ae 100644
--- a/src/DatabaseSave.hxx
+++ b/src/db/DatabaseSave.hxx
diff --git a/src/DatabaseSimple.hxx b/src/db/DatabaseSimple.hxx
index b99b3bfa5..b99b3bfa5 100644
--- a/src/DatabaseSimple.hxx
+++ b/src/db/DatabaseSimple.hxx
diff --git a/src/DatabaseSong.cxx b/src/db/DatabaseSong.cxx
index 592d38b85..592d38b85 100644
--- a/src/DatabaseSong.cxx
+++ b/src/db/DatabaseSong.cxx
diff --git a/src/DatabaseSong.hxx b/src/db/DatabaseSong.hxx
index 0200af6b8..0200af6b8 100644
--- a/src/DatabaseSong.hxx
+++ b/src/db/DatabaseSong.hxx
diff --git a/src/Directory.cxx b/src/db/Directory.cxx
index 14cf88eb5..e74eabd19 100644
--- a/src/Directory.cxx
+++ b/src/db/Directory.cxx
@@ -22,7 +22,7 @@
 #include "LightDirectory.hxx"
 #include "SongFilter.hxx"
 #include "PlaylistVector.hxx"
-#include "DatabaseLock.hxx"
+#include "db/DatabaseLock.hxx"
 #include "SongSort.hxx"
 #include "Song.hxx"
 #include "LightSong.hxx"
diff --git a/src/Directory.hxx b/src/db/Directory.hxx
index c64a028ba..e114b27f4 100644
--- a/src/Directory.hxx
+++ b/src/db/Directory.hxx
@@ -23,7 +23,7 @@
 #include "check.h"
 #include "util/list.h"
 #include "Compiler.h"
-#include "DatabaseVisitor.hxx"
+#include "db/Visitor.hxx"
 #include "PlaylistVector.hxx"
 
 #include <string>
diff --git a/src/DirectorySave.cxx b/src/db/DirectorySave.cxx
index 499f84734..499f84734 100644
--- a/src/DirectorySave.cxx
+++ b/src/db/DirectorySave.cxx
diff --git a/src/DirectorySave.hxx b/src/db/DirectorySave.hxx
index 07e9e158b..07e9e158b 100644
--- a/src/DirectorySave.hxx
+++ b/src/db/DirectorySave.hxx
diff --git a/src/DatabaseHelpers.cxx b/src/db/Helpers.cxx
index 58e7aaa3b..579b83e15 100644
--- a/src/DatabaseHelpers.cxx
+++ b/src/db/Helpers.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "DatabaseHelpers.hxx"
+#include "Helpers.hxx"
 #include "DatabasePlugin.hxx"
 #include "LightSong.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/DatabaseHelpers.hxx b/src/db/Helpers.hxx
index 0880e4a56..24db260c0 100644
--- a/src/DatabaseHelpers.hxx
+++ b/src/db/Helpers.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_MEMORY_DATABASE_PLUGIN_HXX
 #define MPD_MEMORY_DATABASE_PLUGIN_HXX
 
-#include "DatabaseVisitor.hxx"
+#include "Visitor.hxx"
 #include "tag/TagType.h"
 
 class Error;
diff --git a/src/LightDirectory.hxx b/src/db/LightDirectory.hxx
index d134151a4..d134151a4 100644
--- a/src/LightDirectory.hxx
+++ b/src/db/LightDirectory.hxx
diff --git a/src/LightSong.cxx b/src/db/LightSong.cxx
index af1e801f8..af1e801f8 100644
--- a/src/LightSong.cxx
+++ b/src/db/LightSong.cxx
diff --git a/src/LightSong.hxx b/src/db/LightSong.hxx
index c0cd47749..c0cd47749 100644
--- a/src/LightSong.hxx
+++ b/src/db/LightSong.hxx
diff --git a/src/DatabaseRegistry.cxx b/src/db/Registry.cxx
index b8a91343e..295d3cf2a 100644
--- a/src/DatabaseRegistry.cxx
+++ b/src/db/Registry.cxx
@@ -18,10 +18,10 @@
  */
 
 #include "config.h"
-#include "DatabaseRegistry.hxx"
-#include "db/SimpleDatabasePlugin.hxx"
-#include "db/ProxyDatabasePlugin.hxx"
-#include "db/UpnpDatabasePlugin.hxx"
+#include "Registry.hxx"
+#include "plugins/SimpleDatabasePlugin.hxx"
+#include "plugins/ProxyDatabasePlugin.hxx"
+#include "plugins/UpnpDatabasePlugin.hxx"
 
 #include <string.h>
 
diff --git a/src/DatabaseRegistry.hxx b/src/db/Registry.hxx
index 050842e21..050842e21 100644
--- a/src/DatabaseRegistry.hxx
+++ b/src/db/Registry.hxx
diff --git a/src/DatabaseSelection.cxx b/src/db/Selection.cxx
index 035321252..96382eed7 100644
--- a/src/DatabaseSelection.cxx
+++ b/src/db/Selection.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "DatabaseSelection.hxx"
+#include "Selection.hxx"
 #include "SongFilter.hxx"
 
 DatabaseSelection::DatabaseSelection(const char *_uri, bool _recursive,
diff --git a/src/DatabaseSelection.hxx b/src/db/Selection.hxx
index a39ce7afe..a39ce7afe 100644
--- a/src/DatabaseSelection.hxx
+++ b/src/db/Selection.hxx
diff --git a/src/Song.cxx b/src/db/Song.cxx
index 15924a40a..15924a40a 100644
--- a/src/Song.cxx
+++ b/src/db/Song.cxx
diff --git a/src/Song.hxx b/src/db/Song.hxx
index 0b94fe6d0..0b94fe6d0 100644
--- a/src/Song.hxx
+++ b/src/db/Song.hxx
diff --git a/src/SongSort.cxx b/src/db/SongSort.cxx
index dcea033b6..dcea033b6 100644
--- a/src/SongSort.cxx
+++ b/src/db/SongSort.cxx
diff --git a/src/SongSort.hxx b/src/db/SongSort.hxx
index 28b903532..28b903532 100644
--- a/src/SongSort.hxx
+++ b/src/db/SongSort.hxx
diff --git a/src/DatabaseVisitor.hxx b/src/db/Visitor.hxx
index 0ec29bf49..0ec29bf49 100644
--- a/src/DatabaseVisitor.hxx
+++ b/src/db/Visitor.hxx
diff --git a/src/db/LazyDatabase.cxx b/src/db/plugins/LazyDatabase.cxx
index 6a01ffb82..6a01ffb82 100644
--- a/src/db/LazyDatabase.cxx
+++ b/src/db/plugins/LazyDatabase.cxx
diff --git a/src/db/LazyDatabase.hxx b/src/db/plugins/LazyDatabase.hxx
index f718ecb3f..336b8558f 100644
--- a/src/db/LazyDatabase.hxx
+++ b/src/db/plugins/LazyDatabase.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_LAZY_DATABASE_PLUGIN_HXX
 #define MPD_LAZY_DATABASE_PLUGIN_HXX
 
-#include "DatabasePlugin.hxx"
+#include "db/DatabasePlugin.hxx"
 
 /**
  * A wrapper for a #Database object that gets opened on the first
diff --git a/src/db/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx
index 7253ba0d0..daa963c7d 100644
--- a/src/db/ProxyDatabasePlugin.cxx
+++ b/src/db/plugins/ProxyDatabasePlugin.cxx
@@ -19,13 +19,13 @@
 
 #include "config.h"
 #include "ProxyDatabasePlugin.hxx"
-#include "DatabasePlugin.hxx"
-#include "DatabaseListener.hxx"
-#include "DatabaseSelection.hxx"
-#include "DatabaseError.hxx"
+#include "db/DatabasePlugin.hxx"
+#include "db/DatabaseListener.hxx"
+#include "db/Selection.hxx"
+#include "db/DatabaseError.hxx"
 #include "PlaylistInfo.hxx"
-#include "LightDirectory.hxx"
-#include "LightSong.hxx"
+#include "db/LightDirectory.hxx"
+#include "db/LightSong.hxx"
 #include "SongFilter.hxx"
 #include "Compiler.h"
 #include "config/ConfigData.hxx"
diff --git a/src/db/ProxyDatabasePlugin.hxx b/src/db/plugins/ProxyDatabasePlugin.hxx
index 699d374b5..699d374b5 100644
--- a/src/db/ProxyDatabasePlugin.hxx
+++ b/src/db/plugins/ProxyDatabasePlugin.hxx
diff --git a/src/db/SimpleDatabasePlugin.cxx b/src/db/plugins/SimpleDatabasePlugin.cxx
index 73e080b41..55e08b6d7 100644
--- a/src/db/SimpleDatabasePlugin.cxx
+++ b/src/db/plugins/SimpleDatabasePlugin.cxx
@@ -19,15 +19,15 @@
 
 #include "config.h"
 #include "SimpleDatabasePlugin.hxx"
-#include "DatabaseSelection.hxx"
-#include "DatabaseHelpers.hxx"
-#include "LightDirectory.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
+#include "db/Selection.hxx"
+#include "db/Helpers.hxx"
+#include "db/LightDirectory.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
 #include "SongFilter.hxx"
-#include "DatabaseSave.hxx"
-#include "DatabaseLock.hxx"
-#include "DatabaseError.hxx"
+#include "db/DatabaseSave.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/DatabaseError.hxx"
 #include "fs/TextFile.hxx"
 #include "config/ConfigData.hxx"
 #include "fs/FileSystem.hxx"
diff --git a/src/db/SimpleDatabasePlugin.hxx b/src/db/plugins/SimpleDatabasePlugin.hxx
index 509b91e4e..137a60884 100644
--- a/src/db/SimpleDatabasePlugin.hxx
+++ b/src/db/plugins/SimpleDatabasePlugin.hxx
@@ -20,9 +20,9 @@
 #ifndef MPD_SIMPLE_DATABASE_PLUGIN_HXX
 #define MPD_SIMPLE_DATABASE_PLUGIN_HXX
 
-#include "DatabasePlugin.hxx"
+#include "db/DatabasePlugin.hxx"
 #include "fs/AllocatedPath.hxx"
-#include "LightSong.hxx"
+#include "db/LightSong.hxx"
 #include "Compiler.h"
 
 #include <cassert>
diff --git a/src/db/UpnpDatabasePlugin.cxx b/src/db/plugins/UpnpDatabasePlugin.cxx
index 46084061f..10575fc94 100644
--- a/src/db/UpnpDatabasePlugin.cxx
+++ b/src/db/plugins/UpnpDatabasePlugin.cxx
@@ -26,11 +26,11 @@
 #include "upnp/Directory.hxx"
 #include "upnp/Tags.hxx"
 #include "upnp/Util.hxx"
-#include "DatabasePlugin.hxx"
-#include "DatabaseSelection.hxx"
-#include "DatabaseError.hxx"
-#include "LightDirectory.hxx"
-#include "LightSong.hxx"
+#include "db/DatabasePlugin.hxx"
+#include "db/Selection.hxx"
+#include "db/DatabaseError.hxx"
+#include "db/LightDirectory.hxx"
+#include "db/LightSong.hxx"
 #include "config/ConfigData.hxx"
 #include "tag/TagBuilder.hxx"
 #include "tag/TagTable.hxx"
diff --git a/src/db/UpnpDatabasePlugin.hxx b/src/db/plugins/UpnpDatabasePlugin.hxx
index 0228405cd..0228405cd 100644
--- a/src/db/UpnpDatabasePlugin.hxx
+++ b/src/db/plugins/UpnpDatabasePlugin.hxx
diff --git a/src/db/upnp/Action.hxx b/src/db/plugins/upnp/Action.hxx
index 28c88be92..28c88be92 100644
--- a/src/db/upnp/Action.hxx
+++ b/src/db/plugins/upnp/Action.hxx
diff --git a/src/db/upnp/ContentDirectoryService.cxx b/src/db/plugins/upnp/ContentDirectoryService.cxx
index 35445e09d..35445e09d 100644
--- a/src/db/upnp/ContentDirectoryService.cxx
+++ b/src/db/plugins/upnp/ContentDirectoryService.cxx
diff --git a/src/db/upnp/ContentDirectoryService.hxx b/src/db/plugins/upnp/ContentDirectoryService.hxx
index 24be5dfbf..24be5dfbf 100644
--- a/src/db/upnp/ContentDirectoryService.hxx
+++ b/src/db/plugins/upnp/ContentDirectoryService.hxx
diff --git a/src/db/upnp/Device.cxx b/src/db/plugins/upnp/Device.cxx
index 7bec1cccd..7bec1cccd 100644
--- a/src/db/upnp/Device.cxx
+++ b/src/db/plugins/upnp/Device.cxx
diff --git a/src/db/upnp/Device.hxx b/src/db/plugins/upnp/Device.hxx
index dd7ecac2d..dd7ecac2d 100644
--- a/src/db/upnp/Device.hxx
+++ b/src/db/plugins/upnp/Device.hxx
diff --git a/src/db/upnp/Directory.cxx b/src/db/plugins/upnp/Directory.cxx
index adb8b213a..adb8b213a 100644
--- a/src/db/upnp/Directory.cxx
+++ b/src/db/plugins/upnp/Directory.cxx
diff --git a/src/db/upnp/Directory.hxx b/src/db/plugins/upnp/Directory.hxx
index 433979900..433979900 100644
--- a/src/db/upnp/Directory.hxx
+++ b/src/db/plugins/upnp/Directory.hxx
diff --git a/src/db/upnp/Discovery.cxx b/src/db/plugins/upnp/Discovery.cxx
index 5203dba83..5203dba83 100644
--- a/src/db/upnp/Discovery.cxx
+++ b/src/db/plugins/upnp/Discovery.cxx
diff --git a/src/db/upnp/Discovery.hxx b/src/db/plugins/upnp/Discovery.hxx
index 4c64fe420..4c64fe420 100644
--- a/src/db/upnp/Discovery.hxx
+++ b/src/db/plugins/upnp/Discovery.hxx
diff --git a/src/db/upnp/Domain.cxx b/src/db/plugins/upnp/Domain.cxx
index 010d4c7c2..010d4c7c2 100644
--- a/src/db/upnp/Domain.cxx
+++ b/src/db/plugins/upnp/Domain.cxx
diff --git a/src/db/upnp/Domain.hxx b/src/db/plugins/upnp/Domain.hxx
index ec01ef735..ec01ef735 100644
--- a/src/db/upnp/Domain.hxx
+++ b/src/db/plugins/upnp/Domain.hxx
diff --git a/src/db/upnp/Object.cxx b/src/db/plugins/upnp/Object.cxx
index 703fb0be4..703fb0be4 100644
--- a/src/db/upnp/Object.cxx
+++ b/src/db/plugins/upnp/Object.cxx
diff --git a/src/db/upnp/Object.hxx b/src/db/plugins/upnp/Object.hxx
index 16a66c774..16a66c774 100644
--- a/src/db/upnp/Object.hxx
+++ b/src/db/plugins/upnp/Object.hxx
diff --git a/src/db/upnp/Tags.cxx b/src/db/plugins/upnp/Tags.cxx
index fd65df4d0..fd65df4d0 100644
--- a/src/db/upnp/Tags.cxx
+++ b/src/db/plugins/upnp/Tags.cxx
diff --git a/src/db/upnp/Tags.hxx b/src/db/plugins/upnp/Tags.hxx
index ec6d18478..ec6d18478 100644
--- a/src/db/upnp/Tags.hxx
+++ b/src/db/plugins/upnp/Tags.hxx
diff --git a/src/db/upnp/Util.cxx b/src/db/plugins/upnp/Util.cxx
index cf34a47d3..cf34a47d3 100644
--- a/src/db/upnp/Util.cxx
+++ b/src/db/plugins/upnp/Util.cxx
diff --git a/src/db/upnp/Util.hxx b/src/db/plugins/upnp/Util.hxx
index 58e382faa..58e382faa 100644
--- a/src/db/upnp/Util.hxx
+++ b/src/db/plugins/upnp/Util.hxx
diff --git a/src/db/upnp/WorkQueue.hxx b/src/db/plugins/upnp/WorkQueue.hxx
index fe8ce53f9..fe8ce53f9 100644
--- a/src/db/upnp/WorkQueue.hxx
+++ b/src/db/plugins/upnp/WorkQueue.hxx
diff --git a/src/db/upnp/ixmlwrap.cxx b/src/db/plugins/upnp/ixmlwrap.cxx
index 6a2829cf9..6a2829cf9 100644
--- a/src/db/upnp/ixmlwrap.cxx
+++ b/src/db/plugins/upnp/ixmlwrap.cxx
diff --git a/src/db/upnp/ixmlwrap.hxx b/src/db/plugins/upnp/ixmlwrap.hxx
index 0d519a323..0d519a323 100644
--- a/src/db/upnp/ixmlwrap.hxx
+++ b/src/db/plugins/upnp/ixmlwrap.hxx
diff --git a/src/db/upnp/upnpplib.cxx b/src/db/plugins/upnp/upnpplib.cxx
index 27b4e0564..27b4e0564 100644
--- a/src/db/upnp/upnpplib.cxx
+++ b/src/db/plugins/upnp/upnpplib.cxx
diff --git a/src/db/upnp/upnpplib.hxx b/src/db/plugins/upnp/upnpplib.hxx
index 6759aa16d..6759aa16d 100644
--- a/src/db/upnp/upnpplib.hxx
+++ b/src/db/plugins/upnp/upnpplib.hxx
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