34 files changed, 23 insertions, 23 deletions

diff --git a/Makefile.am b/Makefile.am
index 77a37d09d..56ae9c98b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,16 +123,16 @@ src_mpd_SOURCES = \
 	src/FilterPlugin.cxx src/FilterPlugin.hxx \
 	src/FilterInternal.hxx \
 	src/FilterRegistry.cxx src/FilterRegistry.hxx \
-	src/UpdateDomain.cxx src/UpdateDomain.hxx \
-	src/UpdateGlue.cxx src/UpdateGlue.hxx \
-	src/UpdateQueue.cxx src/UpdateQueue.hxx \
-	src/UpdateIO.cxx src/UpdateIO.hxx \
-	src/UpdateDatabase.cxx src/UpdateDatabase.hxx \
-	src/UpdateWalk.cxx src/UpdateWalk.hxx \
-	src/UpdateSong.cxx src/UpdateSong.hxx \
-	src/UpdateContainer.cxx src/UpdateContainer.hxx \
-	src/UpdateInternal.hxx \
-	src/UpdateRemove.cxx src/UpdateRemove.hxx \
+	src/update/UpdateDomain.cxx src/update/UpdateDomain.hxx \
+	src/update/UpdateGlue.cxx src/update/UpdateGlue.hxx \
+	src/update/UpdateQueue.cxx src/update/UpdateQueue.hxx \
+	src/update/UpdateIO.cxx src/update/UpdateIO.hxx \
+	src/update/UpdateDatabase.cxx src/update/UpdateDatabase.hxx \
+	src/update/UpdateWalk.cxx src/update/UpdateWalk.hxx \
+	src/update/UpdateSong.cxx src/update/UpdateSong.hxx \
+	src/update/UpdateContainer.cxx src/update/UpdateContainer.hxx \
+	src/update/UpdateInternal.hxx \
+	src/update/UpdateRemove.cxx src/update/UpdateRemove.hxx \
 	src/Client.cxx src/Client.hxx \
 	src/ClientInternal.hxx \
 	src/ClientEvent.cxx \
@@ -237,10 +237,10 @@ endif
 
 if ENABLE_INOTIFY
 src_mpd_SOURCES += \
-	src/InotifyDomain.cxx src/InotifyDomain.hxx \
-	src/InotifySource.cxx src/InotifySource.hxx \
-	src/InotifyQueue.cxx src/InotifyQueue.hxx \
-	src/InotifyUpdate.cxx src/InotifyUpdate.hxx
+	src/update/InotifyDomain.cxx src/update/InotifyDomain.hxx \
+	src/update/InotifySource.cxx src/update/InotifySource.hxx \
+	src/update/InotifyQueue.cxx src/update/InotifyQueue.hxx \
+	src/update/InotifyUpdate.cxx src/update/InotifyUpdate.hxx
 endif
 
 if ENABLE_SQLITE
@@ -443,7 +443,7 @@ if ENABLE_ARCHIVE
 noinst_LIBRARIES += libarchive.a
 
 src_mpd_SOURCES +=  \
-	src/UpdateArchive.cxx src/UpdateArchive.hxx
+	src/update/UpdateArchive.cxx src/update/UpdateArchive.hxx
 
 libarchive_a_SOURCES = \
 	src/archive/ArchiveDomain.cxx src/archive/ArchiveDomain.hxx \
@@ -1584,8 +1584,8 @@ noinst_PROGRAMS += test/run_inotify
 test_run_inotify_SOURCES = test/run_inotify.cxx \
 	test/ShutdownHandler.cxx test/ShutdownHandler.hxx \
 	src/Log.cxx src/LogBackend.cxx \
-	src/InotifyDomain.cxx \
-	src/InotifySource.cxx
+	src/update/InotifyDomain.cxx \
+	src/update/InotifySource.cxx
 test_run_inotify_LDADD = \
 	libevent.a \
 	libsystem.a \
diff --git a/src/Main.cxx b/src/Main.cxx
index a5ffb33dc..f91c63d99 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -23,7 +23,7 @@
 #include "CommandLine.hxx"
 #include "PlaylistFile.hxx"
 #include "PlaylistGlobal.hxx"
-#include "UpdateGlue.hxx"
+#include "update/UpdateGlue.hxx"
 #include "MusicChunk.hxx"
 #include "StateFile.hxx"
 #include "PlayerThread.hxx"
