[PATCH v3 19/26] util: Remove unused includes

Peng Liang <tcx4c70@xxxxxxxxx> · Wed, 8 Jun 2022 20:13:07 +0800

Signed-off-by: Peng Liang <tcx4c70@xxxxxxxxx>
---
 src/util/iohelper.c           | 3 ---
 src/util/virarptable.c        | 2 --
 src/util/virauth.c            | 1 -
 src/util/virauthconfig.c      | 1 -
 src/util/virbpf.c             | 1 -
 src/util/virbuffer.c          | 2 --
 src/util/vircgroup.c          | 3 ---
 src/util/vircgroupv2devices.c | 1 -
 src/util/virconf.c            | 1 -
 src/util/vircrypto.c          | 2 --
 src/util/virdnsmasq.c         | 2 --
 src/util/virebtables.c        | 3 ---
 src/util/virenum.c            | 1 -
 src/util/virerror.c           | 1 -
 src/util/vireventglib.c       | 1 -
 src/util/virfcp.c             | 2 --
 src/util/virfdstream.c        | 1 -
 src/util/virfilecache.c       | 2 --
 src/util/virfirewall.c        | 1 -
 src/util/virfirmware.c        | 1 -
 src/util/virhook.c            | 2 --
 src/util/virhostcpu.c         | 2 --
 src/util/virhostmem.c         | 2 --
 src/util/virhostuptime.c      | 1 -
 src/util/viridentity.c        | 3 ---
 src/util/virinitctl.c         | 3 ---
 src/util/viriptables.c        | 6 ------
 src/util/viriscsi.c           | 2 --
 src/util/virjson.c            | 1 -
 src/util/virkmod.c            | 1 -
 src/util/virlease.c           | 2 --
 src/util/virlockspace.c       | 1 -
 src/util/virmacaddr.c         | 1 -
 src/util/virmacmap.c          | 2 --
 src/util/virnetdevbandwidth.c | 1 -
 src/util/virnetdevbridge.c    | 2 --
 src/util/virnetdevmacvlan.c   | 2 --
 src/util/virnetdevmacvlan.h   | 2 --
 src/util/virnetdevmidonet.c   | 1 -
 src/util/virnetdevtap.c       | 1 -
 src/util/virnetdevveth.c      | 2 --
 src/util/virnetdevvlan.c      | 1 -
 src/util/virnetlink.c         | 1 -
 src/util/virnvme.c            | 1 -
 src/util/virobject.c          | 2 --
 src/util/virpci.c             | 1 -
 src/util/virpcivpd.c          | 1 -
 src/util/virperf.c            | 2 --
 src/util/virpidfile.c         | 1 -
 src/util/virpolkit.c          | 2 --
 src/util/virportallocator.c   | 3 ---
 src/util/virqemu.c            | 2 --
 src/util/virrandom.c          | 3 ---
 src/util/virresctrl.h         | 1 -
 src/util/virrotatingfile.c    | 1 -
 src/util/virscsivhost.c       | 1 -
 src/util/virseclabel.c        | 2 --
 src/util/virsecret.c          | 1 -
 src/util/virsocketaddr.c      | 2 --
 src/util/virstoragefile.c     | 4 ----
 src/util/virtpm.c             | 1 -
 src/util/virutil.c            | 2 --
 src/util/viruuid.c            | 3 ---
 63 files changed, 110 deletions(-)

diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index 055540c8c4..dd77bda723 100644
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -31,11 +31,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "virthread.h"
 #include "virfile.h"
-#include "viralloc.h"
 #include "virerror.h"
-#include "virrandom.h"
 #include "virstring.h"
 #include "virgettext.h"
 
diff --git a/src/util/virarptable.c b/src/util/virarptable.c
index 3b9ece3d9b..7f9fefc160 100644
--- a/src/util/virarptable.c
+++ b/src/util/virarptable.c
@@ -27,11 +27,9 @@
 #include "viralloc.h"
 #include "virarptable.h"
 #include "virerror.h"
-#include "virfile.h"
 #include "virlog.h"
 #include "virnetlink.h"
 #include "virsocketaddr.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
