check.h: remove obsolete header

Since we switched from autotools to Meson in commit 94592c1406, we don't need to include `config.h` early to properly enable large file support. Meson passes the required macros on the compiler command line instead of defining them in `config.h`. This means we can include `config.h` at any time, whenever we want to check its macros, and there are no ordering constraints.
2018-11-19 12:49:45 +01:00
parent 2e450bbf95
commit ce49d99c2f
725 changed files with 68 additions and 888 deletions
--- a/src/lib/alsa/AllowedFormat.cxx
+++ b/src/lib/alsa/AllowedFormat.cxx
@@ -17,11 +17,11 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "AllowedFormat.hxx"
 #include "AudioParser.hxx"
 #include "util/IterableSplitString.hxx"
 #include "util/StringBuffer.hxx"
+#include "config.h"

 #include <stdexcept>

--- a/src/lib/alsa/AllowedFormat.hxx
+++ b/src/lib/alsa/AllowedFormat.hxx
@@ -20,8 +20,8 @@
 #ifndef MPD_ALSA_ALLOWED_FORMAT_HXX
 #define MPD_ALSA_ALLOWED_FORMAT_HXX

-#include "check.h"
 #include "AudioFormat.hxx"
+#include "config.h"

 #include <forward_list>
 #include <string>
--- a/src/lib/alsa/Format.hxx
+++ b/src/lib/alsa/Format.hxx
@@ -20,9 +20,9 @@
 #ifndef MPD_ALSA_FORMAT_HXX
 #define MPD_ALSA_FORMAT_HXX

-#include "check.h"
 #include "pcm/SampleFormat.hxx"
 #include "util/Compiler.h"
+#include "config.h"

 #include <alsa/asoundlib.h>

--- a/src/lib/alsa/HwSetup.cxx
+++ b/src/lib/alsa/HwSetup.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "HwSetup.hxx"
 #include "Format.hxx"
 #include "system/ByteOrder.hxx"
@@ -25,6 +24,7 @@
 #include "util/RuntimeError.hxx"
 #include "AudioFormat.hxx"
 #include "Log.hxx"
+#include "config.h"

 static constexpr Domain alsa_output_domain("alsa_output");

--- a/src/lib/alsa/HwSetup.hxx
+++ b/src/lib/alsa/HwSetup.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_ALSA_HW_SETUP_HXX
 #define MPD_ALSA_HW_SETUP_HXX

-#include "check.h"
 #include "pcm/PcmExport.hxx"

 #include <alsa/asoundlib.h>
--- a/src/lib/alsa/NonBlock.cxx
+++ b/src/lib/alsa/NonBlock.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "NonBlock.hxx"
 #include "event/MultiSocketMonitor.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/lib/alsa/NonBlock.hxx
+++ b/src/lib/alsa/NonBlock.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_ALSA_NON_BLOCK_HXX
 #define MPD_ALSA_NON_BLOCK_HXX

-#include "check.h"
 #include "util/ReusableArray.hxx"

 #include <alsa/asoundlib.h>
--- a/src/lib/alsa/PeriodBuffer.hxx
+++ b/src/lib/alsa/PeriodBuffer.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_ALSA_PERIOD_BUFFER_HXX
 #define MPD_ALSA_PERIOD_BUFFER_HXX

-#include "check.h"
-
 #include <alsa/asoundlib.h>

 #include <algorithm>
--- a/src/lib/curl/Form.cxx
+++ b/src/lib/curl/Form.cxx
@@ -27,7 +27,6 @@
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "config.h"
 #include "Form.hxx"

 std::string
--- a/src/lib/curl/Global.cxx
+++ b/src/lib/curl/Global.cxx
@@ -27,7 +27,6 @@
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "config.h"
 #include "Global.hxx"
 #include "Request.hxx"
 #include "Log.hxx"
@@ -35,6 +34,7 @@
 #include "event/SocketMonitor.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
+#include "config.h"

 static constexpr Domain curlm_domain("curlm");

--- a/src/lib/curl/Init.cxx
+++ b/src/lib/curl/Init.cxx
@@ -27,7 +27,6 @@
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "config.h"
 #include "Init.hxx"
 #include "Global.hxx"
 #include "event/Call.hxx"
--- a/src/lib/curl/Init.hxx
+++ b/src/lib/curl/Init.hxx
@@ -30,8 +30,6 @@
 #ifndef CURL_INIT_HXX
 #define CURL_INIT_HXX

-#include "check.h"
-
 class Mutex;
 class EventLoop;
 class CurlGlobal;
