config/Config*: rename files, drop "Config" prefix

65 files changed, 98 insertions, 98 deletions

diff --git a/Makefile.am b/Makefile.am
index a1be6a38d..cacf87a87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1000,17 +1000,17 @@ libbasic_a_SOURCES = \
 # configuration library
 
 libconf_a_SOURCES = \
-	src/config/ConfigDefaults.hxx \
-	src/config/ConfigPath.cxx src/config/ConfigPath.hxx \
+	src/config/Defaults.hxx \
+	src/config/Path.cxx src/config/Path.hxx \
 	src/config/Data.cxx src/config/Data.hxx \
 	src/config/Block.cxx src/config/Block.hxx \
 	src/config/Param.cxx src/config/Param.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
+	src/config/Parser.cxx src/config/Parser.hxx \
+	src/config/Global.cxx src/config/Global.hxx \
+	src/config/File.cxx src/config/File.hxx \
+	src/config/Templates.cxx src/config/Templates.hxx \
+	src/config/Domain.cxx src/config/Domain.hxx \
+	src/config/Option.hxx
 
 # tag plugins
 
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index 22f579c49..27224a41d 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -22,7 +22,7 @@
 #include "ls.hxx"
 #include "LogInit.hxx"
 #include "Log.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "decoder/DecoderList.hxx"
 #include "decoder/DecoderPlugin.hxx"
 #include "output/Registry.hxx"
diff --git a/src/Listen.cxx b/src/Listen.cxx
index 06eec9dad..6cee115f2 100644
--- a/src/Listen.cxx
+++ b/src/Listen.cxx
@@ -21,8 +21,8 @@
 #include "Listen.hxx"
 #include "client/Listener.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "system/Error.hxx"
 #include "util/RuntimeError.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/LogInit.cxx b/src/LogInit.cxx
index 054c37c72..3348ee2f0 100644
--- a/src/LogInit.cxx
+++ b/src/LogInit.cxx
@@ -22,8 +22,8 @@
 #include "LogBackend.hxx"
 #include "Log.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
 #include "util/Domain.hxx"
diff --git a/src/Main.cxx b/src/Main.cxx
index 619531d33..a489c652a 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -52,11 +52,11 @@
 #include "thread/Slack.hxx"
 #include "net/Init.hxx"
 #include "lib/icu/Init.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigDefaults.hxx"
-#include "config/ConfigOption.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Defaults.hxx"
+#include "config/Option.hxx"
+#include "config/Domain.hxx"
 #include "util/RuntimeError.hxx"
 
 #ifdef ENABLE_DAEMON
diff --git a/src/Permission.cxx b/src/Permission.cxx
index 8387b3754..090195cfa 100644
--- a/src/Permission.cxx
+++ b/src/Permission.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "Permission.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "util/RuntimeError.hxx"
 
 #include <algorithm>
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index a748efb07..101e9ecec 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -29,9 +29,9 @@
 #include "fs/io/TextFile.hxx"
 #include "fs/io/FileOutputStream.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
-#include "config/ConfigDefaults.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
+#include "config/Defaults.hxx"
 #include "Idle.hxx"
 #include "fs/Limits.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/ReplayGainGlobal.cxx b/src/ReplayGainGlobal.cxx
index 5e1067946..22c1c9767 100644
--- a/src/ReplayGainGlobal.cxx
+++ b/src/ReplayGainGlobal.cxx
@@ -21,7 +21,7 @@
 #include "ReplayGainGlobal.hxx"
 #include "ReplayGainConfig.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "util/RuntimeError.hxx"
 
 #include <assert.h>
diff --git a/src/client/ClientGlobal.cxx b/src/client/ClientGlobal.cxx
index 0bcc093d9..d7180bd5c 100644
--- a/src/client/ClientGlobal.cxx
+++ b/src/client/ClientGlobal.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "ClientInternal.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 
 #define CLIENT_TIMEOUT_DEFAULT			(60)
 #define CLIENT_MAX_COMMAND_LIST_DEFAULT		(2048*1024)
diff --git a/src/config/Block.cxx b/src/config/Block.cxx
index 86ad226c6..84c6ad744 100644
--- a/src/config/Block.cxx
+++ b/src/config/Block.cxx
@@ -19,8 +19,8 @@
 
 #include "config.h"
 #include "Block.hxx"