diff --git a/src/util/virauth.c b/src/util/virauth.c
index e7fe8c97dd..b9c2ae3ed1 100644
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -31,7 +31,6 @@
 #include "virerror.h"
 #include "configmake.h"
 #include "virauthconfig.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_AUTH
 
diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index 63d9cebdf7..dabd7cd217 100644
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -24,7 +24,6 @@
 
 #include "virlog.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "viralloc.h"
 
 struct _virAuthConfig {
diff --git a/src/util/virbpf.c b/src/util/virbpf.c
index df4f333614..1169b99d07 100644
--- a/src/util/virbpf.c
+++ b/src/util/virbpf.c
@@ -18,7 +18,6 @@
 #include <config.h>
 
 #include "virlog.h"
-#include "virerror.h"
 #include "virbpf.h"
 
 VIR_LOG_INIT("util.bpf");
diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index 19cf775a8c..01d04cc4f9 100644
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -23,8 +23,6 @@
 #include <stdarg.h>
 
 #include "virbuffer.h"
-#include "virstring.h"
-#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 5cfc20f1ed..9918430cca 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -35,19 +35,16 @@
 #define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 #include "vircgrouppriv.h"
 
-#include "virutil.h"
 #include "viralloc.h"
 #include "vircgroupbackend.h"
 #include "virerror.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "virgdbus.h"
-#include "virhash.h"
 #include "virstring.h"
 #include "virsystemd.h"
 #include "virtypedparam.h"
 #include "virhostcpu.h"
-#include "virthread.h"
 
 VIR_LOG_INIT("util.cgroup");
 
diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c
index ffa65bdd00..1769c499c8 100644
--- a/src/util/vircgroupv2devices.c
+++ b/src/util/vircgroupv2devices.c
@@ -30,7 +30,6 @@
 #define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 #include "vircgrouppriv.h"
 
-#include "viralloc.h"
 #include "virbpf.h"
 #include "vircgroup.h"
 #include "vircgroupv2devices.h"
diff --git a/src/util/virconf.c b/src/util/virconf.c
index 0d0c04a824..8a96805642 100644
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -32,7 +32,6 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "virfile.h"
-#include "virstring.h"
 #include "configmake.h"
 
 #define VIR_FROM_THIS VIR_FROM_CONF
diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c
index 23692d22fb..828e822d8e 100644
--- a/src/util/vircrypto.c
+++ b/src/util/vircrypto.c
@@ -23,8 +23,6 @@
 #include "vircrypto.h"
 #include "virlog.h"
 #include "virerror.h"
-#include "viralloc.h"
-#include "virrandom.h"
 #include "virsecureerase.h"
 
 #include <gnutls/gnutls.h>
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index fd4efa802c..342b489ab7 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -31,8 +31,6 @@
 #include <signal.h>
 
 #include "internal.h"
-#include "datatypes.h"
-#include "virbitmap.h"
 #include "virdnsmasq.h"
 #include "vircommand.h"
 #include "viralloc.h"
diff --git a/src/util/virebtables.c b/src/util/virebtables.c
index e296cf2578..a1f5f7cf1e 100644
--- a/src/util/virebtables.c
+++ b/src/util/virebtables.c
@@ -23,10 +23,7 @@
 
 #include "internal.h"
 #include "virebtables.h"
-#include "viralloc.h"
-#include "virerror.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "virfirewall.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virenum.c b/src/util/virenum.c
index 103f00b524..c6936e58ff 100644
--- a/src/util/virenum.c
+++ b/src/util/virenum.c
@@ -18,7 +18,6 @@
 #include <config.h>
 
 #include "virenum.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 5c8b9ebeb5..d114c0a346 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -27,7 +27,6 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virthread.h"
-#include "virstring.h"
 #include "virbuffer.h"
 
 #define LIBVIRT_VIRERRORPRIV_H_ALLOW
diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c
index fc04d8f712..b01ddb814e 100644
--- a/src/util/vireventglib.c
+++ b/src/util/vireventglib.c
@@ -27,7 +27,6 @@
 
 #include "vireventglib.h"
 #include "vireventglibwatch.h"
-#include "virerror.h"
 #include "virlog.h"
 #include "virprobe.h"
 
diff --git a/src/util/virfcp.c b/src/util/virfcp.c
index 5e8fe72fec..bb62fa9025 100644
--- a/src/util/virfcp.c
+++ b/src/util/virfcp.c
@@ -22,10 +22,8 @@
 
 #include "internal.h"
 
-#include "viralloc.h"
 #include "virfile.h"
 #include "virerror.h"
-#include "virstring.h"
 
 #include "virfcp.h"
 
diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c
index b596659702..3de0d59a8b 100644
--- a/src/util/virfdstream.c
+++ b/src/util/virfdstream.c
@@ -39,7 +39,6 @@
 #include "configmake.h"
 #include "virstring.h"
 #include "virtime.h"
-#include "virprocess.h"
 #include "virsocket.h"
 
 #define VIR_FROM_THIS VIR_FROM_STREAMS
diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c
index cfcfc26e19..c4bc984020 100644
--- a/src/util/virfilecache.c
+++ b/src/util/virfilecache.c
@@ -24,7 +24,6 @@
 
 #include "internal.h"
 
-#include "viralloc.h"
 #include "virbuffer.h"
 #include "vircrypto.h"
 #include "virerror.h"
@@ -33,7 +32,6 @@
 #include "virhash.h"
 #include "virlog.h"
 #include "virobject.h"
-#include "virstring.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index 31a8352d4e..3183e0aec7 100644
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -26,7 +26,6 @@
 #include "virfirewalld.h"
 #include "viralloc.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "vircommand.h"
 #include "virlog.h"
 #include "virfile.h"
diff --git a/src/util/virfirmware.c b/src/util/virfirmware.c
index b2e3491544..9b333cf04b 100644
--- a/src/util/virfirmware.c
+++ b/src/util/virfirmware.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include "viralloc.h"
 #include "virerror.h"
 #include "virfirmware.h"
 #include "virlog.h"
diff --git a/src/util/virhook.c b/src/util/virhook.c
index b52e2cd814..871bfcc670 100644
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -27,9 +27,7 @@
 
 #include "virerror.h"
 #include "virhook.h"
-#include "virutil.h"
 #include "virlog.h"
-#include "viralloc.h"
 #include "virfile.h"
 #include "configmake.h"
 #include "vircommand.h"
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index e3f2d6d4b7..639dd9b51e 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -45,9 +45,7 @@
 #include "virerror.h"
 #include "virarch.h"
 #include "virfile.h"
-#include "virtypedparam.h"
 #include "virstring.h"
-#include "virnuma.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c
index 5984dfab3f..052f7cd935 100644
--- a/src/util/virhostmem.c
+++ b/src/util/virhostmem.c
@@ -36,10 +36,8 @@
 # include <windows.h>
 #endif
 
-#include "viralloc.h"
 #include "virhostmem.h"
 #include "virerror.h"
-#include "virarch.h"
 #include "virfile.h"
 #include "virtypedparam.h"
 #include "virstring.h"
diff --git a/src/util/virhostuptime.c b/src/util/virhostuptime.c
index 7508a5a9b6..3d41fa081d 100644
--- a/src/util/virhostuptime.c
+++ b/src/util/virhostuptime.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "virhostuptime.h"
-#include "viralloc.h"
 #include "virfile.h"
 #include "virlog.h"
 #include "virstring.h"
diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index e3a9cbb661..46dcf3a04e 100644
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -30,15 +30,12 @@
 #define LIBVIRT_VIRIDENTITYPRIV_H_ALLOW
 
 #include "internal.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "viridentitypriv.h"
 #include "virlog.h"
-#include "virobject.h"
 #include "virrandom.h"
 #include "virthread.h"
 #include "virutil.h"
-#include "virstring.h"
 #include "virprocess.h"
 #include "virtypedparam.h"
 #include "virfile.h"
diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
index d7e29f24c3..1b9f2ad022 100644
--- a/src/util/virinitctl.c
+++ b/src/util/virinitctl.c
@@ -26,10 +26,7 @@
 #include "internal.h"
 #include "virinitctl.h"
 #include "virerror.h"
-#include "virutil.h"
-#include "viralloc.h"
 #include "virfile.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_INITCTL
 
diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index 7db09a0d80..e9886a200e 100644
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -29,14 +29,8 @@
 #include "internal.h"
 #include "viriptables.h"
 #include "virfirewalld.h"
-#include "vircommand.h"
-#include "viralloc.h"
 #include "virerror.h"
-#include "virfile.h"
 #include "virlog.h"
-#include "virthread.h"
-#include "virstring.h"
-#include "virutil.h"
 #include "virhash.h"
 
 VIR_LOG_INIT("util.iptables");
diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c
index e84d49b03c..fbf84c9305 100644
--- a/src/util/viriscsi.c
+++ b/src/util/viriscsi.c
@@ -27,10 +27,8 @@
 #include "viralloc.h"
 #include "vircommand.h"
 #include "virerror.h"
-#include "virfile.h"
 #include "virlog.h"
 #include "virrandom.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
diff --git a/src/util/virjson.c b/src/util/virjson.c
index ae970c7653..53f8cdff95 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -28,7 +28,6 @@
 #include "virerror.h"
 #include "virlog.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "virbuffer.h"
 #include "virenum.h"
 #include "virbitmap.h"
diff --git a/src/util/virkmod.c b/src/util/virkmod.c
index 6a996ebb04..4c709f8659 100644
--- a/src/util/virkmod.c
+++ b/src/util/virkmod.c
@@ -23,7 +23,6 @@
 #include "viralloc.h"
 #include "virkmod.h"
 #include "vircommand.h"
-#include "virstring.h"
 
 static int
 doModprobe(const char *opts, const char *module, char **outbuf, char **errbuf)
diff --git a/src/util/virlease.c b/src/util/virlease.c
index 48b0f6fe57..357bacd83d 100644
--- a/src/util/virlease.c
+++ b/src/util/virlease.c
@@ -29,8 +29,6 @@
 #include "virfile.h"
 #include "virstring.h"
 #include "virerror.h"
-#include "viralloc.h"
-#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NETWORK
 
diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 79925053bf..d54162b3d7 100644
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -29,7 +29,6 @@
 #include "virfile.h"
 #include "virhash.h"
 #include "virthread.h"
-#include "virstring.h"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c
index 6b22384cee..073f298b5b 100644
--- a/src/util/virmacaddr.c
+++ b/src/util/virmacaddr.c
@@ -23,7 +23,6 @@
 
 #include "virmacaddr.h"
 #include "virrandom.h"
-#include "viralloc.h"
 
 static const unsigned char virMacAddrBroadcastAddrRaw[VIR_MAC_BUFLEN] =
     { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c
index cf554205a8..98be64fb31 100644
--- a/src/util/virmacmap.c
+++ b/src/util/virmacmap.c
@@ -26,8 +26,6 @@
 #include "virjson.h"
 #include "virfile.h"
 #include "virhash.h"
-#include "virstring.h"
-#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NETWORK
 
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 2895be8d27..d816bcbf06 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -24,7 +24,6 @@
 #include "viralloc.h"
 #include "virerror.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index a9667b48ce..f1a1c7f509 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -22,10 +22,8 @@
 #include "virnetdev.h"
 #include "virerror.h"
 #include "virfile.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "virstring.h"
-#include "virsocket.h"
 
 #ifdef WITH_NET_IF_H
 # include <net/if.h>
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 1985d1028a..94968a8b4d 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -24,8 +24,6 @@
 #include "virnetdevmacvlan.h"
 #include "virmacaddr.h"
 #include "virerror.h"
-#include "virthread.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NET
 
diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h
index 0a013fc242..405e48088f 100644
--- a/src/util/virnetdevmacvlan.h
+++ b/src/util/virnetdevmacvlan.h
@@ -21,8 +21,6 @@
 
 #include "internal.h"
 #include "virmacaddr.h"
-#include "virsocketaddr.h"
-#include "virnetdevbandwidth.h"
 #include "virnetdevvportprofile.h"
 #include "virnetdevvlan.h"
 #include "virenum.h"
diff --git a/src/util/virnetdevmidonet.c b/src/util/virnetdevmidonet.c
index 72b2fd4467..202808ef0f 100644
--- a/src/util/virnetdevmidonet.c
+++ b/src/util/virnetdevmidonet.c
@@ -20,7 +20,6 @@
 
 #include "virnetdevmidonet.h"
 #include "vircommand.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "viruuid.h"
 
diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index cdaf67a72e..112a1e8b99 100644
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -29,7 +29,6 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virstring.h"
-#include "datatypes.h"
 
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index b580e105ac..ad1f517039 100644
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -24,8 +24,6 @@
 #include "virlog.h"
 #include "vircommand.h"
 #include "virerror.h"
-#include "virfile.h"
-#include "virstring.h"
 #include "virnetdev.h"
 #include "virnetlink.h"
 
diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c
index 64fbacd4f8..67daa5d3b4 100644
--- a/src/util/virnetdevvlan.c
+++ b/src/util/virnetdevvlan.c
@@ -19,7 +19,6 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virerror.h"
 #include "virnetdevvlan.h"
 #include "viralloc.h"
 
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index c6b015d7a9..98f75652e9 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -30,7 +30,6 @@
 #include "virmacaddr.h"
 #include "virerror.h"
 #include "viralloc.h"
-#include "virsocket.h"
 
 #define VIR_FROM_THIS VIR_FROM_NET
 
diff --git a/src/util/virnvme.c b/src/util/virnvme.c
index 3ce02b5000..d0f0c04aba 100644
--- a/src/util/virnvme.c
+++ b/src/util/virnvme.c
@@ -23,7 +23,6 @@
 #include "virpci.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virstring.h"
 
 VIR_LOG_INIT("util.nvme");
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virobject.c b/src/util/virobject.c
index 74cc84205e..d1cd4d32f1 100644
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -24,11 +24,9 @@
 #define VIR_PARENT_REQUIRED /* empty, to allow virObject to have no parent */
 #include "virobject.h"
 #include "virthread.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "virlog.h"
 #include "virprobe.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
diff --git a/src/util/virpci.c b/src/util/virpci.c
index d141fde814..03d1d7b074 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -31,7 +31,6 @@
 #include <unistd.h>
 
 #include "virlog.h"
-#include "vircommand.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virkmod.h"
diff --git a/src/util/virpcivpd.c b/src/util/virpcivpd.c
index 9af0566d19..4ba4fea237 100644
--- a/src/util/virpcivpd.c
+++ b/src/util/virpcivpd.c
@@ -30,7 +30,6 @@
 #include "virpcivpdpriv.h"
 #include "virlog.h"
 #include "virerror.h"
-#include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
diff --git a/src/util/virperf.c b/src/util/virperf.c
index fde8ca7e34..434d1d99c4 100644
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -30,8 +30,6 @@
 #include "virlog.h"
 #include "virfile.h"
 #include "virstring.h"
-#include "virtypedparam.h"
-#include "viralloc.h"
 
 VIR_LOG_INIT("util.perf");
 
diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index 9d194f7336..bfd967c1af 100644
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -29,7 +29,6 @@
 
 #include "virpidfile.h"
 #include "virfile.h"
-#include "viralloc.h"
 #include "virbuffer.h"
 #include "virutil.h"
 #include "virlog.h"
diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c
index 8970de192f..6c83eaf412 100644
--- a/src/util/virpolkit.c
+++ b/src/util/virpolkit.c
@@ -26,8 +26,6 @@
 #include "virpolkit.h"
 #include "virerror.h"
 #include "virlog.h"
-#include "virstring.h"
-#include "virprocess.h"
 #include "viralloc.h"
 #include "virgdbus.h"
 #include "virfile.h"
diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c
index 97ab362749..87835a3ed7 100644
--- a/src/util/virportallocator.c
+++ b/src/util/virportallocator.c
@@ -24,13 +24,10 @@
 #include <unistd.h>
 
 #include "virsocket.h"
-#include "viralloc.h"
 #include "virbitmap.h"
 #include "virportallocator.h"
 #include "virthread.h"
 #include "virerror.h"
-#include "virfile.h"
-#include "virstring.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virqemu.c b/src/util/virqemu.c
index 8ff61b22b0..9dc0eab386 100644
--- a/src/util/virqemu.c
+++ b/src/util/virqemu.c
@@ -26,8 +26,6 @@
 #include "virerror.h"
 #include "virlog.h"
 #include "virqemu.h"
-#include "virstring.h"
-#include "viralloc.h"
 #include "virbitmap.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index c3f3aa1fa6..e23ddf8e1d 100644
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -28,11 +28,8 @@
 #include <gnutls/crypto.h>
 
 #include "virrandom.h"
-#include "virthread.h"
 #include "virerror.h"
-#include "virfile.h"
 #include "virlog.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h
index 5d7b23c3c4..0e4b535f9e 100644
--- a/src/util/virresctrl.h
+++ b/src/util/virresctrl.h
@@ -21,7 +21,6 @@
 #include "internal.h"
 
 #include "virobject.h"
-#include "virbitmap.h"
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c
index 4e6fa382a8..d339e58e1c 100644
--- a/src/util/virrotatingfile.c
+++ b/src/util/virrotatingfile.c
@@ -28,7 +28,6 @@
 #include "virrotatingfile.h"
 #include "viralloc.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "virfile.h"
 #include "virlog.h"
 
diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c
index 487301ab64..1ea6a1ee2a 100644
--- a/src/util/virscsivhost.c
+++ b/src/util/virscsivhost.c
@@ -25,7 +25,6 @@
 #include "virlog.h"
 #include "virerror.h"
 #include "virfile.h"
-#include "virstring.h"
 #include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virseclabel.c b/src/util/virseclabel.c
index 907e154d14..d7e4834d5f 100644
--- a/src/util/virseclabel.c
+++ b/src/util/virseclabel.c
@@ -22,9 +22,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "viralloc.h"
 #include "virseclabel.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
diff --git a/src/util/virsecret.c b/src/util/virsecret.c
index 604d900f77..c01f3fb967 100644
--- a/src/util/virsecret.c
+++ b/src/util/virsecret.c
@@ -26,7 +26,6 @@
 #include "virerror.h"
 #include "virlog.h"
 #include "virsecret.h"
-#include "virstring.h"
 #include "viruuid.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index 430e43f2eb..0480485ab7 100644
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -20,9 +20,7 @@
 
 #include "virsocketaddr.h"
 #include "virerror.h"
-#include "virstring.h"
 #include "virbuffer.h"
-#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index e3ec64486e..873da65d42 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -23,14 +23,10 @@
 #include "virstoragefile.h"
 
 #include "viralloc.h"
-#include "viruuid.h"
 #include "virerror.h"
 #include "virlog.h"
 #include "vircommand.h"
-#include "virhash.h"
 #include "virstring.h"
-#include "virbuffer.h"
-#include "virsecret.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 
diff --git a/src/util/virtpm.c b/src/util/virtpm.c
index 65126f8160..b898f3a6db 100644
--- a/src/util/virtpm.c
+++ b/src/util/virtpm.c
@@ -22,7 +22,6 @@
 
 #include <sys/stat.h>
 
-#include "virstring.h"
 #include "virerror.h"
 #include "viralloc.h"
 #include "virfile.h"
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 176e2f8f59..7e246d22d1 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -48,11 +48,9 @@
 
 #include "virerror.h"
 #include "virlog.h"
-#include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "vircommand.h"
-#include "virprocess.h"
 #include "virstring.h"
 #include "virutil.h"
 #include "virsocket.h"
diff --git a/src/util/viruuid.c b/src/util/viruuid.c
index 558fbb9c0d..ca22c91d48 100644
--- a/src/util/viruuid.c
+++ b/src/util/viruuid.c
@@ -25,13 +25,10 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "internal.h"
-#include "virerror.h"
 #include "virlog.h"
-#include "viralloc.h"
 #include "virfile.h"
 #include "virrandom.h"
 
-- 
2.36.1







