Config*: move to config/

80 files changed, 111 insertions, 111 deletions

diff --git a/Makefile.am b/Makefile.am
index 405f51ef7..77a37d09d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -489,15 +489,15 @@ endif
 # configuration library
 
 libconf_a_SOURCES = \
-	src/ConfigDefaults.hxx \
-	src/ConfigPath.cxx src/ConfigPath.hxx \
-	src/ConfigData.cxx src/ConfigData.hxx \
-	src/ConfigParser.cxx src/ConfigParser.hxx \
-	src/ConfigGlobal.cxx src/ConfigGlobal.hxx \
-	src/ConfigFile.cxx src/ConfigFile.hxx \
-	src/ConfigTemplates.cxx src/ConfigTemplates.hxx \
-	src/ConfigError.cxx src/ConfigError.hxx \
-	src/ConfigOption.hxx
+	src/config/ConfigDefaults.hxx \
+	src/config/ConfigPath.cxx src/config/ConfigPath.hxx \
+	src/config/ConfigData.cxx src/config/ConfigData.hxx \
+	src/config/ConfigParser.cxx src/config/ConfigParser.hxx \
+	src/config/ConfigGlobal.cxx src/config/ConfigGlobal.hxx \
+	src/config/ConfigFile.cxx src/config/ConfigFile.hxx \
+	src/config/ConfigTemplates.cxx src/config/ConfigTemplates.hxx \
+	src/config/ConfigError.cxx src/config/ConfigError.hxx \
+	src/config/ConfigOption.hxx
 
 # tag plugins
 
diff --git a/src/AudioConfig.cxx b/src/AudioConfig.cxx
index 9fa12f382..d54f59e17 100644
--- a/src/AudioConfig.cxx
+++ b/src/AudioConfig.cxx
@@ -21,9 +21,9 @@
 #include "AudioConfig.hxx"
 #include "AudioFormat.hxx"
 #include "AudioParser.hxx"
-#include "ConfigData.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "util/Error.hxx"
 #include "system/FatalError.hxx"
 
diff --git a/src/ClientGlobal.cxx b/src/ClientGlobal.cxx
index 676c18405..8d90721e9 100644
--- a/src/ClientGlobal.cxx
+++ b/src/ClientGlobal.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "ClientInternal.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 
 #define CLIENT_TIMEOUT_DEFAULT			(60)
 #define CLIENT_MAX_COMMAND_LIST_DEFAULT		(2048*1024)
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index 399ecb393..3659dfcda 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -22,7 +22,7 @@
 #include "ls.hxx"
 #include "LogInit.hxx"
 #include "Log.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "DatabaseRegistry.hxx"
 #include "DatabasePlugin.hxx"
 #include "decoder/DecoderList.hxx"
diff --git a/src/DatabaseGlue.cxx b/src/DatabaseGlue.cxx
index a479df70d..ce53ec184 100644
--- a/src/DatabaseGlue.cxx
+++ b/src/DatabaseGlue.cxx
@@ -24,7 +24,7 @@
 #include "DatabaseError.hxx"
 #include "Directory.hxx"
 #include "util/Error.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 #include "Stats.hxx"
 #include "DatabasePlugin.hxx"
 #include "db/SimpleDatabasePlugin.hxx"
diff --git a/src/DespotifyUtils.cxx b/src/DespotifyUtils.cxx
index 8b9d468d6..47a83e49b 100644
--- a/src/DespotifyUtils.cxx
+++ b/src/DespotifyUtils.cxx
@@ -20,8 +20,8 @@
 #include "DespotifyUtils.hxx"
 #include "tag/Tag.hxx"
 #include "tag/TagBuilder.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
diff --git a/src/FilterConfig.cxx b/src/FilterConfig.cxx
index 5f5442a1e..a3a8f7ddc 100644
--- a/src/FilterConfig.cxx
+++ b/src/FilterConfig.cxx
@@ -21,10 +21,10 @@
 #include "FilterConfig.hxx"
 #include "filter/ChainFilterPlugin.hxx"
 #include "FilterPlugin.hxx"