-#include "ConfigParser.hxx"
-#include "ConfigPath.hxx"
+#include "Parser.hxx"
+#include "Path.hxx"
 #include "system/FatalError.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/RuntimeError.hxx"
diff --git a/src/config/Data.hxx b/src/config/Data.hxx
index f64e1c01f..9d63d147b 100644
--- a/src/config/Data.hxx
+++ b/src/config/Data.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_CONFIG_DATA_HXX
 #define MPD_CONFIG_DATA_HXX
 
-#include "ConfigOption.hxx"
+#include "Option.hxx"
 
 #include <array>
 
diff --git a/src/config/ConfigDefaults.hxx b/src/config/Defaults.hxx
index 09380f4cf..09380f4cf 100644
--- a/src/config/ConfigDefaults.hxx
+++ b/src/config/Defaults.hxx
diff --git a/src/config/ConfigError.cxx b/src/config/Domain.cxx
index d652ba172..1e9893be5 100644
--- a/src/config/ConfigError.cxx
+++ b/src/config/Domain.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ConfigError.hxx"
+#include "Domain.hxx"
 #include "util/Domain.hxx"
 
 const Domain config_domain("config");
diff --git a/src/config/ConfigError.hxx b/src/config/Domain.hxx
index 72c26d5b9..b1b630280 100644
--- a/src/config/ConfigError.hxx
+++ b/src/config/Domain.hxx
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_CONFIG_ERROR_HXX
-#define MPD_CONFIG_ERROR_HXX
+#ifndef MPD_CONFIG_DOMAIN_HXX
+#define MPD_CONFIG_DOMAIN_HXX
 
 extern const class Domain config_domain;
 
diff --git a/src/config/ConfigFile.cxx b/src/config/File.cxx
index 6cdd22009..03aca6e26 100644
--- a/src/config/ConfigFile.cxx
+++ b/src/config/File.cxx
@@ -18,11 +18,11 @@
  */
 
 #include "config.h"
-#include "ConfigFile.hxx"
+#include "File.hxx"
 #include "Data.hxx"
 #include "Param.hxx"
 #include "Block.hxx"
-#include "ConfigTemplates.hxx"
+#include "Templates.hxx"
 #include "util/Tokenizer.hxx"
 #include "util/StringStrip.hxx"
 #include "util/Domain.hxx"
diff --git a/src/config/ConfigFile.hxx b/src/config/File.hxx
index fa49fddf8..fa49fddf8 100644
--- a/src/config/ConfigFile.hxx
+++ b/src/config/File.hxx
diff --git a/src/config/ConfigGlobal.cxx b/src/config/Global.cxx
index 621e59307..0431937c2 100644
--- a/src/config/ConfigGlobal.cxx
+++ b/src/config/Global.cxx
@@ -18,14 +18,14 @@
  */
 
 #include "config.h"
-#include "ConfigGlobal.hxx"
-#include "ConfigParser.hxx"
+#include "Global.hxx"
+#include "Parser.hxx"
 #include "Data.hxx"
 #include "Param.hxx"
 #include "Block.hxx"
-#include "ConfigFile.hxx"
-#include "ConfigPath.hxx"
-#include "ConfigError.hxx"
+#include "File.hxx"
+#include "Path.hxx"
+#include "Domain.hxx"
 #include "fs/Path.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "system/FatalError.hxx"
diff --git a/src/config/ConfigGlobal.hxx b/src/config/Global.hxx
index a44cfe3f8..20bb3fc88 100644
--- a/src/config/ConfigGlobal.hxx
+++ b/src/config/Global.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_CONFIG_GLOBAL_HXX
 #define MPD_CONFIG_GLOBAL_HXX
 
-#include "ConfigOption.hxx"
+#include "Option.hxx"
 #include "Compiler.h"
 
 #include <chrono>
