From 1aee89f5ea603d24991c73e2479472577aa28d66 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 1 Mar 2016 22:08:13 +0100 Subject: [PATCH] *: include cleanup (using iwyu) --- Makefile.am | 2 -- src/Log.cxx | 2 -- src/LogInit.cxx | 1 - src/Main.cxx | 2 -- src/Mapper.cxx | 2 -- src/Partition.cxx | 1 - src/PlaylistFile.cxx | 2 -- src/PlaylistPrint.cxx | 6 +---- src/PlaylistPrint.hxx | 2 -- src/PlaylistSave.cxx | 6 ----- src/SongFilter.hxx | 1 - src/SongSave.hxx | 1 - src/SongUpdate.cxx | 4 --- src/StateFile.cxx | 1 - src/TagArchive.cxx | 1 - src/TagFile.cxx | 1 - src/archive/ArchivePlugin.cxx | 1 - src/archive/plugins/Bzip2ArchivePlugin.cxx | 3 +-- src/archive/plugins/Iso9660ArchivePlugin.cxx | 1 - src/archive/plugins/ZzipArchivePlugin.cxx | 1 - src/client/Client.hxx | 3 ++- src/client/ClientList.hxx | 2 +- src/client/ClientNew.cxx | 1 - src/command/AllCommands.cxx | 1 - src/command/CommandError.cxx | 2 -- src/command/DatabaseCommands.cxx | 3 --- src/command/FileCommands.cxx | 2 -- src/command/NeighborCommands.cxx | 4 --- src/command/OtherCommands.cxx | 1 - src/command/OutputCommands.cxx | 1 - src/command/PlayerCommands.cxx | 1 - src/command/PlaylistCommands.cxx | 2 -- src/command/QueueCommands.cxx | 4 --- src/command/StickerCommands.cxx | 2 -- src/command/TagCommands.cxx | 1 - src/config/ConfigFile.hxx | 1 - src/db/Configured.cxx | 1 - src/db/DatabaseGlue.cxx | 2 -- src/db/DatabasePlaylist.cxx | 1 - src/db/DatabasePrint.cxx | 1 - src/db/DatabasePrint.hxx | 2 -- src/db/plugins/simple/Directory.hxx | 1 - src/db/plugins/simple/DirectorySave.cxx | 1 - src/db/plugins/simple/Mount.cxx | 2 -- .../plugins/simple/SimpleDatabasePlugin.cxx | 1 - src/db/plugins/simple/Song.cxx | 1 - src/db/plugins/simple/Song.hxx | 1 - src/db/plugins/simple/SongSort.hxx | 2 -- .../plugins/upnp/ContentDirectoryService.cxx | 1 - src/db/plugins/upnp/UpnpDatabasePlugin.cxx | 1 - src/db/update/Archive.cxx | 1 - src/db/update/Container.cxx | 2 -- src/db/update/Editor.cxx | 1 - src/db/update/Editor.hxx | 1 - src/db/update/ExcludeList.cxx | 1 - src/db/update/InotifySource.cxx | 2 -- src/db/update/InotifyUpdate.cxx | 1 - src/db/update/Service.cxx | 2 -- src/db/update/UpdateIO.cxx | 2 -- src/db/update/Walk.cxx | 1 - src/db/update/Walk.hxx | 5 +--- src/decoder/DecoderBuffer.cxx | 2 -- src/decoder/DecoderControl.hxx | 2 ++ .../plugins/AudiofileDecoderPlugin.cxx | 1 - src/decoder/plugins/DsdLib.cxx | 1 - src/decoder/plugins/DsdLib.hxx | 1 - src/decoder/plugins/FaadDecoderPlugin.cxx | 1 - src/decoder/plugins/FfmpegDecoderPlugin.cxx | 2 -- src/decoder/plugins/FlacMetadata.cxx | 1 - src/decoder/plugins/FlacMetadata.hxx | 2 -- src/decoder/plugins/GmeDecoderPlugin.cxx | 1 - src/decoder/plugins/MadDecoderPlugin.cxx | 1 - src/decoder/plugins/OpusDecoderPlugin.cxx | 1 - src/decoder/plugins/VorbisComments.cxx | 4 --- src/encoder/plugins/ShineEncoderPlugin.cxx | 1 - src/encoder/plugins/VorbisEncoderPlugin.cxx | 1 - src/event/FullyBufferedSocket.cxx | 6 ----- src/event/Loop.hxx | 1 - src/event/ServerSocket.cxx | 5 ---- src/event/ServerSocket.hxx | 2 -- src/event/SignalMonitor.cxx | 1 - src/event/SocketMonitor.cxx | 1 - src/filter/plugins/ReplayGainFilterPlugin.cxx | 2 -- src/filter/plugins/RouteFilterPlugin.cxx | 1 - src/filter/plugins/VolumeFilterPlugin.cxx | 4 --- src/fs/Charset.cxx | 2 -- src/fs/CheckFile.cxx | 1 - src/fs/Path.cxx | 2 -- src/fs/StandardDirectory.cxx | 1 - src/fs/io/AutoGunzipReader.hxx | 2 -- src/fs/io/FileReader.hxx | 2 -- src/fs/io/GunzipReader.cxx | 1 - src/fs/io/GzipOutputStream.cxx | 1 - src/fs/io/GzipOutputStream.hxx | 1 - src/fs/io/PeekReader.hxx | 2 -- src/input/AsyncInputStream.cxx | 1 - src/input/Init.cxx | 1 - src/input/InputStream.hxx | 1 - src/input/Open.cxx | 2 -- src/input/ProxyInputStream.cxx | 3 --- src/input/TextInputStream.hxx | 2 -- src/input/plugins/AlsaInputPlugin.cxx | 1 - src/input/plugins/ArchiveInputPlugin.cxx | 2 -- src/input/plugins/CdioParanoiaInputPlugin.cxx | 1 - src/input/plugins/CurlInputPlugin.cxx | 2 -- src/input/plugins/FileInputPlugin.cxx | 1 - src/input/plugins/NfsInputPlugin.cxx | 2 -- src/lib/icu/Collate.cxx | 2 -- src/lib/icu/Collate.hxx | 2 -- src/lib/nfs/Connection.hxx | 4 +-- src/lib/nfs/FileReader.cxx | 1 + src/lib/nfs/FileReader.hxx | 1 - src/lib/upnp/ClientInit.cxx | 1 - src/lib/upnp/ContentDirectoryService.cxx | 1 - src/lib/upnp/ContentDirectoryService.hxx | 1 - src/lib/upnp/Device.cxx | 2 -- src/lib/upnp/Discovery.cxx | 1 - src/lib/upnp/Discovery.hxx | 1 - src/lib/upnp/Domain.cxx | 23 ---------------- src/lib/upnp/Domain.hxx | 27 ------------------- src/lib/upnp/Init.cxx | 1 - src/lib/upnp/Util.cxx | 2 -- src/lib/zlib/Domain.cxx | 24 ----------------- src/lib/zlib/Domain.hxx | 27 ------------------- src/lib/zlib/Error.hxx | 2 +- src/mixer/plugins/AlsaMixerPlugin.cxx | 1 - src/mixer/plugins/PulseMixerPlugin.cxx | 1 - .../plugins/SmbclientNeighborPlugin.cxx | 4 --- src/neighbor/plugins/UpnpNeighborPlugin.cxx | 1 - src/net/AllocatedSocketAddress.cxx | 1 - src/net/Resolver.cxx | 1 - src/net/SocketUtil.cxx | 6 ----- src/output/MultipleOutputs.hxx | 1 - src/output/OutputState.cxx | 1 - src/output/Registry.cxx | 2 +- src/output/plugins/JackOutputPlugin.cxx | 1 - src/output/plugins/httpd/HttpdClient.hxx | 3 ++- src/output/plugins/httpd/HttpdInternal.hxx | 2 ++ .../plugins/httpd/HttpdOutputPlugin.cxx | 2 -- src/pcm/PcmChannels.hxx | 1 - src/pcm/PcmConvert.cxx | 3 --- src/pcm/PcmConvert.hxx | 4 --- src/pcm/PcmDop.hxx | 1 - src/pcm/PcmExport.cxx | 2 -- src/pcm/PcmExport.hxx | 1 - src/pcm/PcmFormat.hxx | 1 - src/pcm/SoxrResampler.cxx | 1 - src/pcm/Volume.cxx | 1 - src/pcm/Volume.hxx | 5 ---- src/playlist/PlaylistMapper.cxx | 1 - src/playlist/PlaylistQueue.cxx | 2 +- src/playlist/PlaylistQueue.hxx | 2 -- src/playlist/PlaylistRegistry.cxx | 1 - src/playlist/PlaylistSong.cxx | 1 - src/playlist/Print.cxx | 1 - src/playlist/cue/CueParser.hxx | 3 --- src/playlist/plugins/CuePlaylistPlugin.cxx | 2 -- src/playlist/plugins/FlacPlaylistPlugin.cxx | 2 -- src/playlist/plugins/PlsPlaylistPlugin.cxx | 1 - src/protocol/ArgParser.hxx | 1 - src/queue/Playlist.hxx | 1 - src/queue/PlaylistEdit.cxx | 1 - src/queue/PlaylistUpdate.cxx | 1 - src/queue/QueueSave.cxx | 2 -- src/sticker/SongSticker.cxx | 1 - src/storage/CompositeStorage.hxx | 1 - src/tag/Aiff.cxx | 1 - src/tag/ApeLoader.hxx | 3 --- src/tag/Id3Load.hxx | 1 - src/tag/Settings.hxx | 2 -- src/tag/Tag.cxx | 1 - src/tag/Tag.hxx | 3 --- src/tag/TagBuilder.cxx | 1 - src/tag/TagBuilder.hxx | 2 -- src/tag/TagConfig.cxx | 2 -- src/tag/TagId3.cxx | 4 +-- src/tag/TagString.cxx | 1 - src/tag/TagString.hxx | 2 -- src/unix/Daemon.cxx | 1 - src/util/PeakBuffer.hxx | 1 - src/util/StringUtil.cxx | 1 - 181 files changed, 18 insertions(+), 390 deletions(-) delete mode 100644 src/lib/upnp/Domain.cxx delete mode 100644 src/lib/upnp/Domain.hxx delete mode 100644 src/lib/zlib/Domain.cxx delete mode 100644 src/lib/zlib/Domain.hxx diff --git a/Makefile.am b/Makefile.am index 51063725f..3d393b5bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -240,7 +240,6 @@ UPNP_SOURCES = \ src/lib/upnp/Device.cxx src/lib/upnp/Device.hxx \ src/lib/upnp/ContentDirectoryService.cxx src/lib/upnp/ContentDirectoryService.hxx \ src/lib/upnp/Discovery.cxx src/lib/upnp/Discovery.hxx \ - src/lib/upnp/Domain.cxx src/lib/upnp/Domain.hxx \ src/lib/upnp/ixmlwrap.cxx src/lib/upnp/ixmlwrap.hxx \ src/lib/upnp/Callback.hxx \ src/lib/upnp/Util.cxx src/lib/upnp/Util.hxx \ @@ -607,7 +606,6 @@ libfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) if ENABLE_ZLIB libfs_a_SOURCES += \ - src/lib/zlib/Domain.cxx src/lib/zlib/Domain.hxx \ src/lib/zlib/Error.cxx src/lib/zlib/Error.hxx \ src/fs/io/GunzipReader.cxx src/fs/io/GunzipReader.hxx \ src/fs/io/AutoGunzipReader.cxx src/fs/io/AutoGunzipReader.hxx \ diff --git a/src/Log.cxx b/src/Log.cxx index cb425d86a..eed32cd74 100644 --- a/src/Log.cxx +++ b/src/Log.cxx @@ -20,11 +20,9 @@ #include "config.h" #include "LogV.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" #include -#include #include #include #include diff --git a/src/LogInit.cxx b/src/LogInit.cxx index a409c7fd0..cc617bdf9 100644 --- a/src/LogInit.cxx +++ b/src/LogInit.cxx @@ -35,7 +35,6 @@ #include #include #include -#include #include #define LOG_LEVEL_SECURE LogLevel::INFO diff --git a/src/Main.cxx b/src/Main.cxx index 75ff89f79..f68ecf60d 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -51,9 +51,7 @@ #include "pcm/PcmConvert.hxx" #include "unix/SignalHandlers.hxx" #include "system/FatalError.hxx" -#include "util/UriUtil.hxx" #include "util/Error.hxx" -#include "thread/Id.hxx" #include "thread/Slack.hxx" #include "lib/icu/Init.hxx" #include "config/ConfigGlobal.hxx" diff --git a/src/Mapper.cxx b/src/Mapper.cxx index 5fc062db9..cf61aab87 100644 --- a/src/Mapper.cxx +++ b/src/Mapper.cxx @@ -24,8 +24,6 @@ #include "config.h" #include "Mapper.hxx" #include "fs/AllocatedPath.hxx" -#include "fs/Traits.hxx" -#include "fs/Charset.hxx" #include "fs/CheckFile.hxx" #include "util/StringCompare.hxx" diff --git a/src/Partition.cxx b/src/Partition.cxx index edb7def1b..6217f45d9 100644 --- a/src/Partition.cxx +++ b/src/Partition.cxx @@ -21,7 +21,6 @@ #include "Partition.hxx" #include "Instance.hxx" #include "DetachedSong.hxx" -#include "output/MultipleOutputs.hxx" #include "mixer/Volume.hxx" #include "Idle.hxx" #include "GlobalEvents.hxx" diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx index d22dee62b..af176bf9e 100644 --- a/src/PlaylistFile.cxx +++ b/src/PlaylistFile.cxx @@ -43,12 +43,10 @@ #include "util/Macros.hxx" #include "util/StringCompare.hxx" #include "util/UriUtil.hxx" -#include "util/Error.hxx" #include #include -#include #include #include diff --git a/src/PlaylistPrint.cxx b/src/PlaylistPrint.cxx index 44df5dc0c..2e5804da4 100644 --- a/src/PlaylistPrint.cxx +++ b/src/PlaylistPrint.cxx @@ -20,19 +20,15 @@ #include "config.h" #include "PlaylistPrint.hxx" #include "PlaylistFile.hxx" +#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/Client.hxx" #include "client/Response.hxx" -#include "input/InputStream.hxx" -#include "DetachedSong.hxx" -#include "fs/Traits.hxx" #include "util/Error.hxx" -#include "thread/Cond.hxx" #define SONG_FILE "file: " #define SONG_TIME "Time: " diff --git a/src/PlaylistPrint.hxx b/src/PlaylistPrint.hxx index ae1693366..b61ca7c04 100644 --- a/src/PlaylistPrint.hxx +++ b/src/PlaylistPrint.hxx @@ -25,9 +25,7 @@ struct playlist; struct Partition; class SongFilter; -class Client; class Response; -class Error; /** * Sends the whole playlist to the client, song URIs only. diff --git a/src/PlaylistSave.cxx b/src/PlaylistSave.cxx index f550324ce..23e6f3f49 100644 --- a/src/PlaylistSave.cxx +++ b/src/PlaylistSave.cxx @@ -23,7 +23,6 @@ #include "PlaylistError.hxx" #include "queue/Playlist.hxx" #include "DetachedSong.hxx" -#include "SongLoader.hxx" #include "Mapper.hxx" #include "Idle.hxx" #include "fs/AllocatedPath.hxx" @@ -32,12 +31,7 @@ #include "fs/NarrowPath.hxx" #include "fs/io/FileOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx" -#include "util/Alloc.hxx" #include "util/UriUtil.hxx" -#include "util/Error.hxx" -#include "Log.hxx" - -#include void playlist_print_song(BufferedOutputStream &os, const DetachedSong &song) diff --git a/src/SongFilter.hxx b/src/SongFilter.hxx index d408d5f74..217e0c0a0 100644 --- a/src/SongFilter.hxx +++ b/src/SongFilter.hxx @@ -40,7 +40,6 @@ template struct ConstBuffer; struct Tag; struct TagItem; -struct Song; struct LightSong; class DetachedSong; diff --git a/src/SongSave.hxx b/src/SongSave.hxx index 6932c7c1e..db59adb8c 100644 --- a/src/SongSave.hxx +++ b/src/SongSave.hxx @@ -23,7 +23,6 @@ #define SONG_BEGIN "song_begin: " struct Song; -struct Directory; class DetachedSong; class BufferedOutputStream; class TextFile; diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx index 2d3a2fe5e..f8686f161 100644 --- a/src/SongUpdate.cxx +++ b/src/SongUpdate.cxx @@ -26,10 +26,7 @@ #include "util/UriUtil.hxx" #include "util/Error.hxx" #include "fs/AllocatedPath.hxx" -#include "fs/Traits.hxx" #include "fs/FileInfo.hxx" -#include "decoder/DecoderList.hxx" -#include "tag/Tag.hxx" #include "tag/TagBuilder.hxx" #include "TagFile.hxx" #include "TagStream.hxx" @@ -40,7 +37,6 @@ #include #include -#include #ifdef ENABLE_DATABASE diff --git a/src/StateFile.cxx b/src/StateFile.cxx index 5de89d1db..4c731faab 100644 --- a/src/StateFile.cxx +++ b/src/StateFile.cxx @@ -28,7 +28,6 @@ #include "Instance.hxx" #include "mixer/Volume.hxx" #include "SongLoader.hxx" -#include "fs/FileSystem.hxx" #include "util/Domain.hxx" #include "Log.hxx" diff --git a/src/TagArchive.cxx b/src/TagArchive.cxx index bfd7e4ffc..a5a849d7b 100644 --- a/src/TagArchive.cxx +++ b/src/TagArchive.cxx @@ -20,7 +20,6 @@ #include "config.h" #include "TagArchive.hxx" #include "TagStream.hxx" -#include "tag/Generic.hxx" #include "archive/ArchiveFile.hxx" #include "input/InputStream.hxx" #include "thread/Cond.hxx" diff --git a/src/TagFile.cxx b/src/TagFile.cxx index 41abb1732..56e235462 100644 --- a/src/TagFile.cxx +++ b/src/TagFile.cxx @@ -23,7 +23,6 @@ #include "tag/TagHandler.hxx" #include "tag/TagBuilder.hxx" #include "fs/Path.hxx" -#include "util/UriUtil.hxx" #include "util/Error.hxx" #include "decoder/DecoderList.hxx" #include "decoder/DecoderPlugin.hxx" diff --git a/src/archive/ArchivePlugin.cxx b/src/archive/ArchivePlugin.cxx index fa3f53855..79df23612 100644 --- a/src/archive/ArchivePlugin.cxx +++ b/src/archive/ArchivePlugin.cxx @@ -19,7 +19,6 @@ #include "config.h" #include "ArchivePlugin.hxx" -#include "ArchiveFile.hxx" #include "fs/Path.hxx" #include "util/Error.hxx" diff --git a/src/archive/plugins/Bzip2ArchivePlugin.cxx b/src/archive/plugins/Bzip2ArchivePlugin.cxx index f51d3292b..63ff2841c 100644 --- a/src/archive/plugins/Bzip2ArchivePlugin.cxx +++ b/src/archive/plugins/Bzip2ArchivePlugin.cxx @@ -27,12 +27,11 @@ #include "../ArchiveFile.hxx" #include "../ArchiveVisitor.hxx" #include "input/InputStream.hxx" -#include "input/InputPlugin.hxx" #include "input/LocalOpen.hxx" +#include "thread/Cond.hxx" #include "util/RefCount.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" -#include "fs/Traits.hxx" #include "fs/Path.hxx" #include diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx index a7d31971b..6c17b6ad8 100644 --- a/src/archive/plugins/Iso9660ArchivePlugin.cxx +++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx @@ -27,7 +27,6 @@ #include "../ArchiveFile.hxx" #include "../ArchiveVisitor.hxx" #include "input/InputStream.hxx" -#include "input/InputPlugin.hxx" #include "fs/Path.hxx" #include "util/RefCount.hxx" #include "util/Error.hxx" diff --git a/src/archive/plugins/ZzipArchivePlugin.cxx b/src/archive/plugins/ZzipArchivePlugin.cxx index 1fe7a3e86..e83edb09b 100644 --- a/src/archive/plugins/ZzipArchivePlugin.cxx +++ b/src/archive/plugins/ZzipArchivePlugin.cxx @@ -27,7 +27,6 @@ #include "../ArchiveFile.hxx" #include "../ArchiveVisitor.hxx" #include "input/InputStream.hxx" -#include "input/InputPlugin.hxx" #include "fs/Path.hxx" #include "util/RefCount.hxx" #include "util/Error.hxx" diff --git a/src/client/Client.hxx b/src/client/Client.hxx index 2b48b990f..0e7f324b7 100644 --- a/src/client/Client.hxx +++ b/src/client/Client.hxx @@ -27,7 +27,8 @@ #include "event/TimeoutMonitor.hxx" #include "Compiler.h" -#include +#include +#include #include #include diff --git a/src/client/ClientList.hxx b/src/client/ClientList.hxx index 799b14ab7..76ddf1410 100644 --- a/src/client/ClientList.hxx +++ b/src/client/ClientList.hxx @@ -22,7 +22,7 @@ #include "Client.hxx" -class Client; +#include class ClientList { typedef boost::intrusive::list diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx index 239e3aed7..75926aa9c 100644 --- a/src/command/AllCommands.cxx +++ b/src/command/AllCommands.cxx @@ -40,7 +40,6 @@ #include "util/Macros.hxx" #include "util/Tokenizer.hxx" #include "util/Error.hxx" -#include "util/ConstBuffer.hxx" #include "util/StringAPI.hxx" #ifdef ENABLE_SQLITE diff --git a/src/command/CommandError.cxx b/src/command/CommandError.cxx index 71147835b..9faec6893 100644 --- a/src/command/CommandError.cxx +++ b/src/command/CommandError.cxx @@ -29,8 +29,6 @@ #include #include -#include -#include gcc_const static enum ack diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx index 6542bd5ef..ae5ef48f5 100644 --- a/src/command/DatabaseCommands.cxx +++ b/src/command/DatabaseCommands.cxx @@ -20,7 +20,6 @@ #include "config.h" #include "DatabaseCommands.hxx" #include "Request.hxx" -#include "db/DatabaseGlue.hxx" #include "db/DatabaseQueue.hxx" #include "db/DatabasePlaylist.hxx" #include "db/DatabasePrint.hxx" @@ -36,8 +35,6 @@ #include "SongFilter.hxx" #include "BulkEdit.hxx" -#include - CommandResult handle_listfiles_db(Client &client, Response &r, const char *uri) { diff --git a/src/command/FileCommands.cxx b/src/command/FileCommands.cxx index 5fe0281c3..52ece5771 100644 --- a/src/command/FileCommands.cxx +++ b/src/command/FileCommands.cxx @@ -26,7 +26,6 @@ #include "protocol/Ack.hxx" #include "client/Client.hxx" #include "client/Response.hxx" -#include "util/ConstBuffer.hxx" #include "util/CharUtil.hxx" #include "util/UriUtil.hxx" #include "util/Error.hxx" @@ -42,7 +41,6 @@ #include "TimePrint.hxx" #include -#include #include /* for PRIu64 */ gcc_pure diff --git a/src/command/NeighborCommands.cxx b/src/command/NeighborCommands.cxx index 848c1088b..d5fea43b8 100644 --- a/src/command/NeighborCommands.cxx +++ b/src/command/NeighborCommands.cxx @@ -26,13 +26,9 @@ #include "Partition.hxx" #include "neighbor/Glue.hxx" #include "neighbor/Info.hxx" -#include "util/ConstBuffer.hxx" -#include #include -#include - bool neighbor_commands_available(const Instance &instance) { diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx index c1df73734..47f60601f 100644 --- a/src/command/OtherCommands.cxx +++ b/src/command/OtherCommands.cxx @@ -37,7 +37,6 @@ #include "mixer/Volume.hxx" #include "util/UriUtil.hxx" #include "util/Error.hxx" -#include "util/ConstBuffer.hxx" #include "util/StringAPI.hxx" #include "fs/AllocatedPath.hxx" #include "Stats.hxx" diff --git a/src/command/OutputCommands.cxx b/src/command/OutputCommands.cxx index 7c2e1eef5..d680836ec 100644 --- a/src/command/OutputCommands.cxx +++ b/src/command/OutputCommands.cxx @@ -25,7 +25,6 @@ #include "client/Client.hxx" #include "client/Response.hxx" #include "Partition.hxx" -#include "util/ConstBuffer.hxx" CommandResult handle_enableoutput(Client &client, Request args, Response &r) diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx index 7a71aa017..1eef18a0f 100644 --- a/src/command/PlayerCommands.cxx +++ b/src/command/PlayerCommands.cxx @@ -30,7 +30,6 @@ #include "Instance.hxx" #include "AudioFormat.hxx" #include "ReplayGainConfig.hxx" -#include "util/ConstBuffer.hxx" #ifdef ENABLE_DATABASE #include "db/update/Service.hxx" diff --git a/src/command/PlaylistCommands.cxx b/src/command/PlaylistCommands.cxx index f1a40aa61..d7a0bbcdb 100644 --- a/src/command/PlaylistCommands.cxx +++ b/src/command/PlaylistCommands.cxx @@ -30,11 +30,9 @@ #include "BulkEdit.hxx" #include "playlist/PlaylistQueue.hxx" #include "playlist/Print.hxx" -#include "queue/Playlist.hxx" #include "TimePrint.hxx" #include "client/Client.hxx" #include "client/Response.hxx" -#include "ls.hxx" #include "Mapper.hxx" #include "fs/AllocatedPath.hxx" #include "util/UriUtil.hxx" diff --git a/src/command/QueueCommands.cxx b/src/command/QueueCommands.cxx index 26a3e222c..5505bc329 100644 --- a/src/command/QueueCommands.cxx +++ b/src/command/QueueCommands.cxx @@ -35,16 +35,12 @@ #include "BulkEdit.hxx" #include "util/ConstBuffer.hxx" #include "util/StringAPI.hxx" -#include "util/UriUtil.hxx" #include "util/NumberParser.hxx" #include "util/Error.hxx" -#include "fs/AllocatedPath.hxx" #include #include -#include - static CommandResult AddUri(Client &client, const LocatedUri &uri, Response &r) { diff --git a/src/command/StickerCommands.cxx b/src/command/StickerCommands.cxx index fd6a27c38..7fea154e0 100644 --- a/src/command/StickerCommands.cxx +++ b/src/command/StickerCommands.cxx @@ -22,7 +22,6 @@ #include "Request.hxx" #include "SongPrint.hxx" #include "db/Interface.hxx" -#include "db/DatabaseGlue.hxx" #include "sticker/SongSticker.hxx" #include "sticker/StickerPrint.hxx" #include "sticker/StickerDatabase.hxx" @@ -30,7 +29,6 @@ #include "client/Client.hxx" #include "client/Response.hxx" #include "Partition.hxx" -#include "Instance.hxx" #include "util/Error.hxx" #include "util/ConstBuffer.hxx" #include "util/StringAPI.hxx" diff --git a/src/command/TagCommands.cxx b/src/command/TagCommands.cxx index 2ee67cbdf..d40b7d15d 100644 --- a/src/command/TagCommands.cxx +++ b/src/command/TagCommands.cxx @@ -20,7 +20,6 @@ #include "config.h" #include "TagCommands.hxx" #include "Request.hxx" -#include "CommandError.hxx" #include "client/Client.hxx" #include "client/Response.hxx" #include "tag/Tag.hxx" diff --git a/src/config/ConfigFile.hxx b/src/config/ConfigFile.hxx index e33c42b23..996bb562e 100644 --- a/src/config/ConfigFile.hxx +++ b/src/config/ConfigFile.hxx @@ -20,7 +20,6 @@ #ifndef MPD_CONFIG_FILE_HXX #define MPD_CONFIG_FILE_HXX -class Error; class Path; struct ConfigData; diff --git a/src/db/Configured.cxx b/src/db/Configured.cxx index 4bef9c1d8..42c1feccd 100644 --- a/src/db/Configured.cxx +++ b/src/db/Configured.cxx @@ -27,7 +27,6 @@ #include "fs/AllocatedPath.hxx" #include "fs/StandardDirectory.hxx" #include "util/Error.hxx" -#include "Log.hxx" Database * CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener, diff --git a/src/db/DatabaseGlue.cxx b/src/db/DatabaseGlue.cxx index 506e1975f..233890a4b 100644 --- a/src/db/DatabaseGlue.cxx +++ b/src/db/DatabaseGlue.cxx @@ -25,8 +25,6 @@ #include "config/Block.hxx" #include "DatabasePlugin.hxx" -#include - Database * DatabaseGlobalInit(EventLoop &loop, DatabaseListener &listener, const ConfigBlock &block, Error &error) diff --git a/src/db/DatabasePlaylist.cxx b/src/db/DatabasePlaylist.cxx index 585a05080..a052fdfbf 100644 --- a/src/db/DatabasePlaylist.cxx +++ b/src/db/DatabasePlaylist.cxx @@ -24,7 +24,6 @@ #include "PlaylistFile.hxx" #include "Interface.hxx" #include "DetachedSong.hxx" -#include "storage/StorageInterface.hxx" #include diff --git a/src/db/DatabasePrint.cxx b/src/db/DatabasePrint.cxx index c1ecf0bf3..e0c623005 100644 --- a/src/db/DatabasePrint.cxx +++ b/src/db/DatabasePrint.cxx @@ -23,7 +23,6 @@ #include "SongFilter.hxx" #include "SongPrint.hxx" #include "TimePrint.hxx" -#include "client/Client.hxx" #include "client/Response.hxx" #include "Partition.hxx" #include "tag/Tag.hxx" diff --git a/src/db/DatabasePrint.hxx b/src/db/DatabasePrint.hxx index 81f44e74e..2c85f7c06 100644 --- a/src/db/DatabasePrint.hxx +++ b/src/db/DatabasePrint.hxx @@ -21,12 +21,10 @@ #define MPD_DB_PRINT_H #include "tag/Mask.hxx" -#include "Compiler.h" class SongFilter; struct DatabaseSelection; struct Partition; -class Client; class Response; class Error; diff --git a/src/db/plugins/simple/Directory.hxx b/src/db/plugins/simple/Directory.hxx index 198b77c8f..2eda91c46 100644 --- a/src/db/plugins/simple/Directory.hxx +++ b/src/db/plugins/simple/Directory.hxx @@ -43,7 +43,6 @@ static constexpr unsigned DEVICE_INARCHIVE = -1; */ static constexpr unsigned DEVICE_CONTAINER = -2; -struct db_visitor; class SongFilter; class Error; class Database; diff --git a/src/db/plugins/simple/DirectorySave.cxx b/src/db/plugins/simple/DirectorySave.cxx index fec78644b..83664eb4f 100644 --- a/src/db/plugins/simple/DirectorySave.cxx +++ b/src/db/plugins/simple/DirectorySave.cxx @@ -31,7 +31,6 @@ #include "util/Error.hxx" #include "util/Domain.hxx" -#include #include #define DIRECTORY_DIR "directory: " diff --git a/src/db/plugins/simple/Mount.cxx b/src/db/plugins/simple/Mount.cxx index 2777e5049..05342a13f 100644 --- a/src/db/plugins/simple/Mount.cxx +++ b/src/db/plugins/simple/Mount.cxx @@ -22,10 +22,8 @@ #include "PrefixedLightSong.hxx" #include "db/Selection.hxx" #include "db/LightDirectory.hxx" -#include "db/LightSong.hxx" #include "db/Interface.hxx" #include "fs/Traits.hxx" -#include "util/Error.hxx" #include diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.cxx b/src/db/plugins/simple/SimpleDatabasePlugin.cxx index 88e2c6535..3f4d94131 100644 --- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx +++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx @@ -27,7 +27,6 @@ #include "db/LightDirectory.hxx" #include "Directory.hxx" #include "Song.hxx" -#include "SongFilter.hxx" #include "DatabaseSave.hxx" #include "db/DatabaseLock.hxx" #include "db/DatabaseError.hxx" diff --git a/src/db/plugins/simple/Song.cxx b/src/db/plugins/simple/Song.cxx index 27b3564cd..a721339b6 100644 --- a/src/db/plugins/simple/Song.cxx +++ b/src/db/plugins/simple/Song.cxx @@ -27,7 +27,6 @@ #include #include -#include inline Song::Song(const char *_uri, size_t uri_length, Directory &_parent) :parent(&_parent), mtime(0), diff --git a/src/db/plugins/simple/Song.hxx b/src/db/plugins/simple/Song.hxx index 8dd0ecf66..b8428f091 100644 --- a/src/db/plugins/simple/Song.hxx +++ b/src/db/plugins/simple/Song.hxx @@ -29,7 +29,6 @@ #include -#include #include struct LightSong; diff --git a/src/db/plugins/simple/SongSort.hxx b/src/db/plugins/simple/SongSort.hxx index bc0cbd715..d1258a5b3 100644 --- a/src/db/plugins/simple/SongSort.hxx +++ b/src/db/plugins/simple/SongSort.hxx @@ -22,8 +22,6 @@ #include "Song.hxx" -struct list_head; - void song_list_sort(SongList &songs); diff --git a/src/db/plugins/upnp/ContentDirectoryService.cxx b/src/db/plugins/upnp/ContentDirectoryService.cxx index 38cb9dcfd..6754b48b7 100644 --- a/src/db/plugins/upnp/ContentDirectoryService.cxx +++ b/src/db/plugins/upnp/ContentDirectoryService.cxx @@ -19,7 +19,6 @@ #include "config.h" #include "lib/upnp/ContentDirectoryService.hxx" -#include "lib/upnp/Domain.hxx" #include "lib/upnp/ixmlwrap.hxx" #include "lib/upnp/UniqueIxml.hxx" #include "lib/upnp/Action.hxx" diff --git a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx index f259533ee..ffd45710b 100644 --- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx +++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx @@ -21,7 +21,6 @@ #include "UpnpDatabasePlugin.hxx" #include "Directory.hxx" #include "Tags.hxx" -#include "lib/upnp/Domain.hxx" #include "lib/upnp/ClientInit.hxx" #include "lib/upnp/Discovery.hxx" #include "lib/upnp/ContentDirectoryService.hxx" diff --git a/src/db/update/Archive.cxx b/src/db/update/Archive.cxx index cc892388a..c645211fa 100644 --- a/src/db/update/Archive.cxx +++ b/src/db/update/Archive.cxx @@ -36,7 +36,6 @@ #include -#include #include static Directory * diff --git a/src/db/update/Container.cxx b/src/db/update/Container.cxx index d1b7fe756..8f11ae5f0 100644 --- a/src/db/update/Container.cxx +++ b/src/db/update/Container.cxx @@ -32,8 +32,6 @@ #include "tag/TagBuilder.hxx" #include "Log.hxx" -#include - Directory * UpdateWalk::MakeDirectoryIfModified(Directory &parent, const char *name, const StorageFileInfo &info) diff --git a/src/db/update/Editor.cxx b/src/db/update/Editor.cxx index 4397c3515..910747a7e 100644 --- a/src/db/update/Editor.cxx +++ b/src/db/update/Editor.cxx @@ -26,7 +26,6 @@ #include "db/plugins/simple/Song.hxx" #include -#include void DatabaseEditor::DeleteSong(Directory &dir, Song *del) diff --git a/src/db/update/Editor.hxx b/src/db/update/Editor.hxx index d7d8c0409..ae50287a4 100644 --- a/src/db/update/Editor.hxx +++ b/src/db/update/Editor.hxx @@ -26,7 +26,6 @@ struct Directory; struct Song; -class UpdateRemoveService; class DatabaseEditor final { UpdateRemoveService remove; diff --git a/src/db/update/ExcludeList.cxx b/src/db/update/ExcludeList.cxx index 2cfd4a072..c1dc9face 100644 --- a/src/db/update/ExcludeList.cxx +++ b/src/db/update/ExcludeList.cxx @@ -32,7 +32,6 @@ #include #include -#include bool ExcludeList::LoadFile(Path path_fs) diff --git a/src/db/update/InotifySource.cxx b/src/db/update/InotifySource.cxx index 26d2392b0..d84d05591 100644 --- a/src/db/update/InotifySource.cxx +++ b/src/db/update/InotifySource.cxx @@ -25,8 +25,6 @@ #include "system/FatalError.hxx" #include "Log.hxx" -#include - #include #include #include diff --git a/src/db/update/InotifyUpdate.cxx b/src/db/update/InotifyUpdate.cxx index 61cf88c2b..cb619b404 100644 --- a/src/db/update/InotifyUpdate.cxx +++ b/src/db/update/InotifyUpdate.cxx @@ -34,7 +34,6 @@ #include #include -#include #include #include diff --git a/src/db/update/Service.cxx b/src/db/update/Service.cxx index cb0af0da3..0383d6bae 100644 --- a/src/db/update/Service.cxx +++ b/src/db/update/Service.cxx @@ -29,9 +29,7 @@ #include "Idle.hxx" #include "util/Error.hxx" #include "Log.hxx" -#include "Instance.hxx" #include "system/FatalError.hxx" -#include "thread/Id.hxx" #include "thread/Thread.hxx" #include "thread/Util.hxx" diff --git a/src/db/update/UpdateIO.cxx b/src/db/update/UpdateIO.cxx index 1b0037355..7bf743ce8 100644 --- a/src/db/update/UpdateIO.cxx +++ b/src/db/update/UpdateIO.cxx @@ -19,7 +19,6 @@ #include "config.h" /* must be first for large file support */ #include "UpdateIO.hxx" -#include "UpdateDomain.hxx" #include "db/plugins/simple/Directory.hxx" #include "storage/FileInfo.hxx" #include "storage/StorageInterface.hxx" @@ -30,7 +29,6 @@ #include "Log.hxx" #include -#include bool GetInfo(Storage &storage, const char *uri_utf8, StorageFileInfo &info) diff --git a/src/db/update/Walk.cxx b/src/db/update/Walk.cxx index 9e7d47a1a..41bc1c772 100644 --- a/src/db/update/Walk.cxx +++ b/src/db/update/Walk.cxx @@ -44,7 +44,6 @@ #include "Log.hxx" #include -#include #include #include #include diff --git a/src/db/update/Walk.hxx b/src/db/update/Walk.hxx index 41b85947b..fd2b5fd42 100644 --- a/src/db/update/Walk.hxx +++ b/src/db/update/Walk.hxx @@ -24,9 +24,6 @@ #include "Editor.hxx" #include "Compiler.h" -#include - -struct stat; struct StorageFileInfo; struct Directory; struct ArchivePlugin; @@ -141,7 +138,7 @@ private: /** * Create the specified directory object if it does not exist - * already or if the #stat object indicates that it has been + * already or if the #StorageFileInfo object indicates that it has been * modified since the last update. Returns nullptr when it * exists already and is unmodified. * diff --git a/src/decoder/DecoderBuffer.cxx b/src/decoder/DecoderBuffer.cxx index 03b5dc9ed..575e0c92a 100644 --- a/src/decoder/DecoderBuffer.cxx +++ b/src/decoder/DecoderBuffer.cxx @@ -21,8 +21,6 @@ #include "DecoderBuffer.hxx" #include "DecoderAPI.hxx" -#include - bool DecoderBuffer::Fill() { diff --git a/src/decoder/DecoderControl.hxx b/src/decoder/DecoderControl.hxx index 5e2605154..d1d385d43 100644 --- a/src/decoder/DecoderControl.hxx +++ b/src/decoder/DecoderControl.hxx @@ -29,6 +29,8 @@ #include "Chrono.hxx" #include "util/Error.hxx" +#include + #include #include diff --git a/src/decoder/plugins/AudiofileDecoderPlugin.cxx b/src/decoder/plugins/AudiofileDecoderPlugin.cxx index 62a028a7c..f26d6f880 100644 --- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx +++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx @@ -23,7 +23,6 @@ #include "input/InputStream.hxx" #include "CheckAudioFormat.hxx" #include "tag/TagHandler.hxx" -#include "fs/Path.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" #include "Log.hxx" diff --git a/src/decoder/plugins/DsdLib.cxx b/src/decoder/plugins/DsdLib.cxx index fc1c9a114..a5e9c8391 100644 --- a/src/decoder/plugins/DsdLib.cxx +++ b/src/decoder/plugins/DsdLib.cxx @@ -29,7 +29,6 @@ #include "input/InputStream.hxx" #include "tag/TagId3.hxx" #include "util/Error.hxx" -#include "util/Alloc.hxx" #include #include diff --git a/src/decoder/plugins/DsdLib.hxx b/src/decoder/plugins/DsdLib.hxx index a60342e16..1b72ca7fd 100644 --- a/src/decoder/plugins/DsdLib.hxx +++ b/src/decoder/plugins/DsdLib.hxx @@ -24,7 +24,6 @@ #include "input/Offset.hxx" #include "Compiler.h" -#include #include struct Decoder; diff --git a/src/decoder/plugins/FaadDecoderPlugin.cxx b/src/decoder/plugins/FaadDecoderPlugin.cxx index 39096d79a..04bb000ee 100644 --- a/src/decoder/plugins/FaadDecoderPlugin.cxx +++ b/src/decoder/plugins/FaadDecoderPlugin.cxx @@ -33,7 +33,6 @@ #include #include -#include static const unsigned adts_sample_rates[] = { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index ea9d8e9d3..6bb3c3c9d 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -40,7 +40,6 @@ #include "CheckAudioFormat.hxx" #include "util/ConstBuffer.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" #include "LogV.hxx" extern "C" { @@ -48,7 +47,6 @@ extern "C" { #include #include #include -#include #if LIBAVUTIL_VERSION_MAJOR >= 53 #include diff --git a/src/decoder/plugins/FlacMetadata.cxx b/src/decoder/plugins/FlacMetadata.cxx index f674bcb6b..77501ebc9 100644 --- a/src/decoder/plugins/FlacMetadata.cxx +++ b/src/decoder/plugins/FlacMetadata.cxx @@ -29,7 +29,6 @@ #include "tag/ReplayGain.hxx" #include "tag/MixRamp.hxx" #include "ReplayGainInfo.hxx" -#include "util/ASCII.hxx" #include "util/DivideString.hxx" bool diff --git a/src/decoder/plugins/FlacMetadata.hxx b/src/decoder/plugins/FlacMetadata.hxx index d4f7e3480..6249dc96c 100644 --- a/src/decoder/plugins/FlacMetadata.hxx +++ b/src/decoder/plugins/FlacMetadata.hxx @@ -25,8 +25,6 @@ #include -#include - struct TagHandler; class MixRampInfo; diff --git a/src/decoder/plugins/GmeDecoderPlugin.cxx b/src/decoder/plugins/GmeDecoderPlugin.cxx index bc533f9c9..97e406581 100644 --- a/src/decoder/plugins/GmeDecoderPlugin.cxx +++ b/src/decoder/plugins/GmeDecoderPlugin.cxx @@ -25,7 +25,6 @@ #include "tag/TagHandler.hxx" #include "fs/Path.hxx" #include "fs/AllocatedPath.hxx" -#include "util/Alloc.hxx" #include "util/FormatString.hxx" #include "util/UriUtil.hxx" #include "util/Error.hxx" diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index dab851196..cbcd72d6e 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -29,7 +29,6 @@ #include "tag/MixRamp.hxx" #include "CheckAudioFormat.hxx" #include "util/StringCompare.hxx" -#include "util/ASCII.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" #include "Log.hxx" diff --git a/src/decoder/plugins/OpusDecoderPlugin.cxx b/src/decoder/plugins/OpusDecoderPlugin.cxx index e1db490d7..7d91cf72e 100644 --- a/src/decoder/plugins/OpusDecoderPlugin.cxx +++ b/src/decoder/plugins/OpusDecoderPlugin.cxx @@ -36,7 +36,6 @@ #include #include -#include static constexpr opus_int32 opus_sample_rate = 48000; diff --git a/src/decoder/plugins/VorbisComments.cxx b/src/decoder/plugins/VorbisComments.cxx index e4fabe5ad..4f0e84893 100644 --- a/src/decoder/plugins/VorbisComments.cxx +++ b/src/decoder/plugins/VorbisComments.cxx @@ -26,12 +26,8 @@ #include "tag/VorbisComment.hxx" #include "tag/ReplayGain.hxx" #include "ReplayGainInfo.hxx" -#include "util/ASCII.hxx" #include "util/DivideString.hxx" -#include -#include - bool vorbis_comments_to_replay_gain(ReplayGainInfo &rgi, char **comments) { diff --git a/src/encoder/plugins/ShineEncoderPlugin.cxx b/src/encoder/plugins/ShineEncoderPlugin.cxx index 11479d2ae..d36f3ffe6 100644 --- a/src/encoder/plugins/ShineEncoderPlugin.cxx +++ b/src/encoder/plugins/ShineEncoderPlugin.cxx @@ -23,7 +23,6 @@ #include "AudioFormat.hxx" #include "config/ConfigError.hxx" #include "util/Manual.hxx" -#include "util/NumberParser.hxx" #include "util/DynamicFifoBuffer.hxx" #include "util/Error.hxx" diff --git a/src/encoder/plugins/VorbisEncoderPlugin.cxx b/src/encoder/plugins/VorbisEncoderPlugin.cxx index dafaf36dc..079048615 100644 --- a/src/encoder/plugins/VorbisEncoderPlugin.cxx +++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx @@ -22,7 +22,6 @@ #include "OggStream.hxx" #include "OggSerial.hxx" #include "../EncoderAPI.hxx" -#include "tag/Tag.hxx" #include "AudioFormat.hxx" #include "config/ConfigError.hxx" #include "util/StringUtil.hxx" diff --git a/src/event/FullyBufferedSocket.cxx b/src/event/FullyBufferedSocket.cxx index 804986c33..21a038044 100644 --- a/src/event/FullyBufferedSocket.cxx +++ b/src/event/FullyBufferedSocket.cxx @@ -25,14 +25,8 @@ #include "Compiler.h" #include -#include #include -#ifndef WIN32 -#include -#include -#endif - FullyBufferedSocket::ssize_t FullyBufferedSocket::DirectWrite(const void *data, size_t length) { diff --git a/src/event/Loop.hxx b/src/event/Loop.hxx index 1d08b67e5..3232aaa41 100644 --- a/src/event/Loop.hxx +++ b/src/event/Loop.hxx @@ -35,7 +35,6 @@ class TimeoutMonitor; class IdleMonitor; class DeferredMonitor; -class SocketMonitor; #include diff --git a/src/event/ServerSocket.cxx b/src/event/ServerSocket.cxx index 3cd2ced47..608ee65e2 100644 --- a/src/event/ServerSocket.cxx +++ b/src/event/ServerSocket.cxx @@ -30,7 +30,6 @@ #include "system/fd_util.h" #include "fs/AllocatedPath.hxx" #include "fs/FileSystem.hxx" -#include "util/Alloc.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" #include "Log.hxx" @@ -38,12 +37,9 @@ #include #include -#include #include -#include #include #include -#include #include #ifdef WIN32 @@ -52,7 +48,6 @@ #else #include #include -#include #include #endif diff --git a/src/event/ServerSocket.hxx b/src/event/ServerSocket.hxx index eb996b2b6..252dad66f 100644 --- a/src/event/ServerSocket.hxx +++ b/src/event/ServerSocket.hxx @@ -22,8 +22,6 @@ #include -#include - class SocketAddress; class AllocatedSocketAddress; class EventLoop; diff --git a/src/event/SignalMonitor.cxx b/src/event/SignalMonitor.cxx index 7a3b03faf..0e1f4b4f4 100644 --- a/src/event/SignalMonitor.cxx +++ b/src/event/SignalMonitor.cxx @@ -22,7 +22,6 @@ #ifndef WIN32 -#include "WakeFD.hxx" #include "SocketMonitor.hxx" #include "util/Manual.hxx" #include "system/FatalError.hxx" diff --git a/src/event/SocketMonitor.cxx b/src/event/SocketMonitor.cxx index 7665aa215..b54ccc81c 100644 --- a/src/event/SocketMonitor.cxx +++ b/src/event/SocketMonitor.cxx @@ -21,7 +21,6 @@ #include "SocketMonitor.hxx" #include "Loop.hxx" #include "system/fd_util.h" -#include "Compiler.h" #include diff --git a/src/filter/plugins/ReplayGainFilterPlugin.cxx b/src/filter/plugins/ReplayGainFilterPlugin.cxx index 5c11ee7ff..c73669b11 100644 --- a/src/filter/plugins/ReplayGainFilterPlugin.cxx +++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx @@ -27,14 +27,12 @@ #include "ReplayGainConfig.hxx" #include "mixer/MixerControl.hxx" #include "pcm/Volume.hxx" -#include "pcm/PcmBuffer.hxx" #include "util/ConstBuffer.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" #include "Log.hxx" #include -#include static constexpr Domain replay_gain_domain("replay_gain"); diff --git a/src/filter/plugins/RouteFilterPlugin.cxx b/src/filter/plugins/RouteFilterPlugin.cxx index 03115f696..450b01f12 100644 --- a/src/filter/plugins/RouteFilterPlugin.cxx +++ b/src/filter/plugins/RouteFilterPlugin.cxx @@ -53,7 +53,6 @@ #include -#include #include #include #include diff --git a/src/filter/plugins/VolumeFilterPlugin.cxx b/src/filter/plugins/VolumeFilterPlugin.cxx index 2ad387d86..c29c92886 100644 --- a/src/filter/plugins/VolumeFilterPlugin.cxx +++ b/src/filter/plugins/VolumeFilterPlugin.cxx @@ -25,10 +25,6 @@ #include "pcm/Volume.hxx" #include "AudioFormat.hxx" #include "util/ConstBuffer.hxx" -#include "util/Error.hxx" - -#include -#include class VolumeFilter final : public Filter { PcmVolume pv; diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx index 136158e5a..ea98d6a9d 100644 --- a/src/fs/Charset.cxx +++ b/src/fs/Charset.cxx @@ -20,10 +20,8 @@ #include "config.h" #include "Charset.hxx" #include "Domain.hxx" -#include "Limits.hxx" #include "Log.hxx" #include "lib/icu/Converter.hxx" -#include "util/Error.hxx" #include "util/AllocatedString.hxx" #ifdef WIN32 diff --git a/src/fs/CheckFile.cxx b/src/fs/CheckFile.cxx index fa2c343fa..f5bd74381 100644 --- a/src/fs/CheckFile.cxx +++ b/src/fs/CheckFile.cxx @@ -28,7 +28,6 @@ #include "system/Error.hxx" #include -#include void CheckDirectoryReadable(Path path_fs) diff --git a/src/fs/Path.cxx b/src/fs/Path.cxx index a05f8f2a5..0a7fe3072 100644 --- a/src/fs/Path.cxx +++ b/src/fs/Path.cxx @@ -20,8 +20,6 @@ #include "config.h" #include "Path.hxx" #include "Charset.hxx" -#include "util/UriUtil.hxx" -#include "util/StringUtil.hxx" std::string Path::ToUTF8() const diff --git a/src/fs/StandardDirectory.cxx b/src/fs/StandardDirectory.cxx index 419b78849..5d9fc37fb 100644 --- a/src/fs/StandardDirectory.cxx +++ b/src/fs/StandardDirectory.cxx @@ -34,7 +34,6 @@ #include #else #include -#include #include #include #endif diff --git a/src/fs/io/AutoGunzipReader.hxx b/src/fs/io/AutoGunzipReader.hxx index c135d8eb6..9e757dc77 100644 --- a/src/fs/io/AutoGunzipReader.hxx +++ b/src/fs/io/AutoGunzipReader.hxx @@ -24,8 +24,6 @@ #include "PeekReader.hxx" #include "Compiler.h" -#include - class GunzipReader; /** diff --git a/src/fs/io/FileReader.hxx b/src/fs/io/FileReader.hxx index 2b7ce9c66..d371b7de6 100644 --- a/src/fs/io/FileReader.hxx +++ b/src/fs/io/FileReader.hxx @@ -29,8 +29,6 @@ #include "system/FileDescriptor.hxx" #endif -#include - #ifdef WIN32 #include #endif diff --git a/src/fs/io/GunzipReader.cxx b/src/fs/io/GunzipReader.cxx index 44f001805..16b3381cd 100644 --- a/src/fs/io/GunzipReader.cxx +++ b/src/fs/io/GunzipReader.cxx @@ -19,7 +19,6 @@ #include "config.h" #include "GunzipReader.hxx" -#include "lib/zlib/Domain.hxx" GunzipReader::GunzipReader(Reader &_next) throw(ZlibError) :next(_next), eof(false) diff --git a/src/fs/io/GzipOutputStream.cxx b/src/fs/io/GzipOutputStream.cxx index 683a3c4ad..8ba1f1387 100644 --- a/src/fs/io/GzipOutputStream.cxx +++ b/src/fs/io/GzipOutputStream.cxx @@ -19,7 +19,6 @@ #include "config.h" #include "GzipOutputStream.hxx" -#include "lib/zlib/Domain.hxx" #include "lib/zlib/Error.hxx" GzipOutputStream::GzipOutputStream(OutputStream &_next) throw(ZlibError) diff --git a/src/fs/io/GzipOutputStream.hxx b/src/fs/io/GzipOutputStream.hxx index bbcb1aac7..185b87fcb 100644 --- a/src/fs/io/GzipOutputStream.hxx +++ b/src/fs/io/GzipOutputStream.hxx @@ -25,7 +25,6 @@ #include "lib/zlib/Error.hxx" #include "Compiler.h" -#include #include /** diff --git a/src/fs/io/PeekReader.hxx b/src/fs/io/PeekReader.hxx index 547d4e8f2..8548b5136 100644 --- a/src/fs/io/PeekReader.hxx +++ b/src/fs/io/PeekReader.hxx @@ -26,8 +26,6 @@ #include -class AutoGunzipReader; - /** * A filter that allows the caller to peek the first few bytes without * consuming them. The first call must be Peek(), and the following diff --git a/src/input/AsyncInputStream.cxx b/src/input/AsyncInputStream.cxx index 98a85f045..308214f2b 100644 --- a/src/input/AsyncInputStream.cxx +++ b/src/input/AsyncInputStream.cxx @@ -21,7 +21,6 @@ #include "AsyncInputStream.hxx" #include "Domain.hxx" #include "tag/Tag.hxx" -#include "event/Call.hxx" #include "thread/Cond.hxx" #include "IOThread.hxx" #include "util/HugeAllocator.hxx" diff --git a/src/input/Init.cxx b/src/input/Init.cxx index cc54c482e..a3cc55451 100644 --- a/src/input/Init.cxx +++ b/src/input/Init.cxx @@ -28,7 +28,6 @@ #include "Log.hxx" #include -#include bool input_stream_global_init(Error &error) diff --git a/src/input/InputStream.hxx b/src/input/InputStream.hxx index d3fa604c1..aabbc8ef5 100644 --- a/src/input/InputStream.hxx +++ b/src/input/InputStream.hxx @@ -29,7 +29,6 @@ #include #include -#include class Cond; class Error; diff --git a/src/input/Open.cxx b/src/input/Open.cxx index 3701fb8a6..cb4b932f3 100644 --- a/src/input/Open.cxx +++ b/src/input/Open.cxx @@ -25,10 +25,8 @@ #include "Domain.hxx" #include "plugins/RewindInputPlugin.hxx" #include "fs/Traits.hxx" -#include "fs/Path.hxx" #include "fs/AllocatedPath.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" InputStreamPtr InputStream::Open(const char *url, diff --git a/src/input/ProxyInputStream.cxx b/src/input/ProxyInputStream.cxx index 3eb9477a3..d0d0e99bd 100644 --- a/src/input/ProxyInputStream.cxx +++ b/src/input/ProxyInputStream.cxx @@ -19,9 +19,6 @@ #include "config.h" #include "ProxyInputStream.hxx" -#include "tag/Tag.hxx" - -#include ProxyInputStream::ProxyInputStream(InputStream *_input) :InputStream(_input->GetURI(), _input->mutex, _input->cond), diff --git a/src/input/TextInputStream.hxx b/src/input/TextInputStream.hxx index 9edf2b82e..0566a63f3 100644 --- a/src/input/TextInputStream.hxx +++ b/src/input/TextInputStream.hxx @@ -23,8 +23,6 @@ #include "input/Ptr.hxx" #include "util/StaticFifoBuffer.hxx" -class InputStream; - class TextInputStream { InputStreamPtr is; StaticFifoBuffer buffer; diff --git a/src/input/plugins/AlsaInputPlugin.cxx b/src/input/plugins/AlsaInputPlugin.cxx index 7a96ade1d..85b61ee10 100644 --- a/src/input/plugins/AlsaInputPlugin.cxx +++ b/src/input/plugins/AlsaInputPlugin.cxx @@ -36,7 +36,6 @@ #include "Log.hxx" #include "event/MultiSocketMonitor.hxx" #include "event/DeferredMonitor.hxx" -#include "event/Call.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" #include "IOThread.hxx" diff --git a/src/input/plugins/ArchiveInputPlugin.cxx b/src/input/plugins/ArchiveInputPlugin.cxx index 35a7f6925..8d83fa3f4 100644 --- a/src/input/plugins/ArchiveInputPlugin.cxx +++ b/src/input/plugins/ArchiveInputPlugin.cxx @@ -25,9 +25,7 @@ #include "archive/ArchivePlugin.hxx" #include "archive/ArchiveFile.hxx" #include "../InputPlugin.hxx" -#include "fs/Traits.hxx" #include "fs/Path.hxx" -#include "util/Alloc.hxx" #include "Log.hxx" #include diff --git a/src/input/plugins/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx index a56929fd6..6f71bfe4d 100644 --- a/src/input/plugins/CdioParanoiaInputPlugin.cxx +++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx @@ -37,7 +37,6 @@ #include #include -#include #include #include #include diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index fcd1307ba..d3872aa39 100644 --- a/src/input/plugins/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -24,7 +24,6 @@ #include "../InputPlugin.hxx" #include "config/ConfigGlobal.hxx" #include "config/Block.hxx" -#include "tag/Tag.hxx" #include "tag/TagBuilder.hxx" #include "event/SocketMonitor.hxx" #include "event/TimeoutMonitor.hxx" @@ -33,7 +32,6 @@ #include "util/ASCII.hxx" #include "util/StringUtil.hxx" #include "util/NumberParser.hxx" -#include "util/CircularBuffer.hxx" #include "util/HugeAllocator.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/input/plugins/FileInputPlugin.cxx b/src/input/plugins/FileInputPlugin.cxx index dc35112f3..1d5eaf90e 100644 --- a/src/input/plugins/FileInputPlugin.cxx +++ b/src/input/plugins/FileInputPlugin.cxx @@ -30,7 +30,6 @@ #include #include -#include static constexpr Domain file_domain("file"); diff --git a/src/input/plugins/NfsInputPlugin.cxx b/src/input/plugins/NfsInputPlugin.cxx index a886885fa..bb397e1fc 100644 --- a/src/input/plugins/NfsInputPlugin.cxx +++ b/src/input/plugins/NfsInputPlugin.cxx @@ -29,8 +29,6 @@ #include "util/Error.hxx" #include -#include -#include /** * Do not buffer more than this number of bytes. It should be a diff --git a/src/lib/icu/Collate.cxx b/src/lib/icu/Collate.cxx index 52585ad33..bb47a86f5 100644 --- a/src/lib/icu/Collate.cxx +++ b/src/lib/icu/Collate.cxx @@ -27,7 +27,6 @@ #include "util/WritableBuffer.hxx" #include "util/ConstBuffer.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" #include #include @@ -44,7 +43,6 @@ #include #include -#include #ifdef HAVE_ICU static UCollator *collator; diff --git a/src/lib/icu/Collate.hxx b/src/lib/icu/Collate.hxx index 57a330b70..37bc3f33c 100644 --- a/src/lib/icu/Collate.hxx +++ b/src/lib/icu/Collate.hxx @@ -23,8 +23,6 @@ #include "check.h" #include "Compiler.h" -#include - class Error; template class AllocatedString; diff --git a/src/lib/nfs/Connection.hxx b/src/lib/nfs/Connection.hxx index f25133d47..1d677e412 100644 --- a/src/lib/nfs/Connection.hxx +++ b/src/lib/nfs/Connection.hxx @@ -20,15 +20,12 @@ #ifndef MPD_NFS_CONNECTION_HXX #define MPD_NFS_CONNECTION_HXX -#include "Lease.hxx" #include "Cancellable.hxx" #include "event/SocketMonitor.hxx" #include "event/TimeoutMonitor.hxx" #include "event/DeferredMonitor.hxx" #include "util/Error.hxx" -#include - #include #include #include @@ -37,6 +34,7 @@ struct nfs_context; struct nfsdir; struct nfsdirent; class NfsCallback; +class NfsLease; /** * An asynchronous connection to a NFS server. diff --git a/src/lib/nfs/FileReader.cxx b/src/lib/nfs/FileReader.cxx index da2288de3..523690de7 100644 --- a/src/lib/nfs/FileReader.cxx +++ b/src/lib/nfs/FileReader.cxx @@ -33,6 +33,7 @@ #include #include #include +#include NfsFileReader::NfsFileReader() :DeferredMonitor(io_thread_get()), state(State::INITIAL) diff --git a/src/lib/nfs/FileReader.hxx b/src/lib/nfs/FileReader.hxx index fa540ee94..ab88299cc 100644 --- a/src/lib/nfs/FileReader.hxx +++ b/src/lib/nfs/FileReader.hxx @@ -30,7 +30,6 @@ #include #include -#include struct nfsfh; class NfsConnection; diff --git a/src/lib/upnp/ClientInit.cxx b/src/lib/upnp/ClientInit.cxx index 1ea66e04d..19046f397 100644 --- a/src/lib/upnp/ClientInit.cxx +++ b/src/lib/upnp/ClientInit.cxx @@ -21,7 +21,6 @@ #include "ClientInit.hxx" #include "Init.hxx" #include "Callback.hxx" -#include "Domain.hxx" #include "thread/Mutex.hxx" #include "util/RuntimeError.hxx" diff --git a/src/lib/upnp/ContentDirectoryService.cxx b/src/lib/upnp/ContentDirectoryService.cxx index 9aa9a915e..bd824c001 100644 --- a/src/lib/upnp/ContentDirectoryService.cxx +++ b/src/lib/upnp/ContentDirectoryService.cxx @@ -20,7 +20,6 @@ #include "config.h" #include "ContentDirectoryService.hxx" #include "UniqueIxml.hxx" -#include "Domain.hxx" #include "Device.hxx" #include "ixmlwrap.hxx" #include "Util.hxx" diff --git a/src/lib/upnp/ContentDirectoryService.hxx b/src/lib/upnp/ContentDirectoryService.hxx index 74b9c3b70..6b1cbbdd5 100644 --- a/src/lib/upnp/ContentDirectoryService.hxx +++ b/src/lib/upnp/ContentDirectoryService.hxx @@ -27,7 +27,6 @@ #include #include -class Error; class UPnPDevice; struct UPnPService; class UPnPDirContent; diff --git a/src/lib/upnp/Device.cxx b/src/lib/upnp/Device.cxx index 0ed579ab1..f44d0670a 100644 --- a/src/lib/upnp/Device.cxx +++ b/src/lib/upnp/Device.cxx @@ -22,8 +22,6 @@ #include "Util.hxx" #include "lib/expat/ExpatParser.hxx" -#include - #include UPnPDevice::~UPnPDevice() diff --git a/src/lib/upnp/Discovery.cxx b/src/lib/upnp/Discovery.cxx index 24ee2b8c4..139eb6f36 100644 --- a/src/lib/upnp/Discovery.cxx +++ b/src/lib/upnp/Discovery.cxx @@ -19,7 +19,6 @@ #include "config.h" #include "Discovery.hxx" -#include "Domain.hxx" #include "ContentDirectoryService.hxx" #include "system/Clock.hxx" #include "Log.hxx" diff --git a/src/lib/upnp/Discovery.hxx b/src/lib/upnp/Discovery.hxx index 13935cfd8..6069afec6 100644 --- a/src/lib/upnp/Discovery.hxx +++ b/src/lib/upnp/Discovery.hxx @@ -24,7 +24,6 @@ #include "Device.hxx" #include "WorkQueue.hxx" #include "thread/Mutex.hxx" -#include "util/Error.hxx" #include "Compiler.h" #include diff --git a/src/lib/upnp/Domain.cxx b/src/lib/upnp/Domain.cxx deleted file mode 100644 index 1665c53d7..000000000 --- a/src/lib/upnp/Domain.cxx +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2003-2016 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. - */ - -#include "Domain.hxx" -#include "util/Domain.hxx" - -const Domain upnp_domain("upnp"); diff --git a/src/lib/upnp/Domain.hxx b/src/lib/upnp/Domain.hxx deleted file mode 100644 index 4e28b1c73..000000000 --- a/src/lib/upnp/Domain.hxx +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2003-2016 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_UPNP_DOMAIN_HXX -#define MPD_UPNP_DOMAIN_HXX - -class Domain; - -extern const Domain upnp_domain; - -#endif diff --git a/src/lib/upnp/Init.cxx b/src/lib/upnp/Init.cxx index 6f492db6a..c4bd1b9b0 100644 --- a/src/lib/upnp/Init.cxx +++ b/src/lib/upnp/Init.cxx @@ -19,7 +19,6 @@ #include "config.h" #include "Init.hxx" -#include "Domain.hxx" #include "thread/Mutex.hxx" #include "util/RuntimeError.hxx" diff --git a/src/lib/upnp/Util.cxx b/src/lib/upnp/Util.cxx index 9d7217f73..1792d905c 100644 --- a/src/lib/upnp/Util.cxx +++ b/src/lib/upnp/Util.cxx @@ -19,8 +19,6 @@ #include "Util.hxx" -#include - #include /** Get rid of white space at both ends */ diff --git a/src/lib/zlib/Domain.cxx b/src/lib/zlib/Domain.cxx deleted file mode 100644 index cdc048394..000000000 --- a/src/lib/zlib/Domain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2003-2016 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. - */ - -#include "config.h" -#include "Domain.hxx" -#include "util/Domain.hxx" - -const Domain zlib_domain("zlib"); diff --git a/src/lib/zlib/Domain.hxx b/src/lib/zlib/Domain.hxx deleted file mode 100644 index 6eee2a48b..000000000 --- a/src/lib/zlib/Domain.hxx +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2003-2016 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_ZLIB_DOMAIN_HXX -#define MPD_ZLIB_DOMAIN_HXX - -class Domain; - -extern const Domain zlib_domain; - -#endif diff --git a/src/lib/zlib/Error.hxx b/src/lib/zlib/Error.hxx index 3d3617618..becd42776 100644 --- a/src/lib/zlib/Error.hxx +++ b/src/lib/zlib/Error.hxx @@ -20,7 +20,7 @@ #ifndef MPD_ZLIB_ERROR_HXX #define MPD_ZLIB_ERROR_HXX -#include +#include class ZlibError final : public std::exception { int code; diff --git a/src/mixer/plugins/AlsaMixerPlugin.cxx b/src/mixer/plugins/AlsaMixerPlugin.cxx index 5cd7b7b1b..d6984fa13 100644 --- a/src/mixer/plugins/AlsaMixerPlugin.cxx +++ b/src/mixer/plugins/AlsaMixerPlugin.cxx @@ -23,7 +23,6 @@ #include "output/OutputAPI.hxx" #include "event/MultiSocketMonitor.hxx" #include "event/DeferredMonitor.hxx" -#include "event/Loop.hxx" #include "util/ASCII.hxx" #include "util/ReusableArray.hxx" #include "util/Clamp.hxx" diff --git a/src/mixer/plugins/PulseMixerPlugin.cxx b/src/mixer/plugins/PulseMixerPlugin.cxx index 0ac920b5a..6d003b47d 100644 --- a/src/mixer/plugins/PulseMixerPlugin.cxx +++ b/src/mixer/plugins/PulseMixerPlugin.cxx @@ -25,7 +25,6 @@ #include "mixer/Listener.hxx" #include "output/plugins/PulseOutputPlugin.hxx" #include "util/Error.hxx" -#include "Log.hxx" #include #include diff --git a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx index 78e121b09..d43d5eb64 100644 --- a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx +++ b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx @@ -30,14 +30,10 @@ #include "thread/Cond.hxx" #include "thread/Thread.hxx" #include "thread/Name.hxx" -#include "util/Macros.hxx" -#include "util/Domain.hxx" -#include "util/Error.hxx" #include "Log.hxx" #include -#include #include class SmbclientNeighborExplorer final : public NeighborExplorer { diff --git a/src/neighbor/plugins/UpnpNeighborPlugin.cxx b/src/neighbor/plugins/UpnpNeighborPlugin.cxx index ee22d870b..e83563a3f 100644 --- a/src/neighbor/plugins/UpnpNeighborPlugin.cxx +++ b/src/neighbor/plugins/UpnpNeighborPlugin.cxx @@ -19,7 +19,6 @@ #include "config.h" #include "UpnpNeighborPlugin.hxx" -#include "lib/upnp/Domain.hxx" #include "lib/upnp/ClientInit.hxx" #include "lib/upnp/Discovery.hxx" #include "lib/upnp/ContentDirectoryService.hxx" diff --git a/src/net/AllocatedSocketAddress.cxx b/src/net/AllocatedSocketAddress.cxx index 61615a72b..09264456b 100644 --- a/src/net/AllocatedSocketAddress.cxx +++ b/src/net/AllocatedSocketAddress.cxx @@ -30,7 +30,6 @@ #include "config.h" #include "AllocatedSocketAddress.hxx" -#include #include #ifdef HAVE_UN diff --git a/src/net/Resolver.cxx b/src/net/Resolver.cxx index 55b46759e..a4f63bb69 100644 --- a/src/net/Resolver.cxx +++ b/src/net/Resolver.cxx @@ -19,7 +19,6 @@ #include "config.h" #include "Resolver.hxx" -#include "SocketAddress.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/net/SocketUtil.cxx b/src/net/SocketUtil.cxx index 89b206d8e..0f89cac1f 100644 --- a/src/net/SocketUtil.cxx +++ b/src/net/SocketUtil.cxx @@ -23,12 +23,6 @@ #include "SocketError.hxx" #include "system/fd_util.h" -#include - -#ifdef HAVE_IPV6 -#include -#endif - int socket_bind_listen(int domain, int type, int protocol, SocketAddress address, diff --git a/src/output/MultipleOutputs.hxx b/src/output/MultipleOutputs.hxx index 68299244b..a5aa58172 100644 --- a/src/output/MultipleOutputs.hxx +++ b/src/output/MultipleOutputs.hxx @@ -35,7 +35,6 @@ #include -struct AudioFormat; class MusicBuffer; class MusicPipe; class EventLoop; diff --git a/src/output/OutputState.cxx b/src/output/OutputState.cxx index 1765956c2..0c6855454 100644 --- a/src/output/OutputState.cxx +++ b/src/output/OutputState.cxx @@ -31,7 +31,6 @@ #include "fs/io/BufferedOutputStream.hxx" #include "util/StringCompare.hxx" -#include #include #define AUDIO_DEVICE_STATE "audio_device_state:" diff --git a/src/output/Registry.cxx b/src/output/Registry.cxx index dd9db7b35..e8b17d088 100644 --- a/src/output/Registry.cxx +++ b/src/output/Registry.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "Registry.hxx" -#include "OutputAPI.hxx" +#include "OutputPlugin.hxx" #include "plugins/AlsaOutputPlugin.hxx" #include "plugins/AoOutputPlugin.hxx" #include "plugins/FifoOutputPlugin.hxx" diff --git a/src/output/plugins/JackOutputPlugin.cxx b/src/output/plugins/JackOutputPlugin.cxx index 9452ec5a9..26d3d838b 100644 --- a/src/output/plugins/JackOutputPlugin.cxx +++ b/src/output/plugins/JackOutputPlugin.cxx @@ -36,7 +36,6 @@ #include /* for usleep() */ #include -#include static constexpr unsigned MAX_PORTS = 16; diff --git a/src/output/plugins/httpd/HttpdClient.hxx b/src/output/plugins/httpd/HttpdClient.hxx index 307dc8785..222b1da99 100644 --- a/src/output/plugins/httpd/HttpdClient.hxx +++ b/src/output/plugins/httpd/HttpdClient.hxx @@ -23,7 +23,8 @@ #include "event/BufferedSocket.hxx" #include "Compiler.h" -#include +#include +#include #include #include diff --git a/src/output/plugins/httpd/HttpdInternal.hxx b/src/output/plugins/httpd/HttpdInternal.hxx index 6e41f74fd..73f1efe2b 100644 --- a/src/output/plugins/httpd/HttpdInternal.hxx +++ b/src/output/plugins/httpd/HttpdInternal.hxx @@ -34,6 +34,8 @@ #include "util/Cast.hxx" #include "Compiler.h" +#include + #include #include diff --git a/src/output/plugins/httpd/HttpdOutputPlugin.cxx b/src/output/plugins/httpd/HttpdOutputPlugin.cxx index aa8ed0bfe..7aa3b5dd0 100644 --- a/src/output/plugins/httpd/HttpdOutputPlugin.cxx +++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx @@ -39,8 +39,6 @@ #include -#include -#include #include #include diff --git a/src/pcm/PcmChannels.hxx b/src/pcm/PcmChannels.hxx index 126727a12..1a98ea332 100644 --- a/src/pcm/PcmChannels.hxx +++ b/src/pcm/PcmChannels.hxx @@ -21,7 +21,6 @@ #define MPD_PCM_CHANNELS_HXX #include -#include class PcmBuffer; template struct ConstBuffer; diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/PcmConvert.cxx index 4160891bd..81bec1c75 100644 --- a/src/pcm/PcmConvert.cxx +++ b/src/pcm/PcmConvert.cxx @@ -22,13 +22,10 @@ #include "Domain.hxx" #include "ConfiguredResampler.hxx" #include "AudioFormat.hxx" -#include "util/ConstBuffer.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" #include "util/ConstBuffer.hxx" #include -#include bool pcm_convert_global_init(Error &error) diff --git a/src/pcm/PcmConvert.hxx b/src/pcm/PcmConvert.hxx index b7d616d69..8b49c001f 100644 --- a/src/pcm/PcmConvert.hxx +++ b/src/pcm/PcmConvert.hxx @@ -21,7 +21,6 @@ #define PCM_CONVERT_HXX #include "check.h" -#include "PcmBuffer.hxx" #include "FormatConverter.hxx" #include "ChannelsConverter.hxx" #include "GlueResampler.hxx" @@ -31,11 +30,8 @@ #include "PcmDsd.hxx" #endif -#include - template struct ConstBuffer; class Error; -class Domain; /** * This object is statically allocated (within another struct), and diff --git a/src/pcm/PcmDop.hxx b/src/pcm/PcmDop.hxx index d6f5bb51e..f87f0fd63 100644 --- a/src/pcm/PcmDop.hxx +++ b/src/pcm/PcmDop.hxx @@ -23,7 +23,6 @@ #include "check.h" #include -#include class PcmBuffer; template struct ConstBuffer; diff --git a/src/pcm/PcmExport.cxx b/src/pcm/PcmExport.cxx index 5a9bf4558..3bb831836 100644 --- a/src/pcm/PcmExport.cxx +++ b/src/pcm/PcmExport.cxx @@ -29,8 +29,6 @@ #include "PcmDop.hxx" #endif -#include - void PcmExport::Open(SampleFormat sample_format, unsigned _channels, Params params) diff --git a/src/pcm/PcmExport.hxx b/src/pcm/PcmExport.hxx index dd34e441a..df1fcb5f7 100644 --- a/src/pcm/PcmExport.hxx +++ b/src/pcm/PcmExport.hxx @@ -24,7 +24,6 @@ #include "PcmBuffer.hxx" #include "AudioFormat.hxx" -struct AudioFormat; template struct ConstBuffer; /** diff --git a/src/pcm/PcmFormat.hxx b/src/pcm/PcmFormat.hxx index b03fd5ffb..b89c9de05 100644 --- a/src/pcm/PcmFormat.hxx +++ b/src/pcm/PcmFormat.hxx @@ -23,7 +23,6 @@ #include "AudioFormat.hxx" #include -#include template struct ConstBuffer; class PcmBuffer; diff --git a/src/pcm/SoxrResampler.cxx b/src/pcm/SoxrResampler.cxx index 422d0f085..1b8002115 100644 --- a/src/pcm/SoxrResampler.cxx +++ b/src/pcm/SoxrResampler.cxx @@ -21,7 +21,6 @@ #include "SoxrResampler.hxx" #include "AudioFormat.hxx" #include "config/Block.hxx" -#include "util/ASCII.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" #include "Log.hxx" diff --git a/src/pcm/Volume.cxx b/src/pcm/Volume.cxx index 2f2016cca..d8f83ad60 100644 --- a/src/pcm/Volume.cxx +++ b/src/pcm/Volume.cxx @@ -20,7 +20,6 @@ #include "config.h" #include "Volume.hxx" #include "Domain.hxx" -#include "PcmUtils.hxx" #include "Traits.hxx" #include "util/ConstBuffer.hxx" #include "util/Error.hxx" diff --git a/src/pcm/Volume.hxx b/src/pcm/Volume.hxx index 94c23ab23..5e92fb6fe 100644 --- a/src/pcm/Volume.hxx +++ b/src/pcm/Volume.hxx @@ -24,9 +24,6 @@ #include "PcmBuffer.hxx" #include "PcmDither.hxx" -#include -#include - #ifndef NDEBUG #include #endif @@ -45,8 +42,6 @@ static constexpr unsigned PCM_VOLUME_BITS = 10; static constexpr unsigned PCM_VOLUME_1 = 1024; static constexpr int PCM_VOLUME_1S = PCM_VOLUME_1; -struct AudioFormat; - /** * Converts a float value (0.0 = silence, 1.0 = 100% volume) to an * integer volume value (1000 = 100%). diff --git a/src/playlist/PlaylistMapper.cxx b/src/playlist/PlaylistMapper.cxx index fde554562..bbfdb18a4 100644 --- a/src/playlist/PlaylistMapper.cxx +++ b/src/playlist/PlaylistMapper.cxx @@ -21,7 +21,6 @@ #include "PlaylistMapper.hxx" #include "PlaylistFile.hxx" #include "PlaylistStream.hxx" -#include "PlaylistRegistry.hxx" #include "Mapper.hxx" #include "fs/AllocatedPath.hxx" #include "storage/StorageInterface.hxx" diff --git a/src/playlist/PlaylistQueue.cxx b/src/playlist/PlaylistQueue.cxx index f42b191ad..5aa0de9eb 100644 --- a/src/playlist/PlaylistQueue.cxx +++ b/src/playlist/PlaylistQueue.cxx @@ -21,13 +21,13 @@ #include "PlaylistQueue.hxx" #include "PlaylistAny.hxx" #include "PlaylistSong.hxx" +#include "PlaylistError.hxx" #include "queue/Playlist.hxx" #include "SongEnumerator.hxx" #include "DetachedSong.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" #include "fs/Traits.hxx" -#include "util/Error.hxx" #ifdef ENABLE_DATABASE #include "SongLoader.hxx" diff --git a/src/playlist/PlaylistQueue.hxx b/src/playlist/PlaylistQueue.hxx index 1507b70b7..e120926bc 100644 --- a/src/playlist/PlaylistQueue.hxx +++ b/src/playlist/PlaylistQueue.hxx @@ -24,8 +24,6 @@ #ifndef MPD_PLAYLIST_QUEUE_HXX #define MPD_PLAYLIST_QUEUE_HXX -#include "PlaylistError.hxx" - class Error; class SongLoader; class SongEnumerator; diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx index 079a09abc..f385b1c06 100644 --- a/src/playlist/PlaylistRegistry.cxx +++ b/src/playlist/PlaylistRegistry.cxx @@ -37,7 +37,6 @@ #include "util/Macros.hxx" #include "config/ConfigGlobal.hxx" #include "config/Block.hxx" -#include "Log.hxx" #include #include diff --git a/src/playlist/PlaylistSong.cxx b/src/playlist/PlaylistSong.cxx index 784300cc6..5efa65544 100644 --- a/src/playlist/PlaylistSong.cxx +++ b/src/playlist/PlaylistSong.cxx @@ -27,7 +27,6 @@ #include "util/Error.hxx" #include "DetachedSong.hxx" -#include #include static void diff --git a/src/playlist/Print.cxx b/src/playlist/Print.cxx index 6199811b8..20477a5dd 100644 --- a/src/playlist/Print.cxx +++ b/src/playlist/Print.cxx @@ -24,7 +24,6 @@ #include "SongEnumerator.hxx" #include "SongPrint.hxx" #include "DetachedSong.hxx" -#include "SongLoader.hxx" #include "fs/Traits.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" diff --git a/src/playlist/cue/CueParser.hxx b/src/playlist/cue/CueParser.hxx index 168e51b92..950d96274 100644 --- a/src/playlist/cue/CueParser.hxx +++ b/src/playlist/cue/CueParser.hxx @@ -28,9 +28,6 @@ #include #include -class DetachedSong; -struct Tag; - class CueParser { enum { /** diff --git a/src/playlist/plugins/CuePlaylistPlugin.cxx b/src/playlist/plugins/CuePlaylistPlugin.cxx index 64eafb792..49c9df1d7 100644 --- a/src/playlist/plugins/CuePlaylistPlugin.cxx +++ b/src/playlist/plugins/CuePlaylistPlugin.cxx @@ -24,8 +24,6 @@ #include "../cue/CueParser.hxx" #include "input/TextInputStream.hxx" -#include - class CuePlaylist final : public SongEnumerator { TextInputStream tis; CueParser parser; diff --git a/src/playlist/plugins/FlacPlaylistPlugin.cxx b/src/playlist/plugins/FlacPlaylistPlugin.cxx index e99a95329..85eed0cdc 100644 --- a/src/playlist/plugins/FlacPlaylistPlugin.cxx +++ b/src/playlist/plugins/FlacPlaylistPlugin.cxx @@ -34,8 +34,6 @@ #include -#include - class FlacPlaylist final : public SongEnumerator { const char *const uri; diff --git a/src/playlist/plugins/PlsPlaylistPlugin.cxx b/src/playlist/plugins/PlsPlaylistPlugin.cxx index 0c107d7a7..725f80ced 100644 --- a/src/playlist/plugins/PlsPlaylistPlugin.cxx +++ b/src/playlist/plugins/PlsPlaylistPlugin.cxx @@ -28,7 +28,6 @@ #include "util/ASCII.hxx" #include "util/StringUtil.hxx" #include "util/DivideString.hxx" -#include "util/Error.hxx" #include diff --git a/src/protocol/ArgParser.hxx b/src/protocol/ArgParser.hxx index 6424a7264..3c1506dcf 100644 --- a/src/protocol/ArgParser.hxx +++ b/src/protocol/ArgParser.hxx @@ -27,7 +27,6 @@ #include -class Response; class SongTime; class SignedSongTime; diff --git a/src/queue/Playlist.hxx b/src/queue/Playlist.hxx index 038af7464..72c84337a 100644 --- a/src/queue/Playlist.hxx +++ b/src/queue/Playlist.hxx @@ -21,7 +21,6 @@ #define MPD_PLAYLIST_HXX #include "queue/Queue.hxx" -#include "PlaylistError.hxx" enum TagType : uint8_t; struct PlayerControl; diff --git a/src/queue/PlaylistEdit.cxx b/src/queue/PlaylistEdit.cxx index 1d1a03505..7af1e110f 100644 --- a/src/queue/PlaylistEdit.cxx +++ b/src/queue/PlaylistEdit.cxx @@ -27,7 +27,6 @@ #include "Playlist.hxx" #include "PlaylistError.hxx" #include "player/Control.hxx" -#include "util/UriUtil.hxx" #include "util/Error.hxx" #include "DetachedSong.hxx" #include "SongLoader.hxx" diff --git a/src/queue/PlaylistUpdate.cxx b/src/queue/PlaylistUpdate.cxx index c3045e441..a0bc0208a 100644 --- a/src/queue/PlaylistUpdate.cxx +++ b/src/queue/PlaylistUpdate.cxx @@ -22,7 +22,6 @@ #include "db/Interface.hxx" #include "db/LightSong.hxx" #include "DetachedSong.hxx" -#include "tag/Tag.hxx" #include "Idle.hxx" #include "util/Error.hxx" diff --git a/src/queue/QueueSave.cxx b/src/queue/QueueSave.cxx index 066991067..a67172795 100644 --- a/src/queue/QueueSave.cxx +++ b/src/queue/QueueSave.cxx @@ -23,13 +23,11 @@ #include "PlaylistError.hxx" #include "DetachedSong.hxx" #include "SongSave.hxx" -#include "SongLoader.hxx" #include "playlist/PlaylistSong.hxx" #include "fs/io/TextFile.hxx" #include "fs/io/BufferedOutputStream.hxx" #include "util/StringCompare.hxx" #include "util/Error.hxx" -#include "fs/Traits.hxx" #include "Log.hxx" #include diff --git a/src/sticker/SongSticker.cxx b/src/sticker/SongSticker.cxx index 0f6fcb844..dddeef9cf 100644 --- a/src/sticker/SongSticker.cxx +++ b/src/sticker/SongSticker.cxx @@ -25,7 +25,6 @@ #include "util/Error.hxx" #include "util/Alloc.hxx" -#include #include #include diff --git a/src/storage/CompositeStorage.hxx b/src/storage/CompositeStorage.hxx index 29d5d170d..89d2f90d3 100644 --- a/src/storage/CompositeStorage.hxx +++ b/src/storage/CompositeStorage.hxx @@ -29,7 +29,6 @@ #include class Error; -class Storage; /** * A #Storage implementation that combines multiple other #Storage diff --git a/src/tag/Aiff.cxx b/src/tag/Aiff.cxx index 23e319296..ccedafb0a 100644 --- a/src/tag/Aiff.cxx +++ b/src/tag/Aiff.cxx @@ -27,7 +27,6 @@ #include #include -#include #include struct aiff_header { diff --git a/src/tag/ApeLoader.hxx b/src/tag/ApeLoader.hxx index 9abd8ecbb..e9a756f45 100644 --- a/src/tag/ApeLoader.hxx +++ b/src/tag/ApeLoader.hxx @@ -24,10 +24,7 @@ #include -#include - struct StringView; -class Path; class InputStream; typedef std::function - extern tag_mask_t global_tag_mask; gcc_const diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx index af7c1bfa9..e2036dacc 100644 --- a/src/tag/Tag.cxx +++ b/src/tag/Tag.cxx @@ -20,7 +20,6 @@ #include "config.h" #include "Tag.hxx" #include "TagPool.hxx" -#include "TagString.hxx" #include "TagBuilder.hxx" #include "util/ASCII.hxx" diff --git a/src/tag/Tag.hxx b/src/tag/Tag.hxx index ca08a9c31..521a61d9c 100644 --- a/src/tag/Tag.hxx +++ b/src/tag/Tag.hxx @@ -26,9 +26,6 @@ #include "Compiler.h" #include -#include - -#include /** * The meta information about a song file. It is a MPD specific diff --git a/src/tag/TagBuilder.cxx b/src/tag/TagBuilder.cxx index 8aaf7d3b7..0933ec4d9 100644 --- a/src/tag/TagBuilder.cxx +++ b/src/tag/TagBuilder.cxx @@ -29,7 +29,6 @@ #include #include -#include #include TagBuilder::TagBuilder(const Tag &other) diff --git a/src/tag/TagBuilder.hxx b/src/tag/TagBuilder.hxx index 8b6961fa4..9858ceae1 100644 --- a/src/tag/TagBuilder.hxx +++ b/src/tag/TagBuilder.hxx @@ -26,8 +26,6 @@ #include -#include - struct StringView; struct TagItem; struct Tag; diff --git a/src/tag/TagConfig.cxx b/src/tag/TagConfig.cxx index 9b2b7119d..ead15c483 100644 --- a/src/tag/TagConfig.cxx +++ b/src/tag/TagConfig.cxx @@ -28,8 +28,6 @@ #include "util/ASCII.hxx" #include "util/StringUtil.hxx" -#include - #include void diff --git a/src/tag/TagId3.cxx b/src/tag/TagId3.cxx index 4ad0c7c6e..7330bda67 100644 --- a/src/tag/TagId3.cxx +++ b/src/tag/TagId3.cxx @@ -25,16 +25,14 @@ #include "TagBuilder.hxx" #include "util/Alloc.hxx" #include "util/StringUtil.hxx" -#include "util/Error.hxx" #include "Log.hxx" -#include "config/ConfigGlobal.hxx" -#include "fs/Path.hxx" #include #include #include +#include #include # ifndef ID3_FRAME_COMPOSER diff --git a/src/tag/TagString.cxx b/src/tag/TagString.cxx index 663f0dec6..19c29eaef 100644 --- a/src/tag/TagString.cxx +++ b/src/tag/TagString.cxx @@ -25,7 +25,6 @@ #include "util/UTF8.hxx" #include -#include #include gcc_pure diff --git a/src/tag/TagString.hxx b/src/tag/TagString.hxx index d50bc1353..0f980d0a6 100644 --- a/src/tag/TagString.hxx +++ b/src/tag/TagString.hxx @@ -23,8 +23,6 @@ #include "check.h" #include "Compiler.h" -#include - struct StringView; template struct WritableBuffer; diff --git a/src/unix/Daemon.cxx b/src/unix/Daemon.cxx index 78d6eadcb..598446c3d 100644 --- a/src/unix/Daemon.cxx +++ b/src/unix/Daemon.cxx @@ -23,7 +23,6 @@ #include "fs/AllocatedPath.hxx" #include "fs/FileSystem.hxx" #include "PidFile.hxx" -#include "Log.hxx" #include #include diff --git a/src/util/PeakBuffer.hxx b/src/util/PeakBuffer.hxx index b7761f0ae..bbbb4c32b 100644 --- a/src/util/PeakBuffer.hxx +++ b/src/util/PeakBuffer.hxx @@ -20,7 +20,6 @@ #ifndef MPD_PEAK_BUFFER_HXX #define MPD_PEAK_BUFFER_HXX -#include "WritableBuffer.hxx" #include "Compiler.h" #include diff --git a/src/util/StringUtil.cxx b/src/util/StringUtil.cxx index 6cb5889fc..62994bc18 100644 --- a/src/util/StringUtil.cxx +++ b/src/util/StringUtil.cxx @@ -18,7 +18,6 @@ */ #include "StringUtil.hxx" -#include "StringAPI.hxx" #include "CharUtil.hxx" #include "ASCII.hxx"