-#include "ConfigData.hxx"
-#include "ConfigOption.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigOption.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigError.hxx"
 #include "util/Error.hxx"
 
 #include <algorithm>
diff --git a/src/FilterPlugin.cxx b/src/FilterPlugin.cxx
index 74d8cd45b..98314f771 100644
--- a/src/FilterPlugin.cxx
+++ b/src/FilterPlugin.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "FilterPlugin.hxx"
 #include "FilterRegistry.hxx"
-#include "ConfigData.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigError.hxx"
 #include "util/Error.hxx"
 
 #include <assert.h>
diff --git a/src/InputInit.cxx b/src/InputInit.cxx
index 56683dc20..d1d844830 100644
--- a/src/InputInit.cxx
+++ b/src/InputInit.cxx
@@ -23,9 +23,9 @@
 #include "InputPlugin.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
+#include "config/ConfigData.hxx"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/Listen.cxx b/src/Listen.cxx
index 9d9b02c48..9cdf1b823 100644
--- a/src/Listen.cxx
+++ b/src/Listen.cxx
@@ -22,9 +22,9 @@
 #include "Main.hxx"
 #include "Instance.hxx"
 #include "Client.hxx"
-#include "ConfigData.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "event/ServerSocket.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/LogInit.cxx b/src/LogInit.cxx
index 0b781da23..2a5d4d7c5 100644
--- a/src/LogInit.cxx
+++ b/src/LogInit.cxx
@@ -21,9 +21,9 @@
 #include "LogInit.hxx"
 #include "LogBackend.hxx"
 #include "Log.hxx"
-#include "ConfigData.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "system/FatalError.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
diff --git a/src/Main.cxx b/src/Main.cxx
index 8f6780661..a5ffb33dc 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -61,10 +61,10 @@
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "thread/Id.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigData.hxx"
-#include "ConfigDefaults.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigDefaults.hxx"
+#include "config/ConfigOption.hxx"
 #include "Stats.hxx"
 
 #ifdef ENABLE_INOTIFY
diff --git a/src/Permission.cxx b/src/Permission.cxx
index cd2d31b04..d2d9d4297 100644
--- a/src/Permission.cxx
+++ b/src/Permission.cxx
@@ -19,9 +19,9 @@
 
 #include "config.h"
 #include "Permission.hxx"
-#include "ConfigData.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "system/FatalError.hxx"
 
 #include <algorithm>
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index 2707bcb76..befa45d94 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -26,9 +26,9 @@
 #include "DetachedSong.hxx"
 #include "Mapper.hxx"
 #include "fs/TextFile.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
-#include "ConfigDefaults.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
+#include "config/ConfigDefaults.hxx"
 #include "Idle.hxx"
 #include "fs/Limits.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/PlaylistState.cxx b/src/PlaylistState.cxx
index e727ecd1f..4a4e37345 100644
--- a/src/PlaylistState.cxx
+++ b/src/PlaylistState.cxx
@@ -29,8 +29,8 @@
 #include "queue/QueueSave.hxx"
 #include "fs/TextFile.hxx"
 #include "PlayerControl.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "fs/Limits.hxx"
 #include "util/CharUtil.hxx"
 #include "util/StringUtil.hxx"
diff --git a/src/ReplayGainConfig.cxx b/src/ReplayGainConfig.cxx
index 9cf9f6e39..c3bbcac3c 100644
--- a/src/ReplayGainConfig.cxx
+++ b/src/ReplayGainConfig.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "ReplayGainConfig.hxx"
 #include "Idle.hxx"
-#include "ConfigData.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "system/FatalError.hxx"
 
 #include <assert.h>
diff --git a/src/UpdateWalk.cxx b/src/UpdateWalk.cxx
index 430e63af0..21754b31d 100644
--- a/src/UpdateWalk.cxx
+++ b/src/UpdateWalk.cxx
@@ -32,8 +32,8 @@
 #include "playlist/PlaylistRegistry.hxx"
 #include "Mapper.hxx"
 #include "ExcludeList.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
