diff --git a/Makefile.am b/Makefile.am
index 7ce7f06dcd396c836dbcc4ec28a2ae616a703a38..30ba26786cc4193165a3112b1b7a704b14567040 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,7 +79,6 @@ libmpd_a_SOURCES = \
$(OUTPUT_API_SRC) \
$(MIXER_API_SRC) \
src/check.h \
- src/Compiler.h \
src/open.h \
src/protocol/Ack.cxx src/protocol/Ack.hxx \
src/protocol/ArgParser.cxx src/protocol/ArgParser.hxx \
@@ -505,6 +504,7 @@ endif
# Generic utility library
libutil_a_SOURCES = \
+ src/Compiler.h \
src/util/Exception.cxx src/util/Exception.hxx \
src/util/RuntimeError.hxx \
src/util/Macros.hxx \
diff --git a/src/AudioFormat.hxx b/src/AudioFormat.hxx
index d9848308552197244772c6ab083422073964ef73..8b0ffb557ee341a3035387617a062ac9fde8d892 100644
--- a/src/AudioFormat.hxx
+++ b/src/AudioFormat.hxx
@@ -21,7 +21,7 @@
#define MPD_AUDIO_FORMAT_HXX
#include "pcm/SampleFormat.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdint.h>
#include <stddef.h>
diff --git a/src/IdleFlags.hxx b/src/IdleFlags.hxx
index ab253f092d918a059fa73ae5e11e2d1fc997774f..25742737aba99dc11ab1b60cfd1c208322658cdd 100644
--- a/src/IdleFlags.hxx
+++ b/src/IdleFlags.hxx
@@ -25,7 +25,7 @@
#ifndef MPD_IDLE_FLAGS_HXX
#define MPD_IDLE_FLAGS_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
/** song database has been updated*/
static constexpr unsigned IDLE_DATABASE = 0x1;
diff --git a/src/Instance.hxx b/src/Instance.hxx
index 6b1e6d87aaf047b2424a042ae822469a6c0b3fb9..4b9604dcb7f5b114f5389560610ca5a9ad35241d 100644
--- a/src/Instance.hxx
+++ b/src/Instance.hxx
@@ -24,7 +24,7 @@
#include "event/Loop.hxx"
#include "event/Thread.hxx"
#include "event/MaskMonitor.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#ifdef ENABLE_SYSTEMD_DAEMON
#include "lib/systemd/Watchdog.hxx"
diff --git a/src/LocateUri.hxx b/src/LocateUri.hxx
index 71c01806144456dc319316fafc9d9490d333312c..b1f561520989c275a2d92c99e2202e4e56d697e1 100644
--- a/src/LocateUri.hxx
+++ b/src/LocateUri.hxx
@@ -21,7 +21,7 @@
#define MPD_LOCATE_URI_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "fs/AllocatedPath.hxx"
#ifdef _WIN32
diff --git a/src/Log.hxx b/src/Log.hxx
index a57fccd657d457caac7695dde3a6681a92b2296f..25da072ba59282c86110403d97eab13408e69f8d 100644
--- a/src/Log.hxx
+++ b/src/Log.hxx
@@ -21,7 +21,7 @@
#define MPD_LOG_HXX
#include "LogLevel.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <exception>
diff --git a/src/Mapper.hxx b/src/Mapper.hxx
index 55731a6d81340a241e500c3b0a95a197002ff365..e0563c835586004424692813cd8c8598de69fa74 100644
--- a/src/Mapper.hxx
+++ b/src/Mapper.hxx
@@ -26,7 +26,7 @@
#include <string>
-#include "Compiler.h"
+#include "util/Compiler.h"
#define PLAYLIST_FILE_SUFFIX ".m3u"
diff --git a/src/MixRampInfo.hxx b/src/MixRampInfo.hxx
index c5caf241f3c79957fea6aa1cd721df15f5709d5b..0c408ecbf2b332b91981e5bf2923c048ffc4eb8f 100644
--- a/src/MixRampInfo.hxx
+++ b/src/MixRampInfo.hxx
@@ -21,7 +21,7 @@
#define MPD_MIX_RAMP_INFO_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
diff --git a/src/MusicPipe.hxx b/src/MusicPipe.hxx
index e4546ed44fd11849d45c8bfa436717b2bdba03ad..e1c44377e808aeca6a5debb66f75dd9abb8724af 100644
--- a/src/MusicPipe.hxx
+++ b/src/MusicPipe.hxx
@@ -22,7 +22,7 @@
#include "MusicChunkPtr.hxx"
#include "thread/Mutex.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#ifndef NDEBUG
#include "AudioFormat.hxx"
diff --git a/src/Partition.hxx b/src/Partition.hxx
index e2e15351d82798c073165e8f10f0c964af738f5b..83a0ec69ab88f3bb56ae00cf9e755b3b9305716c 100644
--- a/src/Partition.hxx
+++ b/src/Partition.hxx
@@ -30,7 +30,7 @@
#include "ReplayGainMode.hxx"
#include "SingleMode.hxx"
#include "Chrono.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
#include <memory>
diff --git a/src/ReplayGainInfo.hxx b/src/ReplayGainInfo.hxx
index 4cdbbc0c6db8cd16887f335739dae65a9a439d1e..0cf1d700abc929e4e194f1ed830b6de8206a9d7d 100644
--- a/src/ReplayGainInfo.hxx
+++ b/src/ReplayGainInfo.hxx
@@ -21,7 +21,7 @@
#define MPD_REPLAY_GAIN_INFO_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "ReplayGainMode.hxx"
struct ReplayGainConfig;
diff --git a/src/ReplayGainMode.hxx b/src/ReplayGainMode.hxx
index 885151704e6b135d1d24088f12dd748e35335dcd..789d86007c7ad05ac1d85495dfd347217c28e4c8 100644
--- a/src/ReplayGainMode.hxx
+++ b/src/ReplayGainMode.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_REPLAY_GAIN_MODE_HXX
#define MPD_REPLAY_GAIN_MODE_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdint.h>
diff --git a/src/SingleMode.hxx b/src/SingleMode.hxx
index e7a74080047c121f621a14a69c296d273f43e6ae..1cb109f8816da97826b51c63f91e6f4fb3e604a5 100644
--- a/src/SingleMode.hxx
+++ b/src/SingleMode.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_SINGLE_MODE_HXX
#define MPD_SINGLE_MODE_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdint.h>
diff --git a/src/SongLoader.hxx b/src/SongLoader.hxx
index ffb337ab9143a7ec27b511a11a90ea1cf1cd995e..252eebcfc02237e1da73763b2448ee421c4ec409 100644
--- a/src/SongLoader.hxx
+++ b/src/SongLoader.hxx
@@ -21,7 +21,7 @@
#define MPD_SONG_LOADER_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <cstddef>
diff --git a/src/StateFile.hxx b/src/StateFile.hxx
index de5b994d0a24e376ef5d877a7d91da02cb9dfa82..b577603bedba45e1e616673fd6ea13cfbf0ecb1d 100644
--- a/src/StateFile.hxx
+++ b/src/StateFile.hxx
@@ -23,7 +23,7 @@
#include "StateFileConfig.hxx"
#include "event/TimerEvent.hxx"
#include "fs/AllocatedPath.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
#include <chrono>
diff --git a/src/android/Environment.hxx b/src/android/Environment.hxx
index b3642577077eec852b3d54282fba7ef158613151..89d37d7afc7121e02b1e0aa5dd18403801f367f7 100644
--- a/src/android/Environment.hxx
+++ b/src/android/Environment.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_ANDROID_ENVIRONMENT_HXX
#define MPD_ANDROID_ENVIRONMENT_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <jni.h>
diff --git a/src/client/Client.hxx b/src/client/Client.hxx
index 457ea746b05e34a8116a6c8e52841966dfb88454..7edbc97c418e1f0cec0d1cecfc7b64e05177e4cb 100644
--- a/src/client/Client.hxx
+++ b/src/client/Client.hxx
@@ -26,7 +26,7 @@
#include "tag/Mask.hxx"
#include "event/FullyBufferedSocket.hxx"
#include "event/TimerEvent.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <boost/intrusive/link_mode.hpp>
#include <boost/intrusive/list_hook.hpp>
diff --git a/src/client/ClientMessage.hxx b/src/client/ClientMessage.hxx
index 1da871a604ad0d256d0a2f3de93d04318635b090..41366d184645d52e566054321d3beefb32a6210a 100644
--- a/src/client/ClientMessage.hxx
+++ b/src/client/ClientMessage.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_CLIENT_MESSAGE_HXX
#define MPD_CLIENT_MESSAGE_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
diff --git a/src/client/Response.hxx b/src/client/Response.hxx
index ffe4720f4b9d4a66de4f31c608f68365bd0d0b89..2418e7d5121c4267f38adac262970fcd6a3ce4b0 100644
--- a/src/client/Response.hxx
+++ b/src/client/Response.hxx
@@ -22,7 +22,7 @@
#include "check.h"
#include "protocol/Ack.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stddef.h>
#include <stdarg.h>
diff --git a/src/command/NeighborCommands.hxx b/src/command/NeighborCommands.hxx
index 9c383c599d1a51678728e5ccdcb25bf9f7133099..574f431325f82b9c9f981eff4c99136516cd29b9 100644
--- a/src/command/NeighborCommands.hxx
+++ b/src/command/NeighborCommands.hxx
@@ -21,7 +21,7 @@
#define MPD_NEIGHBOR_COMMANDS_HXX
#include "CommandResult.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct Instance;
class Client;
diff --git a/src/command/PlaylistCommands.hxx b/src/command/PlaylistCommands.hxx
index 9a787a7d2436af73d94a957f78321fa204debeef..97746469a8b216ab300686e4eda451f72a026a8b 100644
--- a/src/command/PlaylistCommands.hxx
+++ b/src/command/PlaylistCommands.hxx
@@ -21,7 +21,7 @@
#define MPD_PLAYLIST_COMMANDS_HXX
#include "CommandResult.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
class Client;
class Request;
diff --git a/src/config/Block.hxx b/src/config/Block.hxx
index 035d8c39529fa459d7ff0bc0b8d678fcb9161959..e20f001166de706853ec78206f2244c0429d98a2 100644
--- a/src/config/Block.hxx
+++ b/src/config/Block.hxx
@@ -22,7 +22,7 @@
#include "check.h"
#include "Param.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
#include <vector>
diff --git a/src/config/Check.hxx b/src/config/Check.hxx
index 5f23b2198a94c186ccad58e59cf94543d25a0066..ca6bf5a7dc2c667e47dae4a8b356521eddfb7728 100644
--- a/src/config/Check.hxx
+++ b/src/config/Check.hxx
@@ -21,7 +21,7 @@
#define MPD_CONFIG_CHECK_HXX
#include "Option.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct ConfigData;
diff --git a/src/config/Option.hxx b/src/config/Option.hxx
index 6a66fff39c86033f4307b33b82717d7d326a2c27..d98fab1a00f53b90f988b674d57ea5df36829490 100644
--- a/src/config/Option.hxx
+++ b/src/config/Option.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_CONFIG_OPTION_HXX
#define MPD_CONFIG_OPTION_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#if defined(_WIN32) && CLANG_OR_GCC_VERSION(4,7)
/* "INPUT" is declared by winuser.h */
diff --git a/src/config/Param.hxx b/src/config/Param.hxx
index d7be49a551f3ad9459c450126347919b2d19b2f4..bd0cefb5a179a6dd0a7f8976220ac1fc4d0ad161 100644
--- a/src/config/Param.hxx
+++ b/src/config/Param.hxx
@@ -21,7 +21,7 @@
#define MPD_CONFIG_PARAM_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
diff --git a/src/db/Count.hxx b/src/db/Count.hxx
index d31d39cd5c3300783747f9354e28d916be2037ae..c8f855177e889a8fcaf34ebf66c04455d63081cd 100644
--- a/src/db/Count.hxx
+++ b/src/db/Count.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_DB_COUNT_HXX
#define MPD_DB_COUNT_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdint.h>
diff --git a/src/db/DatabaseGlue.hxx b/src/db/DatabaseGlue.hxx
index 19ab87345d203565dc7c76870d4d96540a68718b..de1fb4a7a85c101eaaa668d3c5c1b962631f3a0b 100644
--- a/src/db/DatabaseGlue.hxx
+++ b/src/db/DatabaseGlue.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_DATABASE_GLUE_HXX
#define MPD_DATABASE_GLUE_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
struct ConfigBlock;
class EventLoop;
diff --git a/src/db/DatabaseLock.hxx b/src/db/DatabaseLock.hxx
index 4bcb17bc00b810276cc70304b5508426a09be277..357cdd31c95a5008f1c8e8873f41c6968840c0fc 100644
--- a/src/db/DatabaseLock.hxx
+++ b/src/db/DatabaseLock.hxx
@@ -28,7 +28,7 @@
#include "check.h"
#include "thread/Mutex.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <assert.h>
diff --git a/src/db/DatabasePlaylist.hxx b/src/db/DatabasePlaylist.hxx
index cdfb490a2fef008b9f89433ddd6a29a37efffdab..abf9dc10d2b54b5de09efce3dc8d37cf8c8170f8 100644
--- a/src/db/DatabasePlaylist.hxx
+++ b/src/db/DatabasePlaylist.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_DATABASE_PLAYLIST_HXX
#define MPD_DATABASE_PLAYLIST_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
class Database;
class Storage;
diff --git a/src/db/DatabaseSong.hxx b/src/db/DatabaseSong.hxx
index 283c7ae5d6be06de9a1d43c4f9325ad61435ed5b..4e5ad4ea267eaaef5abb9e8044fc1382a619a58d 100644
--- a/src/db/DatabaseSong.hxx
+++ b/src/db/DatabaseSong.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_DATABASE_SONG_HXX
#define MPD_DATABASE_SONG_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
struct LightSong;
class Database;
diff --git a/src/db/Interface.hxx b/src/db/Interface.hxx
index 56cfcb82e4bf22f3c35a2451a593b8adce944e27..a8db2b12a9c6217d69211211c0a162a486df7d79 100644
--- a/src/db/Interface.hxx
+++ b/src/db/Interface.hxx
@@ -22,7 +22,7 @@
#include "Visitor.hxx"
#include "tag/Type.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <chrono>
diff --git a/src/db/LightDirectory.hxx b/src/db/LightDirectory.hxx
index e066a1fbc9b0ae9063b62fe8c339f811f969987f..1e74f815aab83c5145642f3e0f659cf4ecf1732b 100644
--- a/src/db/LightDirectory.hxx
+++ b/src/db/LightDirectory.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_LIGHT_DIRECTORY_HXX
#define MPD_LIGHT_DIRECTORY_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
diff --git a/src/db/PlaylistInfo.hxx b/src/db/PlaylistInfo.hxx
index 6874a2b6cf1f5e4603365869328c029074509b8b..e9a97b68274aa6fab0d67f08d04047b19a02af85 100644
--- a/src/db/PlaylistInfo.hxx
+++ b/src/db/PlaylistInfo.hxx
@@ -21,7 +21,7 @@
#define MPD_PLAYLIST_INFO_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
#include <chrono>
diff --git a/src/db/PlaylistVector.hxx b/src/db/PlaylistVector.hxx
index 9075706f3c2282f04c00cf2d2fbf86f8c6f099ce..260211c9ecee04c4d828ffbdc144860d9dff51a6 100644
--- a/src/db/PlaylistVector.hxx
+++ b/src/db/PlaylistVector.hxx
@@ -21,7 +21,7 @@
#define MPD_PLAYLIST_VECTOR_HXX
#include "db/PlaylistInfo.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <list>
diff --git a/src/db/Registry.hxx b/src/db/Registry.hxx
index 71f107c428785aafacf43b497cd9b0e813240659..eb2cea468d360f63980486e453b621f35ded6123 100644
--- a/src/db/Registry.hxx
+++ b/src/db/Registry.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_DATABASE_REGISTRY_HXX
#define MPD_DATABASE_REGISTRY_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
struct DatabasePlugin;
diff --git a/src/db/Selection.hxx b/src/db/Selection.hxx
index 633f858c579255d95375522215c86dc69cf4877b..9a6e0bcd9f6f2ec84f13109d27160519f3aa8808 100644
--- a/src/db/Selection.hxx
+++ b/src/db/Selection.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_DATABASE_SELECTION_HXX
#define MPD_DATABASE_SELECTION_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx
index 1a21f32c09cbe3ca86e38ea1ebb3dcb85d0732c9..2920e204c9888398a8ddb051ddc3b5c89fb1a8d9 100644
--- a/src/db/plugins/ProxyDatabasePlugin.cxx
+++ b/src/db/plugins/ProxyDatabasePlugin.cxx
@@ -32,7 +32,7 @@
#include "song/UriSongFilter.hxx"
#include "song/BaseSongFilter.hxx"
#include "song/TagSongFilter.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "config/Block.hxx"
#include "tag/Builder.hxx"
#include "tag/Tag.hxx"
diff --git a/src/db/plugins/simple/Directory.hxx b/src/db/plugins/simple/Directory.hxx
index 4a6fcd0a9e3e8de3d4cf22f1205bc06a739be74c..0dc2d337abee9aaebfd100a3fcd366e36d5ec18f 100644
--- a/src/db/plugins/simple/Directory.hxx
+++ b/src/db/plugins/simple/Directory.hxx
@@ -21,7 +21,7 @@
#define MPD_DIRECTORY_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "db/Visitor.hxx"
#include "db/PlaylistVector.hxx"
#include "Song.hxx"
diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.hxx b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
index be5919c00f83241b6783d1d9c48542c8cb7fa3cf..ab9c77ab2b6a6fb6276d0e04a4d980d7b5aa2532 100644
--- a/src/db/plugins/simple/SimpleDatabasePlugin.hxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
@@ -25,7 +25,7 @@
#include "fs/AllocatedPath.hxx"
#include "song/LightSong.hxx"
#include "util/Manual.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <cassert>
diff --git a/src/db/plugins/simple/Song.hxx b/src/db/plugins/simple/Song.hxx
index 1cd344f9f0d2f5d2316efa1a2f11f0b936939a0c..073748500b643caec67545f1886df41b6b796713 100644
--- a/src/db/plugins/simple/Song.hxx
+++ b/src/db/plugins/simple/Song.hxx
@@ -24,7 +24,7 @@
#include "Chrono.hxx"
#include "tag/Tag.hxx"
#include "AudioFormat.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <boost/intrusive/list.hpp>
diff --git a/src/db/plugins/upnp/Directory.hxx b/src/db/plugins/upnp/Directory.hxx
index 23d01039cd1d08d4c9038626a69ad0936447261b..52988ef3f3d9346c7683089c15e95236afc54e29 100644
--- a/src/db/plugins/upnp/Directory.hxx
+++ b/src/db/plugins/upnp/Directory.hxx
@@ -21,7 +21,7 @@
#define MPD_UPNP_DIRECTORY_HXX
#include "Object.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
#include <vector>
diff --git a/src/db/plugins/upnp/Object.hxx b/src/db/plugins/upnp/Object.hxx
index a234e842a13f69b7dda8414448b963bc935f8616..c65b81398abd9d7d845ce8226befbec080ecee59 100644
--- a/src/db/plugins/upnp/Object.hxx
+++ b/src/db/plugins/upnp/Object.hxx
@@ -21,7 +21,7 @@
#define MPD_UPNP_OBJECT_HXX
#include "tag/Tag.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
diff --git a/src/db/update/Editor.hxx b/src/db/update/Editor.hxx
index a422b1542d9fc11b5f7be10f2b2bb558fe5fc4e0..2567847b46089133c11490d27328ca35f3ff94c7 100644
--- a/src/db/update/Editor.hxx
+++ b/src/db/update/Editor.hxx
@@ -22,7 +22,7 @@
#include "check.h"
#include "Remove.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct Directory;
struct Song;
diff --git a/src/db/update/ExcludeList.hxx b/src/db/update/ExcludeList.hxx
index 4a851a7dc95b866d4242e7ba3a3a0d05916838cf..ada5c1b885fce7e92e71e8ba87ab2a87a4bf3810 100644
--- a/src/db/update/ExcludeList.hxx
+++ b/src/db/update/ExcludeList.hxx
@@ -26,7 +26,7 @@
#define MPD_EXCLUDE_H
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "fs/Glob.hxx"
#include "input/Ptr.hxx"
diff --git a/src/db/update/InotifySource.hxx b/src/db/update/InotifySource.hxx
index a1c8a0374aaf6c4fa3c77ef02c8782310a7c6433..8478b6ddf7b40a281322b2dcace92a8fa5130be1 100644
--- a/src/db/update/InotifySource.hxx
+++ b/src/db/update/InotifySource.hxx
@@ -21,7 +21,7 @@
#define MPD_INOTIFY_SOURCE_HXX
#include "event/SocketMonitor.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
class FileDescriptor;
diff --git a/src/db/update/InotifyUpdate.hxx b/src/db/update/InotifyUpdate.hxx
index a58a38dcd013997820f0f506beb9c4c5d5e58609..6004b061b0f5cc0100a861d9d49f13591cacbb06 100644
--- a/src/db/update/InotifyUpdate.hxx
+++ b/src/db/update/InotifyUpdate.hxx
@@ -21,7 +21,7 @@
#define MPD_INOTIFY_UPDATE_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
class EventLoop;
class Storage;
diff --git a/src/db/update/Queue.hxx b/src/db/update/Queue.hxx
index 63a7acbc645b386e41a775878c33e183878937c6..8bffad9a42195bc4080c53aa313da5fd77854488 100644
--- a/src/db/update/Queue.hxx
+++ b/src/db/update/Queue.hxx
@@ -21,7 +21,7 @@
#define MPD_UPDATE_QUEUE_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
#include <list>
diff --git a/src/db/update/Remove.hxx b/src/db/update/Remove.hxx
index d34fa20491674c5e87942048b3ccdd24f6e60112..cbcbdbe2152506f9c9579a6826772c0c60aef6d0 100644
--- a/src/db/update/Remove.hxx
+++ b/src/db/update/Remove.hxx
@@ -23,7 +23,7 @@
#include "check.h"
#include "event/DeferEvent.hxx"
#include "thread/Mutex.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <forward_list>
#include <string>
diff --git a/src/db/update/Service.hxx b/src/db/update/Service.hxx
index 3f628477246161e22e769d532d966526ad9ab662..2872b6b3a5baf36c0a74fc3cba4d397fb260343e 100644
--- a/src/db/update/Service.hxx
+++ b/src/db/update/Service.hxx
@@ -25,7 +25,7 @@
#include "Queue.hxx"
#include "event/DeferEvent.hxx"
#include "thread/Thread.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
class SimpleDatabase;
class DatabaseListener;
diff --git a/src/db/update/UpdateIO.hxx b/src/db/update/UpdateIO.hxx
index b9f43105a384f640b3c1b4c2c3a5002e53681d8b..3acc167a06c87a3798e724371701d697842b982d 100644
--- a/src/db/update/UpdateIO.hxx
+++ b/src/db/update/UpdateIO.hxx
@@ -21,7 +21,7 @@
#define MPD_UPDATE_IO_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct Directory;
struct StorageFileInfo;
diff --git a/src/db/update/Walk.hxx b/src/db/update/Walk.hxx
index d16f5325e64673f59af99bf7d666fe29228a9d7b..4b04f16a7e77730fcc2dfbbcd34dee319c9ac5ad 100644
--- a/src/db/update/Walk.hxx
+++ b/src/db/update/Walk.hxx
@@ -23,7 +23,7 @@
#include "check.h"
#include "Config.hxx"
#include "Editor.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <atomic>
diff --git a/src/decoder/Client.hxx b/src/decoder/Client.hxx
index c1a702047a46270c7131ec780d6c83580b785846..5abf4338146c12273400968023e9c0185541fdba 100644
--- a/src/decoder/Client.hxx
+++ b/src/decoder/Client.hxx
@@ -24,7 +24,7 @@
#include "DecoderCommand.hxx"
#include "Chrono.hxx"
#include "input/Ptr.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdint.h>
diff --git a/src/decoder/DecoderBuffer.hxx b/src/decoder/DecoderBuffer.hxx
index a7ba2f85f6dee7f76a17e540e7336a475247b184..8a70f068b8b589bd7aa13f11ae50f9dc23f753d6 100644
--- a/src/decoder/DecoderBuffer.hxx
+++ b/src/decoder/DecoderBuffer.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_DECODER_BUFFER_HXX
#define MPD_DECODER_BUFFER_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "util/DynamicFifoBuffer.hxx"
#include "util/ConstBuffer.hxx"
diff --git a/src/decoder/DecoderList.hxx b/src/decoder/DecoderList.hxx
index bbb42d4bb2ff4b4289d92027795f19d4a51546cf..fd466ccf7feab81b0ea4430593588bb594db57dc 100644
--- a/src/decoder/DecoderList.hxx
+++ b/src/decoder/DecoderList.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_DECODER_LIST_HXX
#define MPD_DECODER_LIST_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
struct ConfigData;
struct DecoderPlugin;
diff --git a/src/decoder/DecoderPlugin.hxx b/src/decoder/DecoderPlugin.hxx
index d41086d8b3ab487fff4ee9ec5e387e1d7c60890c..40419bea5a60f2c334f40a6b46566ab1c95e3a75 100644
--- a/src/decoder/DecoderPlugin.hxx
+++ b/src/decoder/DecoderPlugin.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_DECODER_PLUGIN_HXX
#define MPD_DECODER_PLUGIN_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <forward_list>
diff --git a/src/decoder/Reader.hxx b/src/decoder/Reader.hxx
index 40542ae43502e92af6f23ff38cc2d66293310161..724622451093bdd9b7cf126c647af587d4e2d7b5 100644
--- a/src/decoder/Reader.hxx
+++ b/src/decoder/Reader.hxx
@@ -22,7 +22,7 @@
#include "check.h"
#include "fs/io/Reader.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
class DecoderClient;
class InputStream;
diff --git a/src/decoder/plugins/DsdLib.hxx b/src/decoder/plugins/DsdLib.hxx
index 06c61e500fe6962909616ff302f066af113612bd..804f78eabfb9f17909953d115261b0ff397e243b 100644
--- a/src/decoder/plugins/DsdLib.hxx
+++ b/src/decoder/plugins/DsdLib.hxx
@@ -22,7 +22,7 @@
#include "system/ByteOrder.hxx"
#include "input/Offset.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdint.h>
diff --git a/src/decoder/plugins/FlacInput.cxx b/src/decoder/plugins/FlacInput.cxx
index 773c83cc91badc7a8657d988b7aee85e94d699e9..e1e49dc869d4e86cd3be67e69d1de102419804b5 100644
--- a/src/decoder/plugins/FlacInput.cxx
+++ b/src/decoder/plugins/FlacInput.cxx
@@ -23,7 +23,7 @@
#include "../DecoderAPI.hxx"
#include "input/InputStream.hxx"
#include "Log.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <exception>
diff --git a/src/encoder/EncoderInterface.hxx b/src/encoder/EncoderInterface.hxx
index b8d610ffcad29dfedc275a2e75c3fcba0799c80a..2ec67749d8b252ed2d56f44243d01e2232592aad 100644
--- a/src/encoder/EncoderInterface.hxx
+++ b/src/encoder/EncoderInterface.hxx
@@ -21,7 +21,7 @@
#define MPD_ENCODER_INTERFACE_HXX
#include "EncoderPlugin.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <assert.h>
#include <stddef.h>
diff --git a/src/encoder/plugins/NullEncoderPlugin.cxx b/src/encoder/plugins/NullEncoderPlugin.cxx
index 10515d42d9ec854d031df91bc382d8f10eb295e8..dd5a6363d65107ab600a5d39fa5bfd4e08c66d9d 100644
--- a/src/encoder/plugins/NullEncoderPlugin.cxx
+++ b/src/encoder/plugins/NullEncoderPlugin.cxx
@@ -21,7 +21,7 @@
#include "NullEncoderPlugin.hxx"
#include "../EncoderAPI.hxx"
#include "util/DynamicFifoBuffer.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
class NullEncoder final : public Encoder {
DynamicFifoBuffer<uint8_t> buffer;
diff --git a/src/event/BufferedSocket.cxx b/src/event/BufferedSocket.cxx
index 03acca2f5340e08785e5494574975a37b72dabad..86c8477a7b4d17e22896a0e18a01decec6c74ebf 100644
--- a/src/event/BufferedSocket.cxx
+++ b/src/event/BufferedSocket.cxx
@@ -20,7 +20,7 @@
#include "config.h"
#include "BufferedSocket.hxx"
#include "net/SocketError.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <algorithm>
diff --git a/src/event/Call.cxx b/src/event/Call.cxx
index 369fe0f7fa4713e304235c0aedc9eb79816dd88e..097e7ab0e94c2ef5565a62ef96233fac8acc336f 100644
--- a/src/event/Call.cxx
+++ b/src/event/Call.cxx
@@ -23,7 +23,7 @@
#include "DeferEvent.hxx"
#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <exception>
diff --git a/src/event/FullyBufferedSocket.cxx b/src/event/FullyBufferedSocket.cxx
index 9fb588931dc65939e8ba95f370a837a070cc0e49..9460d122699f083a03a23807fb88241d5a4e89f5 100644
--- a/src/event/FullyBufferedSocket.cxx
+++ b/src/event/FullyBufferedSocket.cxx
@@ -20,7 +20,7 @@
#include "config.h"
#include "FullyBufferedSocket.hxx"
#include "net/SocketError.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <assert.h>
#include <string.h>
diff --git a/src/event/Loop.hxx b/src/event/Loop.hxx
index 70028f3854055530d50428bf2b149aa3c92b891e..31028efdd846a5da59532ae4ab782f5c455c7a76 100644
--- a/src/event/Loop.hxx
+++ b/src/event/Loop.hxx
@@ -22,7 +22,7 @@
#include "check.h"
#include "thread/Id.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "PollGroup.hxx"
#include "thread/Mutex.hxx"
diff --git a/src/event/MultiSocketMonitor.hxx b/src/event/MultiSocketMonitor.hxx
index f030a7f59a418b7e70deb93424c68d5966052c57..c45175c5afd7e4befe450de175cb55c1dbbd340f 100644
--- a/src/event/MultiSocketMonitor.hxx
+++ b/src/event/MultiSocketMonitor.hxx
@@ -24,7 +24,7 @@
#include "IdleMonitor.hxx"
#include "TimerEvent.hxx"
#include "SocketMonitor.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <forward_list>
#include <iterator>
diff --git a/src/event/PollGroupEPoll.hxx b/src/event/PollGroupEPoll.hxx
index 7a7032b775ba137b8ecd14c5bb00614a483d0fe1..f22ed354354fb98f7bbfa71921adadbcfd82e345 100644
--- a/src/event/PollGroupEPoll.hxx
+++ b/src/event/PollGroupEPoll.hxx
@@ -22,7 +22,7 @@
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "system/EPollFD.hxx"
#include <array>
diff --git a/src/filter/FilterRegistry.hxx b/src/filter/FilterRegistry.hxx
index 02855cd84ae57745fb98fccb7b384f2bcf6365e2..a8a584636f346a9b141e089c09fc3f0ba4bd6d22 100644
--- a/src/filter/FilterRegistry.hxx
+++ b/src/filter/FilterRegistry.hxx
@@ -26,7 +26,7 @@
#ifndef MPD_FILTER_REGISTRY_HXX
#define MPD_FILTER_REGISTRY_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
struct FilterPlugin;
diff --git a/src/filter/plugins/NullFilterPlugin.cxx b/src/filter/plugins/NullFilterPlugin.cxx
index 037be79f46bde6b5867d2c9ac364798861624ae1..17dd335149c95b41f3ddee0717e2e631a37b48de 100644
--- a/src/filter/plugins/NullFilterPlugin.cxx
+++ b/src/filter/plugins/NullFilterPlugin.cxx
@@ -30,7 +30,7 @@
#include "filter/Prepared.hxx"
#include "filter/FilterRegistry.hxx"
#include "AudioFormat.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "util/ConstBuffer.hxx"
class NullFilter final : public Filter {
diff --git a/src/fs/AllocatedPath.cxx b/src/fs/AllocatedPath.cxx
index afae0c8722b32b11e92a4ee109f8ee3328c4c06e..bd5d8478f5b6363bc0ff46e3089f5953e27cfeec 100644
--- a/src/fs/AllocatedPath.cxx
+++ b/src/fs/AllocatedPath.cxx
@@ -21,7 +21,7 @@
#include "AllocatedPath.hxx"
#include "Domain.hxx"
#include "Charset.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <exception>
diff --git a/src/fs/AllocatedPath.hxx b/src/fs/AllocatedPath.hxx
index 5df8939285bc0319e6c0df57df21ef0a4cc6a730..b83d776ccd59977a71a5ec51a3c91f2a610ab910 100644
--- a/src/fs/AllocatedPath.hxx
+++ b/src/fs/AllocatedPath.hxx
@@ -21,7 +21,7 @@
#define MPD_FS_ALLOCATED_PATH_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "Traits.hxx"
#include "Path.hxx"
diff --git a/src/fs/Charset.hxx b/src/fs/Charset.hxx
index de6cc22d0d99f47bae00bb913fe99e37cd1fa6e2..5332b991098bfaf55eb5b9eb44c1f78271c90dce 100644
--- a/src/fs/Charset.hxx
+++ b/src/fs/Charset.hxx
@@ -21,7 +21,7 @@
#define MPD_FS_CHARSET_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "Traits.hxx"
#if (defined(HAVE_ICU) || defined(HAVE_ICONV)) && !defined(_WIN32)
diff --git a/src/fs/Glob.hxx b/src/fs/Glob.hxx
index b15972f0d21b3449872036661802e35eadbc3d27..18176f09468f0e46da2980f11e810d0f055ff9f0 100644
--- a/src/fs/Glob.hxx
+++ b/src/fs/Glob.hxx
@@ -33,7 +33,7 @@
#endif
#ifdef HAVE_CLASS_GLOB
-#include "Compiler.h"
+#include "util/Compiler.h"
/**
* A pattern that matches file names. It may contain shell wildcards
diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx
index eac017389c113f617611a5027026f8a50a910171..8561f459155f4e0684a69e24e784e04cd03d99c9 100644
--- a/src/fs/Path.hxx
+++ b/src/fs/Path.hxx
@@ -21,7 +21,7 @@
#define MPD_FS_PATH_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "Traits.hxx"
#include <string>
diff --git a/src/fs/Traits.hxx b/src/fs/Traits.hxx
index 73339e44461dd3e3c88f3414c12edc3f99610416..a7d088a7f44a2cb1cd4bbf422512cd4f101edf0f 100644
--- a/src/fs/Traits.hxx
+++ b/src/fs/Traits.hxx
@@ -21,7 +21,7 @@
#define MPD_FS_TRAITS_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "util/StringPointer.hxx"
#include "util/StringAPI.hxx"
diff --git a/src/fs/io/AutoGunzipReader.hxx b/src/fs/io/AutoGunzipReader.hxx
index 1e97057315883ed87b4d762b2b13c746014067af..ae9521c7bd6aefab07ea2a95b43e485438da7f27 100644
--- a/src/fs/io/AutoGunzipReader.hxx
+++ b/src/fs/io/AutoGunzipReader.hxx
@@ -22,7 +22,7 @@
#include "check.h"
#include "PeekReader.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
class GunzipReader;
diff --git a/src/fs/io/BufferedOutputStream.hxx b/src/fs/io/BufferedOutputStream.hxx
index c7f29a12ae7221bd7fb3b7ce06ddb8dd2dab3127..0a8fae8642237ab86dfb4f7f09ece2cfc36d311c 100644
--- a/src/fs/io/BufferedOutputStream.hxx
+++ b/src/fs/io/BufferedOutputStream.hxx
@@ -31,7 +31,7 @@
#define BUFFERED_OUTPUT_STREAM_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "util/DynamicFifoBuffer.hxx"
#include <stddef.h>
diff --git a/src/fs/io/BufferedReader.hxx b/src/fs/io/BufferedReader.hxx
index c4c6da80f713ab4cc5f155024cb4394840e97908..01d6f141e8e658131da18a95ea2c461c2107bf40 100644
--- a/src/fs/io/BufferedReader.hxx
+++ b/src/fs/io/BufferedReader.hxx
@@ -21,7 +21,7 @@
#define MPD_BUFFERED_READER_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "util/DynamicFifoBuffer.hxx"
#include <stddef.h>
diff --git a/src/fs/io/FileOutputStream.hxx b/src/fs/io/FileOutputStream.hxx
index 876313b6cc28ca72ad04527cc9d0486d6ff2fe7e..ac4c3342ed0c13d4dc17afb207c03589750a418d 100644
--- a/src/fs/io/FileOutputStream.hxx
+++ b/src/fs/io/FileOutputStream.hxx
@@ -33,7 +33,7 @@
#include "check.h"
#include "OutputStream.hxx"
#include "fs/AllocatedPath.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#ifndef _WIN32
#include "system/FileDescriptor.hxx"
diff --git a/src/fs/io/FileReader.hxx b/src/fs/io/FileReader.hxx
index d4d54564a1e523154af4d14c43b157d97b734868..3904c550cb506ca4a28cdcb5ad63679bd011396a 100644
--- a/src/fs/io/FileReader.hxx
+++ b/src/fs/io/FileReader.hxx
@@ -23,7 +23,7 @@
#include "check.h"
#include "Reader.hxx"
#include "fs/AllocatedPath.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#ifndef _WIN32
#include "system/FileDescriptor.hxx"
diff --git a/src/fs/io/GunzipReader.hxx b/src/fs/io/GunzipReader.hxx
index 100d2bc1c88b72f42b9ba3777321f50154d460fe..18091ee7c542c883b32e86e47cd0784990921c18 100644
--- a/src/fs/io/GunzipReader.hxx
+++ b/src/fs/io/GunzipReader.hxx
@@ -23,7 +23,7 @@
#include "check.h"
#include "Reader.hxx"
#include "util/StaticFifoBuffer.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <zlib.h>
diff --git a/src/fs/io/GzipOutputStream.hxx b/src/fs/io/GzipOutputStream.hxx
index 1051a7e90c57210b2e974377b8005fb36fb25481..99c18fe4606e204ce48a933ebdbe91867ff71a3f 100644
--- a/src/fs/io/GzipOutputStream.hxx
+++ b/src/fs/io/GzipOutputStream.hxx
@@ -32,7 +32,7 @@
#include "check.h"
#include "OutputStream.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <zlib.h>
diff --git a/src/fs/io/PeekReader.hxx b/src/fs/io/PeekReader.hxx
index 367d62f8b0084d2c9aaf3695e5c3e5210c2cdcce..70e91129e38541a8a16971a17620998b7a0ada3f 100644
--- a/src/fs/io/PeekReader.hxx
+++ b/src/fs/io/PeekReader.hxx
@@ -22,7 +22,7 @@
#include "check.h"
#include "Reader.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdint.h>
diff --git a/src/fs/io/Reader.hxx b/src/fs/io/Reader.hxx
index 7040e629c6815cc23ee9b69b2e1c1530ecd51266..868f8cb129140406ee764e2b9e1857e1906a4fe7 100644
--- a/src/fs/io/Reader.hxx
+++ b/src/fs/io/Reader.hxx
@@ -21,7 +21,7 @@
#define MPD_READER_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stddef.h>
diff --git a/src/fs/io/StdioOutputStream.hxx b/src/fs/io/StdioOutputStream.hxx
index d04b7bd37ed9a35d89a30b6f7d2b2332e850a36b..2369d620805533ff9cff540700dd0cb699fba43f 100644
--- a/src/fs/io/StdioOutputStream.hxx
+++ b/src/fs/io/StdioOutputStream.hxx
@@ -32,7 +32,7 @@
#include "check.h"
#include "OutputStream.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdio.h>
diff --git a/src/fs/io/TextFile.hxx b/src/fs/io/TextFile.hxx
index 10cc8aabd176a6fd8bb94d5ffdd13e7d3c7f9146..284b36d1e6496a2f0967bbec557d0b9a664788a0 100644
--- a/src/fs/io/TextFile.hxx
+++ b/src/fs/io/TextFile.hxx
@@ -21,7 +21,7 @@
#define MPD_TEXT_FILE_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
class Path;
class FileReader;
diff --git a/src/input/Error.hxx b/src/input/Error.hxx
index b52b9d06b89cdfd3f7052196f4a7c7010b264450..c857f827e5e06d0f707a7f155db6ac3ac29aad91 100644
--- a/src/input/Error.hxx
+++ b/src/input/Error.hxx
@@ -21,7 +21,7 @@
#define INPUT_ERROR_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <exception>
diff --git a/src/input/IcyInputStream.hxx b/src/input/IcyInputStream.hxx
index 59918a3a4416675a0557f1cbf9431f0d58d6c423..46b524008580698fdd3448d29695b26b51e5fc42 100644
--- a/src/input/IcyInputStream.hxx
+++ b/src/input/IcyInputStream.hxx
@@ -21,7 +21,7 @@
#define MPD_ICY_INPUT_STREAM_HXX
#include "ProxyInputStream.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <memory>
diff --git a/src/input/InputStream.hxx b/src/input/InputStream.hxx
index 331ec96bb6b399ce4ce6d37ef0c479f317e95276..0dad160b5e28dc399c87b56ac700550fba6ee023 100644
--- a/src/input/InputStream.hxx
+++ b/src/input/InputStream.hxx
@@ -24,7 +24,7 @@
#include "Offset.hxx"
#include "Ptr.hxx"
#include "thread/Mutex.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
#include <memory>
diff --git a/src/input/Reader.hxx b/src/input/Reader.hxx
index 9032d372eafd08498a761cb8a5e76bb455ac0245..dae7d2832d47699fc1cc7e7a5230bc33affc4d7d 100644
--- a/src/input/Reader.hxx
+++ b/src/input/Reader.hxx
@@ -22,7 +22,7 @@
#include "check.h"
#include "fs/io/Reader.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct Decoder;
class InputStream;
diff --git a/src/java/Global.hxx b/src/java/Global.hxx
index 49c7bc6f87aaf3a7d8e4f9bce0fb6ee83b26b768..9d341b36c89ccba592548468614864851b25886b 100644
--- a/src/java/Global.hxx
+++ b/src/java/Global.hxx
@@ -30,7 +30,7 @@
#ifndef JAVA_GLOBAL_HXX
#define JAVA_GLOBAL_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <jni.h>
diff --git a/src/lib/alsa/Format.hxx b/src/lib/alsa/Format.hxx
index 145e4b3fc55286b3b74c232ac99c83801ff97c27..9542072fd0e7b49361bb3a9e21d8c79d6295b4e5 100644
--- a/src/lib/alsa/Format.hxx
+++ b/src/lib/alsa/Format.hxx
@@ -22,7 +22,7 @@
#include "check.h"
#include "pcm/SampleFormat.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <alsa/asoundlib.h>
diff --git a/src/lib/alsa/Version.hxx b/src/lib/alsa/Version.hxx
index c69c8bf79975d732058345fabfb7620676e8185c..844607473f20fee662f80414e420b697c4890cd3 100644
--- a/src/lib/alsa/Version.hxx
+++ b/src/lib/alsa/Version.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_ALSA_VERSION_HXX
#define MPD_ALSA_VERSION_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdint.h>
diff --git a/src/lib/curl/Version.hxx b/src/lib/curl/Version.hxx
index c854a0d58a55d39d3d35654f2c5d32e5ee77cd74..9e9a319d34cc52db872523cca98c68b6840bce78 100644
--- a/src/lib/curl/Version.hxx
+++ b/src/lib/curl/Version.hxx
@@ -30,7 +30,7 @@
#ifndef CURL_VERSION_HXX
#define CURL_VERSION_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
gcc_const
bool
diff --git a/src/lib/dbus/Error.hxx b/src/lib/dbus/Error.hxx
index 602dca892f4915d434c5fe3b3d020e0f789a2ef6..9f1deb8f2cc0ba942f1cef8e78ab8950bc09b0a3 100644
--- a/src/lib/dbus/Error.hxx
+++ b/src/lib/dbus/Error.hxx
@@ -33,7 +33,7 @@
#ifndef ODBUS_ERROR_HXX
#define ODBUS_ERROR_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <dbus/dbus.h>
diff --git a/src/lib/dbus/UDisks2.cxx b/src/lib/dbus/UDisks2.cxx
index 18610ecb7078c7455282f5d65e120a13fbaf3452..2476668f45cb115eb75cc82bb60ddf70e4977b28 100644
--- a/src/lib/dbus/UDisks2.cxx
+++ b/src/lib/dbus/UDisks2.cxx
@@ -22,7 +22,7 @@
#include "ReadIter.hxx"
#include "ObjectManager.hxx"
#include "util/StringAPI.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <functional>
diff --git a/src/lib/dbus/Watch.hxx b/src/lib/dbus/Watch.hxx
index 554be2ab80e7f7c28e4df0d1af4819b7a758a536..939793043ce9301eeabe16e069fdf0edf83720f0 100644
--- a/src/lib/dbus/Watch.hxx
+++ b/src/lib/dbus/Watch.hxx
@@ -36,7 +36,7 @@
#include "Connection.hxx"
#include "event/SocketMonitor.hxx"
#include "event/DeferEvent.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <dbus/dbus.h>
diff --git a/src/lib/expat/ExpatParser.hxx b/src/lib/expat/ExpatParser.hxx
index ff91cfb0a013e96c600b0bd0116949fd7952bec4..72736ef98c368e40294160d9f2f8df1936300499 100644
--- a/src/lib/expat/ExpatParser.hxx
+++ b/src/lib/expat/ExpatParser.hxx
@@ -21,7 +21,7 @@
#define MPD_EXPAT_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <expat.h>
diff --git a/src/lib/ffmpeg/Time.hxx b/src/lib/ffmpeg/Time.hxx
index 71f7edd2225574b3a4954855a76fb068f258aa26..cba1fe4c19bc220d8d35b44173305dc383adeba3 100644
--- a/src/lib/ffmpeg/Time.hxx
+++ b/src/lib/ffmpeg/Time.hxx
@@ -21,7 +21,7 @@
#define MPD_FFMPEG_TIME_HXX
#include "Chrono.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
extern "C" {
#include <libavutil/avutil.h>
diff --git a/src/lib/gcrypt/Hash.hxx b/src/lib/gcrypt/Hash.hxx
index 208d6e2476f2c0c58b09b1a1c932bfbbdd0fefcf..0503112d06634bc05b4bd59338c3d8f3e4bab5cc 100644
--- a/src/lib/gcrypt/Hash.hxx
+++ b/src/lib/gcrypt/Hash.hxx
@@ -31,7 +31,7 @@
#define GCRYPT_HASH_HXX
#include "util/ConstBuffer.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <gcrypt.h>
diff --git a/src/lib/gcrypt/MD5.hxx b/src/lib/gcrypt/MD5.hxx
index 478a7ef12b5ac71094c6c5e20ab9c6d980e413fb..03bfb03473776560508ab01e3629fa62b80d4629 100644
--- a/src/lib/gcrypt/MD5.hxx
+++ b/src/lib/gcrypt/MD5.hxx
@@ -31,7 +31,7 @@
#define GCRYPT_MD5_HXX
#include "util/StringBuffer.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <array>
diff --git a/src/lib/icu/CaseFold.hxx b/src/lib/icu/CaseFold.hxx
index eaeaf5689466e13821b384eda423b6c695951c0b..5f13b5b00858b83acbe88a2cd1f7c56ae12d3568 100644
--- a/src/lib/icu/CaseFold.hxx
+++ b/src/lib/icu/CaseFold.hxx
@@ -25,7 +25,7 @@
#if defined(HAVE_ICU) || defined(_WIN32)
#define HAVE_ICU_CASE_FOLD
-#include "Compiler.h"
+#include "util/Compiler.h"
template<typename T> class AllocatedString;
diff --git a/src/lib/icu/Collate.hxx b/src/lib/icu/Collate.hxx
index d22fa6870e5ca787e98f455f7a9830ffb773356e..f7c19ebc2688d07af64be54a8bd854e485020de5 100644
--- a/src/lib/icu/Collate.hxx
+++ b/src/lib/icu/Collate.hxx
@@ -21,7 +21,7 @@
#define MPD_ICU_COLLATE_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
/**
* Throws #std::runtime_error on error.
diff --git a/src/lib/icu/Compare.hxx b/src/lib/icu/Compare.hxx
index d380265082d7199220f3afcd0af2b40202f0071f..f3901fe4e6d842986c69c641ef4b247bda72c287 100644
--- a/src/lib/icu/Compare.hxx
+++ b/src/lib/icu/Compare.hxx
@@ -21,7 +21,7 @@
#define MPD_ICU_COMPARE_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "util/AllocatedString.hxx"
/**
diff --git a/src/lib/icu/Converter.hxx b/src/lib/icu/Converter.hxx
index 7ce545cf67d6fd39522a3398fb86613baf34d652..cdb06dd5a82cba33b427745a440b7aa8b0e76d82 100644
--- a/src/lib/icu/Converter.hxx
+++ b/src/lib/icu/Converter.hxx
@@ -21,7 +21,7 @@
#define MPD_ICU_CONVERTER_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#ifdef HAVE_ICU
#include "thread/Mutex.hxx"
diff --git a/src/lib/icu/Win32.hxx b/src/lib/icu/Win32.hxx
index c3aed87a4b51067501f5d0f7c85a2be7d8ef7629..609680fa281d1b41ace93768ffa8862d3662d0f2 100644
--- a/src/lib/icu/Win32.hxx
+++ b/src/lib/icu/Win32.hxx
@@ -21,7 +21,7 @@
#define MPD_ICU_WIN32_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <wchar.h>
diff --git a/src/lib/nfs/Base.hxx b/src/lib/nfs/Base.hxx
index e3dd6523854d5b9442e007f59f896da8f91eb9b9..9dead5e73183e149b893f8561daf54e415ec8937 100644
--- a/src/lib/nfs/Base.hxx
+++ b/src/lib/nfs/Base.hxx
@@ -21,7 +21,7 @@
#define MPD_NFS_BASE_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
/**
* Set the "base" NFS server and export name. This will be the
diff --git a/src/lib/nfs/Cancellable.hxx b/src/lib/nfs/Cancellable.hxx
index 89635bec7456dc1ab7f711366e906988d5474117..6e7890150227b273b0287121ccb77f63f3e46a20 100644
--- a/src/lib/nfs/Cancellable.hxx
+++ b/src/lib/nfs/Cancellable.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_NFS_CANCELLABLE_HXX
#define MPD_NFS_CANCELLABLE_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <boost/intrusive/list.hpp>
diff --git a/src/lib/nfs/FileReader.hxx b/src/lib/nfs/FileReader.hxx
index 8447036d49bd580060b305d64dd872a058f6efdf..da06f6fc17e2e9c4a857bcf528a24ca2ae842783 100644
--- a/src/lib/nfs/FileReader.hxx
+++ b/src/lib/nfs/FileReader.hxx
@@ -24,7 +24,7 @@
#include "Lease.hxx"
#include "Callback.hxx"
#include "event/DeferEvent.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
#include <exception>
diff --git a/src/lib/nfs/Glue.hxx b/src/lib/nfs/Glue.hxx
index 28dba89c2ea17b8005f5d0e2a34ae61db6917fd6..0bf3aa58f197ce379016e4ba37c38a5fa28345bc 100644
--- a/src/lib/nfs/Glue.hxx
+++ b/src/lib/nfs/Glue.hxx
@@ -21,7 +21,7 @@
#define MPD_NFS_GLUE_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
class EventLoop;
class NfsConnection;
diff --git a/src/lib/nfs/Manager.hxx b/src/lib/nfs/Manager.hxx
index 120c65c9e20e34902eea93185118c4453a97f462..0cf10eac5f7c163eb5e7dc30b2d26a4c96dc6564 100644
--- a/src/lib/nfs/Manager.hxx
+++ b/src/lib/nfs/Manager.hxx
@@ -22,7 +22,7 @@
#include "check.h"
#include "Connection.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "event/IdleMonitor.hxx"
#include <boost/intrusive/set.hpp>
diff --git a/src/lib/upnp/Action.hxx b/src/lib/upnp/Action.hxx
index 03c200bfcbe739fac3b6e4832a16dec2e9d2f5bd..3603c2f7c1d5f5ad818d5fe7f42f7fecfe253fd4 100644
--- a/src/lib/upnp/Action.hxx
+++ b/src/lib/upnp/Action.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_UPNP_ACTION_HXX
#define MPD_UPNP_ACTION_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <upnptools.h>
diff --git a/src/lib/upnp/Compat.hxx b/src/lib/upnp/Compat.hxx
index b4b5bd01b21144a45a47ccf234214669f6d7897b..cf3e0dca130422dab4bd9b6c8a93e30133599bfa 100644
--- a/src/lib/upnp/Compat.hxx
+++ b/src/lib/upnp/Compat.hxx
@@ -30,7 +30,7 @@ using UpnpDiscovery = Upnp_Discovery;
#endif
#if UPNP_VERSION < 10624
-#include "Compiler.h"
+#include "util/Compiler.h"
gcc_pure
static inline int
diff --git a/src/lib/upnp/ContentDirectoryService.hxx b/src/lib/upnp/ContentDirectoryService.hxx
index 55fae6a560bb30495f790c251755d7e60d00bb1a..5a14d1cc07906e2e5258f62827d1b79f9f8f78dd 100644
--- a/src/lib/upnp/ContentDirectoryService.hxx
+++ b/src/lib/upnp/ContentDirectoryService.hxx
@@ -20,7 +20,7 @@
#ifndef _UPNPDIR_HXX_INCLUDED_
#define _UPNPDIR_HXX_INCLUDED_
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <upnp.h>
diff --git a/src/lib/upnp/Discovery.hxx b/src/lib/upnp/Discovery.hxx
index 0750caf4754310fff09819e46050acc664216f61..9cb6535e70cb7785a0f03d8bf49f27e74329ffb6 100644
--- a/src/lib/upnp/Discovery.hxx
+++ b/src/lib/upnp/Discovery.hxx
@@ -28,7 +28,7 @@
#include "lib/curl/Request.hxx"
#include "thread/Mutex.hxx"
#include "event/DeferEvent.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <upnp.h>
diff --git a/src/lib/upnp/Util.hxx b/src/lib/upnp/Util.hxx
index de1950d5b0b633600c44a700d9023e3a4cc21de8..0b5a435b53d78af69ecbfc2a86da223c62e8c454 100644
--- a/src/lib/upnp/Util.hxx
+++ b/src/lib/upnp/Util.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_UPNP_UTIL_HXX
#define MPD_UPNP_UTIL_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
#include <list>
diff --git a/src/lib/xiph/FlacIOHandle.cxx b/src/lib/xiph/FlacIOHandle.cxx
index 1d648637e13a38ebb4e41db341300708b1769006..b4da537aad2fd7e421bdeab7ab45a32f1ed33f0c 100644
--- a/src/lib/xiph/FlacIOHandle.cxx
+++ b/src/lib/xiph/FlacIOHandle.cxx
@@ -20,7 +20,7 @@
#include "config.h"
#include "FlacIOHandle.hxx"
#include "Log.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "system/Error.hxx"
#include <errno.h>
diff --git a/src/lib/xiph/FlacIOHandle.hxx b/src/lib/xiph/FlacIOHandle.hxx
index 2c54bbe5ebbce9d4126ef5a5fadf6abe886da254..33bf8d5fe411e086118d033a02b7173a285d1177 100644
--- a/src/lib/xiph/FlacIOHandle.hxx
+++ b/src/lib/xiph/FlacIOHandle.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_FLAC_IO_HANDLE_HXX
#define MPD_FLAC_IO_HANDLE_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "input/InputStream.hxx"
#include <FLAC/callback.h>
diff --git a/src/lib/xiph/FlacMetadataChain.hxx b/src/lib/xiph/FlacMetadataChain.hxx
index bc62c4ca247def99b94f3973fd1b5494374e3b76..8394e101818b3acc5c01c3a3d91eb7b82f120f43 100644
--- a/src/lib/xiph/FlacMetadataChain.hxx
+++ b/src/lib/xiph/FlacMetadataChain.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_FLAC_METADATA_CHAIN_HXX
#define MPD_FLAC_METADATA_CHAIN_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <FLAC/metadata.h>
diff --git a/src/lib/xiph/FlacMetadataIterator.hxx b/src/lib/xiph/FlacMetadataIterator.hxx
index b837c3f2ab8e8a741a9b4f9f772ce06634de87c4..fd2fd28182c74aa517fcbe27605f2f8fa1f19ef0 100644
--- a/src/lib/xiph/FlacMetadataIterator.hxx
+++ b/src/lib/xiph/FlacMetadataIterator.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_FLAC_METADATA_ITERATOR_HXX
#define MPD_FLAC_METADATA_ITERATOR_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <FLAC/metadata.h>
diff --git a/src/lib/xiph/OggSerial.cxx b/src/lib/xiph/OggSerial.cxx
index 70b7fa46ac26d82862182c4e052f1f206c47d67e..97e9476c41d31223f31eab8dce2febfa2cc9119a 100644
--- a/src/lib/xiph/OggSerial.cxx
+++ b/src/lib/xiph/OggSerial.cxx
@@ -18,7 +18,7 @@
*/
#include "OggSerial.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <atomic>
#include <chrono>
diff --git a/src/ls.hxx b/src/ls.hxx
index b8c8f249a17470e061d379b88e130b5c0032472d..aec5d862368acc6f441a5d16168f5bb5a6ecb155 100644
--- a/src/ls.hxx
+++ b/src/ls.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_LS_HXX
#define MPD_LS_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdio.h>
diff --git a/src/mixer/MixerInternal.hxx b/src/mixer/MixerInternal.hxx
index 34ee0a1d73c9d7cd603053360cd22acb1ceadcca..9943bd4c582008b3c206938cab6d86b2d71beece 100644
--- a/src/mixer/MixerInternal.hxx
+++ b/src/mixer/MixerInternal.hxx
@@ -23,7 +23,7 @@
#include "MixerPlugin.hxx"
#include "MixerList.hxx"
#include "thread/Mutex.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
class MixerListener;
diff --git a/src/mixer/MixerType.hxx b/src/mixer/MixerType.hxx
index ce28329810bcb53ce78d26ba13bc6f4fe910603f..ec1d0ff025a0995f5c2c683f41deeb03b5b06d6a 100644
--- a/src/mixer/MixerType.hxx
+++ b/src/mixer/MixerType.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_MIXER_TYPE_HXX
#define MPD_MIXER_TYPE_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
enum class MixerType {
/** mixer disabled */
diff --git a/src/mixer/Volume.hxx b/src/mixer/Volume.hxx
index 5ca467d7713de07e149c567b306729b8a54b75e2..3e1cf9a4223c423c08c259b0be251b40bdc45e5b 100644
--- a/src/mixer/Volume.hxx
+++ b/src/mixer/Volume.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_VOLUME_HXX
#define MPD_VOLUME_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
class MultipleOutputs;
class BufferedOutputStream;
diff --git a/src/mixer/plugins/HaikuMixerPlugin.cxx b/src/mixer/plugins/HaikuMixerPlugin.cxx
index f0b50a91c73da5dafadddf1775021fffb062914d..9a24ce48a996306a6eb7a4fccdbbfa437d1f14d7 100644
--- a/src/mixer/plugins/HaikuMixerPlugin.cxx
+++ b/src/mixer/plugins/HaikuMixerPlugin.cxx
@@ -23,7 +23,7 @@
#include "config.h"
#include "mixer/MixerInternal.hxx"
#include "output/plugins/HaikuOutputPlugin.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "util/RuntimeError.hxx"
diff --git a/src/mixer/plugins/RoarMixerPlugin.cxx b/src/mixer/plugins/RoarMixerPlugin.cxx
index d3df5f9109ec1987c2656e77a235cb7f9d79ca64..77dd2cc440f204662c17f810bed4bf511f5c2614 100644
--- a/src/mixer/plugins/RoarMixerPlugin.cxx
+++ b/src/mixer/plugins/RoarMixerPlugin.cxx
@@ -22,7 +22,7 @@
#include "config.h"
#include "mixer/MixerInternal.hxx"
#include "output/plugins/RoarOutputPlugin.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
class RoarMixer final : public Mixer {
/** the base mixer class */
diff --git a/src/neighbor/Glue.hxx b/src/neighbor/Glue.hxx
index 732841511e9eec8b98ded58b42968c3d75a6144b..6ae247582dad655342511c207f25af1c1058441a 100644
--- a/src/neighbor/Glue.hxx
+++ b/src/neighbor/Glue.hxx
@@ -21,7 +21,7 @@
#define MPD_NEIGHBOR_ALL_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "thread/Mutex.hxx"
#include <forward_list>
diff --git a/src/neighbor/Registry.hxx b/src/neighbor/Registry.hxx
index 5e9ddfb6292c62097aa19c7c42eb573b5cdf638d..389030543faf004a040b74114bdc9a3601a223d4 100644
--- a/src/neighbor/Registry.hxx
+++ b/src/neighbor/Registry.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_NEIGHBOR_REGISTRY_HXX
#define MPD_NEIGHBOR_REGISTRY_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
struct NeighborPlugin;
diff --git a/src/net/AllocatedSocketAddress.hxx b/src/net/AllocatedSocketAddress.hxx
index 30ed8d819b3923e6b971ca91194e20a9b0965366..772ae9657c091cf94eaff944a2064df7abb9eeac 100644
--- a/src/net/AllocatedSocketAddress.hxx
+++ b/src/net/AllocatedSocketAddress.hxx
@@ -32,7 +32,7 @@
#include "SocketAddress.hxx"
#include "Features.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <algorithm>
diff --git a/src/net/Resolver.hxx b/src/net/Resolver.hxx
index ad4faba363ebf383b8ae530562e02daadc0eaf77..1f8b89659df14eb618237b220df03d7b953f6e09 100644
--- a/src/net/Resolver.hxx
+++ b/src/net/Resolver.hxx
@@ -21,7 +21,7 @@
#define MPD_RESOLVER_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct addrinfo;
diff --git a/src/net/SocketAddress.hxx b/src/net/SocketAddress.hxx
index b83cbf5b0198813605f93cf5d0f282978cb8d663..d7b022d97722871c423002e8e5b704bce275286e 100644
--- a/src/net/SocketAddress.hxx
+++ b/src/net/SocketAddress.hxx
@@ -31,7 +31,7 @@
#define SOCKET_ADDRESS_HXX
#include "Features.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <cstddef>
diff --git a/src/net/SocketError.hxx b/src/net/SocketError.hxx
index c4caac6466419d37757e541c5ef6f3c01854752f..03a932e55748db8427caf9fea404883125dab0f3 100644
--- a/src/net/SocketError.hxx
+++ b/src/net/SocketError.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_SOCKET_ERROR_HXX
#define MPD_SOCKET_ERROR_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "system/Error.hxx"
#ifdef _WIN32
diff --git a/src/net/StaticSocketAddress.hxx b/src/net/StaticSocketAddress.hxx
index 5da2cb3d729faa00deb71e32165760eba3d276ac..8b9e8ecde26a390c89f69fb00640d7bf18685e68 100644
--- a/src/net/StaticSocketAddress.hxx
+++ b/src/net/StaticSocketAddress.hxx
@@ -31,7 +31,7 @@
#define STATIC_SOCKET_ADDRESS_HXX
#include "SocketAddress.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <assert.h>
diff --git a/src/net/ToString.hxx b/src/net/ToString.hxx
index 4eef8656d60d22666a7616c875ed48a51d44294c..3dbf3d45e14f87cbffba1473b00d6e8abe3c53aa 100644
--- a/src/net/ToString.hxx
+++ b/src/net/ToString.hxx
@@ -31,7 +31,7 @@
#define NET_TO_STRING_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
diff --git a/src/output/Control.hxx b/src/output/Control.hxx
index 711f86382a3a8aced7a06fc0aa964f360de9db49..72016e98985c0f68bae0280b87612c2857eb218c 100644
--- a/src/output/Control.hxx
+++ b/src/output/Control.hxx
@@ -26,7 +26,7 @@
#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"
#include "system/PeriodClock.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <utility>
#include <exception>
diff --git a/src/output/Interface.cxx b/src/output/Interface.cxx
index 5480642dfa67cc5a8f75ee4e360810a1a1505fe9..69c2b0a0f968a678662dbd59a176097715262848 100644
--- a/src/output/Interface.cxx
+++ b/src/output/Interface.cxx
@@ -18,7 +18,7 @@
*/
#include "Interface.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdexcept>
diff --git a/src/output/MultipleOutputs.hxx b/src/output/MultipleOutputs.hxx
index 7e9e201f40c23a50c2d42505d1c3da9270cbb4a4..c69adc4a1b58e5bb27d12c8513779b096b38c28d 100644
--- a/src/output/MultipleOutputs.hxx
+++ b/src/output/MultipleOutputs.hxx
@@ -32,7 +32,7 @@
#include "AudioFormat.hxx"
#include "ReplayGainMode.hxx"
#include "Chrono.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <vector>
diff --git a/src/output/OutputPlugin.hxx b/src/output/OutputPlugin.hxx
index f55aebc782fc3246eabe82d4ce4f9fb1f19ed472..cc2f1a068a691162a89d24d824fe0aafa3513139 100644
--- a/src/output/OutputPlugin.hxx
+++ b/src/output/OutputPlugin.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_OUTPUT_PLUGIN_HXX
#define MPD_OUTPUT_PLUGIN_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <chrono>
diff --git a/src/output/SharedPipeConsumer.hxx b/src/output/SharedPipeConsumer.hxx
index 4b9efd48f59653e760e10a36f42ca7e964372591..e292816382936fe1158c12034940cc6b1d83553e 100644
--- a/src/output/SharedPipeConsumer.hxx
+++ b/src/output/SharedPipeConsumer.hxx
@@ -21,7 +21,7 @@
#define SHARED_PIPE_CONSUMER_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <assert.h>
diff --git a/src/output/Source.hxx b/src/output/Source.hxx
index 435ce52b2292dc33312e79ab1f8d6214e24691f9..783b7cdae68dfa5c6e8bcab166bd86ac26d7163a 100644
--- a/src/output/Source.hxx
+++ b/src/output/Source.hxx
@@ -21,7 +21,7 @@
#define AUDIO_OUTPUT_SOURCE_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "SharedPipeConsumer.hxx"
#include "AudioFormat.hxx"
#include "ReplayGainMode.hxx"
diff --git a/src/output/plugins/WinmmOutputPlugin.hxx b/src/output/plugins/WinmmOutputPlugin.hxx
index 55f1439d4f7faec7b0fee3ecc2c443a0a1716a43..deae2da42d291551f62413d8ea787cd4693955b9 100644
--- a/src/output/plugins/WinmmOutputPlugin.hxx
+++ b/src/output/plugins/WinmmOutputPlugin.hxx
@@ -24,7 +24,7 @@
#ifdef ENABLE_WINMM_OUTPUT
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <windows.h>
#include <mmsystem.h>
diff --git a/src/output/plugins/httpd/HttpdClient.hxx b/src/output/plugins/httpd/HttpdClient.hxx
index 9d061f43d4cc92feafb0a10c6205fa9bebd75b19..d49d4ae1c69ace17cb305102a8f62eef144b18f7 100644
--- a/src/output/plugins/httpd/HttpdClient.hxx
+++ b/src/output/plugins/httpd/HttpdClient.hxx
@@ -22,7 +22,7 @@
#include "Page.hxx"
#include "event/BufferedSocket.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <boost/intrusive/link_mode.hpp>
#include <boost/intrusive/list_hook.hpp>
diff --git a/src/output/plugins/httpd/HttpdInternal.hxx b/src/output/plugins/httpd/HttpdInternal.hxx
index 9a99fdbc83a32c1c5c54ac494590080e0618e4ea..80d8928d69bb844fd6fa77c9fab8dc7faf405135 100644
--- a/src/output/plugins/httpd/HttpdInternal.hxx
+++ b/src/output/plugins/httpd/HttpdInternal.hxx
@@ -33,7 +33,7 @@
#include "event/ServerSocket.hxx"
#include "event/DeferEvent.hxx"
#include "util/Cast.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <boost/intrusive/list.hpp>
diff --git a/src/pcm/FallbackResampler.hxx b/src/pcm/FallbackResampler.hxx
index ec82b301d0da63885063aea548810f1a8ad9f697..96073522479a4da8d6c186bbd90d1b672531a44f 100644
--- a/src/pcm/FallbackResampler.hxx
+++ b/src/pcm/FallbackResampler.hxx
@@ -23,7 +23,7 @@
#include "Resampler.hxx"
#include "PcmBuffer.hxx"
#include "AudioFormat.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
/**
* A naive resampler that is used when no external library was found
diff --git a/src/pcm/Interleave.hxx b/src/pcm/Interleave.hxx
index a94bc67f613c6a6a1adee8f94a0f191cd624f015..f2f98210d9d1a9a6c93f84de515421950d1204d0 100644
--- a/src/pcm/Interleave.hxx
+++ b/src/pcm/Interleave.hxx
@@ -21,7 +21,7 @@
#define MPD_PCM_INTERLEAVE_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "util/ConstBuffer.hxx"
#include <stdint.h>
diff --git a/src/pcm/LibsamplerateResampler.hxx b/src/pcm/LibsamplerateResampler.hxx
index 988a0575db5444ea4d743c8162520a1e03a63aa5..31cb7ddf416436944154eebb4aec691789472da9 100644
--- a/src/pcm/LibsamplerateResampler.hxx
+++ b/src/pcm/LibsamplerateResampler.hxx
@@ -23,7 +23,7 @@
#include "Resampler.hxx"
#include "PcmBuffer.hxx"
#include "AudioFormat.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <samplerate.h>
diff --git a/src/pcm/PcmBuffer.hxx b/src/pcm/PcmBuffer.hxx
index f7917554cf31b776595a05a0d02d6e3eb7a61a1f..e57657015d32967ff1d2d28e1c19b8d4a6be314a 100644
--- a/src/pcm/PcmBuffer.hxx
+++ b/src/pcm/PcmBuffer.hxx
@@ -21,7 +21,7 @@
#define PCM_BUFFER_HXX
#include "util/ReusableArray.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdint.h>
diff --git a/src/pcm/PcmMix.hxx b/src/pcm/PcmMix.hxx
index 7f08a94099f4d60ef65ff956967571e23c6ff11b..c1c2b8f4513294e65d89d93a33eb35b764ec7936 100644
--- a/src/pcm/PcmMix.hxx
+++ b/src/pcm/PcmMix.hxx
@@ -21,7 +21,7 @@
#define MPD_PCM_MIX_HXX
#include "SampleFormat.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stddef.h>
diff --git a/src/pcm/PcmUtils.hxx b/src/pcm/PcmUtils.hxx
index b3bc058fa683c83701f7ac716a494a0456d35da2..2461ba2a965e9d68675ad2010d3d84913c707550 100644
--- a/src/pcm/PcmUtils.hxx
+++ b/src/pcm/PcmUtils.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_PCM_UTILS_H
#define MPD_PCM_UTILS_H
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <limits>
diff --git a/src/pcm/Resampler.hxx b/src/pcm/Resampler.hxx
index 7f2c5ae4cd7c61cca776a0cc3181cc8a618fc26b..40b8a9e9301ef9f89236a3f0ae6c0dcf39301591 100644
--- a/src/pcm/Resampler.hxx
+++ b/src/pcm/Resampler.hxx
@@ -21,7 +21,7 @@
#define MPD_PCM_RESAMPLER_HXX
#include "util/ConstBuffer.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct AudioFormat;
diff --git a/src/pcm/SampleFormat.hxx b/src/pcm/SampleFormat.hxx
index 92c081f9920b7c460e3d75d5a8308258e7d4ade1..a271e8a82ac18d0d31bb1b5fde2353812de6743e 100644
--- a/src/pcm/SampleFormat.hxx
+++ b/src/pcm/SampleFormat.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_PCM_SAMPLE_FORMAT_HXX
#define MPD_PCM_SAMPLE_FORMAT_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdint.h>
diff --git a/src/pcm/SoxrResampler.hxx b/src/pcm/SoxrResampler.hxx
index 735a24a85a75cee66a51cafe0d7dc6478143776a..31142a7dfeb0e2c8dae9d1636195d497a5b72732 100644
--- a/src/pcm/SoxrResampler.hxx
+++ b/src/pcm/SoxrResampler.hxx
@@ -22,7 +22,7 @@
#include "Resampler.hxx"
#include "PcmBuffer.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct AudioFormat;
struct ConfigBlock;
diff --git a/src/player/CrossFade.hxx b/src/player/CrossFade.hxx
index 9241006d8e66d9595ef769055ab334ad1410740d..2bdd3f0a02f4fde65f19c026b02e984ba6245e8e 100644
--- a/src/player/CrossFade.hxx
+++ b/src/player/CrossFade.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_CROSSFADE_HXX
#define MPD_CROSSFADE_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
struct AudioFormat;
class SignedSongTime;
diff --git a/src/player/Outputs.hxx b/src/player/Outputs.hxx
index 54e340931e3f7ec29ac471451e9d39895bcae35d..225ec583647385b4e1b634803e7c10512494d40c 100644
--- a/src/player/Outputs.hxx
+++ b/src/player/Outputs.hxx
@@ -22,7 +22,7 @@
#include "MusicChunkPtr.hxx"
#include "Chrono.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct AudioFormat;
struct MusicChunk;
diff --git a/src/playlist/MemorySongEnumerator.hxx b/src/playlist/MemorySongEnumerator.hxx
index 7b9f78d1388aadb55a15875ef0a966ae32ff0cc9..f59d1f87df7014a28647ec549f5edaad9107742d 100644
--- a/src/playlist/MemorySongEnumerator.hxx
+++ b/src/playlist/MemorySongEnumerator.hxx
@@ -22,7 +22,7 @@
#include "SongEnumerator.hxx"
#include "song/DetachedSong.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <forward_list>
diff --git a/src/playlist/PlaylistRegistry.hxx b/src/playlist/PlaylistRegistry.hxx
index 9f56dddf1a8cd0e8b899a1ea9f9edc36f443c202..b184b989dd9479612781862a7bc9bdaeda6aabe5 100644
--- a/src/playlist/PlaylistRegistry.hxx
+++ b/src/playlist/PlaylistRegistry.hxx
@@ -21,7 +21,7 @@
#define MPD_PLAYLIST_REGISTRY_HXX
#include "input/Ptr.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct ConfigData;
class Mutex;
diff --git a/src/playlist/PlaylistStream.hxx b/src/playlist/PlaylistStream.hxx
index 46742e970eb2484594c7935f63c440264bd1292b..4001ced631068ca49eecfcfaa3589942c77e4f6c 100644
--- a/src/playlist/PlaylistStream.hxx
+++ b/src/playlist/PlaylistStream.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_PLAYLIST_STREAM_HXX
#define MPD_PLAYLIST_STREAM_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <memory>
diff --git a/src/playlist/cue/CueParser.hxx b/src/playlist/cue/CueParser.hxx
index c9e344c98d6128a21e91adc59e12a351325317be..85e1147226335490c440aaceeef39ebbc3d4153e 100644
--- a/src/playlist/cue/CueParser.hxx
+++ b/src/playlist/cue/CueParser.hxx
@@ -23,7 +23,7 @@
#include "check.h"
#include "song/DetachedSong.hxx"
#include "tag/Builder.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
#include <memory>
diff --git a/src/queue/IdTable.hxx b/src/queue/IdTable.hxx
index 5be7c7e4e4f024f1dfc9994fafb206cad1d3bb14..a632ec545d4a2789ae45158f74e30e77aa17756a 100644
--- a/src/queue/IdTable.hxx
+++ b/src/queue/IdTable.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_ID_TABLE_HXX
#define MPD_ID_TABLE_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <algorithm>
diff --git a/src/queue/Queue.hxx b/src/queue/Queue.hxx
index 886ea31bb8918f55542ef2eebc3084b53e2f330c..f3e2854d0e060c8cd79b11a52d08f71ebf14928e 100644
--- a/src/queue/Queue.hxx
+++ b/src/queue/Queue.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_QUEUE_HXX
#define MPD_QUEUE_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "IdTable.hxx"
#include "SingleMode.hxx"
#include "util/LazyRandomEngine.hxx"
diff --git a/src/song/AndSongFilter.hxx b/src/song/AndSongFilter.hxx
index 5c3869d93e81df0017002aad0d6019a49a8ed7c8..bc9cb3468ba8d46d7f5a56cc45273095032aadd4 100644
--- a/src/song/AndSongFilter.hxx
+++ b/src/song/AndSongFilter.hxx
@@ -21,7 +21,7 @@
#define MPD_AND_SONG_FILTER_HXX
#include "ISongFilter.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <list>
diff --git a/src/song/BaseSongFilter.hxx b/src/song/BaseSongFilter.hxx
index d5a049bf2ed1b4ff4bde4de15593c2075e315fc6..d0d2aab392b515184a665ea4725db2fdba477fbe 100644
--- a/src/song/BaseSongFilter.hxx
+++ b/src/song/BaseSongFilter.hxx
@@ -21,7 +21,7 @@
#define MPD_BASE_SONG_FILTER_HXX
#include "ISongFilter.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
class BaseSongFilter final : public ISongFilter {
std::string value;
diff --git a/src/song/DetachedSong.hxx b/src/song/DetachedSong.hxx
index a161ad4273a5546d223ebec900212dc8c3583c54..d45439d0a62a09b4c0630b03576413dce66ac0af 100644
--- a/src/song/DetachedSong.hxx
+++ b/src/song/DetachedSong.hxx
@@ -23,7 +23,7 @@
#include "check.h"
#include "tag/Tag.hxx"
#include "Chrono.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <chrono>
#include <string>
diff --git a/src/song/Filter.hxx b/src/song/Filter.hxx
index 5164ee888a7bee72e9e981f0dde0b25f772629bc..771f0d6c8649d15a26f00c1366b7f0a669fb46ff 100644
--- a/src/song/Filter.hxx
+++ b/src/song/Filter.hxx
@@ -21,7 +21,7 @@
#define MPD_SONG_FILTER_HXX
#include "AndSongFilter.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
diff --git a/src/song/ISongFilter.hxx b/src/song/ISongFilter.hxx
index 22e74614851ea6735979b1b57f148045dbb282c2..7ff8b34182b8c6da15dc6ba87a8d1793847c02da 100644
--- a/src/song/ISongFilter.hxx
+++ b/src/song/ISongFilter.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_I_SONG_FILTER_HXX
#define MPD_I_SONG_FILTER_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <memory>
#include <string>
diff --git a/src/song/LightSong.hxx b/src/song/LightSong.hxx
index 7bc21e0302e8e9a905f01c609a62c53438b6aa6b..8fa06ea4d43c63c03a826b0ea7fe3af380e7cf83 100644
--- a/src/song/LightSong.hxx
+++ b/src/song/LightSong.hxx
@@ -22,7 +22,7 @@
#include "Chrono.hxx"
#include "AudioFormat.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
#include <chrono>
diff --git a/src/song/StringFilter.hxx b/src/song/StringFilter.hxx
index da809f3a32d0b981fda547e9dd963120618704ec..8c39b5f693ab58aad06af8e5a4dc62f0ed9c7fee 100644
--- a/src/song/StringFilter.hxx
+++ b/src/song/StringFilter.hxx
@@ -21,7 +21,7 @@
#define MPD_STRING_FILTER_HXX
#include "lib/icu/Compare.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
diff --git a/src/sticker/StickerDatabase.hxx b/src/sticker/StickerDatabase.hxx
index e533fbfbe1a1b3129a7d13c6811c9fcfb14aa915..ecb735c904f8e12a86cdcd11ddef4ad481900134 100644
--- a/src/sticker/StickerDatabase.hxx
+++ b/src/sticker/StickerDatabase.hxx
@@ -43,7 +43,7 @@
#define MPD_STICKER_DATABASE_HXX
#include "Match.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <string>
diff --git a/src/storage/CompositeStorage.hxx b/src/storage/CompositeStorage.hxx
index a586b9c469fc0243eafb8d65162f070bf1bdb07d..ed1c412a05492cd18bf819e7b5c9a5f7bcf5b736 100644
--- a/src/storage/CompositeStorage.hxx
+++ b/src/storage/CompositeStorage.hxx
@@ -23,7 +23,7 @@
#include "check.h"
#include "StorageInterface.hxx"
#include "thread/Mutex.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <memory>
#include <string>
diff --git a/src/storage/Configured.hxx b/src/storage/Configured.hxx
index 068c7a498008a6e88ce7d70d8150ab5e73f5445b..b5091fde811d3f1cb59e2ac3cd3ee70ecc66f773 100644
--- a/src/storage/Configured.hxx
+++ b/src/storage/Configured.hxx
@@ -21,7 +21,7 @@
#define MPD_STORAGE_CONFIG_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <memory>
diff --git a/src/storage/Registry.hxx b/src/storage/Registry.hxx
index 4a4136067c759a4245a91d09ab1b51a418f5f7e7..648d6efc5456988dc7c1799f60568e3861283639 100644
--- a/src/storage/Registry.hxx
+++ b/src/storage/Registry.hxx
@@ -21,7 +21,7 @@
#define MPD_STORAGE_REGISTRY_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <memory>
diff --git a/src/storage/StorageInterface.hxx b/src/storage/StorageInterface.hxx
index dbad0c041c3c1b833b28d72def508b8fe105912f..edd0638b2ae1b47c62f1c96c4c9484ce1058b44d 100644
--- a/src/storage/StorageInterface.hxx
+++ b/src/storage/StorageInterface.hxx
@@ -21,7 +21,7 @@
#define MPD_STORAGE_INTERFACE_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <memory>
#include <string>
diff --git a/src/storage/plugins/LocalStorage.hxx b/src/storage/plugins/LocalStorage.hxx
index ae1a89ee29add4ed64d2cfd3c0d5e82de2faf3cc..3e943a2ed7e86bfa3e414977f74d5965cf8182f6 100644
--- a/src/storage/plugins/LocalStorage.hxx
+++ b/src/storage/plugins/LocalStorage.hxx
@@ -21,7 +21,7 @@
#define MPD_STORAGE_LOCAL_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <memory>
diff --git a/src/system/ByteOrder.hxx b/src/system/ByteOrder.hxx
index edeeb31c331460493b3a6f024cde16a8bb93fcfb..8ed3b6c720e845f2965a88570c8c9c14765a4031 100644
--- a/src/system/ByteOrder.hxx
+++ b/src/system/ByteOrder.hxx
@@ -30,7 +30,7 @@
#ifndef BYTE_ORDER_HXX
#define BYTE_ORDER_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <stdint.h>
diff --git a/src/system/Clock.hxx b/src/system/Clock.hxx
index 222ac48482776a125a04f2b1baf0eb4811aa5638..6c034f5d74607bda4910d2f3650c508f3b90b598 100644
--- a/src/system/Clock.hxx
+++ b/src/system/Clock.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_CLOCK_H
#define MPD_CLOCK_H
-#include "Compiler.h"
+#include "util/Compiler.h"
#ifdef _WIN32
diff --git a/src/system/Error.hxx b/src/system/Error.hxx
index f65a602b3c7196be6dd9e60b15d64a0bd7d04ba8..a946788721fa7da2990dbed4374fa82130d25a4e 100644
--- a/src/system/Error.hxx
+++ b/src/system/Error.hxx
@@ -30,7 +30,7 @@
#ifndef SYSTEM_ERROR_HXX
#define SYSTEM_ERROR_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <system_error>
#include <utility>
diff --git a/src/system/EventFD.cxx b/src/system/EventFD.cxx
index 1103176c47a44aefe6679951d4e795b35d3aa06c..d6f43f32e739c15c610ad2a137ea3503217ab64b 100644
--- a/src/system/EventFD.cxx
+++ b/src/system/EventFD.cxx
@@ -21,7 +21,7 @@
#ifdef USE_EVENTFD
#include "EventFD.hxx"
#include "system/Error.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <assert.h>
#include <sys/eventfd.h>
diff --git a/src/system/EventPipe.cxx b/src/system/EventPipe.cxx
index 075c2fa0a660b84f1864d11743ce7b49a421d2e3..a7f25fb5db8d47c96789859fdb05e6a9198cc55f 100644
--- a/src/system/EventPipe.cxx
+++ b/src/system/EventPipe.cxx
@@ -22,7 +22,7 @@
#include "FileDescriptor.hxx"
#include "system/Error.hxx"
#include "util/ScopeExit.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <assert.h>
#include <unistd.h>
diff --git a/src/system/FatalError.hxx b/src/system/FatalError.hxx
index c692a2c39f634a0594b9411e904492c17a063acb..ffb82db1d3f92aba3b7d434f0442044098cf799e 100644
--- a/src/system/FatalError.hxx
+++ b/src/system/FatalError.hxx
@@ -21,7 +21,7 @@
#define MPD_FATAL_ERROR_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#ifdef _WIN32
#include <windef.h>
diff --git a/src/system/FileDescriptor.hxx b/src/system/FileDescriptor.hxx
index a6e32b96390a39a335c1bf39a0c2853e2f84c82d..5e91bbd33e861943d63f4cdf22c82b8637ccd5ce 100644
--- a/src/system/FileDescriptor.hxx
+++ b/src/system/FileDescriptor.hxx
@@ -31,7 +31,7 @@
#define FILE_DESCRIPTOR_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <utility>
diff --git a/src/tag/Builder.hxx b/src/tag/Builder.hxx
index f0d37990b2ca7b198802259b0a29e55f016cacf7..136e0e745548af30978ad6b007a580a5403f7777 100644
--- a/src/tag/Builder.hxx
+++ b/src/tag/Builder.hxx
@@ -22,7 +22,7 @@
#include "Type.h"
#include "Chrono.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <vector>
#include <memory>
diff --git a/src/tag/FixString.hxx b/src/tag/FixString.hxx
index 618d9640db2f98ea6d814dd9213ced6b69f96240..256d7500803c3a7bd83be0d023c12004f5e0fec8 100644
--- a/src/tag/FixString.hxx
+++ b/src/tag/FixString.hxx
@@ -21,7 +21,7 @@
#define MPD_TAG_STRING_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct StringView;
template<typename T> struct WritableBuffer;
diff --git a/src/tag/Format.hxx b/src/tag/Format.hxx
index 3cda2e4f99ec874d34c936dca6d7136543850988..25a6781445c5407c29776d3ef8b0edf039112479 100644
--- a/src/tag/Format.hxx
+++ b/src/tag/Format.hxx
@@ -21,7 +21,7 @@
#define MPD_TAG_FORMAT_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct Tag;
diff --git a/src/tag/Handler.hxx b/src/tag/Handler.hxx
index 04c5011011f2b7cb926cd31fd43ceb6625a12b53..45acbb6b340c366f0721eb5f5d67ca272c259da6 100644
--- a/src/tag/Handler.hxx
+++ b/src/tag/Handler.hxx
@@ -23,7 +23,7 @@
#include "check.h"
#include "Type.h"
#include "Chrono.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct AudioFormat;
class TagBuilder;
diff --git a/src/tag/ParseName.hxx b/src/tag/ParseName.hxx
index 541c0858c710d6a8a23aabc1231cf6ebd4992ecb..1537bc4532b8e29f09af90abb683985611731211 100644
--- a/src/tag/ParseName.hxx
+++ b/src/tag/ParseName.hxx
@@ -21,7 +21,7 @@
#define MPD_TAG_PARSE_NAME_HXX
#include "Type.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
/**
* Parse the string, and convert it into a #TagType. Returns
diff --git a/src/tag/Set.hxx b/src/tag/Set.hxx
index 59a39d7f6935e7a110853efc11cedb4c25d54182..e74d145f4b0df1f45960bcd5b7b8c82daef4b90e 100644
--- a/src/tag/Set.hxx
+++ b/src/tag/Set.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_TAG_SET_HXX
#define MPD_TAG_SET_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "Tag.hxx"
#include <set>
diff --git a/src/tag/Settings.hxx b/src/tag/Settings.hxx
index e3d4d3bacf06a36580521eb4143ae2f56d009352..5a690138ef6c46e82705a40a82cc7912d5f3ca13 100644
--- a/src/tag/Settings.hxx
+++ b/src/tag/Settings.hxx
@@ -22,7 +22,7 @@
#include "Mask.hxx"
#include "Type.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
extern TagMask global_tag_mask;
diff --git a/src/tag/Table.hxx b/src/tag/Table.hxx
index f808a86ba2ae9aa4b88fbf3430e31322c99e9c08..28714378ad236fd0cccfef34a3402495020eefe2 100644
--- a/src/tag/Table.hxx
+++ b/src/tag/Table.hxx
@@ -21,7 +21,7 @@
#define MPD_TAG_TABLE_HXX
#include "Type.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
struct tag_table {
const char *name;
diff --git a/src/tag/Tag.hxx b/src/tag/Tag.hxx
index 4a12dde16f5533a16e537647d4dfa8df48885e95..842ea58737dccdae23609cd733b59c5a76156edd 100644
--- a/src/tag/Tag.hxx
+++ b/src/tag/Tag.hxx
@@ -23,7 +23,7 @@
#include "Type.h" // IWYU pragma: export
#include "Item.hxx" // IWYU pragma: export
#include "Chrono.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <algorithm>
#include <memory>
diff --git a/src/tag/VorbisComment.hxx b/src/tag/VorbisComment.hxx
index d2ea86338ba975bd8da193f852c06cd7947c75ed..99da9b5342a6d47c89ffd2db5cb491897e935f72 100644
--- a/src/tag/VorbisComment.hxx
+++ b/src/tag/VorbisComment.hxx
@@ -21,7 +21,7 @@
#define MPD_TAG_VORBIS_COMMENT_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
/**
* Checks if the specified name matches the entry's name, and if yes,
diff --git a/src/thread/Id.hxx b/src/thread/Id.hxx
index 7fc6a4d803e6832baef64b3fb2093e97f237200f..1dc77a2e3ee54fa8e3fa5c032442cffe3b19b885 100644
--- a/src/thread/Id.hxx
+++ b/src/thread/Id.hxx
@@ -20,7 +20,7 @@
#ifndef MPD_THREAD_ID_HXX
#define MPD_THREAD_ID_HXX
-#include "Compiler.h"
+#include "util/Compiler.h"
#ifdef _WIN32
#include <windows.h>
diff --git a/src/thread/Thread.hxx b/src/thread/Thread.hxx
index 822943ac33a8bf81e679e705b9e3954c81c7923f..7f724a627c4e0c6f2be9851c73958d263b422c7d 100644
--- a/src/thread/Thread.hxx
+++ b/src/thread/Thread.hxx
@@ -22,7 +22,7 @@
#include "check.h"
#include "util/BindMethod.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#ifdef _WIN32
#include <windows.h>
diff --git a/src/Compiler.h b/src/util/Compiler.h
similarity index 100%
rename from src/Compiler.h
rename to src/util/Compiler.h
diff --git a/src/win32/Win32Main.cxx b/src/win32/Win32Main.cxx
index 6475509b04474fed1a1de230a44b81dc6da4e2f8..f1c22f59f6d0b84f058f6dfc0b2967de2a772a82 100644
--- a/src/win32/Win32Main.cxx
+++ b/src/win32/Win32Main.cxx
@@ -22,7 +22,7 @@
#ifdef _WIN32
-#include "Compiler.h"
+#include "util/Compiler.h"
#include "Instance.hxx"
#include "system/FatalError.hxx"
diff --git a/src/zeroconf/AvahiPoll.hxx b/src/zeroconf/AvahiPoll.hxx
index d1a13c13030f6746656851f50df6a580b121f80d..83bae006dfb75d223c124471dc22e9b3b64feae8 100644
--- a/src/zeroconf/AvahiPoll.hxx
+++ b/src/zeroconf/AvahiPoll.hxx
@@ -21,7 +21,7 @@
#define MPD_AVAHI_POLL_HXX
#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <avahi-common/watch.h>
diff --git a/src/zeroconf/ZeroconfBonjour.cxx b/src/zeroconf/ZeroconfBonjour.cxx
index 9125bf48365f4ab89b31761fb2a48f771d0b6050..ebf6363635e594d0c9e13dca258a52fcc4817c39 100644
--- a/src/zeroconf/ZeroconfBonjour.cxx
+++ b/src/zeroconf/ZeroconfBonjour.cxx
@@ -24,7 +24,7 @@
#include "event/SocketMonitor.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <dns_sd.h>
diff --git a/src/zeroconf/ZeroconfGlue.cxx b/src/zeroconf/ZeroconfGlue.cxx
index e3ecb8eba62a997d349bb2beabe021bcd77e201c..21b9403d01fa7a4bf79ca7c73af6aac534c5a6d7 100644
--- a/src/zeroconf/ZeroconfGlue.cxx
+++ b/src/zeroconf/ZeroconfGlue.cxx
@@ -26,7 +26,7 @@
#include "Listen.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
static constexpr Domain zeroconf_domain("zeroconf");
diff --git a/test/DumpDecoderClient.cxx b/test/DumpDecoderClient.cxx
index 3c459d469487984b1a4d1f473376b9e2861eef9a..d6f29d192e128f0e13d3c92b64499204b1872c45 100644
--- a/test/DumpDecoderClient.cxx
+++ b/test/DumpDecoderClient.cxx
@@ -22,7 +22,7 @@
#include "decoder/DecoderAPI.hxx"
#include "input/InputStream.hxx"
#include "util/StringBuffer.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <unistd.h>
#include <stdio.h>
diff --git a/test/test_archive.cxx b/test/test_archive.cxx
index 1b15e306f66be45899cbcdd8f7657843a81a1277..655e65f6dec1817ef271854c91c39342061d69f4 100644
--- a/test/test_archive.cxx
+++ b/test/test_archive.cxx
@@ -1,6 +1,6 @@
#include "config.h"
#include "archive/ArchiveLookup.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
diff --git a/test/test_byte_reverse.cxx b/test/test_byte_reverse.cxx
index f884e1fbe29d16fc264f5de35c24a0db5cca6de3..69bae7c77f07a5b44d8b7d345a3c891679923f0b 100644
--- a/test/test_byte_reverse.cxx
+++ b/test/test_byte_reverse.cxx
@@ -19,7 +19,7 @@
#include "util/ByteReverse.hxx"
#include "util/Macros.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
diff --git a/test/test_pcm_main.cxx b/test/test_pcm_main.cxx
index be50936dfb01e1f2b7ac780be541ccbcc73a4791..f65862fe252afa0ca1c0d37cb7367c27f743167f 100644
--- a/test/test_pcm_main.cxx
+++ b/test/test_pcm_main.cxx
@@ -20,7 +20,7 @@
#include "config.h"
#include "test_pcm_all.hxx"
#include "TestAudioFormat.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/ui/text/TestRunner.h>
diff --git a/test/test_protocol.cxx b/test/test_protocol.cxx
index 38f92fa3eb5238d2aee8f3045ccf5cdb993c6cb2..596e4afc33f6015e5fb570a4f89093acf35ffd4c 100644
--- a/test/test_protocol.cxx
+++ b/test/test_protocol.cxx
@@ -1,7 +1,7 @@
#include "config.h"
#include "protocol/ArgParser.hxx"
#include "protocol/Ack.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/TestFactoryRegistry.h>