diff --git a/src/config/ConfigOption.hxx b/src/config/Option.hxx
index 6a66fff39..6a66fff39 100644
--- a/src/config/ConfigOption.hxx
+++ b/src/config/Option.hxx
diff --git a/src/config/Param.cxx b/src/config/Param.cxx
index 36dcdd9a0..175cb49af 100644
--- a/src/config/Param.cxx
+++ b/src/config/Param.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "Param.hxx"
-#include "ConfigPath.hxx"
+#include "Path.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/RuntimeError.hxx"
 
diff --git a/src/config/ConfigParser.cxx b/src/config/Parser.cxx
index 13ad98ead..8d233d1c2 100644
--- a/src/config/ConfigParser.cxx
+++ b/src/config/Parser.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ConfigParser.hxx"
+#include "Parser.hxx"
 #include "util/StringUtil.hxx"
 
 bool
diff --git a/src/config/ConfigParser.hxx b/src/config/Parser.hxx
index 83be449e6..83be449e6 100644
--- a/src/config/ConfigParser.hxx
+++ b/src/config/Parser.hxx
diff --git a/src/config/ConfigPath.cxx b/src/config/Path.cxx
index 2e75a4b59..32d23c9df 100644
--- a/src/config/ConfigPath.cxx
+++ b/src/config/Path.cxx
@@ -18,13 +18,13 @@
  */
 
 #include "config.h"
-#include "ConfigPath.hxx"
+#include "Path.hxx"
+#include "Global.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
 #include "fs/Domain.hxx"
 #include "fs/StandardDirectory.hxx"
 #include "util/RuntimeError.hxx"
-#include "ConfigGlobal.hxx"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/config/ConfigPath.hxx b/src/config/Path.hxx
index 2bc952680..2bc952680 100644
--- a/src/config/ConfigPath.hxx
+++ b/src/config/Path.hxx
diff --git a/src/config/ConfigTemplates.cxx b/src/config/Templates.cxx
index 8a0438340..f09321a74 100644
--- a/src/config/ConfigTemplates.cxx
+++ b/src/config/Templates.cxx
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ConfigTemplates.hxx"
-#include "ConfigOption.hxx"
+#include "Templates.hxx"
+#include "Option.hxx"
 #include "util/Macros.hxx"
 
 #include <string.h>
diff --git a/src/config/ConfigTemplates.hxx b/src/config/Templates.hxx
index d87ba02be..d87ba02be 100644
--- a/src/config/ConfigTemplates.hxx
+++ b/src/config/Templates.hxx
diff --git a/src/db/Configured.cxx b/src/db/Configured.cxx
index 5c0a1b00c..79b28197b 100644
--- a/src/db/Configured.cxx
+++ b/src/db/Configured.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Configured.hxx"
 #include "DatabaseGlue.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Param.hxx"
 #include "config/Block.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/db/update/Walk.cxx b/src/db/update/Walk.cxx
index f04319849..db434df33 100644
--- a/src/db/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@@ -30,8 +30,8 @@
 #include "storage/StorageInterface.hxx"
 #include "playlist/PlaylistRegistry.hxx"
 #include "ExcludeList.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
diff --git a/src/decoder/DecoderList.cxx b/src/decoder/DecoderList.cxx
index 9da62bcce..b5c6264c8 100644
--- a/src/decoder/DecoderList.cxx
+++ b/src/decoder/DecoderList.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "DecoderList.hxx"
 #include "DecoderPlugin.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Block.hxx"
 #include "plugins/AudiofileDecoderPlugin.hxx"
 #include "plugins/PcmDecoderPlugin.hxx"
diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx
index baec7374f..65c840424 100644
--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/src/decoder/plugins/MadDecoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "MadDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "tag/Id3Scan.hxx"
 #include "tag/Rva2.hxx"
 #include "tag/Handler.hxx"
diff --git a/src/encoder/plugins/FlacEncoderPlugin.cxx b/src/encoder/plugins/FlacEncoderPlugin.cxx
index 188b13e17..303e5aff4 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 "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/DynamicFifoBuffer.hxx"
 #include "util/RuntimeError.hxx"
 
diff --git a/src/encoder/plugins/LameEncoderPlugin.cxx b/src/encoder/plugins/LameEncoderPlugin.cxx
index 04c4cc976..2a8513cb4 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 "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/NumberParser.hxx"
 #include "util/ReusableArray.hxx"
 #include "util/RuntimeError.hxx"