diff --git a/src/ConfigData.cxx b/src/config/ConfigData.cxx
index 70e1e55ed..70e1e55ed 100644
--- a/src/ConfigData.cxx
+++ b/src/config/ConfigData.cxx
diff --git a/src/ConfigData.hxx b/src/config/ConfigData.hxx
index e42d674ba..e42d674ba 100644
--- a/src/ConfigData.hxx
+++ b/src/config/ConfigData.hxx
diff --git a/src/ConfigDefaults.hxx b/src/config/ConfigDefaults.hxx
index c50f28c91..c50f28c91 100644
--- a/src/ConfigDefaults.hxx
+++ b/src/config/ConfigDefaults.hxx
diff --git a/src/ConfigError.cxx b/src/config/ConfigError.cxx
index 70aff7175..70aff7175 100644
--- a/src/ConfigError.cxx
+++ b/src/config/ConfigError.cxx
diff --git a/src/ConfigError.hxx b/src/config/ConfigError.hxx
index cbfa79df3..cbfa79df3 100644
--- a/src/ConfigError.hxx
+++ b/src/config/ConfigError.hxx
diff --git a/src/ConfigFile.cxx b/src/config/ConfigFile.cxx
index f045213a4..f045213a4 100644
--- a/src/ConfigFile.cxx
+++ b/src/config/ConfigFile.cxx
diff --git a/src/ConfigFile.hxx b/src/config/ConfigFile.hxx
index b87182c6a..b87182c6a 100644
--- a/src/ConfigFile.hxx
+++ b/src/config/ConfigFile.hxx
diff --git a/src/ConfigGlobal.cxx b/src/config/ConfigGlobal.cxx
index c7d16d3e7..c7d16d3e7 100644
--- a/src/ConfigGlobal.cxx
+++ b/src/config/ConfigGlobal.cxx
diff --git a/src/ConfigGlobal.hxx b/src/config/ConfigGlobal.hxx
index abce424de..abce424de 100644
--- a/src/ConfigGlobal.hxx
+++ b/src/config/ConfigGlobal.hxx
diff --git a/src/ConfigOption.hxx b/src/config/ConfigOption.hxx
index 4ee108196..4ee108196 100644
--- a/src/ConfigOption.hxx
+++ b/src/config/ConfigOption.hxx
diff --git a/src/ConfigParser.cxx b/src/config/ConfigParser.cxx
index 3535c9a13..3535c9a13 100644
--- a/src/ConfigParser.cxx
+++ b/src/config/ConfigParser.cxx
diff --git a/src/ConfigParser.hxx b/src/config/ConfigParser.hxx
index 06151b0bd..06151b0bd 100644
--- a/src/ConfigParser.hxx
+++ b/src/config/ConfigParser.hxx
diff --git a/src/ConfigPath.cxx b/src/config/ConfigPath.cxx
index a3b3f83a5..a3b3f83a5 100644
--- a/src/ConfigPath.cxx
+++ b/src/config/ConfigPath.cxx
diff --git a/src/ConfigPath.hxx b/src/config/ConfigPath.hxx
index a5518a497..a5518a497 100644
--- a/src/ConfigPath.hxx
+++ b/src/config/ConfigPath.hxx
diff --git a/src/ConfigTemplates.cxx b/src/config/ConfigTemplates.cxx
index e9cd68b5b..e9cd68b5b 100644
--- a/src/ConfigTemplates.cxx
+++ b/src/config/ConfigTemplates.cxx
diff --git a/src/ConfigTemplates.hxx b/src/config/ConfigTemplates.hxx
index 90d098dc0..90d098dc0 100644
--- a/src/ConfigTemplates.hxx
+++ b/src/config/ConfigTemplates.hxx
diff --git a/src/db/ProxyDatabasePlugin.cxx b/src/db/ProxyDatabasePlugin.cxx
index b5ed09eb3..7253ba0d0 100644
--- a/src/db/ProxyDatabasePlugin.cxx
+++ b/src/db/ProxyDatabasePlugin.cxx
@@ -28,7 +28,7 @@
 #include "LightSong.hxx"
 #include "SongFilter.hxx"
 #include "Compiler.h"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 #include "tag/TagBuilder.hxx"
 #include "tag/Tag.hxx"
 #include "util/Error.hxx"
