Config*: move to config/

2014-01-24 00:20:01 +01:00 · 2014-01-24 00:20:01 +01:00 · 197b503f3e
parent 129eb178eb
commit 197b503f3e
80 changed files with 111 additions and 111 deletions
--- 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

--- 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"

--- 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)
--- 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"
--- 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"
--- 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"

--- 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>
--- 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>
--- 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>
--- 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"
--- 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"
--- 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
--- 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>
--- 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"
--- 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"
--- 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>
--- 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"
--- a/src/config/ConfigData.cxx
+++ b/src/config/ConfigData.cxx
--- a/src/config/ConfigData.hxx
+++ b/src/config/ConfigData.hxx
--- a/src/config/ConfigDefaults.hxx
+++ b/src/config/ConfigDefaults.hxx
--- a/src/config/ConfigError.cxx
+++ b/src/config/ConfigError.cxx
--- a/src/config/ConfigError.hxx
+++ b/src/config/ConfigError.hxx
--- a/src/config/ConfigFile.cxx
+++ b/src/config/ConfigFile.cxx
--- a/src/config/ConfigFile.hxx
+++ b/src/config/ConfigFile.hxx
--- a/src/config/ConfigGlobal.cxx
+++ b/src/config/ConfigGlobal.cxx
--- a/src/config/ConfigGlobal.hxx
+++ b/src/config/ConfigGlobal.hxx
--- a/src/config/ConfigOption.hxx
+++ b/src/config/ConfigOption.hxx
--- a/src/config/ConfigParser.cxx
+++ b/src/config/ConfigParser.cxx
--- a/src/config/ConfigParser.hxx
+++ b/src/config/ConfigParser.hxx
--- a/src/config/ConfigPath.cxx
+++ b/src/config/ConfigPath.cxx
--- a/src/config/ConfigPath.hxx
+++ b/src/config/ConfigPath.hxx
--- a/src/config/ConfigTemplates.cxx
+++ b/src/config/ConfigTemplates.cxx
--- a/src/config/ConfigTemplates.hxx
+++ b/src/config/ConfigTemplates.hxx
--- 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"
--- 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"
--- 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"
--- 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

--- 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"
--- 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"
--- 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

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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>

--- 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"
--- 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>

--- 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>
--- 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"
--- 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"
--- 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>
--- 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

--- 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>
--- 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"

--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"