[libvirt] [PATCH 3/5] util: Don't include 'viralloc.h' into other header files

Peter Krempa pkrempa at redhat.com
Wed Apr 3 13:06:35 UTC 2019 

'viralloc.h' does not provide any type or macro which would be necessary
in headers. Prevent leakage of the inclusion.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/conf/domain_capabilities.h      | 1 -
 src/conf/node_device_util.c         | 1 +
 src/conf/virdomainmomentobjlist.c   | 1 +
 src/conf/virdomainsnapshotobjlist.c | 1 +
 src/lxc/lxc_fuse.c                  | 1 +
 src/lxc/lxc_fuse.h                  | 1 -
 src/qemu/qemu_firmware.c            | 1 +
 src/qemu/qemu_firmware.h            | 1 -
 src/util/virauth.c                  | 1 +
 src/util/virauthconfig.c            | 1 +
 src/util/virauthconfig.h            | 1 -
 src/util/virbitmap.c                | 1 +
 src/util/virbitmap.h                | 1 -
 src/util/virbuffer.c                | 1 +
 src/util/virbuffer.h                | 1 -
 src/util/vircgroupv1.c              | 1 +
 src/util/vircgroupv2.c              | 1 +
 src/util/vircommand.c               | 1 +
 src/util/vircommand.h               | 1 -
 src/util/virerror.c                 | 1 +
 src/util/virerror.h                 | 1 -
 src/util/virfile.c                  | 1 +
 src/util/virfile.h                  | 1 -
 src/util/virfirewall.c              | 1 +
 src/util/virfirewall.h              | 1 -
 src/util/virfirewalld.c             | 1 +
 src/util/virhash.c                  | 1 +
 src/util/virhash.h                  | 1 -
 src/util/virjson.c                  | 1 +
 src/util/virjson.h                  | 1 -
 src/util/virmacaddr.c               | 1 +
 src/util/virmacaddr.h               | 1 -
 src/util/virmdev.c                  | 1 +
 src/util/virmdev.h                  | 1 -
 src/util/virnetdev.c                | 1 +
 src/util/virnetdev.h                | 1 -
 src/util/virnetdevip.c              | 1 +
 src/util/virnetdevvlan.c            | 1 +
 src/util/virnetdevvlan.h            | 1 -
 src/util/virnetlink.c               | 1 +
 src/util/virnetlink.h               | 1 -
 src/util/virpci.c                   | 1 +
 src/util/virpci.h                   | 1 -
 src/util/virperf.c                  | 1 +
 src/util/virperf.h                  | 1 -
 src/util/virscsi.c                  | 1 +
 src/util/virscsi.h                  | 1 -
 src/util/virscsivhost.c             | 1 +
 src/util/virscsivhost.h             | 1 -
 src/util/virsocketaddr.c            | 1 +
 src/util/virsocketaddr.h            | 1 -
 src/util/virstring.h                | 1 -
 src/util/virusb.c                   | 1 +
 src/util/virusb.h                   | 1 -
 tests/qemusecuritymock.c            | 1 +
 tests/vircgroupmock.c               | 1 +
 56 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index 26f4b8c394..28e7d495c5 100644
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@@ -23,7 +23,6 @@

 # include "internal.h"
 # include "domain_conf.h"
-# include "viralloc.h"

 typedef const char * (*virDomainCapsValToStr)(int value);

diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c
index d1d9c3ee49..859ff9ebbb 100644
--- a/src/conf/node_device_util.c
+++ b/src/conf/node_device_util.c
@@ -25,6 +25,7 @@
 #include "virscsihost.h"
 #include "virstring.h"
 #include "virvhba.h"
+#include "viralloc.h"

 #define VIR_FROM_THIS VIR_FROM_NODEDEV

diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c
index 65e82f632c..553150a4b1 100644
--- a/src/conf/virdomainmomentobjlist.c
+++ b/src/conf/virdomainmomentobjlist.c
@@ -28,6 +28,7 @@
 #include "virerror.h"
 #include "virstring.h"
 #include "moment_conf.h"
+#include "viralloc.h"

 /* FIXME: using virObject would allow us to not need this */
 #include "snapshot_conf.h"
