19 files changed, 1 insertions, 35 deletions
diff --git a/src/ClientExpire.cxx b/src/ClientExpire.cxx
index ea842cfd9..5954bba8b 100644
--- a/src/ClientExpire.cxx
+++ b/src/ClientExpire.cxx
@@ -21,8 +21,6 @@
 #include "ClientInternal.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
-
 void
 Client::SetExpired()
 {
diff --git a/src/ClientProcess.cxx b/src/ClientProcess.cxx
index 7da1664ca..0e361fb30 100644
--- a/src/ClientProcess.cxx
+++ b/src/ClientProcess.cxx
@@ -23,8 +23,6 @@
 #include "AllCommands.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
-
 #include <string.h>
 
 #define CLIENT_LIST_MODE_BEGIN "command_list_begin"
diff --git a/src/DatabaseGlue.cxx b/src/DatabaseGlue.cxx
index d47108f71..d46e3022a 100644
--- a/src/DatabaseGlue.cxx
+++ b/src/DatabaseGlue.cxx
@@ -30,8 +30,6 @@
 #include "DatabasePlugin.hxx"
 #include "db/SimpleDatabasePlugin.hxx"
 
-#include <glib.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/GlobalEvents.cxx b/src/GlobalEvents.cxx
index 9e0509d40..0a9354bec 100644
--- a/src/GlobalEvents.cxx
+++ b/src/GlobalEvents.cxx
@@ -26,7 +26,6 @@
 #include <atomic>
 
 #include <assert.h>
-#include <glib.h>
 
 namespace GlobalEvents {
 	class Monitor final : public DeferredMonitor {
diff --git a/src/InotifySource.cxx b/src/InotifySource.cxx
index bf292af60..b6d43f657 100644
--- a/src/InotifySource.cxx
+++ b/src/InotifySource.cxx
@@ -25,8 +25,6 @@
 #include "system/FatalError.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
-
 #include <sys/inotify.h>
 #include <unistd.h>
 
diff --git a/src/Listen.cxx b/src/Listen.cxx
index 7da39dd0e..d314423c5 100644
--- a/src/Listen.cxx
+++ b/src/Listen.cxx
@@ -31,8 +31,6 @@
 #include "fs/Path.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
-
 #include <string.h>
 #include <assert.h>
 
diff --git a/src/PlaylistVector.cxx b/src/PlaylistVector.cxx
index 68657af50..5bb0cdf64 100644
--- a/src/PlaylistVector.cxx
+++ b/src/PlaylistVector.cxx
@@ -25,7 +25,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <glib.h>
 
 PlaylistVector::iterator
 PlaylistVector::find(const char *name)
diff --git a/src/ReplayGainConfig.cxx b/src/ReplayGainConfig.cxx
index 840403923..ec54dd3e7 100644
--- a/src/ReplayGainConfig.cxx
+++ b/src/ReplayGainConfig.cxx
@@ -25,8 +25,6 @@
 #include "Playlist.hxx"
 #include "system/FatalError.hxx"
 
-#include <glib.h>
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index 98a58c53e..b6e0acb60 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -34,8 +34,6 @@
 #include "tag/TagId3.hxx"
 #include "tag/ApeTag.hxx"
 
-#include <glib.h>
-
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/TimePrint.cxx b/src/TimePrint.cxx
index a0b07c447..129fa5352 100644
--- a/src/TimePrint.cxx
+++ b/src/TimePrint.cxx
@@ -21,8 +21,6 @@
 #include "TimePrint.hxx"
 #include "Client.hxx"
 
-#include <glib.h>
-
 void
 time_print(Client *client, const char *name, time_t t)
 {
diff --git a/src/UpdateDatabase.cxx b/src/UpdateDatabase.cxx
index 9d2fa9017..83bc66876 100644
--- a/src/UpdateDatabase.cxx
+++ b/src/UpdateDatabase.cxx
@@ -25,8 +25,8 @@
 #include "Song.hxx"
 #include "DatabaseLock.hxx"
 
-#include <glib.h>
 #include <assert.h>
+#include <stddef.h>
 
 void
 delete_song(Directory *dir, Song *del)
diff --git a/src/archive/Iso9660ArchivePlugin.cxx b/src/archive/Iso9660ArchivePlugin.cxx
index 2fee25311..bb49f4add 100644
--- a/src/archive/Iso9660ArchivePlugin.cxx
+++ b/src/archive/Iso9660ArchivePlugin.cxx
@@ -36,8 +36,6 @@
 #include <cdio/cdio.h>
 #include <cdio/iso9660.h>
 
-#include <glib.h>
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/db/SimpleDatabasePlugin.cxx b/src/db/SimpleDatabasePlugin.cxx
index 2cb820827..03acd1760 100644
--- a/src/db/SimpleDatabasePlugin.cxx
+++ b/src/db/SimpleDatabasePlugin.cxx
@@ -33,8 +33,6 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
-
 #include <sys/types.h>
 #include <errno.h>
 
diff --git a/src/encoder/FlacEncoderPlugin.cxx b/src/encoder/FlacEncoderPlugin.cxx
index 5a77e24a7..fa7ed992d 100644
--- a/src/encoder/FlacEncoderPlugin.cxx
+++ b/src/encoder/FlacEncoderPlugin.cxx
@@ -31,8 +31,6 @@ extern "C" {
 #include "util/growing_fifo.h"
 }
 
-#include <glib.h>
-
 #include <assert.h>
 #include <string.h>
 
diff --git a/src/filter/ChainFilterPlugin.cxx b/src/filter/ChainFilterPlugin.cxx
index 90e196d76..ab1bfbd12 100644
--- a/src/filter/ChainFilterPlugin.cxx
+++ b/src/filter/ChainFilterPlugin.cxx
@@ -26,8 +26,6 @@
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 
-#include <glib.h>
-
 #include <list>
 
 #include <assert.h>
diff --git a/src/filter/VolumeFilterPlugin.cxx b/src/filter/VolumeFilterPlugin.cxx
index cfc638f52..1b663f6eb 100644
--- a/src/filter/VolumeFilterPlugin.cxx
+++ b/src/filter/VolumeFilterPlugin.cxx
@@ -28,8 +28,6 @@
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 
-#include <glib.h>
-
 #include <assert.h>
 #include <string.h>
 
diff --git a/src/mixer/PulseMixerPlugin.cxx b/src/mixer/PulseMixerPlugin.cxx
index f651c34b0..368fd3830 100644
--- a/src/mixer/PulseMixerPlugin.cxx
+++ b/src/mixer/PulseMixerPlugin.cxx
@@ -26,8 +26,6 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
-
 #include <pulse/thread-mainloop.h>
 #include <pulse/context.h>
 #include <pulse/introspect.h>
diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/PcmConvert.cxx
index 4260ccb0f..95361ee1b 100644
--- a/src/pcm/PcmConvert.cxx
+++ b/src/pcm/PcmConvert.cxx
@@ -26,8 +26,6 @@
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 
-#include <glib.h>
-
 #include <assert.h>
 #include <math.h>
 
diff --git a/src/pcm/PcmVolume.cxx b/src/pcm/PcmVolume.cxx
index 05ab73c68..43906e202 100644
--- a/src/pcm/PcmVolume.cxx
+++ b/src/pcm/PcmVolume.cxx
@@ -22,8 +22,6 @@
 #include "PcmUtils.hxx"
 #include "AudioFormat.hxx"
 
-#include <glib.h>
-
 #include <stdint.h>
 #include <string.h>