@@ -68,7 +68,7 @@
 #include "Stats.hxx"
 
 #ifdef ENABLE_INOTIFY
-#include "InotifyUpdate.hxx"
+#include "update/InotifyUpdate.hxx"
 #endif
 
 #ifdef ENABLE_SQLITE
diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx
index fc6903d37..b7b84bcde 100644
--- a/src/command/OtherCommands.cxx
+++ b/src/command/OtherCommands.cxx
@@ -21,7 +21,7 @@
 #include "OtherCommands.hxx"
 #include "DatabaseCommands.hxx"
 #include "CommandError.hxx"
-#include "UpdateGlue.hxx"
+#include "update/UpdateGlue.hxx"
 #include "Directory.hxx"
 #include "DetachedSong.hxx"
 #include "SongPrint.hxx"
diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx
index ae7a7ba89..20de2af92 100644
--- a/src/command/PlayerCommands.cxx
+++ b/src/command/PlayerCommands.cxx
@@ -22,7 +22,7 @@
 #include "CommandError.hxx"
 #include "Playlist.hxx"
 #include "PlaylistPrint.hxx"
-#include "UpdateGlue.hxx"
+#include "update/UpdateGlue.hxx"
 #include "Client.hxx"
 #include "Volume.hxx"
 #include "output/OutputAll.hxx"
diff --git a/src/InotifyDomain.cxx b/src/update/InotifyDomain.cxx
index 4a3ab2d79..4a3ab2d79 100644
--- a/src/InotifyDomain.cxx
+++ b/src/update/InotifyDomain.cxx
diff --git a/src/InotifyDomain.hxx b/src/update/InotifyDomain.hxx
index ad6202361..ad6202361 100644
--- a/src/InotifyDomain.hxx
+++ b/src/update/InotifyDomain.hxx
diff --git a/src/InotifyQueue.cxx b/src/update/InotifyQueue.cxx
index f4bccf7ae..f4bccf7ae 100644
--- a/src/InotifyQueue.cxx
+++ b/src/update/InotifyQueue.cxx
diff --git a/src/InotifyQueue.hxx b/src/update/InotifyQueue.hxx
index 99e2635b1..99e2635b1 100644
--- a/src/InotifyQueue.hxx
+++ b/src/update/InotifyQueue.hxx
diff --git a/src/InotifySource.cxx b/src/update/InotifySource.cxx
index c2783690e..c2783690e 100644
--- a/src/InotifySource.cxx
+++ b/src/update/InotifySource.cxx
diff --git a/src/InotifySource.hxx b/src/update/InotifySource.hxx
index 77c11093c..77c11093c 100644
--- a/src/InotifySource.hxx
+++ b/src/update/InotifySource.hxx
diff --git a/src/InotifyUpdate.cxx b/src/update/InotifyUpdate.cxx
index 7515990d7..7515990d7 100644
--- a/src/InotifyUpdate.cxx
+++ b/src/update/InotifyUpdate.cxx
diff --git a/src/InotifyUpdate.hxx b/src/update/InotifyUpdate.hxx
index 2d7d4e3b4..2d7d4e3b4 100644
--- a/src/InotifyUpdate.hxx
+++ b/src/update/InotifyUpdate.hxx
diff --git a/src/UpdateArchive.cxx b/src/update/UpdateArchive.cxx
index ec46a4e17..ec46a4e17 100644
--- a/src/UpdateArchive.cxx
+++ b/src/update/UpdateArchive.cxx
diff --git a/src/UpdateArchive.hxx b/src/update/UpdateArchive.hxx
index 1fc9af349..1fc9af349 100644
--- a/src/UpdateArchive.hxx
+++ b/src/update/UpdateArchive.hxx
diff --git a/src/UpdateContainer.cxx b/src/update/UpdateContainer.cxx
index 0417aa999..0417aa999 100644
--- a/src/UpdateContainer.cxx
+++ b/src/update/UpdateContainer.cxx
diff --git a/src/UpdateContainer.hxx b/src/update/UpdateContainer.hxx
index 8125f71ee..8125f71ee 100644
--- a/src/UpdateContainer.hxx
+++ b/src/update/UpdateContainer.hxx
diff --git a/src/UpdateDatabase.cxx b/src/update/UpdateDatabase.cxx
index fe49a90fb..fe49a90fb 100644
--- a/src/UpdateDatabase.cxx
+++ b/src/update/UpdateDatabase.cxx
diff --git a/src/UpdateDatabase.hxx b/src/update/UpdateDatabase.hxx
index bd7c395f2..bd7c395f2 100644
--- a/src/UpdateDatabase.hxx
+++ b/src/update/UpdateDatabase.hxx
diff --git a/src/UpdateDomain.cxx b/src/update/UpdateDomain.cxx
index 80ad4fd22..80ad4fd22 100644
--- a/src/UpdateDomain.cxx
+++ b/src/update/UpdateDomain.cxx
diff --git a/src/UpdateDomain.hxx b/src/update/UpdateDomain.hxx
index a6e994390..a6e994390 100644
--- a/src/UpdateDomain.hxx
+++ b/src/update/UpdateDomain.hxx
diff --git a/src/UpdateGlue.cxx b/src/update/UpdateGlue.cxx
index 29e5f3ca7..29e5f3ca7 100644
--- a/src/UpdateGlue.cxx
+++ b/src/update/UpdateGlue.cxx
diff --git a/src/UpdateGlue.hxx b/src/update/UpdateGlue.hxx
index 6e247414e..6e247414e 100644
--- a/src/UpdateGlue.hxx
+++ b/src/update/UpdateGlue.hxx
diff --git a/src/UpdateIO.cxx b/src/update/UpdateIO.cxx
index 6343c4490..8e4406dc8 100644
--- a/src/UpdateIO.cxx
+++ b/src/update/UpdateIO.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h" /* must be first for large file support */
 #include "UpdateIO.hxx"
