diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c
index 8ad37ece69..ee04418bc0 100644
--- a/tools/virsh-checkpoint.c
+++ b/tools/virsh-checkpoint.c
@@ -33,9 +33,7 @@
 #include "viralloc.h"
 #include "virfile.h"
 #include "virsh-util.h"
-#include "virstring.h"
 #include "virxml.h"
-#include "conf/checkpoint_conf.h"
 #include "vsh-table.h"
 
 /* Helper for checkpoint-create and checkpoint-create-as */
diff --git a/tools/virsh-completer-checkpoint.c b/tools/virsh-completer-checkpoint.c
index b6d6c93e85..bdd3a4d850 100644
--- a/tools/virsh-completer-checkpoint.c
+++ b/tools/virsh-completer-checkpoint.c
@@ -21,10 +21,8 @@
 #include <config.h>
 
 #include "virsh-completer-checkpoint.h"
-#include "viralloc.h"
 #include "virsh-util.h"
 #include "virsh.h"
-#include "virstring.h"
 
 char **
 virshCheckpointNameCompleter(vshControl *ctl,
diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c
index d4c877cd04..b54baf3577 100644
--- a/tools/virsh-completer-domain.c
+++ b/tools/virsh-completer-domain.c
@@ -27,7 +27,6 @@
 #include "virsh-domain-monitor.h"
 #include "virsh-util.h"
 #include "virsh.h"
-#include "virstring.h"
 #include "virxml.h"
 #include "virperf.h"
 #include "virbitmap.h"
diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c
index 68bc6cfe25..05a84a43bb 100644
--- a/tools/virsh-completer-host.c
+++ b/tools/virsh-completer-host.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include "virsh-completer-host.h"
-#include "viralloc.h"
 #include "virsh.h"
 #include "virstring.h"
 #include "virxml.h"
diff --git a/tools/virsh-completer-interface.c b/tools/virsh-completer-interface.c
index 44ba35550a..72a32dcfe3 100644
--- a/tools/virsh-completer-interface.c
+++ b/tools/virsh-completer-interface.c
@@ -22,9 +22,7 @@
 
 #include "virsh-completer-interface.h"
 #include "virsh-util.h"
-#include "viralloc.h"
 #include "virsh.h"
-#include "virstring.h"
 
 typedef const char *
 (*virInterfaceStringCallback)(virInterfacePtr iface);
diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-network.c
index 839d71e961..f28d724ca8 100644
--- a/tools/virsh-completer-network.c
+++ b/tools/virsh-completer-network.c
@@ -25,7 +25,6 @@
 #include "viralloc.h"
 #include "virsh-network.h"
 #include "virsh.h"
-#include "virstring.h"
 
 char **
 virshNetworkNameCompleter(vshControl *ctl,
diff --git a/tools/virsh-completer-nodedev.c b/tools/virsh-completer-nodedev.c
index 57544da15d..d743df460e 100644
--- a/tools/virsh-completer-nodedev.c
+++ b/tools/virsh-completer-nodedev.c
@@ -24,10 +24,8 @@
 #include "virsh-util.h"
 #include "conf/node_device_conf.h"
 #include "conf/domain_conf.h"
-#include "viralloc.h"
 #include "virsh-nodedev.h"
 #include "virsh.h"
-#include "virstring.h"
 
 char **
 virshNodeDeviceNameCompleter(vshControl *ctl,
diff --git a/tools/virsh-completer-nwfilter.c b/tools/virsh-completer-nwfilter.c
index 9850dbba5d..3a0ddecead 100644
--- a/tools/virsh-completer-nwfilter.c
+++ b/tools/virsh-completer-nwfilter.c
@@ -22,9 +22,7 @@
 
 #include "virsh-completer-nwfilter.h"
 #include "virsh-util.h"
-#include "viralloc.h"
 #include "virsh.h"
-#include "virstring.h"
 
 char **
 virshNWFilterNameCompleter(vshControl *ctl,
diff --git a/tools/virsh-completer-pool.c b/tools/virsh-completer-pool.c
index 1a966d95b9..0600394411 100644
--- a/tools/virsh-completer-pool.c
+++ b/tools/virsh-completer-pool.c
@@ -23,10 +23,8 @@
 #include "virsh-completer-pool.h"
 #include "virsh-util.h"
 #include "conf/storage_conf.h"
-#include "viralloc.h"
 #include "virsh-pool.h"
 #include "virsh.h"
-#include "virstring.h"
 
 char **
 virshStoragePoolNameCompleter(vshControl *ctl,
diff --git a/tools/virsh-completer-secret.c b/tools/virsh-completer-secret.c
index 396997244d..f31127d0ce 100644
--- a/tools/virsh-completer-secret.c
+++ b/tools/virsh-completer-secret.c
@@ -21,11 +21,9 @@
 #include <config.h>
 
 #include "virsh-completer-secret.h"
-#include "viralloc.h"
 #include "virsh-secret.h"
 #include "virsh-util.h"
 #include "virsh.h"
-#include "virstring.h"
 
 char **
 virshSecretUUIDCompleter(vshControl *ctl,
diff --git a/tools/virsh-completer-snapshot.c b/tools/virsh-completer-snapshot.c
index 535841cf2e..c7974d715c 100644
--- a/tools/virsh-completer-snapshot.c
+++ b/tools/virsh-completer-snapshot.c
@@ -21,10 +21,8 @@
 #include <config.h>
 
 #include "virsh-completer-snapshot.h"
-#include "viralloc.h"
 #include "virsh-util.h"
 #include "virsh.h"
-#include "virstring.h"
 
 char **
 virshSnapshotNameCompleter(vshControl *ctl,
diff --git a/tools/virsh-completer-volume.c b/tools/virsh-completer-volume.c
index a1ebadccac..9a80112e59 100644
--- a/tools/virsh-completer-volume.c
+++ b/tools/virsh-completer-volume.c
@@ -22,10 +22,8 @@
 
 #include "virsh-completer-volume.h"
 #include "virsh-util.h"
-#include "viralloc.h"
 #include "virsh-pool.h"
 #include "virsh.h"
-#include "virstring.h"
 #include "virsh-volume.h"
 
 char **
diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
index e5610d0fe8..d4defba86e 100644
--- a/tools/virsh-completer.c
+++ b/tools/virsh-completer.c
@@ -21,8 +21,6 @@
 #include <config.h>
 
 #include "virsh-completer.h"
-#include "viralloc.h"
-#include "virstring.h"
 
 /**
  * A completer callback is a function that accepts three arguments:
diff --git a/tools/virsh-console.c b/tools/virsh-console.c
index b8780c714d..13ee811a92 100644
--- a/tools/virsh-console.c
+++ b/tools/virsh-console.c
@@ -35,7 +35,6 @@
 # include "virsh-console.h"
 # include "virsh-util.h"
 # include "virlog.h"
-# include "virfile.h"
 # include "viralloc.h"
 # include "virthread.h"
 # include "virerror.h"
diff --git a/tools/virsh-domain-event.c b/tools/virsh-domain-event.c
index 2d6db5f881..9531a5435c 100644
--- a/tools/virsh-domain-event.c
+++ b/tools/virsh-domain-event.c
@@ -17,13 +17,11 @@
  */
 
 #include <config.h>
-#include "virsh-domain-event.h"
 #include "virsh-util.h"
 
 #include "internal.h"
 #include "viralloc.h"
 #include "virenum.h"
-#include "virutil.h"
 #include "virtime.h"
 #include "virtypedparam.h"
 
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 06ed6ba9cf..d7fe037eb7 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -44,7 +44,6 @@
 #include "virsh-console.h"
 #include "virsh-domain-monitor.h"
 #include "virsh-host.h"
-#include "virerror.h"
 #include "virtime.h"
 #include "virtypedparam.h"
 #include "virxml.h"
diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 90066249af..1be912dd54 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -26,7 +26,6 @@
 #include "internal.h"
 #include "viralloc.h"
 #include "virfile.h"
-#include "virstring.h"
 #include "virtime.h"
 #include "conf/node_device_conf.h"
 #include "virenum.h"
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 7e7a8d511f..5fdc78470b 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -27,7 +27,6 @@
 #include "viralloc.h"
 #include "virfile.h"
 #include "conf/storage_conf.h"
-#include "virstring.h"
 #include "virtime.h"
 #include "vsh-table.h"
 #include "virenum.h"
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 7cd76f39e2..47a96e082b 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -31,7 +31,6 @@
 #include "viralloc.h"
 #include "virfile.h"
 #include "virsh-util.h"
-#include "virstring.h"
 #include "virxml.h"
 #include "conf/virdomainsnapshotobjlist.h"
 #include "vsh-table.h"
diff --git a/tools/virsh-util.c b/tools/virsh-util.c
index dc6ed7a86d..ef275a4369 100644
--- a/tools/virsh-util.c
+++ b/tools/virsh-util.c
@@ -22,7 +22,6 @@
 
 #include "virfile.h"
 #include "virstring.h"
-#include "viralloc.h"
 #include "virxml.h"
 
 static virDomainPtr
diff --git a/tools/virsh.c b/tools/virsh.c
index f7adb90be8..4a4ceef4ec 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -21,29 +21,22 @@
 #include <config.h>
 #include "virsh.h"
 
-#include <stdarg.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <sys/time.h>
 #include <fcntl.h>
-#include <time.h>
 #include <sys/stat.h>
-#include <inttypes.h>
 
 #include "internal.h"
 #include "virerror.h"
-#include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "virthread.h"
-#include "vircommand.h"
-#include "virtypedparam.h"
 #include "virstring.h"
 #include "virgettext.h"
 
 #include "virsh-backup.h"
 #include "virsh-checkpoint.h"
-#include "virsh-console.h"
 #include "virsh-domain.h"
 #include "virsh-domain-event.h"
 #include "virsh-domain-monitor.h"
diff --git a/tools/virsh.h b/tools/virsh.h
index d7a60b135d..f9841c8da2 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -23,8 +23,6 @@
 #include <unistd.h>
 
 #include "internal.h"
-#include "virerror.h"
-#include "virthread.h"
 #include "virpolkit.h"
 #include "vsh.h"
 #include "virsh-completer.h"
diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index e010763e21..952999ca3c 100644
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -32,7 +32,6 @@
 #include "virstring.h"
 #include "virthread.h"
 #include "virgettext.h"
-#include "virtime.h"
 #include "virt-admin-completer.h"
 #include "vsh-table.h"
 #include "virenum.h"
diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helper.c
index 0fb03da697..3f8757e496 100644
--- a/tools/virt-login-shell-helper.c
+++ b/tools/virt-login-shell-helper.c
@@ -21,7 +21,6 @@
 
 #include <getopt.h>
 #include <signal.h>
-#include <stdarg.h>
 #include <unistd.h>
 
 #include "internal.h"
diff --git a/tools/vsh-table.c b/tools/vsh-table.c
index aa2deb8c72..005cc564dd 100644
--- a/tools/vsh-table.c
+++ b/tools/vsh-table.c
@@ -22,7 +22,6 @@
 #include "vsh-table.h"
 
 #include <stdarg.h>
-#include <stddef.h>
 #include <wchar.h>
 #include <wctype.h>
 
diff --git a/tools/vsh.c b/tools/vsh.c
index 499794c8fc..0066504ebe 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -26,7 +26,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <inttypes.h>
 #include <signal.h>
 
 #if WITH_READLINE
diff --git a/tools/vsh.h b/tools/vsh.h
index 663dc1ffce..a43660b63d 100644
--- a/tools/vsh.h
+++ b/tools/vsh.h
@@ -26,7 +26,6 @@
 #endif
 
 #include "internal.h"
-#include "virerror.h"
 #include "virthread.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE