diff --git a/src/IcyMetaDataParser.cxx b/src/IcyMetaDataParser.cxx index 1a0168aa3..02afbc659 100644 --- a/src/IcyMetaDataParser.cxx +++ b/src/IcyMetaDataParser.cxx @@ -23,8 +23,8 @@ #include "util/StringView.hxx" #include +#include -#include #include #ifdef HAVE_ICU_CONVERTER diff --git a/src/Idle.cxx b/src/Idle.cxx index 8292bb414..59053f917 100644 --- a/src/Idle.cxx +++ b/src/Idle.cxx @@ -26,7 +26,7 @@ #include "Main.hxx" #include "Instance.hxx" -#include +#include void idle_add(unsigned flags) diff --git a/src/IdleFlags.cxx b/src/IdleFlags.cxx index ca979efde..356e04dd0 100644 --- a/src/IdleFlags.cxx +++ b/src/IdleFlags.cxx @@ -25,7 +25,7 @@ #include "IdleFlags.hxx" #include "util/ASCII.hxx" -#include +#include static const char *const idle_names[] = { "database", diff --git a/src/LogBackend.cxx b/src/LogBackend.cxx index 8fd7aa498..178b9cd92 100644 --- a/src/LogBackend.cxx +++ b/src/LogBackend.cxx @@ -23,7 +23,8 @@ #include "util/StringStrip.hxx" #include "config.h" -#include +#include + #include #include #include diff --git a/src/LogInit.cxx b/src/LogInit.cxx index 629716f51..eb2bcc3f0 100644 --- a/src/LogInit.cxx +++ b/src/LogInit.cxx @@ -30,11 +30,12 @@ #include "util/RuntimeError.hxx" #include "system/Error.hxx" +#include + #ifdef ENABLE_SYSTEMD_DAEMON #include #endif -#include #include #include #include diff --git a/src/Mapper.cxx b/src/Mapper.cxx index 3ec44c7ba..099fb92ae 100644 --- a/src/Mapper.cxx +++ b/src/Mapper.cxx @@ -33,7 +33,7 @@ #include "Main.hxx" #endif -#include +#include /** * The absolute path of the playlist directory encoded in the diff --git a/src/MusicBuffer.cxx b/src/MusicBuffer.cxx index 51717c705..65038d666 100644 --- a/src/MusicBuffer.cxx +++ b/src/MusicBuffer.cxx @@ -20,7 +20,7 @@ #include "MusicBuffer.hxx" #include "MusicChunk.hxx" -#include +#include MusicBuffer::MusicBuffer(unsigned num_chunks) :buffer(num_chunks) { diff --git a/src/MusicChunk.cxx b/src/MusicChunk.cxx index f19dc1f72..84e6f0f66 100644 --- a/src/MusicChunk.cxx +++ b/src/MusicChunk.cxx @@ -21,7 +21,7 @@ #include "pcm/AudioFormat.hxx" #include "tag/Tag.hxx" -#include +#include MusicChunkInfo::MusicChunkInfo() noexcept = default; MusicChunkInfo::~MusicChunkInfo() noexcept = default; diff --git a/src/MusicPipe.cxx b/src/MusicPipe.cxx index 152293a85..81874f452 100644 --- a/src/MusicPipe.cxx +++ b/src/MusicPipe.cxx @@ -20,7 +20,7 @@ #include "MusicPipe.hxx" #include "MusicChunk.hxx" -#include +#include #ifndef NDEBUG diff --git a/src/Permission.cxx b/src/Permission.cxx index 43e6935fc..b4b6d01a7 100644 --- a/src/Permission.cxx +++ b/src/Permission.cxx @@ -26,11 +26,11 @@ #include "util/RuntimeError.hxx" #include "util/StringView.hxx" +#include #include #include #include -#include #include static constexpr char PERMISSION_PASSWORD_CHAR = '@'; diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx index 6e7937fb3..aa67a4ae4 100644 --- a/src/PlaylistFile.cxx +++ b/src/PlaylistFile.cxx @@ -42,7 +42,8 @@ #include "util/StringCompare.hxx" #include "util/UriExtract.hxx" -#include +#include + #include static const char PLAYLIST_COMMENT = '#'; diff --git a/src/ReplayGainGlobal.cxx b/src/ReplayGainGlobal.cxx index 741381dcb..98b8dcda0 100644 --- a/src/ReplayGainGlobal.cxx +++ b/src/ReplayGainGlobal.cxx @@ -21,9 +21,9 @@ #include "ReplayGainConfig.hxx" #include "config/Data.hxx" +#include #include -#include #include #include diff --git a/src/ReplayGainMode.cxx b/src/ReplayGainMode.cxx index 70544f944..803209d14 100644 --- a/src/ReplayGainMode.cxx +++ b/src/ReplayGainMode.cxx @@ -19,9 +19,9 @@ #include "ReplayGainMode.hxx" +#include #include -#include #include const char * diff --git a/src/SingleMode.cxx b/src/SingleMode.cxx index 99ed827c5..1060848e2 100644 --- a/src/SingleMode.cxx +++ b/src/SingleMode.cxx @@ -19,9 +19,9 @@ #include "SingleMode.hxx" +#include #include -#include #include const char * diff --git a/src/SongLoader.cxx b/src/SongLoader.cxx index 585d80461..eda809d46 100644 --- a/src/SongLoader.cxx +++ b/src/SongLoader.cxx @@ -26,7 +26,7 @@ #include "PlaylistError.hxx" #include "config.h" -#include +#include #ifdef ENABLE_DATABASE diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx index f718bbd84..bce944315 100644 --- a/src/SongUpdate.cxx +++ b/src/SongUpdate.cxx @@ -34,7 +34,8 @@ #include "TagArchive.hxx" #endif -#include +#include + #include #ifdef ENABLE_DATABASE diff --git a/src/TagFile.cxx b/src/TagFile.cxx index c1d13ed37..1e132560a 100644 --- a/src/TagFile.cxx +++ b/src/TagFile.cxx @@ -27,7 +27,7 @@ #include "input/InputStream.hxx" #include "input/LocalOpen.hxx" -#include +#include class TagFileScan { const Path path_fs; diff --git a/src/TagStream.cxx b/src/TagStream.cxx index 4d200c703..4010318e1 100644 --- a/src/TagStream.cxx +++ b/src/TagStream.cxx @@ -28,7 +28,7 @@ #include "thread/Mutex.hxx" #include "util/UriExtract.hxx" -#include +#include /** * Does the #DecoderPlugin support either the suffix or the MIME type? diff --git a/src/archive/ArchiveList.cxx b/src/archive/ArchiveList.cxx index 4e371c0bb..a81d4f382 100644 --- a/src/archive/ArchiveList.cxx +++ b/src/archive/ArchiveList.cxx @@ -25,9 +25,9 @@ #include "plugins/Iso9660ArchivePlugin.hxx" #include "plugins/ZzipArchivePlugin.hxx" +#include #include -#include #include const ArchivePlugin *const archive_plugins[] = { diff --git a/src/archive/ArchivePlugin.cxx b/src/archive/ArchivePlugin.cxx index 7a775e995..65e90bc60 100644 --- a/src/archive/ArchivePlugin.cxx +++ b/src/archive/ArchivePlugin.cxx @@ -21,7 +21,7 @@ #include "ArchiveFile.hxx" #include "fs/Path.hxx" -#include +#include std::unique_ptr archive_file_open(const ArchivePlugin *plugin, Path path) diff --git a/src/client/Idle.cxx b/src/client/Idle.cxx index 4d328dee6..ecb3f98ec 100644 --- a/src/client/Idle.cxx +++ b/src/client/Idle.cxx @@ -22,7 +22,7 @@ #include "Response.hxx" #include "Idle.hxx" -#include +#include static void WriteIdleResponse(Response &r, unsigned flags) noexcept diff --git a/src/client/List.cxx b/src/client/List.cxx index bc1f60487..9ffc56af7 100644 --- a/src/client/List.cxx +++ b/src/client/List.cxx @@ -20,7 +20,7 @@ #include "List.hxx" #include "util/DeleteDisposer.hxx" -#include +#include ClientList::~ClientList() noexcept { diff --git a/src/client/New.cxx b/src/client/New.cxx index 87a5c8e7a..b12ec4146 100644 --- a/src/client/New.cxx +++ b/src/client/New.cxx @@ -29,7 +29,7 @@ #include "net/ToString.hxx" #include "Log.hxx" -#include +#include static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n"; diff --git a/src/client/Subscribe.cxx b/src/client/Subscribe.cxx index 4e636cc50..0b65d5b1b 100644 --- a/src/client/Subscribe.cxx +++ b/src/client/Subscribe.cxx @@ -21,7 +21,7 @@ #include "Partition.hxx" #include "IdleFlags.hxx" -#include +#include Client::SubscribeResult Client::Subscribe(const char *channel) noexcept diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx index 86830ed90..ba9fc2f62 100644 --- a/src/command/AllCommands.cxx +++ b/src/command/AllCommands.cxx @@ -48,9 +48,9 @@ #include "StickerCommands.hxx" #endif +#include #include -#include #include /* diff --git a/src/command/CommandListBuilder.hxx b/src/command/CommandListBuilder.hxx index c9459f529..e1bd8830a 100644 --- a/src/command/CommandListBuilder.hxx +++ b/src/command/CommandListBuilder.hxx @@ -20,11 +20,10 @@ #ifndef MPD_COMMAND_LIST_BUILDER_HXX #define MPD_COMMAND_LIST_BUILDER_HXX +#include #include #include -#include - class CommandListBuilder { /** * print OK after each command execution diff --git a/src/command/FileCommands.cxx b/src/command/FileCommands.cxx index 563072a23..61f1f4e0d 100644 --- a/src/command/FileCommands.cxx +++ b/src/command/FileCommands.cxx @@ -43,7 +43,8 @@ #include "thread/Mutex.hxx" #include "Log.hxx" -#include +#include + #include /* for PRIu64 */ gcc_pure diff --git a/src/command/MessageCommands.cxx b/src/command/MessageCommands.cxx index 62cf6bb36..1478d401b 100644 --- a/src/command/MessageCommands.cxx +++ b/src/command/MessageCommands.cxx @@ -25,11 +25,10 @@ #include "util/ConstBuffer.hxx" #include "Partition.hxx" +#include #include #include -#include - CommandResult handle_subscribe(Client &client, Request args, Response &r) { diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx index fd2627587..7b2dfe511 100644 --- a/src/command/OtherCommands.cxx +++ b/src/command/OtherCommands.cxx @@ -55,7 +55,7 @@ #include "db/update/Service.hxx" #endif -#include +#include static void print_spl_list(Response &r, const PlaylistVector &list) diff --git a/src/command/Request.hxx b/src/command/Request.hxx index 2a213cf8b..b38a6505c 100644 --- a/src/command/Request.hxx +++ b/src/command/Request.hxx @@ -25,10 +25,9 @@ #include "Chrono.hxx" #include "util/ConstBuffer.hxx" +#include #include -#include - class Response; class Request : public ConstBuffer { diff --git a/src/config/File.cxx b/src/config/File.cxx index 8c3ab111b..c121ce19f 100644 --- a/src/config/File.cxx +++ b/src/config/File.cxx @@ -35,7 +35,7 @@ #include "fs/io/BufferedReader.hxx" #include "Log.hxx" -#include +#include static constexpr char CONF_COMMENT = '#'; diff --git a/src/config/Path.cxx b/src/config/Path.cxx index 8d5c3d519..4c372942b 100644 --- a/src/config/Path.cxx +++ b/src/config/Path.cxx @@ -24,7 +24,8 @@ #include "fs/StandardDirectory.hxx" #include "util/RuntimeError.hxx" -#include +#include + #include #ifndef _WIN32 diff --git a/src/db/DatabaseLock.hxx b/src/db/DatabaseLock.hxx index f2f23f19c..b6a571263 100644 --- a/src/db/DatabaseLock.hxx +++ b/src/db/DatabaseLock.hxx @@ -29,7 +29,7 @@ #include "thread/Mutex.hxx" #include "util/Compiler.h" -#include +#include extern Mutex db_mutex; diff --git a/src/db/DatabaseSong.cxx b/src/db/DatabaseSong.cxx index 39aba9b54..9bc555f9b 100644 --- a/src/db/DatabaseSong.cxx +++ b/src/db/DatabaseSong.cxx @@ -26,7 +26,7 @@ #include "util/UriExtract.hxx" #include "util/UriRelative.hxx" -#include +#include DetachedSong DatabaseDetachSong(const Storage *storage, const LightSong &song) noexcept diff --git a/src/db/PlaylistVector.cxx b/src/db/PlaylistVector.cxx index a2250f7eb..9197a004d 100644 --- a/src/db/PlaylistVector.cxx +++ b/src/db/PlaylistVector.cxx @@ -21,8 +21,7 @@ #include "db/DatabaseLock.hxx" #include - -#include +#include PlaylistVector::iterator PlaylistVector::find(const char *name) noexcept diff --git a/src/db/VHelper.cxx b/src/db/VHelper.cxx index 83470fafa..d80a61c65 100644 --- a/src/db/VHelper.cxx +++ b/src/db/VHelper.cxx @@ -23,9 +23,9 @@ #include "song/Filter.hxx" #include +#include #include -#include #include #include diff --git a/src/db/plugins/simple/Directory.cxx b/src/db/plugins/simple/Directory.cxx index e372c3685..72d169086 100644 --- a/src/db/plugins/simple/Directory.cxx +++ b/src/db/plugins/simple/Directory.cxx @@ -33,7 +33,8 @@ #include "util/Alloc.hxx" #include "util/DeleteDisposer.hxx" -#include +#include + #include #include diff --git a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx index ed0f11ec3..208a0cb4c 100644 --- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx +++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx @@ -40,10 +40,10 @@ #include "util/RecursiveMap.hxx" #include "util/SplitString.hxx" +#include #include #include -#include #include static const char *const rootid = "0"; diff --git a/src/db/update/Editor.cxx b/src/db/update/Editor.cxx index 5ec0c4986..c07e767dd 100644 --- a/src/db/update/Editor.cxx +++ b/src/db/update/Editor.cxx @@ -24,7 +24,7 @@ #include "db/plugins/simple/Directory.hxx" #include "db/plugins/simple/Song.hxx" -#include +#include void DatabaseEditor::DeleteSong(Directory &dir, Song *del) diff --git a/src/db/update/ExcludeList.cxx b/src/db/update/ExcludeList.cxx index 5e189c0f0..51227dfc4 100644 --- a/src/db/update/ExcludeList.cxx +++ b/src/db/update/ExcludeList.cxx @@ -29,7 +29,7 @@ #include "util/StringStrip.hxx" #include "config.h" -#include +#include #ifdef HAVE_CLASS_GLOB diff --git a/src/db/update/InotifyUpdate.cxx b/src/db/update/InotifyUpdate.cxx index 444d9f23e..5d0154969 100644 --- a/src/db/update/InotifyUpdate.cxx +++ b/src/db/update/InotifyUpdate.cxx @@ -27,11 +27,11 @@ #include "fs/Traits.hxx" #include "Log.hxx" -#include -#include +#include #include +#include +#include -#include #include #include #include diff --git a/src/db/update/Service.cxx b/src/db/update/Service.cxx index ddbbe70b2..9c1ec0b1a 100644 --- a/src/db/update/Service.cxx +++ b/src/db/update/Service.cxx @@ -36,7 +36,7 @@ #include "event/Loop.hxx" #endif -#include +#include UpdateService::UpdateService(const ConfigData &_config, EventLoop &_loop, SimpleDatabase &_db, diff --git a/src/db/update/Walk.cxx b/src/db/update/Walk.cxx index 3d95ae5f5..4ebd230da 100644 --- a/src/db/update/Walk.cxx +++ b/src/db/update/Walk.cxx @@ -38,10 +38,10 @@ #include "util/UriExtract.hxx" #include "Log.hxx" +#include #include #include -#include #include #include #include diff --git a/src/decoder/Bridge.cxx b/src/decoder/Bridge.cxx index 27d1a577a..b87466798 100644 --- a/src/decoder/Bridge.cxx +++ b/src/decoder/Bridge.cxx @@ -36,7 +36,8 @@ #include "util/ConstBuffer.hxx" #include "util/StringBuffer.hxx" -#include +#include + #include #include diff --git a/src/decoder/Control.cxx b/src/decoder/Control.cxx index d307332f5..e6a0df714 100644 --- a/src/decoder/Control.cxx +++ b/src/decoder/Control.cxx @@ -21,10 +21,9 @@ #include "MusicPipe.hxx" #include "song/DetachedSong.hxx" +#include #include -#include - DecoderControl::DecoderControl(Mutex &_mutex, Cond &_client_cond, InputCacheManager *_input_cache, const AudioFormat _configured_audio_format, diff --git a/src/decoder/Control.hxx b/src/decoder/Control.hxx index b486f6d62..f523a306c 100644 --- a/src/decoder/Control.hxx +++ b/src/decoder/Control.hxx @@ -31,11 +31,11 @@ #include "ReplayGainConfig.hxx" #include "ReplayGainMode.hxx" +#include #include -#include #include +#include -#include #include /* damn you, windows.h! */ diff --git a/src/decoder/DecoderAPI.cxx b/src/decoder/DecoderAPI.cxx index be3a9c680..c061df035 100644 --- a/src/decoder/DecoderAPI.cxx +++ b/src/decoder/DecoderAPI.cxx @@ -21,7 +21,7 @@ #include "input/InputStream.hxx" #include "Log.hxx" -#include +#include size_t decoder_read(DecoderClient *client, diff --git a/src/decoder/DecoderPlugin.cxx b/src/decoder/DecoderPlugin.cxx index 2bdc35db1..d7e6de357 100644 --- a/src/decoder/DecoderPlugin.cxx +++ b/src/decoder/DecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "DecoderPlugin.hxx" #include "util/StringUtil.hxx" -#include +#include bool DecoderPlugin::SupportsSuffix(const char *suffix) const noexcept diff --git a/src/decoder/DecoderPrint.cxx b/src/decoder/DecoderPrint.cxx index f6dad6cbf..8dccb3256 100644 --- a/src/decoder/DecoderPrint.cxx +++ b/src/decoder/DecoderPrint.cxx @@ -22,10 +22,9 @@ #include "DecoderPlugin.hxx" #include "client/Response.hxx" +#include #include -#include - static void decoder_plugin_print(Response &r, const DecoderPlugin &plugin) diff --git a/src/decoder/plugins/AdPlugDecoderPlugin.cxx b/src/decoder/plugins/AdPlugDecoderPlugin.cxx index a64946bfd..0368b1a3c 100644 --- a/src/decoder/plugins/AdPlugDecoderPlugin.cxx +++ b/src/decoder/plugins/AdPlugDecoderPlugin.cxx @@ -29,7 +29,7 @@ #include #include -#include +#include static constexpr Domain adplug_domain("adplug"); diff --git a/src/decoder/plugins/AudiofileDecoderPlugin.cxx b/src/decoder/plugins/AudiofileDecoderPlugin.cxx index 527f7d41f..1bda4faa9 100644 --- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx +++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx @@ -29,9 +29,9 @@ #include #include +#include #include -#include #include #include diff --git a/src/decoder/plugins/FaadDecoderPlugin.cxx b/src/decoder/plugins/FaadDecoderPlugin.cxx index 983103e0e..5875a743a 100644 --- a/src/decoder/plugins/FaadDecoderPlugin.cxx +++ b/src/decoder/plugins/FaadDecoderPlugin.cxx @@ -30,9 +30,9 @@ #include +#include #include -#include #include static const unsigned adts_sample_rates[] = diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index 58795e3ea..9bedd3f7e 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -52,7 +52,8 @@ extern "C" { #include } -#include +#include + #include /** diff --git a/src/decoder/plugins/FlacPcm.cxx b/src/decoder/plugins/FlacPcm.cxx index c6f853b65..4747b405f 100644 --- a/src/decoder/plugins/FlacPcm.cxx +++ b/src/decoder/plugins/FlacPcm.cxx @@ -23,7 +23,7 @@ #include "util/RuntimeError.hxx" #include "util/ConstBuffer.hxx" -#include +#include void FlacPcmImport::Open(unsigned sample_rate, unsigned bits_per_sample, diff --git a/src/decoder/plugins/FlacStreamDecoder.hxx b/src/decoder/plugins/FlacStreamDecoder.hxx index 0d63a9a7f..f3c8621a5 100644 --- a/src/decoder/plugins/FlacStreamDecoder.hxx +++ b/src/decoder/plugins/FlacStreamDecoder.hxx @@ -22,10 +22,9 @@ #include -#include +#include #include - -#include +#include /** * OO wrapper for a FLAC__StreamDecoder. diff --git a/src/decoder/plugins/GmeDecoderPlugin.cxx b/src/decoder/plugins/GmeDecoderPlugin.cxx index f7165419a..3ee92f877 100644 --- a/src/decoder/plugins/GmeDecoderPlugin.cxx +++ b/src/decoder/plugins/GmeDecoderPlugin.cxx @@ -37,7 +37,8 @@ #include -#include +#include + #include #include diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index 8193b263f..c28f9be8a 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -39,7 +39,8 @@ #include #endif -#include +#include + #include #include #include diff --git a/src/decoder/plugins/MikmodDecoderPlugin.cxx b/src/decoder/plugins/MikmodDecoderPlugin.cxx index ad6ff51c4..397359d62 100644 --- a/src/decoder/plugins/MikmodDecoderPlugin.cxx +++ b/src/decoder/plugins/MikmodDecoderPlugin.cxx @@ -29,7 +29,7 @@ #include -#include +#include static constexpr Domain mikmod_domain("mikmod"); diff --git a/src/decoder/plugins/ModplugDecoderPlugin.cxx b/src/decoder/plugins/ModplugDecoderPlugin.cxx index 6fd39e0f1..380891f34 100644 --- a/src/decoder/plugins/ModplugDecoderPlugin.cxx +++ b/src/decoder/plugins/ModplugDecoderPlugin.cxx @@ -29,8 +29,7 @@ #include - -#include +#include static constexpr Domain modplug_domain("modplug"); diff --git a/src/decoder/plugins/WavpackDecoderPlugin.cxx b/src/decoder/plugins/WavpackDecoderPlugin.cxx index 4bae80bfb..93459f311 100644 --- a/src/decoder/plugins/WavpackDecoderPlugin.cxx +++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx @@ -31,13 +31,11 @@ #include #include +#include +#include #include #include -#include - -#include - #define ERRORLEN 80 #ifdef OPEN_DSD_AS_PCM diff --git a/src/encoder/EncoderInterface.hxx b/src/encoder/EncoderInterface.hxx index 3a9c34653..33e21c7ae 100644 --- a/src/encoder/EncoderInterface.hxx +++ b/src/encoder/EncoderInterface.hxx @@ -23,7 +23,8 @@ #include "EncoderPlugin.hxx" #include "util/Compiler.h" -#include +#include + #include struct AudioFormat; diff --git a/src/encoder/plugins/LameEncoderPlugin.cxx b/src/encoder/plugins/LameEncoderPlugin.cxx index 61a26ab02..ae120fdd8 100644 --- a/src/encoder/plugins/LameEncoderPlugin.cxx +++ b/src/encoder/plugins/LameEncoderPlugin.cxx @@ -26,9 +26,9 @@ #include +#include #include -#include #include class LameEncoder final : public Encoder { diff --git a/src/encoder/plugins/OpusEncoderPlugin.cxx b/src/encoder/plugins/OpusEncoderPlugin.cxx index 10fccb4c2..e29510c47 100644 --- a/src/encoder/plugins/OpusEncoderPlugin.cxx +++ b/src/encoder/plugins/OpusEncoderPlugin.cxx @@ -26,9 +26,9 @@ #include #include +#include #include -#include #include namespace { diff --git a/src/encoder/plugins/TwolameEncoderPlugin.cxx b/src/encoder/plugins/TwolameEncoderPlugin.cxx index ab53070d1..40f59a297 100644 --- a/src/encoder/plugins/TwolameEncoderPlugin.cxx +++ b/src/encoder/plugins/TwolameEncoderPlugin.cxx @@ -27,9 +27,9 @@ #include +#include #include -#include #include class TwolameEncoder final : public Encoder { diff --git a/src/encoder/plugins/WaveEncoderPlugin.cxx b/src/encoder/plugins/WaveEncoderPlugin.cxx index cf9ffab65..522bd7a1e 100644 --- a/src/encoder/plugins/WaveEncoderPlugin.cxx +++ b/src/encoder/plugins/WaveEncoderPlugin.cxx @@ -22,7 +22,8 @@ #include "util/ByteOrder.hxx" #include "util/DynamicFifoBuffer.hxx" -#include +#include + #include static constexpr uint16_t WAVE_FORMAT_PCM = 1; diff --git a/src/event/BufferedSocket.hxx b/src/event/BufferedSocket.hxx index 130f910c3..e1944bfbf 100644 --- a/src/event/BufferedSocket.hxx +++ b/src/event/BufferedSocket.hxx @@ -23,9 +23,9 @@ #include "SocketMonitor.hxx" #include "util/StaticFifoBuffer.hxx" +#include #include -#include #include class EventLoop; diff --git a/src/event/Call.cxx b/src/event/Call.cxx index 8bf817288..8f3ec2d9a 100644 --- a/src/event/Call.cxx +++ b/src/event/Call.cxx @@ -23,10 +23,9 @@ #include "thread/Mutex.hxx" #include "thread/Cond.hxx" +#include #include -#include - class BlockingCallMonitor final { DeferEvent defer_event; diff --git a/src/event/FullyBufferedSocket.cxx b/src/event/FullyBufferedSocket.cxx index c095229cd..43ef6f7b2 100644 --- a/src/event/FullyBufferedSocket.cxx +++ b/src/event/FullyBufferedSocket.cxx @@ -21,7 +21,8 @@ #include "net/SocketError.hxx" #include "util/Compiler.h" -#include +#include + #include FullyBufferedSocket::ssize_t diff --git a/src/event/IdleMonitor.cxx b/src/event/IdleMonitor.cxx index d0ea31a37..d98db171a 100644 --- a/src/event/IdleMonitor.cxx +++ b/src/event/IdleMonitor.cxx @@ -20,7 +20,7 @@ #include "IdleMonitor.hxx" #include "Loop.hxx" -#include +#include void IdleMonitor::Cancel() noexcept diff --git a/src/event/Loop.hxx b/src/event/Loop.hxx index e0248d602..c13c35ea2 100644 --- a/src/event/Loop.hxx +++ b/src/event/Loop.hxx @@ -34,10 +34,9 @@ #include #include -#include #include - -#include +#include +#include /** * An event loop that polls for events on file/socket descriptors. diff --git a/src/event/MultiSocketMonitor.hxx b/src/event/MultiSocketMonitor.hxx index b8d544afe..549d69ee1 100644 --- a/src/event/MultiSocketMonitor.hxx +++ b/src/event/MultiSocketMonitor.hxx @@ -24,11 +24,10 @@ #include "TimerEvent.hxx" #include "SocketMonitor.hxx" +#include #include #include -#include - #ifndef _WIN32 struct pollfd; #endif diff --git a/src/event/PollGroupPoll.cxx b/src/event/PollGroupPoll.cxx index e0d0e0afc..1568108a4 100644 --- a/src/event/PollGroupPoll.cxx +++ b/src/event/PollGroupPoll.cxx @@ -23,7 +23,7 @@ #include "PollGroupPoll.hxx" -#include +#include PollGroupPoll::PollGroupPoll() noexcept = default; PollGroupPoll::~PollGroupPoll() noexcept = default; diff --git a/src/event/PollGroupWinSelect.hxx b/src/event/PollGroupWinSelect.hxx index 7821de4a9..ac296609b 100644 --- a/src/event/PollGroupWinSelect.hxx +++ b/src/event/PollGroupWinSelect.hxx @@ -22,11 +22,11 @@ #include "PollResultGeneric.hxx" -#include -#include - +#include #include +#include + #include #include diff --git a/src/event/ServerSocket.cxx b/src/event/ServerSocket.cxx index 9eef67857..583508d07 100644 --- a/src/event/ServerSocket.cxx +++ b/src/event/ServerSocket.cxx @@ -35,11 +35,10 @@ #include "util/Domain.hxx" #include "Log.hxx" +#include #include #include -#include - #ifdef HAVE_UN #include #endif diff --git a/src/event/SignalMonitor.cxx b/src/event/SignalMonitor.cxx index 236f19d03..c060d3b95 100644 --- a/src/event/SignalMonitor.cxx +++ b/src/event/SignalMonitor.cxx @@ -37,12 +37,12 @@ #endif #include +#include #ifdef USE_SIGNALFD #include #endif -#include #include class SignalMonitor final : private SocketMonitor { diff --git a/src/event/SocketMonitor.cxx b/src/event/SocketMonitor.cxx index 2fc867329..28bef0afd 100644 --- a/src/event/SocketMonitor.cxx +++ b/src/event/SocketMonitor.cxx @@ -20,10 +20,9 @@ #include "SocketMonitor.hxx" #include "Loop.hxx" +#include #include -#include - void SocketMonitor::Dispatch(unsigned flags) noexcept { diff --git a/src/event/SocketMonitor.hxx b/src/event/SocketMonitor.hxx index 2c4e7eec6..9792b96c2 100644 --- a/src/event/SocketMonitor.hxx +++ b/src/event/SocketMonitor.hxx @@ -23,9 +23,9 @@ #include "PollGroup.hxx" #include "net/SocketDescriptor.hxx" +#include #include -#include #include class EventLoop; diff --git a/src/filter/Filter.hxx b/src/filter/Filter.hxx index 214a22ec1..b434663a7 100644 --- a/src/filter/Filter.hxx +++ b/src/filter/Filter.hxx @@ -22,7 +22,7 @@ #include "pcm/AudioFormat.hxx" -#include +#include template struct ConstBuffer; diff --git a/src/filter/Observer.cxx b/src/filter/Observer.cxx index 364c7b958..e052272eb 100644 --- a/src/filter/Observer.cxx +++ b/src/filter/Observer.cxx @@ -22,7 +22,7 @@ #include "Prepared.hxx" #include "util/ConstBuffer.hxx" -#include +#include class FilterObserver::PreparedProxy final : public PreparedFilter { FilterObserver &observer; diff --git a/src/filter/plugins/AutoConvertFilterPlugin.cxx b/src/filter/plugins/AutoConvertFilterPlugin.cxx index cf6786c92..54c692406 100644 --- a/src/filter/plugins/AutoConvertFilterPlugin.cxx +++ b/src/filter/plugins/AutoConvertFilterPlugin.cxx @@ -24,10 +24,9 @@ #include "pcm/AudioFormat.hxx" #include "util/ConstBuffer.hxx" +#include #include -#include - class AutoConvertFilter final : public Filter { /** * The underlying filter. diff --git a/src/filter/plugins/ChainFilterPlugin.cxx b/src/filter/plugins/ChainFilterPlugin.cxx index ba4a000dd..07bca48af 100644 --- a/src/filter/plugins/ChainFilterPlugin.cxx +++ b/src/filter/plugins/ChainFilterPlugin.cxx @@ -25,10 +25,9 @@ #include "util/StringBuffer.hxx" #include "util/RuntimeError.hxx" -#include +#include #include - -#include +#include class ChainFilter final : public Filter { struct Child { diff --git a/src/filter/plugins/ConvertFilterPlugin.cxx b/src/filter/plugins/ConvertFilterPlugin.cxx index 15c3ae0a6..91ddddeef 100644 --- a/src/filter/plugins/ConvertFilterPlugin.cxx +++ b/src/filter/plugins/ConvertFilterPlugin.cxx @@ -24,10 +24,9 @@ #include "pcm/Convert.hxx" #include "util/ConstBuffer.hxx" +#include #include -#include - class ConvertFilter final : public Filter { /** * The input audio format; PCM data is passed to the filter() diff --git a/src/filter/plugins/ReplayGainFilterPlugin.cxx b/src/filter/plugins/ReplayGainFilterPlugin.cxx index 4a667dbe7..6dc63b863 100644 --- a/src/filter/plugins/ReplayGainFilterPlugin.cxx +++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx @@ -29,10 +29,9 @@ #include "util/Domain.hxx" #include "Log.hxx" +#include #include -#include - static constexpr Domain replay_gain_domain("replay_gain"); class ReplayGainFilter final : public Filter { diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx index 3fb09bd5d..5f776abf4 100644 --- a/src/fs/Charset.cxx +++ b/src/fs/Charset.cxx @@ -31,8 +31,7 @@ #endif #include - -#include +#include #ifdef HAVE_FS_CHARSET diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx index 13d49aa60..b8d5bb3e6 100644 --- a/src/fs/Path.hxx +++ b/src/fs/Path.hxx @@ -23,10 +23,9 @@ #include "util/Compiler.h" #include "Traits.hxx" +#include #include -#include - class AllocatedPath; /** diff --git a/src/fs/Traits.hxx b/src/fs/Traits.hxx index d2a2934a0..547ad64ff 100644 --- a/src/fs/Traits.hxx +++ b/src/fs/Traits.hxx @@ -29,10 +29,9 @@ #include #endif +#include #include -#include - #ifdef _WIN32 #define PATH_LITERAL(s) _T(s) #else diff --git a/src/fs/io/FileOutputStream.hxx b/src/fs/io/FileOutputStream.hxx index 73ac4f6f8..4b378dc8e 100644 --- a/src/fs/io/FileOutputStream.hxx +++ b/src/fs/io/FileOutputStream.hxx @@ -38,7 +38,8 @@ #include "system/FileDescriptor.hxx" #endif -#include +#include + #include #ifdef _WIN32 diff --git a/src/fs/io/FileReader.cxx b/src/fs/io/FileReader.cxx index 123c43012..39bfcda95 100644 --- a/src/fs/io/FileReader.cxx +++ b/src/fs/io/FileReader.cxx @@ -32,7 +32,7 @@ #include "system/Error.hxx" #include "system/Open.hxx" -#include +#include #ifdef _WIN32 diff --git a/src/fs/io/PeekReader.cxx b/src/fs/io/PeekReader.cxx index 922fd1b10..cc1a43efe 100644 --- a/src/fs/io/PeekReader.cxx +++ b/src/fs/io/PeekReader.cxx @@ -20,8 +20,8 @@ #include "PeekReader.hxx" #include +#include -#include #include const void * diff --git a/src/fs/io/TextFile.cxx b/src/fs/io/TextFile.cxx index 584edf185..832a29032 100644 --- a/src/fs/io/TextFile.cxx +++ b/src/fs/io/TextFile.cxx @@ -23,7 +23,7 @@ #include "BufferedReader.hxx" #include "fs/Path.hxx" -#include +#include TextFile::TextFile(Path path_fs) :file_reader(std::make_unique(path_fs)), diff --git a/src/input/AsyncInputStream.cxx b/src/input/AsyncInputStream.cxx index 4f77f4106..af4f0fbc8 100644 --- a/src/input/AsyncInputStream.cxx +++ b/src/input/AsyncInputStream.cxx @@ -23,9 +23,9 @@ #include "thread/Cond.hxx" #include "event/Loop.hxx" +#include #include -#include #include AsyncInputStream::AsyncInputStream(EventLoop &event_loop, const char *_url, diff --git a/src/input/BufferedInputStream.hxx b/src/input/BufferedInputStream.hxx index ca73d9f0e..14a44e754 100644 --- a/src/input/BufferedInputStream.hxx +++ b/src/input/BufferedInputStream.hxx @@ -23,7 +23,7 @@ #include "InputStream.hxx" #include "BufferingInputStream.hxx" -#include +#include /** * A "huge" buffer which remembers the (partial) contents of an diff --git a/src/input/Init.cxx b/src/input/Init.cxx index 95037c400..87e944463 100644 --- a/src/input/Init.cxx +++ b/src/input/Init.cxx @@ -27,10 +27,9 @@ #include "PluginUnavailable.hxx" #include "util/RuntimeError.hxx" +#include #include -#include - void input_stream_global_init(const ConfigData &config, EventLoop &event_loop) { diff --git a/src/input/InputPlugin.cxx b/src/input/InputPlugin.cxx index 4b0f61bfc..b682bccaa 100644 --- a/src/input/InputPlugin.cxx +++ b/src/input/InputPlugin.cxx @@ -20,8 +20,8 @@ #include "InputPlugin.hxx" #include "util/StringCompare.hxx" -#include #include +#include #include bool @@ -71,4 +71,4 @@ protocol_is_whitelisted(const char *proto) { return std::binary_search(begin, end, proto, [](const char* a, const char* b) { return strcasecmp(a,b) < 0; }); -} \ No newline at end of file +} diff --git a/src/input/InputPlugin.hxx b/src/input/InputPlugin.hxx index 4b574d892..5a0dbe9a3 100644 --- a/src/input/InputPlugin.hxx +++ b/src/input/InputPlugin.hxx @@ -23,7 +23,8 @@ #include "Ptr.hxx" #include "thread/Mutex.hxx" #include "util/Compiler.h" -#include + +#include #include #include diff --git a/src/input/InputStream.cxx b/src/input/InputStream.cxx index 0ca298f5b..1ed319466 100644 --- a/src/input/InputStream.cxx +++ b/src/input/InputStream.cxx @@ -22,10 +22,9 @@ #include "tag/Tag.hxx" #include "util/ASCII.hxx" +#include #include -#include - InputStream::~InputStream() noexcept = default; void diff --git a/src/input/InputStream.hxx b/src/input/InputStream.hxx index 2c838c1b3..8395693e2 100644 --- a/src/input/InputStream.hxx +++ b/src/input/InputStream.hxx @@ -25,10 +25,9 @@ #include "thread/Mutex.hxx" #include "util/Compiler.h" -#include +#include #include - -#include +#include struct Tag; class InputStreamHandler; diff --git a/src/input/LocalOpen.cxx b/src/input/LocalOpen.cxx index 7947569a1..ecbd42511 100644 --- a/src/input/LocalOpen.cxx +++ b/src/input/LocalOpen.cxx @@ -29,7 +29,7 @@ #include "fs/Path.hxx" #include "system/Error.hxx" -#include +#include InputStreamPtr OpenLocalInputStream(Path path, Mutex &mutex) diff --git a/src/input/RewindInputStream.cxx b/src/input/RewindInputStream.cxx index 5e9659056..8aa5c265c 100644 --- a/src/input/RewindInputStream.cxx +++ b/src/input/RewindInputStream.cxx @@ -20,7 +20,8 @@ #include "RewindInputStream.hxx" #include "ProxyInputStream.hxx" -#include +#include + #include class RewindInputStream final : public ProxyInputStream { diff --git a/src/input/TextInputStream.cxx b/src/input/TextInputStream.cxx index 2cb3cfd0e..9bfebfb71 100644 --- a/src/input/TextInputStream.cxx +++ b/src/input/TextInputStream.cxx @@ -21,7 +21,7 @@ #include "InputStream.hxx" #include "util/TextFile.hxx" -#include +#include TextInputStream::TextInputStream(InputStreamPtr &&_is) noexcept :is(std::move(_is)) {} diff --git a/src/input/ThreadInputStream.cxx b/src/input/ThreadInputStream.cxx index d337abda1..b82c1b27f 100644 --- a/src/input/ThreadInputStream.cxx +++ b/src/input/ThreadInputStream.cxx @@ -21,7 +21,8 @@ #include "CondHandler.hxx" #include "thread/Name.hxx" -#include +#include + #include ThreadInputStream::ThreadInputStream(const char *_plugin, diff --git a/src/input/ThreadInputStream.hxx b/src/input/ThreadInputStream.hxx index 50d9d9a06..b7f520a66 100644 --- a/src/input/ThreadInputStream.hxx +++ b/src/input/ThreadInputStream.hxx @@ -26,9 +26,9 @@ #include "util/HugeAllocator.hxx" #include "util/CircularBuffer.hxx" +#include #include -#include #include /** diff --git a/src/input/cache/Item.cxx b/src/input/cache/Item.cxx index ecfdcc038..727e0c94a 100644 --- a/src/input/cache/Item.cxx +++ b/src/input/cache/Item.cxx @@ -21,7 +21,7 @@ #include "Lease.hxx" #include "input/InputStream.hxx" -#include +#include InputCacheItem::InputCacheItem(InputStreamPtr _input) noexcept :BufferingInputStream(std::move(_input)), diff --git a/src/input/plugins/AlsaInputPlugin.cxx b/src/input/plugins/AlsaInputPlugin.cxx index eccfbe5c5..d09126d14 100644 --- a/src/input/plugins/AlsaInputPlugin.cxx +++ b/src/input/plugins/AlsaInputPlugin.cxx @@ -43,7 +43,8 @@ #include -#include +#include + #include static constexpr Domain alsa_input_domain("alsa"); diff --git a/src/input/plugins/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx index 2929c742e..2b6ef9aac 100644 --- a/src/input/plugins/CdioParanoiaInputPlugin.cxx +++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx @@ -34,11 +34,12 @@ #include "Log.hxx" #include "config/Block.hxx" +#include + #include #include #include #include -#include #include diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index 2628c2efa..9fc1710d5 100644 --- a/src/input/plugins/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -49,9 +49,9 @@ #include "util/UriQueryParser.hxx" #endif +#include #include -#include #include #include diff --git a/src/input/plugins/QobuzClient.cxx b/src/input/plugins/QobuzClient.cxx index ff80b3648..bfffd863a 100644 --- a/src/input/plugins/QobuzClient.cxx +++ b/src/input/plugins/QobuzClient.cxx @@ -21,10 +21,9 @@ #include "lib/crypto/MD5.hxx" #include "util/ConstBuffer.hxx" +#include #include -#include - namespace { class QueryStringBuilder { diff --git a/src/java/Class.hxx b/src/java/Class.hxx index 083c64217..fd38ce9eb 100644 --- a/src/java/Class.hxx +++ b/src/java/Class.hxx @@ -33,7 +33,7 @@ #include "Ref.hxx" #include "Exception.hxx" -#include +#include namespace Java { /** diff --git a/src/java/Object.hxx b/src/java/Object.hxx index 1bb7a9bd3..45920a056 100644 --- a/src/java/Object.hxx +++ b/src/java/Object.hxx @@ -34,7 +34,7 @@ #include -#include +#include namespace Java { /** diff --git a/src/java/Ref.hxx b/src/java/Ref.hxx index 5b6ab0169..37c85a5e9 100644 --- a/src/java/Ref.hxx +++ b/src/java/Ref.hxx @@ -34,10 +34,9 @@ #include +#include #include -#include - namespace Java { /** * Hold a local reference on a JNI object. diff --git a/src/lib/alsa/Format.hxx b/src/lib/alsa/Format.hxx index f7fb8ca2e..1060ff194 100644 --- a/src/lib/alsa/Format.hxx +++ b/src/lib/alsa/Format.hxx @@ -26,7 +26,7 @@ #include -#include +#include #if SND_LIB_VERSION >= 0x1001c /* alsa-lib supports DSD since version 1.0.27.1 */ diff --git a/src/lib/alsa/PeriodBuffer.hxx b/src/lib/alsa/PeriodBuffer.hxx index 6c634e21d..816af621f 100644 --- a/src/lib/alsa/PeriodBuffer.hxx +++ b/src/lib/alsa/PeriodBuffer.hxx @@ -23,8 +23,8 @@ #include #include +#include -#include #include namespace Alsa { diff --git a/src/lib/curl/Delegate.cxx b/src/lib/curl/Delegate.cxx index 2ebb9cd7a..a16793ed2 100644 --- a/src/lib/curl/Delegate.cxx +++ b/src/lib/curl/Delegate.cxx @@ -30,10 +30,9 @@ #include "Delegate.hxx" #include "Parser.hxx" +#include #include -#include - void DelegateCurlResponseHandler::OnHeaders(unsigned status, std::multimap &&headers) diff --git a/src/lib/curl/Global.cxx b/src/lib/curl/Global.cxx index c83df1ad4..24c17798e 100644 --- a/src/lib/curl/Global.cxx +++ b/src/lib/curl/Global.cxx @@ -35,7 +35,7 @@ #include "util/RuntimeError.hxx" #include "util/Domain.hxx" -#include +#include static constexpr Domain curlm_domain("curlm"); diff --git a/src/lib/curl/Init.cxx b/src/lib/curl/Init.cxx index 9b38c746f..4fa067bc3 100644 --- a/src/lib/curl/Init.cxx +++ b/src/lib/curl/Init.cxx @@ -32,7 +32,7 @@ #include "event/Call.hxx" #include "thread/Mutex.hxx" -#include +#include Mutex CurlInit::mutex; unsigned CurlInit::ref; diff --git a/src/lib/curl/Request.cxx b/src/lib/curl/Request.cxx index 864a92d3f..eb3afbff1 100644 --- a/src/lib/curl/Request.cxx +++ b/src/lib/curl/Request.cxx @@ -40,8 +40,8 @@ #include #include +#include -#include #include CurlRequest::CurlRequest(CurlGlobal &_global, diff --git a/src/lib/dbus/AsyncRequest.hxx b/src/lib/dbus/AsyncRequest.hxx index 9450a3e7a..1c3cf0ff7 100644 --- a/src/lib/dbus/AsyncRequest.hxx +++ b/src/lib/dbus/AsyncRequest.hxx @@ -33,10 +33,9 @@ #include "PendingCall.hxx" #include "Message.hxx" +#include #include -#include - namespace ODBus { /** diff --git a/src/lib/ffmpeg/Time.hxx b/src/lib/ffmpeg/Time.hxx index f2d589d15..bd189e255 100644 --- a/src/lib/ffmpeg/Time.hxx +++ b/src/lib/ffmpeg/Time.hxx @@ -28,7 +28,8 @@ extern "C" { #include } -#include +#include + #include /* suppress the ffmpeg compatibility macro */ diff --git a/src/lib/icu/CaseFold.cxx b/src/lib/icu/CaseFold.cxx index 74e378e92..26ae6cba5 100644 --- a/src/lib/icu/CaseFold.cxx +++ b/src/lib/icu/CaseFold.cxx @@ -40,9 +40,9 @@ #include #endif +#include #include -#include #include AllocatedString<> diff --git a/src/lib/icu/Collate.cxx b/src/lib/icu/Collate.cxx index d84881017..d3cf68cb1 100644 --- a/src/lib/icu/Collate.cxx +++ b/src/lib/icu/Collate.cxx @@ -38,10 +38,10 @@ #include #endif +#include #include #include -#include #include #ifdef HAVE_ICU diff --git a/src/lib/icu/Util.cxx b/src/lib/icu/Util.cxx index 461043fea..74904dd09 100644 --- a/src/lib/icu/Util.cxx +++ b/src/lib/icu/Util.cxx @@ -24,10 +24,10 @@ #include +#include #include #include -#include #include AllocatedArray diff --git a/src/lib/nfs/Base.cxx b/src/lib/nfs/Base.cxx index a3d33cc63..92020b861 100644 --- a/src/lib/nfs/Base.cxx +++ b/src/lib/nfs/Base.cxx @@ -19,7 +19,8 @@ #include "Base.hxx" -#include +#include + #include static char nfs_base_server[64]; diff --git a/src/lib/nfs/Cancellable.hxx b/src/lib/nfs/Cancellable.hxx index e859688df..a571ac315 100644 --- a/src/lib/nfs/Cancellable.hxx +++ b/src/lib/nfs/Cancellable.hxx @@ -25,8 +25,7 @@ #include #include - -#include +#include template class CancellablePointer diff --git a/src/lib/nfs/Error.cxx b/src/lib/nfs/Error.cxx index 942e6cabf..3214b7c76 100644 --- a/src/lib/nfs/Error.cxx +++ b/src/lib/nfs/Error.cxx @@ -37,7 +37,8 @@ extern "C" { #include } -#include +#include + #include static StringBuffer<256> diff --git a/src/lib/nfs/FileReader.cxx b/src/lib/nfs/FileReader.cxx index af904f5c1..6e66bfa71 100644 --- a/src/lib/nfs/FileReader.cxx +++ b/src/lib/nfs/FileReader.cxx @@ -24,10 +24,10 @@ #include "event/Call.hxx" #include "util/ASCII.hxx" -#include +#include #include +#include -#include #include #include diff --git a/src/lib/nfs/Glue.cxx b/src/lib/nfs/Glue.cxx index 9101ad78c..329e39134 100644 --- a/src/lib/nfs/Glue.cxx +++ b/src/lib/nfs/Glue.cxx @@ -22,7 +22,7 @@ #include "event/Call.hxx" #include "util/Manual.hxx" -#include +#include static Manual nfs_glue; static unsigned in_use; diff --git a/src/lib/sqlite/Util.hxx b/src/lib/sqlite/Util.hxx index 664d03cc3..ba142f55a 100644 --- a/src/lib/sqlite/Util.hxx +++ b/src/lib/sqlite/Util.hxx @@ -25,7 +25,7 @@ #include -#include +#include namespace Sqlite { diff --git a/src/lib/upnp/ClientInit.cxx b/src/lib/upnp/ClientInit.cxx index f40e53377..ae001e6e8 100644 --- a/src/lib/upnp/ClientInit.cxx +++ b/src/lib/upnp/ClientInit.cxx @@ -25,7 +25,7 @@ #include -#include +#include static Mutex upnp_client_init_mutex; static unsigned upnp_client_ref; diff --git a/src/lib/upnp/Init.cxx b/src/lib/upnp/Init.cxx index c47fc6ee8..4e3176db3 100644 --- a/src/lib/upnp/Init.cxx +++ b/src/lib/upnp/Init.cxx @@ -25,7 +25,7 @@ #include #include -#include +#include static Mutex upnp_init_mutex; static unsigned upnp_ref; diff --git a/src/lib/xiph/FlacStreamMetadata.cxx b/src/lib/xiph/FlacStreamMetadata.cxx index 9c6e1af90..794f8aafa 100644 --- a/src/lib/xiph/FlacStreamMetadata.cxx +++ b/src/lib/xiph/FlacStreamMetadata.cxx @@ -30,7 +30,7 @@ #include "ReplayGainInfo.hxx" #include "util/StringView.hxx" -#include +#include static StringView ToStringView(const FLAC__StreamMetadata_VorbisComment_Entry &entry) noexcept diff --git a/src/lib/xiph/OggPage.hxx b/src/lib/xiph/OggPage.hxx index 1584ef276..8a63cad61 100644 --- a/src/lib/xiph/OggPage.hxx +++ b/src/lib/xiph/OggPage.hxx @@ -22,7 +22,8 @@ #include -#include +#include + #include #include diff --git a/src/lib/xiph/OggStreamState.hxx b/src/lib/xiph/OggStreamState.hxx index a87e8cb6d..8e8934915 100644 --- a/src/lib/xiph/OggStreamState.hxx +++ b/src/lib/xiph/OggStreamState.hxx @@ -22,7 +22,8 @@ #include -#include +#include + #include #include diff --git a/src/ls.cxx b/src/ls.cxx index 1b8e2ced2..022ccb370 100644 --- a/src/ls.cxx +++ b/src/ls.cxx @@ -24,7 +24,7 @@ #include "client/Response.hxx" #include "util/UriExtract.hxx" -#include +#include #include diff --git a/src/mixer/MixerAll.cxx b/src/mixer/MixerAll.cxx index 17c43f3ce..5f6f89ef3 100644 --- a/src/mixer/MixerAll.cxx +++ b/src/mixer/MixerAll.cxx @@ -24,7 +24,7 @@ #include "pcm/Volume.hxx" #include "Log.hxx" -#include +#include gcc_pure static int diff --git a/src/mixer/MixerControl.cxx b/src/mixer/MixerControl.cxx index a80b524a9..1df696641 100644 --- a/src/mixer/MixerControl.cxx +++ b/src/mixer/MixerControl.cxx @@ -20,7 +20,7 @@ #include "MixerControl.hxx" #include "MixerInternal.hxx" -#include +#include Mixer * mixer_new(EventLoop &event_loop, diff --git a/src/mixer/MixerType.cxx b/src/mixer/MixerType.cxx index d9a896861..55caba945 100644 --- a/src/mixer/MixerType.cxx +++ b/src/mixer/MixerType.cxx @@ -19,9 +19,9 @@ #include "MixerType.hxx" +#include #include -#include #include MixerType diff --git a/src/mixer/Volume.cxx b/src/mixer/Volume.cxx index 08f582971..e76f1fb89 100644 --- a/src/mixer/Volume.cxx +++ b/src/mixer/Volume.cxx @@ -26,7 +26,8 @@ #include "fs/io/BufferedOutputStream.hxx" #include "Log.hxx" -#include +#include + #include #define SW_VOLUME_STATE "sw_volume: " diff --git a/src/mixer/plugins/OssMixerPlugin.cxx b/src/mixer/plugins/OssMixerPlugin.cxx index 2f3b763f3..a53559997 100644 --- a/src/mixer/plugins/OssMixerPlugin.cxx +++ b/src/mixer/plugins/OssMixerPlugin.cxx @@ -26,7 +26,8 @@ #include "util/RuntimeError.hxx" #include "Log.hxx" -#include +#include + #include #include #include diff --git a/src/mixer/plugins/PulseMixerPlugin.cxx b/src/mixer/plugins/PulseMixerPlugin.cxx index 9bea8116d..428e3c4af 100644 --- a/src/mixer/plugins/PulseMixerPlugin.cxx +++ b/src/mixer/plugins/PulseMixerPlugin.cxx @@ -32,10 +32,9 @@ #include #include +#include #include -#include - class PulseMixer final : public Mixer { PulseOutput &output; diff --git a/src/mixer/plugins/SoftwareMixerPlugin.cxx b/src/mixer/plugins/SoftwareMixerPlugin.cxx index c394a9628..cb9649017 100644 --- a/src/mixer/plugins/SoftwareMixerPlugin.cxx +++ b/src/mixer/plugins/SoftwareMixerPlugin.cxx @@ -22,7 +22,8 @@ #include "filter/plugins/VolumeFilterPlugin.hxx" #include "pcm/Volume.hxx" -#include +#include + #include class SoftwareMixer final : public Mixer { diff --git a/src/mixer/plugins/WinmmMixerPlugin.cxx b/src/mixer/plugins/WinmmMixerPlugin.cxx index 9661d6551..0bf60f58b 100644 --- a/src/mixer/plugins/WinmmMixerPlugin.cxx +++ b/src/mixer/plugins/WinmmMixerPlugin.cxx @@ -23,9 +23,9 @@ #include +#include #include -#include #include #include diff --git a/src/net/AddressInfo.cxx b/src/net/AddressInfo.cxx index 51de814d4..9bd51dba6 100644 --- a/src/net/AddressInfo.cxx +++ b/src/net/AddressInfo.cxx @@ -30,7 +30,7 @@ #include "AddressInfo.hxx" #include "Features.hxx" -#include +#include static constexpr int address_family_ranking[] = { #ifdef HAVE_UN diff --git a/src/net/IPv4Address.cxx b/src/net/IPv4Address.cxx index 0ed825b21..c7f2ec521 100644 --- a/src/net/IPv4Address.cxx +++ b/src/net/IPv4Address.cxx @@ -29,7 +29,7 @@ #include "IPv4Address.hxx" -#include +#include static const struct sockaddr_in * CastToIPv4(const struct sockaddr *p) noexcept diff --git a/src/net/IPv6Address.cxx b/src/net/IPv6Address.cxx index 5c6d38a62..de8b44c5b 100644 --- a/src/net/IPv6Address.cxx +++ b/src/net/IPv6Address.cxx @@ -30,7 +30,8 @@ #include "IPv6Address.hxx" #include "IPv4Address.hxx" -#include +#include + #include static const struct sockaddr_in6 * diff --git a/src/net/SocketAddress.cxx b/src/net/SocketAddress.cxx index 634792d5c..9261519cd 100644 --- a/src/net/SocketAddress.cxx +++ b/src/net/SocketAddress.cxx @@ -32,7 +32,8 @@ #include "IPv6Address.hxx" #include "util/StringView.hxx" -#include +#include + #include #ifdef HAVE_UN diff --git a/src/net/StaticSocketAddress.hxx b/src/net/StaticSocketAddress.hxx index e6f7572dd..6694cdebb 100644 --- a/src/net/StaticSocketAddress.hxx +++ b/src/net/StaticSocketAddress.hxx @@ -34,7 +34,7 @@ #include "Features.hxx" #include "util/Compiler.h" -#include +#include /** * An OO wrapper for struct sockaddr_storage. diff --git a/src/net/ToString.cxx b/src/net/ToString.cxx index a09c377e5..d15812457 100644 --- a/src/net/ToString.cxx +++ b/src/net/ToString.cxx @@ -34,6 +34,7 @@ #include "IPv4Address.hxx" #include +#include #ifdef _WIN32 #include @@ -48,7 +49,6 @@ #include #endif -#include #include #ifdef HAVE_UN diff --git a/src/output/Control.cxx b/src/output/Control.cxx index d6b100ff1..e4be4dfa7 100644 --- a/src/output/Control.cxx +++ b/src/output/Control.cxx @@ -24,7 +24,7 @@ #include "config/Block.hxx" #include "Log.hxx" -#include +#include /** after a failure, wait this duration before automatically reopening the device */ diff --git a/src/output/Init.cxx b/src/output/Init.cxx index 96f7f3a0b..93a98a152 100644 --- a/src/output/Init.cxx +++ b/src/output/Init.cxx @@ -39,9 +39,9 @@ #include "util/StringFormat.hxx" #include "Log.hxx" +#include #include -#include #include #define AUDIO_OUTPUT_TYPE "type" diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx index 87d65a1ea..f78b8808d 100644 --- a/src/output/MultipleOutputs.cxx +++ b/src/output/MultipleOutputs.cxx @@ -30,9 +30,9 @@ #include "util/RuntimeError.hxx" #include "util/StringAPI.hxx" +#include #include -#include #include MultipleOutputs::MultipleOutputs(AudioOutputClient &_client, diff --git a/src/output/MultipleOutputs.hxx b/src/output/MultipleOutputs.hxx index 885f5f522..18872ba3e 100644 --- a/src/output/MultipleOutputs.hxx +++ b/src/output/MultipleOutputs.hxx @@ -28,11 +28,10 @@ #include "Chrono.hxx" #include "util/Compiler.h" +#include #include #include -#include - class MusicPipe; class EventLoop; class MixerListener; diff --git a/src/output/OutputPlugin.cxx b/src/output/OutputPlugin.cxx index 8be272ecc..75563636e 100644 --- a/src/output/OutputPlugin.cxx +++ b/src/output/OutputPlugin.cxx @@ -19,7 +19,7 @@ #include "OutputPlugin.hxx" -#include +#include AudioOutput * ao_plugin_init(EventLoop &event_loop, diff --git a/src/output/SharedPipeConsumer.hxx b/src/output/SharedPipeConsumer.hxx index f07373290..814ddeadf 100644 --- a/src/output/SharedPipeConsumer.hxx +++ b/src/output/SharedPipeConsumer.hxx @@ -22,7 +22,7 @@ #include "util/Compiler.h" -#include +#include struct MusicChunk; class MusicPipe; diff --git a/src/output/Source.hxx b/src/output/Source.hxx index 3badfc819..543935ce1 100644 --- a/src/output/Source.hxx +++ b/src/output/Source.hxx @@ -28,10 +28,10 @@ #include "thread/Mutex.hxx" #include "util/ConstBuffer.hxx" -#include +#include #include +#include -#include #include struct MusicChunk; diff --git a/src/output/Thread.cxx b/src/output/Thread.cxx index 18193c0e4..b42d517d7 100644 --- a/src/output/Thread.cxx +++ b/src/output/Thread.cxx @@ -29,7 +29,8 @@ #include "util/RuntimeError.hxx" #include "Log.hxx" -#include +#include + #include void diff --git a/src/output/Timer.cxx b/src/output/Timer.cxx index 051671f8d..27ee91f91 100644 --- a/src/output/Timer.cxx +++ b/src/output/Timer.cxx @@ -20,7 +20,7 @@ #include "Timer.hxx" #include "pcm/AudioFormat.hxx" -#include +#include Timer::Timer(const AudioFormat af) :rate(af.sample_rate * af.GetFrameSize()) diff --git a/src/output/plugins/JackOutputPlugin.cxx b/src/output/plugins/JackOutputPlugin.cxx index 165d4651d..2e133398a 100644 --- a/src/output/plugins/JackOutputPlugin.cxx +++ b/src/output/plugins/JackOutputPlugin.cxx @@ -29,8 +29,7 @@ #include "Log.hxx" #include - -#include +#include #include #include diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx index aa6ad33d7..5ed07174d 100644 --- a/src/output/plugins/OssOutputPlugin.cxx +++ b/src/output/plugins/OssOutputPlugin.cxx @@ -27,6 +27,7 @@ #include "util/ByteOrder.hxx" #include "Log.hxx" +#include #include #include @@ -36,7 +37,6 @@ #include #include #include -#include #if defined(__OpenBSD__) || defined(__NetBSD__) # include diff --git a/src/output/plugins/PulseOutputPlugin.cxx b/src/output/plugins/PulseOutputPlugin.cxx index 3fdfbc82b..54ae119a6 100644 --- a/src/output/plugins/PulseOutputPlugin.cxx +++ b/src/output/plugins/PulseOutputPlugin.cxx @@ -33,9 +33,9 @@ #include #include +#include #include -#include #include #include diff --git a/src/output/plugins/RecorderOutputPlugin.cxx b/src/output/plugins/RecorderOutputPlugin.cxx index 824def5f3..6f61bcbf4 100644 --- a/src/output/plugins/RecorderOutputPlugin.cxx +++ b/src/output/plugins/RecorderOutputPlugin.cxx @@ -30,10 +30,10 @@ #include "util/Domain.hxx" #include "util/ScopeExit.hxx" -#include +#include #include +#include -#include #include static constexpr Domain recorder_domain("recorder"); diff --git a/src/output/plugins/ShoutOutputPlugin.cxx b/src/output/plugins/ShoutOutputPlugin.cxx index 919a5684a..790bf42dc 100644 --- a/src/output/plugins/ShoutOutputPlugin.cxx +++ b/src/output/plugins/ShoutOutputPlugin.cxx @@ -30,10 +30,10 @@ #include -#include +#include #include +#include -#include #include static constexpr unsigned DEFAULT_CONN_TIMEOUT = 2; diff --git a/src/output/plugins/httpd/HttpdClient.cxx b/src/output/plugins/httpd/HttpdClient.cxx index 93ff7e74a..5d4ef90b6 100644 --- a/src/output/plugins/httpd/HttpdClient.cxx +++ b/src/output/plugins/httpd/HttpdClient.cxx @@ -27,7 +27,8 @@ #include "net/UniqueSocketDescriptor.hxx" #include "Log.hxx" -#include +#include + #include #include diff --git a/src/output/plugins/httpd/HttpdOutputPlugin.cxx b/src/output/plugins/httpd/HttpdOutputPlugin.cxx index 252696b2a..ef4b7eaae 100644 --- a/src/output/plugins/httpd/HttpdOutputPlugin.cxx +++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx @@ -32,7 +32,7 @@ #include "util/DeleteDisposer.hxx" #include "config/Net.hxx" -#include +#include #include diff --git a/src/pcm/AudioFormat.cxx b/src/pcm/AudioFormat.cxx index a3fc7f5d3..3006bf159 100644 --- a/src/pcm/AudioFormat.cxx +++ b/src/pcm/AudioFormat.cxx @@ -20,7 +20,8 @@ #include "AudioFormat.hxx" #include "util/StringBuffer.hxx" -#include +#include + #include void diff --git a/src/pcm/AudioParser.cxx b/src/pcm/AudioParser.cxx index ad8d0ad29..d6b585cfb 100644 --- a/src/pcm/AudioParser.cxx +++ b/src/pcm/AudioParser.cxx @@ -26,7 +26,8 @@ #include "AudioFormat.hxx" #include "util/RuntimeError.hxx" -#include +#include + #include #include diff --git a/src/pcm/ChannelsConverter.cxx b/src/pcm/ChannelsConverter.cxx index c619deec8..bcd494b38 100644 --- a/src/pcm/ChannelsConverter.cxx +++ b/src/pcm/ChannelsConverter.cxx @@ -22,7 +22,7 @@ #include "util/ConstBuffer.hxx" #include "util/RuntimeError.hxx" -#include +#include void PcmChannelsConverter::Open(SampleFormat _format, diff --git a/src/pcm/ChannelsConverter.hxx b/src/pcm/ChannelsConverter.hxx index 58932a6d3..baf3ae920 100644 --- a/src/pcm/ChannelsConverter.hxx +++ b/src/pcm/ChannelsConverter.hxx @@ -24,7 +24,7 @@ #include "Buffer.hxx" #ifndef NDEBUG -#include +#include #endif template struct ConstBuffer; diff --git a/src/pcm/ConfiguredResampler.cxx b/src/pcm/ConfiguredResampler.cxx index 1d0453208..a219838c3 100644 --- a/src/pcm/ConfiguredResampler.cxx +++ b/src/pcm/ConfiguredResampler.cxx @@ -34,7 +34,8 @@ #include "SoxrResampler.hxx" #endif -#include +#include + #include enum class SelectedResampler { diff --git a/src/pcm/Convert.cxx b/src/pcm/Convert.cxx index b4099432b..f68d43173 100644 --- a/src/pcm/Convert.cxx +++ b/src/pcm/Convert.cxx @@ -21,10 +21,9 @@ #include "ConfiguredResampler.hxx" #include "util/ConstBuffer.hxx" +#include #include -#include - void pcm_convert_global_init(const ConfigData &config) { diff --git a/src/pcm/Dop.cxx b/src/pcm/Dop.cxx index 89c68d689..f9c4707c6 100644 --- a/src/pcm/Dop.cxx +++ b/src/pcm/Dop.cxx @@ -21,10 +21,9 @@ #include "ChannelDefs.hxx" #include "util/ConstBuffer.hxx" +#include #include -#include - static constexpr uint32_t pcm_two_dsd_to_dop_marker1(uint8_t a, uint8_t b) noexcept { diff --git a/src/pcm/Dsd2Pcm.cxx b/src/pcm/Dsd2Pcm.cxx index 9b105ae12..42f76d730 100644 --- a/src/pcm/Dsd2Pcm.cxx +++ b/src/pcm/Dsd2Pcm.cxx @@ -35,7 +35,8 @@ or implied, of Sebastian Gesemann. #include "util/BitReverse.hxx" #include "util/GenerateArray.hxx" -#include +#include + #include #include diff --git a/src/pcm/Export.cxx b/src/pcm/Export.cxx index 76b25d09c..1b583e4b3 100644 --- a/src/pcm/Export.cxx +++ b/src/pcm/Export.cxx @@ -25,7 +25,8 @@ #include "util/ConstBuffer.hxx" #include "util/WritableBuffer.hxx" -#include +#include + #include void diff --git a/src/pcm/FallbackResampler.cxx b/src/pcm/FallbackResampler.cxx index 7938fa803..9a7549c31 100644 --- a/src/pcm/FallbackResampler.cxx +++ b/src/pcm/FallbackResampler.cxx @@ -19,7 +19,7 @@ #include "FallbackResampler.hxx" -#include +#include AudioFormat FallbackPcmResampler::Open(AudioFormat &af, unsigned new_sample_rate) diff --git a/src/pcm/FormatConverter.cxx b/src/pcm/FormatConverter.cxx index 62ef857e6..f8ec1ac1c 100644 --- a/src/pcm/FormatConverter.cxx +++ b/src/pcm/FormatConverter.cxx @@ -22,7 +22,7 @@ #include "util/ConstBuffer.hxx" #include "util/RuntimeError.hxx" -#include +#include void PcmFormatConverter::Open(SampleFormat _src_format, SampleFormat _dest_format) diff --git a/src/pcm/FormatConverter.hxx b/src/pcm/FormatConverter.hxx index 406d10f04..c1ab1e3d1 100644 --- a/src/pcm/FormatConverter.hxx +++ b/src/pcm/FormatConverter.hxx @@ -25,7 +25,7 @@ #include "Dither.hxx" #ifndef NDEBUG -#include +#include #endif template struct ConstBuffer; diff --git a/src/pcm/GlueResampler.cxx b/src/pcm/GlueResampler.cxx index 1fbcbc1d5..8a4daef9b 100644 --- a/src/pcm/GlueResampler.cxx +++ b/src/pcm/GlueResampler.cxx @@ -22,7 +22,7 @@ #include "Resampler.hxx" #include "AudioFormat.hxx" -#include +#include GluePcmResampler::GluePcmResampler() :resampler(pcm_resampler_create()) {} diff --git a/src/pcm/LibsamplerateResampler.cxx b/src/pcm/LibsamplerateResampler.cxx index 08c461e98..3c7e6706e 100644 --- a/src/pcm/LibsamplerateResampler.cxx +++ b/src/pcm/LibsamplerateResampler.cxx @@ -24,7 +24,8 @@ #include "util/Domain.hxx" #include "Log.hxx" -#include +#include + #include #include diff --git a/src/pcm/Mix.cxx b/src/pcm/Mix.cxx index 17e34b005..b17343513 100644 --- a/src/pcm/Mix.cxx +++ b/src/pcm/Mix.cxx @@ -25,10 +25,9 @@ #include "Dither.cxx" // including the .cxx file to get inlined templates +#include #include -#include - template> static typename Traits::value_type PcmAddVolume(PcmDither &dither, diff --git a/src/pcm/PcmChannels.cxx b/src/pcm/PcmChannels.cxx index 629a13cde..02e0fa1b7 100644 --- a/src/pcm/PcmChannels.cxx +++ b/src/pcm/PcmChannels.cxx @@ -27,8 +27,7 @@ #include #include - -#include +#include template static void diff --git a/src/pcm/PcmDsd.cxx b/src/pcm/PcmDsd.cxx index 7111c22cb..b2153be3e 100644 --- a/src/pcm/PcmDsd.cxx +++ b/src/pcm/PcmDsd.cxx @@ -21,7 +21,7 @@ #include "Dsd2Pcm.hxx" #include "util/ConstBuffer.hxx" -#include +#include ConstBuffer PcmDsd::ToFloat(unsigned channels, ConstBuffer src) noexcept diff --git a/src/pcm/RestBuffer.hxx b/src/pcm/RestBuffer.hxx index 69094614a..366753d90 100644 --- a/src/pcm/RestBuffer.hxx +++ b/src/pcm/RestBuffer.hxx @@ -23,8 +23,8 @@ #include "ChannelDefs.hxx" #include +#include -#include #include template struct ConstBuffer; diff --git a/src/pcm/SampleFormat.cxx b/src/pcm/SampleFormat.cxx index 7931c5011..5de8d60d1 100644 --- a/src/pcm/SampleFormat.cxx +++ b/src/pcm/SampleFormat.cxx @@ -19,7 +19,7 @@ #include "SampleFormat.hxx" -#include +#include const char * sample_format_to_string(SampleFormat format) noexcept diff --git a/src/pcm/SoxrResampler.cxx b/src/pcm/SoxrResampler.cxx index c70c99647..769445e58 100644 --- a/src/pcm/SoxrResampler.cxx +++ b/src/pcm/SoxrResampler.cxx @@ -26,7 +26,8 @@ #include -#include +#include + #include static constexpr Domain soxr_domain("soxr"); diff --git a/src/pcm/Volume.cxx b/src/pcm/Volume.cxx index afb2d38f2..975a4571c 100644 --- a/src/pcm/Volume.cxx +++ b/src/pcm/Volume.cxx @@ -27,7 +27,8 @@ #include "Dither.cxx" // including the .cxx file to get inlined templates -#include +#include + #include #include diff --git a/src/pcm/Volume.hxx b/src/pcm/Volume.hxx index 46a1eda29..e38c85a71 100644 --- a/src/pcm/Volume.hxx +++ b/src/pcm/Volume.hxx @@ -25,7 +25,7 @@ #include "Dither.hxx" #ifndef NDEBUG -#include +#include #endif template struct ConstBuffer; diff --git a/src/player/Control.cxx b/src/player/Control.cxx index 6ee0cc2d2..593af3331 100644 --- a/src/player/Control.cxx +++ b/src/player/Control.cxx @@ -23,8 +23,7 @@ #include "song/DetachedSong.hxx" #include - -#include +#include PlayerControl::PlayerControl(PlayerListener &_listener, PlayerOutputs &_outputs, diff --git a/src/player/CrossFade.cxx b/src/player/CrossFade.cxx index ce86d3f0a..ec8fd334e 100644 --- a/src/player/CrossFade.cxx +++ b/src/player/CrossFade.cxx @@ -25,10 +25,9 @@ #include "util/Domain.hxx" #include "Log.hxx" +#include #include -#include - static constexpr Domain cross_fade_domain("cross_fade"); gcc_pure diff --git a/src/playlist/PlaylistMapper.cxx b/src/playlist/PlaylistMapper.cxx index 82e9e4af9..98d123f6e 100644 --- a/src/playlist/PlaylistMapper.cxx +++ b/src/playlist/PlaylistMapper.cxx @@ -26,7 +26,7 @@ #include "storage/StorageInterface.hxx" #include "util/UriUtil.hxx" -#include +#include /** * Load a playlist from the configured playlist directory. diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx index a932a9241..68c78d6eb 100644 --- a/src/playlist/PlaylistRegistry.cxx +++ b/src/playlist/PlaylistRegistry.cxx @@ -38,10 +38,9 @@ #include "config/Data.hxx" #include "config/Block.hxx" +#include #include -#include - const PlaylistPlugin *const playlist_plugins[] = { &extm3u_playlist_plugin, &m3u_playlist_plugin, diff --git a/src/playlist/PlaylistStream.cxx b/src/playlist/PlaylistStream.cxx index 9452a31e3..cebcc38e1 100644 --- a/src/playlist/PlaylistStream.cxx +++ b/src/playlist/PlaylistStream.cxx @@ -26,10 +26,9 @@ #include "util/UriExtract.hxx" #include "Log.hxx" +#include #include -#include - static std::unique_ptr playlist_open_path_suffix(Path path, Mutex &mutex) try { diff --git a/src/playlist/cue/CueParser.cxx b/src/playlist/cue/CueParser.cxx index e11ea3944..736a0314c 100644 --- a/src/playlist/cue/CueParser.cxx +++ b/src/playlist/cue/CueParser.cxx @@ -23,7 +23,8 @@ #include "util/StringStrip.hxx" #include "util/CharUtil.hxx" -#include +#include + #include #include diff --git a/src/queue/IdTable.hxx b/src/queue/IdTable.hxx index 531aba718..58e32649f 100644 --- a/src/queue/IdTable.hxx +++ b/src/queue/IdTable.hxx @@ -23,8 +23,7 @@ #include "util/Compiler.h" #include - -#include +#include /** * A table that maps id numbers to position numbers. diff --git a/src/queue/Playlist.cxx b/src/queue/Playlist.cxx index 5a2151749..f086af189 100644 --- a/src/queue/Playlist.cxx +++ b/src/queue/Playlist.cxx @@ -25,7 +25,7 @@ #include "SingleMode.hxx" #include "Log.hxx" -#include +#include void playlist::TagModified(DetachedSong &&song) noexcept diff --git a/src/queue/Queue.hxx b/src/queue/Queue.hxx index df0818b64..bee779491 100644 --- a/src/queue/Queue.hxx +++ b/src/queue/Queue.hxx @@ -25,9 +25,9 @@ #include "SingleMode.hxx" #include "util/LazyRandomEngine.hxx" +#include #include -#include #include class DetachedSong; diff --git a/src/song/Filter.cxx b/src/song/Filter.cxx index 6ec9d3e7f..f67395322 100644 --- a/src/song/Filter.cxx +++ b/src/song/Filter.cxx @@ -37,7 +37,8 @@ #include "util/ASCII.hxx" #include "util/UriUtil.hxx" -#include +#include + #include #define LOCATE_TAG_FILE_KEY "file" diff --git a/src/song/StringFilter.cxx b/src/song/StringFilter.cxx index 5b5678839..1ff044c88 100644 --- a/src/song/StringFilter.cxx +++ b/src/song/StringFilter.cxx @@ -20,7 +20,7 @@ #include "StringFilter.hxx" #include "util/StringAPI.hxx" -#include +#include bool StringFilter::MatchWithoutNegation(const char *s) const noexcept diff --git a/src/sticker/Database.cxx b/src/sticker/Database.cxx index 1817bfec8..aec53dd7e 100644 --- a/src/sticker/Database.cxx +++ b/src/sticker/Database.cxx @@ -25,10 +25,9 @@ #include "util/StringCompare.hxx" #include "util/ScopeExit.hxx" +#include #include -#include - using namespace Sqlite; enum sticker_sql { diff --git a/src/storage/MemoryDirectoryReader.cxx b/src/storage/MemoryDirectoryReader.cxx index af2087ef2..4220c237e 100644 --- a/src/storage/MemoryDirectoryReader.cxx +++ b/src/storage/MemoryDirectoryReader.cxx @@ -19,7 +19,7 @@ #include "MemoryDirectoryReader.hxx" -#include +#include const char * MemoryStorageDirectoryReader::Read() noexcept diff --git a/src/storage/plugins/CurlStorage.cxx b/src/storage/plugins/CurlStorage.cxx index a45f7369b..07f25c441 100644 --- a/src/storage/plugins/CurlStorage.cxx +++ b/src/storage/plugins/CurlStorage.cxx @@ -41,12 +41,11 @@ #include "util/StringFormat.hxx" #include "util/UriExtract.hxx" +#include #include #include #include -#include - class CurlStorage final : public Storage { const std::string base; diff --git a/src/storage/plugins/NfsStorage.cxx b/src/storage/plugins/NfsStorage.cxx index c1c88c069..f6d4a5dcb 100644 --- a/src/storage/plugins/NfsStorage.cxx +++ b/src/storage/plugins/NfsStorage.cxx @@ -42,9 +42,9 @@ extern "C" { #include } +#include #include -#include #include #include diff --git a/src/system/EventFD.cxx b/src/system/EventFD.cxx index 82e6ed4e3..80c722953 100644 --- a/src/system/EventFD.cxx +++ b/src/system/EventFD.cxx @@ -31,7 +31,8 @@ #include "system/Error.hxx" #include "util/Compiler.h" -#include +#include + #include EventFD::EventFD() diff --git a/src/system/EventPipe.cxx b/src/system/EventPipe.cxx index 4ab31aba3..981832b8c 100644 --- a/src/system/EventPipe.cxx +++ b/src/system/EventPipe.cxx @@ -22,7 +22,8 @@ #include "system/Error.hxx" #include "util/Compiler.h" -#include +#include + #include #ifdef _WIN32 diff --git a/src/system/FileDescriptor.cxx b/src/system/FileDescriptor.cxx index 8639d9dbf..cd13e0b91 100644 --- a/src/system/FileDescriptor.cxx +++ b/src/system/FileDescriptor.cxx @@ -30,7 +30,8 @@ #include "FileDescriptor.hxx" #include "system/Error.hxx" -#include +#include + #include #include #include diff --git a/src/system/SignalFD.cxx b/src/system/SignalFD.cxx index 7b0634b22..e00464466 100644 --- a/src/system/SignalFD.cxx +++ b/src/system/SignalFD.cxx @@ -30,7 +30,8 @@ #include "SignalFD.hxx" #include "Error.hxx" -#include +#include + #include void diff --git a/src/system/UniqueFileDescriptor.hxx b/src/system/UniqueFileDescriptor.hxx index ff1a72719..8e808b231 100644 --- a/src/system/UniqueFileDescriptor.hxx +++ b/src/system/UniqueFileDescriptor.hxx @@ -32,10 +32,9 @@ #include "FileDescriptor.hxx" +#include #include -#include - /** * An OO wrapper for a UNIX file descriptor. */ diff --git a/src/tag/ApeLoader.cxx b/src/tag/ApeLoader.cxx index 19f881666..e07d7b457 100644 --- a/src/tag/ApeLoader.cxx +++ b/src/tag/ApeLoader.cxx @@ -22,10 +22,10 @@ #include "input/InputStream.hxx" #include "util/StringView.hxx" +#include #include #include -#include #include struct ApeFooter { diff --git a/src/tag/Builder.cxx b/src/tag/Builder.cxx index 1eec48bae..b55f02709 100644 --- a/src/tag/Builder.cxx +++ b/src/tag/Builder.cxx @@ -27,8 +27,8 @@ #include #include +#include -#include #include TagBuilder::TagBuilder(const Tag &other) noexcept diff --git a/src/tag/FixString.cxx b/src/tag/FixString.cxx index 6fe44ffa5..209ca88a6 100644 --- a/src/tag/FixString.cxx +++ b/src/tag/FixString.cxx @@ -23,7 +23,8 @@ #include "util/StringView.hxx" #include "util/UTF8.hxx" -#include +#include + #include gcc_pure diff --git a/src/tag/MixRamp.cxx b/src/tag/MixRamp.cxx index 8e42a57b1..3f0c11746 100644 --- a/src/tag/MixRamp.cxx +++ b/src/tag/MixRamp.cxx @@ -23,7 +23,7 @@ #include "util/ASCII.hxx" #include "util/StringView.hxx" -#include +#include template static bool diff --git a/src/tag/ParseName.cxx b/src/tag/ParseName.cxx index 7fd1a249a..b9d6182aa 100644 --- a/src/tag/ParseName.cxx +++ b/src/tag/ParseName.cxx @@ -21,7 +21,8 @@ #include "util/ASCII.hxx" #include "util/StringView.hxx" -#include +#include + #include TagType diff --git a/src/tag/Pool.cxx b/src/tag/Pool.cxx index 319336136..192e291d3 100644 --- a/src/tag/Pool.cxx +++ b/src/tag/Pool.cxx @@ -23,9 +23,9 @@ #include "util/VarSize.hxx" #include "util/StringView.hxx" +#include #include -#include #include #include #include diff --git a/src/tag/ReplayGain.cxx b/src/tag/ReplayGain.cxx index c294a6b12..bd8d65fda 100644 --- a/src/tag/ReplayGain.cxx +++ b/src/tag/ReplayGain.cxx @@ -23,7 +23,7 @@ #include "util/ASCII.hxx" #include "util/NumberParser.hxx" -#include +#include template static bool diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx index b9b7c6e8b..f3a580a11 100644 --- a/src/tag/Tag.cxx +++ b/src/tag/Tag.cxx @@ -21,7 +21,7 @@ #include "Pool.hxx" #include "Builder.hxx" -#include +#include void Tag::Clear() noexcept diff --git a/src/tag/VorbisComment.cxx b/src/tag/VorbisComment.cxx index 0f92f3c42..62808d0b8 100644 --- a/src/tag/VorbisComment.cxx +++ b/src/tag/VorbisComment.cxx @@ -20,7 +20,7 @@ #include "VorbisComment.hxx" #include "util/StringView.hxx" -#include +#include StringView GetVorbisCommentValue(StringView entry, StringView name) noexcept diff --git a/src/thread/Thread.hxx b/src/thread/Thread.hxx index 8a6ad2908..5501ddc86 100644 --- a/src/thread/Thread.hxx +++ b/src/thread/Thread.hxx @@ -23,14 +23,14 @@ #include "util/BindMethod.hxx" #include "util/Compiler.h" +#include + #ifdef _WIN32 #include #else #include #endif -#include - class Thread { typedef BoundMethod Function; const Function f; diff --git a/src/time/ISO8601.cxx b/src/time/ISO8601.cxx index 336ddcd5b..514c8a23b 100644 --- a/src/time/ISO8601.cxx +++ b/src/time/ISO8601.cxx @@ -34,9 +34,9 @@ #include "Convert.hxx" #include "util/StringBuffer.hxx" +#include #include -#include #include StringBuffer<64> diff --git a/src/time/Parser.cxx b/src/time/Parser.cxx index 016a0e3d5..0b9689afd 100644 --- a/src/time/Parser.cxx +++ b/src/time/Parser.cxx @@ -30,9 +30,9 @@ #include "Parser.hxx" #include "Convert.hxx" +#include #include -#include #include std::chrono::system_clock::time_point diff --git a/src/unix/PidFile.hxx b/src/unix/PidFile.hxx index 8666b7745..1118ba2e4 100644 --- a/src/unix/PidFile.hxx +++ b/src/unix/PidFile.hxx @@ -24,7 +24,8 @@ #include "fs/AllocatedPath.hxx" #include "system/Error.hxx" -#include +#include + #include #include #include diff --git a/src/util/ASCII.hxx b/src/util/ASCII.hxx index 02bca648c..ad063db77 100644 --- a/src/util/ASCII.hxx +++ b/src/util/ASCII.hxx @@ -33,7 +33,8 @@ #include "StringView.hxx" #include "Compiler.h" -#include +#include + #include /** diff --git a/src/util/AllocatedArray.hxx b/src/util/AllocatedArray.hxx index f05460d24..7444113ea 100644 --- a/src/util/AllocatedArray.hxx +++ b/src/util/AllocatedArray.hxx @@ -35,8 +35,7 @@ #include "Compiler.h" #include - -#include +#include /** * An array allocated on the heap with a length determined at runtime. diff --git a/src/util/ByteReverse.cxx b/src/util/ByteReverse.cxx index 89c15c08c..f2c8b9dc7 100644 --- a/src/util/ByteReverse.cxx +++ b/src/util/ByteReverse.cxx @@ -21,7 +21,7 @@ #include "util/ByteOrder.hxx" #include "Compiler.h" -#include +#include void reverse_bytes_16(uint16_t *gcc_restrict dest, diff --git a/src/util/CircularBuffer.hxx b/src/util/CircularBuffer.hxx index 0a058c19a..bff34113c 100644 --- a/src/util/CircularBuffer.hxx +++ b/src/util/CircularBuffer.hxx @@ -32,7 +32,8 @@ #include "WritableBuffer.hxx" -#include +#include + #include /** diff --git a/src/util/ConstBuffer.hxx b/src/util/ConstBuffer.hxx index b60ced4bc..80fdf4dcc 100644 --- a/src/util/ConstBuffer.hxx +++ b/src/util/ConstBuffer.hxx @@ -35,7 +35,7 @@ #include #ifndef NDEBUG -#include +#include #endif template diff --git a/src/util/DivideString.hxx b/src/util/DivideString.hxx index 805cbb5e0..eeeffd208 100644 --- a/src/util/DivideString.hxx +++ b/src/util/DivideString.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DIVIDE_STRING_HXX #define MPD_DIVIDE_STRING_HXX -#include +#include /** * Split a given constant string at a separator character. Duplicates diff --git a/src/util/ForeignFifoBuffer.hxx b/src/util/ForeignFifoBuffer.hxx index aca299323..d6912d3c2 100644 --- a/src/util/ForeignFifoBuffer.hxx +++ b/src/util/ForeignFifoBuffer.hxx @@ -32,12 +32,10 @@ #include "WritableBuffer.hxx" -#include #include - +#include #include - -#include +#include /** * A first-in-first-out buffer: you can append data at the end, and diff --git a/src/util/LazyRandomEngine.hxx b/src/util/LazyRandomEngine.hxx index 6875250a0..5d6219c88 100644 --- a/src/util/LazyRandomEngine.hxx +++ b/src/util/LazyRandomEngine.hxx @@ -20,10 +20,9 @@ #ifndef MPD_LAZY_RANDOM_ENGINE_HXX #define MPD_LAZY_RANDOM_ENGINE_HXX +#include #include -#include - /** * A random engine that will be created and seeded on demand. */ diff --git a/src/util/Manual.hxx b/src/util/Manual.hxx index b6ad7d072..78006ff74 100644 --- a/src/util/Manual.hxx +++ b/src/util/Manual.hxx @@ -30,11 +30,10 @@ #ifndef MANUAL_HXX #define MANUAL_HXX +#include #include #include -#include - #if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wstrict-aliasing" diff --git a/src/util/NumberParser.hxx b/src/util/NumberParser.hxx index 12a1040ec..c84c96ef5 100644 --- a/src/util/NumberParser.hxx +++ b/src/util/NumberParser.hxx @@ -31,7 +31,8 @@ #ifndef NUMBER_PARSER_HXX #define NUMBER_PARSER_HXX -#include +#include + #include #include diff --git a/src/util/OptionDef.hxx b/src/util/OptionDef.hxx index 30a47e0e1..f831ceb2a 100644 --- a/src/util/OptionDef.hxx +++ b/src/util/OptionDef.hxx @@ -20,7 +20,7 @@ #ifndef MPD_UTIL_OPTIONDEF_HXX #define MPD_UTIL_OPTIONDEF_HXX -#include +#include /** * Command line option definition. diff --git a/src/util/PeakBuffer.cxx b/src/util/PeakBuffer.cxx index afa3bfb86..33a37b329 100644 --- a/src/util/PeakBuffer.cxx +++ b/src/util/PeakBuffer.cxx @@ -21,8 +21,8 @@ #include "DynamicFifoBuffer.hxx" #include +#include -#include #include PeakBuffer::~PeakBuffer() diff --git a/src/util/SliceBuffer.hxx b/src/util/SliceBuffer.hxx index a5c6f0e83..30c4c4c4c 100644 --- a/src/util/SliceBuffer.hxx +++ b/src/util/SliceBuffer.hxx @@ -23,10 +23,10 @@ #include "HugeAllocator.hxx" #include "Compiler.h" -#include +#include #include +#include -#include #include /** diff --git a/src/util/SparseBuffer.hxx b/src/util/SparseBuffer.hxx index d051c53e7..bac29115d 100644 --- a/src/util/SparseBuffer.hxx +++ b/src/util/SparseBuffer.hxx @@ -34,10 +34,9 @@ #include "ConstBuffer.hxx" #include "WritableBuffer.hxx" +#include #include -#include - /** * Helper class for #SparseBuffer which describes which portions of * the buffer have "known" data. diff --git a/src/util/StaticFifoBuffer.hxx b/src/util/StaticFifoBuffer.hxx index 968b6b330..6b7f6d005 100644 --- a/src/util/StaticFifoBuffer.hxx +++ b/src/util/StaticFifoBuffer.hxx @@ -32,11 +32,10 @@ #include "WritableBuffer.hxx" -#include #include +#include #include - -#include +#include /** * A first-in-first-out buffer: you can append data at the end, and diff --git a/src/util/StringUtil.cxx b/src/util/StringUtil.cxx index 47b12023a..872fa70d8 100644 --- a/src/util/StringUtil.cxx +++ b/src/util/StringUtil.cxx @@ -22,7 +22,7 @@ #include "CharUtil.hxx" #include "ASCII.hxx" -#include +#include bool StringArrayContainsCase(const char *const*haystack, diff --git a/src/util/UriRelative.cxx b/src/util/UriRelative.cxx index 5a003143c..619afa812 100644 --- a/src/util/UriRelative.cxx +++ b/src/util/UriRelative.cxx @@ -32,7 +32,8 @@ #include "StringAPI.hxx" #include "StringCompare.hxx" -#include +#include + #include bool diff --git a/src/util/UriUtil.cxx b/src/util/UriUtil.cxx index 09ebafbd7..d962934a5 100644 --- a/src/util/UriUtil.cxx +++ b/src/util/UriUtil.cxx @@ -30,7 +30,8 @@ #include "UriUtil.hxx" #include "ASCII.hxx" -#include +#include + #include static const char * diff --git a/src/util/WritableBuffer.hxx b/src/util/WritableBuffer.hxx index c6a579fc3..3fc8ed890 100644 --- a/src/util/WritableBuffer.hxx +++ b/src/util/WritableBuffer.hxx @@ -36,7 +36,7 @@ #include #ifndef NDEBUG -#include +#include #endif template diff --git a/test/ContainerScan.cxx b/test/ContainerScan.cxx index 45d4a0ed6..5a7cc41df 100644 --- a/test/ContainerScan.cxx +++ b/test/ContainerScan.cxx @@ -28,9 +28,9 @@ #include "util/PrintException.hxx" #include "util/UriExtract.hxx" +#include #include -#include #include #include #include diff --git a/test/RunChromaprint.cxx b/test/RunChromaprint.cxx index d3c278ac4..0554f25d6 100644 --- a/test/RunChromaprint.cxx +++ b/test/RunChromaprint.cxx @@ -34,9 +34,9 @@ #include "Log.hxx" #include "LogBackend.hxx" +#include #include -#include #include #include #include diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx index 9823cef8d..2afbb4c26 100644 --- a/test/read_mixer.cxx +++ b/test/read_mixer.cxx @@ -25,7 +25,8 @@ #include "config/Block.hxx" #include "util/PrintException.hxx" -#include +#include + #include const FilterPlugin * diff --git a/test/read_tags.cxx b/test/read_tags.cxx index 5ddaf038a..c47c37665 100644 --- a/test/read_tags.cxx +++ b/test/read_tags.cxx @@ -33,9 +33,9 @@ #include "util/StringView.hxx" #include "util/PrintException.hxx" +#include #include -#include #include #include #include diff --git a/test/run_convert.cxx b/test/run_convert.cxx index 0e0617617..9162c97ce 100644 --- a/test/run_convert.cxx +++ b/test/run_convert.cxx @@ -36,9 +36,9 @@ #include "Log.hxx" #include "LogBackend.hxx" +#include #include -#include #include #include #include diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx index 0a31fe28b..8b8e6ef61 100644 --- a/test/run_decoder.cxx +++ b/test/run_decoder.cxx @@ -33,9 +33,9 @@ #include "Log.hxx" #include "LogBackend.hxx" +#include #include -#include #include #include #include diff --git a/test/run_filter.cxx b/test/run_filter.cxx index b5b75dc56..7fd2ce327 100644 --- a/test/run_filter.cxx +++ b/test/run_filter.cxx @@ -33,10 +33,10 @@ #include "util/RuntimeError.hxx" #include "util/PrintException.hxx" +#include #include #include -#include #include #include #include diff --git a/test/run_output.cxx b/test/run_output.cxx index 30344158c..232c94d38 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -30,9 +30,9 @@ #include "util/ScopeExit.hxx" #include "util/PrintException.hxx" +#include #include -#include #include #include #include diff --git a/test/test_vorbis_encoder.cxx b/test/test_vorbis_encoder.cxx index 69f1c61da..cf768f1f6 100644 --- a/test/test_vorbis_encoder.cxx +++ b/test/test_vorbis_encoder.cxx @@ -28,9 +28,9 @@ #include "tag/Builder.hxx" #include "util/PrintException.hxx" +#include #include -#include #include static uint8_t zero[256];