-#include "src/UpdateDomain.hxx"
+#include "UpdateDomain.hxx"
 #include "Directory.hxx"
 #include "Mapper.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/UpdateIO.hxx b/src/update/UpdateIO.hxx
index 819879422..819879422 100644
--- a/src/UpdateIO.hxx
+++ b/src/update/UpdateIO.hxx
diff --git a/src/UpdateInternal.hxx b/src/update/UpdateInternal.hxx
index 2e373bd06..2e373bd06 100644
--- a/src/UpdateInternal.hxx
+++ b/src/update/UpdateInternal.hxx
diff --git a/src/UpdateQueue.cxx b/src/update/UpdateQueue.cxx
index a6002f854..a6002f854 100644
--- a/src/UpdateQueue.cxx
+++ b/src/update/UpdateQueue.cxx
diff --git a/src/UpdateQueue.hxx b/src/update/UpdateQueue.hxx
index e4228f5ed..e4228f5ed 100644
--- a/src/UpdateQueue.hxx
+++ b/src/update/UpdateQueue.hxx
diff --git a/src/UpdateRemove.cxx b/src/update/UpdateRemove.cxx
index bed7a92ab..bed7a92ab 100644
--- a/src/UpdateRemove.cxx
+++ b/src/update/UpdateRemove.cxx
diff --git a/src/UpdateRemove.hxx b/src/update/UpdateRemove.hxx
index d54e3aa80..d54e3aa80 100644
--- a/src/UpdateRemove.hxx
+++ b/src/update/UpdateRemove.hxx
diff --git a/src/UpdateSong.cxx b/src/update/UpdateSong.cxx
index 2db85a674..2db85a674 100644
--- a/src/UpdateSong.cxx
+++ b/src/update/UpdateSong.cxx
diff --git a/src/UpdateSong.hxx b/src/update/UpdateSong.hxx
index 5feb01928..5feb01928 100644
--- a/src/UpdateSong.hxx
+++ b/src/update/UpdateSong.hxx
diff --git a/src/UpdateWalk.cxx b/src/update/UpdateWalk.cxx
index 21754b31d..21754b31d 100644
--- a/src/UpdateWalk.cxx
+++ b/src/update/UpdateWalk.cxx
diff --git a/src/UpdateWalk.hxx b/src/update/UpdateWalk.hxx
index e908829e3..e908829e3 100644
--- a/src/UpdateWalk.hxx
+++ b/src/update/UpdateWalk.hxx
diff --git a/test/run_inotify.cxx b/test/run_inotify.cxx
index 4a604a6d6..9ed00d3d6 100644
--- a/test/run_inotify.cxx
+++ b/test/run_inotify.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "ShutdownHandler.hxx"
-#include "InotifySource.hxx"
+#include "update/InotifySource.hxx"
 #include "event/Loop.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"