ConfigData: move struct config_param to Param.hxx

40 files changed, 144 insertions, 114 deletions

diff --git a/Makefile.am b/Makefile.am
index 1cd6b1bf6..e3e4358d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -769,8 +769,9 @@ endif
 libconf_a_SOURCES = \
 	src/config/ConfigDefaults.hxx \
 	src/config/ConfigPath.cxx src/config/ConfigPath.hxx \
-	src/config/ConfigData.cxx src/config/ConfigData.hxx \
+	src/config/ConfigData.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 \
diff --git a/src/AudioConfig.cxx b/src/AudioConfig.cxx
index 1045a1956..ef1f96ee9 100644
--- a/src/AudioConfig.cxx
+++ b/src/AudioConfig.cxx
@@ -21,7 +21,7 @@
 #include "AudioConfig.hxx"
 #include "AudioFormat.hxx"
 #include "AudioParser.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigOption.hxx"
 #include "util/Error.hxx"
diff --git a/src/Listen.cxx b/src/Listen.cxx
index 3a4b7139f..05a2bdd4d 100644
--- a/src/Listen.cxx
+++ b/src/Listen.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Listen.hxx"
 #include "client/Client.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigOption.hxx"
 #include "event/ServerSocket.hxx"
diff --git a/src/LogInit.cxx b/src/LogInit.cxx
index b2a7c33ba..d9fd846fa 100644
--- a/src/LogInit.cxx
+++ b/src/LogInit.cxx
@@ -21,7 +21,7 @@
 #include "LogInit.hxx"
 #include "LogBackend.hxx"
 #include "Log.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigOption.hxx"
 #include "system/FatalError.hxx"
diff --git a/src/Main.cxx b/src/Main.cxx
index 8eed54428..c7304f117 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -58,7 +58,7 @@
 #include "thread/Slack.hxx"
 #include "lib/icu/Init.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigDefaults.hxx"
 #include "config/ConfigOption.hxx"
 #include "config/ConfigError.hxx"
diff --git a/src/Permission.cxx b/src/Permission.cxx
index fe1441430..c14830ac7 100644
--- a/src/Permission.cxx
+++ b/src/Permission.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "Permission.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigOption.hxx"
 #include "system/FatalError.hxx"
diff --git a/src/ReplayGainConfig.cxx b/src/ReplayGainConfig.cxx
index 2d1df3913..8d1f83404 100644
--- a/src/ReplayGainConfig.cxx
+++ b/src/ReplayGainConfig.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "ReplayGainConfig.hxx"
 #include "Idle.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "system/FatalError.hxx"
 
diff --git a/src/config/ConfigData.hxx b/src/config/ConfigData.hxx
index 1f7e61b6f..a79836324 100644
--- a/src/config/ConfigData.hxx
+++ b/src/config/ConfigData.hxx
@@ -20,88 +20,11 @@
 #ifndef MPD_CONFIG_DATA_HXX
 #define MPD_CONFIG_DATA_HXX
 
-#include "Block.hxx"
 #include "ConfigOption.hxx"
-#include "Compiler.h"
 
-#include <string>
 #include <array>
-#include <vector>
 