--- a/src/lib/dbus/Glue.cxx
+++ b/src/lib/dbus/Glue.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Glue.hxx"
 #include "event/Call.hxx"

--- a/src/lib/dbus/Watch.cxx
+++ b/src/lib/dbus/Watch.cxx
@@ -30,7 +30,6 @@
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "config.h"
 #include "Watch.hxx"

 namespace ODBus {
--- a/src/lib/expat/ExpatParser.cxx
+++ b/src/lib/expat/ExpatParser.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "ExpatParser.hxx"
 #include "util/ASCII.hxx"

--- a/src/lib/expat/ExpatParser.hxx
+++ b/src/lib/expat/ExpatParser.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_EXPAT_HXX
 #define MPD_EXPAT_HXX

-#include "check.h"
 #include "util/Compiler.h"

 #include <expat.h>
--- a/src/lib/expat/StreamExpatParser.cxx
+++ b/src/lib/expat/StreamExpatParser.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "ExpatParser.hxx"
 #include "input/InputStream.hxx"

--- a/src/lib/ffmpeg/Domain.cxx
+++ b/src/lib/ffmpeg/Domain.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Domain.hxx"
 #include "util/Domain.hxx"

--- a/src/lib/ffmpeg/Error.cxx
+++ b/src/lib/ffmpeg/Error.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Error.hxx"
 #include "util/RuntimeError.hxx"

--- a/src/lib/ffmpeg/Init.cxx
+++ b/src/lib/ffmpeg/Init.cxx
@@ -20,7 +20,6 @@
 /* necessary because libavutil/common.h uses UINT64_C */
 #define __STDC_CONSTANT_MACROS

-#include "config.h"
 #include "Init.hxx"
 #include "LogCallback.hxx"

--- a/src/lib/ffmpeg/LogCallback.cxx
+++ b/src/lib/ffmpeg/LogCallback.cxx
@@ -20,7 +20,6 @@
 /* necessary because libavutil/common.h uses UINT64_C */
 #define __STDC_CONSTANT_MACROS

-#include "config.h"
 #include "LogCallback.hxx"
 #include "Domain.hxx"
 #include "LogV.hxx"
--- a/src/lib/ffmpeg/LogCallback.hxx
+++ b/src/lib/ffmpeg/LogCallback.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_FFMPEG_LOG_CALLBACK_HXX
 #define MPD_FFMPEG_LOG_CALLBACK_HXX

-#include "check.h"
-
 #include <stdarg.h>

 void
--- a/src/lib/ffmpeg/LogError.cxx
+++ b/src/lib/ffmpeg/LogError.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "LogError.hxx"
 #include "Domain.hxx"
 #include "Log.hxx"
--- a/src/lib/icu/CaseFold.cxx
+++ b/src/lib/icu/CaseFold.cxx
@@ -17,8 +17,8 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "CaseFold.hxx"
+#include "config.h"

 #ifdef HAVE_ICU_CASE_FOLD

--- a/src/lib/icu/CaseFold.hxx
+++ b/src/lib/icu/CaseFold.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_ICU_CASE_FOLD_HXX
 #define MPD_ICU_CASE_FOLD_HXX

-#include "check.h"
+#include "config.h"

 #if defined(HAVE_ICU) || defined(_WIN32)
 #define HAVE_ICU_CASE_FOLD
--- a/src/lib/icu/Collate.cxx
+++ b/src/lib/icu/Collate.cxx
@@ -17,9 +17,9 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Collate.hxx"
 #include "util/AllocatedString.hxx"
+#include "config.h"

 #ifdef HAVE_ICU
 #include "Util.hxx"
--- a/src/lib/icu/Collate.hxx
+++ b/src/lib/icu/Collate.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_ICU_COLLATE_HXX
 #define MPD_ICU_COLLATE_HXX

-#include "check.h"
 #include "util/Compiler.h"

 /**
--- a/src/lib/icu/Compare.cxx
+++ b/src/lib/icu/Compare.cxx
@@ -17,10 +17,10 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Compare.hxx"
 #include "CaseFold.hxx"
 #include "util/StringAPI.hxx"
+#include "config.h"

 #include <string.h>

--- a/src/lib/icu/Compare.hxx
+++ b/src/lib/icu/Compare.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_ICU_COMPARE_HXX
 #define MPD_ICU_COMPARE_HXX

-#include "check.h"
 #include "util/Compiler.h"
 #include "util/AllocatedString.hxx"

--- a/src/lib/icu/Converter.cxx
+++ b/src/lib/icu/Converter.cxx
@@ -17,13 +17,13 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Converter.hxx"
 #include "util/Macros.hxx"
 #include "util/AllocatedString.hxx"
 #include "util/AllocatedArray.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/FormatString.hxx"
+#include "config.h"

 #include <stdexcept>

--- a/src/lib/icu/Converter.hxx
+++ b/src/lib/icu/Converter.hxx
@@ -20,8 +20,8 @@
 #ifndef MPD_ICU_CONVERTER_HXX
 #define MPD_ICU_CONVERTER_HXX

-#include "check.h"
 #include "util/Compiler.h"
+#include "config.h"

 #ifdef HAVE_ICU
 #include "thread/Mutex.hxx"
--- a/src/lib/icu/Init.cxx
+++ b/src/lib/icu/Init.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Init.hxx"
 #include "Collate.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/lib/icu/Init.hxx
+++ b/src/lib/icu/Init.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_ICU_INIT_HXX
 #define MPD_ICU_INIT_HXX

-#include "check.h"
+#include "config.h"

 #ifdef HAVE_ICU

--- a/src/lib/icu/Util.cxx
+++ b/src/lib/icu/Util.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Util.hxx"
 #include "util/AllocatedString.hxx"
 #include "util/AllocatedArray.hxx"
--- a/src/lib/icu/Util.hxx
+++ b/src/lib/icu/Util.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_ICU_UTIL_HXX
 #define MPD_ICU_UTIL_HXX

-#include "check.h"
-
 #include <unicode/utypes.h>

 template<typename T> struct ConstBuffer;
--- a/src/lib/icu/Win32.cxx
+++ b/src/lib/icu/Win32.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Win32.hxx"
 #include "system/Error.hxx"
 #include "util/AllocatedString.hxx"
--- a/src/lib/icu/Win32.hxx
+++ b/src/lib/icu/Win32.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_ICU_WIN32_HXX
 #define MPD_ICU_WIN32_HXX

-#include "check.h"
 #include "util/Compiler.h"

 #include <wchar.h>
--- a/src/lib/nfs/Base.cxx
+++ b/src/lib/nfs/Base.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Base.hxx"

 #include <assert.h>
--- a/src/lib/nfs/Base.hxx
+++ b/src/lib/nfs/Base.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_NFS_BASE_HXX
 #define MPD_NFS_BASE_HXX

-#include "check.h"
 #include "util/Compiler.h"

 /**
--- a/src/lib/nfs/Blocking.cxx
+++ b/src/lib/nfs/Blocking.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Blocking.hxx"
 #include "Connection.hxx"
 #include "event/Call.hxx"
--- a/src/lib/nfs/Blocking.hxx
+++ b/src/lib/nfs/Blocking.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_BLOCKING_NFS_CALLBACK_HXX
 #define MPD_BLOCKING_NFS_CALLBACK_HXX

-#include "check.h"
 #include "Callback.hxx"
 #include "Lease.hxx"
 #include "thread/Mutex.hxx"
--- a/src/lib/nfs/Callback.hxx
+++ b/src/lib/nfs/Callback.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_NFS_CALLBACK_HXX
 #define MPD_NFS_CALLBACK_HXX

-#include "check.h"
-
 #include <exception>

 /**
--- a/src/lib/nfs/Connection.cxx
+++ b/src/lib/nfs/Connection.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Connection.hxx"
 #include "Error.hxx"
 #include "Lease.hxx"
--- a/src/lib/nfs/FileReader.cxx
+++ b/src/lib/nfs/FileReader.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "FileReader.hxx"
 #include "Glue.hxx"
 #include "Base.hxx"
--- a/src/lib/nfs/FileReader.hxx
+++ b/src/lib/nfs/FileReader.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_NFS_FILE_READER_HXX
 #define MPD_NFS_FILE_READER_HXX

-#include "check.h"
 #include "Lease.hxx"
 #include "Callback.hxx"
 #include "event/DeferEvent.hxx"
--- a/src/lib/nfs/Glue.cxx
+++ b/src/lib/nfs/Glue.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Glue.hxx"
 #include "Manager.hxx"
 #include "event/Call.hxx"
--- a/src/lib/nfs/Glue.hxx
+++ b/src/lib/nfs/Glue.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_NFS_GLUE_HXX
 #define MPD_NFS_GLUE_HXX

-#include "check.h"
 #include "util/Compiler.h"

 class EventLoop;
--- a/src/lib/nfs/Lease.hxx
+++ b/src/lib/nfs/Lease.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_NFS_LEASE_HXX
 #define MPD_NFS_LEASE_HXX

-#include "check.h"
-
 #include <exception>

 class NfsLease {
--- a/src/lib/nfs/Manager.cxx
+++ b/src/lib/nfs/Manager.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Manager.hxx"
 #include "event/Loop.hxx"
 #include "Log.hxx"
--- a/src/lib/nfs/Manager.hxx
+++ b/src/lib/nfs/Manager.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_NFS_MANAGER_HXX
 #define MPD_NFS_MANAGER_HXX

-#include "check.h"
 #include "Connection.hxx"
 #include "util/Compiler.h"
 #include "event/IdleMonitor.hxx"
--- a/src/lib/pulse/Domain.cxx
+++ b/src/lib/pulse/Domain.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Domain.hxx"
 #include "util/Domain.hxx"

--- a/src/lib/pulse/Error.cxx
+++ b/src/lib/pulse/Error.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Error.hxx"
 #include "util/RuntimeError.hxx"

--- a/src/lib/pulse/LogError.cxx
+++ b/src/lib/pulse/LogError.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "LogError.hxx"
 #include "Domain.hxx"
 #include "Log.hxx"
--- a/src/lib/smbclient/Domain.cxx
+++ b/src/lib/smbclient/Domain.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Domain.hxx"
 #include "util/Domain.hxx"

--- a/src/lib/smbclient/Init.cxx
+++ b/src/lib/smbclient/Init.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Init.hxx"
 #include "Mutex.hxx"
 #include "thread/Mutex.hxx"
--- a/src/lib/smbclient/Mutex.cxx
+++ b/src/lib/smbclient/Mutex.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Mutex.hxx"
 #include "thread/Mutex.hxx"

--- a/src/lib/systemd/Watchdog.cxx
+++ b/src/lib/systemd/Watchdog.cxx
@@ -27,7 +27,6 @@
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "config.h"
 #include "Watchdog.hxx"

 #include <systemd/sd-daemon.h>
--- a/src/lib/systemd/Watchdog.hxx
+++ b/src/lib/systemd/Watchdog.hxx
@@ -30,7 +30,6 @@
 #ifndef SYSTEMD_WATCHDOG_HXX
 #define SYSTEMD_WATCHDOG_HXX

-#include "check.h"
 #include "event/TimerEvent.hxx"

 namespace Systemd {
--- a/src/lib/upnp/ClientInit.cxx
+++ b/src/lib/upnp/ClientInit.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "ClientInit.hxx"
 #include "Init.hxx"
 #include "Callback.hxx"
--- a/src/lib/upnp/ClientInit.hxx
+++ b/src/lib/upnp/ClientInit.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_UPNP_CLIENT_INIT_HXX
 #define MPD_UPNP_CLIENT_INIT_HXX

-#include "check.h"
-
 #include <upnp.h>

 UpnpClient_Handle
--- a/src/lib/upnp/ContentDirectoryService.cxx
+++ b/src/lib/upnp/ContentDirectoryService.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "ContentDirectoryService.hxx"
 #include "UniqueIxml.hxx"
 #include "Device.hxx"
--- a/src/lib/upnp/Device.cxx
+++ b/src/lib/upnp/Device.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Device.hxx"
 #include "Util.hxx"
 #include "lib/expat/ExpatParser.hxx"
--- a/src/lib/upnp/Discovery.cxx
+++ b/src/lib/upnp/Discovery.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Discovery.hxx"
 #include "ContentDirectoryService.hxx"
 #include "Log.hxx"
--- a/src/lib/upnp/Init.cxx
+++ b/src/lib/upnp/Init.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "Init.hxx"
 #include "thread/Mutex.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/lib/upnp/Init.hxx
+++ b/src/lib/upnp/Init.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_UPNP_INIT_HXX
 #define MPD_UPNP_INIT_HXX

-#include "check.h"
-
 void
 UpnpGlobalInit();

--- a/src/lib/xiph/FlacIOHandle.cxx
+++ b/src/lib/xiph/FlacIOHandle.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "FlacIOHandle.hxx"
 #include "Log.hxx"
 #include "util/Compiler.h"
--- a/src/lib/xiph/FlacMetadataChain.cxx
+++ b/src/lib/xiph/FlacMetadataChain.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "FlacMetadataChain.hxx"
 #include "FlacMetadataIterator.hxx"
 #include "FlacIOHandle.hxx"
--- a/src/lib/xiph/FlacStreamMetadata.cxx
+++ b/src/lib/xiph/FlacStreamMetadata.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "FlacStreamMetadata.hxx"
 #include "FlacAudioFormat.hxx"
 #include "XiphTags.hxx"
--- a/src/lib/xiph/OggFind.cxx
+++ b/src/lib/xiph/OggFind.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "OggFind.hxx"
 #include "lib/xiph/OggSyncState.hxx"
 #include "input/InputStream.hxx"
--- a/src/lib/xiph/OggFind.hxx
+++ b/src/lib/xiph/OggFind.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_OGG_FIND_HXX
 #define MPD_OGG_FIND_HXX

-#include "check.h"
 #include "input/Offset.hxx"

 #include <ogg/ogg.h>
--- a/src/lib/xiph/OggPacket.cxx
+++ b/src/lib/xiph/OggPacket.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "OggPacket.hxx"
 #include "OggSyncState.hxx"
 #include "OggStreamState.hxx"
--- a/src/lib/xiph/OggPacket.hxx
+++ b/src/lib/xiph/OggPacket.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_OGG_PACKET_HXX
 #define MPD_OGG_PACKET_HXX

-#include "check.h"
-
 #include <ogg/ogg.h>

 class OggSyncState;
--- a/src/lib/xiph/OggPage.hxx
+++ b/src/lib/xiph/OggPage.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_OGG_PAGE_HXX
 #define MPD_OGG_PAGE_HXX

-#include "check.h"
-
 #include <ogg/ogg.h>

 #include <assert.h>
--- a/src/lib/xiph/OggStreamState.hxx
+++ b/src/lib/xiph/OggStreamState.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_OGG_STREAM_STATE_HXX
 #define MPD_OGG_STREAM_STATE_HXX

-#include "check.h"
-
 #include <ogg/ogg.h>

 #include <assert.h>
--- a/src/lib/xiph/OggSyncState.cxx
+++ b/src/lib/xiph/OggSyncState.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "OggSyncState.hxx"
 #include "fs/io/Reader.hxx"

--- a/src/lib/xiph/OggSyncState.hxx
+++ b/src/lib/xiph/OggSyncState.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_OGG_SYNC_STATE_HXX
 #define MPD_OGG_SYNC_STATE_HXX

-#include "check.h"
-
 #include <ogg/ogg.h>

 #include <stddef.h>
--- a/src/lib/xiph/OggVisitor.cxx
+++ b/src/lib/xiph/OggVisitor.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "OggVisitor.hxx"

 #include <stdexcept>
--- a/src/lib/xiph/OggVisitor.hxx
+++ b/src/lib/xiph/OggVisitor.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_OGG_VISITOR_HXX
 #define MPD_OGG_VISITOR_HXX

-#include "check.h"
 #include "OggSyncState.hxx"
 #include "OggStreamState.hxx"

--- a/src/lib/xiph/VorbisComment.hxx
+++ b/src/lib/xiph/VorbisComment.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_VORBIS_COMMENT_HXX
 #define MPD_VORBIS_COMMENT_HXX

-#include "check.h"
-
 #include <vorbis/codec.h>

 /**
--- a/src/lib/xiph/VorbisComments.cxx
+++ b/src/lib/xiph/VorbisComments.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "VorbisComments.hxx"
 #include "XiphTags.hxx"
 #include "tag/Table.hxx"
--- a/src/lib/xiph/VorbisComments.hxx
+++ b/src/lib/xiph/VorbisComments.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_VORBIS_COMMENTS_HXX
 #define MPD_VORBIS_COMMENTS_HXX

-#include "check.h"
-
 #include <memory>

 struct ReplayGainInfo;
--- a/src/lib/xiph/XiphTags.cxx
+++ b/src/lib/xiph/XiphTags.cxx
@@ -21,7 +21,7 @@
 * Flac and Opus which will be used in addition to the Tags in tag/TagNames.c
 * see https://www.xiph.org/vorbis/doc/v-comment.html for further Info
 */
-#include "config.h"
+
 #include "XiphTags.hxx"

 const struct tag_table xiph_tags[] = {
--- a/src/lib/xiph/XiphTags.hxx
+++ b/src/lib/xiph/XiphTags.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_XIPH_TAGS_HXX
 #define MPD_XIPH_TAGS_HXX

-#include "check.h"
 #include "tag/Table.hxx"

 extern const struct tag_table xiph_tags[];
--- a/src/lib/yajl/ParseInputStream.cxx
+++ b/src/lib/yajl/ParseInputStream.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "ParseInputStream.hxx"
 #include "Handle.hxx"
 #include "input/InputStream.hxx"
--- a/src/lib/zlib/Error.cxx
+++ b/src/lib/zlib/Error.cxx
@@ -27,7 +27,6 @@
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "config.h"
 #include "Error.hxx"

 #include <zlib.h>