diff --git a/scripts/check_config_h.rb b/scripts/check_config_h.rb
deleted file mode 100755
index 2619984e4..000000000
--- a/scripts/check_config_h.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This script verifies that every source includes config.h first.
-# This is very important for consistent Large File Support.
-#
-
-def check_file(file)
-    first = true
-    file.each_line do |line|
-        if line =~ /^\#include\s+(\S+)/ then
-            if $1 == '"config.h"'
-                unless first
-                    puts "#{file.path}: config.h included too late"
-                end
-            else
-                if first
-                    puts "#{file.path}: config.h missing"
-                end
-            end
-            first = false
-        end
-    end
-end
-
-def check_path(path)
-    File.open(path) do |file|
-        check_file(file)
-    end
-end
-
-if ARGV.empty?
-    Dir["src/*.c"].each do |path|
-        check_path(path)
-    end
-
-    Dir["src/*/*.c"].each do |path|
-        check_path(path)
-    end
-
-    Dir["test/*.c"].each do |path|
-        check_path(path)
-    end
-else
-    ARGV.each do |path|
-        check_path(path)
-    end
-end
diff --git a/src/AudioParser.cxx b/src/AudioParser.cxx
index 714ac9d4a..2f268b297 100644
--- a/src/AudioParser.cxx
+++ b/src/AudioParser.cxx
@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
 #include "util/RuntimeError.hxx"
diff --git a/src/CheckAudioFormat.cxx b/src/CheckAudioFormat.cxx
index 3b38ce8ab..c837e49c9 100644
--- a/src/CheckAudioFormat.cxx
+++ b/src/CheckAudioFormat.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "CheckAudioFormat.hxx"
 #include "AudioFormat.hxx"
 #include "util/RuntimeError.hxx"
diff --git a/src/IcyMetaDataParser.cxx b/src/IcyMetaDataParser.cxx
index 990baf8a5..f766400f5 100644
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "IcyMetaDataParser.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Builder.hxx"
diff --git a/src/Idle.cxx b/src/Idle.cxx
index cc0f2eeb9..14f2b396c 100644
--- a/src/Idle.cxx
+++ b/src/Idle.cxx
@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "Idle.hxx"
 #include "Main.hxx"
 #include "Instance.hxx"
diff --git a/src/IdleFlags.cxx b/src/IdleFlags.cxx
index 0b4389c3e..1161e40f1 100644
--- a/src/IdleFlags.cxx
+++ b/src/IdleFlags.cxx
@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "IdleFlags.hxx"
 #include "util/ASCII.hxx"
 
diff --git a/src/Instance.hxx b/src/Instance.hxx
index d65d37059..e89420bed 100644
--- a/src/Instance.hxx
+++ b/src/Instance.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_INSTANCE_HXX
 #define MPD_INSTANCE_HXX
 
-#include "check.h"
+#include "config.h"
 #include "event/Loop.hxx"
 #include "event/Thread.hxx"
 #include "event/MaskMonitor.hxx"
diff --git a/src/LocateUri.hxx b/src/LocateUri.hxx
index 248011f0d..953671d79 100644
--- a/src/LocateUri.hxx
+++ b/src/LocateUri.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_LOCATE_URI_HXX
 #define MPD_LOCATE_URI_HXX
 
-#include "check.h"
+#include "config.h"
 #include "util/Compiler.h"
 #include "fs/AllocatedPath.hxx"
 
diff --git a/src/Log.cxx b/src/Log.cxx
index c700e74a4..622f79b69 100644
--- a/src/Log.cxx
+++ b/src/Log.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LogV.hxx"
 #include "util/Domain.hxx"
 
diff --git a/src/LogBackend.cxx b/src/LogBackend.cxx
index 98a9071e0..874da1af0 100644
--- a/src/LogBackend.cxx
+++ b/src/LogBackend.cxx
@@ -17,11 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LogBackend.hxx"
 #include "Log.hxx"
 #include "util/Domain.hxx"
 #include "util/StringStrip.hxx"
+#include "config.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/src/LogBackend.hxx b/src/LogBackend.hxx
index 4c4d8bb47..76d7b1910 100644
--- a/src/LogBackend.hxx
+++ b/src/LogBackend.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_LOG_BACKEND_HXX
 #define MPD_LOG_BACKEND_HXX
 
-#include "check.h"
 #include "LogLevel.hxx"
 
 void
diff --git a/src/Mapper.hxx b/src/Mapper.hxx
index e8b048161..bf8ef6ae1 100644
--- a/src/Mapper.hxx
+++ b/src/Mapper.hxx
@@ -24,9 +24,10 @@
 #ifndef MPD_MAPPER_HXX
 #define MPD_MAPPER_HXX
 
-#include <string>
-
 #include "util/Compiler.h"
+#include "config.h"
+
+#include <string>
 
 #define PLAYLIST_FILE_SUFFIX ".m3u"
 
diff --git a/src/MixRampInfo.hxx b/src/MixRampInfo.hxx
index e5288ca01..61898a345 100644
--- a/src/MixRampInfo.hxx
+++ b/src/MixRampInfo.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_MIX_RAMP_INFO_HXX
 #define MPD_MIX_RAMP_INFO_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <string>
diff --git a/src/MusicBuffer.cxx b/src/MusicBuffer.cxx
index 3a9eec2d4..a982b1d6c 100644
--- a/src/MusicBuffer.cxx
+++ b/src/MusicBuffer.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"
 
diff --git a/src/MusicChunk.cxx b/src/MusicChunk.cxx
index f50464e5c..a1e682c9d 100644
--- a/src/MusicChunk.cxx
+++ b/src/MusicChunk.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicChunk.hxx"
 #include "AudioFormat.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/MusicChunkPtr.cxx b/src/MusicChunkPtr.cxx
index 9a013a894..37c89fd75 100644
--- a/src/MusicChunkPtr.cxx
+++ b/src/MusicChunkPtr.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicChunkPtr.hxx"
 #include "MusicBuffer.hxx"
 
diff --git a/src/MusicChunkPtr.hxx b/src/MusicChunkPtr.hxx
index 81c8ad30e..74f4a21ae 100644
--- a/src/MusicChunkPtr.hxx
+++ b/src/MusicChunkPtr.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_MUSIC_CHUNK_PTR_HXX
 #define MPD_MUSIC_CHUNK_PTR_HXX
 
-#include "check.h"
-
 #include <memory>
 
 struct MusicChunk;
diff --git a/src/MusicPipe.cxx b/src/MusicPipe.cxx
index ce09628c9..018f46b49 100644
--- a/src/MusicPipe.cxx
+++ b/src/MusicPipe.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 
diff --git a/src/Partition.hxx b/src/Partition.hxx
index 2854b0030..139607dc4 100644
--- a/src/Partition.hxx
+++ b/src/Partition.hxx
@@ -31,6 +31,7 @@
 #include "SingleMode.hxx"
 #include "Chrono.hxx"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <string>
 #include <memory>
diff --git a/src/Permission.hxx b/src/Permission.hxx
index e8138400c..ae6c7fd49 100644
--- a/src/Permission.hxx
+++ b/src/Permission.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_PERMISSION_HXX
 #define MPD_PERMISSION_HXX
 
-#include "check.h"
+#include "config.h"
 
 struct ConfigData;
 
diff --git a/src/PlaylistDatabase.cxx b/src/PlaylistDatabase.cxx
index 2cb02785f..0adc58949 100644
--- a/src/PlaylistDatabase.cxx
+++ b/src/PlaylistDatabase.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistDatabase.hxx"
 #include "db/PlaylistVector.hxx"
 #include "fs/io/TextFile.hxx"
diff --git a/src/PlaylistDatabase.hxx b/src/PlaylistDatabase.hxx
index 15f646ce0..65157ddc4 100644
--- a/src/PlaylistDatabase.hxx
+++ b/src/PlaylistDatabase.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_PLAYLIST_DATABASE_HXX
 #define MPD_PLAYLIST_DATABASE_HXX
 
-#include "check.h"
-
 #define PLAYLIST_META_BEGIN "playlist_begin: "
 
 class PlaylistVector;
diff --git a/src/PlaylistError.cxx b/src/PlaylistError.cxx
index e98116d5e..939890631 100644
--- a/src/PlaylistError.cxx
+++ b/src/PlaylistError.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistError.hxx"
 #include "util/Domain.hxx"
 
diff --git a/src/PlaylistPrint.cxx b/src/PlaylistPrint.cxx
index 198d0e58e..6d07594a9 100644
--- a/src/PlaylistPrint.cxx
+++ b/src/PlaylistPrint.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistPrint.hxx"
 #include "PlaylistFile.hxx"
 #include "PlaylistError.hxx"
diff --git a/src/RemoteTagCache.cxx b/src/RemoteTagCache.cxx
index ec0c5d0ba..e86fc4c75 100644
--- a/src/RemoteTagCache.cxx
+++ b/src/RemoteTagCache.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "RemoteTagCache.hxx"
 #include "RemoteTagCacheHandler.hxx"
 #include "input/ScanTags.hxx"
diff --git a/src/RemoteTagCache.hxx b/src/RemoteTagCache.hxx
index 7e138138e..f99e79d6f 100644
--- a/src/RemoteTagCache.hxx
+++ b/src/RemoteTagCache.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_REMOTE_TAG_CACHE_HXX
 #define MPD_REMOTE_TAG_CACHE_HXX
 
-#include "check.h"
 #include "input/RemoteTagScanner.hxx"
 #include "tag/Tag.hxx"
 #include "event/DeferEvent.hxx"
diff --git a/src/ReplayGainConfig.hxx b/src/ReplayGainConfig.hxx
index 7a72ed44e..36fadc1b0 100644
--- a/src/ReplayGainConfig.hxx
+++ b/src/ReplayGainConfig.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_REPLAY_GAIN_CONFIG_HXX
 #define MPD_REPLAY_GAIN_CONFIG_HXX
 
