util: Remove unused includes

Signed-off-by: Peng Liang <tcx4c70@gmail.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index 055540c8c48ac66da75bb5e51a44426a5a21d5d7..dd77bda72386829c186363837389f090eb70f7c0 100644 (file)
--- 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 3b9ece3d9bf1a76be0a66b0636d9e4795124cbf0..7f9fefc16031d0a74833725e90e203b5c10e8a0c 100644 (file)
--- 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 e7fe8c97dd737fd5a2a30ad4e83000f88a0da37c..b9c2ae3ed1a9321374b3612299d3661e7bca0e4f 100644 (file)
--- 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 63d9cebdf7cb764eda8f4d0ead666ea6c0959bc3..dabd7cd2176f488719b412c4ced898f18da5989d 100644 (file)
--- 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 df4f33361466c13855d5270b6a73ca6684c2c9f5..1169b99d07675580055b6514670fb9eee508f8e0 100644 (file)
--- 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 19cf775a8c07748a363a2c088b785bae0f345f67..01d04cc4f97f6d683fc9762340a51c5aa008d88e 100644 (file)
--- 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 5cfc20f1ede9b8b17b248592d09fbf4c885deafc..9918430ccae9d7169bd3c3306d5e75719e09a969 100644 (file)
--- 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 ffa65bdd00f3db0ace7b8e065f563f4af250ac7d..1769c499c8bf7867eb936d85560d4a4cabead010 100644 (file)
--- 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 0d0c04a8244b036b440d29a972ea3abc2d687ca4..8a9680564201d230703223d260eed9f0537858d5 100644 (file)
--- 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 23692d22fbb29ee0b358aa86f350f1cafef8263a..828e822d8e746e92f6a7d4318dc6d50f12f88a22 100644 (file)
--- 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 fd4efa802c5363132a43a0cecc1650da475bdef6..342b489ab74df5734b271268691b95a26b281946 100644 (file)
--- 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 e296cf257875201ef31fd84fc46dc51432679403..a1f5f7cf1e49b6c77d7e7eec272f265680876e80 100644 (file)
--- 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 103f00b524130d89cfbdc80253a71caf3af74cbe..c6936e58ff071bbb958f2e5595439274a231745b 100644 (file)
--- 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 5c8b9ebeb5281b721b5e55f068483ae538e6ff98..d114c0a34661f5d8bf7dae6c52a52608df79f0b0 100644 (file)
--- 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 983787932fab625fed10510849aee55521bf0293..023dc37445c259f9f5b8491634bd3ea71dc768cc 100644 (file)
--- 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 5e8fe72fec1d25b32278771deb4ee1ffa8dd1d87..bb62fa90254dc86bfb2e35256494fb5e9293aaa6 100644 (file)
--- 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 b596659702c0ce7d65177f539b8bedd36b1a19df..3de0d59a8b4137393f86fd261f6b8780b2e4ee7e 100644 (file)
--- 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 cfcfc26e1993e6e42ad87640730670bc1d813959..c4bc9840207daabc4ee7240578f7e8d8455c5cfc 100644 (file)
--- 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 31a8352d4e914da828a7279591e1622af1d09fcd..3183e0aec7bd567e115985d98c1174c74eff24cb 100644 (file)
--- 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 b2e34915441fad155116a3ab168b1f372781a3dc..9b333cf04be4cc93f0580b87cba04bbc56bac9ad 100644 (file)
--- 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 b52e2cd814053c5964f9a68b99713b869a61114a..871bfcc670c390d11eb63d04c6bbbf7c478f61b0 100644 (file)
--- 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 e3f2d6d4b7d1100dec73bebb5715fa1b6c4147d6..639dd9b51e93e7031eebb11f02d6e5c6ae7298bc 100644 (file)
--- 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 5984dfab3f8b1b591614f8b61034c5bff4fba5b4..052f7cd935191b883de8c649cc4fc5639d42986a 100644 (file)
--- 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 7508a5a9b6369b7509c3761cb070f0e2038ca574..3d41fa081d16a13c1f602257662e7acb9639b449 100644 (file)
--- 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 e3a9cbb661b603b7954207c55d18680b31b7b9ec..46dcf3a04e4f7727fe12619a024567a29a90b27d 100644 (file)
--- 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 d7e29f24c3db2c0c59fc09bda75ed989700de101..1b9f2ad022000ef9ecfe8722079f6c1eba4051ea 100644 (file)
--- 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 7db09a0d802e7088fe0196d7f6e6a01e97d19d26..e9886a200edd5ee553a94d7d292e68dd0d33c6dc 100644 (file)
--- 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 e84d49b03c8284e9e3d28f7d24721107cf72c8d3..fbf84c9305a6d80bfca3188cdefd03480ca2b4a2 100644 (file)
--- 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 ae970c765377aa4ee38a2f0e66d4707e823c7f94..53f8cdff956df1a5b2b6c1813757679ecf4f3dd8 100644 (file)
--- 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 6a996ebb04578b30cdd6c810c8ce8942533e06e9..4c709f86598e257047ca15ef106b12c19ea3b224 100644 (file)
--- 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 48b0f6fe57ebc4a469289519634bcd837b60e3ea..357bacd83d2efe5037cbdc3e0adfffa8d27be2b9 100644 (file)
--- 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 79925053bf05beb1388b0a3c5325b041cf0bdc6c..d54162b3d79ca813aeb84905385a1f6630ac7923 100644 (file)
--- 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 6b22384ceee6bcf3ce58f3b62972c05ef521700c..073f298b5b66d71ea9a40eb79adda742ddd08851 100644 (file)
--- 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 cf554205a86a892a84b011467b5c277b7f8a0f4f..98be64fb31b91d070c46566cac8f60a13196973e 100644 (file)
--- 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 2895be8d27fa94e7b576e695fe794319a2547c91..d816bcbf06999c09758058162473547d6fb5151b 100644 (file)
--- 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 a9667b48ce07eefc7359fa7951f355a8212ca1fa..f1a1c7f509da0fca13c9c0e3d473e63f19381d64 100644 (file)
--- 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 1985d1028a4ee3f1072387b94e38be60c8a4012e..94968a8b4d5fae5dc8669d141ed99e69b7ad1387 100644 (file)
--- 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 0a013fc242b66d48958adac6ebe817071eb11f32..405e48088ff54ec082e1f9e9f0b32762f31f9ad0 100644 (file)
--- 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 72b2fd44675e17eb383ebe1335127882005a0bcd..202808ef0fe483dd5f819e5abe5fb1dc4d529b5a 100644 (file)
--- 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 cdaf67a72ecb8afcd5bf57b2520dfbfb9465e17a..112a1e8b99f9521f4f71a98b4b7dcf4ef844e672 100644 (file)
--- 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 b580e105aced7b1fe740b574d7f68a901568eb51..ad1f5170395c316c13366e428e9c247bac552c70 100644 (file)
--- 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 64fbacd4f860363d9c3c9ca3045596c5d3995298..67daa5d3b4faeaff030212ff8e93627f1c683b49 100644 (file)
--- 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 c6b015d7a987c570e6a8444967a4d6266fb955bf..98f75652e9a494fc9590c80b51752152222d129d 100644 (file)
--- 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 3ce02b5000f84386a820c7d86ca16319e8625a14..d0f0c04abaee1e30a7a28d80e310d3973ab8b2e2 100644 (file)
--- 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 74cc84205ea347175b95f51417e6abcc4f17f1f6..d1cd4d32f19bd2ca6c455a66ec01b508eb15e2bb 100644 (file)
--- 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 d141fde814147a78d5dcf74dad037ebdbfaf8d41..03d1d7b07460482fb6bbd3620a965c55538af6c8 100644 (file)
--- 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 9af0566d19c6fa0eb2ec6776f11c59f9701cdfb6..4ba4fea237ebf8ba40eb5d9a5d779b82207d062f 100644 (file)
--- 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 fde8ca7e34e964f63f152d2b3de33b8b3891eac7..434d1d99c4effc83ef5c2f91010f2611d4c2e117 100644 (file)
--- 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 9d194f7336c15f6c732c9fd3d49ccfff8a391ded..bfd967c1af45ba5ae551a0f282c81413f0b4f100 100644 (file)
--- 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 8970de192fe1adaad5d91ad5320f41dc6f8bad3a..6c83eaf412bf710858f322820a15b5de0feca3f9 100644 (file)
--- 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 97ab3627491527c4d685d1c715270522d0d80b7a..87835a3ed764198f5cf0a99b0a71d5e17410fab7 100644 (file)
--- 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 8ff61b22b085cc59070572d5acf2d09dbf0667da..9dc0eab386a88231436ecc2434ffaaec6edcce92 100644 (file)
--- 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 c3f3aa1fa605839e57aad28ba8196a55a8034025..e23ddf8e1d9b40ea366dd4e25cb5467aa5bda7c2 100644 (file)
--- 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 5d7b23c3c457caf5387f649cab2ca2395a707498..0e4b535f9e52596c498bb7d6e0eb3df242d380d7 100644 (file)
--- 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 4e6fa382a8efd3f89a9e7939b4c7f7d362bf3615..d339e58e1c2be898aa959b4762a69794dbfdc8f9 100644 (file)
--- 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 487301ab642d01fe433bd4bfa4dbb952819a2818..1ea6a1ee2ad6cade051b47d8dbf8e2f2a82d8b3f 100644 (file)
--- 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 907e154d14c7051a634ab5a8d63e0bd7d5958308..d7e4834d5f302598a62a601c041961eb62d4d7fa 100644 (file)
--- 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 604d900f77b94a069d020460de9ab02d05f757d5..c01f3fb96715726546030e3f5f469a17e259af67 100644 (file)
--- 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 430e43f2eb6e5cf808e9613ded215291d4caae22..0480485ab7cab1f523b9e30caf365c2dd2df56aa 100644 (file)
--- 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 e3ec64486e92e818d96f7307c218ca4f34bea1b1..873da65d42fcfae78ded4f3da63d43f33dc927c3 100644 (file)
--- 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 65126f81606800bc1eee728097039551604fd524..b898f3a6dbb551374a0cad11d83305906d03eea2 100644 (file)
--- 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 176e2f8f5957232013cf7103695ff2c384192b5f..7e246d22d1d72487441f87ce41df347890b63a90 100644 (file)
--- 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 558fbb9c0d9fee7ab3b51853965ae108ee4ccba6..ca22c91d48587fec714e79ab53d5f15f1216448b 100644 (file)
--- 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"