diff --git a/df/df.c b/df/df.c
index d39464346..0dcf1c965 100644
--- a/df/df.c
+++ b/df/df.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <unistd.h>
-#include <error.h>
 #include <errno.h>
 
 #include "guestfs.h"
diff --git a/df/output.c b/df/output.c
index cf80b11ee..b9bbcb6bd 100644
--- a/df/output.c
+++ b/df/output.c
@@ -27,14 +27,12 @@
 #include <errno.h>
 #include <libintl.h>
 #include <math.h>
-#include <assert.h>
 
 #ifdef HAVE_LIBVIRT
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
 #endif
 
-#include "c-ctype.h"
 #include "human.h"
 
 #include "guestfs.h"
diff --git a/df/parallel.c b/df/parallel.c
index b8522c733..a06e37016 100644
--- a/df/parallel.c
+++ b/df/parallel.c
@@ -25,7 +25,6 @@
 #include <libintl.h>
 #include <errno.h>
 #include <error.h>
-#include <assert.h>
 
 #include <pthread.h>
 
diff --git a/fish/options.c b/fish/options.c
index e7d914e0f..61c82ed87 100644
--- a/fish/options.c
+++ b/fish/options.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <libintl.h>
-#include <getopt.h>
 
 #include <libxml/uri.h>
 
diff --git a/src/actions-support.c b/src/actions-support.c
index 865567863..1fb9e4011 100644
--- a/src/actions-support.c
+++ b/src/actions-support.c
@@ -25,7 +25,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
-#include <assert.h>
 
 #include "guestfs.h"
 #include "guestfs-internal.h"
diff --git a/src/alloc.c b/src/alloc.c
index e9184af21..4bdadea26 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -30,8 +30,6 @@
 #include "guestfs.h"
 #include "guestfs-internal.h"
 
-#include "hash.h"
-
 void *
 guestfs___safe_malloc (guestfs_h *g, size_t nbytes)
 {
diff --git a/src/launch.c b/src/launch.c
index 01d76ef29..5896194c1 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -30,9 +30,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <errno.h>
-#include <assert.h>
-
-#include "c-ctype.h"
 
 #include "guestfs.h"
 #include "guestfs-internal.h"
diff --git a/src/libvirt-auth.c b/src/libvirt-auth.c
index ac1057394..cd9037887 100644
--- a/src/libvirt-auth.c
+++ b/src/libvirt-auth.c
@@ -20,7 +20,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 
 #ifdef HAVE_LIBVIRT
 #include <libvirt/libvirt.h>
diff --git a/src/private-data.c b/src/private-data.c
index 4ff1f6c81..7c50e8d8a 100644
--- a/src/private-data.c
+++ b/src/private-data.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "c-ctype.h"
 #include "hash.h"
 #include "hash-pjw.h"