diff --git a/src/DatabasePrint.hxx b/src/DatabasePrint.hxx
index 4aacd9363..413a923a3 100644
--- a/src/DatabasePrint.hxx
+++ b/src/DatabasePrint.hxx
@@ -23,8 +23,6 @@
 #include "gcc.h"
 #include "gerror.h"
 
-#include <stdbool.h>
-
 struct client;
 class SongFilter;
 struct DatabaseSelection;
diff --git a/src/InotifySource.cxx b/src/InotifySource.cxx
index 689468102..16fd62511 100644
--- a/src/InotifySource.cxx
+++ b/src/InotifySource.cxx
@@ -32,7 +32,6 @@ extern "C" {
 #include <sys/inotify.h>
 #include <unistd.h>
 #include <errno.h>
-#include <stdbool.h>
 
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "inotify"
diff --git a/src/InotifyUpdate.cxx b/src/InotifyUpdate.cxx
index e9350591b..3e438b697 100644
--- a/src/InotifyUpdate.cxx
+++ b/src/InotifyUpdate.cxx
@@ -31,7 +31,6 @@ extern "C" {
 #include <assert.h>
 #include <sys/inotify.h>
 #include <sys/stat.h>
-#include <stdbool.h>
 #include <string.h>
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/PlaylistFile.hxx b/src/PlaylistFile.hxx
index b20f0d762..6df5a46d3 100644
--- a/src/PlaylistFile.hxx
+++ b/src/PlaylistFile.hxx
@@ -25,7 +25,6 @@
 #include <string>
 
 #include <glib.h>
-#include <stdbool.h>
 #include <time.h>
 
 struct song;
diff --git a/src/PlaylistPrint.hxx b/src/PlaylistPrint.hxx
index ac0712f01..22db2fe02 100644
--- a/src/PlaylistPrint.hxx
+++ b/src/PlaylistPrint.hxx
@@ -21,7 +21,6 @@
 #define MPD_PLAYLIST_PRINT_HXX
 
 #include <glib.h>
-#include <stdbool.h>
 #include <stdint.h>
 
 struct client;
diff --git a/src/PlaylistQueue.hxx b/src/PlaylistQueue.hxx
index e1d3bf391..cda77c818 100644
--- a/src/PlaylistQueue.hxx
+++ b/src/PlaylistQueue.hxx
@@ -26,8 +26,6 @@
 
 #include "playlist_error.h"
 
-#include <stdbool.h>
-
 struct playlist_provider;
 struct playlist;
 struct player_control;
diff --git a/src/PlaylistSong.hxx b/src/PlaylistSong.hxx
index f6959715a..117ee1338 100644
--- a/src/PlaylistSong.hxx
+++ b/src/PlaylistSong.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_PLAYLIST_SONG_HXX
 #define MPD_PLAYLIST_SONG_HXX
 
-#include <stdbool.h>
-
 /**
  * Verifies the song, returns NULL if it is unsafe.  Translate the
  * song to a new song object within the database, if it is a local
diff --git a/src/SongFilter.hxx b/src/SongFilter.hxx
index a3068a970..afec81300 100644
--- a/src/SongFilter.hxx
+++ b/src/SongFilter.hxx
@@ -25,7 +25,6 @@
 #include <list>
 
 #include <stdint.h>
-#include <stdbool.h>
 
 #define LOCATE_TAG_FILE_TYPE	TAG_NUM_OF_ITEM_TYPES+10
 #define LOCATE_TAG_ANY_TYPE     TAG_NUM_OF_ITEM_TYPES+20
diff --git a/src/UpdateArchive.hxx b/src/UpdateArchive.hxx
index 533f8ffd0..5ce63978e 100644
--- a/src/UpdateArchive.hxx
+++ b/src/UpdateArchive.hxx
@@ -23,7 +23,6 @@
 #include "check.h"
 #include "gcc.h"
 
-#include <stdbool.h>
 #include <sys/stat.h>
 
 struct directory;
diff --git a/src/UpdateInternal.hxx b/src/UpdateInternal.hxx
index 76ab7bed3..50443c086 100644
--- a/src/UpdateInternal.hxx
+++ b/src/UpdateInternal.hxx
@@ -22,8 +22,6 @@
 
 #include "check.h"
 
-#include <stdbool.h>
-
 extern bool walk_discard;
 extern bool modified;
 
diff --git a/src/UpdateWalk.hxx b/src/UpdateWalk.hxx
index 7fa3083fc..62c0d0a8e 100644
--- a/src/UpdateWalk.hxx
+++ b/src/UpdateWalk.hxx
@@ -22,8 +22,6 @@
 
 #include "check.h"
 
-#include <stdbool.h>
-
 void
 update_walk_global_init(void);
 
diff --git a/src/db/SimpleDatabasePlugin.hxx b/src/db/SimpleDatabasePlugin.hxx
index 2ea5c4925..4de39b46c 100644
--- a/src/db/SimpleDatabasePlugin.hxx
+++ b/src/db/SimpleDatabasePlugin.hxx
@@ -26,7 +26,6 @@
 #include <cassert>
 #include <string>
 
-#include <stdbool.h>
 #include <time.h>
 
 struct directory;
diff --git a/src/decoder/FLACMetaData.cxx b/src/decoder/FLACMetaData.cxx
index 158e426db..561c1591f 100644
--- a/src/decoder/FLACMetaData.cxx
+++ b/src/decoder/FLACMetaData.cxx
@@ -32,7 +32,6 @@ extern "C" {
 #include <glib.h>
 
 #include <assert.h>
-#include <stdbool.h>
 #include <stdlib.h>
 
 static bool
diff --git a/src/decoder/FLACMetaData.hxx b/src/decoder/FLACMetaData.hxx
index 7b5eb8b0c..0eceec23c 100644
--- a/src/decoder/FLACMetaData.hxx
+++ b/src/decoder/FLACMetaData.hxx
@@ -26,7 +26,6 @@
 #include <FLAC/metadata.h>
 
 #include <assert.h>
-#include <stdbool.h>
 
 class FLACMetadataChain {
 	FLAC__Metadata_Chain *chain;
diff --git a/test/RunInotify.cxx b/test/RunInotify.cxx
index 491cddb78..2b77130d8 100644
--- a/test/RunInotify.cxx
+++ b/test/RunInotify.cxx
@@ -22,7 +22,6 @@
 
 #include <glib.h>
 
-#include <stdbool.h>
 #include <sys/inotify.h>
 #include <signal.h>