diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h
index 7480ee8c2f566fa8716545f2f8a9e6ab81c6df9a..42996b9741ffbdd853a71db16a6fa5267a764dd6 100644
--- a/src/access/viraccessperm.h
+++ b/src/access/viraccessperm.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include "internal.h"
-#include "virutil.h"
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 6cef9e9726ae749678994d5596f8472e19a99b23..a95d56d017f45e642441628d7360f578f9c26f07 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "virutil.h"
 #include "virbuffer.h"
 #include "virxml.h"
 #include "virbitmap.h"
diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index e091d7cfe220a6d11b7f126a1339009083ee2b9b..d7395f22017466bb4003b7d78009035029620d57 100644
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -25,7 +25,6 @@
 #include <libxml/xpath.h>
 
 #include "internal.h"
-#include "virutil.h"
 #include "virthread.h"
 #include "virbuffer.h"
 #include "virpci.h"
diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index ce405e5b152c6e04611091bf614c3c2d584cc24c..31063d206cd74254c8ca10fb50d85c156125ce62 100644
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -25,7 +25,6 @@
 #include <libxml/xpath.h>
 
 #include "internal.h"
-#include "virutil.h"
 #include "virthread.h"
 #include "device_conf.h"
 #include "virenum.h"
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 4ff616ee90f06a825a1e0ca0bfd7c586c2ac2f43..9e4b0847fbb3903d4558fc7204f05bf69bd69dfa 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -24,7 +24,6 @@
 
 #include "internal.h"
 #include "virbitmap.h"
-#include "virutil.h"
 #include "virscsihost.h"
 #include "virpci.h"
 #include "virvhba.h"
diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h
index b1b8e3274d51d5b0740b1efedb1189ca67e98b1d..ae3599bb8b3184fde60a064b36a19ea8418f0049 100644
--- a/src/conf/numa_conf.h
+++ b/src/conf/numa_conf.h
@@ -23,7 +23,6 @@
 #include <libxml/xpath.h>
 
 #include "internal.h"
-#include "virutil.h"
 #include "virbitmap.h"
 #include "virbuffer.h"
 #include "virenum.h"
diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index ac94751ef34418a20d9f205ab62c940c3a08aca9..77457ecd7a51bec34783ba39a1efaa072f1481d8 100644
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include "internal.h"
-#include "virutil.h"
 
 typedef struct _virSecretDef virSecretDef;
 typedef virSecretDef *virSecretDefPtr;
