include cleanups (powered by iwyu)

2019-07-05 09:59:00 +02:00 · 2019-07-05 09:59:00 +02:00 · d663f81420
parent 9cdebc90a0
commit d663f81420
229 changed files with 67 additions and 397 deletions
--- a/src/AudioFormat.cxx
+++ b/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
--- a/src/AudioFormat.hxx
+++ b/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;
--- a/src/CheckAudioFormat.cxx
+++ b/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)
 {
--- a/src/CommandLine.cxx
+++ b/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"
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@ -24,6 +24,8 @@
 #include "util/StringView.hxx"
 #include "Log.hxx"

+#include <algorithm>
+
 #include <assert.h>
 #include <string.h>

--- a/src/Instance.cxx
+++ b/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
--- a/src/Listen.cxx
+++ b/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>
--- a/src/LocateUri.hxx
+++ b/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
--- a/src/Main.cxx
+++ b/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
--- a/src/Main.hxx
+++ b/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

--- a/src/MusicPipe.cxx
+++ b/src/MusicPipe.cxx
@ -20,6 +20,8 @@
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"

+#include <assert.h>
+
 #ifndef NDEBUG

 bool
--- a/src/MusicPipe.hxx
+++ b/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.
--- a/src/Partition.hxx
+++ b/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>
--- a/src/Permission.cxx
+++ b/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>
--- a/src/PlaylistFile.cxx
+++ b/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 = '#';

--- a/src/PlaylistPrint.cxx
+++ b/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: "
--- a/src/PlaylistSave.cxx
+++ b/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)
 {
--- a/src/ReplayGainGlobal.cxx
+++ b/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>
--- a/src/SongPrint.cxx
+++ b/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"
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@ -34,8 +34,6 @@
 #include "TagArchive.hxx"
 #endif

-#include <exception>
-
 #include <assert.h>
 #include <string.h>

--- a/src/StateFile.cxx
+++ b/src/StateFile.cxx
@ -34,8 +34,6 @@

 #include <exception>

-#include <string.h>
-
 static constexpr Domain state_file_domain("state_file");

 StateFile::StateFile(StateFileConfig &&_config,
--- a/src/StateFile.hxx
+++ b/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;
--- a/src/Stats.cxx
+++ b/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>

--- a/src/TagFile.cxx
+++ b/src/TagFile.cxx
@ -27,8 +27,6 @@
 #include "input/InputStream.hxx"
 #include "input/LocalOpen.hxx"

-#include <exception>
-
 #include <assert.h>

 class TagFileScan {
--- a/src/TagStream.cxx
+++ b/src/TagStream.cxx
@ -28,8 +28,6 @@
 #include "input/InputStream.hxx"
 #include "thread/Mutex.hxx"

-#include <exception>
-
 #include <assert.h>

 /**
--- a/src/TimePrint.hxx
+++ b/src/TimePrint.hxx
@ -22,8 +22,6 @@

 #include <chrono>

-#include <time.h>
-
 class Response;

 /**
--- a/src/client/Client.cxx
+++ b/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
--- a/src/client/Read.cxx
+++ b/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>
--- a/src/client/Subscribe.cxx
+++ b/src/client/Subscribe.cxx
@ -19,7 +19,7 @@

 #include "Client.hxx"
 #include "Partition.hxx"
-#include "Idle.hxx"
+#include "IdleFlags.hxx"

 #include <assert.h>

--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@ -47,7 +47,6 @@

 #ifdef ENABLE_SQLITE
 #include "StickerCommands.hxx"
-#include "sticker/Database.hxx"
 #endif

 #include <assert.h>
--- a/src/command/CommandError.cxx
+++ b/src/command/CommandError.cxx
@ -27,8 +27,6 @@

 #include <system_error>

-#include <assert.h>
-
 gcc_const
 static enum ack
 ToAck(PlaylistResult result) noexcept
--- a/src/command/CommandError.hxx
+++ b/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;
--- a/src/command/DatabaseCommands.cxx
+++ b/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)
--- a/src/command/FileCommands.cxx
+++ b/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"
--- a/src/command/OtherCommands.cxx
+++ b/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)
--- a/src/command/PlayerCommands.cxx
+++ b/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"
--- a/src/command/PlaylistCommands.cxx
+++ b/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"
--- a/src/command/QueueCommands.cxx
+++ b/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
--- a/src/command/StickerCommands.cxx
+++ b/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"
--- a/src/command/StorageCommands.cxx
+++ b/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>

--- a/src/command/TagCommands.cxx
+++ b/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
--- a/src/config/Block.cxx
+++ b/src/config/Block.cxx
@ -23,7 +23,6 @@
 #include "fs/AllocatedPath.hxx"
 #include "util/RuntimeError.hxx"

-#include <assert.h>
 #include <stdlib.h>

 void
--- 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 "Param.hxx"
 #include "util/Compiler.h"

 #include <string>
--- a/src/config/Check.hxx
+++ b/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;

 /**
--- a/src/config/Data.hxx
+++ b/src/config/Data.hxx
@ -28,8 +28,6 @@
 #include <chrono>
 #include <forward_list>

-struct ConfigParam;
-struct ConfigBlock;
 class AllocatedPath;

 struct ConfigData {
--- a/src/config/Path.cxx
+++ b/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"

--- a/src/db/DatabaseGlue.cxx
+++ b/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"
--- a/src/db/DatabasePlaylist.cxx
+++ b/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"
--- a/src/db/DatabasePrint.cxx
+++ b/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"
--- a/src/db/DatabasePrint.hxx
+++ b/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;

--- a/src/db/DatabaseSong.hxx
+++ b/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;
--- a/src/db/UniqueTags.hxx
+++ b/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;
--- a/src/db/VHelper.cxx
+++ b/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>
--- a/src/db/VHelper.hxx
+++ b/src/db/VHelper.hxx
@ -22,7 +22,6 @@

 #include "Visitor.hxx"
 #include "Selection.hxx"
-#include "song/DetachedSong.hxx"

 #include <vector>

--- a/src/db/plugins/ProxyDatabasePlugin.cxx
+++ b/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"
--- a/src/db/plugins/simple/DatabaseSave.cxx
+++ b/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"
--- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx
+++ b/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"
--- a/src/db/plugins/upnp/ContentDirectoryService.cxx
+++ b/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)
 {
--- a/src/db/plugins/upnp/Directory.cxx
+++ b/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"
--- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
+++ b/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"
--- a/src/db/update/Editor.hxx
+++ b/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;
--- a/src/db/update/ExcludeList.cxx
+++ b/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

--- a/src/db/update/InotifySource.cxx
+++ b/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>
--- a/src/db/update/InotifySource.hxx
+++ b/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);
--- a/src/db/update/InotifyUpdate.hxx
+++ b/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;
--- a/src/db/update/Remove.hxx
+++ b/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;

 /**
--- a/src/db/update/UpdateIO.cxx
+++ b/src/db/update/UpdateIO.cxx
@ -26,8 +26,6 @@
 #include "fs/AllocatedPath.hxx"
 #include "Log.hxx"

-#include <stdexcept>
-
 #include <errno.h>

 bool
--- a/src/db/update/Walk.cxx
+++ b/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>
--- a/src/decoder/DecoderAPI.hxx
+++ b/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
--- a/src/decoder/Reader.hxx
+++ b/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;
--- a/src/decoder/Thread.cxx
+++ b/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"
--- a/src/decoder/plugins/DsdLib.cxx
+++ b/src/decoder/plugins/DsdLib.cxx
@ -33,8 +33,6 @@
 #include <id3tag.h>
 #endif

-#include <stdexcept>
-
 #include <string.h>
 #include <stdlib.h>

--- a/src/decoder/plugins/DsdiffDecoderPlugin.cxx
+++ b/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;
--- a/src/decoder/plugins/DsfDecoderPlugin.cxx
+++ b/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>

--- a/src/decoder/plugins/FaadDecoderPlugin.cxx
+++ b/src/decoder/plugins/FaadDecoderPlugin.cxx
@ -31,7 +31,6 @@
 #include <neaacdec.h>

 #include <cmath>
-#include <exception>

 #include <assert.h>
 #include <string.h>
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/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"
--- a/src/decoder/plugins/FfmpegIo.cxx
+++ b/src/decoder/plugins/FfmpegIo.cxx
@ -24,8 +24,6 @@
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"

-#include <exception>
-
 AvioStream::~AvioStream()
 {
 	if (io != nullptr) {
--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/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>
--- a/src/decoder/plugins/MpcdecDecoderPlugin.cxx
+++ b/src/decoder/plugins/MpcdecDecoderPlugin.cxx
@ -31,8 +31,6 @@

 #include <mpc/mpcdec.h>

-#include <exception>
-
 #include <math.h>

 struct mpc_decoder_data {
--- a/src/decoder/plugins/OggDecoder.cxx
+++ b/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.
--- a/src/decoder/plugins/OpusTags.cxx
+++ b/src/decoder/plugins/OpusTags.cxx
@ -26,8 +26,6 @@
 #include "util/NumberParser.hxx"
 #include "util/StringView.hxx"

-#include <string>
-
 #include <stdint.h>

 gcc_pure
--- a/src/decoder/plugins/PcmDecoderPlugin.cxx
+++ b/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");
--- a/src/decoder/plugins/WavpackDecoderPlugin.cxx
+++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx
@ -31,7 +31,7 @@

 #include <wavpack/wavpack.h>

-#include <stdexcept>
+#include <algorithm>
 #include <memory>

 #include <cstdlib>
--- a/src/decoder/plugins/WildmidiDecoderPlugin.cxx
+++ b/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" {
--- a/src/encoder/plugins/FlacEncoderPlugin.cxx
+++ b/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"

--- a/src/encoder/plugins/LameEncoderPlugin.cxx
+++ b/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"
--- a/src/encoder/plugins/OpusEncoderPlugin.cxx
+++ b/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"

--- a/src/encoder/plugins/ShineEncoderPlugin.cxx
+++ b/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"

--- a/src/encoder/plugins/TwolameEncoderPlugin.cxx
+++ b/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"
--- a/src/event/BufferedSocket.cxx
+++ b/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
--- a/src/event/Call.cxx
+++ b/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>

--- a/src/event/MultiSocketMonitor.hxx
+++ b/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>
--- a/src/event/ServerSocket.cxx
+++ b/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>

--- a/src/event/SocketMonitor.cxx
+++ b/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
--- a/src/filter/plugins/AutoConvertFilterPlugin.cxx
+++ b/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"
--- a/src/filter/plugins/ConvertFilterPlugin.cxx
+++ b/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>
--- a/src/filter/plugins/FfmpegFilterPlugin.cxx
+++ b/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;
--- a/src/filter/plugins/NullFilterPlugin.cxx
+++ b/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 {
--- a/src/filter/plugins/RouteFilterPlugin.cxx
+++ b/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>
--- a/src/filter/plugins/VolumeFilterPlugin.cxx
+++ b/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;

--- a/Show More
+++ b/Show More