diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index 4ba981d7f89ac9a4999fbcbce9c02baa15b3405c..a9723fddd74c82acb17b82ac8e262745f932e327 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"
 # include "virautoclean.h"
 
 typedef const char * (*virDomainCapsValToStr)(int value);
diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c
index d1d9c3ee49f3972f35efcc5baf0b4b79158c522d..859ff9ebbbc5ac9e46c75b3de8cce181033c57f6 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 66eb66017be5473c74aaad15883dea1f94e6e73f..7f90632a5316e33737e95082a67909c38a3c5871 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 4ddc2a4b6559e9a857ed70bb6c99c3ff1512e0bd..46b7d8b0e7c71b7b46a1f2e6dedee8bd67c16cfa 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 e0b77031da177d69503c8e1ff4213e0352df5803..4137d1b04fa5a4cc5ca21af4b842ed15e289c394 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 f8230e64c553d4f8c5111302a2e472cb2d973741..95285ae915deb72cbd2fbe6068a6af3eca291538 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 787b76b531314e6a050d9b5ac8bca06a59dd4d7d..affa0d633420a11996c8f47b8cc7014d1e5aced8 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 8e193fb35c0e25668cf197698c649a1a2378accf..727eccaea7004654d1d12f7dc42ea293c9c7d87f 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"
 # include "virautoclean.h"
 