diff --git a/src/encoder/plugins/OpusEncoderPlugin.cxx b/src/encoder/plugins/OpusEncoderPlugin.cxx
index b7424171f..a44b11c82 100644
--- a/src/encoder/plugins/OpusEncoderPlugin.cxx
+++ b/src/encoder/plugins/OpusEncoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "OpusEncoderPlugin.hxx"
 #include "OggEncoder.hxx"
 #include "AudioFormat.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/Alloc.hxx"
 #include "system/ByteOrder.hxx"
 #include "util/StringUtil.hxx"
diff --git a/src/encoder/plugins/ShineEncoderPlugin.cxx b/src/encoder/plugins/ShineEncoderPlugin.cxx
index 757ff9942..7341c356b 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 "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/DynamicFifoBuffer.hxx"
 #include "util/RuntimeError.hxx"
 
diff --git a/src/encoder/plugins/TwolameEncoderPlugin.cxx b/src/encoder/plugins/TwolameEncoderPlugin.cxx
index e34dd8a81..5959b4389 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 "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/NumberParser.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
diff --git a/src/encoder/plugins/VorbisEncoderPlugin.cxx b/src/encoder/plugins/VorbisEncoderPlugin.cxx
index 5a8e2826a..0c205f08b 100644
--- a/src/encoder/plugins/VorbisEncoderPlugin.cxx
+++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx
@@ -22,7 +22,7 @@
 #include "OggEncoder.hxx"
 #include "lib/xiph/VorbisComment.hxx"
 #include "AudioFormat.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/StringUtil.hxx"
 #include "util/NumberParser.hxx"
 #include "util/RuntimeError.hxx"
diff --git a/src/filter/LoadChain.cxx b/src/filter/LoadChain.cxx
index e5eb0f915..558134b92 100644
--- a/src/filter/LoadChain.cxx
+++ b/src/filter/LoadChain.cxx
@@ -23,9 +23,9 @@
 #include "Prepared.hxx"
 #include "plugins/ChainFilterPlugin.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigOption.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Option.hxx"
+#include "config/Global.hxx"
+#include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "util/RuntimeError.hxx"
 
diff --git a/src/filter/plugins/RouteFilterPlugin.cxx b/src/filter/plugins/RouteFilterPlugin.cxx
index e7eebe5e8..6a4977b83 100644
--- a/src/filter/plugins/RouteFilterPlugin.cxx
+++ b/src/filter/plugins/RouteFilterPlugin.cxx
@@ -40,7 +40,7 @@
  */
 
 #include "config.h"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "AudioFormat.hxx"
 #include "filter/FilterPlugin.hxx"
diff --git a/src/fs/CheckFile.cxx b/src/fs/CheckFile.cxx
index 633ccc437..67578e182 100644
--- a/src/fs/CheckFile.cxx
+++ b/src/fs/CheckFile.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "CheckFile.hxx"
 #include "Log.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "FileInfo.hxx"
 #include "Path.hxx"
 #include "AllocatedPath.hxx"
diff --git a/src/fs/Config.cxx b/src/fs/Config.cxx
index b7409b56c..9d51da47e 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 "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 
 void
 ConfigureFS()
diff --git a/src/input/Init.cxx b/src/input/Init.cxx
index 146f7db2e..f5b42b00b 100644
--- a/src/input/Init.cxx
+++ b/src/input/Init.cxx
@@ -21,8 +21,8 @@
 #include "Init.hxx"
 #include "Registry.hxx"
 #include "InputPlugin.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "config/Block.hxx"
 #include "Log.hxx"
 #include "PluginUnavailable.hxx"
diff --git a/src/input/plugins/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx
index 22121efc9..34b4cdf07 100644
--- a/src/input/plugins/CdioParanoiaInputPlugin.cxx
+++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx
@@ -33,7 +33,7 @@
 #include "fs/AllocatedPath.hxx"
 #include "Log.hxx"
 #include "config/Block.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx
index dcf87eb87..a4ccc8310 100644
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -31,7 +31,7 @@
 #include "../IcyInputStream.hxx"
 #include "IcyMetaDataParser.hxx"
 #include "../InputPlugin.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Block.hxx"
 #include "tag/Builder.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/neighbor/Glue.cxx b/src/neighbor/Glue.cxx