diff --git a/src/db/SimpleDatabasePlugin.cxx b/src/db/SimpleDatabasePlugin.cxx
index f77d98ea5..73e080b41 100644
--- a/src/db/SimpleDatabasePlugin.cxx
+++ b/src/db/SimpleDatabasePlugin.cxx
@@ -29,7 +29,7 @@
 #include "DatabaseLock.hxx"
 #include "DatabaseError.hxx"
 #include "fs/TextFile.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 #include "fs/FileSystem.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/db/UpnpDatabasePlugin.cxx b/src/db/UpnpDatabasePlugin.cxx
index f18dd95d2..46084061f 100644
--- a/src/db/UpnpDatabasePlugin.cxx
+++ b/src/db/UpnpDatabasePlugin.cxx
@@ -31,7 +31,7 @@
 #include "DatabaseError.hxx"
 #include "LightDirectory.hxx"
 #include "LightSong.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 #include "tag/TagBuilder.hxx"
 #include "tag/TagTable.hxx"
 #include "util/Error.hxx"
diff --git a/src/decoder/DecoderAPI.hxx b/src/decoder/DecoderAPI.hxx
index 0ce861fb1..0a7b84371 100644
--- a/src/decoder/DecoderAPI.hxx
+++ b/src/decoder/DecoderAPI.hxx
@@ -36,7 +36,7 @@
 #include "tag/Tag.hxx"
 #include "AudioFormat.hxx"
 #include "MixRampInfo.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 
 // IWYU pragma: end_exports
 
diff --git a/src/decoder/DecoderList.cxx b/src/decoder/DecoderList.cxx
index a644d2eae..5423a85ab 100644
--- a/src/decoder/DecoderList.cxx
+++ b/src/decoder/DecoderList.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "DecoderList.hxx"
 #include "DecoderPlugin.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigData.hxx"
 #include "plugins/AudiofileDecoderPlugin.hxx"
 #include "plugins/PcmDecoderPlugin.hxx"
 #include "plugins/DsdiffDecoderPlugin.hxx"
diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx
index 07fd05f1b..8c32018f3 100644
--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/src/decoder/plugins/MadDecoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "MadDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "InputStream.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "tag/TagId3.hxx"
 #include "tag/TagRva2.hxx"
 #include "tag/TagHandler.hxx"
diff --git a/src/encoder/EncoderAPI.hxx b/src/encoder/EncoderAPI.hxx
index 267affa3a..b147eac21 100644
--- a/src/encoder/EncoderAPI.hxx
+++ b/src/encoder/EncoderAPI.hxx
@@ -30,7 +30,7 @@
 #include "EncoderPlugin.hxx"
 #include "AudioFormat.hxx"
 #include "tag/Tag.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 
 // IWYU pragma: end_exports
 
diff --git a/src/encoder/plugins/FlacEncoderPlugin.cxx b/src/encoder/plugins/FlacEncoderPlugin.cxx
index ebdd101f3..26987fe99 100644
--- a/src/encoder/plugins/FlacEncoderPlugin.cxx
+++ b/src/encoder/plugins/FlacEncoderPlugin.cxx
@@ -22,7 +22,7 @@
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
 #include "pcm/PcmBuffer.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/Manual.hxx"
 #include "util/DynamicFifoBuffer.hxx"
 #include "util/Error.hxx"
diff --git a/src/encoder/plugins/LameEncoderPlugin.cxx b/src/encoder/plugins/LameEncoderPlugin.cxx
index 484c4d0fe..3878b52bb 100644
--- a/src/encoder/plugins/LameEncoderPlugin.cxx
+++ b/src/encoder/plugins/LameEncoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "LameEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/NumberParser.hxx"
 #include "util/ReusableArray.hxx"
 #include "util/Manual.hxx"