diff --git a/src/util/virauth.c b/src/util/virauth.c
index 9c95332e76226ea5a6684230f283747c1450c24b..e5994cbb7ce7805deba2f7c3a30b1f4c2a7b3239 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 1de7e7ecb917678b6aec2aa81023c216034cc174..2c6379680a4489a6405a0c727022574cd5bb0d0f 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 9da0366e811bca30b04f9c868ec34649f70ecfeb..cc30affa33e26709baf6da0e56fa3af02c0fc7b1 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 d074f29e54eb9fdd02332b1cf405ece6b640c3f5..3573b973ecd83b079369d7d2a0086f2533154257 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 b4d36732921724b6d87948adca0ffcff04554752..38dc06412a8ef4c8516f823da2944588c77aebc7 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 2e1e4abeadeef43ccc763841d707b760af34cf54..54703a28d8643a8896772cd4278d8429f914abde 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 2f5efdf2b74e50eb09f894b75f5da29fd48860ae..fbfed5cbf376606b565971112e49ac52c13fa8dc 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 c172eb8b9613262fd580f8608ca26a3dee59afb9..6224072db0f9231f95231c5a040c66b835d8a29a 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 4084929c5a02dce92087b52ced9340320e883369..940ee58528cef2ebaa7d4b16fb1610a1686ee960 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 15e2f0ef1eb1d323f05d0d50f75d3170970fc92d..9e99697c55f27d1e3e3bb4d06dd4bf52a483b3a1 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 fab852cebfc939240904974e23fad1a618901c68..c03da43f25e67efd05ef017c0bcd54ec2ded49bd 100644
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -24,7 +24,6 @@
 
 # include "internal.h"
 # include "virbuffer.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef struct _virCommand virCommand;
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 05e535d859b9340a9a73f07a099af4544e7441da..d26dd2b1f1b89f2e911c3e07e2c2d78012c39bce 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 4f691550bce313a9a302d80ceecbaa1a416a58f6..8f51510dc2b5d1aa65d01749276c57e6d396e9cd 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 9f1a965acb415653f86ac172dcd1b3fb3d08b59c..f7415cf63309ca85c2ac6b107d7e8b35cd323b15 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 4f50ba9a5bcf48b39dca82040ad83e223f86dd30..641960e2cab209750486377c141368a1dd8c56e7 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"
 # include "virautoclean.h"
 
 typedef enum {
diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index d42c734ea6f3087f6153c7180e0c2b3ac9c28a37..940cc9b3f979d3aab7346acb457f69c3952fdb90 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 63bf915233274c88a675e40da12b8313b80e5796..a0e81a9a46306de5dde551c6adb6cf92242c2dc0 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 f8965eea09a5a1dcd2dd2e7a080d8a3724520e7c..7a730f2bea550844c86dc8237a7ecc0bdd6ab3a5 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 4fcdd61043ac03a83a0c9004c96bf020cc4682e6..4907c1124fd556e5303d53b6a18796cfe39f9301 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 b1de808b1865de1fa96455303d772536eba1dda3..d2156a5ce09288760a9b5fdbcb4321ad1b6be0c9 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 1dceb746b99410623affaac9c058ae59dcd0a7ca..03547a9a2896f699be91d67461a0c2f3e8701b73 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 724d0283cc0e6bd60706637af1ab12d6ad8f9880..fa8329af26690a4ad326fc37b5fc96c0f426399e 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 "virautoclean.h"
 
diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c
index 3235f26182e6d121266fd9d8bcc834c147796b7f..5f825735ae03d4cda16cfad01ef92883ea6f1bc5 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 6cb0ce326425aa8992b96b98178837d890d40515..55f9d61abe8739595aed2262a32ef36484bbd0fe 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 814dc5595259ee56b59fe6646aeeced6e6c86a19..aa046f519e75711d18b70679b36d57aceb514542 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 9cc041e0dea38a18a511dda1d4732c79b743dac5..a0e64f67aef8b595f6987533720e6ab94f604631 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"
 # include "virautoclean.h"
 
 typedef enum {
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 699f2a0acbb493bab8fb6aac88eb9a6f2d916949..5c0e9723b915a350ae70d6cb6f967bc2c81acc8c 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 262611f1798902407cc5f19b4545b23ada5e9bd6..e58c385dbec988cb58eaa19ea9ff1198154e44d6 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"
 # include "virautoclean.h"
 
 # ifdef HAVE_STRUCT_IFREQ
diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index f39467f1d65a5280f3ec08da53402fd0324b6c30..e2009fd829e41a35ce33edd079d07176848b9fe7 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 e5d65f4dba1d148fb72691b12d902c8c07d2537b..2076cc48dc3072e01e6b7c3118df38df6b45f022 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 ff4fb94abca8c696469eead89c662b3bc152c8bc..c250181f69b0260612caa0063e3e9d6c7a91d9d2 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 1d8467e6432f13c556957ba604438e357ed1bde4..7b3c6bf05f02144be3e2b5bbc7a0ef704c927d26 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 4405e87e1733f7ff85d1242a12023723c94fdfcb..1bc075a86f5558f4f418e5f176420b2294a43a4f 100644
--- a/src/util/virnetlink.h
+++ b/src/util/virnetlink.h
@@ -22,7 +22,6 @@
 
 # include "internal.h"
 # include "virmacaddr.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 # if defined(__linux__) && defined(HAVE_LIBNL)
diff --git a/src/util/virpci.c b/src/util/virpci.c
index adeab66d779ff60a6d879cf9fbb491a7731acd50..871aaa392d4f61c004b4c131b4d18fe09ec92048 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 41651e2de422d4285efbfe6499f56a254dc1f94b..0a03927df85271708b61113f64057004156d0280 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"
 # include "virautoclean.h"
 
 typedef struct _virPCIDevice virPCIDevice;
diff --git a/src/util/virperf.c b/src/util/virperf.c
index 65235dda6a6c98460d5fac4ce1d858a00c8dab66..6ecfc29cb2a8503698c855070606d784c83be187 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 b625bb6846b85041690c2fb41cdd575a2f937df1..f43b8567238ab35a54325cb40879ad90a12d2fa2 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 b27831f0b3720e352af34ebfd964167b327625b7..6e167067e4045911b07c45759498206007e7aed2 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 70673483d0110495fd918bbbc39907778b66787e..907948455e2f3827f00cc29570936be8fe054bf5 100644
--- a/src/util/virscsi.h
+++ b/src/util/virscsi.h
@@ -23,7 +23,6 @@
 
 # include "internal.h"
 # include "virobject.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef struct _virSCSIDevice virSCSIDevice;
diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c
index 62b3e99ceaa4ca69c6e2cadfd42ddbdab220a26c..cbd9069146e237d67c2a4db0e15a63e7f152fbc4 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 5e9978c19cf04ccf87d0705732b5cfe5f0c929a5..7349db378ec5288a2b69c132b46f048e8a724a53 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"
 # include "virautoclean.h"
 
 typedef struct _virSCSIVHostDevice virSCSIVHostDevice;
diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index ccfaeabe13ba4a702fbccb133a89e11abe63bfcf..182e18aa8c7cd4298d2800a58957102ee5b09853 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 2cc3f94b804984df80b8cc3d072083f7f94fac72..5230cddf64aabd33b16c3bafa50be8990a62a243 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 b0fedf96a3529169c9d9ac1cbfbb2d8b787cfec8..b2cd8ea53c19053b96e0db74439dab857e60d163 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 3f74aa128347c3159cec0c088d3667b703cfec05..d1a414af41ec8af66a844f6444976e28c7029925 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 d3067e36e31bf130a8d14f253d8eb5f34cc2ec75..6d61a2555a2252da5c8976cc1537c7ea1d66fc88 100644
--- a/src/util/virusb.h
+++ b/src/util/virusb.h
@@ -23,7 +23,6 @@
 
 # include "internal.h"
 # include "virobject.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 # define USB_DEVFS "/dev/bus/usb/"
diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c
index 3fdc165fb1faed71ba51727d7988663b0984bcda..4edc5c44ad7a636335bcb759e0bd87bc22b545c7 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 11a24035aa958a074a03def5f08886ddfe57d19e..7bbaa6dd0fc14c42070b083719ab3f7efc9493fa 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);