include cleanup using iwyu

src/ArchiveFile.hxx

@@ -23,6 +23,8 @@
 class Mutex;
 class Cond;
 class Error;
+class ArchiveVisitor;
+struct InputStream;
 
 class ArchiveFile {
 public:

src/ArchiveLookup.cxx

@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <errno.h>
 
 gcc_pure

src/ArchivePlugin.hxx

@@ -20,9 +20,7 @@
 #ifndef MPD_ARCHIVE_PLUGIN_HXX
 #define MPD_ARCHIVE_PLUGIN_HXX
 
-struct InputStream;
 class ArchiveFile;
-class ArchiveVisitor;
 class Error;
 
 struct archive_plugin {

src/AvahiPoll.cxx

@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "AvahiPoll.hxx"
-#include "event/Loop.hxx"
 #include "event/SocketMonitor.hxx"
 #include "event/TimeoutMonitor.hxx"
 

src/Client.hxx

@@ -165,7 +165,7 @@ void client_manager_init(void);
 
 void
 client_new(EventLoop &loop, Partition &partition,
-	   int fd, const struct sockaddr *sa, size_t sa_length, int uid);
+	   int fd, const sockaddr *sa, size_t sa_length, int uid);
 
 /**
  * Write a C string to the client.

src/ClientFile.cxx

@@ -24,11 +24,8 @@
 #include "fs/Path.hxx"
 #include "fs/FileSystem.hxx"
 #include "util/Error.hxx"
-#include "util/Domain.hxx"
 
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
 #include <unistd.h>
 
 bool

src/ClientGlobal.cxx

@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "ClientInternal.hxx"
-#include "ClientList.hxx"
 #include "ConfigGlobal.hxx"
 
 #define CLIENT_TIMEOUT_DEFAULT			(60)

src/ClientNew.cxx

@@ -31,13 +31,11 @@
 #include <glib.h>
 
 #include <assert.h>
-#include <sys/types.h>
 #ifdef WIN32
 #include <winsock2.h>
 #else
 #include <sys/socket.h>
 #endif
-#include <unistd.h>
 
 #ifdef HAVE_LIBWRAP
 #include <tcpd.h>

src/ClientRead.cxx

@@ -23,7 +23,6 @@
 #include "event/Loop.hxx"
 #include "util/CharUtil.hxx"
 
-#include <assert.h>
 #include <string.h>
 
 BufferedSocket::InputResult

src/ClientSubscribe.cxx

@@ -22,11 +22,6 @@
 #include "Idle.hxx"
 
 #include <assert.h>
-#include <string.h>
-
-	bool Unsubscribe(const char *channel);
-	void UnsubscribeAll();
-	bool PushMessage(const ClientMessage &msg);
 
 Client::SubscribeResult
 Client::Subscribe(const char *channel)

src/CommandLine.cxx

@@ -38,7 +38,6 @@
 #include "util/Domain.hxx"
 #include "util/OptionDef.hxx"
 #include "util/OptionParser.hxx"
-#include "system/FatalError.hxx"
 
 #ifdef ENABLE_ENCODER
 #include "EncoderList.hxx"

src/ConfigData.cxx

@@ -26,7 +26,6 @@
 #include "system/FatalError.hxx"
 
 #include <assert.h>
-#include <string.h>
 #include <stdlib.h>
 
 int

src/ConfigFile.cxx

@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "ConfigFile.hxx"
-#include "ConfigError.hxx"
 #include "ConfigData.hxx"
 #include "ConfigTemplates.hxx"
 #include "util/Tokenizer.hxx"
@@ -32,9 +31,7 @@
 #include "Log.hxx"
 
 #include <assert.h>
-#include <string.h>
 #include <stdio.h>
-#include <errno.h>
 
 #define MAX_STRING_SIZE	MPD_PATH_MAX+80
 

src/ConfigGlobal.cxx

@@ -30,8 +30,6 @@
 #include "system/FatalError.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
-#include <string.h>
 #include <stdlib.h>
 
 static ConfigData config_data;

src/ConfigTemplates.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_CONFIG_TEMPLATES_HXX
 #define MPD_CONFIG_TEMPLATES_HXX
 
-#include "ConfigOption.hxx"
-
 struct ConfigTemplate {
 	const char *const name;
 	const bool repeatable;

src/CrossFade.cxx

@@ -26,8 +26,6 @@
 #include "Log.hxx"
 
 #include <assert.h>
-#include <string.h>
-#include <stdlib.h>
 
 static constexpr Domain cross_fade_domain("cross_fade");
 

src/Daemon.cxx

@@ -30,9 +30,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #ifndef WIN32

src/DatabaseGlue.cxx

@@ -21,7 +21,6 @@
 #include "DatabaseGlue.hxx"
 #include "DatabaseSimple.hxx"
 #include "DatabaseRegistry.hxx"
-#include "DatabaseSave.hxx"
 #include "DatabaseError.hxx"
 #include "Directory.hxx"
 #include "util/Error.hxx"
@@ -30,13 +29,8 @@
 #include "DatabasePlugin.hxx"
 #include "db/SimpleDatabasePlugin.hxx"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <assert.h>
 #include <string.h>
-#include <errno.h>
-
 
 static Database *db;
 static bool db_is_open;

src/DatabaseHelpers.hxx

@@ -22,7 +22,6 @@
 
 #include "DatabaseVisitor.hxx"
 #include "tag/TagType.h"
-#include "Compiler.h"
 
 class Error;
 class Database;

src/DatabaseLock.cxx

@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "DatabaseLock.hxx"
-#include "Compiler.h"
 
 Mutex db_mutex;
 

src/DatabasePrint.cxx

@@ -21,7 +21,6 @@
 #include "DatabasePrint.hxx"
 #include "DatabaseSelection.hxx"
 #include "SongFilter.hxx"
-#include "PlaylistVector.hxx"
 #include "SongPrint.hxx"
 #include "TimePrint.hxx"
 #include "Directory.hxx"

src/DatabasePrint.hxx

@@ -24,7 +24,6 @@
 
 class SongFilter;
 struct DatabaseSelection;
-struct db_visitor;
 class Client;
 class Error;
 

src/DatabaseQueue.cxx

@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "DatabaseQueue.hxx"
-#include "DatabaseSelection.hxx"
 #include "DatabaseGlue.hxx"
 #include "DatabasePlugin.hxx"
 #include "Partition.hxx"

src/DatabaseSave.cxx

@@ -23,7 +23,6 @@
 #include "DatabaseError.hxx"
 #include "Directory.hxx"
 #include "DirectorySave.hxx"
-#include "Song.hxx"
 #include "TextFile.hxx"
 #include "tag/Tag.hxx"
 #include "tag/TagSettings.h"
@@ -33,7 +32,6 @@
 
 #include <glib.h>
 
-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 

src/DecoderAPI.cxx

@@ -34,7 +34,6 @@
 #include "Log.hxx"
 
 #include <assert.h>
-#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 

src/DecoderAPI.hxx

@@ -27,6 +27,8 @@
 #ifndef MPD_DECODER_API_HXX
 #define MPD_DECODER_API_HXX
 
+// IWYU pragma: begin_exports
+
 #include "check.h"
 #include "DecoderCommand.hxx"
 #include "DecoderPlugin.hxx"
@@ -36,6 +38,8 @@
 #include "MixRampInfo.hxx"
 #include "ConfigData.hxx"
 
+// IWYU pragma: end_exports
+
 /**
  * Notify the player thread that it has finished initialization and
  * that it has read the song's meta data.

src/DecoderControl.cxx

@@ -22,8 +22,6 @@
 #include "MusicPipe.hxx"
 #include "Song.hxx"
 
-#include <glib.h>
-
 #include <assert.h>
 
 DecoderControl::DecoderControl(Mutex &_mutex, Cond &_client_cond)

src/DecoderInternal.hxx

@@ -20,13 +20,11 @@
 #ifndef MPD_DECODER_INTERNAL_HXX
 #define MPD_DECODER_INTERNAL_HXX
 
-#include "DecoderCommand.hxx"
 #include "ReplayGainInfo.hxx"
 #include "util/Error.hxx"
 
 class PcmConvert;
 struct DecoderControl;
-struct InputStream;
 struct Tag;
 
 struct Decoder {

src/DecoderPlugin.hxx

@@ -24,7 +24,6 @@
 
 struct config_param;
 struct InputStream;
-struct Tag;
 struct tag_handler;
 
 /**

src/DecoderThread.cxx

@@ -29,7 +29,6 @@
 #include "fs/Traits.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "DecoderAPI.hxx"
-#include "tag/Tag.hxx"
 #include "InputStream.hxx"
 #include "DecoderList.hxx"
 #include "util/UriUtil.hxx"

src/DirectorySave.cxx

@@ -30,9 +30,6 @@
 
 #include <glib.h>
 
-#include <assert.h>
-#include <string.h>
-
 #define DIRECTORY_DIR "directory: "
 #define DIRECTORY_MTIME "mtime: "
 #define DIRECTORY_BEGIN "begin: "

src/EncoderAPI.hxx

@@ -25,9 +25,13 @@
 #ifndef MPD_ENCODER_API_HXX
 #define MPD_ENCODER_API_HXX
 
+// IWYU pragma: begin_exports
+
 #include "EncoderPlugin.hxx"
 #include "AudioFormat.hxx"
 #include "tag/Tag.hxx"
 #include "ConfigData.hxx"
 
+// IWYU pragma: end_exports
+
 #endif

src/FilterConfig.cxx

@@ -21,8 +21,6 @@
 #include "FilterConfig.hxx"
 #include "filter/ChainFilterPlugin.hxx"
 #include "FilterPlugin.hxx"
-#include "FilterInternal.hxx"
-#include "FilterRegistry.hxx"
 #include "ConfigData.hxx"
 #include "ConfigOption.hxx"
 #include "ConfigGlobal.hxx"

src/FilterPlugin.cxx

@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "FilterPlugin.hxx"
-#include "FilterInternal.hxx"
 #include "FilterRegistry.hxx"
 #include "ConfigData.hxx"
 #include "ConfigError.hxx"

src/FilterRegistry.cxx

@@ -21,7 +21,6 @@
 #include "FilterRegistry.hxx"
 #include "FilterPlugin.hxx"
 
-#include <stddef.h>
 #include <string.h>
 
 const struct filter_plugin *const filter_plugins[] = {

src/GlobalEvents.cxx

@@ -21,7 +21,6 @@
 #include "GlobalEvents.hxx"
 #include "util/Manual.hxx"
 #include "event/DeferredMonitor.hxx"
-#include "Compiler.h"
 
 #include <atomic>
 

src/IcyMetaDataServer.cxx

@@ -25,7 +25,6 @@
 
 #include <glib.h>
 
-#include <assert.h>
 #include <string.h>
 
 char*

src/InotifyQueue.cxx

@@ -21,7 +21,6 @@
 #include "InotifyQueue.hxx"
 #include "InotifyDomain.hxx"
 #include "UpdateGlue.hxx"
-#include "event/Loop.hxx"
 #include "Log.hxx"
 
 #include <string.h>

src/InotifySource.hxx

@@ -22,7 +22,6 @@
 
 #include "event/SocketMonitor.hxx"
 #include "util/FifoBuffer.hxx"
-#include "Compiler.h"
 
 class Error;
 

src/Log.cxx

@@ -19,28 +19,13 @@
 
 #include "config.h"
 #include "LogV.hxx"
-#include "ConfigData.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
-#include "system/fd_util.h"
-#include "system/FatalError.hxx"
-#include "fs/Path.hxx"
-#include "fs/FileSystem.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
-#include "system/FatalError.hxx"
 
 #include <glib.h>
 
 #include <assert.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <fcntl.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
 #include <errno.h>
 
 static GLogLevelFlags

src/LogInit.cxx

@@ -23,7 +23,6 @@
 #include "ConfigData.hxx"
 #include "ConfigGlobal.hxx"
 #include "ConfigOption.hxx"
-#include "system/fd_util.h"
 #include "system/FatalError.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
@@ -33,16 +32,11 @@
 #include "system/FatalError.hxx"
 
 #include <assert.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <string.h>
-#include <stdarg.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#include <errno.h>
 #include <glib.h>
 
 #ifdef HAVE_SYSLOG

src/LogV.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_LOGV_HXX
 #define MPD_LOGV_HXX
 
-#include "Log.hxx"
+#include "Log.hxx" // IWYU pragma: export
 
 #include <stdarg.h>
 

src/Main.cxx

@@ -80,10 +80,7 @@
 
 #include <glib.h>
 
-#include <unistd.h>
 #include <stdlib.h>
-#include <errno.h>
-#include <string.h>
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>

src/Mapper.cxx

@@ -36,9 +36,7 @@
 #include <assert.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <errno.h>
-#include <dirent.h>
 
 static constexpr Domain mapper_domain("mapper");
 

src/Mapper.hxx

@@ -30,7 +30,6 @@
 
 #define PLAYLIST_FILE_SUFFIX ".m3u"
 
-class Path;
 class AllocatedPath;
 struct Directory;
 struct Song;

src/MixerControl.cxx

@@ -23,7 +23,6 @@
 #include "util/Error.hxx"
 
 #include <assert.h>
-#include <stddef.h>
 
 Mixer *
 mixer_new(const struct mixer_plugin *plugin, void *ao,

src/MixerControl.hxx

@@ -31,7 +31,7 @@ struct mixer_plugin;
 struct config_param;
 
 Mixer *
-mixer_new(const struct mixer_plugin *plugin, void *ao,
+mixer_new(const mixer_plugin *plugin, void *ao,
 	  const config_param &param,
 	  Error &error);
 

src/OutputAPI.hxx

@@ -20,10 +20,14 @@
 #ifndef MPD_OUTPUT_API_HXX
 #define MPD_OUTPUT_API_HxX
 
+// IWYU pragma: begin_exports
+
 #include "OutputPlugin.hxx"
 #include "OutputInternal.hxx"
 #include "AudioFormat.hxx"
 #include "tag/Tag.hxx"
 #include "ConfigData.hxx"
 
+// IWYU pragma: end_exports
+
 #endif

src/OutputAll.hxx

@@ -115,7 +115,7 @@ audio_output_all_set_replay_gain_mode(ReplayGainMode mode);
  * (all closed then)
  */
 bool
-audio_output_all_play(struct music_chunk *chunk, Error &error);
+audio_output_all_play(music_chunk *chunk, Error &error);
 
 /**
  * Checks if the output devices have drained their music pipe, and

src/OutputCommand.cxx

@@ -28,7 +28,6 @@
 #include "OutputCommand.hxx"
 #include "OutputAll.hxx"
 #include "OutputInternal.hxx"
-#include "OutputPlugin.hxx"
 #include "PlayerControl.hxx"
 #include "MixerControl.hxx"
 #include "Idle.hxx"

src/OutputControl.cxx

@@ -24,16 +24,13 @@
 #include "OutputInternal.hxx"
 #include "OutputPlugin.hxx"
 #include "OutputError.hxx"
-#include "MixerPlugin.hxx"
 #include "MixerControl.hxx"
 #include "notify.hxx"
 #include "filter/ReplayGainFilterPlugin.hxx"
-#include "FilterPlugin.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
 
 #include <assert.h>
-#include <stdlib.h>
 
 /** after a failure, wait this number of seconds before
     automatically reopening the device */

src/OutputControl.hxx

@@ -30,20 +30,20 @@ struct config_param;
 class MusicPipe;
 
 void
-audio_output_set_replay_gain_mode(struct audio_output *ao,
+audio_output_set_replay_gain_mode(audio_output *ao,
 				  ReplayGainMode mode);
 
 /**
  * Enables the device.
  */
 void
-audio_output_enable(struct audio_output *ao);
+audio_output_enable(audio_output *ao);
 
 /**
  * Disables the device.
  */
 void
-audio_output_disable(struct audio_output *ao);
+audio_output_disable(audio_output *ao);
 
 /**
  * Opens or closes the device, depending on the "enabled" flag.
@@ -51,40 +51,44 @@ audio_output_disable(struct audio_output *ao);
  * @return true if the device is open
  */
 bool
-audio_output_update(struct audio_output *ao,
+audio_output_update(audio_output *ao,
 		    AudioFormat audio_format,
 		    const MusicPipe &mp);
 
 void
-audio_output_play(struct audio_output *ao);
+audio_output_play(audio_output *ao);
 
-void audio_output_pause(struct audio_output *ao);
+void
+audio_output_pause(audio_output *ao);
 
 void
-audio_output_drain_async(struct audio_output *ao);
+audio_output_drain_async(audio_output *ao);
 
 /**
  * Clear the "allow_play" flag and send the "CANCEL" command
  * asynchronously.  To finish the operation, the caller has to call
  * audio_output_allow_play().
  */
-void audio_output_cancel(struct audio_output *ao);
+void
+audio_output_cancel(audio_output *ao);
 
 /**
  * Set the "allow_play" and signal the thread.
  */
 void
-audio_output_allow_play(struct audio_output *ao);
+audio_output_allow_play(audio_output *ao);
 
-void audio_output_close(struct audio_output *ao);
+void
+audio_output_close(audio_output *ao);
 
 /**
  * Closes the audio output, but if the "always_on" flag is set, put it
  * into pause mode instead.
  */
 void
-audio_output_release(struct audio_output *ao);
+audio_output_release(audio_output *ao);
 
-void audio_output_finish(struct audio_output *ao);
+void
+audio_output_finish(audio_output *ao);
 
 #endif

src/OutputInit.cxx

@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "OutputInternal.hxx"
-#include "OutputControl.hxx"
 #include "OutputList.hxx"
 #include "OutputError.hxx"
 #include "OutputAPI.hxx"

src/OutputState.cxx

@@ -33,7 +33,6 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include <string.h>
 
 #define AUDIO_DEVICE_STATE "audio_device_state:"
 

src/OutputThread.hxx

@@ -22,6 +22,7 @@
 
 struct audio_output;
 
-void audio_output_thread_start(struct audio_output *ao);
+void
+audio_output_thread_start(audio_output *ao);
 
 #endif

src/Page.hxx

@@ -27,8 +27,6 @@
 
 #include "util/RefCount.hxx"
 
-#include <algorithm>
-
 #include <stddef.h>
 
 /**

src/PlayerControl.cxx

@@ -21,9 +21,8 @@
 #include "PlayerControl.hxx"
 #include "Idle.hxx"
 #include "Song.hxx"
-#include "DecoderControl.hxx"
 
-#include <cmath>
+#include <algorithm>
 
 #include <assert.h>
 

src/PlayerThread.cxx

@@ -25,7 +25,6 @@
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"
 #include "Song.hxx"
-#include "Main.hxx"
 #include "system/FatalError.hxx"
 #include "CrossFade.hxx"
 #include "PlayerControl.hxx"

src/Playlist.cxx

@@ -22,7 +22,6 @@
 #include "PlaylistError.hxx"
 #include "PlayerControl.hxx"
 #include "Song.hxx"
-#include "tag/Tag.hxx"
 #include "Idle.hxx"
 #include "Log.hxx"
 

src/PlaylistAny.cxx

@@ -21,7 +21,6 @@
 #include "PlaylistAny.hxx"
 #include "PlaylistMapper.hxx"
 #include "PlaylistRegistry.hxx"
-#include "PlaylistError.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
 #include "InputStream.hxx"

src/PlaylistFile.cxx

@@ -43,10 +43,7 @@
 #include <glib.h>
 
 #include <assert.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <string.h>
 #include <errno.h>
 

src/PlaylistFile.hxx

@@ -24,7 +24,6 @@
 #include <string>
 
 struct Song;
-struct PlaylistInfo;
 class PlaylistVector;
 class Error;
 

src/PlaylistGlobal.cxx

@@ -24,7 +24,6 @@
 
 #include "config.h"
 #include "PlaylistGlobal.hxx"
-#include "Playlist.hxx"
 #include "Main.hxx"
 #include "Instance.hxx"
 #include "GlobalEvents.hxx"

src/PlaylistPrint.cxx

@@ -23,8 +23,6 @@
 #include "PlaylistAny.hxx"
 #include "PlaylistSong.hxx"
 #include "Playlist.hxx"
-#include "PlaylistRegistry.hxx"
-#include "PlaylistPlugin.hxx"
 #include "QueuePrint.hxx"
 #include "SongEnumerator.hxx"
 #include "SongPrint.hxx"

src/PlaylistQueue.cxx

@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "PlaylistQueue.hxx"
-#include "PlaylistPlugin.hxx"
 #include "PlaylistAny.hxx"
 #include "PlaylistSong.hxx"
 #include "Playlist.hxx"

src/PlaylistState.hxx

@@ -32,12 +32,12 @@ struct PlayerControl;
 class TextFile;
 
 void
-playlist_state_save(FILE *fp, const struct playlist &playlist,
+playlist_state_save(FILE *fp, const playlist &playlist,
 		    PlayerControl &pc);
 
 bool
 playlist_state_restore(const char *line, TextFile &file,
-		       struct playlist &playlist, PlayerControl &pc);
+		       playlist &playlist, PlayerControl &pc);
 
 /**
  * Generates a hash number for the current state of the playlist and
@@ -46,7 +46,7 @@ playlist_state_restore(const char *line, TextFile &file,
  * be saved.
  */
 unsigned
-playlist_state_get_hash(const struct playlist &playlist,
+playlist_state_get_hash(const playlist &playlist,
 			PlayerControl &c);
 
 #endif

src/PlaylistVector.cxx

@@ -24,7 +24,6 @@
 #include <algorithm>
 
 #include <assert.h>
-#include <string.h>
 
 PlaylistVector::iterator
 PlaylistVector::find(const char *name)

src/Queue.cxx

@@ -21,8 +21,6 @@
 #include "Queue.hxx"
 #include "Song.hxx"
 
-#include <stdlib.h>
-
 queue::queue(unsigned _max_length)
 	:max_length(_max_length), length(0),
 	 version(1),

src/QueuePrint.cxx

@@ -22,13 +22,8 @@
 #include "Queue.hxx"
 #include "SongFilter.hxx"
 #include "SongPrint.hxx"
-#include "Mapper.hxx"
 #include "Client.hxx"
 
-extern "C" {
-#include "Song.hxx"
-}
-
 /**
  * Send detailed information about a range of songs in the queue to a
  * client.

src/ReplayGainConfig.cxx

@@ -22,12 +22,12 @@
 #include "Idle.hxx"
 #include "ConfigData.hxx"
 #include "ConfigGlobal.hxx"
-#include "Playlist.hxx"
 #include "system/FatalError.hxx"
 
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 
 ReplayGainMode replay_gain_mode = REPLAY_GAIN_OFF;
 

src/Song.hxx

@@ -26,7 +26,7 @@
 #include <string>
 
 #include <assert.h>
-#include <sys/time.h>
+#include <time.h>
 
 #define SONG_FILE	"file: "
 #define SONG_TIME	"Time: "

src/SongSave.cxx

@@ -21,7 +21,6 @@
 #include "SongSave.hxx"
 #include "Song.hxx"
 #include "TagSave.hxx"
-#include "Directory.hxx"
 #include "TextFile.hxx"
 #include "tag/Tag.hxx"
 #include "tag/TagBuilder.hxx"

src/SongSort.cxx

@@ -20,7 +20,6 @@
 #include "config.h"
 #include "SongSort.hxx"
 #include "Song.hxx"
-#include "util/list.h"
 #include "tag/Tag.hxx"
 
 extern "C" {
@@ -29,7 +28,6 @@ extern "C" {
 
 #include <glib.h>
 
-#include <assert.h>
 #include <stdlib.h>
 
 static const char *

src/SongSort.hxx

@@ -23,6 +23,6 @@
 struct list_head;
 
 void
-song_list_sort(struct list_head *songs);
+song_list_sort(list_head *songs);
 
 #endif

src/SongSticker.hxx

@@ -63,7 +63,7 @@ sticker_song_delete_value(const Song *song, const char *name);
  * @param song the song object
  * @return a sticker object, or NULL on error or if there is no sticker
  */
-struct sticker *
+sticker *
 sticker_song_get(const Song *song);
 
 /**

src/SongUpdate.cxx

@@ -20,14 +20,11 @@
 #include "config.h" /* must be first for large file support */
 #include "Song.hxx"
 #include "util/UriUtil.hxx"
-#include "util/Error.hxx"
 #include "Directory.hxx"
 #include "Mapper.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
-#include "InputStream.hxx"
-#include "DecoderPlugin.hxx"
 #include "DecoderList.hxx"
 #include "tag/Tag.hxx"
 #include "tag/TagBuilder.hxx"
@@ -35,13 +32,10 @@
 #include "tag/TagId3.hxx"
 #include "tag/ApeTag.hxx"
 #include "TagFile.hxx"
-#include "thread/Cond.hxx"
 
 #include <assert.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <stdio.h>
 
 Song *
 Song::LoadFile(const char *path_utf8, Directory *parent)

src/StateFile.cxx

@@ -24,7 +24,7 @@
 #include "TextFile.hxx"
 #include "Partition.hxx"
 #include "Volume.hxx"
-#include "event/Loop.hxx"
+
 #include "fs/FileSystem.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"

src/StickerDatabase.hxx

@@ -106,7 +106,7 @@ sticker_delete_value(const char *type, const char *uri, const char *name);
  * @param sticker the sticker object to be freed
  */
 void
-sticker_free(struct sticker *sticker);
+sticker_free(sticker *sticker);
 
 /**
  * Determines a single value in a sticker.
@@ -117,7 +117,7 @@ sticker_free(struct sticker *sticker);
  */
 gcc_pure
 const char *
-sticker_get_value(const struct sticker &sticker, const char *name);
+sticker_get_value(const sticker &sticker, const char *name);
 
 /**
  * Iterates over all sticker items in a sticker.
@@ -127,7 +127,7 @@ sticker_get_value(const struct sticker &sticker, const char *name);
  * @param user_data an opaque pointer for the callback function
  */
 void
-sticker_foreach(const struct sticker &sticker,
+sticker_foreach(const sticker &sticker,
 		void (*func)(const char *name, const char *value,
 			     void *user_data),
 		void *user_data);
@@ -139,7 +139,7 @@ sticker_foreach(const struct sticker &sticker,
  * @param uri the URI of the resource, e.g. the song path
  * @return a sticker object, or nullptr on error or if there is no sticker
  */
-struct sticker *
+sticker *
 sticker_load(const char *type, const char *uri);
 
 /**

src/TagFile.hxx

@@ -31,6 +31,6 @@ struct tag_handler;
  */
 bool
 tag_file_scan(Path path,
-	      const struct tag_handler *handler, void *handler_ctx);
+	      const tag_handler *handler, void *handler_ctx);
 
 #endif

src/TextInputStream.cxx

@@ -21,7 +21,6 @@
 #include "TextInputStream.hxx"
 #include "InputStream.hxx"
 #include "util/CharUtil.hxx"
-#include "util/fifo_buffer.h"
 #include "util/Error.hxx"
 #include "Log.hxx"
 

src/TextInputStream.hxx

@@ -25,7 +25,6 @@
 #include <string>
 
 struct InputStream;
-struct fifo_buffer;
 
 class TextInputStream {
 	InputStream &is;

src/Timer.cxx

@@ -27,8 +27,6 @@
 #include <limits>
 
 #include <assert.h>
-#include <limits.h>
-#include <stddef.h>
 
 Timer::Timer(const AudioFormat af)
 	: time(0),

src/UpdateArchive.hxx

@@ -26,7 +26,6 @@
 #include <sys/stat.h>
 
 struct Directory;
-struct archive_plugin;
 
 #ifdef ENABLE_ARCHIVE
 

src/UpdateRemove.cxx

@@ -20,7 +20,6 @@
 #include "config.h" /* must be first for large file support */
 #include "UpdateRemove.hxx"
 #include "UpdateDomain.hxx"
-#include "Playlist.hxx"
 #include "GlobalEvents.hxx"
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"

src/UpdateSong.cxx

@@ -27,7 +27,6 @@
 #include "DatabaseLock.hxx"
 #include "Directory.hxx"
 #include "Song.hxx"
-#include "DecoderPlugin.hxx"
 #include "DecoderList.hxx"
 #include "Log.hxx"
 

src/UpdateWalk.cxx

@@ -44,12 +44,8 @@
 #include <glib.h>
 
 #include <assert.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <string.h>
-#include <stdlib.h>
 #include <errno.h>
 
 bool walk_discard;

src/ZeroconfAvahi.cxx

@@ -29,14 +29,11 @@
 #include <avahi-client/client.h>
 #include <avahi-client/publish.h>
 
-#include <avahi-common/watch.h>
 #include <avahi-common/alternative.h>
 #include <avahi-common/domain.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/error.h>
 
-#include <stddef.h>
-
 static constexpr Domain avahi_domain("avahi");
 
 static char *avahiName;

src/archive/Bzip2ArchivePlugin.cxx

@@ -35,9 +35,7 @@
 
 #include <bzlib.h>
 
-#include <stdint.h>
 #include <stddef.h>
-#include <string.h>
 
 #ifdef HAVE_OLDER_BZIP2
 #define BZ2_bzDecompressInit bzDecompressInit

src/archive/Iso9660ArchivePlugin.cxx

@@ -32,7 +32,6 @@
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 
-#include <cdio/cdio.h>
 #include <cdio/iso9660.h>
 
 #include <stdlib.h>

src/archive/ZzipArchivePlugin.cxx

@@ -34,8 +34,6 @@
 
 #include <zzip/zzip.h>
 
-#include <string.h>
-
 class ZzipArchiveFile final : public ArchiveFile {
 public:
 	RefCount ref;

src/command/DatabaseCommands.cxx

@@ -26,14 +26,10 @@
 #include "CommandError.hxx"
 #include "Client.hxx"
 #include "tag/Tag.hxx"
-#include "util/UriUtil.hxx"
 #include "util/Error.hxx"
 #include "SongFilter.hxx"
 #include "protocol/Result.hxx"
 
-#include <assert.h>
-#include <string.h>
-
 CommandResult
 handle_lsinfo2(Client &client, int argc, char *argv[])
 {

src/command/MessageCommands.cxx

@@ -24,7 +24,6 @@
 #include "Instance.hxx"
 #include "Main.hxx"
 #include "protocol/Result.hxx"
-#include "protocol/ArgParser.hxx"
 
 #include <set>
 #include <string>

src/command/OtherCommands.cxx

@@ -44,10 +44,6 @@
 #include "Client.hxx"
 #include "Idle.hxx"
 
-#ifdef ENABLE_SQLITE
-#include "StickerDatabase.hxx"
-#endif
-
 #include <assert.h>
 #include <string.h>
 

src/command/OutputCommands.cxx

@@ -24,8 +24,6 @@
 #include "protocol/Result.hxx"
 #include "protocol/ArgParser.hxx"
 
-#include <string.h>
-
 CommandResult
 handle_enableoutput(Client &client, gcc_unused int argc, char *argv[])
 {

src/command/PlaylistCommands.cxx

@@ -35,9 +35,6 @@
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
 
-#include <assert.h>
-#include <stdlib.h>
-
 static void
 print_spl_list(Client &client, const PlaylistVector &list)
 {

src/command/StickerCommands.cxx

@@ -31,8 +31,6 @@
 #include "protocol/Result.hxx"
 #include "util/Error.hxx"
 
-#include <glib.h>
-
 #include <string.h>
 
 struct sticker_song_find_data {

src/db/ProxyDatabasePlugin.cxx

@@ -22,7 +22,6 @@
 #include "DatabasePlugin.hxx"
 #include "DatabaseSelection.hxx"
 #include "DatabaseError.hxx"
-#include "PlaylistVector.hxx"
 #include "Directory.hxx"
 #include "Song.hxx"
 #include "SongFilter.hxx"

src/db/SimpleDatabasePlugin.cxx

@@ -33,7 +33,6 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
-#include <sys/types.h>
 #include <errno.h>
 
 static constexpr Domain simple_db_domain("simple_db");

src/decoder/DsdLib.cxx

@@ -27,8 +27,6 @@
 #include "DsdLib.hxx"
 #include "DecoderAPI.hxx"
 #include "InputStream.hxx"
-#include "util/bit_reverse.h"
-#include "tag/TagHandler.hxx"
 #include "tag/TagId3.hxx"
 #include "util/Error.hxx"
 

src/decoder/DsdiffDecoderPlugin.cxx

@@ -38,9 +38,6 @@
 #include "DsdLib.hxx"
 #include "Log.hxx"
 
-#include <unistd.h>
-#include <stdio.h> /* for SEEK_SET, SEEK_CUR */
-
 struct DsdiffHeader {
 	DsdId id;
 	DffDsdUint64 size;