index 5037ba8ac..b55b3d9ad 100644
--- a/src/neighbor/Glue.cxx
+++ b/src/neighbor/Glue.cxx
@@ -23,8 +23,8 @@
 #include "Explorer.hxx"
 #include "NeighborPlugin.hxx"
 #include "Info.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Global.hxx"
+#include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "util/RuntimeError.hxx"
 
diff --git a/src/output/Init.cxx b/src/output/Init.cxx
index 3847e54b1..5f5d07e18 100644
--- a/src/output/Init.cxx
+++ b/src/output/Init.cxx
@@ -35,8 +35,8 @@
 #include "filter/plugins/ChainFilterPlugin.hxx"
 #include "filter/plugins/VolumeFilterPlugin.hxx"
 #include "filter/plugins/NormalizeFilterPlugin.hxx"
-#include "config/ConfigError.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Domain.hxx"
+#include "config/Global.hxx"
 #include "config/Block.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/StringFormat.hxx"
diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx
index f87baa6bc..de60c8eb3 100644
--- a/src/output/MultipleOutputs.cxx
+++ b/src/output/MultipleOutputs.cxx
@@ -24,8 +24,8 @@
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 #include "config/Block.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "util/RuntimeError.hxx"
 
 #include <stdexcept>
diff --git a/src/output/plugins/JackOutputPlugin.cxx b/src/output/plugins/JackOutputPlugin.cxx
index 92afc2df1..58d7000ee 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 "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/IterableSplitString.hxx"
diff --git a/src/output/plugins/RecorderOutputPlugin.cxx b/src/output/plugins/RecorderOutputPlugin.cxx
index 2e58fafea..5359d16c7 100644
--- a/src/output/plugins/RecorderOutputPlugin.cxx
+++ b/src/output/plugins/RecorderOutputPlugin.cxx
@@ -24,8 +24,8 @@
 #include "encoder/ToOutputStream.hxx"
 #include "encoder/EncoderInterface.hxx"
 #include "encoder/Configured.hxx"
-#include "config/ConfigError.hxx"
-#include "config/ConfigPath.hxx"
+#include "config/Domain.hxx"
+#include "config/Path.hxx"
 #include "Log.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/io/FileOutputStream.hxx"
diff --git a/src/pcm/ConfiguredResampler.cxx b/src/pcm/ConfiguredResampler.cxx
index 605900c1c..5e2744ab2 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 "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
+#include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "config/Param.hxx"
 #include "util/RuntimeError.hxx"
diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx
index 01151c83a..446db1636 100644
--- a/src/playlist/PlaylistRegistry.cxx
+++ b/src/playlist/PlaylistRegistry.cxx
@@ -36,7 +36,7 @@
 #include "util/UriUtil.hxx"
 #include "util/StringUtil.hxx"
 #include "util/Macros.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Block.hxx"
 
 #include <assert.h>
diff --git a/src/queue/PlaylistState.cxx b/src/queue/PlaylistState.cxx
index bb916f2c7..20668c5b0 100644
--- a/src/queue/PlaylistState.cxx
+++ b/src/queue/PlaylistState.cxx
@@ -31,8 +31,8 @@
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
 #include "player/Control.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "util/CharUtil.hxx"
 #include "util/StringAPI.hxx"
 #include "util/StringCompare.hxx"
diff --git a/src/storage/Configured.cxx b/src/storage/Configured.cxx
index d0ee3d543..f6a53c838 100644
--- a/src/storage/Configured.cxx
+++ b/src/storage/Configured.cxx
@@ -22,8 +22,8 @@
 #include "Registry.hxx"
 #include "StorageInterface.hxx"
 #include "plugins/LocalStorage.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Global.hxx"
+#include "config/Domain.hxx"
 #include "fs/StandardDirectory.hxx"
 #include "fs/CheckFile.hxx"
 #include "util/UriUtil.hxx"
diff --git a/src/tag/Config.cxx b/src/tag/Config.cxx
index 4ea09f559..a08239efd 100644
--- a/src/tag/Config.cxx
+++ b/src/tag/Config.cxx
@@ -21,8 +21,8 @@
 #include "Config.hxx"
 #include "Settings.hxx"
 #include "ParseName.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "util/Alloc.hxx"
 #include "util/ASCII.hxx"
 #include "util/StringStrip.hxx"
