*: include cleanup (using iwyu)

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 \

src/Log.cxx

@@ -20,11 +20,9 @@
 #include "config.h"
 #include "LogV.hxx"
 #include "util/Error.hxx"
-#include "util/Domain.hxx"
 
 #include <exception>
 
-#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>

src/LogInit.cxx

@@ -35,7 +35,6 @@
 #include <string.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <time.h>
 #include <unistd.h>
 
 #define LOG_LEVEL_SECURE LogLevel::INFO

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"

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"
 

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"

src/PlaylistFile.cxx

@@ -43,12 +43,10 @@
 #include "util/Macros.hxx"
 #include "util/StringCompare.hxx"
 #include "util/UriUtil.hxx"
-#include "util/Error.hxx"
 
 #include <memory>
 
 #include <assert.h>
-#include <sys/stat.h>
 #include <string.h>
 #include <errno.h>
 

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: "

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.

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 <string.h>
 
 void
 playlist_print_song(BufferedOutputStream &os, const DetachedSong &song)

src/SongFilter.hxx

@@ -40,7 +40,6 @@
 template<typename T> struct ConstBuffer;
 struct Tag;
 struct TagItem;
-struct Song;
 struct LightSong;
 class DetachedSong;
 

src/SongSave.hxx

@@ -23,7 +23,6 @@
 #define SONG_BEGIN "song_begin: "
 
 struct Song;
-struct Directory;
 class DetachedSong;
 class BufferedOutputStream;
 class TextFile;

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 <assert.h>
 #include <string.h>
-#include <sys/stat.h>
 
 #ifdef ENABLE_DATABASE
 

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"
 

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"

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"

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"
 

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 <bzlib.h>

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"

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"

src/client/Client.hxx

@@ -27,7 +27,8 @@
 #include "event/TimeoutMonitor.hxx"
 #include "Compiler.h"
 
-#include <boost/intrusive/list.hpp>
+#include <boost/intrusive/link_mode.hpp>
+#include <boost/intrusive/list_hook.hpp>
 
 #include <set>
 #include <string>

src/client/ClientList.hxx

@@ -22,7 +22,7 @@
 
 #include "Client.hxx"
 