diff --git a/src/encoder/plugins/OpusEncoderPlugin.cxx b/src/encoder/plugins/OpusEncoderPlugin.cxx
index 9fbdc8711..2d3194c26 100644
--- a/src/encoder/plugins/OpusEncoderPlugin.cxx
+++ b/src/encoder/plugins/OpusEncoderPlugin.cxx
@@ -23,7 +23,7 @@
 #include "OggSerial.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "system/ByteOrder.hxx"
diff --git a/src/encoder/plugins/ShineEncoderPlugin.cxx b/src/encoder/plugins/ShineEncoderPlugin.cxx
index 5b1b95a27..00b8eec7c 100644
--- a/src/encoder/plugins/ShineEncoderPlugin.cxx
+++ b/src/encoder/plugins/ShineEncoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/Manual.hxx"
 #include "util/NumberParser.hxx"
 #include "util/DynamicFifoBuffer.hxx"
diff --git a/src/encoder/plugins/TwolameEncoderPlugin.cxx b/src/encoder/plugins/TwolameEncoderPlugin.cxx
index cea72bfdd..2eb6b2b1c 100644
--- a/src/encoder/plugins/TwolameEncoderPlugin.cxx
+++ b/src/encoder/plugins/TwolameEncoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "TwolameEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/NumberParser.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/encoder/plugins/VorbisEncoderPlugin.cxx b/src/encoder/plugins/VorbisEncoderPlugin.cxx
index 356d67571..7fdb3066f 100644
--- a/src/encoder/plugins/VorbisEncoderPlugin.cxx
+++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx
@@ -24,7 +24,7 @@
 #include "../EncoderAPI.hxx"
 #include "tag/Tag.hxx"
 #include "AudioFormat.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/NumberParser.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/filter/AutoConvertFilterPlugin.cxx b/src/filter/AutoConvertFilterPlugin.cxx
index 34ba7eef2..b9bc12f31 100644
--- a/src/filter/AutoConvertFilterPlugin.cxx
+++ b/src/filter/AutoConvertFilterPlugin.cxx
@@ -24,7 +24,7 @@
 #include "FilterInternal.hxx"
 #include "FilterRegistry.hxx"
 #include "AudioFormat.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 
 #include <assert.h>
 
diff --git a/src/filter/RouteFilterPlugin.cxx b/src/filter/RouteFilterPlugin.cxx
index 75b5cffba..50073778a 100644
--- a/src/filter/RouteFilterPlugin.cxx
+++ b/src/filter/RouteFilterPlugin.cxx
@@ -40,8 +40,8 @@
  */
 
 #include "config.h"
-#include "ConfigError.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigError.hxx"
+#include "config/ConfigData.hxx"
 #include "AudioFormat.hxx"
 #include "FilterPlugin.hxx"
 #include "FilterInternal.hxx"
diff --git a/src/fs/Config.cxx b/src/fs/Config.cxx
index b88de69cf..c9555bcc2 100644
--- a/src/fs/Config.cxx
+++ b/src/fs/Config.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Config.hxx"
 #include "Charset.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 
 #include <glib.h>
 
diff --git a/src/input/CdioParanoiaInputPlugin.cxx b/src/input/CdioParanoiaInputPlugin.cxx
index f9264979f..297ee84dc 100644
--- a/src/input/CdioParanoiaInputPlugin.cxx
+++ b/src/input/CdioParanoiaInputPlugin.cxx
@@ -31,8 +31,8 @@
 #include "system/ByteOrder.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "Log.hxx"
-#include "ConfigData.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigError.hxx"
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx
index ccb73a448..64321b38d 100644
--- a/src/input/CurlInputPlugin.cxx
+++ b/src/input/CurlInputPlugin.cxx
@@ -21,8 +21,8 @@
 #include "CurlInputPlugin.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigData.hxx"
 #include "tag/Tag.hxx"
 #include "tag/TagBuilder.hxx"
 #include "IcyMetaDataParser.hxx"
