include cleanups (powered by iwyu)

src/AudioFormat.cxx

@@ -19,9 +19,9 @@
 
 #include "AudioFormat.hxx"
 #include "util/StringBuffer.hxx"
-#include "util/StringFormat.hxx"
 
 #include <assert.h>
+#include <stdio.h>
 
 void
 AudioFormat::ApplyMask(AudioFormat mask) noexcept

src/AudioFormat.hxx

@@ -24,9 +24,8 @@
 #include "pcm/ChannelDefs.hxx"
 #include "util/Compiler.h"
 
-#include <chrono>
+#include <cstdint>
 
-#include <stdint.h>
 #include <stddef.h>
 
 template<size_t CAPACITY> class StringBuffer;

src/CheckAudioFormat.cxx

@@ -21,10 +21,6 @@
 #include "AudioFormat.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <stdexcept>
-
-#include <assert.h>
-
 void
 CheckSampleRate(unsigned long sample_rate)
 {

src/CommandLine.cxx

@@ -36,13 +36,15 @@
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
 #include "fs/StandardDirectory.hxx"
-#include "system/Error.hxx"
 #include "util/Macros.hxx"
-#include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
 #include "util/OptionDef.hxx"
 #include "util/OptionParser.hxx"
 
+#ifdef _WIN32
+#include "system/Error.hxx"
+#endif
+
 #ifdef ENABLE_DATABASE
 #include "db/Registry.hxx"
 #include "db/DatabasePlugin.hxx"

src/IcyMetaDataParser.cxx

@@ -24,6 +24,8 @@
 #include "util/StringView.hxx"
 #include "Log.hxx"
 
+#include <algorithm>
+
 #include <assert.h>
 #include <string.h>
 

src/Instance.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Instance.hxx"
 #include "Partition.hxx"
-#include "Idle.hxx"
+#include "IdleFlags.hxx"
 #include "Stats.hxx"
 #include "client/List.hxx"
 #include "input/cache/Manager.hxx"
@@ -46,8 +46,6 @@
 #endif
 #endif
 
-#include <exception>
-
 Instance::Instance()
 	:rtio_thread(true),
 #ifdef ENABLE_SYSTEMD_DAEMON

src/Listen.cxx

@@ -34,8 +34,6 @@
 #include "fs/XDG.hxx"
 
 #include <sys/stat.h>
-#include <string.h>
-#include <assert.h>
 
 #ifdef ENABLE_SYSTEMD_DAEMON
 #include <systemd/sd-daemon.h>

src/LocateUri.hxx

@@ -21,7 +21,6 @@
 #define MPD_LOCATE_URI_HXX
 
 #include "config.h"
-#include "util/Compiler.h"
 #include "fs/AllocatedPath.hxx"
 
 #ifdef _WIN32

src/Main.cxx

@@ -34,7 +34,7 @@
 #include "Partition.hxx"
 #include "tag/Config.hxx"
 #include "ReplayGainGlobal.hxx"
-#include "Idle.hxx"
+#include "IdleFlags.hxx"
 #include "Log.hxx"
 #include "LogInit.hxx"
 #include "input/Init.hxx"
@@ -52,7 +52,6 @@
 #include "thread/Slack.hxx"
 #include "net/Init.hxx"
 #include "lib/icu/Init.hxx"
-#include "config/File.hxx"
 #include "config/Check.hxx"
 #include "config/Data.hxx"
 #include "config/Param.hxx"
@@ -98,6 +97,7 @@
 #include "android/Environment.hxx"
 #include "android/Context.hxx"
 #include "android/LogListener.hxx"
+#include "config/File.hxx"
 #include "fs/FileSystem.hxx"
 #include "org_musicpd_Bridge.h"
 #endif

src/Main.hxx

@@ -20,14 +20,12 @@
 #ifndef MPD_MAIN_HXX
 #define MPD_MAIN_HXX
 
-class EventLoop;
-class Context;
 struct Instance;
 
 #ifdef ANDROID
 #include "android/LogListener.hxx"
 
-extern Context *context;
+extern class Context *context;
 extern LogListener *logListener;
 #endif
 

src/MusicPipe.cxx

@@ -20,6 +20,8 @@
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 
+#include <assert.h>
+
 #ifndef NDEBUG
 
 bool

src/MusicPipe.hxx

@@ -28,8 +28,6 @@
 #include "AudioFormat.hxx"
 #endif
 
-#include <assert.h>
-
 /**
  * A queue of #MusicChunk objects.  One party appends chunks at the
  * tail, and the other consumes them from the head.

src/Partition.hxx

@@ -30,7 +30,6 @@
 #include "ReplayGainMode.hxx"
 #include "SingleMode.hxx"
 #include "Chrono.hxx"
-#include "util/Compiler.h"
 #include "config.h"
 
 #include <string>

src/Permission.cxx

@@ -26,9 +26,9 @@
 #include "util/RuntimeError.hxx"
 #include "util/StringView.hxx"
 
-#include <algorithm>
 #include <map>
 #include <string>
+#include <utility>
 
 #include <assert.h>
 #include <string.h>

src/PlaylistFile.cxx

@@ -39,15 +39,11 @@
 #include "fs/FileSystem.hxx"
 #include "fs/FileInfo.hxx"
 #include "fs/DirectoryReader.hxx"
-#include "util/Macros.hxx"
 #include "util/StringCompare.hxx"
 #include "util/UriUtil.hxx"
 
-#include <memory>
-
 #include <assert.h>
 #include <string.h>
-#include <errno.h>
 
 static const char PLAYLIST_COMMENT = '#';
 

src/PlaylistPrint.cxx

@@ -22,11 +22,6 @@
 #include "PlaylistError.hxx"
 #include "queue/Playlist.hxx"
 #include "queue/QueuePrint.hxx"
-#include "SongPrint.hxx"
-#include "Partition.hxx"
-#include "Instance.hxx"
-#include "db/Interface.hxx"
-#include "client/Response.hxx"
 
 #define SONG_FILE "file: "
 #define SONG_TIME "Time: "

src/PlaylistSave.cxx

@@ -32,8 +32,6 @@
 #include "fs/io/BufferedOutputStream.hxx"
 #include "util/UriUtil.hxx"
 
-#include <exception>
-
 static void
 playlist_print_path(BufferedOutputStream &os, const Path path)
 {

src/ReplayGainGlobal.cxx

@@ -19,9 +19,7 @@
 
 #include "ReplayGainGlobal.hxx"
 #include "ReplayGainConfig.hxx"
-#include "config/Param.hxx"
 #include "config/Data.hxx"
-#include "util/RuntimeError.hxx"
 
 #include <assert.h>
 #include <stdlib.h>

src/SongPrint.cxx

@@ -19,9 +19,6 @@
 
 #include "SongPrint.hxx"
 #include "song/LightSong.hxx"
-#include "Partition.hxx"
-#include "Instance.hxx"
-#include "storage/StorageInterface.hxx"
 #include "song/DetachedSong.hxx"
 #include "TimePrint.hxx"
 #include "TagPrint.hxx"

src/SongUpdate.cxx

@@ -34,8 +34,6 @@
 #include "TagArchive.hxx"
 #endif
 
-#include <exception>
-
 #include <assert.h>
 #include <string.h>
 

src/StateFile.cxx

@@ -34,8 +34,6 @@
 
 #include <exception>
 
-#include <string.h>
-
 static constexpr Domain state_file_domain("state_file");
 
 StateFile::StateFile(StateFileConfig &&_config,

src/StateFile.hxx

@@ -22,12 +22,10 @@
 
 #include "StateFileConfig.hxx"
 #include "event/TimerEvent.hxx"
-#include "fs/AllocatedPath.hxx"
 #include "util/Compiler.h"
 #include "config.h"
 
 #include <string>
-#include <chrono>
 
 struct Partition;
 class OutputStream;

src/Stats.cxx

@@ -26,10 +26,13 @@
 #include "db/Selection.hxx"
 #include "db/Interface.hxx"
 #include "db/Stats.hxx"
-#include "system/Clock.hxx"
 #include "Log.hxx"
 #include "time/ChronoUtil.hxx"
 
+#ifdef _WIN32
+#include "system/Clock.hxx"
+#endif
+
 #include <chrono>
 #include <cmath>
 

src/TagFile.cxx

@@ -27,8 +27,6 @@
 #include "input/InputStream.hxx"
 #include "input/LocalOpen.hxx"
 
-#include <exception>
-
 #include <assert.h>
 
 class TagFileScan {

src/TagStream.cxx

@@ -28,8 +28,6 @@
 #include "input/InputStream.hxx"
 #include "thread/Mutex.hxx"
 
-#include <exception>
-
 #include <assert.h>
 
 /**

src/TimePrint.hxx

@@ -22,8 +22,6 @@
 
 #include <chrono>
 
-#include <time.h>
-
 class Response;
 
 /**

src/client/Client.cxx

@@ -22,7 +22,6 @@
 #include "Partition.hxx"
 #include "Instance.hxx"
 #include "BackgroundCommand.hxx"
-#include "util/Domain.hxx"
 #include "config.h"
 
 Client::~Client() noexcept

src/client/Read.cxx

@@ -21,7 +21,6 @@
 #include "Config.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
-#include "event/Loop.hxx"
 #include "util/StringStrip.hxx"
 
 #include <string.h>

src/client/Subscribe.cxx

@@ -19,7 +19,7 @@
 
 #include "Client.hxx"
 #include "Partition.hxx"
-#include "Idle.hxx"
+#include "IdleFlags.hxx"
 
 #include <assert.h>
 

src/command/AllCommands.cxx

@@ -47,7 +47,6 @@
 
 #ifdef ENABLE_SQLITE
 #include "StickerCommands.hxx"
-#include "sticker/Database.hxx"
 #endif
 
 #include <assert.h>

src/command/CommandError.cxx

@@ -27,8 +27,6 @@
 
 #include <system_error>
 
-#include <assert.h>
-
 gcc_const
 static enum ack
 ToAck(PlaylistResult result) noexcept

src/command/CommandError.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_COMMAND_ERROR_HXX
 #define MPD_COMMAND_ERROR_HXX
 
-#include "CommandResult.hxx"
-
 #include <exception>
 
 class Response;

src/command/DatabaseCommands.cxx

@@ -24,20 +24,18 @@
 #include "db/DatabasePrint.hxx"
 #include "db/Count.hxx"
 #include "db/Selection.hxx"
-#include "CommandError.hxx"
 #include "protocol/RangeArg.hxx"
 #include "client/Client.hxx"
 #include "client/Response.hxx"
 #include "tag/ParseName.hxx"
-#include "tag/Mask.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/Exception.hxx"
 #include "util/StringAPI.hxx"
 #include "util/ASCII.hxx"
 #include "song/Filter.hxx"
-#include "BulkEdit.hxx"
 
 #include <memory>
+#include <vector>
 
 CommandResult
 handle_listfiles_db(Client &client, Response &r, const char *uri)

src/command/FileCommands.cxx

@@ -22,7 +22,6 @@
 #include "config.h"
 #include "FileCommands.hxx"
 #include "Request.hxx"
-#include "CommandError.hxx"
 #include "protocol/Ack.hxx"
 #include "client/Client.hxx"
 #include "client/Response.hxx"

src/command/OtherCommands.cxx

@@ -22,7 +22,6 @@
 #include "Request.hxx"
 #include "FileCommands.hxx"
 #include "StorageCommands.hxx"
-#include "CommandError.hxx"
 #include "db/Uri.hxx"
 #include "storage/StorageInterface.hxx"
 #include "LocateUri.hxx"
@@ -47,7 +46,7 @@
 #include "client/Response.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
-#include "Idle.hxx"
+#include "IdleFlags.hxx"
 #include "Log.hxx"
 
 #ifdef ENABLE_DATABASE
@@ -57,7 +56,6 @@
 #endif
 
 #include <assert.h>
-#include <string.h>
 
 static void
 print_spl_list(Response &r, const PlaylistVector &list)

src/command/PlayerCommands.cxx

@@ -20,7 +20,6 @@
 #include "config.h"
 #include "PlayerCommands.hxx"
 #include "Request.hxx"
-#include "CommandError.hxx"
 #include "queue/Playlist.hxx"
 #include "PlaylistPrint.hxx"
 #include "SingleMode.hxx"
@@ -29,7 +28,7 @@
 #include "mixer/Volume.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
-#include "Idle.hxx"
+#include "IdleFlags.hxx"
 #include "AudioFormat.hxx"
 #include "util/StringBuffer.hxx"
 #include "util/ScopeExit.hxx"

src/command/PlaylistCommands.cxx

@@ -23,7 +23,6 @@
 #include "Instance.hxx"
 #include "db/Selection.hxx"
 #include "db/DatabasePlaylist.hxx"
-#include "CommandError.hxx"
 #include "PlaylistSave.hxx"
 #include "PlaylistFile.hxx"
 #include "PlaylistError.hxx"

src/command/QueueCommands.cxx

@@ -20,7 +20,6 @@
 #include "config.h"
 #include "QueueCommands.hxx"
 #include "Request.hxx"
-#include "CommandError.hxx"
 #include "protocol/RangeArg.hxx"
 #include "db/DatabaseQueue.hxx"
 #include "db/Selection.hxx"
@@ -40,7 +39,6 @@
 #include "util/StringAPI.hxx"
 #include "util/NumberParser.hxx"
 
-#include <memory>
 #include <limits>
 
 static void

src/command/StickerCommands.cxx

@@ -24,7 +24,6 @@
 #include "sticker/Sticker.hxx"
 #include "sticker/SongSticker.hxx"
 #include "sticker/Print.hxx"
-#include "sticker/Database.hxx"
 #include "client/Client.hxx"
 #include "client/Response.hxx"
 #include "Partition.hxx"

src/command/StorageCommands.cxx

@@ -22,14 +22,12 @@
 #include "config.h"
 #include "StorageCommands.hxx"
 #include "Request.hxx"
-#include "CommandError.hxx"
 #include "time/ChronoUtil.hxx"
 #include "util/UriUtil.hxx"
 #include "util/ConstBuffer.hxx"
 #include "fs/Traits.hxx"
 #include "client/Client.hxx"
 #include "client/Response.hxx"
-#include "Partition.hxx"
 #include "Instance.hxx"
 #include "storage/Registry.hxx"
 #include "storage/CompositeStorage.hxx"
@@ -37,7 +35,7 @@
 #include "db/plugins/simple/SimpleDatabasePlugin.hxx"
 #include "db/update/Service.hxx"
 #include "TimePrint.hxx"
-#include "Idle.hxx"
+#include "IdleFlags.hxx"
 
 #include <memory>
 

src/command/TagCommands.cxx

@@ -22,7 +22,7 @@
 #include "client/Client.hxx"
 #include "client/Response.hxx"
 #include "tag/ParseName.hxx"
-#include "Partition.hxx"
+#include "queue/Playlist.hxx"
 #include "util/ConstBuffer.hxx"
 
 CommandResult

src/config/Block.cxx

@@ -23,7 +23,6 @@
 #include "fs/AllocatedPath.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <assert.h>
 #include <stdlib.h>
 
 void

src/config/Block.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_CONFIG_BLOCK_HXX
 #define MPD_CONFIG_BLOCK_HXX
 
-#include "Param.hxx"
 #include "util/Compiler.h"
 
 #include <string>

src/config/Check.hxx

@@ -20,9 +20,6 @@
 #ifndef MPD_CONFIG_CHECK_HXX
 #define MPD_CONFIG_CHECK_HXX
 
-#include "Option.hxx"
-#include "util/Compiler.h"
-
 struct ConfigData;
 
 /**

src/config/Data.hxx

@@ -28,8 +28,6 @@
 #include <chrono>
 #include <forward_list>
 
-struct ConfigParam;
-struct ConfigBlock;
 class AllocatedPath;
 
 struct ConfigData {

src/config/Path.cxx

@@ -21,7 +21,6 @@
 #include "Data.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
-#include "fs/Domain.hxx"
 #include "fs/StandardDirectory.hxx"
 #include "util/RuntimeError.hxx"
 

src/db/DatabaseGlue.cxx

@@ -20,7 +20,6 @@
 #include "DatabaseGlue.hxx"
 #include "Interface.hxx"
 #include "Registry.hxx"
-#include "DatabaseError.hxx"
 #include "util/RuntimeError.hxx"
 #include "config/Block.hxx"
 #include "DatabasePlugin.hxx"

src/db/DatabasePlaylist.cxx

@@ -19,7 +19,6 @@
 
 #include "DatabasePlaylist.hxx"
 #include "DatabaseSong.hxx"
-#include "Selection.hxx"
 #include "PlaylistFile.hxx"
 #include "Interface.hxx"
 #include "song/DetachedSong.hxx"

src/db/DatabasePrint.cxx

@@ -21,15 +21,10 @@
 #include "Selection.hxx"
 #include "SongPrint.hxx"
 #include "TimePrint.hxx"
-#include "TagPrint.hxx"
 #include "client/Response.hxx"
-#include "protocol/RangeArg.hxx"
 #include "Partition.hxx"
-#include "song/DetachedSong.hxx"
-#include "song/Filter.hxx"
 #include "song/LightSong.hxx"
 #include "tag/Tag.hxx"
-#include "tag/Mask.hxx"
 #include "LightDirectory.hxx"
 #include "PlaylistInfo.hxx"
 #include "Interface.hxx"

src/db/DatabasePrint.hxx

@@ -24,10 +24,8 @@
 
 template<typename T> struct ConstBuffer;
 enum TagType : uint8_t;
-class TagMask;
 class SongFilter;
 struct DatabaseSelection;
-struct RangeArg;
 struct Partition;
 class Response;
 

src/db/DatabaseSong.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_DATABASE_SONG_HXX
 #define MPD_DATABASE_SONG_HXX
 
-#include "util/Compiler.h"
-
 struct LightSong;
 class Database;
 class Storage;

src/db/UniqueTags.hxx

@@ -22,11 +22,8 @@
 
 #include "tag/Type.h"
 
-#include <map>
-#include <set>
 #include <string>
 
-class TagMask;
 class Database;
 struct DatabaseSelection;
 template<typename Key> class RecursiveMap;

src/db/VHelper.cxx

@@ -18,9 +18,12 @@
  */
 
 #include "VHelper.hxx"
+#include "song/DetachedSong.hxx"
 #include "song/LightSong.hxx"
 #include "song/Filter.hxx"
 
+#include <algorithm>
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>

src/db/VHelper.hxx

@@ -22,7 +22,6 @@
 
 #include "Visitor.hxx"
 #include "Selection.hxx"
-#include "song/DetachedSong.hxx"
 
 #include <vector>
 

src/db/plugins/ProxyDatabasePlugin.cxx

@@ -36,7 +36,6 @@
 #include "config/Block.hxx"
 #include "tag/Builder.hxx"
 #include "tag/Tag.hxx"
-#include "tag/Mask.hxx"
 #include "tag/ParseName.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/RecursiveMap.hxx"

src/db/plugins/simple/DatabaseSave.cxx

@@ -19,7 +19,6 @@
 
 #include "DatabaseSave.hxx"
 #include "db/DatabaseLock.hxx"
-#include "Directory.hxx"
 #include "DirectorySave.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
 #include "fs/io/TextFile.hxx"

src/db/plugins/simple/SimpleDatabasePlugin.cxx

@@ -33,7 +33,6 @@
 #include "DatabaseSave.hxx"
 #include "db/DatabaseLock.hxx"
 #include "db/DatabaseError.hxx"
-#include "tag/Mask.hxx"
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
 #include "fs/io/FileOutputStream.hxx"

src/db/plugins/upnp/ContentDirectoryService.cxx

@@ -23,13 +23,10 @@
 #include "lib/upnp/Action.hxx"
 #include "Directory.hxx"
 #include "util/NumberParser.hxx"
-#include "util/UriUtil.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/StringFormat.hxx"
 
-#include <stdio.h>
-
 static void
 ReadResultTag(UPnPDirContent &dirbuf, IXML_Document *response)
 {

src/db/plugins/upnp/Directory.cxx

@@ -18,7 +18,6 @@
  */
 
 #include "Directory.hxx"
-#include "lib/upnp/Util.hxx"
 #include "lib/expat/ExpatParser.hxx"
 #include "Tags.hxx"
 #include "tag/Builder.hxx"

src/db/plugins/upnp/UpnpDatabasePlugin.cxx

@@ -34,12 +34,8 @@
 #include "song/Filter.hxx"
 #include "song/TagSongFilter.hxx"
 #include "db/Stats.hxx"
-#include "config/Block.hxx"
-#include "tag/Builder.hxx"
 #include "tag/Table.hxx"
-#include "tag/Mask.hxx"
 #include "fs/Traits.hxx"
-#include "Log.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/RecursiveMap.hxx"
 #include "util/SplitString.hxx"

src/db/update/Editor.hxx

@@ -21,7 +21,6 @@
 #define MPD_UPDATE_DATABASE_HXX
 
 #include "Remove.hxx"
-#include "util/Compiler.h"
 
 struct Directory;
 struct Song;

src/db/update/ExcludeList.cxx

@@ -27,13 +27,9 @@
 #include "fs/NarrowPath.hxx"
 #include "input/TextInputStream.hxx"
 #include "util/StringStrip.hxx"
-#include "Log.hxx"
 #include "config.h"
 
-#include <exception>
-
 #include <assert.h>
-#include <string.h>
 
 #ifdef HAVE_CLASS_GLOB
 

src/db/update/InotifySource.cxx

@@ -25,7 +25,6 @@
 #include "Log.hxx"
 
 #include <sys/inotify.h>
-#include <unistd.h>
 #include <errno.h>
 #include <stdint.h>
 #include <limits.h>

src/db/update/InotifySource.hxx

@@ -21,9 +21,6 @@
 #define MPD_INOTIFY_SOURCE_HXX
 
 #include "event/SocketMonitor.hxx"
-#include "util/Compiler.h"
-
-class FileDescriptor;
 
 typedef void (*mpd_inotify_callback_t)(int wd, unsigned mask,
 				       const char *name, void *ctx);

src/db/update/InotifyUpdate.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_INOTIFY_UPDATE_HXX
 #define MPD_INOTIFY_UPDATE_HXX
 
-#include "util/Compiler.h"
-
 class EventLoop;
 class Storage;
 class UpdateService;

src/db/update/Remove.hxx

@@ -22,12 +22,10 @@
 
 #include "event/DeferEvent.hxx"
 #include "thread/Mutex.hxx"
-#include "util/Compiler.h"
 
 #include <forward_list>
 #include <string>
 
-struct Song;
 class DatabaseListener;
 
 /**

src/db/update/UpdateIO.cxx

@@ -26,8 +26,6 @@
 #include "fs/AllocatedPath.hxx"
 #include "Log.hxx"
 
-#include <stdexcept>
-
 #include <errno.h>
 
 bool

src/db/update/Walk.cxx

@@ -40,7 +40,7 @@
 #include "util/UriUtil.hxx"
 #include "Log.hxx"
 
-#include <stdexcept>
+#include <exception>
 #include <memory>
 
 #include <assert.h>

src/decoder/DecoderAPI.hxx

@@ -44,8 +44,6 @@
 
 #include <stdint.h>
 
-class DecoderClient;
-
 /**
  * Throw an instance of this class to stop decoding the current song
  * (successfully).  It can be used to jump out of all of a decoder's

src/decoder/Reader.hxx

@@ -21,7 +21,6 @@
 #define MPD_DECODER_READER_HXX
 
 #include "fs/io/Reader.hxx"
-#include "util/Compiler.h"
 
 class DecoderClient;
 class InputStream;

src/decoder/Thread.cxx

@@ -35,7 +35,6 @@
 #include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
 #include "util/ScopeExit.hxx"
-#include "util/StringCompare.hxx"
 #include "thread/Name.hxx"
 #include "tag/ApeReplayGain.hxx"
 #include "Log.hxx"

src/decoder/plugins/DsdLib.cxx

@@ -33,8 +33,6 @@
 #include <id3tag.h>
 #endif
 
-#include <stdexcept>
-
 #include <string.h>
 #include <stdlib.h>
 

src/decoder/plugins/DsdiffDecoderPlugin.cxx

@@ -36,7 +36,6 @@
 #include "util/StringView.hxx"
 #include "tag/Handler.hxx"
 #include "DsdLib.hxx"
-#include "Log.hxx"
 
 struct DsdiffHeader {
 	DsdId id;

src/decoder/plugins/DsfDecoderPlugin.cxx

@@ -36,7 +36,6 @@
 #include "util/ByteOrder.hxx"
 #include "DsdLib.hxx"
 #include "tag/Handler.hxx"
-#include "Log.hxx"
 
 #include <string.h>
 

src/decoder/plugins/FaadDecoderPlugin.cxx

@@ -31,7 +31,6 @@
 #include <neaacdec.h>
 
 #include <cmath>
-#include <exception>
 
 #include <assert.h>
 #include <string.h>

src/decoder/plugins/FfmpegDecoderPlugin.cxx

@@ -24,7 +24,6 @@
 #include "FfmpegDecoderPlugin.hxx"
 #include "lib/ffmpeg/Domain.hxx"
 #include "lib/ffmpeg/Error.hxx"
-#include "lib/ffmpeg/LogError.hxx"
 #include "lib/ffmpeg/Init.hxx"
 #include "lib/ffmpeg/Buffer.hxx"
 #include "lib/ffmpeg/Frame.hxx"

src/decoder/plugins/FfmpegIo.cxx

@@ -24,8 +24,6 @@
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
 
-#include <exception>
-
 AvioStream::~AvioStream()
 {
 	if (io != nullptr) {

src/decoder/plugins/MadDecoderPlugin.cxx

@@ -21,10 +21,8 @@
 #include "MadDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
-#include "config/Block.hxx"
 #include "tag/Id3Scan.hxx"
 #include "tag/Id3ReplayGain.hxx"
-#include "tag/Rva2.hxx"
 #include "tag/Handler.hxx"
 #include "tag/ReplayGain.hxx"
 #include "tag/MixRamp.hxx"
@@ -40,8 +38,6 @@
 #include <id3tag.h>
 #endif
 
-#include <stdexcept>
-
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>

src/decoder/plugins/MpcdecDecoderPlugin.cxx

@@ -31,8 +31,6 @@
 
 #include <mpc/mpcdec.h>
 
-#include <exception>
-
 #include <math.h>
 
 struct mpc_decoder_data {

src/decoder/plugins/OggDecoder.cxx

@@ -21,8 +21,6 @@
 #include "lib/xiph/OggFind.hxx"
 #include "input/InputStream.hxx"
 
-#include <exception>
-
 /**
  * Load the end-of-stream packet and restore the previous file
  * position.

src/decoder/plugins/OpusTags.cxx

@@ -26,8 +26,6 @@
 #include "util/NumberParser.hxx"
 #include "util/StringView.hxx"
 
-#include <string>
-
 #include <stdint.h>
 
 gcc_pure

src/decoder/plugins/PcmDecoderPlugin.cxx

@@ -38,7 +38,6 @@
 
 #include <exception>
 
-#include <assert.h>
 #include <string.h>
 
 static constexpr Domain pcm_decoder_domain("pcm_decoder");

src/decoder/plugins/WavpackDecoderPlugin.cxx

@@ -31,7 +31,7 @@
 
 #include <wavpack/wavpack.h>
 
-#include <stdexcept>
+#include <algorithm>
 #include <memory>
 
 #include <cstdlib>

src/decoder/plugins/WildmidiDecoderPlugin.cxx

@@ -25,7 +25,6 @@
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
 #include "fs/Path.hxx"
-#include "Log.hxx"
 #include "PluginUnavailable.hxx"
 
 extern "C" {

src/encoder/plugins/FlacEncoderPlugin.cxx

@@ -21,7 +21,6 @@
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
 #include "pcm/Buffer.hxx"
-#include "config/Domain.hxx"
 #include "util/DynamicFifoBuffer.hxx"
 #include "util/RuntimeError.hxx"
 

src/encoder/plugins/LameEncoderPlugin.cxx

@@ -20,7 +20,6 @@
 #include "LameEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "config/Domain.hxx"
 #include "util/NumberParser.hxx"
 #include "util/ReusableArray.hxx"
 #include "util/RuntimeError.hxx"

src/encoder/plugins/OpusEncoderPlugin.cxx

@@ -20,7 +20,6 @@
 #include "OpusEncoderPlugin.hxx"
 #include "OggEncoder.hxx"
 #include "AudioFormat.hxx"
-#include "config/Domain.hxx"
 #include "util/ByteOrder.hxx"
 #include "util/StringUtil.hxx"
 

src/encoder/plugins/ShineEncoderPlugin.cxx

@@ -20,7 +20,6 @@
 #include "ShineEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "config/Domain.hxx"
 #include "util/DynamicFifoBuffer.hxx"
 #include "util/RuntimeError.hxx"
 

src/encoder/plugins/TwolameEncoderPlugin.cxx

@@ -20,7 +20,6 @@
 #include "TwolameEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "config/Domain.hxx"
 #include "util/NumberParser.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"

src/event/BufferedSocket.cxx

@@ -21,7 +21,7 @@
 #include "net/SocketError.hxx"
 #include "util/Compiler.h"
 
-#include <algorithm>
+#include <stdexcept>
 
 BufferedSocket::ssize_t
 BufferedSocket::DirectRead(void *data, size_t length) noexcept

src/event/Call.cxx

@@ -22,7 +22,6 @@
 #include "DeferEvent.hxx"
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
-#include "util/Compiler.h"
 
 #include <exception>
 

src/event/MultiSocketMonitor.hxx

@@ -23,7 +23,6 @@
 #include "IdleMonitor.hxx"
 #include "TimerEvent.hxx"
 #include "SocketMonitor.hxx"
-#include "util/Compiler.h"
 
 #include <forward_list>
 #include <iterator>

src/event/ServerSocket.cxx

@@ -23,7 +23,6 @@
 #include "net/IPv6Address.hxx"
 #include "net/StaticSocketAddress.hxx"
 #include "net/AllocatedSocketAddress.hxx"
-#include "net/SocketAddress.hxx"
 #include "net/SocketUtil.hxx"
 #include "net/SocketError.hxx"
 #include "net/UniqueSocketDescriptor.hxx"
@@ -37,7 +36,7 @@
 #include "Log.hxx"
 
 #include <string>
-#include <algorithm>
+#include <utility>
 
 #include <assert.h>
 

src/event/SocketMonitor.cxx

@@ -20,13 +20,9 @@
 #include "SocketMonitor.hxx"
 #include "Loop.hxx"
 
-#include <assert.h>
+#include <utility>
 
-#ifdef _WIN32
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#endif
+#include <assert.h>
 
 void
 SocketMonitor::Dispatch(unsigned flags) noexcept

src/filter/plugins/AutoConvertFilterPlugin.cxx

@@ -19,7 +19,6 @@
 
 #include "AutoConvertFilterPlugin.hxx"
 #include "ConvertFilterPlugin.hxx"
-#include "filter/FilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
 #include "AudioFormat.hxx"

src/filter/plugins/ConvertFilterPlugin.cxx

@@ -21,11 +21,9 @@
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
 #include "pcm/Convert.hxx"
-#include "util/Manual.hxx"
 #include "util/ConstBuffer.hxx"
 #include "AudioFormat.hxx"
 
-#include <stdexcept>
 #include <memory>
 
 #include <assert.h>

src/filter/plugins/FfmpegFilterPlugin.cxx

@@ -22,10 +22,8 @@
 #include "filter/FilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
-#include "filter/FilterRegistry.hxx"
 #include "lib/ffmpeg/Filter.hxx"
 #include "config/Block.hxx"
-#include "AudioFormat.hxx"
 
 class PreparedFfmpegFilter final : public PreparedFilter {
 	const char *const graph_string;

src/filter/plugins/NullFilterPlugin.cxx

@@ -28,7 +28,6 @@
 #include "filter/FilterPlugin.hxx"
 #include "filter/NullFilter.hxx"
 #include "filter/Prepared.hxx"
-#include "AudioFormat.hxx"
 #include "util/Compiler.h"
 
 class PreparedNullFilter final : public PreparedFilter {

src/filter/plugins/RouteFilterPlugin.cxx

@@ -40,7 +40,6 @@
  */
 
 #include "RouteFilterPlugin.hxx"
-#include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "AudioFormat.hxx"
 #include "filter/FilterPlugin.hxx"
@@ -53,8 +52,8 @@
 #include "util/ConstBuffer.hxx"
 #include "util/WritableBuffer.hxx"
 
-#include <algorithm>
 #include <array>
+#include <stdexcept>
 
 #include <string.h>
 #include <stdint.h>

src/filter/plugins/VolumeFilterPlugin.cxx

@@ -24,8 +24,6 @@
 #include "AudioFormat.hxx"
 #include "util/ConstBuffer.hxx"
 
-#include <stdexcept>
-
 class VolumeFilter final : public Filter {
 	PcmVolume pv;
 

src/fs/AllocatedPath.cxx

@@ -18,13 +18,8 @@
  */
 
 #include "AllocatedPath.hxx"
-#include "Domain.hxx"
 #include "Charset.hxx"
 #include "Features.hxx"
-#include "util/Compiler.h"
-#include "config.h"
-
-#include <exception>
 
 /* no inlining, please */
 AllocatedPath::~AllocatedPath() noexcept = default;

src/fs/Charset.cxx

@@ -31,7 +31,6 @@
 #endif
 
 #include <algorithm>
-#include <stdexcept>
 
 #include <assert.h>
 #include <string.h>

src/fs/CheckFile.cxx

@@ -26,8 +26,6 @@
 #include "DirectoryReader.hxx"
 #include "system/Error.hxx"
 
-#include <errno.h>
-
 void
 CheckDirectoryReadable(Path path_fs)
 try {

src/fs/io/GunzipReader.hxx

@@ -22,7 +22,6 @@
 
 #include "Reader.hxx"
 #include "util/StaticFifoBuffer.hxx"
-#include "util/Compiler.h"
 
 #include <zlib.h>
 

src/fs/io/GzipOutputStream.hxx

@@ -31,7 +31,6 @@
 #define GZIP_OUTPUT_STREAM_HXX
 
 #include "OutputStream.hxx"
-#include "util/Compiler.h"
 
 #include <zlib.h>
 

src/fs/io/PeekReader.hxx

@@ -21,7 +21,6 @@
 #define MPD_PEEK_READER_HXX
 
 #include "Reader.hxx"
-#include "util/Compiler.h"
 
 #include <stdint.h>
 

src/fs/io/TextFile.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_TEXT_FILE_HXX
 #define MPD_TEXT_FILE_HXX
 
-#include "util/Compiler.h"
 #include "config.h"
 
 #include <memory>

src/input/BufferedInputStream.cxx

@@ -18,8 +18,6 @@
  */
 
 #include "BufferedInputStream.hxx"
-#include "thread/Cond.hxx"
-#include "thread/Name.hxx"
 
 #include <string.h>
 

src/input/BufferingInputStream.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "BufferingInputStream.hxx"
-#include "thread/Cond.hxx"
+#include "InputStream.hxx"
 #include "thread/Name.hxx"
 
 #include <string.h>

src/input/BufferingInputStream.hxx

@@ -20,10 +20,10 @@
 #ifndef MPD_BUFFERING_INPUT_STREAM_BUFFER_HXX
 #define MPD_BUFFERING_INPUT_STREAM_BUFFER_HXX
 
-#include "InputStream.hxx"
 #include "Ptr.hxx"
 #include "Handler.hxx"
 #include "thread/Thread.hxx"
+#include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
 #include "util/SparseBuffer.hxx"
 

src/input/ProxyInputStream.cxx

@@ -20,7 +20,7 @@
 #include "ProxyInputStream.hxx"
 #include "tag/Tag.hxx"
 
-#include <stdexcept>
+#include <utility>
 
 ProxyInputStream::ProxyInputStream(InputStreamPtr _input) noexcept
 	:InputStream(_input->GetURI(), _input->mutex),

src/input/Reader.hxx

@@ -21,9 +21,7 @@
 #define MPD_INPUT_READER_HXX
 
 #include "fs/io/Reader.hxx"
-#include "util/Compiler.h"
 
-struct Decoder;
 class InputStream;
 
 /**

src/input/TextInputStream.cxx

@@ -20,9 +20,6 @@
 #include "TextInputStream.hxx"
 #include "InputStream.hxx"
 #include "util/TextFile.hxx"
-#include "Log.hxx"
-
-#include <stdexcept>
 
 #include <assert.h>
 

src/input/cache/Item.cxx

@@ -19,6 +19,7 @@
 
 #include "Item.hxx"
 #include "Lease.hxx"
+#include "input/InputStream.hxx"
 
 #include <assert.h>
 

src/input/cache/Item.hxx

@@ -22,12 +22,10 @@
 
 #include "input/BufferingInputStream.hxx"
 #include "thread/Mutex.hxx"
-#include "util/SparseBuffer.hxx"
 
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set_hook.hpp>
 
-#include <memory>
 #include <string>
 
 class InputCacheLease;

src/input/cache/Manager.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_INPUT_CACHE_MANAGER_HXX
 #define MPD_INPUT_CACHE_MANAGER_HXX
 
-#include "input/Offset.hxx"
 #include "thread/Mutex.hxx"
 #include "util/Compiler.h"
 

src/input/plugins/AlsaInputPlugin.cxx

@@ -30,11 +30,9 @@
 #include "../InputPlugin.hxx"
 #include "../AsyncInputStream.hxx"
 #include "event/Call.hxx"
-#include "thread/Cond.hxx"
 #include "config/Block.hxx"
 #include "util/Domain.hxx"
 #include "util/RuntimeError.hxx"
-#include "util/StringCompare.hxx"
 #include "util/ASCII.hxx"
 #include "util/DivideString.hxx"
 #include "AudioParser.hxx"

src/input/plugins/CdioParanoiaInputPlugin.cxx

@@ -21,7 +21,6 @@
  * CD-Audio handling (requires libcdio_paranoia)
  */
 
-#include "config.h"
 #include "CdioParanoiaInputPlugin.hxx"
 #include "lib/cdio/Paranoia.hxx"
 #include "../InputStream.hxx"
@@ -34,7 +33,6 @@
 #include "fs/AllocatedPath.hxx"
 #include "Log.hxx"
 #include "config/Block.hxx"
-#include "config/Domain.hxx"
 
 #include <stdio.h>
 #include <stdint.h>

src/input/plugins/CurlInputPlugin.cxx

@@ -19,7 +19,6 @@
 
 #include "CurlInputPlugin.hxx"
 #include "lib/curl/Error.hxx"
-#include "lib/curl/Easy.hxx"
 #include "lib/curl/Global.hxx"
 #include "lib/curl/Init.hxx"
 #include "lib/curl/Request.hxx"
@@ -36,10 +35,8 @@
 #include "event/Call.hxx"
 #include "event/Loop.hxx"
 #include "util/ASCII.hxx"
-#include "util/StringUtil.hxx"
 #include "util/StringFormat.hxx"
 #include "util/NumberParser.hxx"
-#include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
 #include "PluginUnavailable.hxx"

src/input/plugins/FfmpegInputPlugin.cxx

@@ -23,15 +23,9 @@
 #include "FfmpegInputPlugin.hxx"
 #include "lib/ffmpeg/IOContext.hxx"
 #include "lib/ffmpeg/Init.hxx"
-#include "lib/ffmpeg/Error.hxx"
 #include "../InputStream.hxx"
 #include "PluginUnavailable.hxx"
-#include "util/StringAPI.hxx"
 #include "../InputPlugin.hxx"
-#include <iostream>
-#include <exception>
-#include <typeinfo>
-#include <stdexcept>
 
 class FfmpegInputStream final : public InputStream {
 	Ffmpeg::IOContext io;
@@ -90,7 +84,7 @@ input_ffmpeg_protocols() {
 			protocols.emplace(schema);
 		}
 	}
-	
+
 	return protocols;
 }
 

src/input/plugins/FileInputPlugin.cxx

@@ -19,7 +19,6 @@
 
 #include "FileInputPlugin.hxx"
 #include "../InputStream.hxx"
-#include "../InputPlugin.hxx"
 #include "fs/Path.hxx"
 #include "fs/FileInfo.hxx"
 #include "fs/io/FileReader.hxx"

src/input/plugins/MmsInputPlugin.cxx

@@ -21,7 +21,6 @@
 #include "input/ThreadInputStream.hxx"
 #include "input/InputPlugin.hxx"
 #include "system/Error.hxx"
-#include "util/ASCII.hxx"
 
 #include <libmms/mmsx.h>
 

src/input/plugins/NfsInputPlugin.cxx

@@ -22,7 +22,6 @@
 #include "../InputPlugin.hxx"
 #include "lib/nfs/Glue.hxx"
 #include "lib/nfs/FileReader.hxx"
-#include "util/ASCII.hxx"
 
 /**
  * Do not buffer more than this number of bytes.  It should be a

src/input/plugins/QobuzInputPlugin.cxx

@@ -31,11 +31,8 @@
 #include "thread/Mutex.hxx"
 #include "util/StringCompare.hxx"
 
-#include <stdexcept>
 #include <memory>
 
-#include <time.h>
-
 static QobuzClient *qobuz_client;
 
 class QobuzInputStream final

src/input/plugins/QobuzLoginRequest.cxx

@@ -22,7 +22,6 @@
 #include "QobuzSession.hxx"
 #include "lib/curl/Form.hxx"
 #include "lib/yajl/Callbacks.hxx"
-#include "util/RuntimeError.hxx"
 
 using Wrapper = Yajl::CallbacksWrapper<QobuzLoginRequest::ResponseParser>;
 static constexpr yajl_callbacks parse_callbacks = {

src/input/plugins/QobuzTrackRequest.cxx

@@ -21,7 +21,6 @@
 #include "QobuzErrorParser.hxx"
 #include "QobuzClient.hxx"
 #include "lib/yajl/Callbacks.hxx"
-#include "util/RuntimeError.hxx"
 
 using Wrapper = Yajl::CallbacksWrapper<QobuzTrackRequest::ResponseParser>;
 static constexpr yajl_callbacks parse_callbacks = {

src/input/plugins/SmbclientInputPlugin.cxx

@@ -25,7 +25,6 @@
 #include "../MaybeBufferedInputStream.hxx"
 #include "PluginUnavailable.hxx"
 #include "system/Error.hxx"
-#include "util/ASCII.hxx"
 
 #include <libsmbclient.h>
 

src/input/plugins/TidalInputPlugin.cxx

@@ -34,7 +34,6 @@
 #include "util/StringCompare.hxx"
 #include "Log.hxx"
 
-#include <stdexcept>
 #include <memory>
 
 static constexpr Domain tidal_domain("tidal");

src/input/plugins/TidalSessionManager.cxx

@@ -18,7 +18,6 @@
  */
 
 #include "TidalSessionManager.hxx"
-#include "lib/curl/Global.hxx"
 #include "util/Domain.hxx"
 
 #include "Log.hxx"

src/input/plugins/TidalSessionManager.hxx

@@ -30,9 +30,6 @@
 #include <memory>
 #include <string>
 
-class CurlRequest;
-class TidalLoginRequest;
-
 /**
  * Callback class for #TidalSessionManager.
  *

src/lib/alsa/Version.cxx

@@ -21,6 +21,8 @@
 
 #include <alsa/asoundlib.h>
 
+#include <stdlib.h>
+
 gcc_pure
 static uint_least32_t
 ParseAlsaVersion(const char *p) noexcept

src/lib/curl/Init.cxx

@@ -32,8 +32,6 @@
 #include "event/Call.hxx"
 #include "thread/Mutex.hxx"
 
-#include <atomic>
-
 #include <assert.h>
 
 Mutex CurlInit::mutex;

src/lib/dbus/Connection.hxx

@@ -35,8 +35,7 @@
 
 #include <dbus/dbus.h>
 
-#include <algorithm>
-#include <stdexcept>
+#include <utility>
 
 namespace ODBus {
 

src/lib/dbus/Message.hxx

@@ -35,8 +35,8 @@
 
 #include <dbus/dbus.h>
 
-#include <algorithm>
 #include <stdexcept>
+#include <utility>
 
 namespace ODBus {
 

src/lib/dbus/Watch.hxx

@@ -36,7 +36,6 @@
 #include "Connection.hxx"
 #include "event/SocketMonitor.hxx"
 #include "event/DeferEvent.hxx"
-#include "util/Compiler.h"
 
 #include <dbus/dbus.h>
 

src/lib/ffmpeg/Init.cxx

@@ -37,4 +37,3 @@ FfmpegInit()
 	av_register_all();
 #endif
 }
-

src/lib/ffmpeg/LogCallback.cxx

@@ -30,8 +30,6 @@ extern "C" {
 #include <libavutil/log.h>
 }
 
-#include <stdio.h>
-
 gcc_const
 static LogLevel
 FfmpegImportLogLevel(int level) noexcept

src/lib/gcrypt/MD5.cxx

@@ -31,8 +31,6 @@
 #include "Hash.hxx"
 #include "util/HexFormat.hxx"
 
-#include <stdio.h>
-
 std::array<uint8_t, 16>
 MD5(ConstBuffer<void> input) noexcept
 {

src/lib/nfs/Connection.hxx

@@ -24,6 +24,7 @@
 #include "event/SocketMonitor.hxx"
 #include "event/TimerEvent.hxx"
 #include "event/DeferEvent.hxx"
+#include "util/Compiler.h"
 
 #include <string>
 #include <list>

src/lib/pcre/UniqueRegex.hxx

@@ -34,9 +34,8 @@
 #define UNIQUE_REGEX_HXX
 
 #include "RegexPointer.hxx"
-#include "util/StringView.hxx"
 
-#include <algorithm>
+#include <utility>
 
 #include <pcre.h>
 

src/lib/sqlite/Util.hxx

@@ -20,6 +20,7 @@
 #ifndef MPD_SQLITE_UTIL_HXX
 #define MPD_SQLITE_UTIL_HXX
 
+#include "util/Compiler.h"
 #include "Error.hxx"
 
 #include <sqlite3.h>

src/lib/upnp/ContentDirectoryService.cxx

@@ -21,11 +21,12 @@
 #include "UniqueIxml.hxx"
 #include "Device.hxx"
 #include "ixmlwrap.hxx"
-#include "Action.hxx"
 #include "util/UriUtil.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/SplitString.hxx"
 
+#include <upnptools.h>
+
 ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device,
 						 const UPnPService &service) noexcept
 	:m_actionURL(uri_apply_base(service.controlURL, device.URLBase)),

src/lib/upnp/Discovery.hxx

@@ -28,7 +28,6 @@
 #include "lib/curl/Request.hxx"
 #include "thread/Mutex.hxx"
 #include "event/DeferEvent.hxx"
-#include "util/Compiler.h"
 
 #include <upnp.h>
 
@@ -37,7 +36,6 @@
 #include <list>
 #include <vector>
 #include <string>
-#include <memory>
 #include <chrono>
 
 #if UPNP_VERSION < 10800

src/lib/upnp/Util.cxx

@@ -19,8 +19,6 @@
 
 #include "Util.hxx"
 
-#include <assert.h>
-
 /** Get rid of white space at both ends */
 void
 trimstring(std::string &s, const char *ws) noexcept

src/lib/upnp/ixmlwrap.hxx

@@ -19,8 +19,6 @@
 
 #include <ixml.h>
 
-#include <string>
-
 namespace ixmlwrap {
 	/**
 	 * Retrieve the text content for the first element of given

src/lib/xiph/FlacIOHandle.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_FLAC_IO_HANDLE_HXX
 #define MPD_FLAC_IO_HANDLE_HXX
 
-#include "util/Compiler.h"
 #include "input/InputStream.hxx"
 
 #include <FLAC/callback.h>

src/lib/xiph/FlacStreamMetadata.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_FLAC_STREAM_METADATA_HXX
 #define MPD_FLAC_STREAM_METADATA_HXX
 
-#include <FLAC/metadata.h>
+#include <FLAC/format.h>
 
 class TagHandler;
 class MixRampInfo;

src/lib/xiph/OggVisitor.hxx

@@ -25,8 +25,6 @@
 
 #include <ogg/ogg.h>
 
-#include <stddef.h>
-
 class Reader;
 
 /**

src/mixer/MixerAll.cxx

@@ -21,12 +21,9 @@
 #include "MixerControl.hxx"
 #include "MixerInternal.hxx"
 #include "MixerList.hxx"
-#include "output/Filtered.hxx"
 #include "pcm/Volume.hxx"
 #include "Log.hxx"
 
-#include <stdexcept>
-
 #include <assert.h>
 
 gcc_pure

src/mixer/MixerType.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_MIXER_TYPE_HXX
 #define MPD_MIXER_TYPE_HXX
 
-#include "util/Compiler.h"
-
 enum class MixerType {
 	/** mixer disabled */
 	NONE,

src/mixer/plugins/PulseMixerPlugin.cxx

@@ -18,7 +18,6 @@
  */
 
 #include "PulseMixerPlugin.hxx"
-#include "lib/pulse/Domain.hxx"
 #include "lib/pulse/LogError.hxx"
 #include "lib/pulse/LockGuard.hxx"
 #include "mixer/MixerInternal.hxx"

src/mixer/plugins/SndioMixerPlugin.cxx

@@ -17,11 +17,8 @@
  */
 
 #include "mixer/MixerInternal.hxx"
-#include "mixer/Listener.hxx"
 #include "output/plugins/SndioOutputPlugin.hxx"
 
-#include <sndio.h>
-
 class SndioMixer final : public Mixer {
 	SndioOutput &output;
 

src/neighbor/Glue.cxx

@@ -23,7 +23,6 @@
 #include "NeighborPlugin.hxx"
 #include "Info.hxx"
 #include "config/Data.hxx"
-#include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "util/RuntimeError.hxx"
 

src/neighbor/plugins/SmbclientNeighborPlugin.cxx

@@ -33,7 +33,7 @@
 
 #include <libsmbclient.h>
 
-#include <algorithm>
+#include <utility>
 
 class SmbclientNeighborExplorer final : public NeighborExplorer {
 	struct Server {

src/neighbor/plugins/UdisksNeighborPlugin.cxx

@@ -36,9 +36,7 @@
 #include "util/Manual.hxx"
 #include "Log.hxx"
 
-#include <stdexcept>
 #include <string>
-#include <list>
 #include <map>
 
 static NeighborInfo

src/neighbor/plugins/UpnpNeighborPlugin.cxx

@@ -27,8 +27,6 @@
 #include "neighbor/Info.hxx"
 #include "Log.hxx"
 
-#include <stdexcept>
-
 class UpnpNeighborExplorer final
 	: public NeighborExplorer, UPnPDiscoveryListener {
 	struct Server {

src/net/AddressInfo.hxx

@@ -32,7 +32,6 @@
 
 #include "SocketAddress.hxx"
 
-#include <algorithm>
 #include <utility>
 
 #ifdef _WIN32

src/net/AllocatedSocketAddress.cxx

@@ -39,14 +39,6 @@
 #include <sys/un.h>
 #endif
 
-#ifdef HAVE_TCP
-#ifdef _WIN32
-#include <ws2tcpip.h>
-#else
-#include <netinet/in.h>
-#endif
-#endif
-
 AllocatedSocketAddress &
 AllocatedSocketAddress::operator=(SocketAddress src) noexcept
 {

src/net/AllocatedSocketAddress.hxx

@@ -34,7 +34,7 @@
 #include "Features.hxx"
 #include "util/Compiler.h"
 
-#include <algorithm>
+#include <utility>
 
 #include <stdlib.h>
 

src/net/Resolver.hxx

@@ -33,7 +33,6 @@
 #ifndef NET_RESOLVER_HXX
 #define NET_RESOLVER_HXX
 
-struct addrinfo;
 class AddressInfoList;
 
 /**

src/net/StaticSocketAddress.cxx

@@ -37,14 +37,6 @@
 
 #include <string.h>
 
-#ifdef HAVE_TCP
-#ifdef _WIN32
-#include <ws2tcpip.h>
-#else
-#include <netinet/in.h>
-#endif
-#endif
-
 StaticSocketAddress &
 StaticSocketAddress::operator=(SocketAddress other) noexcept
 {

src/output/Control.cxx

@@ -19,14 +19,10 @@
 
 #include "Control.hxx"
 #include "Filtered.hxx"
-#include "Domain.hxx"
 #include "mixer/MixerControl.hxx"
-#include "filter/plugins/ReplayGainFilterPlugin.hxx"
 #include "config/Block.hxx"
 #include "Log.hxx"
 
-#include <stdexcept>
-
 #include <assert.h>
 
 /** after a failure, wait this duration before

src/output/Control.hxx

@@ -28,16 +28,11 @@
 #include "system/PeriodClock.hxx"
 #include "util/Compiler.h"
 
-#include <utility>
 #include <exception>
 #include <memory>
 #include <string>
 #include <map>
 
-#ifndef NDEBUG
-#include <assert.h>
-#endif
-
 #include <stdint.h>
 
 enum class ReplayGainMode : uint8_t;

src/output/Filtered.hxx

@@ -30,12 +30,10 @@
 
 class FilterFactory;
 class PreparedFilter;
-class MusicPipe;
 class EventLoop;
 class Mixer;
 class MixerListener;
 struct MixerPlugin;
-struct MusicChunk;
 struct ConfigBlock;
 class AudioOutput;
 struct AudioOutputDefaults;

src/output/Init.cxx

@@ -26,7 +26,6 @@
 #include "mixer/MixerList.hxx"
 #include "mixer/MixerType.hxx"
 #include "mixer/MixerControl.hxx"
-#include "mixer/plugins/SoftwareMixerPlugin.hxx"
 #include "filter/LoadChain.hxx"
 #include "filter/Prepared.hxx"
 #include "filter/plugins/AutoConvertFilterPlugin.hxx"
@@ -35,9 +34,6 @@
 #include "filter/plugins/ChainFilterPlugin.hxx"
 #include "filter/plugins/VolumeFilterPlugin.hxx"
 #include "filter/plugins/NormalizeFilterPlugin.hxx"
-#include "config/Domain.hxx"
-#include "config/Option.hxx"
-#include "config/Block.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/StringFormat.hxx"
 #include "Log.hxx"

src/output/Interface.hxx

@@ -23,7 +23,6 @@
 #include <map>
 #include <string>
 #include <chrono>
-#include <stdexcept>
 
 struct AudioFormat;
 struct Tag;

src/output/MultipleOutputs.cxx

@@ -20,7 +20,6 @@
 #include "MultipleOutputs.hxx"
 #include "Filtered.hxx"
 #include "Defaults.hxx"
-#include "Domain.hxx"
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 #include "filter/Factory.hxx"

src/output/OutputCommand.cxx

@@ -26,9 +26,7 @@
 
 #include "OutputCommand.hxx"
 #include "MultipleOutputs.hxx"
-#include "Filtered.hxx"
 #include "Client.hxx"
-#include "player/Control.hxx"
 #include "mixer/MixerControl.hxx"
 #include "mixer/Volume.hxx"
 #include "Idle.hxx"

src/output/OutputPlugin.hxx

@@ -22,13 +22,7 @@
 
 #include "util/Compiler.h"
 
-#include <chrono>
-
-#include <stddef.h>
-
 struct ConfigBlock;
-struct AudioFormat;
-struct Tag;
 class AudioOutput;
 struct MixerPlugin;
 class EventLoop;

src/output/Print.cxx

@@ -24,7 +24,6 @@
 
 #include "Print.hxx"
 #include "MultipleOutputs.hxx"
-#include "Filtered.hxx"
 #include "client/Response.hxx"
 
 void

src/output/Source.hxx

@@ -20,7 +20,6 @@
 #ifndef AUDIO_OUTPUT_SOURCE_HXX
 #define AUDIO_OUTPUT_SOURCE_HXX
 
-#include "util/Compiler.h"
 #include "SharedPipeConsumer.hxx"
 #include "AudioFormat.hxx"
 #include "ReplayGainMode.hxx"

src/output/State.cxx

@@ -24,7 +24,6 @@
 
 #include "State.hxx"
 #include "MultipleOutputs.hxx"
-#include "Filtered.hxx"
 #include "Domain.hxx"
 #include "Log.hxx"
 #include "fs/io/BufferedOutputStream.hxx"

src/output/Thread.cxx

@@ -21,7 +21,6 @@
 #include "Filtered.hxx"
 #include "Client.hxx"
 #include "Domain.hxx"
-#include "mixer/MixerInternal.hxx"
 #include "thread/Util.hxx"
 #include "thread/Slack.hxx"
 #include "thread/Name.hxx"

src/output/Timer.cxx

@@ -20,8 +20,6 @@
 #include "Timer.hxx"
 #include "AudioFormat.hxx"
 
-#include <limits>
-
 #include <assert.h>
 
 Timer::Timer(const AudioFormat af)

src/output/plugins/AlsaOutputPlugin.cxx

@@ -34,7 +34,6 @@
 #include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
 #include "util/ConstBuffer.hxx"
-#include "util/ScopeExit.hxx"
 #include "util/StringView.hxx"
 #include "event/MultiSocketMonitor.hxx"
 #include "event/DeferEvent.hxx"

src/output/plugins/JackOutputPlugin.cxx

@@ -20,7 +20,6 @@
 #include "config.h"
 #include "JackOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "config/Domain.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/IterableSplitString.hxx"

src/output/plugins/PulseOutputPlugin.cxx

@@ -18,7 +18,6 @@
  */
 
 #include "PulseOutputPlugin.hxx"
-#include "lib/pulse/Domain.hxx"
 #include "lib/pulse/Error.hxx"
 #include "lib/pulse/LogError.hxx"
 #include "lib/pulse/LockGuard.hxx"
@@ -26,7 +25,6 @@
 #include "mixer/MixerList.hxx"
 #include "mixer/plugins/PulseMixerPlugin.hxx"
 #include "util/ScopeExit.hxx"
-#include "Log.hxx"
 
 #include <pulse/thread-mainloop.h>
 #include <pulse/context.h>

src/output/plugins/RecorderOutputPlugin.cxx

@@ -23,7 +23,6 @@
 #include "encoder/ToOutputStream.hxx"
 #include "encoder/EncoderInterface.hxx"
 #include "encoder/Configured.hxx"
-#include "config/Domain.hxx"
 #include "config/Path.hxx"
 #include "Log.hxx"
 #include "fs/AllocatedPath.hxx"

src/output/plugins/ShoutOutputPlugin.cxx

@@ -34,7 +34,6 @@
 #include <memory>
 
 #include <assert.h>
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 

src/output/plugins/httpd/HttpdOutputPlugin.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "HttpdOutputPlugin.hxx"
 #include "HttpdInternal.hxx"
 #include "HttpdClient.hxx"
@@ -26,19 +25,16 @@
 #include "encoder/Configured.hxx"
 #include "net/UniqueSocketDescriptor.hxx"
 #include "net/SocketAddress.hxx"
-#include "net/ToString.hxx"
 #include "Page.hxx"
 #include "IcyMetaDataServer.hxx"
 #include "event/Call.hxx"
 #include "util/Domain.hxx"
 #include "util/DeleteDisposer.hxx"
-#include "Log.hxx"
 #include "config/Net.hxx"
 
 #include <assert.h>
 
 #include <string.h>
-#include <errno.h>
 
 const Domain httpd_output_domain("httpd_output");
 

src/pcm/ConfiguredResampler.cxx

@@ -21,7 +21,6 @@
 #include "FallbackResampler.hxx"
 #include "config/Data.hxx"
 #include "config/Option.hxx"
-#include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "config/Param.hxx"
 #include "util/RuntimeError.hxx"

src/pcm/Export.cxx

@@ -18,7 +18,6 @@
  */
 
 #include "Export.hxx"
-#include "AudioFormat.hxx"
 #include "Order.hxx"
 #include "Pack.hxx"
 #include "Silence.hxx"

src/pcm/Export.hxx

@@ -33,7 +33,6 @@
 #include <stdint.h>
 
 template<typename T> struct ConstBuffer;
-struct AudioFormat;
 
 /**
  * An object that handles export of PCM samples to some instance

src/pcm/FallbackResampler.hxx

@@ -23,7 +23,6 @@
 #include "Resampler.hxx"
 #include "Buffer.hxx"
 #include "AudioFormat.hxx"
-#include "util/Compiler.h"
 
 /**
  * A naive resampler that is used when no external library was found

src/pcm/FloatConvert.hxx

@@ -21,6 +21,7 @@
 #define MPD_PCM_FLOAT_CONVERT_HXX
 
 #include "Traits.hxx"
+#include "Clamp.hxx"
 
 /**
  * Convert from float to an integer sample format.

src/pcm/GlueResampler.cxx

@@ -20,6 +20,7 @@
 #include "GlueResampler.hxx"
 #include "ConfiguredResampler.hxx"
 #include "Resampler.hxx"
+#include "AudioFormat.hxx"
 
 #include <assert.h>
 

src/pcm/GlueResampler.hxx

@@ -20,9 +20,10 @@
 #ifndef MPD_GLUE_RESAMPLER_HXX
 #define MPD_GLUE_RESAMPLER_HXX
 
-#include "AudioFormat.hxx"
+#include "SampleFormat.hxx"
 #include "FormatConverter.hxx"
 
+struct AudioFormat;
 class PcmResampler;
 template<typename T> struct ConstBuffer;
 

src/pcm/LibsamplerateResampler.hxx

@@ -23,7 +23,6 @@
 #include "Resampler.hxx"
 #include "Buffer.hxx"
 #include "AudioFormat.hxx"
-#include "util/Compiler.h"
 
 #include <samplerate.h>
 

src/pcm/PcmFormat.cxx

@@ -19,7 +19,6 @@
 
 #include "PcmFormat.hxx"
 #include "Buffer.hxx"
-#include "Clamp.hxx"
 #include "Traits.hxx"
 #include "FloatConvert.hxx"
 #include "ShiftConvert.hxx"

src/pcm/SoxrResampler.hxx

@@ -22,7 +22,6 @@
 
 #include "Resampler.hxx"
 #include "Buffer.hxx"
-#include "util/Compiler.h"
 
 struct AudioFormat;
 struct ConfigBlock;

src/pcm/dsd2pcm/dsd2pcm.h

@@ -32,7 +32,6 @@ or implied, of Sebastian Gesemann.
 #define DSD2PCM_H_INCLUDED
 
 #include <stddef.h>
-#include <string.h>
 
 #ifdef __cplusplus
 extern "C" {

src/playlist/MemorySongEnumerator.hxx

@@ -22,7 +22,6 @@
 
 #include "SongEnumerator.hxx"
 #include "song/DetachedSong.hxx"
-#include "util/Compiler.h"
 
 #include <forward_list>
 

src/playlist/PlaylistAny.cxx

@@ -22,7 +22,6 @@
 #include "PlaylistStream.hxx"
 #include "PlaylistMapper.hxx"
 #include "SongEnumerator.hxx"
-#include "util/UriUtil.hxx"
 #include "config.h"
 
 std::unique_ptr<SongEnumerator>

src/playlist/PlaylistRegistry.cxx

@@ -41,7 +41,6 @@
 #include "config/Block.hxx"
 
 #include <assert.h>
-#include <string.h>
 
 const struct playlist_plugin *const playlist_plugins[] = {
 	&extm3u_playlist_plugin,

src/playlist/plugins/AsxPlaylistPlugin.cxx

@@ -24,7 +24,6 @@
 #include "util/ASCII.hxx"
 #include "util/StringView.hxx"
 #include "lib/expat/ExpatParser.hxx"
-#include "Log.hxx"
 
 /**
  * This is the state object for our XML parser.

src/playlist/plugins/RssPlaylistPlugin.cxx

@@ -24,7 +24,6 @@
 #include "util/ASCII.hxx"
 #include "util/StringView.hxx"
 #include "lib/expat/ExpatParser.hxx"
-#include "Log.hxx"
 
 /**
  * This is the state object for the our XML parser.

src/playlist/plugins/XspfPlaylistPlugin.cxx

@@ -25,7 +25,6 @@
 #include "tag/Builder.hxx"
 #include "util/StringView.hxx"
 #include "lib/expat/ExpatParser.hxx"
-#include "Log.hxx"
 
 #include <string.h>
 

src/protocol/Ack.hxx

@@ -23,6 +23,7 @@
 #include "util/StringFormat.hxx"
 
 #include <stdexcept>
+#include <utility>
 
 class Domain;
 

src/queue/PlaylistEdit.cxx

@@ -30,8 +30,6 @@
 #include "song/DetachedSong.hxx"
 #include "SongLoader.hxx"
 
-#include <memory>
-
 #include <stdlib.h>
 
 void

src/queue/Queue.hxx

@@ -25,7 +25,7 @@
 #include "SingleMode.hxx"
 #include "util/LazyRandomEngine.hxx"
 
-#include <algorithm>
+#include <utility>
 
 #include <assert.h>
 #include <stdint.h>

src/song/BaseSongFilter.hxx

@@ -21,7 +21,6 @@
 #define MPD_BASE_SONG_FILTER_HXX
 
 #include "ISongFilter.hxx"
-#include "util/Compiler.h"
 
 class BaseSongFilter final : public ISongFilter {
 	std::string value;

src/song/Filter.cxx

@@ -25,24 +25,17 @@
 #include "TagSongFilter.hxx"
 #include "ModifiedSinceSongFilter.hxx"
 #include "AudioFormatSongFilter.hxx"
-#include "LightSong.hxx"
 #include "AudioParser.hxx"
 #include "tag/ParseName.hxx"
-#include "tag/Tag.hxx"
-#include "time/ChronoUtil.hxx"
 #include "time/ISO8601.hxx"
 #include "util/CharUtil.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/RuntimeError.hxx"
-#include "util/StringAPI.hxx"
 #include "util/StringCompare.hxx"
 #include "util/StringStrip.hxx"
 #include "util/StringView.hxx"
 #include "util/ASCII.hxx"
 #include "util/UriUtil.hxx"
-#include "lib/icu/CaseFold.hxx"
-
-#include <exception>
 
 #include <assert.h>
 #include <stdlib.h>

src/song/StringFilter.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "StringFilter.hxx"
-#include "util/StringCompare.hxx"
+#include "util/StringAPI.hxx"
 
 #include <assert.h>
 

src/song/TagSongFilter.hxx

@@ -25,10 +25,8 @@
 
 #include <stdint.h>
 
-template<typename T> struct ConstBuffer;
 enum TagType : uint8_t;
 struct Tag;
-struct TagItem;
 struct LightSong;
 
 class TagSongFilter final : public ISongFilter {

src/sticker/Database.hxx

@@ -44,7 +44,6 @@
 
 #include "Match.hxx"
 #include "lib/sqlite/Database.hxx"
-#include "util/Compiler.h"
 
 #include <sqlite3.h>
 

src/storage/Configured.cxx

@@ -22,14 +22,11 @@
 #include "StorageInterface.hxx"
 #include "plugins/LocalStorage.hxx"
 #include "config/Data.hxx"
-#include "config/Domain.hxx"
 #include "fs/StandardDirectory.hxx"
 #include "fs/CheckFile.hxx"
 #include "util/UriUtil.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <assert.h>
-
 static std::unique_ptr<Storage>
 CreateConfiguredStorageUri(EventLoop &event_loop, const char *uri)
 {

src/storage/Registry.cxx

@@ -27,7 +27,6 @@
 #include "plugins/CurlStorage.hxx"
 #include "config.h"
 
-#include <assert.h>
 #include <string.h>
 
 const StoragePlugin *const storage_plugins[] = {

src/storage/plugins/CurlStorage.cxx

@@ -29,11 +29,9 @@
 #include "lib/curl/Handler.hxx"
 #include "lib/expat/ExpatParser.hxx"
 #include "fs/Traits.hxx"
-#include "event/Call.hxx"
 #include "event/DeferEvent.hxx"
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
-#include "time/ChronoUtil.hxx"
 #include "time/Parser.hxx"
 #include "util/ASCII.hxx"
 #include "util/IterableSplitString.hxx"
@@ -42,10 +40,9 @@
 #include "util/StringFormat.hxx"
 #include "util/UriUtil.hxx"
 
-#include <algorithm>
 #include <memory>
 #include <string>
-#include <list>
+#include <utility>
 
 #include <assert.h>
 

src/storage/plugins/UdisksStorage.cxx

@@ -25,7 +25,6 @@
 #include "lib/dbus/Glue.hxx"
 #include "lib/dbus/AsyncRequest.hxx"
 #include "lib/dbus/Message.hxx"
-#include "lib/dbus/PendingCall.hxx"
 #include "lib/dbus/AppendIter.hxx"
 #include "lib/dbus/ReadIter.hxx"
 #include "lib/dbus/ObjectManager.hxx"

src/system/Clock.hxx

@@ -20,12 +20,12 @@
 #ifndef MPD_CLOCK_H
 #define MPD_CLOCK_H
 
+#ifdef _WIN32
+
 #include "util/Compiler.h"
 
 #include <chrono>
 
-#ifdef _WIN32
-
 /**
  * Returns the uptime of the current process in seconds.
  */

src/system/EpollFD.hxx

@@ -35,8 +35,6 @@
 #include <sys/epoll.h>
 #include <stdint.h>
 
-struct epoll_event;
-
 /**
  * A class that wraps Linux epoll.
  */

src/system/EventPipe.cxx

@@ -20,7 +20,6 @@
 #include "EventPipe.hxx"
 #include "FileDescriptor.hxx"
 #include "system/Error.hxx"
-#include "util/ScopeExit.hxx"
 #include "util/Compiler.h"
 
 #include <assert.h>

src/tag/Builder.cxx

@@ -25,6 +25,7 @@
 #include "util/WritableBuffer.hxx"
 #include "util/StringView.hxx"
 
+#include <algorithm>
 #include <array>
 
 #include <assert.h>

src/tag/Generic.cxx

@@ -26,8 +26,6 @@
 #include "input/LocalOpen.hxx"
 #include "config.h"
 
-#include <exception>
-
 bool
 ScanGenericTags(InputStream &is, TagHandler &handler)
 {

src/tag/Handler.cxx

@@ -20,7 +20,6 @@
 #include "Handler.hxx"
 #include "Builder.hxx"
 #include "AudioFormat.hxx"
-#include "util/ASCII.hxx"
 #include "util/CharUtil.hxx"
 #include "util/StringView.hxx"
 

src/tag/ReplayGain.cxx

@@ -24,7 +24,6 @@
 #include "util/NumberParser.hxx"
 
 #include <assert.h>
-#include <stdlib.h>
 
 template<typename T>
 static bool

src/tag/Tag.hxx

@@ -25,8 +25,8 @@
 #include "Chrono.hxx"
 #include "util/Compiler.h"
 
-#include <algorithm>
 #include <memory>
+#include <utility>
 
 /**
  * The meta information about a song file.  It is a MPD specific

src/time/ISO8601.hxx

@@ -35,7 +35,6 @@
 
 #include "util/Compiler.h"
 
-#include <string>
 #include <chrono>
 
 #include <stddef.h>

src/unix/Daemon.cxx

@@ -21,7 +21,6 @@
 #include "Daemon.hxx"
 #include "system/Error.hxx"
 #include "fs/AllocatedPath.hxx"
-#include "fs/FileSystem.hxx"
 #include "util/RuntimeError.hxx"
 
 #ifndef _WIN32

src/util/AllocatedString.hxx

@@ -32,7 +32,6 @@
 
 #include "StringPointer.hxx"
 
-#include <utility>
 #include <algorithm>
 
 /**

src/util/DivideString.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_DIVIDE_STRING_HXX
 #define MPD_DIVIDE_STRING_HXX
 
-#include "Compiler.h"
-
 #include <assert.h>
 
 /**

src/util/Exception.hxx

@@ -34,6 +34,7 @@
 
 #include <exception>
 #include <string>
+#include <utility>
 
 /**
  * Throws the specified exception.  There is an overload for

src/util/HexFormat.hxx

@@ -34,6 +34,7 @@
 #include "StringBuffer.hxx"
 #include "Compiler.h"
 
+#include <stddef.h>
 #include <stdint.h>
 
 /**

src/util/OptionParser.cxx

@@ -22,8 +22,6 @@
 #include "util/RuntimeError.hxx"
 #include "util/StringCompare.hxx"
 
-#include <string.h>
-
 inline const char *
 OptionParser::CheckShiftValue(const char *s, const OptionDef &option)
 {

src/util/PrintException.hxx

@@ -33,7 +33,7 @@
 #ifndef PRINT_EXCEPTION_HXX
 #define PRINT_EXCEPTION_HXX
 
-#include <stdexcept>
+#include <exception>
 
 /**
  * Print this exception (and its nested exceptions, if any) to stderr.

src/util/SplitString.cxx

@@ -31,8 +31,6 @@
 #include "IterableSplitString.hxx"
 #include "StringStrip.hxx"
 
-#include <string.h>
-
 std::forward_list<std::string>
 SplitString(const char *s, char separator, bool strip) noexcept
 {

src/zeroconf/AvahiPoll.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_AVAHI_POLL_HXX
 #define MPD_AVAHI_POLL_HXX
 
-#include "util/Compiler.h"
-
 #include <avahi-common/watch.h>
 
 class EventLoop;

test/read_conf.cxx

@@ -21,11 +21,9 @@
 #include "config/Param.hxx"
 #include "config/File.hxx"
 #include "fs/Path.hxx"
-#include "fs/Path.hxx"
 #include "util/PrintException.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 

test/test_protocol.cxx

 #include "protocol/ArgParser.hxx"
 #include "protocol/Ack.hxx"
 #include "protocol/RangeArg.hxx"
-#include "util/Compiler.h"
 
 #include <gtest/gtest.h>
 
-#include <stdlib.h>
-
 TEST(ArgParser, Range)
 {
 	RangeArg range = ParseCommandArgRange("1");