-class Client;
+#include <boost/intrusive/list.hpp>
 
 class ClientList {
 	typedef boost::intrusive::list<Client,

src/client/ClientNew.cxx

@@ -26,7 +26,6 @@
 #include "net/SocketAddress.hxx"
 #include "net/ToString.hxx"
 #include "Permission.hxx"
-#include "util/Error.hxx"
 #include "Log.hxx"
 
 #include <assert.h>

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

src/command/CommandError.cxx

@@ -29,8 +29,6 @@
 #include <system_error>
 
 #include <assert.h>
-#include <string.h>
-#include <errno.h>
 
 gcc_const
 static enum ack

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 <string.h>
-
 CommandResult
 handle_listfiles_db(Client &client, Response &r, const char *uri)
 {

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 <assert.h>
-#include <sys/stat.h>
 #include <inttypes.h> /* for PRIu64 */
 
 gcc_pure

src/command/NeighborCommands.cxx

@@ -26,13 +26,9 @@
 #include "Partition.hxx"
 #include "neighbor/Glue.hxx"
 #include "neighbor/Info.hxx"
-#include "util/ConstBuffer.hxx"
 
-#include <set>
 #include <string>
 
-#include <assert.h>
-
 bool
 neighbor_commands_available(const Instance &instance)
 {

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"

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)

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"

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"

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 <memory>
 #include <limits>
 
-#include <string.h>
-
 static CommandResult
 AddUri(Client &client, const LocatedUri &uri, Response &r)
 {

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"

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"

src/config/ConfigFile.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_CONFIG_FILE_HXX
 #define MPD_CONFIG_FILE_HXX
 
-class Error;
 class Path;
 struct ConfigData;
 

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,

src/db/DatabaseGlue.cxx

@@ -25,8 +25,6 @@
 #include "config/Block.hxx"
 #include "DatabasePlugin.hxx"
 
-#include <string.h>
-
 Database *
 DatabaseGlobalInit(EventLoop &loop, DatabaseListener &listener,
 		   const ConfigBlock &block, Error &error)

src/db/DatabasePlaylist.cxx

@@ -24,7 +24,6 @@
 #include "PlaylistFile.hxx"
 #include "Interface.hxx"
 #include "DetachedSong.hxx"
-#include "storage/StorageInterface.hxx"
 
 #include <functional>
 

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"

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;
 

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;

src/db/plugins/simple/DirectorySave.cxx

@@ -31,7 +31,6 @@
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 
-#include <stddef.h>
 #include <string.h>
 
 #define DIRECTORY_DIR "directory: "

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 <string>
 

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"

src/db/plugins/simple/Song.cxx

@@ -27,7 +27,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <stdlib.h>
 
 inline Song::Song(const char *_uri, size_t uri_length, Directory &_parent)
 	:parent(&_parent), mtime(0),

src/db/plugins/simple/Song.hxx

@@ -29,7 +29,6 @@
 
 #include <string>
 
-#include <assert.h>
 #include <time.h>
 
 struct LightSong;

src/db/plugins/simple/SongSort.hxx

@@ -22,8 +22,6 @@
 
 #include "Song.hxx"
 
-struct list_head;
-
 void
 song_list_sort(SongList &songs);
 

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"

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"

src/db/update/Archive.cxx

@@ -36,7 +36,6 @@
 
 #include <string>
 
-#include <sys/stat.h>
 #include <string.h>
 
 static Directory *

src/db/update/Container.cxx

@@ -32,8 +32,6 @@
 #include "tag/TagBuilder.hxx"
 #include "Log.hxx"
 
-#include <sys/stat.h>
-
 Directory *
 UpdateWalk::MakeDirectoryIfModified(Directory &parent, const char *name,
 				    const StorageFileInfo &info)

src/db/update/Editor.cxx

@@ -26,7 +26,6 @@
 #include "db/plugins/simple/Song.hxx"
 
 #include <assert.h>
-#include <stddef.h>
 
 void
 DatabaseEditor::DeleteSong(Directory &dir, Song *del)

src/db/update/Editor.hxx

@@ -26,7 +26,6 @@
 
 struct Directory;
 struct Song;
-class UpdateRemoveService;
 
 class DatabaseEditor final {
 	UpdateRemoveService remove;

src/db/update/ExcludeList.cxx

@@ -32,7 +32,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <errno.h>
 
 bool
 ExcludeList::LoadFile(Path path_fs)

src/db/update/InotifySource.cxx

@@ -25,8 +25,6 @@
 #include "system/FatalError.hxx"
 #include "Log.hxx"
 
-#include <algorithm>
-
 #include <sys/inotify.h>
 #include <unistd.h>
 #include <errno.h>

src/db/update/InotifyUpdate.cxx

@@ -34,7 +34,6 @@
 
 #include <assert.h>
 #include <sys/inotify.h>
-#include <sys/stat.h>
 #include <string.h>
 #include <dirent.h>
 

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"
 

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 <errno.h>
-#include <unistd.h>
 
 bool
 GetInfo(Storage &storage, const char *uri_utf8, StorageFileInfo &info)

src/db/update/Walk.cxx

@@ -44,7 +44,6 @@
 #include "Log.hxx"
 
 #include <assert.h>
-#include <sys/stat.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>

src/db/update/Walk.hxx

@@ -24,9 +24,6 @@
 #include "Editor.hxx"
 #include "Compiler.h"
 
-#include <sys/stat.h>
-
-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.
 	 *

src/decoder/DecoderBuffer.cxx

@@ -21,8 +21,6 @@
 #include "DecoderBuffer.hxx"
 #include "DecoderAPI.hxx"
 
-#include <assert.h>
-
 bool
 DecoderBuffer::Fill()
 {

src/decoder/DecoderControl.hxx

@@ -29,6 +29,8 @@
 #include "Chrono.hxx"
 #include "util/Error.hxx"
 
+#include <utility>
+
 #include <assert.h>
 #include <stdint.h>
 

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"

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 <string.h>
 #include <stdlib.h>

src/decoder/plugins/DsdLib.hxx

@@ -24,7 +24,6 @@
 #include "input/Offset.hxx"
 #include "Compiler.h"
 
-#include <stddef.h>
 #include <stdint.h>
 
 struct Decoder;

src/decoder/plugins/FaadDecoderPlugin.cxx

@@ -33,7 +33,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <unistd.h>
 
 static const unsigned adts_sample_rates[] =
     { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,

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 <libavformat/avformat.h>
 #include <libavformat/avio.h>
 #include <libavutil/avutil.h>
-#include <libavutil/log.h>
 
 #if LIBAVUTIL_VERSION_MAJOR >= 53
 #include <libavutil/frame.h>

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

src/decoder/plugins/FlacMetadata.hxx

@@ -25,8 +25,6 @@
 
 #include <FLAC/metadata.h>
 
-#include <assert.h>
-
 struct TagHandler;
 class MixRampInfo;
 

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"

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"

src/decoder/plugins/OpusDecoderPlugin.cxx

@@ -36,7 +36,6 @@
 #include <ogg/ogg.h>
 
 #include <string.h>
-#include <stdio.h>
 
 static constexpr opus_int32 opus_sample_rate = 48000;
 

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 <stddef.h>
-#include <stdlib.h>
-
 bool
 vorbis_comments_to_replay_gain(ReplayGainInfo &rgi, char **comments)
 {

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"
 

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"

src/event/FullyBufferedSocket.cxx

@@ -25,14 +25,8 @@
 #include "Compiler.h"
 
 #include <assert.h>
-#include <stdint.h>
 #include <string.h>
 
-#ifndef WIN32
-#include <sys/types.h>
-#include <sys/socket.h>
-#endif
-
 FullyBufferedSocket::ssize_t
 FullyBufferedSocket::DirectWrite(const void *data, size_t length)
 {

src/event/Loop.hxx

@@ -35,7 +35,6 @@
 class TimeoutMonitor;
 class IdleMonitor;
 class DeferredMonitor;
-class SocketMonitor;
 
 #include <assert.h>
 

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 <string>
 #include <algorithm>
 
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdlib.h>
 #include <assert.h>
 
 #ifdef WIN32
@@ -52,7 +48,6 @@
 #else
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <sys/un.h>
 #include <netdb.h>
 #endif
 

src/event/ServerSocket.hxx

@@ -22,8 +22,6 @@
 
 #include <list>
 
-#include <stddef.h>
-
 class SocketAddress;
 class AllocatedSocketAddress;
 class EventLoop;

src/event/SignalMonitor.cxx

@@ -22,7 +22,6 @@
 
 #ifndef WIN32
 
-#include "WakeFD.hxx"
 #include "SocketMonitor.hxx"
 #include "util/Manual.hxx"
 #include "system/FatalError.hxx"

src/event/SocketMonitor.cxx

@@ -21,7 +21,6 @@
 #include "SocketMonitor.hxx"
 #include "Loop.hxx"
 #include "system/fd_util.h"
-#include "Compiler.h"
 
 #include <assert.h>
 

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 <assert.h>
-#include <string.h>
 
 static constexpr Domain replay_gain_domain("replay_gain");
 

src/filter/plugins/RouteFilterPlugin.cxx

@@ -53,7 +53,6 @@
 
 #include <algorithm>
 
-#include <assert.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>

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 <assert.h>
-#include <string.h>
 
 class VolumeFilter final : public Filter {
 	PcmVolume pv;

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

src/fs/CheckFile.cxx

@@ -28,7 +28,6 @@
 #include "system/Error.hxx"
 
 #include <errno.h>
-#include <sys/stat.h>
 
 void
 CheckDirectoryReadable(Path path_fs)

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

src/fs/StandardDirectory.cxx

@@ -34,7 +34,6 @@
 #include <shlobj.h>
 #else
 #include <stdlib.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <pwd.h>
 #endif

src/fs/io/AutoGunzipReader.hxx

@@ -24,8 +24,6 @@
 #include "PeekReader.hxx"
 #include "Compiler.h"
 
-#include <stdint.h>
-
 class GunzipReader;
 
 /**

src/fs/io/FileReader.hxx

@@ -29,8 +29,6 @@
 #include "system/FileDescriptor.hxx"
 #endif
 
-#include <assert.h>
-
 #ifdef WIN32
 #include <windows.h>
 #endif

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)

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)

src/fs/io/GzipOutputStream.hxx

@@ -25,7 +25,6 @@
 #include "lib/zlib/Error.hxx"
 #include "Compiler.h"
 
-#include <assert.h>
 #include <zlib.h>
 
 /**

src/fs/io/PeekReader.hxx

@@ -26,8 +26,6 @@
 
 #include <stdint.h>
 
-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

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"

src/input/Init.cxx

@@ -28,7 +28,6 @@
 #include "Log.hxx"
 
 #include <assert.h>
-#include <string.h>
 
 bool
 input_stream_global_init(Error &error)

src/input/InputStream.hxx

@@ -29,7 +29,6 @@
 #include <string>
 
 #include <assert.h>
-#include <stdint.h>
 
 class Cond;
 class Error;

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,

src/input/ProxyInputStream.cxx

@@ -19,9 +19,6 @@
 
 #include "config.h"
 #include "ProxyInputStream.hxx"
-#include "tag/Tag.hxx"
-
-#include <assert.h>
 
 ProxyInputStream::ProxyInputStream(InputStream *_input)
 	:InputStream(_input->GetURI(), _input->mutex, _input->cond),

src/input/TextInputStream.hxx

@@ -23,8 +23,6 @@
 #include "input/Ptr.hxx"
 #include "util/StaticFifoBuffer.hxx"
 
-class InputStream;
-
 class TextInputStream {
 	InputStreamPtr is;
 	StaticFifoBuffer<char, 4096> buffer;

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"

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 <stdlib.h>

src/input/plugins/CdioParanoiaInputPlugin.cxx

@@ -37,7 +37,6 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <stddef.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>

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"

src/input/plugins/FileInputPlugin.cxx

@@ -30,7 +30,6 @@
 
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <errno.h>
 
 static constexpr Domain file_domain("file");
 

src/input/plugins/NfsInputPlugin.cxx

@@ -29,8 +29,6 @@
 #include "util/Error.hxx"
 
 #include <string.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 
 /**
  * Do not buffer more than this number of bytes.  It should be a

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 <unicode/ucol.h>
 #include <unicode/ustring.h>
@@ -44,7 +43,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <strings.h>
 
 #ifdef HAVE_ICU
 static UCollator *collator;

src/lib/icu/Collate.hxx

@@ -23,8 +23,6 @@
 #include "check.h"
 #include "Compiler.h"
 
-#include <string>
-
 class Error;
 template<typename T> class AllocatedString;
 

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 <boost/intrusive/list.hpp>
-
 #include <string>
 #include <list>
 #include <forward_list>
@@ -37,6 +34,7 @@ struct nfs_context;
 struct nfsdir;
 struct nfsdirent;
 class NfsCallback;
+class NfsLease;
 
 /**
  * An asynchronous connection to a NFS server.

src/lib/nfs/FileReader.cxx

@@ -33,6 +33,7 @@
 #include <assert.h>
 #include <string.h>
 #include <fcntl.h>
+#include <sys/stat.h>
 
 NfsFileReader::NfsFileReader()
 	:DeferredMonitor(io_thread_get()), state(State::INITIAL)

src/lib/nfs/FileReader.hxx

@@ -30,7 +30,6 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <sys/stat.h>
 
 struct nfsfh;
 class NfsConnection;

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"
 

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"

src/lib/upnp/ContentDirectoryService.hxx

@@ -27,7 +27,6 @@
 #include <string>
 #include <list>
 
-class Error;
 class UPnPDevice;
 struct UPnPService;
 class UPnPDirContent;

src/lib/upnp/Device.cxx

@@ -22,8 +22,6 @@
 #include "Util.hxx"
 #include "lib/expat/ExpatParser.hxx"
 
-#include <stdlib.h>
-
 #include <string.h>
 
 UPnPDevice::~UPnPDevice()

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"

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 <upnp/upnp.h>

src/lib/upnp/Domain.cxx

-/*
- * 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");

src/lib/upnp/Domain.hxx

-/*
- * 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

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"
 

src/lib/upnp/Util.cxx

@@ -19,8 +19,6 @@
 
 #include "Util.hxx"
 
-#include <upnp/ixml.h>
-
 #include <assert.h>
 
 /** Get rid of white space at both ends */

src/lib/zlib/Domain.cxx

-/*
- * 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");

src/lib/zlib/Domain.hxx

-/*
- * 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

src/lib/zlib/Error.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_ZLIB_ERROR_HXX
 #define MPD_ZLIB_ERROR_HXX
 
-#include <stdexcept>
+#include <exception>
 
 class ZlibError final : public std::exception {
 	int code;

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"

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 <pulse/context.h>
 #include <pulse/introspect.h>

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 <libsmbclient.h>
 
-#include <list>
 #include <algorithm>
 
 class SmbclientNeighborExplorer final : public NeighborExplorer {

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"

src/net/AllocatedSocketAddress.cxx

@@ -30,7 +30,6 @@
 #include "config.h"
 #include "AllocatedSocketAddress.hxx"
 
-#include <assert.h>
 #include <string.h>
 
 #ifdef HAVE_UN

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"
 

src/net/SocketUtil.cxx

@@ -23,12 +23,6 @@
 #include "SocketError.hxx"
 #include "system/fd_util.h"
 
-#include <unistd.h>
-
-#ifdef HAVE_IPV6
-#include <string.h>
-#endif
-
 int
 socket_bind_listen(int domain, int type, int protocol,
 		   SocketAddress address,

src/output/MultipleOutputs.hxx

@@ -35,7 +35,6 @@
 
 #include <assert.h>
 
-struct AudioFormat;
 class MusicBuffer;
 class MusicPipe;
 class EventLoop;

src/output/OutputState.cxx

@@ -31,7 +31,6 @@
 #include "fs/io/BufferedOutputStream.hxx"
 #include "util/StringCompare.hxx"
 
-#include <assert.h>
 #include <stdlib.h>
 
 #define AUDIO_DEVICE_STATE "audio_device_state:"

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"

src/output/plugins/JackOutputPlugin.cxx

@@ -36,7 +36,6 @@
 
 #include <unistd.h> /* for usleep() */
 #include <stdlib.h>
-#include <string.h>
 
 static constexpr unsigned MAX_PORTS = 16;
 

src/output/plugins/httpd/HttpdClient.hxx

@@ -23,7 +23,8 @@
 #include "event/BufferedSocket.hxx"
 #include "Compiler.h"
 
-#include <boost/intrusive/list.hpp>
+#include <boost/intrusive/link_mode.hpp>
+#include <boost/intrusive/list_hook.hpp>
 
 #include <queue>
 #include <list>

src/output/plugins/httpd/HttpdInternal.hxx

@@ -34,6 +34,8 @@
 #include "util/Cast.hxx"
 #include "Compiler.h"
 
+#include <boost/intrusive/list.hpp>
+
 #include <queue>
 #include <list>
 

src/output/plugins/httpd/HttpdOutputPlugin.cxx

@@ -39,8 +39,6 @@
 
 #include <assert.h>
 
-#include <sys/types.h>
-#include <unistd.h>
 #include <string.h>
 #include <errno.h>
 

src/pcm/PcmChannels.hxx

@@ -21,7 +21,6 @@
 #define MPD_PCM_CHANNELS_HXX
 
 #include <stdint.h>
-#include <stddef.h>
 
 class PcmBuffer;
 template<typename T> struct ConstBuffer;

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 <assert.h>
-#include <math.h>
 
 bool
 pcm_convert_global_init(Error &error)

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 <stddef.h>
-
 template<typename T> struct ConstBuffer;
 class Error;
-class Domain;
 
 /**
  * This object is statically allocated (within another struct), and

src/pcm/PcmDop.hxx

@@ -23,7 +23,6 @@
 #include "check.h"
 
 #include <stdint.h>
-#include <stddef.h>
 
 class PcmBuffer;
 template<typename T> struct ConstBuffer;

src/pcm/PcmExport.cxx

@@ -29,8 +29,6 @@
 #include "PcmDop.hxx"
 #endif
 
-#include <iterator>
-
 void
 PcmExport::Open(SampleFormat sample_format, unsigned _channels,
 		Params params)

src/pcm/PcmExport.hxx

@@ -24,7 +24,6 @@
 #include "PcmBuffer.hxx"
 #include "AudioFormat.hxx"
 
-struct AudioFormat;
 template<typename T> struct ConstBuffer;
 
 /**

src/pcm/PcmFormat.hxx

@@ -23,7 +23,6 @@
 #include "AudioFormat.hxx"
 
 #include <stdint.h>
-#include <stddef.h>
 
 template<typename T> struct ConstBuffer;
 class PcmBuffer;

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"

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"

src/pcm/Volume.hxx

@@ -24,9 +24,6 @@
 #include "PcmBuffer.hxx"
 #include "PcmDither.hxx"
 
-#include <stdint.h>
-#include <stddef.h>
-
 #ifndef NDEBUG
 #include <assert.h>
 #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%).

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"

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"

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;

src/playlist/PlaylistRegistry.cxx

@@ -37,7 +37,6 @@
 #include "util/Macros.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/Block.hxx"
-#include "Log.hxx"
 
 #include <assert.h>
 #include <string.h>

src/playlist/PlaylistSong.cxx

@@ -27,7 +27,6 @@
 #include "util/Error.hxx"
 #include "DetachedSong.hxx"
 
-#include <assert.h>
 #include <string.h>
 
 static void

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"

src/playlist/cue/CueParser.hxx

@@ -28,9 +28,6 @@
 #include <string>
 #include <memory>
 
-class DetachedSong;
-struct Tag;
-
 class CueParser {
 	enum {
 		/**

src/playlist/plugins/CuePlaylistPlugin.cxx

@@ -24,8 +24,6 @@
 #include "../cue/CueParser.hxx"
 #include "input/TextInputStream.hxx"
 
-#include <string>
-
 class CuePlaylist final : public SongEnumerator {
 	TextInputStream tis;
 	CueParser parser;

src/playlist/plugins/FlacPlaylistPlugin.cxx

@@ -34,8 +34,6 @@
 
 #include <FLAC/metadata.h>
 
-#include <string.h>
-
 class FlacPlaylist final : public SongEnumerator {
 	const char *const uri;
 

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 <string>
 

src/protocol/ArgParser.hxx

@@ -27,7 +27,6 @@
 
 #include <stdint.h>
 
-class Response;
 class SongTime;
 class SignedSongTime;
 

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;

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"

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"
 

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 <stdlib.h>

src/sticker/SongSticker.cxx

@@ -25,7 +25,6 @@
 #include "util/Error.hxx"
 #include "util/Alloc.hxx"
 
-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 

src/storage/CompositeStorage.hxx

@@ -29,7 +29,6 @@
 #include <map>
 
 class Error;
-class Storage;
 
 /**
  * A #Storage implementation that combines multiple other #Storage

src/tag/Aiff.cxx

@@ -27,7 +27,6 @@
 #include <limits>
 
 #include <stdint.h>
-#include <sys/stat.h>
 #include <string.h>
 
 struct aiff_header {

src/tag/ApeLoader.hxx

@@ -24,10 +24,7 @@
 
 #include <functional>
 
-#include <stddef.h>
-
 struct StringView;
-class Path;
 class InputStream;
 
 typedef std::function<bool(unsigned long flags, const char *key,

src/tag/Id3Load.hxx

@@ -23,7 +23,6 @@
 #include "check.h"
 #include "Id3Unique.hxx"
 
-class Error;
 class InputStream;
 
 /**

src/tag/Settings.hxx

@@ -24,8 +24,6 @@
 #include "TagType.h"
 #include "Compiler.h"
 
-#include <stdint.h>
-
 extern tag_mask_t global_tag_mask;
 
 gcc_const

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"
 

src/tag/Tag.hxx

@@ -26,9 +26,6 @@
 #include "Compiler.h"
 
 #include <algorithm>
-#include <iterator>
-
-#include <stddef.h>
 
 /**
  * The meta information about a song file.  It is a MPD specific

src/tag/TagBuilder.cxx

@@ -29,7 +29,6 @@
 #include <array>
 
 #include <assert.h>
-#include <string.h>
 #include <stdlib.h>
 
 TagBuilder::TagBuilder(const Tag &other)

src/tag/TagBuilder.hxx

@@ -26,8 +26,6 @@
 
 #include <vector>
 
-#include <stddef.h>
-
 struct StringView;
 struct TagItem;
 struct Tag;

src/tag/TagConfig.cxx

@@ -28,8 +28,6 @@
 #include "util/ASCII.hxx"
 #include "util/StringUtil.hxx"
 
-#include <algorithm>
-
 #include <stdlib.h>
 
 void

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 <id3tag.h>
 
 #include <string>
 #include <stdexcept>
 
+#include <string.h>
 #include <stdlib.h>
 
 #  ifndef ID3_FRAME_COMPOSER

src/tag/TagString.cxx

@@ -25,7 +25,6 @@
 #include "util/UTF8.hxx"
 
 #include <assert.h>
-#include <string.h>
 #include <stdlib.h>
 
 gcc_pure

src/tag/TagString.hxx

@@ -23,8 +23,6 @@
 #include "check.h"
 #include "Compiler.h"
 
-#include <stddef.h>
-
 struct StringView;
 template<typename T> struct WritableBuffer;
 

src/unix/Daemon.cxx

@@ -23,7 +23,6 @@
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
 #include "PidFile.hxx"
-#include "Log.hxx"
 
 #include <stdlib.h>
 #include <unistd.h>

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 <stddef.h>

src/util/StringUtil.cxx

@@ -18,7 +18,6 @@
  */
 
 #include "StringUtil.hxx"
-#include "StringAPI.hxx"
 #include "CharUtil.hxx"
 #include "ASCII.hxx"