diff --git a/src/mixer/OssMixerPlugin.cxx b/src/mixer/OssMixerPlugin.cxx
index ef5992d1d..4e116c2fb 100644
--- a/src/mixer/OssMixerPlugin.cxx
+++ b/src/mixer/OssMixerPlugin.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "MixerInternal.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 #include "system/fd_util.h"
 #include "util/ASCII.hxx"
 #include "util/Error.hxx"
diff --git a/src/mixer/SoftwareMixerPlugin.cxx b/src/mixer/SoftwareMixerPlugin.cxx
index 9609a7c81..ad23baa2c 100644
--- a/src/mixer/SoftwareMixerPlugin.cxx
+++ b/src/mixer/SoftwareMixerPlugin.cxx
@@ -25,7 +25,7 @@
 #include "FilterInternal.hxx"
 #include "filter/VolumeFilterPlugin.hxx"
 #include "pcm/Volume.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 #include "util/Error.hxx"
 
 #include <assert.h>
diff --git a/src/output/OutputAPI.hxx b/src/output/OutputAPI.hxx
index 322ed3971..cfbc43196 100644
--- a/src/output/OutputAPI.hxx
+++ b/src/output/OutputAPI.hxx
@@ -26,7 +26,7 @@
 #include "OutputInternal.hxx"
 #include "AudioFormat.hxx"
 #include "tag/Tag.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 
 // IWYU pragma: end_exports
 
diff --git a/src/output/OutputAll.cxx b/src/output/OutputAll.cxx
index b3623f1af..ded9fa1e1 100644
--- a/src/output/OutputAll.cxx
+++ b/src/output/OutputAll.cxx
@@ -28,9 +28,9 @@
 #include "MusicChunk.hxx"
 #include "system/FatalError.hxx"
 #include "util/Error.hxx"
-#include "ConfigData.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "notify.hxx"
 
 #include <assert.h>
diff --git a/src/output/OutputInit.cxx b/src/output/OutputInit.cxx
index f5b1bdc81..920a04997 100644
--- a/src/output/OutputInit.cxx
+++ b/src/output/OutputInit.cxx
@@ -33,8 +33,8 @@
 #include "filter/AutoConvertFilterPlugin.hxx"
 #include "filter/ReplayGainFilterPlugin.hxx"
 #include "filter/ChainFilterPlugin.hxx"
-#include "ConfigError.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigError.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
 
diff --git a/src/output/plugins/FifoOutputPlugin.cxx b/src/output/plugins/FifoOutputPlugin.cxx
index 5f14bcbbe..6e3a4d332 100644
--- a/src/output/plugins/FifoOutputPlugin.cxx
+++ b/src/output/plugins/FifoOutputPlugin.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "FifoOutputPlugin.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "../OutputAPI.hxx"
 #include "Timer.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/output/plugins/JackOutputPlugin.cxx b/src/output/plugins/JackOutputPlugin.cxx
index 5a0d2bf16..b981c1292 100644
--- a/src/output/plugins/JackOutputPlugin.cxx
+++ b/src/output/plugins/JackOutputPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "JackOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
diff --git a/src/output/plugins/PipeOutputPlugin.cxx b/src/output/plugins/PipeOutputPlugin.cxx
index 802e1ba4d..2eb0c6dd8 100644
--- a/src/output/plugins/PipeOutputPlugin.cxx
+++ b/src/output/plugins/PipeOutputPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "PipeOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 
diff --git a/src/output/plugins/RecorderOutputPlugin.cxx b/src/output/plugins/RecorderOutputPlugin.cxx
index 16fe2c692..685438009 100644
--- a/src/output/plugins/RecorderOutputPlugin.cxx
+++ b/src/output/plugins/RecorderOutputPlugin.cxx
@@ -22,7 +22,7 @@
 #include "../OutputAPI.hxx"
 #include "encoder/EncoderPlugin.hxx"
 #include "encoder/EncoderList.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "system/fd_util.h"