diff --git a/src/util/virconf.h b/src/util/virconf.h
index 0b2de34d36b0433056b6c07268e2f3b4527d3432..6f0101bd3afa4c2d4c2e6c299beeff402ed997dc 100644
--- a/src/util/virconf.h
+++ b/src/util/virconf.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "virutil.h"
 #include "virenum.h"
 
 /**
diff --git a/src/util/virgic.h b/src/util/virgic.h
index 6552ab53f84a772327de3ba5a572dd8ef1374492..08838a619cde4671e3af96d06eeb850d57aacfa2 100644
--- a/src/util/virgic.h
+++ b/src/util/virgic.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "virutil.h"
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/util/virkeycode.h b/src/util/virkeycode.h
index b8d167ff142b3d39d68fa646cca7e97275cb50db..b725613458fbeaf046e85af6acb0f8a16d6d30f3 100644
--- a/src/util/virkeycode.h
+++ b/src/util/virkeycode.h
@@ -21,7 +21,6 @@
 
 #pragma once
 
-#include "virutil.h"
 #include "virenum.h"
 
 VIR_ENUM_DECL(virKeycodeSet);
diff --git a/src/util/virmdev.h b/src/util/virmdev.h
index e0905a3f6ebbc72efb55a80e9f6c7497bde00ec4..51f7f608a2ae77c28cceb3c32c7fc16069e17294 100644
--- a/src/util/virmdev.h
+++ b/src/util/virmdev.h
@@ -20,7 +20,6 @@
 
 #include "internal.h"
 #include "virobject.h"
-#include "virutil.h"
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h
index 9dbf07a6e2cd5ba92e5c67793668001264bf713b..0c1f5f1ecd6b9cc8dfa844ecb2d5feda4c4b8491 100644
--- a/src/util/virnetdevvlan.h
+++ b/src/util/virnetdevvlan.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include <virutil.h>
-
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index 88a42a18168b06a8ff0084b81ae072589c784e9d..3873fdf067408e24cdab574869ceb56e4f35a02e 100644
--- a/src/util/virnetdevvportprofile.h
+++ b/src/util/virnetdevvportprofile.h
@@ -20,7 +20,6 @@
 
 #include "internal.h"
 #include "viruuid.h"
-#include "virutil.h"
 #include "virmacaddr.h"
 #include "virenum.h"
 
diff --git a/src/util/virnuma.h b/src/util/virnuma.h
index 5a6b36f7e948c051b37daa19c3136cef641ecc66..c5bb5ffeced44e485e76858b8c8c717555d69457 100644
--- a/src/util/virnuma.h
+++ b/src/util/virnuma.h
@@ -23,7 +23,6 @@
 
 #include "internal.h"
 #include "virbitmap.h"
-#include "virutil.h"
 
 
 char *virNumaGetAutoPlacementAdvice(unsigned short vcpus,
diff --git a/src/util/virpci.h b/src/util/virpci.h
index f6796fc4228bd17e74b35eecac674f50a1c26c30..f16d23614a6303a3f84c6030ac7307e95765b9a9 100644
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -23,7 +23,6 @@
 #include "internal.h"
 #include "virmdev.h"
 #include "virobject.h"
-#include "virutil.h"
 #include "virenum.h"
 
 typedef struct _virPCIDevice virPCIDevice;
diff --git a/src/util/virperf.h b/src/util/virperf.h
index db61f94888f1e68d7b064f69cb53fb67ae4bdbe3..46307714c3a430cc3fd978e01e63dc3203f51135 100644
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "virutil.h"
 #include "virenum.h"
 
 /* Some Intel processor families introduced some RDT (Resource Director
diff --git a/src/util/virprocess.h b/src/util/virprocess.h
index 04adae6b8270f50d72253cd366705fadcb48d3b2..437deb18305b2b035f13cb2e9a8614ce584e8ddb 100644
--- a/src/util/virprocess.h
+++ b/src/util/virprocess.h
@@ -25,7 +25,6 @@
 
 #include "internal.h"
 #include "virbitmap.h"
-#include "virutil.h"
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h
index 11f275acf4edbd9fd10c1dfe5eca6d59d0a527e7..dcd9ca2bb2b54cb66dcdac901c4852ba30b7c9f4 100644
--- a/src/util/virresctrl.h
+++ b/src/util/virresctrl.h
@@ -22,7 +22,6 @@
 
 #include "virobject.h"
 #include "virbitmap.h"
-#include "virutil.h"
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h
index a5296890cd8e2b7ae0bb9e6be8ea0b8bddc54417..802c4d7bd7f217ab7a415828f3c1d598c70ec234 100644
--- a/src/util/virscsivhost.h
+++ b/src/util/virscsivhost.h
@@ -22,7 +22,6 @@
 
 #include "internal.h"
 #include "virobject.h"
-#include "virutil.h"
 
 typedef struct _virSCSIVHostDevice virSCSIVHostDevice;
 typedef virSCSIVHostDevice *virSCSIVHostDevicePtr;
diff --git a/src/util/virsecret.h b/src/util/virsecret.h
index bf056cb3b2bc91ab222cf945c74bdb8b97f5220b..8c49cfbc89a5c52fc0ce6a1e3eaa52ea73c2ff2b 100644
--- a/src/util/virsecret.h
+++ b/src/util/virsecret.h
@@ -23,7 +23,6 @@
 
 #include "internal.h"
 
-#include "virutil.h"
 #include "virxml.h"
 #include "virenum.h"
 
diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryption.h
index 3e5485d88bb8dd4cbb903282785bdcb15fff7f2e..a107161f0f896ee827265e621b0a11a3056dd04c 100644
--- a/src/util/virstorageencryption.h
+++ b/src/util/virstorageencryption.h
@@ -23,7 +23,6 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "virsecret.h"
-#include "virutil.h"
 #include "virenum.h"
 
 #include <libxml/tree.h>
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 5b995d54ab95b84ed692a059bc2fee3ba7a5532b..9af7b4f226c97eee0b01d3784e9e0ece0fb2b231 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -27,7 +27,6 @@
 #include "virobject.h"
 #include "virseclabel.h"
 #include "virstorageencryption.h"
-#include "virutil.h"
 #include "virsecret.h"
 #include "virenum.h"
 #include "virpci.h"
diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h
index 3ce936205c9abad8cca24b35c0300407e4b4ca01..f1d280e1c98cd8ba5fcae806996f9e5198a924c3 100644
--- a/src/util/virsysinfo.h
+++ b/src/util/virsysinfo.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include "internal.h"
-#include "virutil.h"
 #include "virbuffer.h"
 #include "virenum.h"
 
diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h
index 3ac2e68144661e88a18e7c118edb9a7ea52e0eac..0a430924a76d2cf7743afe1388a79d47172b8dd0 100644
--- a/src/util/virtypedparam.h
+++ b/src/util/virtypedparam.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include "internal.h"
-#include "virutil.h"
 #include "virenum.h"
 
 /**