-class AllocatedPath;
-class Error;
-
-struct config_param {
-	/**
-	 * The next config_param with the same name.  The destructor
-	 * deletes the whole chain.
-	 */
-	struct config_param *next;
-
-	std::string value;
-
-	unsigned int line;
-
-	std::vector<BlockParam> block_params;
-
-	/**
-	 * This flag is false when nobody has queried the value of
-	 * this option yet.
-	 */
-	bool used;
-
-	config_param(int _line=-1)
-		:next(nullptr), line(_line), used(false) {}
-
-	gcc_nonnull_all
-	config_param(const char *_value, int _line=-1);
-
-	config_param(const config_param &) = delete;
-
-	~config_param();
-
-	config_param &operator=(const config_param &) = delete;
-
-	/**
-	 * Determine if this is a "null" instance, i.e. an empty
-	 * object that was synthesized and not loaded from a
-	 * configuration file.
-	 */
-	bool IsNull() const {
-		return line == unsigned(-1);
-	}
-
-	gcc_nonnull_all
-	void AddBlockParam(const char *_name, const char *_value,
-			   int _line=-1) {
-		block_params.emplace_back(_name, _value, _line);
-	}
-
-	gcc_nonnull_all gcc_pure
-	const BlockParam *GetBlockParam(const char *_name) const;
-
-	gcc_pure
-	const char *GetBlockValue(const char *name,
-				  const char *default_value=nullptr) const;
-
-	/**
-	 * Same as config_get_path(), but looks up the setting in the
-	 * specified block.
-	 */
-	AllocatedPath GetBlockPath(const char *name, const char *default_value,
-				   Error &error) const;
-
-	AllocatedPath GetBlockPath(const char *name, Error &error) const;
-
-	gcc_pure
-	int GetBlockValue(const char *name, int default_value) const;
-
-	gcc_pure
-	unsigned GetBlockValue(const char *name, unsigned default_value) const;
-
-	gcc_pure
-	bool GetBlockValue(const char *name, bool default_value) const;
-};
+struct config_param;
 
 struct ConfigData {
 	std::array<config_param *, std::size_t(CONF_MAX)> params;
diff --git a/src/config/ConfigFile.cxx b/src/config/ConfigFile.cxx
index 605adb430..da4613010 100644
--- a/src/config/ConfigFile.cxx
+++ b/src/config/ConfigFile.cxx
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "ConfigFile.hxx"
 #include "ConfigData.hxx"
+#include "Param.hxx"
 #include "ConfigTemplates.hxx"
 #include "util/Tokenizer.hxx"
 #include "util/StringUtil.hxx"
diff --git a/src/config/ConfigGlobal.cxx b/src/config/ConfigGlobal.cxx
index 281c841a4..8efa2129d 100644
--- a/src/config/ConfigGlobal.cxx
+++ b/src/config/ConfigGlobal.cxx
@@ -21,6 +21,7 @@
 #include "ConfigGlobal.hxx"
 #include "ConfigParser.hxx"
 #include "ConfigData.hxx"
+#include "Param.hxx"
 #include "ConfigFile.hxx"
 #include "ConfigPath.hxx"
 #include "ConfigError.hxx"
diff --git a/src/config/ConfigData.cxx b/src/config/Param.cxx
index 5d0b61df0..376f50ee7 100644
--- a/src/config/ConfigData.cxx
+++ b/src/config/Param.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "ConfigData.hxx"
+#include "Param.hxx"
 #include "ConfigPath.hxx"
 #include "util/Error.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/config/Param.hxx b/src/config/Param.hxx
new file mode 100644
index 000000000..66700044c
--- /dev/null
+++ b/src/config/Param.hxx
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_CONFIG_PARAM_HXX
+#define MPD_CONFIG_PARAM_HXX
+
+#include "Block.hxx"
+#include "Compiler.h"
+
+#include <string>
+#include <vector>
+
+class AllocatedPath;
+class Error;
+
+struct config_param {
+	/**
+	 * The next config_param with the same name.  The destructor
+	 * deletes the whole chain.
+	 */
+	struct config_param *next;
+
+	std::string value;
+
+	unsigned int line;
+
+	std::vector<BlockParam> block_params;
+
+	/**
+	 * This flag is false when nobody has queried the value of
+	 * this option yet.
+	 */
+	bool used;
+
+	config_param(int _line=-1)
+		:next(nullptr), line(_line), used(false) {}
+
+	gcc_nonnull_all
+	config_param(const char *_value, int _line=-1);
+
+	config_param(const config_param &) = delete;
+
+	~config_param();
+
+	config_param &operator=(const config_param &) = delete;
+
+	/**
+	 * Determine if this is a "null" instance, i.e. an empty
+	 * object that was synthesized and not loaded from a
+	 * configuration file.
+	 */
+	bool IsNull() const {
+		return line == unsigned(-1);
+	}
+
+	gcc_nonnull_all
+	void AddBlockParam(const char *_name, const char *_value,
+			   int _line=-1) {
+		block_params.emplace_back(_name, _value, _line);
+	}
+
+	gcc_nonnull_all gcc_pure
+	const BlockParam *GetBlockParam(const char *_name) const;
+
+	gcc_pure
+	const char *GetBlockValue(const char *name,
+				  const char *default_value=nullptr) const;
+
+	/**
+	 * Same as config_get_path(), but looks up the setting in the
+	 * specified block.
+	 */
+	AllocatedPath GetBlockPath(const char *name, const char *default_value,
+				   Error &error) const;
+
+	AllocatedPath GetBlockPath(const char *name, Error &error) const;
+
+	gcc_pure
+	int GetBlockValue(const char *name, int default_value) const;
+
+	gcc_pure
+	unsigned GetBlockValue(const char *name, unsigned default_value) const;
+
+	gcc_pure
+	bool GetBlockValue(const char *name, bool default_value) const;
+};
+
+#endif
diff --git a/src/db/Configured.cxx b/src/db/Configured.cxx
index dd537054a..7bdd10b56 100644
--- a/src/db/Configured.cxx
+++ b/src/db/Configured.cxx
@@ -21,7 +21,7 @@
 #include "Configured.hxx"
 #include "DatabaseGlue.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigError.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/StandardDirectory.hxx"
diff --git a/src/db/DatabaseGlue.cxx b/src/db/DatabaseGlue.cxx
index 0cee0d3ac..3ba1b8148 100644
--- a/src/db/DatabaseGlue.cxx
+++ b/src/db/DatabaseGlue.cxx
@@ -22,7 +22,7 @@
 #include "Registry.hxx"
 #include "DatabaseError.hxx"
 #include "util/Error.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "DatabasePlugin.hxx"
 
 #include <string.h>
diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx
index f7518c7ab..1a94000b2 100644
--- a/src/db/plugins/ProxyDatabasePlugin.cxx
+++ b/src/db/plugins/ProxyDatabasePlugin.cxx
@@ -30,7 +30,7 @@
 #include "db/Stats.hxx"
 #include "SongFilter.hxx"
 #include "Compiler.h"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "tag/TagBuilder.hxx"
 #include "tag/Tag.hxx"
 #include "util/Error.hxx"
diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.cxx b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
index 472ac818c..18faf46df 100644
--- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
@@ -34,7 +34,7 @@
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
 #include "fs/io/FileOutputStream.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "fs/FileSystem.hxx"
 #include "util/CharUtil.hxx"
 #include "util/Error.hxx"
diff --git a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
index 94c720a8f..2f666acbe 100644
--- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
+++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
@@ -33,7 +33,7 @@
 #include "db/LightDirectory.hxx"
 #include "db/LightSong.hxx"
 #include "db/Stats.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.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 ac7d254f7..12e464801 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 "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "Chrono.hxx"
 
 // IWYU pragma: end_exports
diff --git a/src/decoder/DecoderList.cxx b/src/decoder/DecoderList.cxx
index d49634797..c5b8ff5fb 100644
--- a/src/decoder/DecoderList.cxx
+++ b/src/decoder/DecoderList.cxx
@@ -21,7 +21,7 @@
 #include "DecoderList.hxx"
 #include "DecoderPlugin.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "plugins/AudiofileDecoderPlugin.hxx"
 #include "plugins/PcmDecoderPlugin.hxx"
 #include "plugins/DsdiffDecoderPlugin.hxx"
diff --git a/src/encoder/EncoderAPI.hxx b/src/encoder/EncoderAPI.hxx
index 40e78a658..a266667fd 100644
--- a/src/encoder/EncoderAPI.hxx
+++ b/src/encoder/EncoderAPI.hxx
@@ -31,7 +31,7 @@
 #include "EncoderPlugin.hxx"
 #include "AudioFormat.hxx"
 #include "tag/Tag.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 
 // IWYU pragma: end_exports
 
diff --git a/src/filter/FilterConfig.cxx b/src/filter/FilterConfig.cxx
index c7d361dbe..6ceecd581 100644
--- a/src/filter/FilterConfig.cxx
+++ b/src/filter/FilterConfig.cxx
@@ -21,7 +21,7 @@
 #include "FilterConfig.hxx"
 #include "plugins/ChainFilterPlugin.hxx"
 #include "FilterPlugin.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigOption.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigError.hxx"
diff --git a/src/filter/FilterPlugin.cxx b/src/filter/FilterPlugin.cxx
index f580c0c94..2d007e2db 100644
--- a/src/filter/FilterPlugin.cxx
+++ b/src/filter/FilterPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "FilterPlugin.hxx"
 #include "FilterRegistry.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigError.hxx"
 #include "util/Error.hxx"
 
diff --git a/src/filter/plugins/AutoConvertFilterPlugin.cxx b/src/filter/plugins/AutoConvertFilterPlugin.cxx
index b4e6baa6e..1c0c99799 100644
--- a/src/filter/plugins/AutoConvertFilterPlugin.cxx
+++ b/src/filter/plugins/AutoConvertFilterPlugin.cxx
@@ -24,7 +24,7 @@
 #include "filter/FilterInternal.hxx"
 #include "filter/FilterRegistry.hxx"
 #include "AudioFormat.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "util/ConstBuffer.hxx"
 
 #include <assert.h>
diff --git a/src/filter/plugins/RouteFilterPlugin.cxx b/src/filter/plugins/RouteFilterPlugin.cxx
index 46d9d68ee..f84dac8cb 100644
--- a/src/filter/plugins/RouteFilterPlugin.cxx
+++ b/src/filter/plugins/RouteFilterPlugin.cxx
@@ -41,7 +41,7 @@
 
 #include "config.h"
 #include "config/ConfigError.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "AudioFormat.hxx"
 #include "filter/FilterPlugin.hxx"
 #include "filter/FilterInternal.hxx"
diff --git a/src/input/Init.cxx b/src/input/Init.cxx
index b29d76f22..9fbef934e 100644
--- a/src/input/Init.cxx
+++ b/src/input/Init.cxx
@@ -24,7 +24,7 @@
 #include "util/Error.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigOption.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "Log.hxx"
 
 #include <assert.h>
diff --git a/src/input/plugins/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx
index f15551647..026d43077 100644
--- a/src/input/plugins/CdioParanoiaInputPlugin.cxx
+++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx
@@ -31,7 +31,7 @@
 #include "system/ByteOrder.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "Log.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigError.hxx"
 
 #include <stdio.h>
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx
index e6fb1140e..a055d0bf6 100644
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -23,7 +23,7 @@
 #include "../IcyInputStream.hxx"
 #include "../InputPlugin.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "tag/Tag.hxx"
 #include "tag/TagBuilder.hxx"
 #include "event/SocketMonitor.hxx"
diff --git a/src/mixer/plugins/OssMixerPlugin.cxx b/src/mixer/plugins/OssMixerPlugin.cxx
index 35f3cbbe0..991ca7e9d 100644
--- a/src/mixer/plugins/OssMixerPlugin.cxx
+++ b/src/mixer/plugins/OssMixerPlugin.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "mixer/MixerInternal.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "system/fd_util.h"
 #include "util/ASCII.hxx"
 #include "util/Error.hxx"
diff --git a/src/mixer/plugins/SoftwareMixerPlugin.cxx b/src/mixer/plugins/SoftwareMixerPlugin.cxx
index c84990888..7f66d2145 100644
--- a/src/mixer/plugins/SoftwareMixerPlugin.cxx
+++ b/src/mixer/plugins/SoftwareMixerPlugin.cxx
@@ -25,7 +25,7 @@
 #include "filter/FilterInternal.hxx"
 #include "filter/plugins/VolumeFilterPlugin.hxx"
 #include "pcm/Volume.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "util/Error.hxx"
 
 #include <assert.h>
diff --git a/src/neighbor/Glue.cxx b/src/neighbor/Glue.cxx
index f3b11e2d3..e5d67f962 100644
--- a/src/neighbor/Glue.cxx
+++ b/src/neighbor/Glue.cxx
@@ -24,7 +24,7 @@
 #include "NeighborPlugin.hxx"
 #include "Info.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigError.hxx"
 #include "util/Error.hxx"
 
diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx
index 5e6030956..ba4423f77 100644
--- a/src/output/MultipleOutputs.cxx
+++ b/src/output/MultipleOutputs.cxx
@@ -27,7 +27,7 @@
 #include "MusicChunk.hxx"
 #include "system/FatalError.hxx"
 #include "util/Error.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigOption.hxx"
 #include "notify.hxx"
diff --git a/src/output/OutputAPI.hxx b/src/output/OutputAPI.hxx
index 83544e0ff..92b3ffec9 100644
--- a/src/output/OutputAPI.hxx
+++ b/src/output/OutputAPI.hxx
@@ -26,7 +26,7 @@
 #include "Internal.hxx"
 #include "AudioFormat.hxx"
 #include "tag/Tag.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 
 // IWYU pragma: end_exports
 
diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx
index 1a18cdc09..a1c0cd37a 100644
--- a/src/playlist/PlaylistRegistry.cxx
+++ b/src/playlist/PlaylistRegistry.cxx
@@ -36,7 +36,7 @@
 #include "util/Error.hxx"
 #include "util/Macros.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "Log.hxx"
 
 #include <assert.h>
diff --git a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
index c298da6b1..0c14f59dd 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 "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "input/InputStream.hxx"
 #include "tag/TagBuilder.hxx"
 #include "util/StringUtil.hxx"
diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx
index a78a421e1..95c77abbb 100644
--- a/test/DumpDatabase.cxx
+++ b/test/DumpDatabase.cxx
@@ -27,7 +27,7 @@
 #include "db/LightSong.hxx"
 #include "db/PlaylistVector.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "tag/TagConfig.hxx"
 #include "fs/Path.hxx"
 #include "event/Loop.hxx"
diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx
index 791816c08..a94462ca3 100644
--- a/test/read_mixer.cxx
+++ b/test/read_mixer.cxx
@@ -24,7 +24,7 @@
 #include "pcm/Volume.hxx"
 #include "Main.hxx"
 #include "event/Loop.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
 
diff --git a/test/run_encoder.cxx b/test/run_encoder.cxx
index 8d8ec5164..04f0f07df 100644
--- a/test/run_encoder.cxx
+++ b/test/run_encoder.cxx
@@ -24,7 +24,7 @@
 #include "encoder/ToOutputStream.hxx"
 #include "AudioFormat.hxx"
 #include "AudioParser.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "fs/io/StdioOutputStream.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
diff --git a/test/run_filter.cxx b/test/run_filter.cxx
index 46357b597..f6a377d82 100644
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "fs/Path.hxx"
 #include "AudioParser.hxx"
diff --git a/test/run_output.cxx b/test/run_output.cxx
index de0aae306..2bf7e81d9 100644
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "output/Internal.hxx"
 #include "output/OutputPlugin.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigOption.hxx"
 #include "Idle.hxx"
diff --git a/test/test_vorbis_encoder.cxx b/test/test_vorbis_encoder.cxx
index ae1b2fdf2..8d3e4bd8a 100644
--- a/test/test_vorbis_encoder.cxx
+++ b/test/test_vorbis_encoder.cxx
@@ -23,7 +23,7 @@
 #include "encoder/EncoderInterface.hxx"
 #include "encoder/ToOutputStream.hxx"
 #include "AudioFormat.hxx"
-#include "config/ConfigData.hxx"
+#include "config/Param.hxx"
 #include "fs/io/StdioOutputStream.hxx"
 #include "tag/Tag.hxx"
 #include "tag/TagBuilder.hxx"