diff --git a/src/output/plugins/ShoutOutputPlugin.cxx b/src/output/plugins/ShoutOutputPlugin.cxx
index e0ec6ce3d..f86e5ce4b 100644
--- a/src/output/plugins/ShoutOutputPlugin.cxx
+++ b/src/output/plugins/ShoutOutputPlugin.cxx
@@ -22,7 +22,7 @@
 #include "../OutputAPI.hxx"
 #include "encoder/EncoderPlugin.hxx"
 #include "encoder/EncoderList.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "system/FatalError.hxx"
diff --git a/src/pcm/ConfiguredResampler.cxx b/src/pcm/ConfiguredResampler.cxx
index a9429ef37..f6aec3f95 100644
--- a/src/pcm/ConfiguredResampler.cxx
+++ b/src/pcm/ConfiguredResampler.cxx
@@ -20,9 +20,9 @@
 #include "config.h"
 #include "ConfiguredResampler.hxx"
 #include "FallbackResampler.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
+#include "config/ConfigError.hxx"
 #include "util/Error.hxx"
 
 #ifdef HAVE_LIBSAMPLERATE
diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx
index 94244f14c..7e80d8d8e 100644
--- a/src/playlist/PlaylistRegistry.cxx
+++ b/src/playlist/PlaylistRegistry.cxx
@@ -35,8 +35,8 @@
 #include "util/StringUtil.hxx"
 #include "util/Error.hxx"
 #include "util/Macros.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigData.hxx"
 #include "system/FatalError.hxx"
 #include "Log.hxx"
 
diff --git a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
index fac052d19..62936ced5 100644
--- a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
+++ b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
@@ -21,7 +21,7 @@
 #include "SoundCloudPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 #include "InputStream.hxx"
 #include "tag/TagBuilder.hxx"
 #include "util/StringUtil.hxx"
diff --git a/src/tag/TagConfig.cxx b/src/tag/TagConfig.cxx
index cfdd2e1eb..3e941c8d9 100644
--- a/src/tag/TagConfig.cxx
+++ b/src/tag/TagConfig.cxx
@@ -21,8 +21,8 @@
 #include "TagConfig.hxx"
 #include "TagSettings.h"
 #include "Tag.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "system/FatalError.hxx"
 #include "util/Alloc.hxx"
 #include "util/ASCII.hxx"
diff --git a/src/tag/TagId3.cxx b/src/tag/TagId3.cxx
index 459692e79..4ecd4baa6 100644
--- a/src/tag/TagId3.cxx
+++ b/src/tag/TagId3.cxx
@@ -25,7 +25,7 @@
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "Riff.hxx"
 #include "Aiff.hxx"
 #include "fs/Path.hxx"
diff --git a/src/zeroconf/ZeroconfGlue.cxx b/src/zeroconf/ZeroconfGlue.cxx
index 05bb3c17c..95797491b 100644
--- a/src/zeroconf/ZeroconfGlue.cxx
+++ b/src/zeroconf/ZeroconfGlue.cxx
@@ -21,8 +21,8 @@
 #include "ZeroconfGlue.hxx"
 #include "ZeroconfAvahi.hxx"
 #include "ZeroconfBonjour.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "Listen.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx
index 7b959a215..caf433ac1 100644
--- a/test/DumpDatabase.cxx
+++ b/test/DumpDatabase.cxx
@@ -25,8 +25,8 @@
 #include "LightDirectory.hxx"
 #include "LightSong.hxx"
 #include "PlaylistVector.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigData.hxx"
 #include "tag/TagConfig.hxx"
 #include "fs/Path.hxx"
 #include "event/Loop.hxx"
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx
index 37fcfd391..292f3987e 100644
--- a/test/dump_playlist.cxx
+++ b/test/dump_playlist.cxx
@@ -22,7 +22,7 @@
 #include "DetachedSong.hxx"
 #include "playlist/SongEnumerator.hxx"
 #include "InputStream.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "decoder/DecoderList.hxx"
 #include "InputInit.hxx"
 #include "IOThread.hxx"