diff --git a/src/conf/virdomainsnapshotobjlist.c b/src/conf/virdomainsnapshotobjlist.c
index 4ddc2a4b65..46b7d8b0e7 100644
--- a/src/conf/virdomainsnapshotobjlist.c
+++ b/src/conf/virdomainsnapshotobjlist.c
@@ -29,6 +29,7 @@
 #include "virerror.h"
 #include "datatypes.h"
 #include "virstring.h"
+#include "viralloc.h"

 #define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT

diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index e0b77031da..4137d1b04f 100644
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -30,6 +30,7 @@
 #include "virfile.h"
 #include "virbuffer.h"
 #include "virstring.h"
+#include "viralloc.h"

 #define VIR_FROM_THIS VIR_FROM_LXC

diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h
index f8230e64c5..95285ae915 100644
--- a/src/lxc/lxc_fuse.h
+++ b/src/lxc/lxc_fuse.h
@@ -28,7 +28,6 @@
 # endif

 # include "lxc_conf.h"
-# include "viralloc.h"

 struct virLXCMeminfo {
     unsigned long long memtotal;
diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index 4ce010caaa..d28905d1b4 100644
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -33,6 +33,7 @@
 #include "virjson.h"
 #include "virlog.h"
 #include "virstring.h"
+#include "viralloc.h"

 #define VIR_FROM_THIS VIR_FROM_QEMU

diff --git a/src/qemu/qemu_firmware.h b/src/qemu/qemu_firmware.h
index 7f8a0e4a15..78b2d2fe07 100644
--- a/src/qemu/qemu_firmware.h
+++ b/src/qemu/qemu_firmware.h
@@ -22,7 +22,6 @@
 # define LIBVIRT_QEMU_FIRMWARE_H

 # include "domain_conf.h"
-# include "viralloc.h"
 # include "qemu_conf.h"

 typedef struct _qemuFirmware qemuFirmware;
diff --git a/src/util/virauth.c b/src/util/virauth.c
index 9c95332e76..e5994cbb7c 100644
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -24,6 +24,7 @@


 #include "virauth.h"
+#include "viralloc.h"
 #include "virutil.h"
 #include "virlog.h"
 #include "datatypes.h"
diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index 1de7e7ecb9..2c6379680a 100644
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -26,6 +26,7 @@
 #include "virlog.h"
 #include "virerror.h"
 #include "virstring.h"
+#include "viralloc.h"

 struct _virAuthConfig {
     virKeyFilePtr keyfile;
diff --git a/src/util/virauthconfig.h b/src/util/virauthconfig.h
index 9da0366e81..cc30affa33 100644
--- a/src/util/virauthconfig.h
+++ b/src/util/virauthconfig.h
@@ -22,7 +22,6 @@
 # define LIBVIRT_VIRAUTHCONFIG_H

 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"

 typedef struct _virAuthConfig virAuthConfig;
diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index d074f29e54..3573b973ec 100644
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -24,6 +24,7 @@
 #include <sys/types.h>

 #include "virbitmap.h"
+#include "viralloc.h"
 #include "virbuffer.h"
 #include "c-ctype.h"
 #include "count-one-bits.h"
diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index b4d3673292..38dc06412a 100644
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -23,7 +23,6 @@
 # define LIBVIRT_VIRBITMAP_H

 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"

 # include <sys/types.h>
diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index 2e1e4abead..54703a28d8 100644
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -26,6 +26,7 @@
 #include "virbuffer.h"
 #include "virerror.h"
 #include "virstring.h"
+#include "viralloc.h"

 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h
index 2f5efdf2b7..fbfed5cbf3 100644
--- a/src/util/virbuffer.h
+++ b/src/util/virbuffer.h
@@ -24,7 +24,6 @@
 # include <stdarg.h>

 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"


diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
index c172eb8b96..6224072db0 100644
--- a/src/util/vircgroupv1.c
+++ b/src/util/vircgroupv1.c
@@ -39,6 +39,7 @@
 #include "virstring.h"
 #include "virsystemd.h"
 #include "virerror.h"
+#include "viralloc.h"

 VIR_LOG_INIT("util.cgroup");

diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index 4084929c5a..940ee58528 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -29,6 +29,7 @@
 #define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 #include "vircgrouppriv.h"

+#include "viralloc.h"
 #include "vircgroup.h"
 #include "vircgroupbackend.h"
 #include "vircgroupv2.h"
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 15e2f0ef1e..9e99697c55 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -42,6 +42,7 @@
 #endif

 #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
+#include "viralloc.h"
 #include "vircommandpriv.h"
 #include "virerror.h"
 #include "virutil.h"
diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index efdc5dd00d..8719deb033 100644
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -24,7 +24,6 @@

 # include "internal.h"
 # include "virbuffer.h"
-# include "viralloc.h"

 typedef struct _virCommand virCommand;
 typedef virCommand *virCommandPtr;
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 05e535d859..d26dd2b1f1 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -24,6 +24,7 @@

 #include "virerror.h"
 #include "datatypes.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virthread.h"
 #include "virutil.h"
diff --git a/src/util/virerror.h b/src/util/virerror.h
index 4f691550bc..8f51510dc2 100644
--- a/src/util/virerror.h
+++ b/src/util/virerror.h
@@ -23,7 +23,6 @@
 # define LIBVIRT_VIRERROR_H

 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"

 # define VIR_ERROR_MAX_LENGTH 1024
diff --git a/src/util/virfile.c b/src/util/virfile.c
index ec8d85929c..cc5b029fe2 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -70,6 +70,7 @@

 #include "configmake.h"
 #include "intprops.h"
+#include "viralloc.h"
 #include "vircommand.h"
 #include "virerror.h"
 #include "virfile.h"
diff --git a/src/util/virfile.h b/src/util/virfile.h
index 3dedb7666a..5171984b6f 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -30,7 +30,6 @@
 # include "internal.h"
 # include "virbitmap.h"
 # include "virstoragefile.h"
-# include "viralloc.h"

 typedef enum {
     VIR_FILE_CLOSE_PRESERVE_ERRNO = 1 << 0,
diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index d42c734ea6..940cc9b3f9 100644
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -25,6 +25,7 @@
 #define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW
 #include "virfirewallpriv.h"
 #include "virfirewalld.h"
+#include "viralloc.h"
 #include "virerror.h"
 #include "virutil.h"
 #include "virstring.h"
diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h
index 63bf915233..a0e81a9a46 100644
--- a/src/util/virfirewall.h
+++ b/src/util/virfirewall.h
@@ -22,7 +22,6 @@
 # define LIBVIRT_VIRFIREWALL_H

 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"

 typedef struct _virFirewall virFirewall;
diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c
index f8965eea09..7a730f2bea 100644
--- a/src/util/virfirewalld.c
+++ b/src/util/virfirewalld.c
@@ -26,6 +26,7 @@
 #include "virfirewalld.h"
 #define LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW
 #include "virfirewalldpriv.h"
+#include "viralloc.h"
 #include "virerror.h"
 #include "virutil.h"
 #include "virlog.h"
diff --git a/src/util/virhash.c b/src/util/virhash.c
index 4fcdd61043..4907c1124f 100644
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -21,6 +21,7 @@

 #include "virerror.h"
 #include "virhash.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virhashcode.h"
 #include "virrandom.h"
diff --git a/src/util/virhash.h b/src/util/virhash.h
index b1de808b18..d2156a5ce0 100644
--- a/src/util/virhash.h
+++ b/src/util/virhash.h
@@ -11,7 +11,6 @@
 # define LIBVIRT_VIRHASH_H


-# include "viralloc.h"
 # include "virautoclean.h"

 /*
diff --git a/src/util/virjson.c b/src/util/virjson.c
index c519f8139e..467561c744 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -24,6 +24,7 @@
 #include <config.h>

 #include "virjson.h"
+#include "viralloc.h"
 #include "virerror.h"
 #include "virlog.h"
 #include "virstring.h"
diff --git a/src/util/virjson.h b/src/util/virjson.h
index ec86603794..e362806a66 100644
--- a/src/util/virjson.h
+++ b/src/util/virjson.h
@@ -25,7 +25,6 @@

 # include "internal.h"
 # include "virbitmap.h"
-# include "viralloc.h"
 # include "virbuffer.h"

 # include <stdarg.h>
diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c
index 3235f26182..5f825735ae 100644
--- a/src/util/virmacaddr.c
+++ b/src/util/virmacaddr.c
@@ -25,6 +25,7 @@
 #include "virmacaddr.h"
 #include "virrandom.h"
 #include "virutil.h"
+#include "viralloc.h"

 static const unsigned char virMacAddrBroadcastAddrRaw[VIR_MAC_BUFLEN] =
     { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h
index 6cb0ce3264..55f9d61abe 100644
--- a/src/util/virmacaddr.h
+++ b/src/util/virmacaddr.h
@@ -22,7 +22,6 @@
 # define LIBVIRT_VIRMACADDR_H

 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"

 # define VIR_MAC_BUFLEN 6
diff --git a/src/util/virmdev.c b/src/util/virmdev.c
index 814dc55952..aa046f519e 100644
--- a/src/util/virmdev.c
+++ b/src/util/virmdev.c
@@ -24,6 +24,7 @@
 #include "virerror.h"
 #include "virfile.h"
 #include "virstring.h"
+#include "viralloc.h"

 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virmdev.h b/src/util/virmdev.h
index d787d354e4..0d3bc506e2 100644
--- a/src/util/virmdev.h
+++ b/src/util/virmdev.h
@@ -22,7 +22,6 @@
 # include "internal.h"
 # include "virobject.h"
 # include "virutil.h"
-# include "viralloc.h"

 typedef enum {
     VIR_MDEV_MODEL_TYPE_VFIO_PCI = 0,
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 699f2a0acb..5c0e9723b9 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -20,6 +20,7 @@

 #include "dirname.h"
 #include "virnetdev.h"
+#include "viralloc.h"
 #include "virnetlink.h"
 #include "virmacaddr.h"
 #include "virfile.h"
diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 6f6094eebe..98357128e4 100644
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -26,7 +26,6 @@
 # include "virmacaddr.h"
 # include "virpci.h"
 # include "virnetdevvlan.h"
-# include "viralloc.h"

 # ifdef HAVE_STRUCT_IFREQ
 typedef struct ifreq virIfreq;
diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index f39467f1d6..e2009fd829 100644
--- a/src/util/virnetdevip.c
+++ b/src/util/virnetdevip.c
@@ -27,6 +27,7 @@
 #include "virstring.h"
 #include "virutil.h"
 #include "vircommand.h"
+#include "viralloc.h"

 #if HAVE_GETIFADDRS
 # include <ifaddrs.h>
diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c
index e5d65f4dba..2076cc48dc 100644
--- a/src/util/virnetdevvlan.c
+++ b/src/util/virnetdevvlan.c
@@ -21,6 +21,7 @@
 #include "internal.h"
 #include "virerror.h"
 #include "virnetdevvlan.h"
+#include "viralloc.h"

 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h
index ff4fb94abc..c250181f69 100644
--- a/src/util/virnetdevvlan.h
+++ b/src/util/virnetdevvlan.h
@@ -21,7 +21,6 @@

 # include <virutil.h>

-# include "viralloc.h"
 # include "virautoclean.h"

 typedef enum {
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 1d8467e643..7b3c6bf05f 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -33,6 +33,7 @@
 #include "virthread.h"
 #include "virmacaddr.h"
 #include "virerror.h"
+#include "viralloc.h"

 #define VIR_FROM_THIS VIR_FROM_NET

diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
index 9dd7b3c3ed..d3b7e6276a 100644
--- a/src/util/virnetlink.h
+++ b/src/util/virnetlink.h
@@ -22,7 +22,6 @@

 # include "internal.h"
 # include "virmacaddr.h"
-# include "viralloc.h"

 # if defined(__linux__) && defined(HAVE_LIBNL)

diff --git a/src/util/virpci.c b/src/util/virpci.c
index adeab66d77..871aaa392d 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -38,6 +38,7 @@
 #include "virkmod.h"
 #include "virstring.h"
 #include "virutil.h"
+#include "viralloc.h"

 VIR_LOG_INIT("util.pci");

diff --git a/src/util/virpci.h b/src/util/virpci.h
index c8fc1e8bf6..e89ea8390c 100644
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -25,7 +25,6 @@
 # include "virmdev.h"
 # include "virobject.h"
 # include "virutil.h"
-# include "viralloc.h"

 typedef struct _virPCIDevice virPCIDevice;
 typedef virPCIDevice *virPCIDevicePtr;
diff --git a/src/util/virperf.c b/src/util/virperf.c
index 65235dda6a..6ecfc29cb2 100644
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -28,6 +28,7 @@
 #include "virfile.h"
 #include "virstring.h"
 #include "virtypedparam.h"
+#include "viralloc.h"

 VIR_LOG_INIT("util.perf");

diff --git a/src/util/virperf.h b/src/util/virperf.h
index b625bb6846..f43b856723 100644
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -20,7 +20,6 @@
 # define LIBVIRT_VIRPERF_H

 # include "virutil.h"
-# include "viralloc.h"
 # include "virautoclean.h"

 /* Some Intel processor families introduced some RDT (Resource Director
diff --git a/src/util/virscsi.c b/src/util/virscsi.c
index b27831f0b3..6e167067e4 100644
--- a/src/util/virscsi.c
+++ b/src/util/virscsi.c
@@ -34,6 +34,7 @@
 #include "virutil.h"
 #include "virstring.h"
 #include "virerror.h"
+#include "viralloc.h"

 #define SYSFS_SCSI_DEVICES "/sys/bus/scsi/devices"

diff --git a/src/util/virscsi.h b/src/util/virscsi.h
index 70e113b486..c04c6bd65a 100644
--- a/src/util/virscsi.h
+++ b/src/util/virscsi.h
@@ -23,7 +23,6 @@

 # include "internal.h"
 # include "virobject.h"
-# include "viralloc.h"

 typedef struct _virSCSIDevice virSCSIDevice;
 typedef virSCSIDevice *virSCSIDevicePtr;
diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c
index 62b3e99cea..cbd9069146 100644
--- a/src/util/virscsivhost.c
+++ b/src/util/virscsivhost.c
@@ -26,6 +26,7 @@
 #include "virerror.h"
 #include "virfile.h"
 #include "virstring.h"
+#include "viralloc.h"

 /* For virReportOOMError()  and virReportSystemError() */
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h
index d28773482c..0c7ec691f5 100644
--- a/src/util/virscsivhost.h
+++ b/src/util/virscsivhost.h
@@ -24,7 +24,6 @@
 # include "internal.h"
 # include "virobject.h"
 # include "virutil.h"
-# include "viralloc.h"

 typedef struct _virSCSIVHostDevice virSCSIVHostDevice;
 typedef virSCSIVHostDevice *virSCSIVHostDevicePtr;
diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index ccfaeabe13..182e18aa8c 100644
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -22,6 +22,7 @@
 #include "virerror.h"
 #include "virstring.h"
 #include "virbuffer.h"
+#include "viralloc.h"

 #include <netdb.h>

diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h
index 2cc3f94b80..5230cddf64 100644
--- a/src/util/virsocketaddr.h
+++ b/src/util/virsocketaddr.h
@@ -26,7 +26,6 @@
 # endif

 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"

 /* On architectures which lack these limits, define them (ie. Cygwin).
diff --git a/src/util/virstring.h b/src/util/virstring.h
index b0fedf96a3..b2cd8ea53c 100644
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -22,7 +22,6 @@
 # include <stdarg.h>

 # include "internal.h"
-# include "viralloc.h"

 char **virStringSplitCount(const char *string,
                            const char *delim,
diff --git a/src/util/virusb.c b/src/util/virusb.c
index 3f74aa1283..d1a414af41 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -33,6 +33,7 @@
 #include "virerror.h"
 #include "virfile.h"
 #include "virstring.h"
+#include "viralloc.h"

 #define USB_SYSFS "/sys/bus/usb"
 #define USB_ID_LEN 10 /* "1234 5678" */
diff --git a/src/util/virusb.h b/src/util/virusb.h
index 6ed71606d4..ab11a5cf50 100644
--- a/src/util/virusb.h
+++ b/src/util/virusb.h
@@ -23,7 +23,6 @@

 # include "internal.h"
 # include "virobject.h"
-# include "viralloc.h"

 # define USB_DEVFS "/dev/bus/usb/"

diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c
index d1b17d8aa4..9889117273 100644
--- a/tests/qemusecuritymock.c
+++ b/tests/qemusecuritymock.c
@@ -29,6 +29,7 @@
 #include "virthread.h"
 #include "virhash.h"
 #include "virstring.h"
+#include "viralloc.h"
 #include "qemusecuritytest.h"
 #include "security/security_manager.h"

diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
index 9c67a44b0d..d834a1d860 100644
--- a/tests/vircgroupmock.c
+++ b/tests/vircgroupmock.c
@@ -34,6 +34,7 @@
 # include "testutilslxc.h"
 # include "virstring.h"
 # include "virfile.h"
+# include "viralloc.h"

 static int (*real_open)(const char *path, int flags, ...);
 static FILE *(*real_fopen)(const char *path, const char *mode);
-- 
2.20.1

More information about the libvir-list mailing list