diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 2439ec4f4b..03d0f46b24 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -27,7 +27,6 @@
 #include "virlog.h"
 #include "virerror.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "virfile.h"
 #include "virtime.h"
 #include "virsystemd.h"
diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c
index ae1f530338..6a37e165ba 100644
--- a/src/qemu/qemu_vhost_user_gpu.c
+++ b/src/qemu/qemu_vhost_user_gpu.c
@@ -29,7 +29,6 @@
 #include "vircommand.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virutil.h"
 #include "virfile.h"
 #include "virstring.h"
 #include "virtime.h"
diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c
index e874929740..9c20a80b88 100644
--- a/src/rpc/virnetlibsshsession.c
+++ b/src/rpc/virnetlibsshsession.c
@@ -26,7 +26,6 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "configmake.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "virobject.h"
 #include "virstring.h"
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index c31d80d4eb..fabdc3ef22 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -29,7 +29,6 @@
 #include "virlog.h"
 #include "configmake.h"
 #include "virthread.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virobject.h"
diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index 618bfb1d3d..342bae229b 100644
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "virutil.h"
 #include "virthread.h"
 #include "virfile.h"
 #include "viralloc.h"
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 0f3ee1faaa..16c384d2f9 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 "virutil.h"
 #include "virstring.h"
 
 #define LIBVIRT_VIRERRORPRIV_H_ALLOW
diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index ee72b579e4..22760e6389 100644
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -27,7 +27,6 @@
 #include "virfirewalld.h"
 #include "viralloc.h"
 #include "virerror.h"
-#include "virutil.h"
 #include "virstring.h"
 #include "vircommand.h"
 #include "virlog.h"
diff --git a/src/util/virgic.c b/src/util/virgic.c
index a3ea3ce6ff..dcae97356d 100644
--- a/src/util/virgic.c
+++ b/src/util/virgic.c
@@ -21,7 +21,6 @@
 #include <config.h>
 #include "internal.h"
 #include "virgic.h"
-#include "virutil.h"
 
 VIR_ENUM_IMPL(virGICVersion,
               VIR_GIC_VERSION_LAST,
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 5fd7186760..d00ef57606 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -24,7 +24,6 @@
 #include "viralloc.h"
 #include "virerror.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 1119846e61..e1ba119b8b 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -21,7 +21,6 @@
 #include "virnetdevbridge.h"
 #include "virnetdev.h"
 #include "virerror.h"
-#include "virutil.h"
 #include "virfile.h"
 #include "viralloc.h"
 #include "virlog.h"
diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index bfb93cf258..cb624c7eec 100644
--- a/src/util/virnetdevip.c
+++ b/src/util/virnetdevip.c
@@ -25,7 +25,6 @@
 #include "virerror.h"
 #include "virlog.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "vircommand.h"
 #include "viralloc.h"
 
diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index b9a27951fb..b3eee1afce 100644
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -26,7 +26,6 @@
 #include "virerror.h"
 #include "virfile.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "virnetdev.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virpci.c b/src/util/virpci.c
index 0b1222373e..db9528478d 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -36,7 +36,6 @@
 #include "virfile.h"
 #include "virkmod.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "viralloc.h"
 
 VIR_LOG_INIT("util.pci");
diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index 227480352d..0487b4e70b 100644
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -29,7 +29,6 @@
 
 #include "virrandom.h"
 #include "virthread.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virlog.h"
diff --git a/src/util/virscsi.c b/src/util/virscsi.c
index 06659c45c7..e3bd81b569 100644
--- a/src/util/virscsi.c
+++ b/src/util/virscsi.c
@@ -31,7 +31,6 @@
 #include "virlog.h"
 #include "virscsi.h"
 #include "virfile.h"
-#include "virutil.h"
 #include "virstring.h"
 #include "virerror.h"
 #include "viralloc.h"
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index d5ac5970f1..831ce30d4d 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -34,7 +34,6 @@
 #include "virhash.h"
 #include "virendian.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "viruri.h"
 #include "virbuffer.h"
 #include "virjson.h"
diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index d6103bdcb6..e4e50d837a 100644
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -25,7 +25,6 @@
 #include <stdarg.h>
 
 #include "viralloc.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "virstring.h"
 
diff --git a/src/util/viruri.c b/src/util/viruri.c
index f16ea16ac1..58d9016a61 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -27,7 +27,6 @@
 #include "virbuffer.h"
 #include "virlog.h"
 #include "virstring.h"
-#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_URI
 
diff --git a/src/util/virusb.c b/src/util/virusb.c
index a2562b7ea8..a28604c3f4 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -29,7 +29,6 @@
 
 #include "virusb.h"
 #include "virlog.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virstring.h"
diff --git a/src/util/virxml.c b/src/util/virxml.c
index 0e66d1623b..9ea7b99dba 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -29,7 +29,6 @@
 #include "virerror.h"
 #include "virxml.h"
 #include "virbuffer.h"
-#include "virutil.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "virstring.h"
diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index 5bc9ae6102..ed427622bd 100644
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -38,7 +38,6 @@
 #include "vbox_driver.h"
 #include "vbox_glue.h"
 #include "virerror.h"
-#include "virutil.h"
 #include "domain_event.h"
 #include "domain_conf.h"
 
diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c
index 7c784a49f1..83973137e7 100644
--- a/tests/fdstreamtest.c
+++ b/tests/fdstreamtest.c
@@ -29,7 +29,6 @@
 #include "virlog.h"
 #include "virstring.h"
 #include "virfile.h"
-#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
diff --git a/tests/testutils.c b/tests/testutils.c
index 8326602c9c..2f6d65364e 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -29,7 +29,6 @@
 #include "testutils.h"
 #include "internal.h"
 #include "viralloc.h"
-#include "virutil.h"
 #include "virthread.h"
 #include "virerror.h"
 #include "virbuffer.h"
diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c
index 298409e919..0f0c7b17da 100644
--- a/tests/virkeycodetest.c
+++ b/tests/virkeycodetest.c
@@ -22,7 +22,6 @@
 #include "testutils.h"
 
 #include "virkeycode.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c
index 7690377ad3..0a938f6410 100644
--- a/tests/virportallocatortest.c
+++ b/tests/virportallocatortest.c
@@ -26,7 +26,6 @@
 
 #if defined(__linux__) && defined(RTLD_NEXT)
 
-# include "virutil.h"
 # include "virerror.h"
 # include "viralloc.h"
 # include "virlog.h"
diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index 8aa2fcf71d..a3cdf8630f 100644
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -40,7 +40,6 @@
 #include "viralloc.h"
 #include "virfile.h"
 #include "virmacaddr.h"
-#include "virutil.h"
 #include "virxml.h"
 #include "virstring.h"
 #include "vsh-table.h"
diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index b87040ee6e..6e5213dea3 100644
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -25,7 +25,6 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
-#include "virutil.h"
 #include "vsh-table.h"
 
 virNWFilterPtr