diff --git a/test/dump_rva2.cxx b/test/dump_rva2.cxx
index 08e5352b8..fd46ee36c 100644
--- a/test/dump_rva2.cxx
+++ b/test/dump_rva2.cxx
@@ -21,7 +21,7 @@
 #include "tag/TagId3.hxx"
 #include "tag/TagRva2.hxx"
 #include "ReplayGainInfo.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "util/Error.hxx"
 #include "fs/Path.hxx"
 #include "Log.hxx"
diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx
index 581bb8829..5ce5e9da4 100644
--- a/test/dump_text_file.cxx
+++ b/test/dump_text_file.cxx
@@ -21,7 +21,7 @@
 #include "IOThread.hxx"
 #include "InputInit.hxx"
 #include "InputStream.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "stdbin.h"
 #include "TextInputStream.hxx"
 #include "util/Error.hxx"
diff --git a/test/read_conf.cxx b/test/read_conf.cxx
index b519f4d78..42afdfb4b 100644
--- a/test/read_conf.cxx
+++ b/test/read_conf.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "fs/Path.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx
index 41261a310..60c60c86a 100644
--- a/test/read_mixer.cxx
+++ b/test/read_mixer.cxx
@@ -25,7 +25,7 @@
 #include "GlobalEvents.hxx"
 #include "Main.hxx"
 #include "event/Loop.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
 
diff --git a/test/run_convert.cxx b/test/run_convert.cxx
index 192ce808a..3c75b2c19 100644
--- a/test/run_convert.cxx
+++ b/test/run_convert.cxx
@@ -27,7 +27,7 @@
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
 #include "pcm/PcmConvert.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "util/FifoBuffer.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
diff --git a/test/run_encoder.cxx b/test/run_encoder.cxx
index ace9faf18..f16d8cb0a 100644
--- a/test/run_encoder.cxx
+++ b/test/run_encoder.cxx
@@ -22,7 +22,7 @@
 #include "encoder/EncoderPlugin.hxx"
 #include "AudioFormat.hxx"
 #include "AudioParser.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
 #include "stdbin.h"
diff --git a/test/run_filter.cxx b/test/run_filter.cxx
index a577cf8ee..16808ebb2 100644
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "ConfigData.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "fs/Path.hxx"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
diff --git a/test/run_input.cxx b/test/run_input.cxx
index 2587a80b0..48892dc28 100644
--- a/test/run_input.cxx
+++ b/test/run_input.cxx
@@ -21,7 +21,7 @@
 #include "TagSave.hxx"
 #include "stdbin.h"
 #include "tag/Tag.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "InputStream.hxx"
 #include "InputInit.hxx"
 #include "IOThread.hxx"
diff --git a/test/run_output.cxx b/test/run_output.cxx
index c18451e10..de2152337 100644
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
@@ -21,9 +21,9 @@
 #include "output/OutputControl.hxx"
 #include "output/OutputInternal.hxx"
 #include "output/OutputPlugin.hxx"
-#include "ConfigData.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
 #include "Idle.hxx"
 #include "Main.hxx"
 #include "event/Loop.hxx"
diff --git a/test/test_vorbis_encoder.cxx b/test/test_vorbis_encoder.cxx
index fba0040d2..59b901da2 100644
--- a/test/test_vorbis_encoder.cxx
+++ b/test/test_vorbis_encoder.cxx
@@ -21,7 +21,7 @@
 #include "encoder/EncoderList.hxx"
 #include "encoder/EncoderPlugin.hxx"
 #include "AudioFormat.hxx"
-#include "ConfigData.hxx"
+#include "config/ConfigData.hxx"
 #include "stdbin.h"
 #include "tag/Tag.hxx"
 #include "tag/TagBuilder.hxx"
diff --git a/test/visit_archive.cxx b/test/visit_archive.cxx
index 001b9067b..ee9fd1a4e 100644
--- a/test/visit_archive.cxx
+++ b/test/visit_archive.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "stdbin.h"
 #include "tag/Tag.hxx"
-#include "ConfigGlobal.hxx"
+#include "config/ConfigGlobal.hxx"
 #include "IOThread.hxx"
 #include "InputInit.hxx"
 #include "archive/ArchiveList.hxx"