-#include "check.h"
-
 struct ReplayGainConfig {
 	static constexpr bool DEFAULT_LIMIT = true;
 
diff --git a/src/ReplayGainGlobal.cxx b/src/ReplayGainGlobal.cxx
index 05b5e34ee..56aaa7890 100644
--- a/src/ReplayGainGlobal.cxx
+++ b/src/ReplayGainGlobal.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ReplayGainGlobal.hxx"
 #include "ReplayGainConfig.hxx"
 #include "config/Param.hxx"
diff --git a/src/ReplayGainGlobal.hxx b/src/ReplayGainGlobal.hxx
index 146835116..7d4586c23 100644
--- a/src/ReplayGainGlobal.hxx
+++ b/src/ReplayGainGlobal.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_REPLAY_GAIN_GLOBAL_HXX
 #define MPD_REPLAY_GAIN_GLOBAL_HXX
 
-#include "check.h"
-
 struct ConfigData;
 struct ReplayGainConfig;
 
diff --git a/src/ReplayGainInfo.cxx b/src/ReplayGainInfo.cxx
index a7bfd73c0..18f40ec4b 100644
--- a/src/ReplayGainInfo.cxx
+++ b/src/ReplayGainInfo.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ReplayGainInfo.hxx"
 #include "ReplayGainConfig.hxx"
 
diff --git a/src/ReplayGainInfo.hxx b/src/ReplayGainInfo.hxx
index 673f4261b..b2664abc3 100644
--- a/src/ReplayGainInfo.hxx
+++ b/src/ReplayGainInfo.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_REPLAY_GAIN_INFO_HXX
 #define MPD_REPLAY_GAIN_INFO_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "ReplayGainMode.hxx"
 
diff --git a/src/SongLoader.cxx b/src/SongLoader.cxx
index a76c93172..ad96ecfec 100644
--- a/src/SongLoader.cxx
+++ b/src/SongLoader.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongLoader.hxx"
 #include "LocateUri.hxx"
 #include "client/Client.hxx"
@@ -25,6 +24,7 @@
 #include "storage/StorageInterface.hxx"
 #include "song/DetachedSong.hxx"
 #include "PlaylistError.hxx"
+#include "config.h"
 
 #include <assert.h>
 
diff --git a/src/SongLoader.hxx b/src/SongLoader.hxx
index f69e61a6f..f5768c1c7 100644
--- a/src/SongLoader.hxx
+++ b/src/SongLoader.hxx
@@ -20,8 +20,8 @@
 #ifndef MPD_SONG_LOADER_HXX
 #define MPD_SONG_LOADER_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <cstddef>
 
diff --git a/src/SongPrint.cxx b/src/SongPrint.cxx
index c00905229..e2e7680f4 100644
--- a/src/SongPrint.cxx
+++ b/src/SongPrint.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongPrint.hxx"
 #include "song/LightSong.hxx"
 #include "Partition.hxx"
diff --git a/src/SongSave.cxx b/src/SongSave.cxx
index f90222d93..954203f0c 100644
--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongSave.hxx"
 #include "AudioParser.hxx"
 #include "db/plugins/simple/Song.hxx"
diff --git a/src/StateFile.hxx b/src/StateFile.hxx
index 03e5a01fa..826bfefb7 100644
--- a/src/StateFile.hxx
+++ b/src/StateFile.hxx
@@ -24,6 +24,7 @@
 #include "event/TimerEvent.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <string>
 #include <chrono>
diff --git a/src/StateFileConfig.cxx b/src/StateFileConfig.cxx
index e4d412b30..e34f54e88 100644
--- a/src/StateFileConfig.cxx
+++ b/src/StateFileConfig.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "StateFileConfig.hxx"
 #include "config/Data.hxx"
 
diff --git a/src/StateFileConfig.hxx b/src/StateFileConfig.hxx
index c8e5fc0f4..40270a070 100644
--- a/src/StateFileConfig.hxx
+++ b/src/StateFileConfig.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_STATE_FILE_CONFIG_HXX
 #define MPD_STATE_FILE_CONFIG_HXX
 
-#include "check.h"
 #include "fs/AllocatedPath.hxx"
 
 #include <chrono>
diff --git a/src/TagArchive.cxx b/src/TagArchive.cxx
index 9bb734769..0e3990377 100644
--- a/src/TagArchive.cxx
+++ b/src/TagArchive.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagArchive.hxx"
 #include "TagStream.hxx"
 #include "archive/ArchiveFile.hxx"
diff --git a/src/TagArchive.hxx b/src/TagArchive.hxx
index 5972a876e..694d0f2cd 100644
--- a/src/TagArchive.hxx
+++ b/src/TagArchive.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_ARCHIVE_HXX
 #define MPD_TAG_ARCHIVE_HXX
 
-#include "check.h"
-
 class ArchiveFile;
 class TagHandler;
 class TagBuilder;
diff --git a/src/TagFile.cxx b/src/TagFile.cxx
index 00b2a07c9..f30037481 100644
--- a/src/TagFile.cxx
+++ b/src/TagFile.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagFile.hxx"
 #include "tag/Generic.hxx"
 #include "tag/Handler.hxx"
diff --git a/src/TagFile.hxx b/src/TagFile.hxx
index d4192f74b..691c3569b 100644
--- a/src/TagFile.hxx
+++ b/src/TagFile.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_FILE_HXX
 #define MPD_TAG_FILE_HXX
 
-#include "check.h"
-
 struct AudioFormat;
 class Path;
 class TagHandler;
diff --git a/src/TagPrint.cxx b/src/TagPrint.cxx
index 98583c27b..7261a4f30 100644
--- a/src/TagPrint.cxx
+++ b/src/TagPrint.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagPrint.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Settings.hxx"
diff --git a/src/TagSave.cxx b/src/TagSave.cxx
index a5590e3cd..2a9a5e8c7 100644
--- a/src/TagSave.cxx
+++ b/src/TagSave.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagSave.hxx"
 #include "tag/Tag.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
diff --git a/src/TagStream.cxx b/src/TagStream.cxx
index d87434108..0cedc72cc 100644
--- a/src/TagStream.cxx
+++ b/src/TagStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagStream.hxx"
 #include "tag/Generic.hxx"
 #include "tag/Handler.hxx"
diff --git a/src/TagStream.hxx b/src/TagStream.hxx
index a9e09b437..33e513f16 100644
--- a/src/TagStream.hxx
+++ b/src/TagStream.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_STREAM_HXX
 #define MPD_TAG_STREAM_HXX
 
-#include "check.h"
-
 struct AudioFormat;
 class InputStream;
 class TagHandler;
diff --git a/src/TimePrint.cxx b/src/TimePrint.cxx
index f5d7380b2..eaac793d9 100644
--- a/src/TimePrint.cxx
+++ b/src/TimePrint.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TimePrint.hxx"
 #include "client/Response.hxx"
 #include "util/TimeISO8601.hxx"
diff --git a/src/android/Context.cxx b/src/android/Context.cxx
index 0e7ac52ca..c8fcd69db 100644
--- a/src/android/Context.cxx
+++ b/src/android/Context.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Context.hxx"
 #include "java/Class.hxx"
 #include "java/File.hxx"
diff --git a/src/android/Environment.cxx b/src/android/Environment.cxx
index 34f70fd54..817ab510e 100644
--- a/src/android/Environment.cxx
+++ b/src/android/Environment.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Environment.hxx"
 #include "java/Class.hxx"
 #include "java/String.hxx"
diff --git a/src/android/LogListener.cxx b/src/android/LogListener.cxx
index c7fed8811..e72d3f84f 100644
--- a/src/android/LogListener.cxx
+++ b/src/android/LogListener.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LogListener.hxx"
 #include "java/Class.hxx"
 #include "java/String.hxx"
diff --git a/src/archive/ArchiveLookup.cxx b/src/archive/ArchiveLookup.cxx
index a4c97e5b2..705ac28f8 100644
--- a/src/archive/ArchiveLookup.cxx
+++ b/src/archive/ArchiveLookup.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "ArchiveLookup.hxx"
 #include "ArchiveDomain.hxx"
 #include "Log.hxx"
diff --git a/src/archive/ArchivePlugin.cxx b/src/archive/ArchivePlugin.cxx
index 6c154c400..6b3cbcb79 100644
--- a/src/archive/ArchivePlugin.cxx
+++ b/src/archive/ArchivePlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ArchivePlugin.hxx"
 #include "ArchiveFile.hxx"
 #include "fs/Path.hxx"
diff --git a/src/archive/plugins/Bzip2ArchivePlugin.cxx b/src/archive/plugins/Bzip2ArchivePlugin.cxx
index df3dd3aa3..db0d013ff 100644
--- a/src/archive/plugins/Bzip2ArchivePlugin.cxx
+++ b/src/archive/plugins/Bzip2ArchivePlugin.cxx
@@ -21,7 +21,6 @@
   * single bz2 archive handling (requires libbz2)
   */
 
-#include "config.h"
 #include "Bzip2ArchivePlugin.hxx"
 #include "../ArchivePlugin.hxx"
 #include "../ArchiveFile.hxx"
diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx
index 4e3dcbbab..a27230728 100644
--- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
@@ -21,7 +21,6 @@
   * iso archive handling (requires cdio, and iso9660)
   */
 
-#include "config.h"
 #include "Iso9660ArchivePlugin.hxx"
 #include "../ArchivePlugin.hxx"
 #include "../ArchiveFile.hxx"
diff --git a/src/archive/plugins/ZzipArchivePlugin.cxx b/src/archive/plugins/ZzipArchivePlugin.cxx
index 10a360614..e238dd4ba 100644
--- a/src/archive/plugins/ZzipArchivePlugin.cxx
+++ b/src/archive/plugins/ZzipArchivePlugin.cxx
@@ -21,7 +21,6 @@
   * zip archive handling (requires zziplib)
   */
 
-#include "config.h"
 #include "ZzipArchivePlugin.hxx"
 #include "../ArchivePlugin.hxx"
 #include "../ArchiveFile.hxx"
diff --git a/src/check.h b/src/check.h
deleted file mode 100644
index 2de484246..000000000
--- a/src/check.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2003-2018 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_CHECK_H
-#define MPD_CHECK_H
-
-/*
- * All sources must include config.h on the first line to ensure that
- * Large File Support is configured properly.  This header checks
- * whether this has happened.
- *
- * Usage: include this header before you use any of the above types.
- * It will stop the compiler if something went wrong.
- *
- * This is Linux/glibc specific, and only enabled in the debug build,
- * so bugs in this headers don't affect users with production builds.
- *
- */
-
-#ifndef PACKAGE_VERSION
-#error config.h missing
-#endif
-
-#endif
diff --git a/src/client/Client.cxx b/src/client/Client.cxx
index 017fa34b7..dc34dccb1 100644
--- a/src/client/Client.cxx
+++ b/src/client/Client.cxx
@@ -17,11 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
-#include "util/Domain.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
+#include "util/Domain.hxx"
+#include "config.h"
 
 const Domain client_domain("client");
 
diff --git a/src/client/Client.hxx b/src/client/Client.hxx
index d1db60c66..dafb961af 100644
--- a/src/client/Client.hxx
+++ b/src/client/Client.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_CLIENT_H
 #define MPD_CLIENT_H
 
-#include "check.h"
 #include "ClientMessage.hxx"
 #include "command/CommandListBuilder.hxx"
 #include "tag/Mask.hxx"
diff --git a/src/client/ClientEvent.cxx b/src/client/ClientEvent.cxx
index 389a40b3e..c2220e67e 100644
--- a/src/client/ClientEvent.cxx
+++ b/src/client/ClientEvent.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Client.hxx"
 #include "Log.hxx"
 
diff --git a/src/client/ClientExpire.cxx b/src/client/ClientExpire.cxx
index db9951694..5ba706c00 100644
--- a/src/client/ClientExpire.cxx
+++ b/src/client/ClientExpire.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "Log.hxx"
 
diff --git a/src/client/ClientFile.cxx b/src/client/ClientFile.cxx
index e2652ab8d..34017774a 100644
--- a/src/client/ClientFile.cxx
+++ b/src/client/ClientFile.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Client.hxx"
 #include "protocol/Ack.hxx"
 #include "fs/Path.hxx"
diff --git a/src/client/ClientGlobal.cxx b/src/client/ClientGlobal.cxx
index 13a72f0ff..e23a0fb49 100644
--- a/src/client/ClientGlobal.cxx
+++ b/src/client/ClientGlobal.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "config/Data.hxx"
 
diff --git a/src/client/ClientIdle.cxx b/src/client/ClientIdle.cxx
index c7fa3b85c..18ff6ae35 100644
--- a/src/client/ClientIdle.cxx
+++ b/src/client/ClientIdle.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "Response.hxx"
 #include "Idle.hxx"
diff --git a/src/client/ClientInternal.hxx b/src/client/ClientInternal.hxx
index 948cb1e05..87a1f403b 100644
--- a/src/client/ClientInternal.hxx
+++ b/src/client/ClientInternal.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_CLIENT_INTERNAL_HXX
 #define MPD_CLIENT_INTERNAL_HXX
 
-#include "check.h"
 #include "Client.hxx"
 #include "command/CommandResult.hxx"
 
diff --git a/src/client/ClientList.cxx b/src/client/ClientList.cxx
index f10bbd546..da95858d2 100644
--- a/src/client/ClientList.cxx
+++ b/src/client/ClientList.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientList.hxx"
 #include "ClientInternal.hxx"
 #include "util/DeleteDisposer.hxx"
diff --git a/src/client/ClientProcess.cxx b/src/client/ClientProcess.cxx
index 3f7c7d282..547aa8c71 100644
--- a/src/client/ClientProcess.cxx
+++ b/src/client/ClientProcess.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "protocol/Result.hxx"
 #include "command/AllCommands.hxx"
diff --git a/src/client/ClientRead.cxx b/src/client/ClientRead.cxx
index c48734b46..5a0fb2d81 100644
--- a/src/client/ClientRead.cxx
+++ b/src/client/ClientRead.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
diff --git a/src/client/ClientSubscribe.cxx b/src/client/ClientSubscribe.cxx
index a9fa91669..23a40eba7 100644
--- a/src/client/ClientSubscribe.cxx
+++ b/src/client/ClientSubscribe.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "Partition.hxx"
 #include "Idle.hxx"
diff --git a/src/client/ClientWrite.cxx b/src/client/ClientWrite.cxx
index 52a47aca9..9bc3ec0c4 100644
--- a/src/client/ClientWrite.cxx
+++ b/src/client/ClientWrite.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Client.hxx"
 
 #include <string.h>
diff --git a/src/client/Listener.cxx b/src/client/Listener.cxx
index a607379b8..3ae39d388 100644
--- a/src/client/Listener.cxx
+++ b/src/client/Listener.cxx
@@ -17,12 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Listener.hxx"
 #include "Client.hxx"
 #include "Permission.hxx"
 #include "net/UniqueSocketDescriptor.hxx"
 #include "net/SocketAddress.hxx"
+#include "config.h"
 
 static unsigned
 GetPermissions(SocketAddress address, int uid) noexcept
diff --git a/src/client/Listener.hxx b/src/client/Listener.hxx
index d889b9d1c..79b0b3f1f 100644
--- a/src/client/Listener.hxx
+++ b/src/client/Listener.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_CLIENT_LISTENER_HXX
 #define MPD_CLIENT_LISTENER_HXX
 
-#include "check.h"
 #include "event/ServerSocket.hxx"
 
 struct Partition;
diff --git a/src/client/Response.cxx b/src/client/Response.cxx
index fa204c47c..188e933bf 100644
--- a/src/client/Response.cxx
+++ b/src/client/Response.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Response.hxx"
 #include "Client.hxx"
 #include "util/FormatString.hxx"
diff --git a/src/client/Response.hxx b/src/client/Response.hxx
index 40688793a..eeae68b4b 100644
--- a/src/client/Response.hxx
+++ b/src/client/Response.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_RESPONSE_HXX
 #define MPD_RESPONSE_HXX
 
-#include "check.h"
 #include "protocol/Ack.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/command/ClientCommands.cxx b/src/command/ClientCommands.cxx
index 457dde4e7..b01766299 100644
--- a/src/command/ClientCommands.cxx
+++ b/src/command/ClientCommands.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientCommands.hxx"
 #include "Request.hxx"
 #include "Permission.hxx"
diff --git a/src/command/CommandListBuilder.cxx b/src/command/CommandListBuilder.cxx
index 0a997122a..2ff9a206f 100644
--- a/src/command/CommandListBuilder.cxx
+++ b/src/command/CommandListBuilder.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "CommandListBuilder.hxx"
 #include "client/ClientInternal.hxx"
 
diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx
index 0fade940c..907e2e6fb 100644
--- a/src/command/DatabaseCommands.cxx
+++ b/src/command/DatabaseCommands.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DatabaseCommands.hxx"
 #include "Request.hxx"
 #include "db/DatabaseQueue.hxx"
diff --git a/src/command/MessageCommands.cxx b/src/command/MessageCommands.cxx
index 5ded58cc5..78f7f3790 100644
--- a/src/command/MessageCommands.cxx
+++ b/src/command/MessageCommands.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MessageCommands.hxx"
 #include "Request.hxx"
 #include "client/Client.hxx"
diff --git a/src/command/NeighborCommands.cxx b/src/command/NeighborCommands.cxx
index 494611b79..b1fcac369 100644
--- a/src/command/NeighborCommands.cxx
+++ b/src/command/NeighborCommands.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "NeighborCommands.hxx"
 #include "Request.hxx"
 #include "client/Client.hxx"
diff --git a/src/command/OutputCommands.cxx b/src/command/OutputCommands.cxx
index 2829dfacc..d374e70e9 100644
--- a/src/command/OutputCommands.cxx
+++ b/src/command/OutputCommands.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "OutputCommands.hxx"
 #include "Request.hxx"
 #include "output/Print.hxx"
diff --git a/src/command/PartitionCommands.cxx b/src/command/PartitionCommands.cxx
index aa9cfd250..35d3dffee 100644
--- a/src/command/PartitionCommands.cxx
+++ b/src/command/PartitionCommands.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PartitionCommands.hxx"
 #include "Request.hxx"
 #include "Instance.hxx"
diff --git a/src/command/Request.hxx b/src/command/Request.hxx
index 741fc5937..68f20d313 100644
--- a/src/command/Request.hxx
+++ b/src/command/Request.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_REQUEST_HXX
 #define MPD_REQUEST_HXX
 
-#include "check.h"
 #include "protocol/ArgParser.hxx"
 #include "protocol/RangeArg.hxx"
 #include "Chrono.hxx"
diff --git a/src/command/StickerCommands.cxx b/src/command/StickerCommands.cxx
index a0972c6f9..7ef3f4e6f 100644
--- a/src/command/StickerCommands.cxx
+++ b/src/command/StickerCommands.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "StickerCommands.hxx"
 #include "Request.hxx"
 #include "SongPrint.hxx"
diff --git a/src/command/TagCommands.cxx b/src/command/TagCommands.cxx
index f06b94003..9b0dbaecf 100644
--- a/src/command/TagCommands.cxx
+++ b/src/command/TagCommands.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagCommands.hxx"
 #include "Request.hxx"
 #include "client/Client.hxx"
diff --git a/src/config/Block.cxx b/src/config/Block.cxx
index 78f085b67..99dafe664 100644
--- a/src/config/Block.cxx
+++ b/src/config/Block.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Block.hxx"
 #include "Parser.hxx"
 #include "Path.hxx"
diff --git a/src/config/Block.hxx b/src/config/Block.hxx
index c290abc2f..8d58e6fb3 100644
--- a/src/config/Block.hxx
+++ b/src/config/Block.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_CONFIG_BLOCK_HXX
 #define MPD_CONFIG_BLOCK_HXX
 
-#include "check.h"
 #include "Param.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/config/Check.cxx b/src/config/Check.cxx
index f68c50247..6b020ffd7 100644
--- a/src/config/Check.cxx
+++ b/src/config/Check.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Check.hxx"
 #include "Data.hxx"
 #include "Domain.hxx"
diff --git a/src/config/Data.cxx b/src/config/Data.cxx
index 2188ef804..c6dd2138a 100644
--- a/src/config/Data.cxx
+++ b/src/config/Data.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Data.hxx"
 #include "Parser.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/config/File.cxx b/src/config/File.cxx
index 24b96f1c5..b0361bc6b 100644
--- a/src/config/File.cxx
+++ b/src/config/File.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "File.hxx"
 #include "Data.hxx"
 #include "Param.hxx"
diff --git a/src/config/Migrate.cxx b/src/config/Migrate.cxx
index fa401dd2d..156dc348f 100644
--- a/src/config/Migrate.cxx
+++ b/src/config/Migrate.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Migrate.hxx"
 #include "Data.hxx"
 #include "Block.hxx"
diff --git a/src/config/Net.cxx b/src/config/Net.cxx
index 066f988b5..4c0e6f3b5 100644
--- a/src/config/Net.cxx
+++ b/src/config/Net.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Net.hxx"
 #include "event/ServerSocket.hxx"
 #include "Path.hxx"
diff --git a/src/config/Param.cxx b/src/config/Param.cxx
index 936cf4d7f..e27059d70 100644
--- a/src/config/Param.cxx
+++ b/src/config/Param.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Param.hxx"
 #include "Path.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/config/Param.hxx b/src/config/Param.hxx
index ff16881e8..9162ec4c6 100644
--- a/src/config/Param.hxx
+++ b/src/config/Param.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_CONFIG_PARAM_HXX
 #define MPD_CONFIG_PARAM_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <string>
diff --git a/src/config/Path.cxx b/src/config/Path.cxx
index 432cae0ef..7a04563c5 100644
--- a/src/config/Path.cxx
+++ b/src/config/Path.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Path.hxx"
 #include "Data.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/db/Configured.cxx b/src/db/Configured.cxx
index 601065aa7..ab2bde405 100644
--- a/src/db/Configured.cxx
+++ b/src/db/Configured.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Configured.hxx"
 #include "DatabaseGlue.hxx"
 #include "config/Data.hxx"
diff --git a/src/db/Configured.hxx b/src/db/Configured.hxx
index 0f92ac296..ae776d38f 100644
--- a/src/db/Configured.hxx
+++ b/src/db/Configured.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_DB_CONFIG_HXX
 #define MPD_DB_CONFIG_HXX
 
-#include "check.h"
-
 struct ConfigData;
 class EventLoop;
 class DatabaseListener;
diff --git a/src/db/Count.cxx b/src/db/Count.cxx
index 7e9be8476..1ad2a7979 100644
--- a/src/db/Count.cxx
+++ b/src/db/Count.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Count.hxx"
 #include "Selection.hxx"
 #include "Interface.hxx"
diff --git a/src/db/DatabaseGlue.cxx b/src/db/DatabaseGlue.cxx
index 2924bc33f..9f001467a 100644
--- a/src/db/DatabaseGlue.cxx
+++ b/src/db/DatabaseGlue.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DatabaseGlue.hxx"
 #include "Registry.hxx"
 #include "DatabaseError.hxx"
diff --git a/src/db/DatabaseLock.cxx b/src/db/DatabaseLock.cxx
index 17ac7a169..6b30ccb63 100644
--- a/src/db/DatabaseLock.cxx
+++ b/src/db/DatabaseLock.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DatabaseLock.hxx"
 
 Mutex db_mutex;
diff --git a/src/db/DatabaseLock.hxx b/src/db/DatabaseLock.hxx
index 2773a5d21..c682b6c6e 100644
--- a/src/db/DatabaseLock.hxx
+++ b/src/db/DatabaseLock.hxx
@@ -26,7 +26,6 @@
 #ifndef MPD_DB_LOCK_HXX
 #define MPD_DB_LOCK_HXX
 
-#include "check.h"
 #include "thread/Mutex.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/db/DatabasePlaylist.cxx b/src/db/DatabasePlaylist.cxx
index 1f291377f..8e8cb97b0 100644
--- a/src/db/DatabasePlaylist.cxx
+++ b/src/db/DatabasePlaylist.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DatabasePlaylist.hxx"
 #include "DatabaseSong.hxx"
 #include "Selection.hxx"
diff --git a/src/db/DatabasePrint.cxx b/src/db/DatabasePrint.cxx
index 78f32f940..ceafb5a93 100644
--- a/src/db/DatabasePrint.cxx
+++ b/src/db/DatabasePrint.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DatabasePrint.hxx"
 #include "Selection.hxx"
 #include "SongPrint.hxx"
diff --git a/src/db/DatabaseQueue.cxx b/src/db/DatabaseQueue.cxx
index b165f439c..de3e8561c 100644
--- a/src/db/DatabaseQueue.cxx
+++ b/src/db/DatabaseQueue.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DatabaseQueue.hxx"
 #include "DatabaseSong.hxx"
 #include "Interface.hxx"
diff --git a/src/db/DatabaseSong.cxx b/src/db/DatabaseSong.cxx
index a31eda59c..3928cc386 100644
--- a/src/db/DatabaseSong.cxx
+++ b/src/db/DatabaseSong.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DatabaseSong.hxx"
 #include "Interface.hxx"
 #include "song/DetachedSong.hxx"
diff --git a/src/db/PlaylistInfo.hxx b/src/db/PlaylistInfo.hxx
index 06a5ec263..388bac64d 100644
--- a/src/db/PlaylistInfo.hxx
+++ b/src/db/PlaylistInfo.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_PLAYLIST_INFO_HXX
 #define MPD_PLAYLIST_INFO_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <string>
diff --git a/src/db/PlaylistVector.cxx b/src/db/PlaylistVector.cxx
index 37b740d66..dbb859076 100644
--- a/src/db/PlaylistVector.cxx
+++ b/src/db/PlaylistVector.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistVector.hxx"
 #include "db/DatabaseLock.hxx"
 
diff --git a/src/db/Selection.cxx b/src/db/Selection.cxx
index a7f61286c..3d183b76b 100644
--- a/src/db/Selection.cxx
+++ b/src/db/Selection.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Selection.hxx"
 #include "song/Filter.hxx"
 
diff --git a/src/db/VHelper.cxx b/src/db/VHelper.cxx
index f2bbc79a6..de55c9a1d 100644
--- a/src/db/VHelper.cxx
+++ b/src/db/VHelper.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "VHelper.hxx"
 #include "song/DetachedSong.hxx"
 #include "song/LightSong.hxx"
diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx
index 4a247301b..9c5d5e9f3 100644
--- a/src/db/plugins/ProxyDatabasePlugin.cxx
+++ b/src/db/plugins/ProxyDatabasePlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ProxyDatabasePlugin.hxx"
 #include "db/Interface.hxx"
 #include "db/DatabasePlugin.hxx"
diff --git a/src/db/plugins/simple/DatabaseSave.cxx b/src/db/plugins/simple/DatabaseSave.cxx
index 0652f4e97..afe9b425e 100644
--- a/src/db/plugins/simple/DatabaseSave.cxx
+++ b/src/db/plugins/simple/DatabaseSave.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DatabaseSave.hxx"
 #include "db/DatabaseLock.hxx"
 #include "Directory.hxx"
diff --git a/src/db/plugins/simple/Directory.cxx b/src/db/plugins/simple/Directory.cxx
index 9725d0f2e..5a8cd1d9e 100644
--- a/src/db/plugins/simple/Directory.cxx
+++ b/src/db/plugins/simple/Directory.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Directory.hxx"
 #include "SongSort.hxx"
 #include "Song.hxx"
diff --git a/src/db/plugins/simple/Directory.hxx b/src/db/plugins/simple/Directory.hxx
index 54106260e..76f56b773 100644
--- a/src/db/plugins/simple/Directory.hxx
+++ b/src/db/plugins/simple/Directory.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_DIRECTORY_HXX
 #define MPD_DIRECTORY_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "db/Visitor.hxx"
 #include "db/PlaylistVector.hxx"
diff --git a/src/db/plugins/simple/DirectorySave.cxx b/src/db/plugins/simple/DirectorySave.cxx
index b5608bd82..085139fe3 100644
--- a/src/db/plugins/simple/DirectorySave.cxx
+++ b/src/db/plugins/simple/DirectorySave.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DirectorySave.hxx"
 #include "Directory.hxx"
 #include "Song.hxx"
diff --git a/src/db/plugins/simple/Mount.cxx b/src/db/plugins/simple/Mount.cxx
index bfa13ec84..b1386b173 100644
--- a/src/db/plugins/simple/Mount.cxx
+++ b/src/db/plugins/simple/Mount.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Mount.hxx"
 #include "PrefixedLightSong.hxx"
 #include "song/Filter.hxx"
diff --git a/src/db/plugins/simple/PrefixedLightSong.hxx b/src/db/plugins/simple/PrefixedLightSong.hxx
index 29565b083..0dce29396 100644
--- a/src/db/plugins/simple/PrefixedLightSong.hxx
+++ b/src/db/plugins/simple/PrefixedLightSong.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_DB_SIMPLE_PREFIXED_LIGHT_SONG_HXX
 #define MPD_DB_SIMPLE_PREFIXED_LIGHT_SONG_HXX
 
-#include "check.h"
 #include "song/LightSong.hxx"
 #include "fs/Traits.hxx"
 
diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.hxx b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
index 65bd53517..f1493b2e8 100644
--- a/src/db/plugins/simple/SimpleDatabasePlugin.hxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
@@ -20,12 +20,12 @@
 #ifndef MPD_SIMPLE_DATABASE_PLUGIN_HXX
 #define MPD_SIMPLE_DATABASE_PLUGIN_HXX
 
-#include "check.h"
 #include "db/Interface.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "song/LightSong.hxx"
 #include "util/Manual.hxx"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <cassert>
 
diff --git a/src/db/plugins/simple/Song.cxx b/src/db/plugins/simple/Song.cxx
index 8ecb703b7..daafb8c51 100644
--- a/src/db/plugins/simple/Song.cxx
+++ b/src/db/plugins/simple/Song.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Song.hxx"
 #include "Directory.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/db/plugins/simple/Song.hxx b/src/db/plugins/simple/Song.hxx
index bf63086e6..c5e744557 100644
--- a/src/db/plugins/simple/Song.hxx
+++ b/src/db/plugins/simple/Song.hxx
@@ -20,11 +20,11 @@
 #ifndef MPD_SONG_HXX
 #define MPD_SONG_HXX
 
-#include "check.h"
 #include "Chrono.hxx"
 #include "tag/Tag.hxx"
 #include "AudioFormat.hxx"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <boost/intrusive/list.hpp>
 
diff --git a/src/db/plugins/simple/SongSort.cxx b/src/db/plugins/simple/SongSort.cxx
index c7f09a258..244d27f56 100644
--- a/src/db/plugins/simple/SongSort.cxx
+++ b/src/db/plugins/simple/SongSort.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongSort.hxx"
 #include "Song.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/db/plugins/upnp/ContentDirectoryService.cxx b/src/db/plugins/upnp/ContentDirectoryService.cxx
index c17e6d79f..4e99a0187 100644
--- a/src/db/plugins/upnp/ContentDirectoryService.cxx
+++ b/src/db/plugins/upnp/ContentDirectoryService.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "lib/upnp/ContentDirectoryService.hxx"
 #include "lib/upnp/ixmlwrap.hxx"
 #include "lib/upnp/UniqueIxml.hxx"
diff --git a/src/db/plugins/upnp/Directory.cxx b/src/db/plugins/upnp/Directory.cxx
index 6a2dfb664..004b79467 100644
--- a/src/db/plugins/upnp/Directory.cxx
+++ b/src/db/plugins/upnp/Directory.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Directory.hxx"
 #include "lib/upnp/Util.hxx"
 #include "lib/expat/ExpatParser.hxx"
diff --git a/src/db/plugins/upnp/Tags.cxx b/src/db/plugins/upnp/Tags.cxx
index be1f9c929..ced244a8f 100644
--- a/src/db/plugins/upnp/Tags.cxx
+++ b/src/db/plugins/upnp/Tags.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Tags.hxx"
 #include "tag/Table.hxx"
 
diff --git a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
index b3ff8a688..89c5c7a02 100644
--- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
+++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "UpnpDatabasePlugin.hxx"
 #include "Directory.hxx"
 #include "Tags.hxx"
diff --git a/src/db/update/Archive.cxx b/src/db/update/Archive.cxx
index 9a1c81f5b..35a1f0ad9 100644
--- a/src/db/update/Archive.cxx
+++ b/src/db/update/Archive.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "Walk.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseLock.hxx"
diff --git a/src/db/update/Config.cxx b/src/db/update/Config.cxx
index e931391c3..7ffdde1a3 100644
--- a/src/db/update/Config.cxx
+++ b/src/db/update/Config.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Config.hxx"
 #include "config/Data.hxx"
 #include "config/Option.hxx"
diff --git a/src/db/update/Config.hxx b/src/db/update/Config.hxx
index a8ed9859c..c93fce7b8 100644
--- a/src/db/update/Config.hxx
+++ b/src/db/update/Config.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_UPDATE_CONFIG_HXX
 #define MPD_UPDATE_CONFIG_HXX
 
-#include "check.h"
-
 struct ConfigData;
 
 struct UpdateConfig {
diff --git a/src/db/update/Container.cxx b/src/db/update/Container.cxx
index 15b151776..35881ac48 100644
--- a/src/db/update/Container.cxx
+++ b/src/db/update/Container.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "Walk.hxx"
 #include "UpdateDomain.hxx"
 #include "song/DetachedSong.hxx"
diff --git a/src/db/update/Editor.cxx b/src/db/update/Editor.cxx
index 49f9355dc..548c7ba4d 100644
--- a/src/db/update/Editor.cxx
+++ b/src/db/update/Editor.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "Editor.hxx"
 #include "Remove.hxx"
 #include "db/PlaylistVector.hxx"
diff --git a/src/db/update/Editor.hxx b/src/db/update/Editor.hxx
index 3715ca4da..aca5da8aa 100644
--- a/src/db/update/Editor.hxx
+++ b/src/db/update/Editor.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_UPDATE_DATABASE_HXX
 #define MPD_UPDATE_DATABASE_HXX
 
-#include "check.h"
 #include "Remove.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/db/update/ExcludeList.cxx b/src/db/update/ExcludeList.cxx
index 475a7f750..eb01085af 100644
--- a/src/db/update/ExcludeList.cxx
+++ b/src/db/update/ExcludeList.cxx
@@ -22,13 +22,13 @@
  *
  */
 
-#include "config.h"
 #include "ExcludeList.hxx"
 #include "fs/Path.hxx"
 #include "fs/NarrowPath.hxx"
 #include "input/TextInputStream.hxx"
 #include "util/StringStrip.hxx"
 #include "Log.hxx"
+#include "config.h"
 
 #include <exception>
 
diff --git a/src/db/update/ExcludeList.hxx b/src/db/update/ExcludeList.hxx
index f0c10669a..f939f3727 100644
--- a/src/db/update/ExcludeList.hxx
+++ b/src/db/update/ExcludeList.hxx
@@ -25,10 +25,10 @@
 #ifndef MPD_EXCLUDE_H
 #define MPD_EXCLUDE_H
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "fs/Glob.hxx"
 #include "input/Ptr.hxx"
+#include "config.h"
 
 #ifdef HAVE_CLASS_GLOB
 #include <forward_list>
diff --git a/src/db/update/InotifyQueue.cxx b/src/db/update/InotifyQueue.cxx
index ff2564fd8..ca5cecc2a 100644
--- a/src/db/update/InotifyQueue.cxx
+++ b/src/db/update/InotifyQueue.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "InotifyQueue.hxx"
 #include "InotifyDomain.hxx"
 #include "Service.hxx"
diff --git a/src/db/update/InotifySource.cxx b/src/db/update/InotifySource.cxx
index 646c720a3..e0509715c 100644
--- a/src/db/update/InotifySource.cxx
+++ b/src/db/update/InotifySource.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "InotifySource.hxx"
 #include "InotifyDomain.hxx"
 #include "system/FileDescriptor.hxx"
diff --git a/src/db/update/InotifyUpdate.cxx b/src/db/update/InotifyUpdate.cxx
index 8d7ba056d..374a1ea04 100644
--- a/src/db/update/InotifyUpdate.cxx
+++ b/src/db/update/InotifyUpdate.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "InotifyUpdate.hxx"
 #include "InotifySource.hxx"
 #include "InotifyQueue.hxx"
diff --git a/src/db/update/InotifyUpdate.hxx b/src/db/update/InotifyUpdate.hxx
index f05f88f6d..8f9f7d99b 100644
--- a/src/db/update/InotifyUpdate.hxx
+++ b/src/db/update/InotifyUpdate.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_INOTIFY_UPDATE_HXX
 #define MPD_INOTIFY_UPDATE_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 class EventLoop;
diff --git a/src/db/update/Queue.cxx b/src/db/update/Queue.cxx
index 6c9f40e77..ffbc8a95d 100644
--- a/src/db/update/Queue.cxx
+++ b/src/db/update/Queue.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Queue.hxx"
 
 bool
diff --git a/src/db/update/Queue.hxx b/src/db/update/Queue.hxx
index 7c02f1d99..fbc9f9d61 100644
--- a/src/db/update/Queue.hxx
+++ b/src/db/update/Queue.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_UPDATE_QUEUE_HXX
 #define MPD_UPDATE_QUEUE_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <string>
diff --git a/src/db/update/Remove.cxx b/src/db/update/Remove.cxx
index a11d6fd19..8fedccc6c 100644
--- a/src/db/update/Remove.cxx
+++ b/src/db/update/Remove.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "Remove.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseListener.hxx"
diff --git a/src/db/update/Remove.hxx b/src/db/update/Remove.hxx
index bec5f3483..b625138c1 100644
--- a/src/db/update/Remove.hxx
+++ b/src/db/update/Remove.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_UPDATE_REMOVE_HXX
 #define MPD_UPDATE_REMOVE_HXX
 
-#include "check.h"
 #include "event/DeferEvent.hxx"
 #include "thread/Mutex.hxx"
 #include "util/Compiler.h"
diff --git a/src/db/update/Service.cxx b/src/db/update/Service.cxx
index 28d2c7b43..deb60a45c 100644
--- a/src/db/update/Service.cxx
+++ b/src/db/update/Service.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Service.hxx"
 #include "Walk.hxx"
 #include "UpdateDomain.hxx"
diff --git a/src/db/update/Service.hxx b/src/db/update/Service.hxx
index 21efc12b8..c00b8f42f 100644
--- a/src/db/update/Service.hxx
+++ b/src/db/update/Service.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_UPDATE_SERVICE_HXX
 #define MPD_UPDATE_SERVICE_HXX
 
-#include "check.h"
 #include "Config.hxx"
 #include "Queue.hxx"
 #include "event/DeferEvent.hxx"
diff --git a/src/db/update/UpdateIO.cxx b/src/db/update/UpdateIO.cxx
index 34e19cfa6..850325abb 100644
--- a/src/db/update/UpdateIO.cxx
+++ b/src/db/update/UpdateIO.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "UpdateIO.hxx"
 #include "db/plugins/simple/Directory.hxx"
 #include "storage/FileInfo.hxx"
diff --git a/src/db/update/UpdateIO.hxx b/src/db/update/UpdateIO.hxx
index 455d5d130..f34521886 100644
--- a/src/db/update/UpdateIO.hxx
+++ b/src/db/update/UpdateIO.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_UPDATE_IO_HXX
 #define MPD_UPDATE_IO_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 struct Directory;
diff --git a/src/db/update/UpdateSong.cxx b/src/db/update/UpdateSong.cxx
index 068a1b6a0..6b6ff4173 100644
--- a/src/db/update/UpdateSong.cxx
+++ b/src/db/update/UpdateSong.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "Walk.hxx"
 #include "UpdateIO.hxx"
 #include "UpdateDomain.hxx"
diff --git a/src/db/update/Walk.cxx b/src/db/update/Walk.cxx
index 9fd7735fb..c13d6fd40 100644
--- a/src/db/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "Walk.hxx"
 #include "UpdateIO.hxx"
 #include "Editor.hxx"
diff --git a/src/db/update/Walk.hxx b/src/db/update/Walk.hxx
index 303c98d16..db0f16c79 100644
--- a/src/db/update/Walk.hxx
+++ b/src/db/update/Walk.hxx
@@ -20,10 +20,10 @@
 #ifndef MPD_UPDATE_WALK_HXX
 #define MPD_UPDATE_WALK_HXX
 
-#include "check.h"
 #include "Config.hxx"
 #include "Editor.hxx"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <atomic>
 
diff --git a/src/decoder/Bridge.cxx b/src/decoder/Bridge.cxx
index a436847e5..59d80cc48 100644
--- a/src/decoder/Bridge.cxx
+++ b/src/decoder/Bridge.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Bridge.hxx"
 #include "DecoderAPI.hxx"
 #include "Domain.hxx"
diff --git a/src/decoder/Client.hxx b/src/decoder/Client.hxx
index 74d1ec529..22d3db3d2 100644
--- a/src/decoder/Client.hxx
+++ b/src/decoder/Client.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_DECODER_CLIENT_HXX
 #define MPD_DECODER_CLIENT_HXX
 
-#include "check.h"
 #include "Command.hxx"
 #include "Chrono.hxx"
 #include "input/Ptr.hxx"
diff --git a/src/decoder/Control.cxx b/src/decoder/Control.cxx
index 6fec4b66d..5faa23fe5 100644
--- a/src/decoder/Control.cxx
+++ b/src/decoder/Control.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Control.hxx"
 #include "MusicPipe.hxx"
 #include "song/DetachedSong.hxx"
diff --git a/src/decoder/DecoderAPI.cxx b/src/decoder/DecoderAPI.cxx
index c5d7b7321..a245989de 100644
--- a/src/decoder/DecoderAPI.cxx
+++ b/src/decoder/DecoderAPI.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DecoderAPI.hxx"
 #include "input/InputStream.hxx"
 #include "Log.hxx"
diff --git a/src/decoder/DecoderAPI.hxx b/src/decoder/DecoderAPI.hxx
index c33605e92..537e371cd 100644
--- a/src/decoder/DecoderAPI.hxx
+++ b/src/decoder/DecoderAPI.hxx
@@ -29,7 +29,6 @@
 
 // IWYU pragma: begin_exports
 
-#include "check.h"
 #include "Client.hxx"
 #include "input/Ptr.hxx"
 #include "Command.hxx"
diff --git a/src/decoder/DecoderBuffer.cxx b/src/decoder/DecoderBuffer.cxx
index a65bd7809..a043245c3 100644
--- a/src/decoder/DecoderBuffer.cxx
+++ b/src/decoder/DecoderBuffer.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DecoderBuffer.hxx"
 #include "DecoderAPI.hxx"
 
diff --git a/src/decoder/DecoderPlugin.cxx b/src/decoder/DecoderPlugin.cxx
index b80c3f3ff..897d3c4a5 100644
--- a/src/decoder/DecoderPlugin.cxx
+++ b/src/decoder/DecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DecoderPlugin.hxx"
 #include "util/StringUtil.hxx"
 
diff --git a/src/decoder/DecoderPrint.cxx b/src/decoder/DecoderPrint.cxx
index c24e64f81..f681008cf 100644
--- a/src/decoder/DecoderPrint.cxx
+++ b/src/decoder/DecoderPrint.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DecoderPrint.hxx"
 #include "DecoderList.hxx"
 #include "DecoderPlugin.hxx"
diff --git a/src/decoder/Reader.cxx b/src/decoder/Reader.cxx
index 126bd1d76..5161517ae 100644
--- a/src/decoder/Reader.cxx
+++ b/src/decoder/Reader.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Reader.hxx"
 #include "DecoderAPI.hxx"
 
diff --git a/src/decoder/Reader.hxx b/src/decoder/Reader.hxx
index 9e5f6c102..50254fcd9 100644
--- a/src/decoder/Reader.hxx
+++ b/src/decoder/Reader.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_DECODER_READER_HXX
 #define MPD_DECODER_READER_HXX
 
-#include "check.h"
 #include "fs/io/Reader.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/decoder/plugins/AdPlugDecoderPlugin.cxx b/src/decoder/plugins/AdPlugDecoderPlugin.cxx
index 79e478746..c082f6f2f 100644
--- a/src/decoder/plugins/AdPlugDecoderPlugin.cxx
+++ b/src/decoder/plugins/AdPlugDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "AdPlugDecoderPlugin.h"
 #include "tag/Handler.hxx"
 #include "../DecoderAPI.hxx"
diff --git a/src/decoder/plugins/AudiofileDecoderPlugin.cxx b/src/decoder/plugins/AudiofileDecoderPlugin.cxx
index 1a688895d..0a86162c8 100644
--- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx
+++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "AudiofileDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
diff --git a/src/decoder/plugins/FaadDecoderPlugin.cxx b/src/decoder/plugins/FaadDecoderPlugin.cxx
index f0991f39e..418f5f688 100644
--- a/src/decoder/plugins/FaadDecoderPlugin.cxx
+++ b/src/decoder/plugins/FaadDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FaadDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "../DecoderBuffer.hxx"
diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
index 0f8abdd41..3bd0ecad5 100644
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -21,7 +21,6 @@
 #define __STDC_CONSTANT_MACROS
 
 #include "lib/ffmpeg/Time.hxx"
-#include "config.h"
 #include "FfmpegDecoderPlugin.hxx"
 #include "lib/ffmpeg/Domain.hxx"
 #include "lib/ffmpeg/Error.hxx"
diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx
index dc57d4cc6..788c79c53 100644
--- a/src/decoder/plugins/FfmpegIo.cxx
+++ b/src/decoder/plugins/FfmpegIo.cxx
@@ -20,7 +20,6 @@
 /* necessary because libavutil/common.h uses UINT64_C */
 #define __STDC_CONSTANT_MACROS
 
-#include "config.h"
 #include "FfmpegIo.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
diff --git a/src/decoder/plugins/FfmpegIo.hxx b/src/decoder/plugins/FfmpegIo.hxx
index 87b8cea99..1d7a5e404 100644
--- a/src/decoder/plugins/FfmpegIo.hxx
+++ b/src/decoder/plugins/FfmpegIo.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_FFMPEG_IO_HXX
 #define MPD_FFMPEG_IO_HXX
 
-#include "check.h"
-
 extern "C" {
 #include "libavformat/avio.h"
 }
diff --git a/src/decoder/plugins/FfmpegMetaData.cxx b/src/decoder/plugins/FfmpegMetaData.cxx
index 81c3f53ce..265722f49 100644
--- a/src/decoder/plugins/FfmpegMetaData.cxx
+++ b/src/decoder/plugins/FfmpegMetaData.cxx
@@ -20,7 +20,6 @@
 /* necessary because libavutil/common.h uses UINT64_C */
 #define __STDC_CONSTANT_MACROS
 
-#include "config.h"
 #include "FfmpegMetaData.hxx"
 #include "tag/Table.hxx"
 #include "tag/Handler.hxx"
diff --git a/src/decoder/plugins/FlacCommon.cxx b/src/decoder/plugins/FlacCommon.cxx
index 7abbc386d..bf3ecc4e3 100644
--- a/src/decoder/plugins/FlacCommon.cxx
+++ b/src/decoder/plugins/FlacCommon.cxx
@@ -21,7 +21,6 @@
  * Common data structures and functions used by FLAC and OggFLAC
  */
 
-#include "config.h"
 #include "FlacCommon.hxx"
 #include "lib/xiph/FlacStreamMetadata.hxx"
 #include "Log.hxx"
diff --git a/src/decoder/plugins/FlacDecoderPlugin.cxx b/src/decoder/plugins/FlacDecoderPlugin.cxx
index 22d5e6141..176d9bcf3 100644
--- a/src/decoder/plugins/FlacDecoderPlugin.cxx
+++ b/src/decoder/plugins/FlacDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "FlacDecoderPlugin.h"
 #include "FlacStreamDecoder.hxx"
 #include "FlacDomain.hxx"
diff --git a/src/decoder/plugins/FlacDomain.cxx b/src/decoder/plugins/FlacDomain.cxx
index 66710b7c7..191962fb5 100644
--- a/src/decoder/plugins/FlacDomain.cxx
+++ b/src/decoder/plugins/FlacDomain.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FlacDomain.hxx"
 #include "util/Domain.hxx"
 
diff --git a/src/decoder/plugins/FlacDomain.hxx b/src/decoder/plugins/FlacDomain.hxx
index df790877d..7f8826460 100644
--- a/src/decoder/plugins/FlacDomain.hxx
+++ b/src/decoder/plugins/FlacDomain.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_FLAC_DOMAIN_HXX
 #define MPD_FLAC_DOMAIN_HXX
 
-#include "check.h"
-
 extern const class Domain flac_domain;
 
 #endif
diff --git a/src/decoder/plugins/FlacInput.cxx b/src/decoder/plugins/FlacInput.cxx
index d48b60728..92204486b 100644
--- a/src/decoder/plugins/FlacInput.cxx
+++ b/src/decoder/plugins/FlacInput.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FlacInput.hxx"
 #include "FlacDomain.hxx"
 #include "../DecoderAPI.hxx"
diff --git a/src/decoder/plugins/FlacPcm.cxx b/src/decoder/plugins/FlacPcm.cxx
index cbecf4e0d..e9a44fe78 100644
--- a/src/decoder/plugins/FlacPcm.cxx
+++ b/src/decoder/plugins/FlacPcm.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FlacPcm.hxx"
 #include "CheckAudioFormat.hxx"
 #include "lib/xiph/FlacAudioFormat.hxx"
diff --git a/src/decoder/plugins/FlacPcm.hxx b/src/decoder/plugins/FlacPcm.hxx
index 2ac985c8c..a8a57754a 100644
--- a/src/decoder/plugins/FlacPcm.hxx
+++ b/src/decoder/plugins/FlacPcm.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FLAC_PCM_HXX
 #define MPD_FLAC_PCM_HXX
 
-#include "check.h"
 #include "pcm/PcmBuffer.hxx"
 #include "AudioFormat.hxx"
 
diff --git a/src/decoder/plugins/FlacStreamDecoder.hxx b/src/decoder/plugins/FlacStreamDecoder.hxx
index 42a531a69..8e333064a 100644
--- a/src/decoder/plugins/FlacStreamDecoder.hxx
+++ b/src/decoder/plugins/FlacStreamDecoder.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_FLAC_STREAM_DECODER
 #define MPD_FLAC_STREAM_DECODER
 
-#include "check.h"
-
 #include <FLAC/stream_decoder.h>
 
 #include <utility>
diff --git a/src/decoder/plugins/FluidsynthDecoderPlugin.cxx b/src/decoder/plugins/FluidsynthDecoderPlugin.cxx
index 33f895d13..9002da363 100644
--- a/src/decoder/plugins/FluidsynthDecoderPlugin.cxx
+++ b/src/decoder/plugins/FluidsynthDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FluidsynthDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
diff --git a/src/decoder/plugins/GmeDecoderPlugin.cxx b/src/decoder/plugins/GmeDecoderPlugin.cxx
index c0d54a91b..64f0a1ad4 100644
--- a/src/decoder/plugins/GmeDecoderPlugin.cxx
+++ b/src/decoder/plugins/GmeDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "GmeDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "config/Block.hxx"
diff --git a/src/decoder/plugins/HybridDsdDecoderPlugin.cxx b/src/decoder/plugins/HybridDsdDecoderPlugin.cxx
index acda1c132..9ff8802e4 100644
--- a/src/decoder/plugins/HybridDsdDecoderPlugin.cxx
+++ b/src/decoder/plugins/HybridDsdDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "HybridDsdDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
diff --git a/src/decoder/plugins/ModplugDecoderPlugin.cxx b/src/decoder/plugins/ModplugDecoderPlugin.cxx
index 820b6ec51..d3d91efe1 100644
--- a/src/decoder/plugins/ModplugDecoderPlugin.cxx
+++ b/src/decoder/plugins/ModplugDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ModplugDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
diff --git a/src/decoder/plugins/MpcdecDecoderPlugin.cxx b/src/decoder/plugins/MpcdecDecoderPlugin.cxx
index 97869cb58..76c71a1ed 100644
--- a/src/decoder/plugins/MpcdecDecoderPlugin.cxx
+++ b/src/decoder/plugins/MpcdecDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MpcdecDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
diff --git a/src/decoder/plugins/Mpg123DecoderPlugin.cxx b/src/decoder/plugins/Mpg123DecoderPlugin.cxx
index eb0d6a8e2..b45f3bc5b 100644
--- a/src/decoder/plugins/Mpg123DecoderPlugin.cxx
+++ b/src/decoder/plugins/Mpg123DecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "Mpg123DecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
diff --git a/src/decoder/plugins/OggCodec.cxx b/src/decoder/plugins/OggCodec.cxx
index 05db87588..d7dc41888 100644
--- a/src/decoder/plugins/OggCodec.cxx
+++ b/src/decoder/plugins/OggCodec.cxx
@@ -21,7 +21,6 @@
  * Common functions used for Ogg data streams (Ogg-Vorbis and OggFLAC)
  */
 
-#include "config.h"
 #include "OggCodec.hxx"
 #include "../DecoderAPI.hxx"
 
diff --git a/src/decoder/plugins/OggDecoder.cxx b/src/decoder/plugins/OggDecoder.cxx
index dab26aa9d..059b1488f 100644
--- a/src/decoder/plugins/OggDecoder.cxx
+++ b/src/decoder/plugins/OggDecoder.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "OggDecoder.hxx"
 #include "lib/xiph/OggFind.hxx"
 #include "input/InputStream.hxx"
diff --git a/src/decoder/plugins/OggDecoder.hxx b/src/decoder/plugins/OggDecoder.hxx
index 0477469bb..a9f441319 100644
--- a/src/decoder/plugins/OggDecoder.hxx
+++ b/src/decoder/plugins/OggDecoder.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_OGG_DECODER_HXX
 #define MPD_OGG_DECODER_HXX
 
-#include "config.h" /* must be first for large file support */
 #include "lib/xiph/OggVisitor.hxx"
 #include "decoder/Reader.hxx"
 
diff --git a/src/decoder/plugins/OpusDecoderPlugin.cxx b/src/decoder/plugins/OpusDecoderPlugin.cxx
index f0f60a263..542f71540 100644
--- a/src/decoder/plugins/OpusDecoderPlugin.cxx
+++ b/src/decoder/plugins/OpusDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "OpusDecoderPlugin.h"
 #include "OggDecoder.hxx"
 #include "OpusDomain.hxx"
diff --git a/src/decoder/plugins/OpusDomain.cxx b/src/decoder/plugins/OpusDomain.cxx
index 9debcc3d1..12e113817 100644
--- a/src/decoder/plugins/OpusDomain.cxx
+++ b/src/decoder/plugins/OpusDomain.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "OpusDomain.hxx"
 #include "util/Domain.hxx"
 
diff --git a/src/decoder/plugins/OpusDomain.hxx b/src/decoder/plugins/OpusDomain.hxx
index 61b86bbd4..0e0fb8ad3 100644
--- a/src/decoder/plugins/OpusDomain.hxx
+++ b/src/decoder/plugins/OpusDomain.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_OPUS_DOMAIN_HXX
 #define MPD_OPUS_DOMAIN_HXX
 
-#include "check.h"
-
 extern const class Domain opus_domain;
 
 #endif
diff --git a/src/decoder/plugins/OpusHead.cxx b/src/decoder/plugins/OpusHead.cxx
index 2956e29ea..2c7555c79 100644
--- a/src/decoder/plugins/OpusHead.cxx
+++ b/src/decoder/plugins/OpusHead.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "OpusHead.hxx"
 
 #include <stdint.h>
diff --git a/src/decoder/plugins/OpusHead.hxx b/src/decoder/plugins/OpusHead.hxx
index 0cf2428f8..5bec73208 100644
--- a/src/decoder/plugins/OpusHead.hxx
+++ b/src/decoder/plugins/OpusHead.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_OPUS_HEAD_HXX
 #define MPD_OPUS_HEAD_HXX
 
-#include "check.h"
-
 #include <stddef.h>
 
 bool
diff --git a/src/decoder/plugins/OpusReader.hxx b/src/decoder/plugins/OpusReader.hxx
index edf9db4ed..12d6d467e 100644
--- a/src/decoder/plugins/OpusReader.hxx
+++ b/src/decoder/plugins/OpusReader.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_OPUS_READER_HXX
 #define MPD_OPUS_READER_HXX
 
-#include "check.h"
-
 #include <algorithm>
 
 #include <stdint.h>
diff --git a/src/decoder/plugins/OpusTags.cxx b/src/decoder/plugins/OpusTags.cxx
index bcdbbdc6b..f4dce2810 100644
--- a/src/decoder/plugins/OpusTags.cxx
+++ b/src/decoder/plugins/OpusTags.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "OpusTags.hxx"
 #include "OpusReader.hxx"
 #include "lib/xiph/XiphTags.hxx"
diff --git a/src/decoder/plugins/OpusTags.hxx b/src/decoder/plugins/OpusTags.hxx
index 32843c93b..e11865fe8 100644
--- a/src/decoder/plugins/OpusTags.hxx
+++ b/src/decoder/plugins/OpusTags.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_OPUS_TAGS_HXX
 #define MPD_OPUS_TAGS_HXX
 
-#include "check.h"
-
 #include <stddef.h>
 
 struct ReplayGainInfo;
diff --git a/src/decoder/plugins/PcmDecoderPlugin.cxx b/src/decoder/plugins/PcmDecoderPlugin.cxx
index ee739ba27..e114c8a32 100644
--- a/src/decoder/plugins/PcmDecoderPlugin.cxx
+++ b/src/decoder/plugins/PcmDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PcmDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
diff --git a/src/decoder/plugins/SndfileDecoderPlugin.cxx b/src/decoder/plugins/SndfileDecoderPlugin.cxx
index c7e455559..08cbb88c1 100644
--- a/src/decoder/plugins/SndfileDecoderPlugin.cxx
+++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SndfileDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
diff --git a/src/decoder/plugins/VorbisDomain.cxx b/src/decoder/plugins/VorbisDomain.cxx
index ae956efe1..0a30eeac6 100644
--- a/src/decoder/plugins/VorbisDomain.cxx
+++ b/src/decoder/plugins/VorbisDomain.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "VorbisDomain.hxx"
 #include "util/Domain.hxx"
 
diff --git a/src/decoder/plugins/VorbisDomain.hxx b/src/decoder/plugins/VorbisDomain.hxx
index 3309023b2..a5d1ccf41 100644
--- a/src/decoder/plugins/VorbisDomain.hxx
+++ b/src/decoder/plugins/VorbisDomain.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_VORBIS_DOMAIN_HXX
 #define MPD_VORBIS_DOMAIN_HXX
 
-#include "check.h"
-
 class Domain;
 
 extern const Domain vorbis_domain;
diff --git a/src/decoder/plugins/WildmidiDecoderPlugin.cxx b/src/decoder/plugins/WildmidiDecoderPlugin.cxx
index b3fa17456..68a72a30a 100644
--- a/src/decoder/plugins/WildmidiDecoderPlugin.cxx
+++ b/src/decoder/plugins/WildmidiDecoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "WildmidiDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "tag/Handler.hxx"
diff --git a/src/encoder/Configured.cxx b/src/encoder/Configured.cxx
index aa53f7f7a..9f2d9c0fb 100644
--- a/src/encoder/Configured.cxx
+++ b/src/encoder/Configured.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Configured.hxx"
 #include "EncoderList.hxx"
 #include "EncoderPlugin.hxx"
diff --git a/src/encoder/ToOutputStream.cxx b/src/encoder/ToOutputStream.cxx
index 0b490c3d6..76485a28e 100644
--- a/src/encoder/ToOutputStream.cxx
+++ b/src/encoder/ToOutputStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ToOutputStream.hxx"
 #include "EncoderInterface.hxx"
 #include "fs/io/OutputStream.hxx"
diff --git a/src/encoder/ToOutputStream.hxx b/src/encoder/ToOutputStream.hxx
index df11bb4f7..27ce147b0 100644
--- a/src/encoder/ToOutputStream.hxx
+++ b/src/encoder/ToOutputStream.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_ENCODER_TO_OUTPUT_STREAM_HXX
 #define MPD_ENCODER_TO_OUTPUT_STREAM_HXX
 
-#include "check.h"
-
 class OutputStream;
 class Encoder;
 
diff --git a/src/encoder/plugins/FlacEncoderPlugin.cxx b/src/encoder/plugins/FlacEncoderPlugin.cxx
index b87d6871f..ed70a6832 100644
--- a/src/encoder/plugins/FlacEncoderPlugin.cxx
+++ b/src/encoder/plugins/FlacEncoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FlacEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
diff --git a/src/encoder/plugins/LameEncoderPlugin.cxx b/src/encoder/plugins/LameEncoderPlugin.cxx
index 04c40b016..fe663c28c 100644
--- a/src/encoder/plugins/LameEncoderPlugin.cxx
+++ b/src/encoder/plugins/LameEncoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LameEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
diff --git a/src/encoder/plugins/NullEncoderPlugin.cxx b/src/encoder/plugins/NullEncoderPlugin.cxx
index 31a35868d..7e365e4cc 100644
--- a/src/encoder/plugins/NullEncoderPlugin.cxx
+++ b/src/encoder/plugins/NullEncoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "NullEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "util/DynamicFifoBuffer.hxx"
diff --git a/src/encoder/plugins/OggEncoder.hxx b/src/encoder/plugins/OggEncoder.hxx
index 8959f83e0..bf0bacf60 100644
--- a/src/encoder/plugins/OggEncoder.hxx
+++ b/src/encoder/plugins/OggEncoder.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_OGG_ENCODER_HXX
 #define MPD_OGG_ENCODER_HXX
 
-#include "config.h"
 #include "../EncoderAPI.hxx"
 #include "lib/xiph/OggStreamState.hxx"
 #include "lib/xiph/OggPage.hxx"
diff --git a/src/encoder/plugins/OpusEncoderPlugin.cxx b/src/encoder/plugins/OpusEncoderPlugin.cxx
index a123fb919..8a55ea07e 100644
--- a/src/encoder/plugins/OpusEncoderPlugin.cxx
+++ b/src/encoder/plugins/OpusEncoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "OpusEncoderPlugin.hxx"
 #include "OggEncoder.hxx"
 #include "AudioFormat.hxx"
diff --git a/src/encoder/plugins/ShineEncoderPlugin.cxx b/src/encoder/plugins/ShineEncoderPlugin.cxx
index 9d342a3fe..227ca26da 100644
--- a/src/encoder/plugins/ShineEncoderPlugin.cxx
+++ b/src/encoder/plugins/ShineEncoderPlugin.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "ShineEncoderPlugin.hxx"
-#include "config.h"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
 #include "config/Domain.hxx"
diff --git a/src/encoder/plugins/TwolameEncoderPlugin.cxx b/src/encoder/plugins/TwolameEncoderPlugin.cxx
index 7d56f33b1..e05f64764 100644
--- a/src/encoder/plugins/TwolameEncoderPlugin.cxx
+++ b/src/encoder/plugins/TwolameEncoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TwolameEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
diff --git a/src/encoder/plugins/VorbisEncoderPlugin.cxx b/src/encoder/plugins/VorbisEncoderPlugin.cxx
index 0c5f06804..7a17a77f3 100644
--- a/src/encoder/plugins/VorbisEncoderPlugin.cxx
+++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "VorbisEncoderPlugin.hxx"
 #include "OggEncoder.hxx"
 #include "lib/xiph/VorbisComment.hxx"
diff --git a/src/encoder/plugins/WaveEncoderPlugin.cxx b/src/encoder/plugins/WaveEncoderPlugin.cxx
index 128e13605..2b6156569 100644
--- a/src/encoder/plugins/WaveEncoderPlugin.cxx
+++ b/src/encoder/plugins/WaveEncoderPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "WaveEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "system/ByteOrder.hxx"
diff --git a/src/event/BufferedSocket.cxx b/src/event/BufferedSocket.cxx
index af712f1ce..c66eb9f42 100644
--- a/src/event/BufferedSocket.cxx
+++ b/src/event/BufferedSocket.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "BufferedSocket.hxx"
 #include "net/SocketError.hxx"
 #include "util/Compiler.h"
diff --git a/src/event/BufferedSocket.hxx b/src/event/BufferedSocket.hxx
index b2c5bbf30..112ae829e 100644
--- a/src/event/BufferedSocket.hxx
+++ b/src/event/BufferedSocket.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_BUFFERED_SOCKET_HXX
 #define MPD_BUFFERED_SOCKET_HXX
 
-#include "check.h"
 #include "SocketMonitor.hxx"
 #include "util/StaticFifoBuffer.hxx"
 
diff --git a/src/event/Call.cxx b/src/event/Call.cxx
index 37b7356bc..b03381da7 100644
--- a/src/event/Call.cxx
+++ b/src/event/Call.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Call.hxx"
 #include "Loop.hxx"
 #include "DeferEvent.hxx"
diff --git a/src/event/Call.hxx b/src/event/Call.hxx
index 7a0ec4c69..1ed6f970e 100644
--- a/src/event/Call.hxx
+++ b/src/event/Call.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_EVENT_CALL_HXX
 #define MPD_EVENT_CALL_HXX
 
-#include "check.h"
-
 #include <functional>
 
 class EventLoop;
diff --git a/src/event/DeferEvent.cxx b/src/event/DeferEvent.cxx
index dca1e1faa..0960f7ce0 100644
--- a/src/event/DeferEvent.cxx
+++ b/src/event/DeferEvent.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DeferEvent.hxx"
 #include "Loop.hxx"
 
diff --git a/src/event/DeferEvent.hxx b/src/event/DeferEvent.hxx
index 76113eead..4dd8c9e66 100644
--- a/src/event/DeferEvent.hxx
+++ b/src/event/DeferEvent.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_DEFER_EVENT_HXX
 #define MPD_DEFER_EVENT_HXX
 
-#include "check.h"
 #include "util/BindMethod.hxx"
 
 #include <boost/intrusive/list_hook.hpp>
diff --git a/src/event/FullyBufferedSocket.cxx b/src/event/FullyBufferedSocket.cxx
index 0bf145078..a3c31f149 100644
--- a/src/event/FullyBufferedSocket.cxx
+++ b/src/event/FullyBufferedSocket.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FullyBufferedSocket.hxx"
 #include "net/SocketError.hxx"
 #include "util/Compiler.h"
diff --git a/src/event/FullyBufferedSocket.hxx b/src/event/FullyBufferedSocket.hxx
index ea511c06f..2351ebf14 100644
--- a/src/event/FullyBufferedSocket.hxx
+++ b/src/event/FullyBufferedSocket.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FULLY_BUFFERED_SOCKET_HXX
 #define MPD_FULLY_BUFFERED_SOCKET_HXX
 
-#include "check.h"
 #include "BufferedSocket.hxx"
 #include "IdleMonitor.hxx"
 #include "util/PeakBuffer.hxx"
diff --git a/src/event/IdleMonitor.cxx b/src/event/IdleMonitor.cxx
index 2102f3b79..d60449cd9 100644
--- a/src/event/IdleMonitor.cxx
+++ b/src/event/IdleMonitor.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "IdleMonitor.hxx"
 #include "Loop.hxx"
 
diff --git a/src/event/IdleMonitor.hxx b/src/event/IdleMonitor.hxx
index a278b3b71..827e25a0b 100644
--- a/src/event/IdleMonitor.hxx
+++ b/src/event/IdleMonitor.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_SOCKET_IDLE_MONITOR_HXX
 #define MPD_SOCKET_IDLE_MONITOR_HXX
 
-#include "check.h"
-
 #include <boost/intrusive/list_hook.hpp>
 
 class EventLoop;
@@ -73,4 +71,4 @@ private:
 	void Run() noexcept;
 };
 
-#endif /* MAIN_NOTIFY_H */
+#endif
diff --git a/src/event/Loop.cxx b/src/event/Loop.cxx
index 8bbb184b5..e0aae6fc4 100644
--- a/src/event/Loop.cxx
+++ b/src/event/Loop.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Loop.hxx"
 #include "SocketMonitor.hxx"
 #include "IdleMonitor.hxx"
diff --git a/src/event/Loop.hxx b/src/event/Loop.hxx
index ff44b1819..80b479494 100644
--- a/src/event/Loop.hxx
+++ b/src/event/Loop.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_EVENT_LOOP_HXX
 #define MPD_EVENT_LOOP_HXX
 
-#include "check.h"
 #include "thread/Id.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/event/MaskMonitor.cxx b/src/event/MaskMonitor.cxx
index f0a74e7d6..3fe29c99b 100644
--- a/src/event/MaskMonitor.cxx
+++ b/src/event/MaskMonitor.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MaskMonitor.hxx"
 
 void
diff --git a/src/event/MaskMonitor.hxx b/src/event/MaskMonitor.hxx
index a85447a51..6b91ab0fd 100644
--- a/src/event/MaskMonitor.hxx
+++ b/src/event/MaskMonitor.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_EVENT_MASK_MONITOR_HXX
 #define MPD_EVENT_MASK_MONITOR_HXX
 
-#include "check.h"
 #include "DeferEvent.hxx"
 #include "util/BindMethod.hxx"
 
diff --git a/src/event/MultiSocketMonitor.cxx b/src/event/MultiSocketMonitor.cxx
index 4bc646f00..b3cd8675c 100644
--- a/src/event/MultiSocketMonitor.cxx
+++ b/src/event/MultiSocketMonitor.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MultiSocketMonitor.hxx"
 #include "Loop.hxx"
 
diff --git a/src/event/MultiSocketMonitor.hxx b/src/event/MultiSocketMonitor.hxx
index 37c50eb75..eff82bbdf 100644
--- a/src/event/MultiSocketMonitor.hxx
+++ b/src/event/MultiSocketMonitor.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_MULTI_SOCKET_MONITOR_HXX
 #define MPD_MULTI_SOCKET_MONITOR_HXX
 
-#include "check.h"
 #include "IdleMonitor.hxx"
 #include "TimerEvent.hxx"
 #include "SocketMonitor.hxx"
diff --git a/src/event/PollGroup.hxx b/src/event/PollGroup.hxx
index cd0808346..5c954a957 100644
--- a/src/event/PollGroup.hxx
+++ b/src/event/PollGroup.hxx
@@ -20,6 +20,8 @@
 #ifndef MPD_EVENT_POLLGROUP_HXX
 #define MPD_EVENT_POLLGROUP_HXX
 
+#include "config.h"
+
 #ifdef USE_EPOLL
 #include "PollGroupEpoll.hxx"
 typedef PollResultEpoll PollResult;
diff --git a/src/event/PollGroupEpoll.hxx b/src/event/PollGroupEpoll.hxx
index 8813a1414..e7de696d0 100644
--- a/src/event/PollGroupEpoll.hxx
+++ b/src/event/PollGroupEpoll.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_EVENT_POLLGROUP_EPOLL_HXX
 #define MPD_EVENT_POLLGROUP_EPOLL_HXX
 
-#include "check.h"
-
 #include "util/Compiler.h"
 #include "system/EpollFD.hxx"
 
diff --git a/src/event/PollGroupPoll.hxx b/src/event/PollGroupPoll.hxx
index 6dd09b194..f9ee18ba6 100644
--- a/src/event/PollGroupPoll.hxx
+++ b/src/event/PollGroupPoll.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_EVENT_POLLGROUP_POLL_HXX
 #define MPD_EVENT_POLLGROUP_POLL_HXX
 
-#include "check.h"
 #include "PollResultGeneric.hxx"
 
 #include <vector>
diff --git a/src/event/PollGroupWinSelect.hxx b/src/event/PollGroupWinSelect.hxx
index 61fffc29b..60d752edd 100644
--- a/src/event/PollGroupWinSelect.hxx
+++ b/src/event/PollGroupWinSelect.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_EVENT_POLLGROUP_WINSELECT_HXX
 #define MPD_EVENT_POLLGROUP_WINSELECT_HXX
 
-#include "check.h"
-
 #include "PollResultGeneric.hxx"
 
 #include <assert.h>
diff --git a/src/event/PollResultGeneric.hxx b/src/event/PollResultGeneric.hxx
index ede21cc4c..49f21ad5b 100644
--- a/src/event/PollResultGeneric.hxx
+++ b/src/event/PollResultGeneric.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_EVENT_POLLRESULT_GENERIC_HXX
 #define MPD_EVENT_POLLRESULT_GENERIC_HXX
 
-#include "check.h"
-
 #include <vector>
 
 #include <stddef.h>
diff --git a/src/event/SignalMonitor.cxx b/src/event/SignalMonitor.cxx
index 5db1bb5af..6c13ed6e3 100644
--- a/src/event/SignalMonitor.cxx
+++ b/src/event/SignalMonitor.cxx
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SignalMonitor.hxx"
+#include "config.h"
 
 #ifndef _WIN32
 
diff --git a/src/event/SignalMonitor.hxx b/src/event/SignalMonitor.hxx
index 37ce40e25..51f85108f 100644
--- a/src/event/SignalMonitor.hxx
+++ b/src/event/SignalMonitor.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_SOCKET_SIGNAL_MONITOR_HXX
 #define MPD_SOCKET_SIGNAL_MONITOR_HXX
 
-#include "check.h"
-
 class EventLoop;
 
 #ifndef _WIN32
diff --git a/src/event/SocketMonitor.cxx b/src/event/SocketMonitor.cxx
index c895fc24d..0b2a36088 100644
--- a/src/event/SocketMonitor.cxx
+++ b/src/event/SocketMonitor.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SocketMonitor.hxx"
 #include "Loop.hxx"
 
diff --git a/src/event/SocketMonitor.hxx b/src/event/SocketMonitor.hxx
index d8f2a700d..df80ced04 100644
--- a/src/event/SocketMonitor.hxx
+++ b/src/event/SocketMonitor.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_SOCKET_MONITOR_HXX
 #define MPD_SOCKET_MONITOR_HXX
 
-#include "check.h"
 #include "PollGroup.hxx"
 #include "net/SocketDescriptor.hxx"
 
diff --git a/src/event/Thread.cxx b/src/event/Thread.cxx
index bad2ad1ba..a54b1e880 100644
--- a/src/event/Thread.cxx
+++ b/src/event/Thread.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Thread.hxx"
 #include "thread/Name.hxx"
 #include "thread/Slack.hxx"
diff --git a/src/event/Thread.hxx b/src/event/Thread.hxx
index c8e36c1a1..2b816ad37 100644
--- a/src/event/Thread.hxx
+++ b/src/event/Thread.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_EVENT_THREAD_HXX
 #define MPD_EVENT_THREAD_HXX
 
-#include "check.h"
 #include "Loop.hxx"
 #include "thread/Thread.hxx"
 
diff --git a/src/event/TimerEvent.cxx b/src/event/TimerEvent.cxx
index bf41f5f36..8dd283ce3 100644
--- a/src/event/TimerEvent.cxx
+++ b/src/event/TimerEvent.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TimerEvent.hxx"
 #include "Loop.hxx"
 
diff --git a/src/event/TimerEvent.hxx b/src/event/TimerEvent.hxx
index 59208f5a1..993a2d82c 100644
--- a/src/event/TimerEvent.hxx
+++ b/src/event/TimerEvent.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_TIMER_EVENT_HXX
 #define MPD_TIMER_EVENT_HXX
 
-#include "check.h"
 #include "util/BindMethod.hxx"
 
 #include <boost/intrusive/set_hook.hpp>
diff --git a/src/event/WakeFD.hxx b/src/event/WakeFD.hxx
index 66785ab94..60f266e68 100644
--- a/src/event/WakeFD.hxx
+++ b/src/event/WakeFD.hxx
@@ -20,9 +20,7 @@
 #ifndef MPD_WAKE_FD_HXX
 #define MPD_WAKE_FD_HXX
 
-#include "check.h"
-
-#include <assert.h>
+#include "config.h"
 
 #ifdef USE_EVENTFD
 #include "system/EventFD.hxx"
@@ -32,4 +30,4 @@
 #define WakeFD EventPipe
 #endif
 
-#endif /* MAIN_NOTIFY_H */
+#endif
diff --git a/src/filter/Factory.cxx b/src/filter/Factory.cxx
index baa4cd09e..993ae85ad 100644
--- a/src/filter/Factory.cxx
+++ b/src/filter/Factory.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Factory.hxx"
 #include "LoadOne.hxx"
 #include "Prepared.hxx"
diff --git a/src/filter/Factory.hxx b/src/filter/Factory.hxx
index 350cc2941..a1a9cb688 100644
--- a/src/filter/Factory.hxx
+++ b/src/filter/Factory.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_FILTER_FACTORY_HXX
 #define MPD_FILTER_FACTORY_HXX
 
-#include "check.h"
-
 #include <memory>
 
 struct ConfigData;
diff --git a/src/filter/FilterRegistry.cxx b/src/filter/FilterRegistry.cxx
index 3f6b4652e..192306e4a 100644
--- a/src/filter/FilterRegistry.cxx
+++ b/src/filter/FilterRegistry.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FilterRegistry.hxx"
 #include "FilterPlugin.hxx"
 
diff --git a/src/filter/LoadChain.cxx b/src/filter/LoadChain.cxx
index fee15bebe..2cfffa0e7 100644
--- a/src/filter/LoadChain.cxx
+++ b/src/filter/LoadChain.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LoadChain.hxx"
 #include "Factory.hxx"
 #include "Prepared.hxx"
diff --git a/src/filter/LoadOne.cxx b/src/filter/LoadOne.cxx
index f918f50c3..00c60ea32 100644
--- a/src/filter/LoadOne.cxx
+++ b/src/filter/LoadOne.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LoadOne.hxx"
 #include "FilterPlugin.hxx"
 #include "FilterRegistry.hxx"
diff --git a/src/filter/Observer.cxx b/src/filter/Observer.cxx
index be185cd6f..337718fdf 100644
--- a/src/filter/Observer.cxx
+++ b/src/filter/Observer.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Observer.hxx"
 #include "Filter.hxx"
 #include "Prepared.hxx"
diff --git a/src/filter/Observer.hxx b/src/filter/Observer.hxx
index 8a1d6db72..bed934bcc 100644
--- a/src/filter/Observer.hxx
+++ b/src/filter/Observer.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_FILTER_OBSERVER_HXX
 #define MPD_FILTER_OBSERVER_HXX
 
-#include "check.h"
-
 #include <memory>
 
 class PreparedFilter;
diff --git a/src/filter/plugins/AutoConvertFilterPlugin.cxx b/src/filter/plugins/AutoConvertFilterPlugin.cxx
index 6cce1877e..08302cc00 100644
--- a/src/filter/plugins/AutoConvertFilterPlugin.cxx
+++ b/src/filter/plugins/AutoConvertFilterPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "AutoConvertFilterPlugin.hxx"
 #include "ConvertFilterPlugin.hxx"
 #include "filter/FilterPlugin.hxx"
diff --git a/src/filter/plugins/ChainFilterPlugin.cxx b/src/filter/plugins/ChainFilterPlugin.cxx
index adcf0346c..2c64bd4e7 100644
--- a/src/filter/plugins/ChainFilterPlugin.cxx
+++ b/src/filter/plugins/ChainFilterPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ChainFilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
diff --git a/src/filter/plugins/ConvertFilterPlugin.cxx b/src/filter/plugins/ConvertFilterPlugin.cxx
index 9fdd9028f..80b28566e 100644
--- a/src/filter/plugins/ConvertFilterPlugin.cxx
+++ b/src/filter/plugins/ConvertFilterPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ConvertFilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
diff --git a/src/filter/plugins/NormalizeFilterPlugin.cxx b/src/filter/plugins/NormalizeFilterPlugin.cxx
index ea0399954..a0594c3f0 100644
--- a/src/filter/plugins/NormalizeFilterPlugin.cxx
+++ b/src/filter/plugins/NormalizeFilterPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "NormalizeFilterPlugin.hxx"
 #include "filter/FilterPlugin.hxx"
 #include "filter/Filter.hxx"
diff --git a/src/filter/plugins/NullFilterPlugin.cxx b/src/filter/plugins/NullFilterPlugin.cxx
index 669f3f7b8..ca04f8483 100644
--- a/src/filter/plugins/NullFilterPlugin.cxx
+++ b/src/filter/plugins/NullFilterPlugin.cxx
@@ -24,7 +24,6 @@
  * plugins.
  */
 
-#include "config.h"
 #include "filter/FilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
diff --git a/src/filter/plugins/ReplayGainFilterPlugin.cxx b/src/filter/plugins/ReplayGainFilterPlugin.cxx
index 77f5e85d1..762913685 100644
--- a/src/filter/plugins/ReplayGainFilterPlugin.cxx
+++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ReplayGainFilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
diff --git a/src/filter/plugins/RouteFilterPlugin.cxx b/src/filter/plugins/RouteFilterPlugin.cxx
index bbdf4fa57..ef17740a9 100644
--- a/src/filter/plugins/RouteFilterPlugin.cxx
+++ b/src/filter/plugins/RouteFilterPlugin.cxx
@@ -39,7 +39,6 @@
  * one of them takes effect.
  */
 
-#include "config.h"
 #include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "AudioFormat.hxx"
diff --git a/src/filter/plugins/VolumeFilterPlugin.cxx b/src/filter/plugins/VolumeFilterPlugin.cxx
index 2981dfd3b..72f4c1582 100644
--- a/src/filter/plugins/VolumeFilterPlugin.cxx
+++ b/src/filter/plugins/VolumeFilterPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "VolumeFilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
diff --git a/src/fs/AllocatedPath.cxx b/src/fs/AllocatedPath.cxx
index 8dd5894ad..32ca1f56c 100644
--- a/src/fs/AllocatedPath.cxx
+++ b/src/fs/AllocatedPath.cxx
@@ -17,11 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "AllocatedPath.hxx"
 #include "Domain.hxx"
 #include "Charset.hxx"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <exception>
 
diff --git a/src/fs/AllocatedPath.hxx b/src/fs/AllocatedPath.hxx
index 16c386018..d8bab299c 100644
--- a/src/fs/AllocatedPath.hxx
+++ b/src/fs/AllocatedPath.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FS_ALLOCATED_PATH_HXX
 #define MPD_FS_ALLOCATED_PATH_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "Traits.hxx"
 #include "Path.hxx"
diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx
index 36d2872ed..cf3d134ba 100644
--- a/src/fs/Charset.cxx
+++ b/src/fs/Charset.cxx
@@ -17,12 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Charset.hxx"
 #include "Domain.hxx"
 #include "Log.hxx"
 #include "lib/icu/Converter.hxx"
 #include "util/AllocatedString.hxx"
+#include "config.h"
 
 #ifdef _WIN32
 #include "lib/icu/Win32.hxx"
diff --git a/src/fs/Charset.hxx b/src/fs/Charset.hxx
index 46aa1a581..c9e2c4d88 100644
--- a/src/fs/Charset.hxx
+++ b/src/fs/Charset.hxx
@@ -20,9 +20,9 @@
 #ifndef MPD_FS_CHARSET_HXX
 #define MPD_FS_CHARSET_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "Traits.hxx"
+#include "config.h"
 
 #if (defined(HAVE_ICU) || defined(HAVE_ICONV)) && !defined(_WIN32)
 #define HAVE_FS_CHARSET
diff --git a/src/fs/CheckFile.cxx b/src/fs/CheckFile.cxx
index 50c3de292..18e95de89 100644
--- a/src/fs/CheckFile.cxx
+++ b/src/fs/CheckFile.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "CheckFile.hxx"
 #include "Log.hxx"
 #include "config/Domain.hxx"
diff --git a/src/fs/CheckFile.hxx b/src/fs/CheckFile.hxx
index 41a827a5d..8619ef81c 100644
--- a/src/fs/CheckFile.hxx
+++ b/src/fs/CheckFile.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_FS_CHECK_FILE_HXX
 #define MPD_FS_CHECK_FILE_HXX
 
-#include "check.h"
-
 class Path;
 
 /**
diff --git a/src/fs/Config.cxx b/src/fs/Config.cxx
index be7d2e665..2ff6e7af9 100644
--- a/src/fs/Config.cxx
+++ b/src/fs/Config.cxx
@@ -17,10 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Config.hxx"
 #include "Charset.hxx"
 #include "config/Data.hxx"
+#include "config.h"
 
 void
 ConfigureFS(const ConfigData &config)
diff --git a/src/fs/Config.hxx b/src/fs/Config.hxx
index 85c54f03a..3b4887545 100644
--- a/src/fs/Config.hxx
+++ b/src/fs/Config.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_FS_CONFIG_HXX
 #define MPD_FS_CONFIG_HXX
 
-#include "check.h"
-
 struct ConfigData;
 
 /**
diff --git a/src/fs/DirectoryReader.cxx b/src/fs/DirectoryReader.cxx
index 6e8bddfdf..9d77d9d23 100644
--- a/src/fs/DirectoryReader.cxx
+++ b/src/fs/DirectoryReader.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DirectoryReader.hxx"
 #include "system/Error.hxx"
 
diff --git a/src/fs/DirectoryReader.hxx b/src/fs/DirectoryReader.hxx
index 920377bd7..6d5f8c7e1 100644
--- a/src/fs/DirectoryReader.hxx
+++ b/src/fs/DirectoryReader.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FS_DIRECTORY_READER_HXX
 #define MPD_FS_DIRECTORY_READER_HXX
 
-#include "check.h"
 #include "Path.hxx"
 
 #ifdef _WIN32
diff --git a/src/fs/Domain.cxx b/src/fs/Domain.cxx
index 0b96573ba..706bac827 100644
--- a/src/fs/Domain.cxx
+++ b/src/fs/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"
 
diff --git a/src/fs/FileInfo.hxx b/src/fs/FileInfo.hxx
index d93d80972..26d9c0009 100644
--- a/src/fs/FileInfo.hxx
+++ b/src/fs/FileInfo.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FS_FILE_INFO_HXX
 #define MPD_FS_FILE_INFO_HXX
 
-#include "check.h"
 #include "Path.hxx"
 #include "system/Error.hxx"
 
diff --git a/src/fs/FileSystem.cxx b/src/fs/FileSystem.cxx
index dfa9db938..e172befe8 100644
--- a/src/fs/FileSystem.cxx
+++ b/src/fs/FileSystem.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FileSystem.hxx"
 #include "AllocatedPath.hxx"
 #include "Limits.hxx"
diff --git a/src/fs/FileSystem.hxx b/src/fs/FileSystem.hxx
index f64aacfe7..c8bf6cc05 100644
--- a/src/fs/FileSystem.hxx
+++ b/src/fs/FileSystem.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FS_FILESYSTEM_HXX
 #define MPD_FS_FILESYSTEM_HXX
 
-#include "check.h"
 #include "Traits.hxx"
 #include "Path.hxx"
 #include "system/UniqueFileDescriptor.hxx"
diff --git a/src/fs/Glob.hxx b/src/fs/Glob.hxx
index b31b8aaa9..31ea25769 100644
--- a/src/fs/Glob.hxx
+++ b/src/fs/Glob.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_FS_GLOB_XX
 #define MPD_FS_GLOB_XX
 
-#include "check.h"
+#include "config.h"
 
 #ifdef HAVE_FNMATCH
 #define HAVE_CLASS_GLOB
diff --git a/src/fs/Limits.hxx b/src/fs/Limits.hxx
index 7e6259934..801ab5289 100644
--- a/src/fs/Limits.hxx
+++ b/src/fs/Limits.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_FS_LIMITS_HXX
 #define MPD_FS_LIMITS_HXX
 
-#include "check.h"
-
 #include <stddef.h>
 #include <limits.h>
 
diff --git a/src/fs/List.cxx b/src/fs/List.cxx
index 92b23e3a3..8d0d3a2d0 100644
--- a/src/fs/List.cxx
+++ b/src/fs/List.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "List.hxx"
 #include "AllocatedPath.hxx"
 #include "Glob.hxx"
diff --git a/src/fs/List.hxx b/src/fs/List.hxx
index 358f2b03b..06c925885 100644
--- a/src/fs/List.hxx
+++ b/src/fs/List.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_FS_LIST_XX
 #define MPD_FS_LIST_XX
 
-#include "check.h"
-
 #include <forward_list>
 
 class Path;
diff --git a/src/fs/NarrowPath.hxx b/src/fs/NarrowPath.hxx
index db07c4a5a..20d05b7cb 100644
--- a/src/fs/NarrowPath.hxx
+++ b/src/fs/NarrowPath.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FS_NARROW_PATH_HXX
 #define MPD_FS_NARROW_PATH_HXX
 
-#include "check.h"
 #include "Path.hxx"
 #include "util/Macros.hxx"
 
diff --git a/src/fs/Path.cxx b/src/fs/Path.cxx
index 3b62a30f2..1519e87ac 100644
--- a/src/fs/Path.cxx
+++ b/src/fs/Path.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Path.hxx"
 #include "Charset.hxx"
 
diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx
index 8561f4591..45e7b40ae 100644
--- a/src/fs/Path.hxx
+++ b/src/fs/Path.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FS_PATH_HXX
 #define MPD_FS_PATH_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "Traits.hxx"
 
diff --git a/src/fs/Path2.cxx b/src/fs/Path2.cxx
index f5f0662cf..cb457a176 100644
--- a/src/fs/Path2.cxx
+++ b/src/fs/Path2.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Path.hxx"
 #include "AllocatedPath.hxx"
 
diff --git a/src/fs/StandardDirectory.cxx b/src/fs/StandardDirectory.cxx
index b2bfef8eb..f3ab31521 100644
--- a/src/fs/StandardDirectory.cxx
+++ b/src/fs/StandardDirectory.cxx
@@ -17,10 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "StandardDirectory.hxx"
 #include "FileSystem.hxx"
 #include "XDG.hxx"
+#include "config.h"
 
 #include <array>
 
diff --git a/src/fs/StandardDirectory.hxx b/src/fs/StandardDirectory.hxx
index 801af4f10..ac6f4e04a 100644
--- a/src/fs/StandardDirectory.hxx
+++ b/src/fs/StandardDirectory.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FS_STANDARD_DIRECTORY_HXX
 #define MPD_FS_STANDARD_DIRECTORY_HXX
 
-#include "check.h"
 #include "AllocatedPath.hxx"
 
 /**
diff --git a/src/fs/Traits.cxx b/src/fs/Traits.cxx
index a31393d44..c1aa4f415 100644
--- a/src/fs/Traits.cxx
+++ b/src/fs/Traits.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Traits.hxx"
 #include "util/StringCompare.hxx"
 
diff --git a/src/fs/Traits.hxx b/src/fs/Traits.hxx
index 54c2e0cce..6a7e31f0c 100644
--- a/src/fs/Traits.hxx
+++ b/src/fs/Traits.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FS_TRAITS_HXX
 #define MPD_FS_TRAITS_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "util/StringPointer.hxx"
 #include "util/StringAPI.hxx"
diff --git a/src/fs/io/AutoGunzipReader.cxx b/src/fs/io/AutoGunzipReader.cxx
index 8e95b1dfe..1762565f0 100644
--- a/src/fs/io/AutoGunzipReader.cxx
+++ b/src/fs/io/AutoGunzipReader.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "AutoGunzipReader.hxx"
 #include "GunzipReader.hxx"
 
diff --git a/src/fs/io/AutoGunzipReader.hxx b/src/fs/io/AutoGunzipReader.hxx
index 232d31a7b..28e67db15 100644
--- a/src/fs/io/AutoGunzipReader.hxx
+++ b/src/fs/io/AutoGunzipReader.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_AUTO_GUNZIP_READER_HXX
 #define MPD_AUTO_GUNZIP_READER_HXX
 
-#include "check.h"
 #include "PeekReader.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/fs/io/BufferedOutputStream.cxx b/src/fs/io/BufferedOutputStream.cxx
index b1598f131..46249de0a 100644
--- a/src/fs/io/BufferedOutputStream.cxx
+++ b/src/fs/io/BufferedOutputStream.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "BufferedOutputStream.hxx"
 #include "OutputStream.hxx"
 
diff --git a/src/fs/io/BufferedOutputStream.hxx b/src/fs/io/BufferedOutputStream.hxx
index 0a8fae864..1df1c5dac 100644
--- a/src/fs/io/BufferedOutputStream.hxx
+++ b/src/fs/io/BufferedOutputStream.hxx
@@ -30,7 +30,6 @@
 #ifndef BUFFERED_OUTPUT_STREAM_HXX
 #define BUFFERED_OUTPUT_STREAM_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "util/DynamicFifoBuffer.hxx"
 
diff --git a/src/fs/io/BufferedReader.cxx b/src/fs/io/BufferedReader.cxx
index 3624f6b9e..d2b5ed711 100644
--- a/src/fs/io/BufferedReader.cxx
+++ b/src/fs/io/BufferedReader.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "BufferedReader.hxx"
 #include "Reader.hxx"
 #include "util/TextFile.hxx"
diff --git a/src/fs/io/BufferedReader.hxx b/src/fs/io/BufferedReader.hxx
index 9f8ae268c..0835c3d35 100644
--- a/src/fs/io/BufferedReader.hxx
+++ b/src/fs/io/BufferedReader.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_BUFFERED_READER_HXX
 #define MPD_BUFFERED_READER_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "util/DynamicFifoBuffer.hxx"
 
diff --git a/src/fs/io/FileOutputStream.cxx b/src/fs/io/FileOutputStream.cxx
index c1cb69840..082ca2fe8 100644
--- a/src/fs/io/FileOutputStream.cxx
+++ b/src/fs/io/FileOutputStream.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "FileOutputStream.hxx"
 #include "system/Error.hxx"
 #include "util/StringFormat.hxx"
diff --git a/src/fs/io/FileOutputStream.hxx b/src/fs/io/FileOutputStream.hxx
index 3f30b3c39..1f6a34ccf 100644
--- a/src/fs/io/FileOutputStream.hxx
+++ b/src/fs/io/FileOutputStream.hxx
@@ -30,7 +30,6 @@
 #ifndef FILE_OUTPUT_STREAM_HXX
 #define FILE_OUTPUT_STREAM_HXX
 
-#include "check.h"
 #include "OutputStream.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/Compiler.h"
diff --git a/src/fs/io/FileReader.cxx b/src/fs/io/FileReader.cxx
index a97cea809..9bc167f0a 100644
--- a/src/fs/io/FileReader.cxx
+++ b/src/fs/io/FileReader.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FileReader.hxx"
 #include "fs/FileInfo.hxx"
 #include "system/Error.hxx"
diff --git a/src/fs/io/FileReader.hxx b/src/fs/io/FileReader.hxx
index 24821fb65..f5fa4ec69 100644
--- a/src/fs/io/FileReader.hxx
+++ b/src/fs/io/FileReader.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FILE_READER_HXX
 #define MPD_FILE_READER_HXX
 
-#include "check.h"
 #include "Reader.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/Compiler.h"
diff --git a/src/fs/io/GunzipReader.cxx b/src/fs/io/GunzipReader.cxx
index 54baa53d7..defa076ce 100644
--- a/src/fs/io/GunzipReader.cxx
+++ b/src/fs/io/GunzipReader.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "GunzipReader.hxx"
 #include "lib/zlib/Error.hxx"
 
diff --git a/src/fs/io/GunzipReader.hxx b/src/fs/io/GunzipReader.hxx
index ed71ada94..817698f14 100644
--- a/src/fs/io/GunzipReader.hxx
+++ b/src/fs/io/GunzipReader.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_GUNZIP_READER_HXX
 #define MPD_GUNZIP_READER_HXX
 
-#include "check.h"
 #include "Reader.hxx"
 #include "util/StaticFifoBuffer.hxx"
 #include "util/Compiler.h"
diff --git a/src/fs/io/GzipOutputStream.cxx b/src/fs/io/GzipOutputStream.cxx
index 6e3b8802b..67f97a278 100644
--- a/src/fs/io/GzipOutputStream.cxx
+++ b/src/fs/io/GzipOutputStream.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "GzipOutputStream.hxx"
 #include "lib/zlib/Error.hxx"
 
diff --git a/src/fs/io/GzipOutputStream.hxx b/src/fs/io/GzipOutputStream.hxx
index 99c18fe46..bfbeebdbd 100644
--- a/src/fs/io/GzipOutputStream.hxx
+++ b/src/fs/io/GzipOutputStream.hxx
@@ -30,7 +30,6 @@
 #ifndef GZIP_OUTPUT_STREAM_HXX
 #define GZIP_OUTPUT_STREAM_HXX
 
-#include "check.h"
 #include "OutputStream.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/fs/io/OutputStream.hxx b/src/fs/io/OutputStream.hxx
index 625f1ebd2..7e5220ec3 100644
--- a/src/fs/io/OutputStream.hxx
+++ b/src/fs/io/OutputStream.hxx
@@ -30,8 +30,6 @@
 #ifndef MPD_OUTPUT_STREAM_HXX
 #define MPD_OUTPUT_STREAM_HXX
 
-#include "check.h"
-
 #include <stddef.h>
 
 class OutputStream {
diff --git a/src/fs/io/PeekReader.cxx b/src/fs/io/PeekReader.cxx
index 8d23899ec..cd4217326 100644
--- a/src/fs/io/PeekReader.cxx
+++ b/src/fs/io/PeekReader.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PeekReader.hxx"
 
 #include <algorithm>
diff --git a/src/fs/io/PeekReader.hxx b/src/fs/io/PeekReader.hxx
index 30bf7cfeb..49c2e6514 100644
--- a/src/fs/io/PeekReader.hxx
+++ b/src/fs/io/PeekReader.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_PEEK_READER_HXX
 #define MPD_PEEK_READER_HXX
 
-#include "check.h"
 #include "Reader.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/fs/io/Reader.hxx b/src/fs/io/Reader.hxx
index 9a12ac23b..9a23dec3f 100644
--- a/src/fs/io/Reader.hxx
+++ b/src/fs/io/Reader.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_READER_HXX
 #define MPD_READER_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <stddef.h>
diff --git a/src/fs/io/StdioOutputStream.hxx b/src/fs/io/StdioOutputStream.hxx
index 2369d6208..af6dd5f51 100644
--- a/src/fs/io/StdioOutputStream.hxx
+++ b/src/fs/io/StdioOutputStream.hxx
@@ -30,7 +30,6 @@
 #ifndef STDIO_OUTPUT_STREAM_HXX
 #define STDIO_OUTPUT_STREAM_HXX
 
-#include "check.h"
 #include "OutputStream.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/fs/io/TextFile.cxx b/src/fs/io/TextFile.cxx
index 5c87fe58a..55d448a8a 100644
--- a/src/fs/io/TextFile.cxx
+++ b/src/fs/io/TextFile.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TextFile.hxx"
 #include "FileReader.hxx"
 #include "AutoGunzipReader.hxx"
diff --git a/src/fs/io/TextFile.hxx b/src/fs/io/TextFile.hxx
index 172678de5..5b37afa24 100644
--- a/src/fs/io/TextFile.hxx
+++ b/src/fs/io/TextFile.hxx
@@ -20,8 +20,8 @@
 #ifndef MPD_TEXT_FILE_HXX
 #define MPD_TEXT_FILE_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
+#include "config.h"
 
 class Path;
 class FileReader;
diff --git a/src/input/AsyncInputStream.cxx b/src/input/AsyncInputStream.cxx
index e8a598555..63c2c472f 100644
--- a/src/input/AsyncInputStream.cxx
+++ b/src/input/AsyncInputStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "AsyncInputStream.hxx"
 #include "CondHandler.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/input/BufferedInputStream.cxx b/src/input/BufferedInputStream.cxx
index 1aa5fa09c..98cd5293c 100644
--- a/src/input/BufferedInputStream.cxx
+++ b/src/input/BufferedInputStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "BufferedInputStream.hxx"
 #include "thread/Cond.hxx"
 #include "thread/Name.hxx"
diff --git a/src/input/BufferedInputStream.hxx b/src/input/BufferedInputStream.hxx
index 2bed6b408..a04c9e9ae 100644
--- a/src/input/BufferedInputStream.hxx
+++ b/src/input/BufferedInputStream.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_BUFFERED_INPUT_STREAM_BUFFER_HXX
 #define MPD_BUFFERED_INPUT_STREAM_BUFFER_HXX
 
-#include "check.h"
 #include "InputStream.hxx"
 #include "Ptr.hxx"
 #include "Handler.hxx"
diff --git a/src/input/CondHandler.hxx b/src/input/CondHandler.hxx
index 70538d25d..3468ea68b 100644
--- a/src/input/CondHandler.hxx
+++ b/src/input/CondHandler.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_COND_INPUT_STREAM_HANDLER_HXX
 #define MPD_COND_INPUT_STREAM_HANDLER_HXX
 
-#include "check.h"
 #include "Handler.hxx"
 #include "thread/Cond.hxx"
 
diff --git a/src/input/Error.cxx b/src/input/Error.cxx
index b3f0e7e65..29194a74f 100644
--- a/src/input/Error.cxx
+++ b/src/input/Error.cxx
@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Error.hxx"
 #include "system/Error.hxx"
+#include "config.h"
 
 #ifdef ENABLE_CURL
 #include "lib/curl/Error.hxx"
diff --git a/src/input/Error.hxx b/src/input/Error.hxx
index 04ea27ab8..6fc2fc5d5 100644
--- a/src/input/Error.hxx
+++ b/src/input/Error.hxx
@@ -20,7 +20,6 @@
 #ifndef INPUT_ERROR_HXX
 #define INPUT_ERROR_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <exception>
diff --git a/src/input/Handler.hxx b/src/input/Handler.hxx
index 533e51518..b27b996da 100644
--- a/src/input/Handler.hxx
+++ b/src/input/Handler.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_INPUT_STREAM_HANDLER_HXX
 #define MPD_INPUT_STREAM_HANDLER_HXX
 
-#include "check.h"
-
 /**
  * An interface which gets receives events from an #InputStream.  Its
  * methods will be called from within an arbitrary thread and must not
diff --git a/src/input/IcyInputStream.cxx b/src/input/IcyInputStream.cxx
index 801a014c2..df87b7785 100644
--- a/src/input/IcyInputStream.cxx
+++ b/src/input/IcyInputStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "IcyInputStream.hxx"
 #include "IcyMetaDataParser.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/input/Init.cxx b/src/input/Init.cxx
index 6e628a475..3b714bf5c 100644
--- a/src/input/Init.cxx
+++ b/src/input/Init.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Init.hxx"
 #include "Registry.hxx"
 #include "InputPlugin.hxx"
diff --git a/src/input/InputStream.cxx b/src/input/InputStream.cxx
index 7e2c39ebc..b6433c5ae 100644
--- a/src/input/InputStream.cxx
+++ b/src/input/InputStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "InputStream.hxx"
 #include "Handler.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/input/InputStream.hxx b/src/input/InputStream.hxx
index 5e13d111d..4d012e91a 100644
--- a/src/input/InputStream.hxx
+++ b/src/input/InputStream.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_INPUT_STREAM_HXX
 #define MPD_INPUT_STREAM_HXX
 
-#include "check.h"
 #include "Offset.hxx"
 #include "Ptr.hxx"
 #include "thread/Mutex.hxx"
diff --git a/src/input/LocalOpen.cxx b/src/input/LocalOpen.cxx
index 26b02769c..2271d51fb 100644
--- a/src/input/LocalOpen.cxx
+++ b/src/input/LocalOpen.cxx
@@ -17,10 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LocalOpen.hxx"
 #include "InputStream.hxx"
 #include "plugins/FileInputPlugin.hxx"
+#include "config.h"
 
 #ifdef ENABLE_ARCHIVE
 #include "plugins/ArchiveInputPlugin.hxx"
diff --git a/src/input/LocalOpen.hxx b/src/input/LocalOpen.hxx
index 25c85f379..0b58f443f 100644
--- a/src/input/LocalOpen.hxx
+++ b/src/input/LocalOpen.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_INPUT_LOCAL_OPEN_HXX
 #define MPD_INPUT_LOCAL_OPEN_HXX
 
-#include "check.h"
 #include "Ptr.hxx"
 
 class Path;
diff --git a/src/input/MaybeBufferedInputStream.cxx b/src/input/MaybeBufferedInputStream.cxx
index dc9b801a3..1f46a819f 100644
--- a/src/input/MaybeBufferedInputStream.cxx
+++ b/src/input/MaybeBufferedInputStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MaybeBufferedInputStream.hxx"
 #include "BufferedInputStream.hxx"
 
diff --git a/src/input/MaybeBufferedInputStream.hxx b/src/input/MaybeBufferedInputStream.hxx
index 8e774729c..faf6eda5a 100644
--- a/src/input/MaybeBufferedInputStream.hxx
+++ b/src/input/MaybeBufferedInputStream.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_MAYBE_BUFFERED_INPUT_STREAM_BUFFER_HXX
 #define MPD_MAYBE_BUFFERED_INPUT_STREAM_BUFFER_HXX
 
-#include "check.h"
 #include "ProxyInputStream.hxx"
 
 /**
diff --git a/src/input/Offset.hxx b/src/input/Offset.hxx
index adb2cf3d2..beab0e227 100644
--- a/src/input/Offset.hxx
+++ b/src/input/Offset.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_OFFSET_HXX
 #define MPD_OFFSET_HXX
 
-#include "check.h"
-
 #include <stdint.h>
 
 /**
diff --git a/src/input/Open.cxx b/src/input/Open.cxx
index bbeb47bb7..1c948f8f3 100644
--- a/src/input/Open.cxx
+++ b/src/input/Open.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "InputStream.hxx"
 #include "Registry.hxx"
 #include "InputPlugin.hxx"
diff --git a/src/input/ProxyInputStream.cxx b/src/input/ProxyInputStream.cxx
index 8217ef962..0d9d808b8 100644
--- a/src/input/ProxyInputStream.cxx
+++ b/src/input/ProxyInputStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ProxyInputStream.hxx"
 #include "tag/Tag.hxx"
 
diff --git a/src/input/Reader.cxx b/src/input/Reader.cxx
index d6836a33c..346bd7ed6 100644
--- a/src/input/Reader.cxx
+++ b/src/input/Reader.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Reader.hxx"
 #include "InputStream.hxx"
 
diff --git a/src/input/Reader.hxx b/src/input/Reader.hxx
index 5b1f7b682..9573e0e15 100644
--- a/src/input/Reader.hxx
+++ b/src/input/Reader.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_INPUT_READER_HXX
 #define MPD_INPUT_READER_HXX
 
-#include "check.h"
 #include "fs/io/Reader.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/input/Registry.cxx b/src/input/Registry.cxx
index 463fd7cf0..15749b418 100644
--- a/src/input/Registry.cxx
+++ b/src/input/Registry.cxx
@@ -17,12 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Registry.hxx"
 #include "InputPlugin.hxx"
 #include "util/Macros.hxx"
 #include "plugins/TidalInputPlugin.hxx"
 #include "plugins/QobuzInputPlugin.hxx"
+#include "config.h"
 
 #ifdef ENABLE_ALSA
 #include "plugins/AlsaInputPlugin.hxx"
diff --git a/src/input/Registry.hxx b/src/input/Registry.hxx
index 7d907ba69..18921c0dc 100644
--- a/src/input/Registry.hxx
+++ b/src/input/Registry.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_INPUT_REGISTRY_HXX
 #define MPD_INPUT_REGISTRY_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 /**
diff --git a/src/input/RewindInputStream.cxx b/src/input/RewindInputStream.cxx
index b2bd1d606..98f2d1967 100644
--- a/src/input/RewindInputStream.cxx
+++ b/src/input/RewindInputStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "RewindInputStream.hxx"
 #include "ProxyInputStream.hxx"
 
diff --git a/src/input/RewindInputStream.hxx b/src/input/RewindInputStream.hxx
index ce7293ff6..397e1e032 100644
--- a/src/input/RewindInputStream.hxx
+++ b/src/input/RewindInputStream.hxx
@@ -27,7 +27,6 @@
 #ifndef MPD_REWIND_INPUT_STREAM_HXX
 #define MPD_REWIND_INPUT_STREAM_HXX
 
-#include "check.h"
 #include "Ptr.hxx"
 
 InputStreamPtr
diff --git a/src/input/ScanTags.cxx b/src/input/ScanTags.cxx
index df890b470..43f0670ea 100644
--- a/src/input/ScanTags.cxx
+++ b/src/input/ScanTags.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ScanTags.hxx"
 #include "RemoteTagScanner.hxx"
 #include "InputPlugin.hxx"
diff --git a/src/input/ScanTags.hxx b/src/input/ScanTags.hxx
index c7f1fe3d4..086adca1c 100644
--- a/src/input/ScanTags.hxx
+++ b/src/input/ScanTags.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_INPUT_SCAN_TAGS_HXX
 #define MPD_INPUT_SCAN_TAGS_HXX
 
-#include "check.h"
-
 #include <memory>
 
 class RemoteTagScanner;
diff --git a/src/input/TextInputStream.cxx b/src/input/TextInputStream.cxx
index c3c6aa30c..98f3f96a4 100644
--- a/src/input/TextInputStream.cxx
+++ b/src/input/TextInputStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TextInputStream.hxx"
 #include "InputStream.hxx"
 #include "util/TextFile.hxx"
diff --git a/src/input/ThreadInputStream.cxx b/src/input/ThreadInputStream.cxx
index 4d6f07878..aa38640c6 100644
--- a/src/input/ThreadInputStream.cxx
+++ b/src/input/ThreadInputStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ThreadInputStream.hxx"
 #include "CondHandler.hxx"
 #include "thread/Name.hxx"
diff --git a/src/input/ThreadInputStream.hxx b/src/input/ThreadInputStream.hxx
index 6c648fa7d..14b849238 100644
--- a/src/input/ThreadInputStream.hxx
+++ b/src/input/ThreadInputStream.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_THREAD_INPUT_STREAM_HXX
 #define MPD_THREAD_INPUT_STREAM_HXX
 
-#include "check.h"
 #include "InputStream.hxx"
 #include "thread/Thread.hxx"
 #include "thread/Cond.hxx"
diff --git a/src/input/plugins/AlsaInputPlugin.cxx b/src/input/plugins/AlsaInputPlugin.cxx
index 29578ebc8..4cdfdbbaf 100644
--- a/src/input/plugins/AlsaInputPlugin.cxx
+++ b/src/input/plugins/AlsaInputPlugin.cxx
@@ -24,7 +24,6 @@
  * http://alsamodular.sourceforge.net/alsa_programming_howto.html
  */
 
-#include "config.h"
 #include "AlsaInputPlugin.hxx"
 #include "lib/alsa/NonBlock.hxx"
 #include "../InputPlugin.hxx"
diff --git a/src/input/plugins/ArchiveInputPlugin.cxx b/src/input/plugins/ArchiveInputPlugin.cxx
index ba4948640..b7f12f74b 100644
--- a/src/input/plugins/ArchiveInputPlugin.cxx
+++ b/src/input/plugins/ArchiveInputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ArchiveInputPlugin.hxx"
 #include "archive/ArchiveDomain.hxx"
 #include "archive/ArchiveLookup.hxx"
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx
index b4144e919..74d28fde0 100644
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "CurlInputPlugin.hxx"
 #include "lib/curl/Error.hxx"
 #include "lib/curl/Easy.hxx"
diff --git a/src/input/plugins/FfmpegInputPlugin.cxx b/src/input/plugins/FfmpegInputPlugin.cxx
index 66ea5572a..09597e774 100644
--- a/src/input/plugins/FfmpegInputPlugin.cxx
+++ b/src/input/plugins/FfmpegInputPlugin.cxx
@@ -20,7 +20,6 @@
 /* necessary because libavutil/common.h uses UINT64_C */
 #define __STDC_CONSTANT_MACROS
 
-#include "config.h"
 #include "FfmpegInputPlugin.hxx"
 #include "lib/ffmpeg/Init.hxx"
 #include "lib/ffmpeg/Domain.hxx"
diff --git a/src/input/plugins/FileInputPlugin.cxx b/src/input/plugins/FileInputPlugin.cxx
index 6ff01ce39..989d3de74 100644
--- a/src/input/plugins/FileInputPlugin.cxx
+++ b/src/input/plugins/FileInputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "FileInputPlugin.hxx"
 #include "../InputStream.hxx"
 #include "../InputPlugin.hxx"
diff --git a/src/input/plugins/MmsInputPlugin.cxx b/src/input/plugins/MmsInputPlugin.cxx
index 17cd016e6..0d7de8f88 100644
--- a/src/input/plugins/MmsInputPlugin.cxx
+++ b/src/input/plugins/MmsInputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MmsInputPlugin.hxx"
 #include "input/ThreadInputStream.hxx"
 #include "input/InputPlugin.hxx"
diff --git a/src/input/plugins/NfsInputPlugin.cxx b/src/input/plugins/NfsInputPlugin.cxx
index c1c1f3264..8281c003d 100644
--- a/src/input/plugins/NfsInputPlugin.cxx
+++ b/src/input/plugins/NfsInputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "NfsInputPlugin.hxx"
 #include "../AsyncInputStream.hxx"
 #include "../InputPlugin.hxx"
diff --git a/src/input/plugins/QobuzClient.cxx b/src/input/plugins/QobuzClient.cxx
index 05bc666ba..5adcee5aa 100644
--- a/src/input/plugins/QobuzClient.cxx
+++ b/src/input/plugins/QobuzClient.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "QobuzClient.hxx"
 #include "lib/gcrypt/MD5.hxx"
 #include "util/ConstBuffer.hxx"
diff --git a/src/input/plugins/QobuzClient.hxx b/src/input/plugins/QobuzClient.hxx
index 4edcc2c5d..9bc3ab4d5 100644
--- a/src/input/plugins/QobuzClient.hxx
+++ b/src/input/plugins/QobuzClient.hxx
@@ -20,7 +20,6 @@
 #ifndef QOBUZ_CLIENT_HXX
 #define QOBUZ_CLIENT_HXX
 
-#include "check.h"
 #include "QobuzSession.hxx"
 #include "QobuzLoginRequest.hxx"
 #include "lib/curl/Init.hxx"
diff --git a/src/input/plugins/QobuzErrorParser.cxx b/src/input/plugins/QobuzErrorParser.cxx
index fb7cce509..69993b8b5 100644
--- a/src/input/plugins/QobuzErrorParser.cxx
+++ b/src/input/plugins/QobuzErrorParser.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "QobuzErrorParser.hxx"
 #include "lib/yajl/Callbacks.hxx"
 #include "util/ConstBuffer.hxx"
diff --git a/src/input/plugins/QobuzErrorParser.hxx b/src/input/plugins/QobuzErrorParser.hxx
index 35e3d8e7d..26dbd5529 100644
--- a/src/input/plugins/QobuzErrorParser.hxx
+++ b/src/input/plugins/QobuzErrorParser.hxx
@@ -20,7 +20,6 @@
 #ifndef QOBUZ_ERROR_PARSER_HXX
 #define QOBUZ_ERROR_PARSER_HXX
 
-#include "check.h"
 #include "lib/yajl/ResponseParser.hxx"
 
 #include <string>
diff --git a/src/input/plugins/QobuzInputPlugin.cxx b/src/input/plugins/QobuzInputPlugin.cxx
index d0717b345..31f60cb24 100644
--- a/src/input/plugins/QobuzInputPlugin.cxx
+++ b/src/input/plugins/QobuzInputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "QobuzInputPlugin.hxx"
 #include "QobuzClient.hxx"
 #include "QobuzTrackRequest.hxx"
diff --git a/src/input/plugins/QobuzLoginRequest.cxx b/src/input/plugins/QobuzLoginRequest.cxx
index 877e70b0c..b1f55515a 100644
--- a/src/input/plugins/QobuzLoginRequest.cxx
+++ b/src/input/plugins/QobuzLoginRequest.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "QobuzLoginRequest.hxx"
 #include "QobuzErrorParser.hxx"
 #include "QobuzSession.hxx"
diff --git a/src/input/plugins/QobuzLoginRequest.hxx b/src/input/plugins/QobuzLoginRequest.hxx
index cfc0ae2ef..d2e56fa31 100644
--- a/src/input/plugins/QobuzLoginRequest.hxx
+++ b/src/input/plugins/QobuzLoginRequest.hxx
@@ -20,7 +20,6 @@
 #ifndef QOBUZ_LOGIN_REQUEST_HXX
 #define QOBUZ_LOGIN_REQUEST_HXX
 
-#include "check.h"
 #include "lib/curl/Delegate.hxx"
 #include "lib/curl/Request.hxx"
 
diff --git a/src/input/plugins/QobuzTagScanner.cxx b/src/input/plugins/QobuzTagScanner.cxx
index ce01829b4..9d045d062 100644
--- a/src/input/plugins/QobuzTagScanner.cxx
+++ b/src/input/plugins/QobuzTagScanner.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "QobuzTagScanner.hxx"
 #include "QobuzErrorParser.hxx"
 #include "QobuzClient.hxx"
diff --git a/src/input/plugins/QobuzTagScanner.hxx b/src/input/plugins/QobuzTagScanner.hxx
index eae715da1..2fc3afdd1 100644
--- a/src/input/plugins/QobuzTagScanner.hxx
+++ b/src/input/plugins/QobuzTagScanner.hxx
@@ -20,7 +20,6 @@
 #ifndef QOBUZ_TAG_SCANNER
 #define QOBUZ_TAG_SCANNER
 
-#include "check.h"
 #include "lib/curl/Delegate.hxx"
 #include "lib/curl/Request.hxx"
 #include "input/RemoteTagScanner.hxx"
diff --git a/src/input/plugins/QobuzTrackRequest.cxx b/src/input/plugins/QobuzTrackRequest.cxx
index 3c83297d2..1667125cb 100644
--- a/src/input/plugins/QobuzTrackRequest.cxx
+++ b/src/input/plugins/QobuzTrackRequest.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "QobuzTrackRequest.hxx"
 #include "QobuzErrorParser.hxx"
 #include "QobuzClient.hxx"
diff --git a/src/input/plugins/QobuzTrackRequest.hxx b/src/input/plugins/QobuzTrackRequest.hxx
index 642f638c8..2f4a22fe3 100644
--- a/src/input/plugins/QobuzTrackRequest.hxx
+++ b/src/input/plugins/QobuzTrackRequest.hxx
@@ -20,7 +20,6 @@
 #ifndef QOBUZ_TRACK_REQUEST_HXX
 #define QOBUZ_TRACK_REQUEST_HXX
 
-#include "check.h"
 #include "lib/curl/Delegate.hxx"
 #include "lib/curl/Slist.hxx"
 #include "lib/curl/Request.hxx"
diff --git a/src/input/plugins/SmbclientInputPlugin.cxx b/src/input/plugins/SmbclientInputPlugin.cxx
index 42db9e084..4469dbab5 100644
--- a/src/input/plugins/SmbclientInputPlugin.cxx
+++ b/src/input/plugins/SmbclientInputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SmbclientInputPlugin.hxx"
 #include "lib/smbclient/Init.hxx"
 #include "lib/smbclient/Mutex.hxx"
diff --git a/src/input/plugins/TidalError.hxx b/src/input/plugins/TidalError.hxx
index 5c7d80886..eba4c9bec 100644
--- a/src/input/plugins/TidalError.hxx
+++ b/src/input/plugins/TidalError.hxx
@@ -20,8 +20,6 @@
 #ifndef TIDAL_ERROR_HXX
 #define TIDAL_ERROR_HXX
 
-#include "check.h"
-
 #include <stdexcept>
 
 /**
diff --git a/src/input/plugins/TidalErrorParser.cxx b/src/input/plugins/TidalErrorParser.cxx
index 0608d619d..9ef101844 100644
--- a/src/input/plugins/TidalErrorParser.cxx
+++ b/src/input/plugins/TidalErrorParser.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TidalErrorParser.hxx"
 #include "TidalError.hxx"
 #include "lib/yajl/Callbacks.hxx"
diff --git a/src/input/plugins/TidalErrorParser.hxx b/src/input/plugins/TidalErrorParser.hxx
index 9c59e5359..7a7fa9169 100644
--- a/src/input/plugins/TidalErrorParser.hxx
+++ b/src/input/plugins/TidalErrorParser.hxx
@@ -20,7 +20,6 @@
 #ifndef TIDAL_ERROR_PARSER_HXX
 #define TIDAL_ERROR_PARSER_HXX
 
-#include "check.h"
 #include "lib/yajl/ResponseParser.hxx"
 
 #include <string>
diff --git a/src/input/plugins/TidalInputPlugin.cxx b/src/input/plugins/TidalInputPlugin.cxx
index a94e94af0..95025954b 100644
--- a/src/input/plugins/TidalInputPlugin.cxx
+++ b/src/input/plugins/TidalInputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TidalInputPlugin.hxx"
 #include "TidalSessionManager.hxx"
 #include "TidalTrackRequest.hxx"
diff --git a/src/input/plugins/TidalLoginRequest.cxx b/src/input/plugins/TidalLoginRequest.cxx
index 515b0edb3..de93c1440 100644
--- a/src/input/plugins/TidalLoginRequest.cxx
+++ b/src/input/plugins/TidalLoginRequest.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TidalLoginRequest.hxx"
 #include "TidalErrorParser.hxx"
 #include "lib/curl/Form.hxx"
diff --git a/src/input/plugins/TidalLoginRequest.hxx b/src/input/plugins/TidalLoginRequest.hxx
index 022cf2dcf..3bedec576 100644
--- a/src/input/plugins/TidalLoginRequest.hxx
+++ b/src/input/plugins/TidalLoginRequest.hxx
@@ -20,7 +20,6 @@
 #ifndef TIDAL_LOGIN_REQUEST_HXX
 #define TIDAL_LOGIN_REQUEST_HXX
 
-#include "check.h"
 #include "lib/curl/Delegate.hxx"
 #include "lib/curl/Slist.hxx"
 #include "lib/curl/Request.hxx"
diff --git a/src/input/plugins/TidalSessionManager.cxx b/src/input/plugins/TidalSessionManager.cxx
index a5a49c8a8..48c4719d5 100644
--- a/src/input/plugins/TidalSessionManager.cxx
+++ b/src/input/plugins/TidalSessionManager.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TidalSessionManager.hxx"
 #include "lib/curl/Global.hxx"
 #include "util/Domain.hxx"
diff --git a/src/input/plugins/TidalSessionManager.hxx b/src/input/plugins/TidalSessionManager.hxx
index 25f6702a8..f5b4c9299 100644
--- a/src/input/plugins/TidalSessionManager.hxx
+++ b/src/input/plugins/TidalSessionManager.hxx
@@ -20,7 +20,6 @@
 #ifndef TIDAL_SESSION_MANAGER_HXX
 #define TIDAL_SESSION_MANAGER_HXX
 
-#include "check.h"
 #include "TidalLoginRequest.hxx"
 #include "lib/curl/Init.hxx"
 #include "thread/Mutex.hxx"
diff --git a/src/input/plugins/TidalTagScanner.cxx b/src/input/plugins/TidalTagScanner.cxx
index ce4340cc3..b0860729d 100644
--- a/src/input/plugins/TidalTagScanner.cxx
+++ b/src/input/plugins/TidalTagScanner.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TidalTagScanner.hxx"
 #include "TidalErrorParser.hxx"
 #include "lib/yajl/Callbacks.hxx"
diff --git a/src/input/plugins/TidalTagScanner.hxx b/src/input/plugins/TidalTagScanner.hxx
index eb7aa3234..7a6d7304e 100644
--- a/src/input/plugins/TidalTagScanner.hxx
+++ b/src/input/plugins/TidalTagScanner.hxx
@@ -20,7 +20,6 @@
 #ifndef TIDAL_TAG_SCANNER_HXX
 #define TIDAL_TAG_SCANNER_HXX
 
-#include "check.h"
 #include "lib/curl/Delegate.hxx"
 #include "lib/curl/Slist.hxx"
 #include "lib/curl/Request.hxx"
diff --git a/src/input/plugins/TidalTrackRequest.cxx b/src/input/plugins/TidalTrackRequest.cxx
index 5a54bddd5..97547fb06 100644
--- a/src/input/plugins/TidalTrackRequest.cxx
+++ b/src/input/plugins/TidalTrackRequest.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TidalTrackRequest.hxx"
 #include "TidalErrorParser.hxx"
 #include "lib/yajl/Callbacks.hxx"
diff --git a/src/input/plugins/TidalTrackRequest.hxx b/src/input/plugins/TidalTrackRequest.hxx
index fbd7bd780..382a334c0 100644
--- a/src/input/plugins/TidalTrackRequest.hxx
+++ b/src/input/plugins/TidalTrackRequest.hxx
@@ -20,7 +20,6 @@
 #ifndef TIDAL_TRACK_REQUEST_HXX
 #define TIDAL_TRACK_REQUEST_HXX
 
-#include "check.h"
 #include "lib/curl/Delegate.hxx"
 #include "lib/curl/Slist.hxx"
 #include "lib/curl/Request.hxx"
diff --git a/src/java/File.cxx b/src/java/File.cxx
index 20ee1b394..3c6764dba 100644
--- a/src/java/File.cxx
+++ b/src/java/File.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "File.hxx"
 #include "Class.hxx"
 #include "String.hxx"
diff --git a/src/lib/alsa/AllowedFormat.cxx b/src/lib/alsa/AllowedFormat.cxx
index 762d25f5d..daf874ec6 100644
--- 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>
 
diff --git a/src/lib/alsa/AllowedFormat.hxx b/src/lib/alsa/AllowedFormat.hxx
index 5dd6abb74..bc64ec709 100644
--- 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>
diff --git a/src/lib/alsa/Format.hxx b/src/lib/alsa/Format.hxx
index 23a434c7c..d0c6e14f1 100644
--- 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>
 
diff --git a/src/lib/alsa/HwSetup.cxx b/src/lib/alsa/HwSetup.cxx
index f65fbcf77..eae4ae32e 100644
--- 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");
 
diff --git a/src/lib/alsa/HwSetup.hxx b/src/lib/alsa/HwSetup.hxx
index 50c5991e7..b2b2fa23f 100644
--- 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>
diff --git a/src/lib/alsa/NonBlock.cxx b/src/lib/alsa/NonBlock.cxx
index 5b6667302..3f4a4adc0 100644
--- 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"
diff --git a/src/lib/alsa/NonBlock.hxx b/src/lib/alsa/NonBlock.hxx
index 8e9e2c7f2..6b9f8f940 100644
--- 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>
diff --git a/src/lib/alsa/PeriodBuffer.hxx b/src/lib/alsa/PeriodBuffer.hxx
index f9197a1ed..534ce7628 100644
--- 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>
diff --git a/src/lib/curl/Form.cxx b/src/lib/curl/Form.cxx
index bf2a3cb76..7e9d84753 100644
--- 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
diff --git a/src/lib/curl/Global.cxx b/src/lib/curl/Global.cxx
index 1195dc168..175cd8d98 100644
--- 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");
 
diff --git a/src/lib/curl/Init.cxx b/src/lib/curl/Init.cxx
index a8732577b..31b9b6744 100644
--- 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"
diff --git a/src/lib/curl/Init.hxx b/src/lib/curl/Init.hxx
index b15d62da5..b08196d86 100644
--- 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;
diff --git a/src/lib/dbus/Glue.cxx b/src/lib/dbus/Glue.cxx
index 3638e3c51..6aedd274e 100644
--- 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"
 
diff --git a/src/lib/dbus/Watch.cxx b/src/lib/dbus/Watch.cxx
index e707b4f90..a399836a7 100644
--- 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 {
diff --git a/src/lib/expat/ExpatParser.cxx b/src/lib/expat/ExpatParser.cxx
index 66cd66862..b4297b981 100644
--- 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"
 
diff --git a/src/lib/expat/ExpatParser.hxx b/src/lib/expat/ExpatParser.hxx
index b0568972e..cf4400d0f 100644
--- 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>
diff --git a/src/lib/expat/StreamExpatParser.cxx b/src/lib/expat/StreamExpatParser.cxx
index 13e9ecf12..20a1b1e4f 100644
--- 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"
 
diff --git a/src/lib/ffmpeg/Domain.cxx b/src/lib/ffmpeg/Domain.cxx
index 94de758cf..99b6696b5 100644
--- 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"
 
diff --git a/src/lib/ffmpeg/Error.cxx b/src/lib/ffmpeg/Error.cxx
index cf7084278..92770e0f7 100644
--- 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"
 
diff --git a/src/lib/ffmpeg/Init.cxx b/src/lib/ffmpeg/Init.cxx
index 1fbabe5f7..1f13a1a91 100644
--- 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"
 
diff --git a/src/lib/ffmpeg/LogCallback.cxx b/src/lib/ffmpeg/LogCallback.cxx
index 16f320146..f236b0eea 100644
--- 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"
diff --git a/src/lib/ffmpeg/LogCallback.hxx b/src/lib/ffmpeg/LogCallback.hxx
index 0d1d69776..e4d045107 100644
--- 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
diff --git a/src/lib/ffmpeg/LogError.cxx b/src/lib/ffmpeg/LogError.cxx
index 2afe9e2dc..ae2f2067d 100644
--- 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"
diff --git a/src/lib/icu/CaseFold.cxx b/src/lib/icu/CaseFold.cxx
index 46739fe64..c1b87ca49 100644
--- 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
 
diff --git a/src/lib/icu/CaseFold.hxx b/src/lib/icu/CaseFold.hxx
index 39338321c..828415b9b 100644
--- 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
diff --git a/src/lib/icu/Collate.cxx b/src/lib/icu/Collate.cxx
index 7d331e31d..baff5137a 100644
--- 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"
diff --git a/src/lib/icu/Collate.hxx b/src/lib/icu/Collate.hxx
index fc3a4f331..7ebecf52a 100644
--- 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"
 
 /**
diff --git a/src/lib/icu/Compare.cxx b/src/lib/icu/Compare.cxx
index 73a98d7bb..5af297404 100644
--- 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>
 
diff --git a/src/lib/icu/Compare.hxx b/src/lib/icu/Compare.hxx
index fa8c69bc2..5504b5d51 100644
--- 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"
 
diff --git a/src/lib/icu/Converter.cxx b/src/lib/icu/Converter.cxx
index 7537b2818..b03543a82 100644
--- 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>
 
diff --git a/src/lib/icu/Converter.hxx b/src/lib/icu/Converter.hxx
index 967c80842..97b41fafc 100644
--- 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"
diff --git a/src/lib/icu/Init.cxx b/src/lib/icu/Init.cxx
index 946636d44..af9fbb036 100644
--- 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"
diff --git a/src/lib/icu/Init.hxx b/src/lib/icu/Init.hxx
index 252b10c7c..3a8237677 100644
--- 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
 
diff --git a/src/lib/icu/Util.cxx b/src/lib/icu/Util.cxx
index 8b146efd3..7840734ce 100644
--- 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"
diff --git a/src/lib/icu/Util.hxx b/src/lib/icu/Util.hxx
index f1b332d09..4a38fb870 100644
--- 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;
diff --git a/src/lib/icu/Win32.cxx b/src/lib/icu/Win32.cxx
index 2f07f7004..bc9218609 100644
--- 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"
diff --git a/src/lib/icu/Win32.hxx b/src/lib/icu/Win32.hxx
index d1ea98912..82e2d7b0f 100644
--- 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>
diff --git a/src/lib/nfs/Base.cxx b/src/lib/nfs/Base.cxx
index 2ceef4387..3557c6d64 100644
--- 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>
diff --git a/src/lib/nfs/Base.hxx b/src/lib/nfs/Base.hxx
index 350d578fd..a50e78c41 100644
--- 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"
 
 /**
diff --git a/src/lib/nfs/Blocking.cxx b/src/lib/nfs/Blocking.cxx
index 423c3fba3..f3c5045be 100644
--- 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"
diff --git a/src/lib/nfs/Blocking.hxx b/src/lib/nfs/Blocking.hxx
index b7986eb1d..5ec913c12 100644
--- 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"
diff --git a/src/lib/nfs/Callback.hxx b/src/lib/nfs/Callback.hxx
index 7f018c378..eed981e41 100644
--- 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>
 
 /**
diff --git a/src/lib/nfs/Connection.cxx b/src/lib/nfs/Connection.cxx
index c636a6ff7..35c84b7de 100644
--- 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"
diff --git a/src/lib/nfs/FileReader.cxx b/src/lib/nfs/FileReader.cxx
index 4dfba90b9..b0f290a0a 100644
--- 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"
diff --git a/src/lib/nfs/FileReader.hxx b/src/lib/nfs/FileReader.hxx
index 75a1f3003..02697e097 100644
--- 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"
diff --git a/src/lib/nfs/Glue.cxx b/src/lib/nfs/Glue.cxx
index fed057c84..f0040ace7 100644
--- 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"
diff --git a/src/lib/nfs/Glue.hxx b/src/lib/nfs/Glue.hxx
index 515d9eb96..0f13eabf9 100644
--- 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;
diff --git a/src/lib/nfs/Lease.hxx b/src/lib/nfs/Lease.hxx
index 0fa68c69a..6d5ab101c 100644
--- 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 {
diff --git a/src/lib/nfs/Manager.cxx b/src/lib/nfs/Manager.cxx
index 42c18bca2..a4ebcc2ae 100644
--- 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"
diff --git a/src/lib/nfs/Manager.hxx b/src/lib/nfs/Manager.hxx
index 648645d0f..b23339e75 100644
--- 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"
diff --git a/src/lib/pulse/Domain.cxx b/src/lib/pulse/Domain.cxx
index f9fb6efcc..e8d3d5635 100644
--- 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"
 
diff --git a/src/lib/pulse/Error.cxx b/src/lib/pulse/Error.cxx
index a78035c36..f4791158d 100644
--- 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"
 
diff --git a/src/lib/pulse/LogError.cxx b/src/lib/pulse/LogError.cxx
index 1936916d8..bba291aee 100644
--- 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"
diff --git a/src/lib/smbclient/Domain.cxx b/src/lib/smbclient/Domain.cxx
index 3a1fe0161..2b9542d94 100644
--- 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"
 
diff --git a/src/lib/smbclient/Init.cxx b/src/lib/smbclient/Init.cxx
index 15448d438..37644487c 100644
--- 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"
diff --git a/src/lib/smbclient/Mutex.cxx b/src/lib/smbclient/Mutex.cxx
index c83971911..6ba6aaff3 100644
--- 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"
 
diff --git a/src/lib/systemd/Watchdog.cxx b/src/lib/systemd/Watchdog.cxx
index 5cba23636..c5feeac72 100644
--- 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>
diff --git a/src/lib/systemd/Watchdog.hxx b/src/lib/systemd/Watchdog.hxx
index 9a0a8ed94..6803f137a 100644
--- 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 {
diff --git a/src/lib/upnp/ClientInit.cxx b/src/lib/upnp/ClientInit.cxx
index 884f8d680..23ba9cade 100644
--- 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"
diff --git a/src/lib/upnp/ClientInit.hxx b/src/lib/upnp/ClientInit.hxx
index 14e4de197..52e18dee2 100644
--- 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
diff --git a/src/lib/upnp/ContentDirectoryService.cxx b/src/lib/upnp/ContentDirectoryService.cxx
index dbcf6a499..12b67e6a3 100644
--- 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"
diff --git a/src/lib/upnp/Device.cxx b/src/lib/upnp/Device.cxx
index a1c3a7d68..0d0c0c363 100644
--- 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"
diff --git a/src/lib/upnp/Discovery.cxx b/src/lib/upnp/Discovery.cxx
index 641da38de..facf94a10 100644
--- 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"
diff --git a/src/lib/upnp/Init.cxx b/src/lib/upnp/Init.cxx
index 2282244b5..7ad4d565a 100644
--- 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"
diff --git a/src/lib/upnp/Init.hxx b/src/lib/upnp/Init.hxx
index d0afe738b..641a766d5 100644
--- 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();
 
diff --git a/src/lib/xiph/FlacIOHandle.cxx b/src/lib/xiph/FlacIOHandle.cxx
index 5e2c43c92..8bf1979c9 100644
--- 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"
diff --git a/src/lib/xiph/FlacMetadataChain.cxx b/src/lib/xiph/FlacMetadataChain.cxx
index c20c79ef3..f47456618 100644
--- 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"
diff --git a/src/lib/xiph/FlacStreamMetadata.cxx b/src/lib/xiph/FlacStreamMetadata.cxx
index 7f00d0b77..cdd7ef99c 100644
--- 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"
diff --git a/src/lib/xiph/OggFind.cxx b/src/lib/xiph/OggFind.cxx
index f3d81118a..e31bd9514 100644
--- 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"
diff --git a/src/lib/xiph/OggFind.hxx b/src/lib/xiph/OggFind.hxx
index c4951b818..051237900 100644
--- 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>
diff --git a/src/lib/xiph/OggPacket.cxx b/src/lib/xiph/OggPacket.cxx
index 1a8a9d86a..a77d2ecc8 100644
--- 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"
diff --git a/src/lib/xiph/OggPacket.hxx b/src/lib/xiph/OggPacket.hxx
index c848e54e3..41e62eec8 100644
--- 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;
diff --git a/src/lib/xiph/OggPage.hxx b/src/lib/xiph/OggPage.hxx
index 3a278a323..76de9166f 100644
--- 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>
diff --git a/src/lib/xiph/OggStreamState.hxx b/src/lib/xiph/OggStreamState.hxx
index cb5db287f..6f4390bec 100644
--- 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>
diff --git a/src/lib/xiph/OggSyncState.cxx b/src/lib/xiph/OggSyncState.cxx
index abbecf727..58bde05c4 100644
--- 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"
 
diff --git a/src/lib/xiph/OggSyncState.hxx b/src/lib/xiph/OggSyncState.hxx
index 15c40fc00..12d6bddd2 100644
--- 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>
diff --git a/src/lib/xiph/OggVisitor.cxx b/src/lib/xiph/OggVisitor.cxx
index 265d20062..14ac666a0 100644
--- 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>
diff --git a/src/lib/xiph/OggVisitor.hxx b/src/lib/xiph/OggVisitor.hxx
index da6389584..4c5e3f14e 100644
--- 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"
 
diff --git a/src/lib/xiph/VorbisComment.hxx b/src/lib/xiph/VorbisComment.hxx
index 5a2577dba..336afa444 100644
--- 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>
 
 /**
diff --git a/src/lib/xiph/VorbisComments.cxx b/src/lib/xiph/VorbisComments.cxx
index 6cf62201b..4644327bd 100644
--- 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"
diff --git a/src/lib/xiph/VorbisComments.hxx b/src/lib/xiph/VorbisComments.hxx
index 0c6b176c2..2cca60849 100644
--- 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;
diff --git a/src/lib/xiph/XiphTags.cxx b/src/lib/xiph/XiphTags.cxx
index 8341d28b7..68a99a9bb 100644
--- 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[] = {
diff --git a/src/lib/xiph/XiphTags.hxx b/src/lib/xiph/XiphTags.hxx
index 3dba30682..396ab5bad 100644
--- 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[];
diff --git a/src/lib/yajl/ParseInputStream.cxx b/src/lib/yajl/ParseInputStream.cxx
index 1a81a1e7c..0e70674db 100644
--- 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"
diff --git a/src/lib/zlib/Error.cxx b/src/lib/zlib/Error.cxx
index 9adedd4db..64338a3ac 100644
--- 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>
diff --git a/src/mixer/MixerAll.cxx b/src/mixer/MixerAll.cxx
index f00cef616..2f77d3a25 100644
--- a/src/mixer/MixerAll.cxx
+++ b/src/mixer/MixerAll.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "output/MultipleOutputs.hxx"
 #include "MixerControl.hxx"
 #include "MixerInternal.hxx"
diff --git a/src/mixer/MixerControl.cxx b/src/mixer/MixerControl.cxx
index 94f30d1e2..ec4fc3e64 100644
--- a/src/mixer/MixerControl.cxx
+++ b/src/mixer/MixerControl.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MixerControl.hxx"
 #include "MixerInternal.hxx"
 
diff --git a/src/mixer/MixerType.cxx b/src/mixer/MixerType.cxx
index 7e73beb3c..8f835835f 100644
--- a/src/mixer/MixerType.cxx
+++ b/src/mixer/MixerType.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MixerType.hxx"
 
 #include <stdexcept>
diff --git a/src/mixer/Volume.cxx b/src/mixer/Volume.cxx
index b18f3b14a..fc6731a6a 100644
--- a/src/mixer/Volume.cxx
+++ b/src/mixer/Volume.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Volume.hxx"
 #include "output/MultipleOutputs.hxx"
 #include "Idle.hxx"
diff --git a/src/mixer/plugins/AlsaMixerPlugin.cxx b/src/mixer/plugins/AlsaMixerPlugin.cxx
index f6f8bf290..a197e807c 100644
--- a/src/mixer/plugins/AlsaMixerPlugin.cxx
+++ b/src/mixer/plugins/AlsaMixerPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "lib/alsa/NonBlock.hxx"
 #include "mixer/MixerInternal.hxx"
 #include "mixer/Listener.hxx"
diff --git a/src/mixer/plugins/HaikuMixerPlugin.cxx b/src/mixer/plugins/HaikuMixerPlugin.cxx
index e878454a2..9efef3854 100644
--- a/src/mixer/plugins/HaikuMixerPlugin.cxx
+++ b/src/mixer/plugins/HaikuMixerPlugin.cxx
@@ -20,7 +20,6 @@
  */
 
 
-#include "config.h"
 #include "mixer/MixerInternal.hxx"
 #include "output/plugins/HaikuOutputPlugin.hxx"
 #include "util/Compiler.h"
diff --git a/src/mixer/plugins/NullMixerPlugin.cxx b/src/mixer/plugins/NullMixerPlugin.cxx
index 8deeac7c3..2aa033d75 100644
--- a/src/mixer/plugins/NullMixerPlugin.cxx
+++ b/src/mixer/plugins/NullMixerPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mixer/MixerInternal.hxx"
 
 class NullMixer final : public Mixer {
diff --git a/src/mixer/plugins/OSXMixerPlugin.cxx b/src/mixer/plugins/OSXMixerPlugin.cxx
index 0fab290ea..3420511af 100644
--- a/src/mixer/plugins/OSXMixerPlugin.cxx
+++ b/src/mixer/plugins/OSXMixerPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mixer/MixerInternal.hxx"
 #include "output/plugins/OSXOutputPlugin.hxx"
 
diff --git a/src/mixer/plugins/OssMixerPlugin.cxx b/src/mixer/plugins/OssMixerPlugin.cxx
index 3ac1e59dd..a43ea9b6d 100644
--- a/src/mixer/plugins/OssMixerPlugin.cxx
+++ b/src/mixer/plugins/OssMixerPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mixer/MixerInternal.hxx"
 #include "config/Block.hxx"
 #include "system/FileDescriptor.hxx"
diff --git a/src/mixer/plugins/PulseMixerPlugin.cxx b/src/mixer/plugins/PulseMixerPlugin.cxx
index 308f9b892..f04369fe2 100644
--- a/src/mixer/plugins/PulseMixerPlugin.cxx
+++ b/src/mixer/plugins/PulseMixerPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PulseMixerPlugin.hxx"
 #include "lib/pulse/Domain.hxx"
 #include "lib/pulse/LogError.hxx"
diff --git a/src/mixer/plugins/SndioMixerPlugin.cxx b/src/mixer/plugins/SndioMixerPlugin.cxx
index f063e8892..ce5ee3cf1 100644
--- a/src/mixer/plugins/SndioMixerPlugin.cxx
+++ b/src/mixer/plugins/SndioMixerPlugin.cxx
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mixer/MixerInternal.hxx"
 #include "mixer/Listener.hxx"
 #include "output/plugins/SndioOutputPlugin.hxx"
diff --git a/src/mixer/plugins/SoftwareMixerPlugin.cxx b/src/mixer/plugins/SoftwareMixerPlugin.cxx
index 172d032ca..177c875d2 100644
--- a/src/mixer/plugins/SoftwareMixerPlugin.cxx
+++ b/src/mixer/plugins/SoftwareMixerPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SoftwareMixerPlugin.hxx"
 #include "mixer/MixerInternal.hxx"
 #include "filter/plugins/VolumeFilterPlugin.hxx"
diff --git a/src/mixer/plugins/WinmmMixerPlugin.cxx b/src/mixer/plugins/WinmmMixerPlugin.cxx
index 5656d2069..08e2b11b9 100644
--- a/src/mixer/plugins/WinmmMixerPlugin.cxx
+++ b/src/mixer/plugins/WinmmMixerPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mixer/MixerInternal.hxx"
 #include "output/OutputAPI.hxx"
 #include "output/plugins/WinmmOutputPlugin.hxx"
diff --git a/src/neighbor/Glue.cxx b/src/neighbor/Glue.cxx
index 09ae7b927..8438766d9 100644
--- a/src/neighbor/Glue.cxx
+++ b/src/neighbor/Glue.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Glue.hxx"
 #include "Registry.hxx"
 #include "Explorer.hxx"
diff --git a/src/neighbor/Glue.hxx b/src/neighbor/Glue.hxx
index 1e31074ab..bceb9522b 100644
--- a/src/neighbor/Glue.hxx
+++ b/src/neighbor/Glue.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_NEIGHBOR_ALL_HXX
 #define MPD_NEIGHBOR_ALL_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "thread/Mutex.hxx"
 
diff --git a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx
index 5ec400c6a..4ed196bef 100644
--- a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx
+++ b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SmbclientNeighborPlugin.hxx"
 #include "lib/smbclient/Init.hxx"
 #include "lib/smbclient/Domain.hxx"
diff --git a/src/neighbor/plugins/UdisksNeighborPlugin.cxx b/src/neighbor/plugins/UdisksNeighborPlugin.cxx
index 1137fe03c..bb6a70d51 100644
--- a/src/neighbor/plugins/UdisksNeighborPlugin.cxx
+++ b/src/neighbor/plugins/UdisksNeighborPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "UdisksNeighborPlugin.hxx"
 #include "lib/dbus/Connection.hxx"
 #include "lib/dbus/Error.hxx"
diff --git a/src/neighbor/plugins/UpnpNeighborPlugin.cxx b/src/neighbor/plugins/UpnpNeighborPlugin.cxx
index 8f2914b56..fe631ac47 100644
--- a/src/neighbor/plugins/UpnpNeighborPlugin.cxx
+++ b/src/neighbor/plugins/UpnpNeighborPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "UpnpNeighborPlugin.hxx"
 #include "lib/upnp/ClientInit.hxx"
 #include "lib/upnp/Discovery.hxx"
diff --git a/src/net/Features.hxx b/src/net/Features.hxx
index 59adb62c0..d90032a92 100644
--- a/src/net/Features.hxx
+++ b/src/net/Features.hxx
@@ -20,8 +20,7 @@
 #ifndef NET_FEATURES_HXX
 #define NET_FEATURES_HXX
 
-/* feature macros are defined in config.h, and this header verifies
-   that it has been included earlier */
-#include "check.h"
+/* feature macros are defined in config.h */
+#include "config.h"
 
 #endif
diff --git a/src/net/HostParser.cxx b/src/net/HostParser.cxx
index 11e5f30c4..3dd6bbec6 100644
--- a/src/net/HostParser.cxx
+++ b/src/net/HostParser.cxx
@@ -30,7 +30,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "HostParser.hxx"
 #include "util/CharUtil.hxx"
 
diff --git a/src/net/IPv4Address.cxx b/src/net/IPv4Address.cxx
index f14eccb13..42de7450a 100644
--- a/src/net/IPv4Address.cxx
+++ b/src/net/IPv4Address.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "IPv4Address.hxx"
 
 #include <assert.h>
diff --git a/src/net/IPv6Address.cxx b/src/net/IPv6Address.cxx
index 410259f82..d7861d3ec 100644
--- a/src/net/IPv6Address.cxx
+++ b/src/net/IPv6Address.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "IPv6Address.hxx"
 
 #include <assert.h>
diff --git a/src/net/Init.hxx b/src/net/Init.hxx
index 3058a7676..ef99e97c9 100644
--- a/src/net/Init.hxx
+++ b/src/net/Init.hxx
@@ -20,7 +20,6 @@
 #ifndef NET_INIT_HXX
 #define NET_INIT_HXX
 
-#include "check.h"
 #include "SocketError.hxx"
 
 #ifdef _WIN32
diff --git a/src/net/Resolver.cxx b/src/net/Resolver.cxx
index c5071104c..36769a904 100644
--- a/src/net/Resolver.cxx
+++ b/src/net/Resolver.cxx
@@ -30,7 +30,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "Resolver.hxx"
 #include "AddressInfo.hxx"
 #include "HostParser.hxx"
diff --git a/src/net/SocketDescriptor.hxx b/src/net/SocketDescriptor.hxx
index 2a4833dd0..3f0c284ae 100644
--- a/src/net/SocketDescriptor.hxx
+++ b/src/net/SocketDescriptor.hxx
@@ -30,6 +30,7 @@
 #ifndef SOCKET_DESCRIPTOR_HXX
 #define SOCKET_DESCRIPTOR_HXX
 
+#include "Features.hxx"
 #include "system/FileDescriptor.hxx"
 
 #include <type_traits>
diff --git a/src/net/SocketError.cxx b/src/net/SocketError.cxx
index 9d0c08301..4de9e4836 100644
--- a/src/net/SocketError.cxx
+++ b/src/net/SocketError.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SocketError.hxx"
 #include "util/Macros.hxx"
 
diff --git a/src/net/ToString.hxx b/src/net/ToString.hxx
index 3dbf3d45e..963f820f4 100644
--- a/src/net/ToString.hxx
+++ b/src/net/ToString.hxx
@@ -30,7 +30,6 @@
 #ifndef NET_TO_STRING_HXX
 #define NET_TO_STRING_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <string>
diff --git a/src/output/Client.hxx b/src/output/Client.hxx
index ae3f00a1e..a835928c8 100644
--- a/src/output/Client.hxx
+++ b/src/output/Client.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_OUTPUT_CLIENT_HXX
 #define MPD_OUTPUT_CLIENT_HXX
 
-#include "check.h"
-
 /**
  * An interface between the #AudioOutput and the #Player.
  */
diff --git a/src/output/Control.cxx b/src/output/Control.cxx
index 39812b165..45b1b6429 100644
--- a/src/output/Control.cxx
+++ b/src/output/Control.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Control.hxx"
 #include "Filtered.hxx"
 #include "Domain.hxx"
diff --git a/src/output/Defaults.cxx b/src/output/Defaults.cxx
index 53db168f0..cfa5093c5 100644
--- a/src/output/Defaults.cxx
+++ b/src/output/Defaults.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Defaults.hxx"
 #include "config/Data.hxx"
 #include "mixer/MixerType.hxx"
diff --git a/src/output/Defaults.hxx b/src/output/Defaults.hxx
index 3c839b450..a080b6703 100644
--- a/src/output/Defaults.hxx
+++ b/src/output/Defaults.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_AUDIO_OUTPUT_DEFAULTS_HXX
 #define MPD_AUDIO_OUTPUT_DEFAULTS_HXX
 
-#include "check.h"
 #include "mixer/MixerType.hxx"
 
 struct ConfigData;
diff --git a/src/output/Filtered.cxx b/src/output/Filtered.cxx
index 6a0fedb49..cbefcdbc9 100644
--- a/src/output/Filtered.cxx
+++ b/src/output/Filtered.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Filtered.hxx"
 #include "Interface.hxx"
 #include "Domain.hxx"
diff --git a/src/output/Finish.cxx b/src/output/Finish.cxx
index e7fb5b3d1..a023f1d68 100644
--- a/src/output/Finish.cxx
+++ b/src/output/Finish.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Filtered.hxx"
 #include "Interface.hxx"
 #include "mixer/MixerControl.hxx"
diff --git a/src/output/Init.cxx b/src/output/Init.cxx
index b791ae867..116d417c3 100644
--- a/src/output/Init.cxx
+++ b/src/output/Init.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Filtered.hxx"
 #include "Registry.hxx"
 #include "Domain.hxx"
diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx
index 31cc8e3f6..12c102618 100644
--- a/src/output/MultipleOutputs.cxx
+++ b/src/output/MultipleOutputs.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MultipleOutputs.hxx"
 #include "Filtered.hxx"
 #include "Defaults.hxx"
diff --git a/src/output/OutputCommand.cxx b/src/output/OutputCommand.cxx
index 830704dc4..c4ab66231 100644
--- a/src/output/OutputCommand.cxx
+++ b/src/output/OutputCommand.cxx
@@ -24,7 +24,6 @@
  *
  */
 
-#include "config.h"
 #include "OutputCommand.hxx"
 #include "MultipleOutputs.hxx"
 #include "Filtered.hxx"
diff --git a/src/output/OutputPlugin.cxx b/src/output/OutputPlugin.cxx
index 9846fa1e8..6475b6c9a 100644
--- a/src/output/OutputPlugin.cxx
+++ b/src/output/OutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "OutputPlugin.hxx"
 
 #include <assert.h>
diff --git a/src/output/Print.cxx b/src/output/Print.cxx
index f22093b93..8bd7f94c6 100644
--- a/src/output/Print.cxx
+++ b/src/output/Print.cxx
@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "Print.hxx"
 #include "MultipleOutputs.hxx"
 #include "Filtered.hxx"
diff --git a/src/output/SharedPipeConsumer.cxx b/src/output/SharedPipeConsumer.cxx
index 43bc06a0f..d74a69c4e 100644
--- a/src/output/SharedPipeConsumer.cxx
+++ b/src/output/SharedPipeConsumer.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SharedPipeConsumer.hxx"
 #include "MusicChunk.hxx"
 #include "MusicPipe.hxx"
diff --git a/src/output/SharedPipeConsumer.hxx b/src/output/SharedPipeConsumer.hxx
index 9761dbaba..43c2d105f 100644
--- a/src/output/SharedPipeConsumer.hxx
+++ b/src/output/SharedPipeConsumer.hxx
@@ -20,7 +20,6 @@
 #ifndef SHARED_PIPE_CONSUMER_HXX
 #define SHARED_PIPE_CONSUMER_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <assert.h>
diff --git a/src/output/Source.cxx b/src/output/Source.cxx
index 7c47ad40c..7c5098d8e 100644
--- a/src/output/Source.cxx
+++ b/src/output/Source.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Source.hxx"
 #include "MusicChunk.hxx"
 #include "filter/Filter.hxx"
diff --git a/src/output/Source.hxx b/src/output/Source.hxx
index 6c6a73db8..a2b04a8e4 100644
--- a/src/output/Source.hxx
+++ b/src/output/Source.hxx
@@ -20,7 +20,6 @@
 #ifndef AUDIO_OUTPUT_SOURCE_HXX
 #define AUDIO_OUTPUT_SOURCE_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "SharedPipeConsumer.hxx"
 #include "AudioFormat.hxx"
diff --git a/src/output/State.cxx b/src/output/State.cxx
index dfe4f1908..ada2353c9 100644
--- a/src/output/State.cxx
+++ b/src/output/State.cxx
@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "State.hxx"
 #include "MultipleOutputs.hxx"
 #include "Filtered.hxx"
diff --git a/src/output/Thread.cxx b/src/output/Thread.cxx
index 0d6f5e308..847a6642e 100644
--- a/src/output/Thread.cxx
+++ b/src/output/Thread.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Control.hxx"
 #include "Filtered.hxx"
 #include "Client.hxx"
diff --git a/src/output/Timer.cxx b/src/output/Timer.cxx
index 74a8af296..8fffa0462 100644
--- a/src/output/Timer.cxx
+++ b/src/output/Timer.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Timer.hxx"
 #include "AudioFormat.hxx"
 
diff --git a/src/output/plugins/AoOutputPlugin.cxx b/src/output/plugins/AoOutputPlugin.cxx
index b453b62e0..72ec94d22 100644
--- a/src/output/plugins/AoOutputPlugin.cxx
+++ b/src/output/plugins/AoOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "AoOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "thread/SafeSingleton.hxx"
diff --git a/src/output/plugins/FifoOutputPlugin.cxx b/src/output/plugins/FifoOutputPlugin.cxx
index cfe3c255e..e7c688357 100644
--- a/src/output/plugins/FifoOutputPlugin.cxx
+++ b/src/output/plugins/FifoOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FifoOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "../Timer.hxx"
diff --git a/src/output/plugins/HaikuOutputPlugin.cxx b/src/output/plugins/HaikuOutputPlugin.cxx
index 127a0f2ea..5d8cbf374 100644
--- a/src/output/plugins/HaikuOutputPlugin.cxx
+++ b/src/output/plugins/HaikuOutputPlugin.cxx
@@ -18,7 +18,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "HaikuOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "mixer/MixerList.hxx"
diff --git a/src/output/plugins/NullOutputPlugin.cxx b/src/output/plugins/NullOutputPlugin.cxx
index 454a7b4a6..fae9f24d6 100644
--- a/src/output/plugins/NullOutputPlugin.cxx
+++ b/src/output/plugins/NullOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "NullOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "../Timer.hxx"
diff --git a/src/output/plugins/OpenALOutputPlugin.cxx b/src/output/plugins/OpenALOutputPlugin.cxx
index 67778e44c..d832bae75 100644
--- a/src/output/plugins/OpenALOutputPlugin.cxx
+++ b/src/output/plugins/OpenALOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "OpenALOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "util/RuntimeError.hxx"
diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx
index 930a33144..26e8ff2a9 100644
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "OssOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "mixer/MixerList.hxx"
diff --git a/src/output/plugins/PipeOutputPlugin.cxx b/src/output/plugins/PipeOutputPlugin.cxx
index 7a556c023..2ad3d5ff6 100644
--- a/src/output/plugins/PipeOutputPlugin.cxx
+++ b/src/output/plugins/PipeOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PipeOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "system/Error.hxx"
diff --git a/src/output/plugins/PulseOutputPlugin.cxx b/src/output/plugins/PulseOutputPlugin.cxx
index 3e9df98b8..59fe9fb54 100644
--- a/src/output/plugins/PulseOutputPlugin.cxx
+++ b/src/output/plugins/PulseOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PulseOutputPlugin.hxx"
 #include "lib/pulse/Domain.hxx"
 #include "lib/pulse/Error.hxx"
diff --git a/src/output/plugins/RecorderOutputPlugin.cxx b/src/output/plugins/RecorderOutputPlugin.cxx
index 48757e6de..194aa080e 100644
--- a/src/output/plugins/RecorderOutputPlugin.cxx
+++ b/src/output/plugins/RecorderOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "RecorderOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "tag/Format.hxx"
diff --git a/src/output/plugins/ShoutOutputPlugin.cxx b/src/output/plugins/ShoutOutputPlugin.cxx
index 25999e5ed..df9df58e4 100644
--- a/src/output/plugins/ShoutOutputPlugin.cxx
+++ b/src/output/plugins/ShoutOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ShoutOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "encoder/EncoderInterface.hxx"
diff --git a/src/output/plugins/SndioOutputPlugin.cxx b/src/output/plugins/SndioOutputPlugin.cxx
index 3dbf815cf..2df3536c3 100644
--- a/src/output/plugins/SndioOutputPlugin.cxx
+++ b/src/output/plugins/SndioOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SndioOutputPlugin.hxx"
 #include "mixer/MixerList.hxx"
 #include "mixer/Listener.hxx"
diff --git a/src/output/plugins/SolarisOutputPlugin.cxx b/src/output/plugins/SolarisOutputPlugin.cxx
index 030712e4d..bb7cc56d6 100644
--- a/src/output/plugins/SolarisOutputPlugin.cxx
+++ b/src/output/plugins/SolarisOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SolarisOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "system/FileDescriptor.hxx"
diff --git a/src/output/plugins/WinmmOutputPlugin.cxx b/src/output/plugins/WinmmOutputPlugin.cxx
index a7d373fe8..c79b464f8 100644
--- a/src/output/plugins/WinmmOutputPlugin.cxx
+++ b/src/output/plugins/WinmmOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "WinmmOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "pcm/PcmBuffer.hxx"
diff --git a/src/output/plugins/WinmmOutputPlugin.hxx b/src/output/plugins/WinmmOutputPlugin.hxx
index 4a52cd5d5..7d51041e2 100644
--- a/src/output/plugins/WinmmOutputPlugin.hxx
+++ b/src/output/plugins/WinmmOutputPlugin.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_WINMM_OUTPUT_PLUGIN_HXX
 #define MPD_WINMM_OUTPUT_PLUGIN_HXX
 
-#include "check.h"
+#include "config.h"
 
 #ifdef ENABLE_WINMM_OUTPUT
 
diff --git a/src/output/plugins/httpd/HttpdClient.cxx b/src/output/plugins/httpd/HttpdClient.cxx
index d10620849..37a7746d4 100644
--- a/src/output/plugins/httpd/HttpdClient.cxx
+++ b/src/output/plugins/httpd/HttpdClient.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "HttpdClient.hxx"
 #include "HttpdInternal.hxx"
 #include "util/ASCII.hxx"
diff --git a/src/output/plugins/httpd/IcyMetaDataServer.cxx b/src/output/plugins/httpd/IcyMetaDataServer.cxx
index aaf94cdb3..10d908285 100644
--- a/src/output/plugins/httpd/IcyMetaDataServer.cxx
+++ b/src/output/plugins/httpd/IcyMetaDataServer.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "IcyMetaDataServer.hxx"
 #include "tag/Tag.hxx"
 #include "util/FormatString.hxx"
diff --git a/src/output/plugins/httpd/Page.cxx b/src/output/plugins/httpd/Page.cxx
index 0ce9032bb..b6120fced 100644
--- a/src/output/plugins/httpd/Page.cxx
+++ b/src/output/plugins/httpd/Page.cxx
@@ -17,12 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Page.hxx"
 
-#include <assert.h>
 #include <string.h>
-#include <stdlib.h>
 
 Page::Page(const void *data, size_t size)
 	:buffer(size)
diff --git a/src/output/plugins/sles/SlesOutputPlugin.cxx b/src/output/plugins/sles/SlesOutputPlugin.cxx
index f0024951a..3ebe08dfd 100644
--- a/src/output/plugins/sles/SlesOutputPlugin.cxx
+++ b/src/output/plugins/sles/SlesOutputPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SlesOutputPlugin.hxx"
 #include "Object.hxx"
 #include "Engine.hxx"
diff --git a/src/pcm/ChannelsConverter.cxx b/src/pcm/ChannelsConverter.cxx
index 21b2cd8dc..6c61ac033 100644
--- a/src/pcm/ChannelsConverter.cxx
+++ b/src/pcm/ChannelsConverter.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ChannelsConverter.hxx"
 #include "PcmChannels.hxx"
 #include "util/ConstBuffer.hxx"
diff --git a/src/pcm/ChannelsConverter.hxx b/src/pcm/ChannelsConverter.hxx
index a6203d0de..64914e094 100644
--- a/src/pcm/ChannelsConverter.hxx
+++ b/src/pcm/ChannelsConverter.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_PCM_CHANNELS_CONVERTER_HXX
 #define MPD_PCM_CHANNELS_CONVERTER_HXX
 
-#include "check.h"
 #include "SampleFormat.hxx"
 #include "PcmBuffer.hxx"
 
diff --git a/src/pcm/ConfiguredResampler.cxx b/src/pcm/ConfiguredResampler.cxx
index 14cada689..65131ab9d 100644
--- a/src/pcm/ConfiguredResampler.cxx
+++ b/src/pcm/ConfiguredResampler.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ConfiguredResampler.hxx"
 #include "FallbackResampler.hxx"
 #include "config/Data.hxx"
@@ -26,6 +25,7 @@
 #include "config/Block.hxx"
 #include "config/Param.hxx"
 #include "util/RuntimeError.hxx"
+#include "config.h"
 
 #ifdef ENABLE_LIBSAMPLERATE
 #include "LibsamplerateResampler.hxx"
diff --git a/src/pcm/ConfiguredResampler.hxx b/src/pcm/ConfiguredResampler.hxx
index 930177352..b07d123b5 100644
--- a/src/pcm/ConfiguredResampler.hxx
+++ b/src/pcm/ConfiguredResampler.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_CONFIGURED_RESAMPLER_HXX
 #define MPD_CONFIGURED_RESAMPLER_HXX
 
-#include "check.h"
-
 struct ConfigData;
 class PcmResampler;
 
diff --git a/src/pcm/Dsd16.cxx b/src/pcm/Dsd16.cxx
index 241479eae..c93845893 100644
--- a/src/pcm/Dsd16.cxx
+++ b/src/pcm/Dsd16.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Dsd16.hxx"
 #include "PcmBuffer.hxx"
 #include "util/ConstBuffer.hxx"
diff --git a/src/pcm/Dsd16.hxx b/src/pcm/Dsd16.hxx
index dfb510f85..b5550b4d4 100644
--- a/src/pcm/Dsd16.hxx
+++ b/src/pcm/Dsd16.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_PCM_DSD_16_HXX
 #define MPD_PCM_DSD_16_HXX
 
-#include "check.h"
-
 #include <stdint.h>
 
 template<typename T> struct ConstBuffer;
diff --git a/src/pcm/Dsd32.cxx b/src/pcm/Dsd32.cxx
index 64288b5d0..085654ade 100644
--- a/src/pcm/Dsd32.cxx
+++ b/src/pcm/Dsd32.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Dsd32.hxx"
 #include "PcmBuffer.hxx"
 #include "util/ConstBuffer.hxx"
diff --git a/src/pcm/Dsd32.hxx b/src/pcm/Dsd32.hxx
index 6cf2e0d72..32b50d2b3 100644
--- a/src/pcm/Dsd32.hxx
+++ b/src/pcm/Dsd32.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_PCM_DSD_32_HXX
 #define MPD_PCM_DSD_32_HXX
 
-#include "check.h"
-
 #include <stdint.h>
 
 template<typename T> struct ConstBuffer;
diff --git a/src/pcm/FallbackResampler.cxx b/src/pcm/FallbackResampler.cxx
index 027328ed9..1d6bbe276 100644
--- a/src/pcm/FallbackResampler.cxx
+++ b/src/pcm/FallbackResampler.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FallbackResampler.hxx"
 
 #include <assert.h>
diff --git a/src/pcm/FormatConverter.cxx b/src/pcm/FormatConverter.cxx
index 7d7d6c4ae..dca4ae495 100644
--- a/src/pcm/FormatConverter.cxx
+++ b/src/pcm/FormatConverter.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FormatConverter.hxx"
 #include "PcmFormat.hxx"
 #include "util/ConstBuffer.hxx"
diff --git a/src/pcm/FormatConverter.hxx b/src/pcm/FormatConverter.hxx
index 2267ffaab..be0fd1bbe 100644
--- a/src/pcm/FormatConverter.hxx
+++ b/src/pcm/FormatConverter.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_PCM_FORMAT_CONVERTER_HXX
 #define MPD_PCM_FORMAT_CONVERTER_HXX
 
-#include "check.h"
 #include "SampleFormat.hxx"
 #include "PcmBuffer.hxx"
 #include "PcmDither.hxx"
diff --git a/src/pcm/GlueResampler.cxx b/src/pcm/GlueResampler.cxx
index 03abe7a5c..83a32f134 100644
--- a/src/pcm/GlueResampler.cxx
+++ b/src/pcm/GlueResampler.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "GlueResampler.hxx"
 #include "ConfiguredResampler.hxx"
 #include "Resampler.hxx"
diff --git a/src/pcm/GlueResampler.hxx b/src/pcm/GlueResampler.hxx
index bdd24dda8..36d291161 100644
--- a/src/pcm/GlueResampler.hxx
+++ b/src/pcm/GlueResampler.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_GLUE_RESAMPLER_HXX
 #define MPD_GLUE_RESAMPLER_HXX
 
-#include "check.h"
 #include "AudioFormat.hxx"
 #include "FormatConverter.hxx"
 
diff --git a/src/pcm/Interleave.cxx b/src/pcm/Interleave.cxx
index cfc008815..6274111fa 100644
--- a/src/pcm/Interleave.cxx
+++ b/src/pcm/Interleave.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Interleave.hxx"
 
 #include <string.h>
diff --git a/src/pcm/Interleave.hxx b/src/pcm/Interleave.hxx
index 48f998cc1..84ab74b05 100644
--- a/src/pcm/Interleave.hxx
+++ b/src/pcm/Interleave.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_PCM_INTERLEAVE_HXX
 #define MPD_PCM_INTERLEAVE_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "util/ConstBuffer.hxx"
 
diff --git a/src/pcm/LibsamplerateResampler.cxx b/src/pcm/LibsamplerateResampler.cxx
index ea921651f..eaef5c67b 100644
--- a/src/pcm/LibsamplerateResampler.cxx
+++ b/src/pcm/LibsamplerateResampler.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LibsamplerateResampler.hxx"
 #include "config/Block.hxx"
 #include "util/ASCII.hxx"
diff --git a/src/pcm/Order.cxx b/src/pcm/Order.cxx
index e128b5a79..e728f0c9f 100644
--- a/src/pcm/Order.cxx
+++ b/src/pcm/Order.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Order.hxx"
 #include "PcmBuffer.hxx"
 #include "util/ConstBuffer.hxx"
diff --git a/src/pcm/Order.hxx b/src/pcm/Order.hxx
index 0c49aabc1..77010230c 100644
--- a/src/pcm/Order.hxx
+++ b/src/pcm/Order.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_PCM_ORDER_HXX
 #define MPD_PCM_ORDER_HXX
 
-#include "check.h"
 #include "SampleFormat.hxx"
 
 class PcmBuffer;
diff --git a/src/pcm/PcmBuffer.cxx b/src/pcm/PcmBuffer.cxx
index 22866772a..d4acd4833 100644
--- a/src/pcm/PcmBuffer.cxx
+++ b/src/pcm/PcmBuffer.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PcmBuffer.hxx"
 
 void *
diff --git a/src/pcm/PcmChannels.cxx b/src/pcm/PcmChannels.cxx
index 5dbd27f52..0a7380cd1 100644
--- a/src/pcm/PcmChannels.cxx
+++ b/src/pcm/PcmChannels.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PcmChannels.hxx"
 #include "PcmBuffer.hxx"
 #include "Silence.hxx"
diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/PcmConvert.cxx
index 7734774e7..dfe7cd204 100644
--- a/src/pcm/PcmConvert.cxx
+++ b/src/pcm/PcmConvert.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PcmConvert.hxx"
 #include "ConfiguredResampler.hxx"
 #include "util/ConstBuffer.hxx"
diff --git a/src/pcm/PcmConvert.hxx b/src/pcm/PcmConvert.hxx
index cedbb45d9..505ccefca 100644
--- a/src/pcm/PcmConvert.hxx
+++ b/src/pcm/PcmConvert.hxx
@@ -20,11 +20,11 @@
 #ifndef PCM_CONVERT_HXX
 #define PCM_CONVERT_HXX
 
-#include "check.h"
 #include "FormatConverter.hxx"
 #include "ChannelsConverter.hxx"
 #include "GlueResampler.hxx"
 #include "AudioFormat.hxx"
+#include "config.h"
 
 #ifdef ENABLE_DSD
 #include "PcmDsd.hxx"
diff --git a/src/pcm/PcmDither.cxx b/src/pcm/PcmDither.cxx
index f83d23955..4ddf85878 100644
--- a/src/pcm/PcmDither.cxx
+++ b/src/pcm/PcmDither.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PcmDither.hxx"
 #include "PcmPrng.hxx"
 #include "Traits.hxx"
diff --git a/src/pcm/PcmDop.cxx b/src/pcm/PcmDop.cxx
index a82d5302d..a0a6bdae6 100644
--- a/src/pcm/PcmDop.cxx
+++ b/src/pcm/PcmDop.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PcmDop.hxx"
 #include "PcmBuffer.hxx"
 #include "AudioFormat.hxx"
diff --git a/src/pcm/PcmDop.hxx b/src/pcm/PcmDop.hxx
index 3a7f12388..0a2c9b205 100644
--- a/src/pcm/PcmDop.hxx
+++ b/src/pcm/PcmDop.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_PCM_DOP_HXX
 #define MPD_PCM_DOP_HXX
 
-#include "check.h"
-
 #include <stdint.h>
 
 class PcmBuffer;
diff --git a/src/pcm/PcmDsd.cxx b/src/pcm/PcmDsd.cxx
index 855137fc0..ce161ea5b 100644
--- a/src/pcm/PcmDsd.cxx
+++ b/src/pcm/PcmDsd.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PcmDsd.hxx"
 #include "dsd2pcm/dsd2pcm.h"
 #include "util/ConstBuffer.hxx"
diff --git a/src/pcm/PcmDsd.hxx b/src/pcm/PcmDsd.hxx
index dbc7dfe48..a4d88ddfb 100644
--- a/src/pcm/PcmDsd.hxx
+++ b/src/pcm/PcmDsd.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_PCM_DSD_HXX
 #define MPD_PCM_DSD_HXX
 
-#include "check.h"
 #include "PcmBuffer.hxx"
 #include "AudioFormat.hxx"
 
diff --git a/src/pcm/PcmExport.cxx b/src/pcm/PcmExport.cxx
index 7d384cf31..7d2f18588 100644
--- a/src/pcm/PcmExport.cxx
+++ b/src/pcm/PcmExport.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PcmExport.hxx"
 #include "AudioFormat.hxx"
 #include "Order.hxx"
diff --git a/src/pcm/PcmExport.hxx b/src/pcm/PcmExport.hxx
index 9667a88fa..d47d1a8c9 100644
--- a/src/pcm/PcmExport.hxx
+++ b/src/pcm/PcmExport.hxx
@@ -20,9 +20,9 @@
 #ifndef PCM_EXPORT_HXX
 #define PCM_EXPORT_HXX
 
-#include "check.h"
 #include "SampleFormat.hxx"
 #include "PcmBuffer.hxx"
+#include "config.h"
 
 template<typename T> struct ConstBuffer;
 struct AudioFormat;
diff --git a/src/pcm/PcmFormat.cxx b/src/pcm/PcmFormat.cxx
index 29b73d05f..1ce48e929 100644
--- a/src/pcm/PcmFormat.cxx
+++ b/src/pcm/PcmFormat.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PcmFormat.hxx"
 #include "PcmBuffer.hxx"
 #include "Clamp.hxx"
diff --git a/src/pcm/PcmMix.cxx b/src/pcm/PcmMix.cxx
index 2c2002ddd..13f558d5e 100644
--- a/src/pcm/PcmMix.cxx
+++ b/src/pcm/PcmMix.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PcmMix.hxx"
 #include "Volume.hxx"
 #include "Clamp.hxx"
diff --git a/src/pcm/Silence.cxx b/src/pcm/Silence.cxx
index 0655160a4..6a8f0ffe2 100644
--- a/src/pcm/Silence.cxx
+++ b/src/pcm/Silence.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Silence.hxx"
 #include "Traits.hxx"
 #include "SampleFormat.hxx"
diff --git a/src/pcm/Silence.hxx b/src/pcm/Silence.hxx
index b35cc1214..38154fcae 100644
--- a/src/pcm/Silence.hxx
+++ b/src/pcm/Silence.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_PCM_SILENCE_HXX
 #define MPD_PCM_SILENCE_HXX
 
-#include "check.h"
-
 #include <stdint.h>
 
 template<typename T> struct WritableBuffer;
diff --git a/src/pcm/SoxrResampler.cxx b/src/pcm/SoxrResampler.cxx
index 2681737f2..411e79b43 100644
--- a/src/pcm/SoxrResampler.cxx
+++ b/src/pcm/SoxrResampler.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SoxrResampler.hxx"
 #include "AudioFormat.hxx"
 #include "config/Block.hxx"
diff --git a/src/pcm/Traits.hxx b/src/pcm/Traits.hxx
index 78cc4998b..9cb8f4b80 100644
--- a/src/pcm/Traits.hxx
+++ b/src/pcm/Traits.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_PCM_TRAITS_HXX
 #define MPD_PCM_TRAITS_HXX
 
-#include "check.h"
 #include "SampleFormat.hxx"
 
 #include <stdint.h>
diff --git a/src/pcm/Volume.cxx b/src/pcm/Volume.cxx
index f1a42430a..82f6ed4a4 100644
--- a/src/pcm/Volume.cxx
+++ b/src/pcm/Volume.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Volume.hxx"
 #include "Silence.hxx"
 #include "Traits.hxx"
diff --git a/src/player/Control.cxx b/src/player/Control.cxx
index 17c05cc2c..b2042f1e5 100644
--- a/src/player/Control.cxx
+++ b/src/player/Control.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Control.hxx"
 #include "Outputs.hxx"
 #include "Idle.hxx"
diff --git a/src/player/CrossFade.cxx b/src/player/CrossFade.cxx
index 0ab8bea05..72b3598bb 100644
--- a/src/player/CrossFade.cxx
+++ b/src/player/CrossFade.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "CrossFade.hxx"
 #include "Chrono.hxx"
 #include "MusicChunk.hxx"
diff --git a/src/player/Thread.cxx b/src/player/Thread.cxx
index 2b302443c..3e30fdf32 100644
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -35,7 +35,6 @@
  * #MusicChunk instances around in #MusicPipe objects.
  */
 
-#include "config.h"
 #include "Control.hxx"
 #include "Outputs.hxx"
 #include "Listener.hxx"
diff --git a/src/playlist/MemorySongEnumerator.cxx b/src/playlist/MemorySongEnumerator.cxx
index cab955c73..779573c1b 100644
--- a/src/playlist/MemorySongEnumerator.cxx
+++ b/src/playlist/MemorySongEnumerator.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MemorySongEnumerator.hxx"
 
 std::unique_ptr<DetachedSong>
diff --git a/src/playlist/PlaylistAny.cxx b/src/playlist/PlaylistAny.cxx
index eaa4308d0..2cf5bd020 100644
--- a/src/playlist/PlaylistAny.cxx
+++ b/src/playlist/PlaylistAny.cxx
@@ -17,12 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistAny.hxx"
 #include "PlaylistStream.hxx"
 #include "PlaylistMapper.hxx"
 #include "SongEnumerator.hxx"
 #include "util/UriUtil.hxx"
+#include "config.h"
 
 std::unique_ptr<SongEnumerator>
 playlist_open_any(const char *uri,
diff --git a/src/playlist/PlaylistAny.hxx b/src/playlist/PlaylistAny.hxx
index ea6f8d3d5..7edab66c3 100644
--- a/src/playlist/PlaylistAny.hxx
+++ b/src/playlist/PlaylistAny.hxx
@@ -20,6 +20,8 @@
 #ifndef MPD_PLAYLIST_ANY_HXX
 #define MPD_PLAYLIST_ANY_HXX
 
+#include "config.h"
+
 #include <memory>
 
 class Mutex;
diff --git a/src/playlist/PlaylistMapper.cxx b/src/playlist/PlaylistMapper.cxx
index e4bbafe89..236e81080 100644
--- a/src/playlist/PlaylistMapper.cxx
+++ b/src/playlist/PlaylistMapper.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistMapper.hxx"
 #include "PlaylistFile.hxx"
 #include "PlaylistStream.hxx"
diff --git a/src/playlist/PlaylistMapper.hxx b/src/playlist/PlaylistMapper.hxx
index 6e757f9c2..d4e5072f5 100644
--- a/src/playlist/PlaylistMapper.hxx
+++ b/src/playlist/PlaylistMapper.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_PLAYLIST_MAPPER_HXX
 #define MPD_PLAYLIST_MAPPER_HXX
 
-#include "check.h"
+#include "config.h"
 
 #include <memory>
 
diff --git a/src/playlist/PlaylistSong.cxx b/src/playlist/PlaylistSong.cxx
index 76e54b1be..7d63fe76c 100644
--- a/src/playlist/PlaylistSong.cxx
+++ b/src/playlist/PlaylistSong.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistSong.hxx"
 #include "SongLoader.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/playlist/PlaylistStream.cxx b/src/playlist/PlaylistStream.cxx
index d245b841d..96e285ce6 100644
--- a/src/playlist/PlaylistStream.cxx
+++ b/src/playlist/PlaylistStream.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistStream.hxx"
 #include "PlaylistRegistry.hxx"
 #include "SongEnumerator.hxx"
diff --git a/src/playlist/cue/CueParser.cxx b/src/playlist/cue/CueParser.cxx
index 83bb75cc0..024ff664a 100644
--- a/src/playlist/cue/CueParser.cxx
+++ b/src/playlist/cue/CueParser.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "CueParser.hxx"
 #include "tag/ParseName.hxx"
 #include "util/Alloc.hxx"
diff --git a/src/playlist/cue/CueParser.hxx b/src/playlist/cue/CueParser.hxx
index c61b392bc..fc5dc0bc7 100644
--- a/src/playlist/cue/CueParser.hxx
+++ b/src/playlist/cue/CueParser.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_CUE_PARSER_HXX
 #define MPD_CUE_PARSER_HXX
 
-#include "check.h"
 #include "song/DetachedSong.hxx"
 #include "tag/Builder.hxx"
 #include "util/Compiler.h"
diff --git a/src/playlist/plugins/AsxPlaylistPlugin.cxx b/src/playlist/plugins/AsxPlaylistPlugin.cxx
index 5c728cf7d..58c004b08 100644
--- a/src/playlist/plugins/AsxPlaylistPlugin.cxx
+++ b/src/playlist/plugins/AsxPlaylistPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "AsxPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
diff --git a/src/playlist/plugins/CuePlaylistPlugin.cxx b/src/playlist/plugins/CuePlaylistPlugin.cxx
index f46eb5429..5a391ecb2 100644
--- a/src/playlist/plugins/CuePlaylistPlugin.cxx
+++ b/src/playlist/plugins/CuePlaylistPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "CuePlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../SongEnumerator.hxx"
diff --git a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
index bbd010390..8484b3c70 100644
--- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
@@ -23,7 +23,6 @@
  * tag of a music file.
  */
 
-#include "config.h"
 #include "EmbeddedCuePlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../SongEnumerator.hxx"
diff --git a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
index 2c336e73d..841d1df1c 100644
--- a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
+++ b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ExtM3uPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../SongEnumerator.hxx"
diff --git a/src/playlist/plugins/FlacPlaylistPlugin.cxx b/src/playlist/plugins/FlacPlaylistPlugin.cxx
index 2b8d58ec7..cdaada6ae 100644
--- a/src/playlist/plugins/FlacPlaylistPlugin.cxx
+++ b/src/playlist/plugins/FlacPlaylistPlugin.cxx
@@ -23,7 +23,6 @@
  * tag of a music file.
  */
 
-#include "config.h"
 #include "FlacPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../SongEnumerator.hxx"
diff --git a/src/playlist/plugins/M3uPlaylistPlugin.cxx b/src/playlist/plugins/M3uPlaylistPlugin.cxx
index 3caf151d1..bf58543dd 100644
--- a/src/playlist/plugins/M3uPlaylistPlugin.cxx
+++ b/src/playlist/plugins/M3uPlaylistPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "M3uPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../SongEnumerator.hxx"
diff --git a/src/playlist/plugins/PlsPlaylistPlugin.cxx b/src/playlist/plugins/PlsPlaylistPlugin.cxx
index 79d3ee5b9..af48cd620 100644
--- a/src/playlist/plugins/PlsPlaylistPlugin.cxx
+++ b/src/playlist/plugins/PlsPlaylistPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlsPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
diff --git a/src/playlist/plugins/RssPlaylistPlugin.cxx b/src/playlist/plugins/RssPlaylistPlugin.cxx
index 5c93391fc..4761afd0c 100644
--- a/src/playlist/plugins/RssPlaylistPlugin.cxx
+++ b/src/playlist/plugins/RssPlaylistPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "RssPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
diff --git a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
index 4fe7b603c..1c3fc0cba 100644
--- a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
+++ b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SoundCloudPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
diff --git a/src/playlist/plugins/XspfPlaylistPlugin.cxx b/src/playlist/plugins/XspfPlaylistPlugin.cxx
index 1fb1b9661..b266830f9 100644
--- a/src/playlist/plugins/XspfPlaylistPlugin.cxx
+++ b/src/playlist/plugins/XspfPlaylistPlugin.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "XspfPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
diff --git a/src/protocol/Ack.cxx b/src/protocol/Ack.cxx
index 94b60913f..164538794 100644
--- a/src/protocol/Ack.cxx
+++ b/src/protocol/Ack.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Ack.hxx"
 #include "util/Domain.hxx"
 
diff --git a/src/protocol/ArgParser.cxx b/src/protocol/ArgParser.cxx
index b8b0c359b..b162c1984 100644
--- a/src/protocol/ArgParser.cxx
+++ b/src/protocol/ArgParser.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ArgParser.hxx"
 #include "RangeArg.hxx"
 #include "Ack.hxx"
diff --git a/src/protocol/ArgParser.hxx b/src/protocol/ArgParser.hxx
index d09f153c3..ba1a29271 100644
--- a/src/protocol/ArgParser.hxx
+++ b/src/protocol/ArgParser.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_PROTOCOL_ARGPARSER_HXX
 #define MPD_PROTOCOL_ARGPARSER_HXX
 
-#include "check.h"
-
 #include <stdint.h>
 
 struct RangeArg;
diff --git a/src/protocol/RangeArg.hxx b/src/protocol/RangeArg.hxx
index 9b1d720ac..2cc3c46e8 100644
--- a/src/protocol/RangeArg.hxx
+++ b/src/protocol/RangeArg.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_PROTOCOL_RANGE_ARG_HXX
 #define MPD_PROTOCOL_RANGE_ARG_HXX
 
-#include "check.h"
-
 #include <limits>
 
 struct RangeArg {
diff --git a/src/protocol/Result.cxx b/src/protocol/Result.cxx
index 5b18d4b67..0b4e9322b 100644
--- a/src/protocol/Result.cxx
+++ b/src/protocol/Result.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Result.hxx"
 #include "client/Client.hxx"
 
diff --git a/src/protocol/Result.hxx b/src/protocol/Result.hxx
index 97dabe384..0dd9d0efb 100644
--- a/src/protocol/Result.hxx
+++ b/src/protocol/Result.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_PROTOCOL_RESULT_HXX
 #define MPD_PROTOCOL_RESULT_HXX
 
-#include "check.h"
-
 class Client;
 
 void
diff --git a/src/queue/Playlist.cxx b/src/queue/Playlist.cxx
index 7f7ff70f1..401526d06 100644
--- a/src/queue/Playlist.cxx
+++ b/src/queue/Playlist.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Playlist.hxx"
 #include "Listener.hxx"
 #include "PlaylistError.hxx"
diff --git a/src/queue/Playlist.hxx b/src/queue/Playlist.hxx
index 69907e79f..1a435be3e 100644
--- a/src/queue/Playlist.hxx
+++ b/src/queue/Playlist.hxx
@@ -22,6 +22,7 @@
 
 #include "SingleMode.hxx"
 #include "queue/Queue.hxx"
+#include "config.h"
 
 enum TagType : uint8_t;
 struct Tag;
diff --git a/src/queue/PlaylistControl.cxx b/src/queue/PlaylistControl.cxx
index edc024b38..b9bbd3304 100644
--- a/src/queue/PlaylistControl.cxx
+++ b/src/queue/PlaylistControl.cxx
@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
 #include "player/Control.hxx"
diff --git a/src/queue/PlaylistEdit.cxx b/src/queue/PlaylistEdit.cxx
index 6236119b4..a0e504f44 100644
--- a/src/queue/PlaylistEdit.cxx
+++ b/src/queue/PlaylistEdit.cxx
@@ -23,7 +23,6 @@
  *
  */
 
-#include "config.h"
 #include "Playlist.hxx"
 #include "Listener.hxx"
 #include "PlaylistError.hxx"
diff --git a/src/queue/PlaylistState.cxx b/src/queue/PlaylistState.cxx
index 905deed71..f57409de0 100644
--- a/src/queue/PlaylistState.cxx
+++ b/src/queue/PlaylistState.cxx
@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "PlaylistState.hxx"
 #include "PlaylistError.hxx"
 #include "Playlist.hxx"
diff --git a/src/queue/PlaylistTag.cxx b/src/queue/PlaylistTag.cxx
index 7e0336504..739bd78d1 100644
--- a/src/queue/PlaylistTag.cxx
+++ b/src/queue/PlaylistTag.cxx
@@ -23,7 +23,6 @@
  *
  */
 
-#include "config.h"
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
 #include "song/DetachedSong.hxx"
diff --git a/src/queue/PlaylistUpdate.cxx b/src/queue/PlaylistUpdate.cxx
index 97d39a1a4..0558b9b67 100644
--- a/src/queue/PlaylistUpdate.cxx
+++ b/src/queue/PlaylistUpdate.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Playlist.hxx"
 #include "db/Interface.hxx"
 #include "song/LightSong.hxx"
diff --git a/src/queue/Queue.cxx b/src/queue/Queue.cxx
index 15e3fb7f1..c4d0aac2b 100644
--- a/src/queue/Queue.cxx
+++ b/src/queue/Queue.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Queue.hxx"
 #include "song/DetachedSong.hxx"
 
diff --git a/src/queue/QueuePrint.cxx b/src/queue/QueuePrint.cxx
index 3019e08ec..2f396dadc 100644
--- a/src/queue/QueuePrint.cxx
+++ b/src/queue/QueuePrint.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "QueuePrint.hxx"
 #include "Queue.hxx"
 #include "song/Filter.hxx"
diff --git a/src/queue/QueueSave.cxx b/src/queue/QueueSave.cxx
index 489293760..d78d8fd02 100644
--- a/src/queue/QueueSave.cxx
+++ b/src/queue/QueueSave.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "QueueSave.hxx"
 #include "Queue.hxx"
 #include "PlaylistError.hxx"
diff --git a/src/song/AndSongFilter.cxx b/src/song/AndSongFilter.cxx
index f0b9f86df..2600e2d25 100644
--- a/src/song/AndSongFilter.cxx
+++ b/src/song/AndSongFilter.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "AndSongFilter.hxx"
 
 ISongFilterPtr
diff --git a/src/song/BaseSongFilter.cxx b/src/song/BaseSongFilter.cxx
index 393a9f3be..f661fe27d 100644
--- a/src/song/BaseSongFilter.cxx
+++ b/src/song/BaseSongFilter.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "BaseSongFilter.hxx"
 #include "Escape.hxx"
 #include "LightSong.hxx"
diff --git a/src/song/DetachedSong.cxx b/src/song/DetachedSong.cxx
index f375d9281..9c6910378 100644
--- a/src/song/DetachedSong.cxx
+++ b/src/song/DetachedSong.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "song/DetachedSong.hxx"
 #include "song/LightSong.hxx"
 #include "util/UriUtil.hxx"
diff --git a/src/song/DetachedSong.hxx b/src/song/DetachedSong.hxx
index 657e6335b..14593d24e 100644
--- a/src/song/DetachedSong.hxx
+++ b/src/song/DetachedSong.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_DETACHED_SONG_HXX
 #define MPD_DETACHED_SONG_HXX
 
-#include "check.h"
 #include "tag/Tag.hxx"
 #include "Chrono.hxx"
 #include "util/Compiler.h"
diff --git a/src/song/ModifiedSinceSongFilter.cxx b/src/song/ModifiedSinceSongFilter.cxx
index d429e1150..ed14a31ad 100644
--- a/src/song/ModifiedSinceSongFilter.cxx
+++ b/src/song/ModifiedSinceSongFilter.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ModifiedSinceSongFilter.hxx"
 #include "LightSong.hxx"
 #include "util/TimeISO8601.hxx"
diff --git a/src/song/OptimizeFilter.cxx b/src/song/OptimizeFilter.cxx
index 81ab26572..7959a4ffc 100644
--- a/src/song/OptimizeFilter.cxx
+++ b/src/song/OptimizeFilter.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "OptimizeFilter.hxx"
 #include "AndSongFilter.hxx"
 #include "NotSongFilter.hxx"
diff --git a/src/song/StringFilter.cxx b/src/song/StringFilter.cxx
index ea3107f68..2f9c26039 100644
--- a/src/song/StringFilter.cxx
+++ b/src/song/StringFilter.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "StringFilter.hxx"
 #include "util/StringCompare.hxx"
 
diff --git a/src/song/StringFilter.hxx b/src/song/StringFilter.hxx
index b01a419a5..a1a281f3c 100644
--- a/src/song/StringFilter.hxx
+++ b/src/song/StringFilter.hxx
@@ -22,6 +22,7 @@
 
 #include "lib/icu/Compare.hxx"
 #include "util/Compiler.h"
+#include "config.h"
 
 #ifdef HAVE_PCRE
 #include "lib/pcre/UniqueRegex.hxx"
diff --git a/src/song/TagSongFilter.cxx b/src/song/TagSongFilter.cxx
index 99eb8252d..547172a4c 100644
--- a/src/song/TagSongFilter.cxx
+++ b/src/song/TagSongFilter.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagSongFilter.hxx"
 #include "Escape.hxx"
 #include "LightSong.hxx"
diff --git a/src/song/UriSongFilter.cxx b/src/song/UriSongFilter.cxx
index cd6ab84f2..537e4963e 100644
--- a/src/song/UriSongFilter.cxx
+++ b/src/song/UriSongFilter.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "UriSongFilter.hxx"
 #include "Escape.hxx"
 #include "LightSong.hxx"
diff --git a/src/sticker/SongSticker.cxx b/src/sticker/SongSticker.cxx
index 64f3f2219..06ef108c3 100644
--- a/src/sticker/SongSticker.cxx
+++ b/src/sticker/SongSticker.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongSticker.hxx"
 #include "StickerDatabase.hxx"
 #include "song/LightSong.hxx"
diff --git a/src/sticker/StickerDatabase.cxx b/src/sticker/StickerDatabase.cxx
index 108318a81..99aa32dda 100644
--- a/src/sticker/StickerDatabase.cxx
+++ b/src/sticker/StickerDatabase.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "StickerDatabase.hxx"
 #include "lib/sqlite/Util.hxx"
 #include "fs/Path.hxx"
diff --git a/src/sticker/StickerPrint.cxx b/src/sticker/StickerPrint.cxx
index 40bb9ca54..d1e2bafc1 100644
--- a/src/sticker/StickerPrint.cxx
+++ b/src/sticker/StickerPrint.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "StickerPrint.hxx"
 #include "StickerDatabase.hxx"
 #include "client/Response.hxx"
diff --git a/src/storage/CompositeStorage.cxx b/src/storage/CompositeStorage.cxx
index 824378f4a..40113af18 100644
--- a/src/storage/CompositeStorage.cxx
+++ b/src/storage/CompositeStorage.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "CompositeStorage.hxx"
 #include "FileInfo.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/storage/CompositeStorage.hxx b/src/storage/CompositeStorage.hxx
index 6d811fef6..cb5d49d6a 100644
--- a/src/storage/CompositeStorage.hxx
+++ b/src/storage/CompositeStorage.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_COMPOSITE_STORAGE_HXX
 #define MPD_COMPOSITE_STORAGE_HXX
 
-#include "check.h"
 #include "StorageInterface.hxx"
 #include "thread/Mutex.hxx"
 #include "util/Compiler.h"
diff --git a/src/storage/Configured.cxx b/src/storage/Configured.cxx
index b64d86a94..35ea17309 100644
--- a/src/storage/Configured.cxx
+++ b/src/storage/Configured.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Configured.hxx"
 #include "Registry.hxx"
 #include "StorageInterface.hxx"
diff --git a/src/storage/Configured.hxx b/src/storage/Configured.hxx
index 9fc07299d..ec1e3e774 100644
--- a/src/storage/Configured.hxx
+++ b/src/storage/Configured.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_STORAGE_CONFIG_HXX
 #define MPD_STORAGE_CONFIG_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <memory>
diff --git a/src/storage/FileInfo.hxx b/src/storage/FileInfo.hxx
index eb622ca7f..ea679ab87 100644
--- a/src/storage/FileInfo.hxx
+++ b/src/storage/FileInfo.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_STORAGE_FILE_INFO_HXX
 #define MPD_STORAGE_FILE_INFO_HXX
 
-#include "check.h"
-
 #include <chrono>
 
 #include <stdint.h>
diff --git a/src/storage/MemoryDirectoryReader.cxx b/src/storage/MemoryDirectoryReader.cxx
index 0887a4b93..65d9e83c4 100644
--- a/src/storage/MemoryDirectoryReader.cxx
+++ b/src/storage/MemoryDirectoryReader.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MemoryDirectoryReader.hxx"
 
 #include <assert.h>
diff --git a/src/storage/MemoryDirectoryReader.hxx b/src/storage/MemoryDirectoryReader.hxx
index d2a6812c0..6f7bc9e3f 100644
--- a/src/storage/MemoryDirectoryReader.hxx
+++ b/src/storage/MemoryDirectoryReader.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_STORAGE_MEMORY_DIRECTORY_READER_HXX
 #define MPD_STORAGE_MEMORY_DIRECTORY_READER_HXX
 
-#include "check.h"
 #include "StorageInterface.hxx"
 #include "FileInfo.hxx"
 
diff --git a/src/storage/Registry.cxx b/src/storage/Registry.cxx
index a80b06f04..45b5f7ab3 100644
--- a/src/storage/Registry.cxx
+++ b/src/storage/Registry.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Registry.hxx"
 #include "StoragePlugin.hxx"
 #include "StorageInterface.hxx"
@@ -26,6 +25,7 @@
 #include "plugins/SmbclientStorage.hxx"
 #include "plugins/NfsStorage.hxx"
 #include "plugins/CurlStorage.hxx"
+#include "config.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/storage/Registry.hxx b/src/storage/Registry.hxx
index 216bc92bf..8ee1301eb 100644
--- a/src/storage/Registry.hxx
+++ b/src/storage/Registry.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_STORAGE_REGISTRY_HXX
 #define MPD_STORAGE_REGISTRY_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <memory>
diff --git a/src/storage/StorageInterface.cxx b/src/storage/StorageInterface.cxx
index 95322746f..b1cb026b6 100644
--- a/src/storage/StorageInterface.cxx
+++ b/src/storage/StorageInterface.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "StorageInterface.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
diff --git a/src/storage/StorageInterface.hxx b/src/storage/StorageInterface.hxx
index 0abfea25e..80582fd87 100644
--- a/src/storage/StorageInterface.hxx
+++ b/src/storage/StorageInterface.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_STORAGE_INTERFACE_HXX
 #define MPD_STORAGE_INTERFACE_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <memory>
diff --git a/src/storage/StoragePlugin.hxx b/src/storage/StoragePlugin.hxx
index fda64bdc0..5726d188a 100644
--- a/src/storage/StoragePlugin.hxx
+++ b/src/storage/StoragePlugin.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_STORAGE_PLUGIN_HXX
 #define MPD_STORAGE_PLUGIN_HXX
 
-#include "check.h"
-
 #include <memory>
 
 class Storage;
diff --git a/src/storage/StorageState.cxx b/src/storage/StorageState.cxx
index e056bc2a7..c26ca2104 100644
--- a/src/storage/StorageState.cxx
+++ b/src/storage/StorageState.cxx
@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "StorageState.hxx"
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
diff --git a/src/storage/plugins/CurlStorage.cxx b/src/storage/plugins/CurlStorage.cxx
index 37d00b6c7..b8ec0c78b 100644
--- a/src/storage/plugins/CurlStorage.cxx
+++ b/src/storage/plugins/CurlStorage.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "CurlStorage.hxx"
 #include "storage/StoragePlugin.hxx"
 #include "storage/StorageInterface.hxx"
diff --git a/src/storage/plugins/CurlStorage.hxx b/src/storage/plugins/CurlStorage.hxx
index de63ef595..9909d972d 100644
--- a/src/storage/plugins/CurlStorage.hxx
+++ b/src/storage/plugins/CurlStorage.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_STORAGE_CURL_HXX
 #define MPD_STORAGE_CURL_HXX
 
-#include "check.h"
-
 struct StoragePlugin;
 
 extern const StoragePlugin curl_storage_plugin;
diff --git a/src/storage/plugins/LocalStorage.cxx b/src/storage/plugins/LocalStorage.cxx
index b5daa2ae8..562e0937a 100644
--- a/src/storage/plugins/LocalStorage.cxx
+++ b/src/storage/plugins/LocalStorage.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LocalStorage.hxx"
 #include "storage/StoragePlugin.hxx"
 #include "storage/StorageInterface.hxx"
diff --git a/src/storage/plugins/LocalStorage.hxx b/src/storage/plugins/LocalStorage.hxx
index 713ae0605..a239ef5bc 100644
--- a/src/storage/plugins/LocalStorage.hxx
+++ b/src/storage/plugins/LocalStorage.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_STORAGE_LOCAL_HXX
 #define MPD_STORAGE_LOCAL_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <memory>
diff --git a/src/storage/plugins/NfsStorage.cxx b/src/storage/plugins/NfsStorage.cxx
index 563bf9249..346f9e6c2 100644
--- a/src/storage/plugins/NfsStorage.cxx
+++ b/src/storage/plugins/NfsStorage.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "NfsStorage.hxx"
 #include "storage/StoragePlugin.hxx"
 #include "storage/StorageInterface.hxx"
diff --git a/src/storage/plugins/NfsStorage.hxx b/src/storage/plugins/NfsStorage.hxx
index 6164da40e..e549098b9 100644
--- a/src/storage/plugins/NfsStorage.hxx
+++ b/src/storage/plugins/NfsStorage.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_STORAGE_NFS_HXX
 #define MPD_STORAGE_NFS_HXX
 
-#include "check.h"
-
 struct StoragePlugin;
 
 extern const StoragePlugin nfs_storage_plugin;
diff --git a/src/storage/plugins/SmbclientStorage.cxx b/src/storage/plugins/SmbclientStorage.cxx
index 07e29e19c..0324bf219 100644
--- a/src/storage/plugins/SmbclientStorage.cxx
+++ b/src/storage/plugins/SmbclientStorage.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SmbclientStorage.hxx"
 #include "storage/StoragePlugin.hxx"
 #include "storage/StorageInterface.hxx"
diff --git a/src/storage/plugins/SmbclientStorage.hxx b/src/storage/plugins/SmbclientStorage.hxx
index 6609d2296..bf7db5f84 100644
--- a/src/storage/plugins/SmbclientStorage.hxx
+++ b/src/storage/plugins/SmbclientStorage.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_STORAGE_SMBCLIENT_HXX
 #define MPD_STORAGE_SMBCLIENT_HXX
 
-#include "check.h"
-
 struct StoragePlugin;
 
 extern const StoragePlugin smbclient_storage_plugin;
diff --git a/src/storage/plugins/UdisksStorage.cxx b/src/storage/plugins/UdisksStorage.cxx
index 793781a7d..135489032 100644
--- a/src/storage/plugins/UdisksStorage.cxx
+++ b/src/storage/plugins/UdisksStorage.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "UdisksStorage.hxx"
 #include "LocalStorage.hxx"
 #include "storage/StoragePlugin.hxx"
diff --git a/src/storage/plugins/UdisksStorage.hxx b/src/storage/plugins/UdisksStorage.hxx
index 3e3562f4c..eac89536b 100644
--- a/src/storage/plugins/UdisksStorage.hxx
+++ b/src/storage/plugins/UdisksStorage.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_STORAGE_UDISKS_HXX
 #define MPD_STORAGE_UDISKS_HXX
 
-#include "check.h"
-
 struct StoragePlugin;
 
 extern const StoragePlugin udisks_storage_plugin;
diff --git a/src/system/EpollFD.cxx b/src/system/EpollFD.cxx
index c06699527..a2e1449f2 100644
--- a/src/system/EpollFD.cxx
+++ b/src/system/EpollFD.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "EpollFD.hxx"
 #include "Error.hxx"
 
diff --git a/src/system/EpollFD.hxx b/src/system/EpollFD.hxx
index 646af3f7f..ec9383a8d 100644
--- a/src/system/EpollFD.hxx
+++ b/src/system/EpollFD.hxx
@@ -30,7 +30,6 @@
 #ifndef EPOLL_FD_HXX
 #define EPOLL_FD_HXX
 
-#include "check.h"
 #include "UniqueFileDescriptor.hxx"
 
 #include <assert.h>
diff --git a/src/system/EventFD.cxx b/src/system/EventFD.cxx
index 8aeb0421c..82e6ed4e3 100644
--- a/src/system/EventFD.cxx
+++ b/src/system/EventFD.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "EventFD.hxx"
 #include "system/Error.hxx"
 #include "util/Compiler.h"
diff --git a/src/system/EventFD.hxx b/src/system/EventFD.hxx
index 1438d2ef8..79d1af0c7 100644
--- a/src/system/EventFD.hxx
+++ b/src/system/EventFD.hxx
@@ -30,7 +30,6 @@
 #ifndef EVENT_FD_HXX
 #define EVENT_FD_HXX
 
-#include "check.h"
 #include "UniqueFileDescriptor.hxx"
 
 /**
diff --git a/src/system/EventPipe.cxx b/src/system/EventPipe.cxx
index facaeea69..6d2be2a53 100644
--- a/src/system/EventPipe.cxx
+++ b/src/system/EventPipe.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "EventPipe.hxx"
 #include "FileDescriptor.hxx"
 #include "system/Error.hxx"
diff --git a/src/system/EventPipe.hxx b/src/system/EventPipe.hxx
index f798a47ea..0c206e608 100644
--- a/src/system/EventPipe.hxx
+++ b/src/system/EventPipe.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_EVENT_PIPE_HXX
 #define MPD_EVENT_PIPE_HXX
 
-#include "check.h"
-
 /**
  * A pipe that can be used to trigger an event to the read side.
  *
diff --git a/src/system/FatalError.cxx b/src/system/FatalError.cxx
index 43550020c..b846dc830 100644
--- a/src/system/FatalError.cxx
+++ b/src/system/FatalError.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FatalError.hxx"
 #include "util/Domain.hxx"
 #include "LogV.hxx"
diff --git a/src/system/FatalError.hxx b/src/system/FatalError.hxx
index 808658d01..eecb0b3cc 100644
--- a/src/system/FatalError.hxx
+++ b/src/system/FatalError.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_FATAL_ERROR_HXX
 #define MPD_FATAL_ERROR_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #ifdef _WIN32
diff --git a/src/system/FileDescriptor.cxx b/src/system/FileDescriptor.cxx
index 719812294..51a57512b 100644
--- a/src/system/FileDescriptor.cxx
+++ b/src/system/FileDescriptor.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "FileDescriptor.hxx"
 
 #include <assert.h>
diff --git a/src/system/FileDescriptor.hxx b/src/system/FileDescriptor.hxx
index 08d11cc43..11e32caf3 100644
--- a/src/system/FileDescriptor.hxx
+++ b/src/system/FileDescriptor.hxx
@@ -30,7 +30,6 @@
 #ifndef FILE_DESCRIPTOR_HXX
 #define FILE_DESCRIPTOR_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <utility>
diff --git a/src/system/Open.cxx b/src/system/Open.cxx
index 193e50ccf..ab8008c38 100644
--- a/src/system/Open.cxx
+++ b/src/system/Open.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "Open.hxx"
 #include "Error.hxx"
 #include "UniqueFileDescriptor.hxx"
diff --git a/src/system/SignalFD.cxx b/src/system/SignalFD.cxx
index 62af45549..7b0634b22 100644
--- a/src/system/SignalFD.cxx
+++ b/src/system/SignalFD.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "SignalFD.hxx"
 #include "Error.hxx"
 
diff --git a/src/system/SignalFD.hxx b/src/system/SignalFD.hxx
index 5d806f6f0..6c6347283 100644
--- a/src/system/SignalFD.hxx
+++ b/src/system/SignalFD.hxx
@@ -30,7 +30,6 @@
 #ifndef SIGNAL_FD_HXX
 #define SIGNAL_FD_HXX
 
-#include "check.h"
 #include "UniqueFileDescriptor.hxx"
 
 #include <signal.h>
diff --git a/src/tag/Aiff.cxx b/src/tag/Aiff.cxx
index 2c090af4c..57ec343d5 100644
--- a/src/tag/Aiff.cxx
+++ b/src/tag/Aiff.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "Aiff.hxx"
 #include "input/InputStream.hxx"
 #include "system/ByteOrder.hxx"
diff --git a/src/tag/ApeLoader.cxx b/src/tag/ApeLoader.cxx
index 7eb303ccf..88556cd4b 100644
--- a/src/tag/ApeLoader.cxx
+++ b/src/tag/ApeLoader.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ApeLoader.hxx"
 #include "system/ByteOrder.hxx"
 #include "input/InputStream.hxx"
diff --git a/src/tag/ApeLoader.hxx b/src/tag/ApeLoader.hxx
index 8d83b1113..ec8e0a182 100644
--- a/src/tag/ApeLoader.hxx
+++ b/src/tag/ApeLoader.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_APE_LOADER_HXX
 #define MPD_APE_LOADER_HXX
 
-#include "check.h"
-
 #include <functional>
 
 struct StringView;
diff --git a/src/tag/ApeReplayGain.cxx b/src/tag/ApeReplayGain.cxx
index 7f77ecd33..e5ec04721 100644
--- a/src/tag/ApeReplayGain.cxx
+++ b/src/tag/ApeReplayGain.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ApeReplayGain.hxx"
 #include "ApeLoader.hxx"
 #include "ReplayGain.hxx"
diff --git a/src/tag/ApeReplayGain.hxx b/src/tag/ApeReplayGain.hxx
index 9b1c2f1f0..8d12d0a0d 100644
--- a/src/tag/ApeReplayGain.hxx
+++ b/src/tag/ApeReplayGain.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_APE_REPLAY_GAIN_HXX
 #define MPD_APE_REPLAY_GAIN_HXX
 
-#include "check.h"
-
 class InputStream;
 struct ReplayGainInfo;
 
diff --git a/src/tag/ApeTag.cxx b/src/tag/ApeTag.cxx
index 68ee9100c..b05162f23 100644
--- a/src/tag/ApeTag.cxx
+++ b/src/tag/ApeTag.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ApeTag.hxx"
 #include "ApeLoader.hxx"
 #include "ParseName.hxx"
diff --git a/src/tag/Builder.cxx b/src/tag/Builder.cxx
index 38c7f501c..3a1d877c9 100644
--- a/src/tag/Builder.cxx
+++ b/src/tag/Builder.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Builder.hxx"
 #include "Settings.hxx"
 #include "Pool.hxx"
diff --git a/src/tag/Config.cxx b/src/tag/Config.cxx
index 247b80df4..571676d2d 100644
--- a/src/tag/Config.cxx
+++ b/src/tag/Config.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Config.hxx"
 #include "Settings.hxx"
 #include "ParseName.hxx"
diff --git a/src/tag/FixString.cxx b/src/tag/FixString.cxx
index 64b6aa1a1..598df98b8 100644
--- a/src/tag/FixString.cxx
+++ b/src/tag/FixString.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "FixString.hxx"
 #include "util/Alloc.hxx"
 #include "util/WritableBuffer.hxx"
diff --git a/src/tag/FixString.hxx b/src/tag/FixString.hxx
index 8fc57ae38..d688786e5 100644
--- a/src/tag/FixString.hxx
+++ b/src/tag/FixString.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_TAG_STRING_HXX
 #define MPD_TAG_STRING_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 struct StringView;
diff --git a/src/tag/Format.cxx b/src/tag/Format.cxx
index c14682ca0..a86e4643e 100644
--- a/src/tag/Format.cxx
+++ b/src/tag/Format.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Format.hxx"
 #include "Tag.hxx"
 #include "ParseName.hxx"
diff --git a/src/tag/Format.hxx b/src/tag/Format.hxx
index 2a4fc3829..0028881c6 100644
--- a/src/tag/Format.hxx
+++ b/src/tag/Format.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_TAG_FORMAT_HXX
 #define MPD_TAG_FORMAT_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 struct Tag;
diff --git a/src/tag/Generic.cxx b/src/tag/Generic.cxx
index 80fc7398d..5cca3e489 100644
--- a/src/tag/Generic.cxx
+++ b/src/tag/Generic.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Generic.hxx"
 #include "Id3Scan.hxx"
 #include "ApeTag.hxx"
@@ -26,6 +25,7 @@
 #include "input/InputStream.hxx"
 #include "input/LocalOpen.hxx"
 #include "Log.hxx"
+#include "config.h"
 
 #include <exception>
 
diff --git a/src/tag/Generic.hxx b/src/tag/Generic.hxx
index 19fb7ca5b..3f7deb1c3 100644
--- a/src/tag/Generic.hxx
+++ b/src/tag/Generic.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_GENERIC_HXX
 #define MPD_TAG_GENERIC_HXX
 
-#include "check.h"
-
 class TagHandler;
 class InputStream;
 class Path;
diff --git a/src/tag/Handler.cxx b/src/tag/Handler.cxx
index 8747c908f..fb328fda6 100644
--- a/src/tag/Handler.cxx
+++ b/src/tag/Handler.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Handler.hxx"
 #include "Builder.hxx"
 #include "AudioFormat.hxx"
diff --git a/src/tag/Handler.hxx b/src/tag/Handler.hxx
index 24f68e380..f03ac4af8 100644
--- a/src/tag/Handler.hxx
+++ b/src/tag/Handler.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_TAG_HANDLER_HXX
 #define MPD_TAG_HANDLER_HXX
 
-#include "check.h"
 #include "Type.h"
 #include "Chrono.hxx"
 #include "util/Compiler.h"
diff --git a/src/tag/Id3Load.cxx b/src/tag/Id3Load.cxx
index 31eeeadda..fe9db5c48 100644
--- a/src/tag/Id3Load.cxx
+++ b/src/tag/Id3Load.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Id3Load.hxx"
 #include "Log.hxx"
 #include "Riff.hxx"
diff --git a/src/tag/Id3Load.hxx b/src/tag/Id3Load.hxx
index 23b7ac605..2f2014722 100644
--- a/src/tag/Id3Load.hxx
+++ b/src/tag/Id3Load.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_TAG_ID3_LOAD_HXX
 #define MPD_TAG_ID3_LOAD_HXX
 
-#include "check.h"
 #include "Id3Unique.hxx"
 
 class InputStream;
diff --git a/src/tag/Id3ReplayGain.cxx b/src/tag/Id3ReplayGain.cxx
index 94a5a0bc4..cab15f708 100644
--- a/src/tag/Id3ReplayGain.cxx
+++ b/src/tag/Id3ReplayGain.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Id3ReplayGain.hxx"
 #include "Rva2.hxx"
 #include "ReplayGain.hxx"
diff --git a/src/tag/Id3ReplayGain.hxx b/src/tag/Id3ReplayGain.hxx
index 642b7ce7b..9a4790060 100644
--- a/src/tag/Id3ReplayGain.hxx
+++ b/src/tag/Id3ReplayGain.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_ID3_REPLAY_GAIN_HXX
 #define MPD_TAG_ID3_REPLAY_GAIN_HXX
 
-#include "check.h"
-
 struct id3_tag;
 struct ReplayGainInfo;
 
diff --git a/src/tag/Id3Scan.cxx b/src/tag/Id3Scan.cxx
index c35b4ac7e..b32b1a37b 100644
--- a/src/tag/Id3Scan.cxx
+++ b/src/tag/Id3Scan.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Id3Scan.hxx"
 #include "Id3Load.hxx"
 #include "Handler.hxx"
diff --git a/src/tag/Id3Scan.hxx b/src/tag/Id3Scan.hxx
index 91a3d9129..34ca73c68 100644
--- a/src/tag/Id3Scan.hxx
+++ b/src/tag/Id3Scan.hxx
@@ -20,10 +20,6 @@
 #ifndef MPD_TAG_ID3_SCAN_HXX
 #define MPD_TAG_ID3_SCAN_HXX
 
-#include "check.h"
-
-#include <memory>
-
 class InputStream;
 class TagHandler;
 struct Tag;
diff --git a/src/tag/Id3Unique.hxx b/src/tag/Id3Unique.hxx
index d09996103..b2117e0d8 100644
--- a/src/tag/Id3Unique.hxx
+++ b/src/tag/Id3Unique.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_ID3_UNIQUE_HXX
 #define MPD_TAG_ID3_UNIQUE_HXX
 
-#include "check.h"
-
 #include <id3tag.h>
 
 #include <memory>
diff --git a/src/tag/MixRamp.cxx b/src/tag/MixRamp.cxx
index 20e51e7f8..43b146466 100644
--- a/src/tag/MixRamp.cxx
+++ b/src/tag/MixRamp.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MixRamp.hxx"
 #include "VorbisComment.hxx"
 #include "MixRampInfo.hxx"
diff --git a/src/tag/MixRamp.hxx b/src/tag/MixRamp.hxx
index 56aa66e87..778ee5975 100644
--- a/src/tag/MixRamp.hxx
+++ b/src/tag/MixRamp.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_MIXRAMP_HXX
 #define MPD_TAG_MIXRAMP_HXX
 
-#include "check.h"
-
 class MixRampInfo;
 
 bool
diff --git a/src/tag/Names.c b/src/tag/Names.c
index 5a4de3b4a..f330f7f70 100644
--- a/src/tag/Names.c
+++ b/src/tag/Names.c
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Type.h"
 
 const char *const tag_item_names[TAG_NUM_OF_ITEM_TYPES] = {
diff --git a/src/tag/ParseName.cxx b/src/tag/ParseName.cxx
index 8f9b5deab..0ad34fddd 100644
--- a/src/tag/ParseName.cxx
+++ b/src/tag/ParseName.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ParseName.hxx"
 #include "util/ASCII.hxx"
 
diff --git a/src/tag/Pool.cxx b/src/tag/Pool.cxx
index 330b65d22..95172b46a 100644
--- a/src/tag/Pool.cxx
+++ b/src/tag/Pool.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Pool.hxx"
 #include "Item.hxx"
 #include "util/Cast.hxx"
diff --git a/src/tag/ReplayGain.cxx b/src/tag/ReplayGain.cxx
index 1fad1322f..a316ff01e 100644
--- a/src/tag/ReplayGain.cxx
+++ b/src/tag/ReplayGain.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ReplayGain.hxx"
 #include "VorbisComment.hxx"
 #include "ReplayGainInfo.hxx"
diff --git a/src/tag/ReplayGain.hxx b/src/tag/ReplayGain.hxx
index 8a1c37d3b..0f40c7b09 100644
--- a/src/tag/ReplayGain.hxx
+++ b/src/tag/ReplayGain.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_REPLAY_GAIN_HXX
 #define MPD_TAG_REPLAY_GAIN_HXX
 
-#include "check.h"
-
 struct ReplayGainInfo;
 
 bool
diff --git a/src/tag/Riff.cxx b/src/tag/Riff.cxx
index 21772e04c..85cbcf743 100644
--- a/src/tag/Riff.cxx
+++ b/src/tag/Riff.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "Riff.hxx"
 #include "input/InputStream.hxx"
 #include "system/ByteOrder.hxx"
diff --git a/src/tag/Rva2.cxx b/src/tag/Rva2.cxx
index c89d0eadb..c7382574e 100644
--- a/src/tag/Rva2.cxx
+++ b/src/tag/Rva2.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Rva2.hxx"
 #include "ReplayGainInfo.hxx"
 
diff --git a/src/tag/Rva2.hxx b/src/tag/Rva2.hxx
index 8cdd2d46c..baf4e8be8 100644
--- a/src/tag/Rva2.hxx
+++ b/src/tag/Rva2.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_RVA2_HXX
 #define MPD_TAG_RVA2_HXX
 
-#include "check.h"
-
 struct id3_tag;
 struct ReplayGainInfo;
 
diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx
index 0c7981e32..59ebea325 100644
--- a/src/tag/Tag.cxx
+++ b/src/tag/Tag.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Tag.hxx"
 #include "Pool.hxx"
 #include "Builder.hxx"
diff --git a/src/tag/VorbisComment.cxx b/src/tag/VorbisComment.cxx
index 09466cad6..f38ff3391 100644
--- a/src/tag/VorbisComment.cxx
+++ b/src/tag/VorbisComment.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "VorbisComment.hxx"
 #include "util/ASCII.hxx"
 
diff --git a/src/tag/VorbisComment.hxx b/src/tag/VorbisComment.hxx
index fdae9ccf6..54e33f459 100644
--- a/src/tag/VorbisComment.hxx
+++ b/src/tag/VorbisComment.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_TAG_VORBIS_COMMENT_HXX
 #define MPD_TAG_VORBIS_COMMENT_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 /**
diff --git a/src/thread/Name.hxx b/src/thread/Name.hxx
index b0c65a55c..68e1beb79 100644
--- a/src/thread/Name.hxx
+++ b/src/thread/Name.hxx
@@ -20,6 +20,8 @@
 #ifndef MPD_THREAD_NAME_HXX
 #define MPD_THREAD_NAME_HXX
 
+#include "config.h"
+
 #if defined(HAVE_PTHREAD_SETNAME_NP) && !defined(__NetBSD__)
 #  define HAVE_THREAD_NAME
 #  include <pthread.h>
diff --git a/src/thread/SafeSingleton.hxx b/src/thread/SafeSingleton.hxx
index 79560dcfe..8385c536e 100644
--- a/src/thread/SafeSingleton.hxx
+++ b/src/thread/SafeSingleton.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_SAFE_SINGLETON_HXX
 #define MPD_SAFE_SINGLETON_HXX
 
-#include "check.h"
 #include "Mutex.hxx"
 
 /**
diff --git a/src/thread/Slack.hxx b/src/thread/Slack.hxx
index abc21142d..91e56b763 100644
--- a/src/thread/Slack.hxx
+++ b/src/thread/Slack.hxx
@@ -20,6 +20,8 @@
 #ifndef MPD_THREAD_SLACK_HXX
 #define MPD_THREAD_SLACK_HXX
 
+#include "config.h"
+
 #ifdef HAVE_PRCTL
 #include <sys/prctl.h>
 #endif
diff --git a/src/thread/Thread.cxx b/src/thread/Thread.cxx
index 80d72caed..bb498fd22 100644
--- a/src/thread/Thread.cxx
+++ b/src/thread/Thread.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Thread.hxx"
 #include "system/Error.hxx"
 
diff --git a/src/thread/Thread.hxx b/src/thread/Thread.hxx
index 3a92db5a0..4c950f415 100644
--- a/src/thread/Thread.hxx
+++ b/src/thread/Thread.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_THREAD_HXX
 #define MPD_THREAD_HXX
 
-#include "check.h"
 #include "util/BindMethod.hxx"
 #include "util/Compiler.h"
 
diff --git a/src/unix/SignalHandlers.cxx b/src/unix/SignalHandlers.cxx
index 868ad24f2..3fcf83289 100644
--- a/src/unix/SignalHandlers.cxx
+++ b/src/unix/SignalHandlers.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SignalHandlers.hxx"
 #include "event/SignalMonitor.hxx"
 
diff --git a/src/util/LazyRandomEngine.cxx b/src/util/LazyRandomEngine.cxx
index de9d5697f..42eafb1a6 100644
--- a/src/util/LazyRandomEngine.cxx
+++ b/src/util/LazyRandomEngine.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LazyRandomEngine.hxx"
 
 void
diff --git a/src/util/LazyRandomEngine.hxx b/src/util/LazyRandomEngine.hxx
index 581c9379b..ead582d69 100644
--- a/src/util/LazyRandomEngine.hxx
+++ b/src/util/LazyRandomEngine.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_LAZY_RANDOM_ENGINE_HXX
 #define MPD_LAZY_RANDOM_ENGINE_HXX
 
-#include "check.h"
-
 #include <random>
 
 #include <assert.h>
diff --git a/src/util/Tokenizer.cxx b/src/util/Tokenizer.cxx
index 100ffd3ed..d2e2bc5ea 100644
--- a/src/util/Tokenizer.cxx
+++ b/src/util/Tokenizer.cxx
@@ -27,7 +27,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "Tokenizer.hxx"
 #include "CharUtil.hxx"
 #include "StringStrip.hxx"
diff --git a/src/win32/Win32Main.cxx b/src/win32/Win32Main.cxx
index e43a5bdc7..4f66ecb53 100644
--- a/src/win32/Win32Main.cxx
+++ b/src/win32/Win32Main.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Main.hxx"
 
 #ifdef _WIN32
diff --git a/src/zeroconf/AvahiPoll.cxx b/src/zeroconf/AvahiPoll.cxx
index 398bebd60..eeb669b23 100644
--- a/src/zeroconf/AvahiPoll.cxx
+++ b/src/zeroconf/AvahiPoll.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "AvahiPoll.hxx"
 #include "event/SocketMonitor.hxx"
 #include "event/TimerEvent.hxx"
diff --git a/src/zeroconf/AvahiPoll.hxx b/src/zeroconf/AvahiPoll.hxx
index 21745e50a..d4e8f1217 100644
--- a/src/zeroconf/AvahiPoll.hxx
+++ b/src/zeroconf/AvahiPoll.hxx
@@ -20,7 +20,6 @@
 #ifndef MPD_AVAHI_POLL_HXX
 #define MPD_AVAHI_POLL_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <avahi-common/watch.h>
diff --git a/src/zeroconf/ZeroconfAvahi.cxx b/src/zeroconf/ZeroconfAvahi.cxx
index d37ec8f54..d3ee1a8e4 100644
--- a/src/zeroconf/ZeroconfAvahi.cxx
+++ b/src/zeroconf/ZeroconfAvahi.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ZeroconfAvahi.hxx"
 #include "AvahiPoll.hxx"
 #include "ZeroconfInternal.hxx"
diff --git a/src/zeroconf/ZeroconfBonjour.cxx b/src/zeroconf/ZeroconfBonjour.cxx
index 9053e0156..104116ebc 100644
--- a/src/zeroconf/ZeroconfBonjour.cxx
+++ b/src/zeroconf/ZeroconfBonjour.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ZeroconfBonjour.hxx"
 #include "ZeroconfInternal.hxx"
 #include "Listen.hxx"
diff --git a/src/zeroconf/ZeroconfGlue.cxx b/src/zeroconf/ZeroconfGlue.cxx
index a6c9bf6fa..af64b08e1 100644
--- a/src/zeroconf/ZeroconfGlue.cxx
+++ b/src/zeroconf/ZeroconfGlue.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ZeroconfGlue.hxx"
 #include "ZeroconfAvahi.hxx"
 #include "ZeroconfBonjour.hxx"
diff --git a/src/zeroconf/ZeroconfGlue.hxx b/src/zeroconf/ZeroconfGlue.hxx
index ca296c9c8..d8ecb8223 100644
--- a/src/zeroconf/ZeroconfGlue.hxx
+++ b/src/zeroconf/ZeroconfGlue.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_ZEROCONF_GLUE_HXX
 #define MPD_ZEROCONF_GLUE_HXX
 
-#include "check.h"
+#include "config.h"
 
 struct ConfigData;
 class EventLoop;
diff --git a/test/ContainerScan.cxx b/test/ContainerScan.cxx
index d2006b096..d047ae0b7 100644
--- a/test/ContainerScan.cxx
+++ b/test/ContainerScan.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "song/DetachedSong.hxx"
 #include "SongSave.hxx"
 #include "config/Data.hxx"
diff --git a/test/DumpDecoderClient.cxx b/test/DumpDecoderClient.cxx
index f7156c5c3..a876c7ad7 100644
--- a/test/DumpDecoderClient.cxx
+++ b/test/DumpDecoderClient.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "DumpDecoderClient.hxx"
 #include "decoder/DecoderAPI.hxx"
 #include "input/InputStream.hxx"
diff --git a/test/DumpDecoderClient.hxx b/test/DumpDecoderClient.hxx
index 8a40e7415..10ff5a09d 100644
--- a/test/DumpDecoderClient.hxx
+++ b/test/DumpDecoderClient.hxx
@@ -20,7 +20,6 @@
 #ifndef DUMP_DECODER_CLIENT_HXX
 #define DUMP_DECODER_CLIENT_HXX
 
-#include "check.h"
 #include "decoder/Client.hxx"
 #include "thread/Mutex.hxx"
 
diff --git a/test/ParseSongFilter.cxx b/test/ParseSongFilter.cxx
index f2d248608..b7eb8c8c5 100644
--- a/test/ParseSongFilter.cxx
+++ b/test/ParseSongFilter.cxx
@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "song/Filter.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/PrintException.hxx"
diff --git a/test/RunChromaprint.cxx b/test/RunChromaprint.cxx
index 311ad4eb7..ab68d2aa4 100644
--- a/test/RunChromaprint.cxx
+++ b/test/RunChromaprint.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "config/File.hxx"
 #include "config/Migrate.hxx"
 #include "config/Data.hxx"
diff --git a/test/ShutdownHandler.cxx b/test/ShutdownHandler.cxx
index 6d56e920b..d23424213 100644
--- a/test/ShutdownHandler.cxx
+++ b/test/ShutdownHandler.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ShutdownHandler.hxx"
 
 #ifndef _WIN32
diff --git a/test/TestAudioFormat.cxx b/test/TestAudioFormat.cxx
index 81657e8f3..4f06ff98a 100644
--- a/test/TestAudioFormat.cxx
+++ b/test/TestAudioFormat.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "AudioFormat.hxx"
 #include "AudioParser.hxx"
 #include "util/StringBuffer.hxx"
diff --git a/test/TestCircularBuffer.cxx b/test/TestCircularBuffer.cxx
index d0e41bba4..77d6e447f 100644
--- a/test/TestCircularBuffer.cxx
+++ b/test/TestCircularBuffer.cxx
@@ -2,7 +2,6 @@
  * Unit tests for class CircularBuffer.
  */
 
-#include "config.h"
 #include "util/CircularBuffer.hxx"
 
 #include <gtest/gtest.h>
diff --git a/test/TestDivideString.cxx b/test/TestDivideString.cxx
index 4ec9a2838..fe9c31917 100644
--- a/test/TestDivideString.cxx
+++ b/test/TestDivideString.cxx
@@ -2,7 +2,6 @@
  * Unit tests for src/util/
  */
 
-#include "config.h"
 #include "util/DivideString.hxx"
 
 #include <gtest/gtest.h>
diff --git a/test/TestMimeType.cxx b/test/TestMimeType.cxx
index 5f110172c..ed2bcdfe8 100644
--- a/test/TestMimeType.cxx
+++ b/test/TestMimeType.cxx
@@ -2,7 +2,6 @@
  * Unit tests for src/util/
  */
 
-#include "config.h"
 #include "util/MimeType.hxx"
 
 #include <gtest/gtest.h>
diff --git a/test/TestRewindInputStream.cxx b/test/TestRewindInputStream.cxx
index 769bd710e..051d5a9ea 100644
--- a/test/TestRewindInputStream.cxx
+++ b/test/TestRewindInputStream.cxx
@@ -2,7 +2,6 @@
  * Unit tests for class RewindInputStream.
  */
 
-#include "config.h"
 #include "input/RewindInputStream.hxx"
 #include "input/InputStream.hxx"
 #include "thread/Mutex.hxx"
diff --git a/test/TestSplitString.cxx b/test/TestSplitString.cxx
index 4464fe29a..6ba87ee1b 100644
--- a/test/TestSplitString.cxx
+++ b/test/TestSplitString.cxx
@@ -2,7 +2,6 @@
  * Unit tests for src/util/
  */
 
-#include "config.h"
 #include "util/SplitString.hxx"
 #include "util/Macros.hxx"
 
diff --git a/test/TestUriUtil.cxx b/test/TestUriUtil.cxx
index 25bbad1ec..21cbd2cdf 100644
--- a/test/TestUriUtil.cxx
+++ b/test/TestUriUtil.cxx
@@ -2,7 +2,6 @@
  * Unit tests for src/util/
  */
 
-#include "config.h"
 #include "util/UriUtil.hxx"
 
 #include <gtest/gtest.h>
diff --git a/test/WriteFile.cxx b/test/WriteFile.cxx
index a0b4a6640..9cba451e9 100644
--- a/test/WriteFile.cxx
+++ b/test/WriteFile.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "fs/io/FileOutputStream.hxx"
 #include "util/PrintException.hxx"
 
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx
index 4fd5f0627..0c336ffaf 100644
--- a/test/dump_playlist.cxx
+++ b/test/dump_playlist.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagSave.hxx"
 #include "song/DetachedSong.hxx"
 #include "playlist/SongEnumerator.hxx"
diff --git a/test/read_conf.cxx b/test/read_conf.cxx
index 00419af19..f6a8019e7 100644
--- a/test/read_conf.cxx
+++ b/test/read_conf.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "config/Data.hxx"
 #include "config/Param.hxx"
 #include "config/File.hxx"
diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx
index 6d9a68868..ad50b8bb4 100644
--- a/test/read_mixer.cxx
+++ b/test/read_mixer.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "NullMixerListener.hxx"
 #include "mixer/MixerControl.hxx"
 #include "mixer/MixerList.hxx"
diff --git a/test/run_avahi.cxx b/test/run_avahi.cxx
index 8babf4e0b..eba2ff835 100644
--- a/test/run_avahi.cxx
+++ b/test/run_avahi.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "event/Loop.hxx"
 #include "ShutdownHandler.hxx"
 #include "zeroconf/ZeroconfAvahi.hxx"
diff --git a/test/run_convert.cxx b/test/run_convert.cxx
index 6637f618e..868a483db 100644
--- a/test/run_convert.cxx
+++ b/test/run_convert.cxx
@@ -23,7 +23,6 @@
  *
  */
 
-#include "config.h"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
 #include "pcm/PcmConvert.hxx"
diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx
index e2ae2c24d..c37664201 100644
--- a/test/run_decoder.cxx
+++ b/test/run_decoder.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "config/File.hxx"
 #include "config/Migrate.hxx"
 #include "config/Data.hxx"
diff --git a/test/run_encoder.cxx b/test/run_encoder.cxx
index fb07487eb..9096d9e5b 100644
--- a/test/run_encoder.cxx
+++ b/test/run_encoder.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "encoder/EncoderList.hxx"
 #include "encoder/EncoderPlugin.hxx"
 #include "encoder/EncoderInterface.hxx"
diff --git a/test/run_filter.cxx b/test/run_filter.cxx
index b2a1845d0..689677592 100644
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "config/Param.hxx"
 #include "config/Data.hxx"
 #include "config/File.hxx"
diff --git a/test/run_gunzip.cxx b/test/run_gunzip.cxx
index 35afc6c8e..f8a0e618e 100644
--- a/test/run_gunzip.cxx
+++ b/test/run_gunzip.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "fs/io/GunzipReader.hxx"
 #include "fs/io/FileReader.hxx"
 #include "fs/io/StdioOutputStream.hxx"
diff --git a/test/run_gzip.cxx b/test/run_gzip.cxx
index 373eb45ef..094456c02 100644
--- a/test/run_gzip.cxx
+++ b/test/run_gzip.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "fs/io/GzipOutputStream.hxx"
 #include "fs/io/StdioOutputStream.hxx"
 #include "system/Error.hxx"
diff --git a/test/run_inotify.cxx b/test/run_inotify.cxx
index 978141319..39625c060 100644
--- a/test/run_inotify.cxx
+++ b/test/run_inotify.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ShutdownHandler.hxx"
 #include "db/update/InotifySource.hxx"
 #include "event/Loop.hxx"
diff --git a/test/run_neighbor_explorer.cxx b/test/run_neighbor_explorer.cxx
index 1797684db..c22ed6b11 100644
--- a/test/run_neighbor_explorer.cxx
+++ b/test/run_neighbor_explorer.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "config/File.hxx"
 #include "config/Migrate.hxx"
 #include "config/Data.hxx"
diff --git a/test/run_normalize.cxx b/test/run_normalize.cxx
index 642b9cc28..687a52033 100644
--- a/test/run_normalize.cxx
+++ b/test/run_normalize.cxx
@@ -23,7 +23,6 @@
  *
  */
 
-#include "config.h"
 #include "AudioCompress/compress.h"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
diff --git a/test/run_output.cxx b/test/run_output.cxx
index be5f215e0..4b45eed7a 100644
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "output/Interface.hxx"
 #include "output/Registry.hxx"
 #include "output/OutputPlugin.hxx"
diff --git a/test/run_resolver.cxx b/test/run_resolver.cxx
index 0a789949e..8bb303f35 100644
--- a/test/run_resolver.cxx
+++ b/test/run_resolver.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "net/Resolver.hxx"
 #include "net/AddressInfo.hxx"
 #include "net/ToString.hxx"
diff --git a/test/run_storage.cxx b/test/run_storage.cxx
index 753c97b87..562b6d1e1 100644
--- a/test/run_storage.cxx
+++ b/test/run_storage.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "event/Thread.hxx"
 #include "storage/Registry.hxx"
 #include "storage/StorageInterface.hxx"
diff --git a/test/software_volume.cxx b/test/software_volume.cxx
index ec63e3f4c..601dba574 100644
--- a/test/software_volume.cxx
+++ b/test/software_volume.cxx
@@ -23,7 +23,6 @@
  *
  */
 
-#include "config.h"
 #include "pcm/Volume.hxx"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
diff --git a/test/test_archive.cxx b/test/test_archive.cxx
index f183e55c6..a5f3dd663 100644
--- a/test/test_archive.cxx
+++ b/test/test_archive.cxx
@@ -1,4 +1,3 @@
-#include "config.h"
 #include "archive/ArchiveLookup.hxx"
 #include "util/Compiler.h"
 
diff --git a/test/test_icy_parser.cxx b/test/test_icy_parser.cxx
index 14467ddb6..867c38eb8 100644
--- a/test/test_icy_parser.cxx
+++ b/test/test_icy_parser.cxx
@@ -2,7 +2,6 @@
  * Unit tests for class IcyMetaDataParser.
  */
 
-#include "config.h"
 #include "util/ScopeExit.hxx"
 
 /* include the .cxx file to get access to internal functions */
diff --git a/test/test_mixramp.cxx b/test/test_mixramp.cxx
index 61bb26046..ca010f246 100644
--- a/test/test_mixramp.cxx
+++ b/test/test_mixramp.cxx
@@ -2,7 +2,6 @@
  * Unit tests for mixramp_interpolate()
  */
 
-#include "config.h"
 #include "player/CrossFade.cxx"
 
 #include <gtest/gtest.h>
diff --git a/test/test_pcm_channels.cxx b/test/test_pcm_channels.cxx
index ad22f75aa..c6ec6698e 100644
--- a/test/test_pcm_channels.cxx
+++ b/test/test_pcm_channels.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "test_pcm_util.hxx"
 #include "pcm/PcmChannels.hxx"
 #include "pcm/PcmBuffer.hxx"
diff --git a/test/test_pcm_dither.cxx b/test/test_pcm_dither.cxx
index 99c203145..62b2302f8 100644
--- a/test/test_pcm_dither.cxx
+++ b/test/test_pcm_dither.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "test_pcm_util.hxx"
 #include "pcm/PcmDither.cxx"
 
diff --git a/test/test_pcm_format.cxx b/test/test_pcm_format.cxx
index bea4a5314..6f2e47a14 100644
--- a/test/test_pcm_format.cxx
+++ b/test/test_pcm_format.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "test_pcm_util.hxx"
 #include "pcm/PcmFormat.hxx"
 #include "pcm/PcmDither.hxx"
diff --git a/test/test_pcm_interleave.cxx b/test/test_pcm_interleave.cxx
index 7606aad06..cc8257e6f 100644
--- a/test/test_pcm_interleave.cxx
+++ b/test/test_pcm_interleave.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "pcm/Interleave.hxx"
 #include "util/Macros.hxx"
 
diff --git a/test/test_pcm_mix.cxx b/test/test_pcm_mix.cxx
index 930d6fc99..8ed67f429 100644
--- a/test/test_pcm_mix.cxx
+++ b/test/test_pcm_mix.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "test_pcm_util.hxx"
 #include "pcm/PcmMix.hxx"
 #include "pcm/PcmDither.hxx"
diff --git a/test/test_pcm_pack.cxx b/test/test_pcm_pack.cxx
index 59d58163e..a3055cbf7 100644
--- a/test/test_pcm_pack.cxx
+++ b/test/test_pcm_pack.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "test_pcm_util.hxx"
 #include "pcm/PcmPack.hxx"
 #include "system/ByteOrder.hxx"
diff --git a/test/test_pcm_volume.cxx b/test/test_pcm_volume.cxx
index 6ad84e968..811bb2d2d 100644
--- a/test/test_pcm_volume.cxx
+++ b/test/test_pcm_volume.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "pcm/Volume.hxx"
 #include "pcm/Traits.hxx"
 #include "util/ConstBuffer.hxx"
diff --git a/test/test_protocol.cxx b/test/test_protocol.cxx
index 86c4a7206..3455bfa58 100644
--- a/test/test_protocol.cxx
+++ b/test/test_protocol.cxx
@@ -1,4 +1,3 @@
-#include "config.h"
 #include "protocol/ArgParser.hxx"
 #include "protocol/Ack.hxx"
 #include "protocol/RangeArg.hxx"
diff --git a/test/test_queue_priority.cxx b/test/test_queue_priority.cxx
index 6a8fbf782..1d65193b3 100644
--- a/test/test_queue_priority.cxx
+++ b/test/test_queue_priority.cxx
@@ -1,4 +1,3 @@
-#include "config.h"
 #include "queue/Queue.hxx"
 #include "song/DetachedSong.hxx"
 #include "util/Macros.hxx"
diff --git a/test/test_translate_song.cxx b/test/test_translate_song.cxx
index 7784a2e24..2419b1bac 100644
--- a/test/test_translate_song.cxx
+++ b/test/test_translate_song.cxx
@@ -2,7 +2,6 @@
  * Unit tests for playlist_check_translate_song().
  */
 
-#include "config.h"
 #include "playlist/PlaylistSong.hxx"
 #include "song/DetachedSong.hxx"
 #include "SongLoader.hxx"
diff --git a/test/test_vorbis_encoder.cxx b/test/test_vorbis_encoder.cxx
index 0317a628c..2524d4564 100644
--- a/test/test_vorbis_encoder.cxx
+++ b/test/test_vorbis_encoder.cxx
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "encoder/EncoderList.hxx"
 #include "encoder/EncoderPlugin.hxx"
 #include "encoder/EncoderInterface.hxx"