diff --git a/src/zeroconf/ZeroconfGlue.cxx b/src/zeroconf/ZeroconfGlue.cxx
index 808083b0c..9e704b8fb 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 "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "Listen.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx
index fbe300d9f..43e45e184 100644
--- a/test/DumpDatabase.cxx
+++ b/test/DumpDatabase.cxx
@@ -26,7 +26,7 @@
 #include "db/LightDirectory.hxx"
 #include "db/LightSong.hxx"
 #include "db/PlaylistVector.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Param.hxx"
 #include "config/Block.hxx"
 #include "tag/Config.hxx"
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx
index cfafcfad0..06d1dac54 100644
--- a/test/dump_playlist.cxx
+++ b/test/dump_playlist.cxx
@@ -22,7 +22,7 @@
 #include "DetachedSong.hxx"
 #include "playlist/SongEnumerator.hxx"
 #include "input/InputStream.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "decoder/DecoderList.hxx"
 #include "input/Init.hxx"
 #include "event/Thread.hxx"
diff --git a/test/dump_rva2.cxx b/test/dump_rva2.cxx
index 68beec9b4..1cb821fbf 100644
--- a/test/dump_rva2.cxx
+++ b/test/dump_rva2.cxx
@@ -21,7 +21,7 @@
 #include "tag/Id3Load.hxx"
 #include "tag/Rva2.hxx"
 #include "ReplayGainInfo.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "thread/Mutex.hxx"
 #include "fs/Path.hxx"
 #include "input/InputStream.hxx"
diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx
index 24962b836..955e82cc6 100644
--- a/test/dump_text_file.cxx
+++ b/test/dump_text_file.cxx
@@ -22,7 +22,7 @@
 #include "input/Init.hxx"
 #include "input/InputStream.hxx"
 #include "input/TextInputStream.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "Log.hxx"
 
 #ifdef ENABLE_ARCHIVE
diff --git a/test/read_conf.cxx b/test/read_conf.cxx
index f37f9126c..b8925f17c 100644
--- a/test/read_conf.cxx
+++ b/test/read_conf.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "fs/Path.hxx"
 #include "Log.hxx"
 
diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx
index 701d9e7c1..d4e3aef44 100644
--- a/test/run_decoder.cxx
+++ b/test/run_decoder.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "event/Thread.hxx"
 #include "decoder/DecoderList.hxx"
 #include "decoder/DecoderPlugin.hxx"
diff --git a/test/run_filter.cxx b/test/run_filter.cxx
index a4440854a..d81342069 100644
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "fs/Path.hxx"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
diff --git a/test/run_input.cxx b/test/run_input.cxx
index d255a76b7..dc3fa1063 100644
--- a/test/run_input.cxx
+++ b/test/run_input.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "TagSave.hxx"
 #include "tag/Tag.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "input/InputStream.hxx"
 #include "input/Init.hxx"
 #include "input/Registry.hxx"
diff --git a/test/run_neighbor_explorer.cxx b/test/run_neighbor_explorer.cxx
index 4505f0e74..3184cdc91 100644
--- a/test/run_neighbor_explorer.cxx
+++ b/test/run_neighbor_explorer.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "neighbor/Listener.hxx"
 #include "neighbor/Info.hxx"
 #include "neighbor/Glue.hxx"
diff --git a/test/run_output.cxx b/test/run_output.cxx
index 74bfc7aab..8437eefa8 100644
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
@@ -22,8 +22,8 @@
 #include "output/Registry.hxx"
 #include "output/OutputPlugin.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "config/Block.hxx"
 #include "event/Thread.hxx"
 #include "fs/Path.hxx"
diff --git a/test/visit_archive.cxx b/test/visit_archive.cxx
index 5bb02a02e..c8a87e27a 100644
--- a/test/visit_archive.cxx
+++ b/test/visit_archive.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "tag/Tag.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "event/Thread.hxx"
 #include "input/Init.hxx"
 #include "archive/ArchiveList.hxx"