Signed-off-by: Peng Liang <tcx4c70@xxxxxxxxx>
---
tests/commandtest.c | 2 --
tests/cputest.c | 2 --
tests/domainconftest.c | 2 --
tests/esxutilstest.c | 1 -
tests/eventtest.c | 2 --
tests/fchosttest.c | 1 -
tests/fdstreamtest.c | 3 ---
tests/genericxml2xmltest.c | 1 -
tests/interfacexml2xmltest.c | 2 --
tests/libxlmock.c | 2 --
tests/libxlxml2domconfigtest.c | 5 -----
tests/lxcxml2xmltest.c | 1 -
tests/networkxml2conftest.c | 2 --
tests/networkxml2firewalltest.c | 2 --
tests/networkxml2xmltest.c | 2 --
tests/networkxml2xmlupdatetest.c | 2 --
tests/nodedevmdevctltest.c | 1 -
tests/nodedevxml2xmltest.c | 2 --
tests/nssmock.c | 2 --
tests/nsstest.c | 1 -
tests/nwfilterebiptablestest.c | 1 -
tests/nwfilterxml2firewalltest.c | 1 -
tests/nwfilterxml2xmltest.c | 5 -----
tests/objecteventtest.c | 3 ---
tests/openvzutilstest.c | 2 --
tests/qemuagenttest.c | 2 --
tests/qemublocktest.c | 4 ----
tests/qemucapsprobemock.c | 1 -
tests/qemucommandutiltest.c | 1 -
tests/qemucpumock.c | 1 -
tests/qemudomaincheckpointxml2xmltest.c | 2 --
tests/qemudomainsnapshotxml2xmltest.c | 2 --
tests/qemuhotplugmock.c | 1 -
tests/qemuhotplugtest.c | 3 ---
tests/qemumemlocktest.c | 2 --
tests/qemumigparamstest.c | 1 -
tests/qemumonitorjsontest.c | 2 --
tests/qemumonitortestutils.c | 2 --
tests/qemumonitortestutils.h | 1 -
tests/qemusecuritymock.c | 2 --
tests/qemuxml2argvmock.c | 6 ------
tests/qemuxml2argvtest.c | 8 --------
tests/qemuxml2xmltest.c | 3 ---
tests/scsihosttest.c | 2 --
tests/seclabeltest.c | 1 -
tests/securityselinuxhelper.c | 1 -
tests/securityselinuxlabeltest.c | 2 --
tests/securityselinuxtest.c | 3 ---
tests/sockettest.c | 1 -
tests/storagebackendsheepdogtest.c | 1 -
tests/storagepoolxml2argvtest.c | 3 ---
tests/storagepoolxml2xmltest.c | 2 --
tests/storagevolxml2argvtest.c | 3 ---
tests/storagevolxml2xmltest.c | 2 --
tests/sysinfotest.c | 1 -
tests/testutils.c | 4 ----
tests/testutils.h | 1 -
tests/testutilslxc.c | 1 -
tests/testutilslxc.h | 2 --
tests/testutilsqemu.c | 1 -
tests/utiltest.c | 1 -
tests/virauthconfigtest.c | 2 --
tests/virbuftest.c | 2 --
tests/vircaps2xmltest.c | 1 -
tests/vircgroupmock.c | 2 --
tests/vircgrouptest.c | 1 -
tests/virconftest.c | 1 -
tests/virdriverconnvalidatetest.c | 2 --
tests/virdrivermoduletest.c | 2 --
tests/virfilemock.c | 2 --
tests/virfiletest.c | 1 -
tests/virfilewrapper.c | 2 --
tests/virfirewalltest.c | 1 -
tests/virhostcputest.c | 1 -
tests/viridentitytest.c | 4 ----
tests/virkeycodetest.c | 4 ----
tests/virkmodtest.c | 1 -
tests/virlockspacetest.c | 2 --
tests/virmigtest.c | 1 -
tests/virmockstathelpers.c | 1 -
tests/virnetdevmock.c | 1 -
tests/virnetdevtest.c | 2 --
tests/virnetmessagetest.c | 2 --
tests/virnetsockettest.c | 1 -
tests/virnettlscontexttest.c | 5 -----
tests/virnettlssessiontest.c | 4 ----
tests/virnetworkportxml2xmltest.c | 1 -
tests/virnumamock.c | 3 ---
tests/virnwfilterbindingxml2xmltest.c | 3 ---
tests/virpcimock.c | 1 -
tests/virportallocatortest.c | 3 ---
tests/virrandommock.c | 1 -
tests/virschematest.c | 2 --
tests/virshtest.c | 2 --
tests/virstoragetest.c | 3 ---
tests/virstorageutiltest.c | 3 ---
tests/virstringtest.c | 3 ---
tests/virtestmock.c | 2 --
tests/virtimetest.c | 2 --
tests/viruritest.c | 1 -
tests/virusbmock.c | 3 ---
tests/virusbtest.c | 2 --
tests/vmx2xmltest.c | 2 --
tests/vshtabletest.c | 1 -
tests/xlconfigtest.c | 1 -
tests/xmconfigtest.c | 2 --
tests/xml2vmxtest.c | 1 -
107 files changed, 216 deletions(-)
diff --git a/tests/commandtest.c b/tests/commandtest.c
index 74e60a072b..95d1bfa91b 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -35,8 +35,6 @@
#include "virfile.h"
#include "virpidfile.h"
#include "virerror.h"
-#include "virthread.h"
-#include "virstring.h"
#include "virprocess.h"
#include "virutil.h"
diff --git a/tests/cputest.c b/tests/cputest.c
index ddf05b779b..b7ec79dfc6 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -33,8 +33,6 @@
#include "cpu_conf.h"
#include "cpu/cpu.h"
#include "cpu/cpu_x86.h"
-#include "cpu/cpu_map.h"
-#include "virstring.h"
#if WITH_QEMU
# include "testutilsqemu.h"
diff --git a/tests/domainconftest.c b/tests/domainconftest.c
index 14d84b0071..b483e1221a 100644
--- a/tests/domainconftest.c
+++ b/tests/domainconftest.c
@@ -19,8 +19,6 @@
#include <config.h>
#include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virlog.h"
#include "domain_conf.h"
diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
index db49dcd6e0..4591cf49db 100644
--- a/tests/esxutilstest.c
+++ b/tests/esxutilstest.c
@@ -7,7 +7,6 @@
# include <unistd.h>
# include "internal.h"
-# include "viralloc.h"
# include "vmx/vmx.h"
# include "esx/esx_util.h"
# include "esx/esx_vi_types.h"
diff --git a/tests/eventtest.c b/tests/eventtest.c
index 1e93c70e74..470de4c630 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -31,10 +31,8 @@
#include "testutils.h"
#include "internal.h"
#include "virfile.h"
-#include "virthread.h"
#include "virlog.h"
#include "virutil.h"
-#include "virevent.h"
VIR_LOG_INIT("tests.eventtest");
diff --git a/tests/fchosttest.c b/tests/fchosttest.c
index dc1503e9a7..d050458a58 100644
--- a/tests/fchosttest.c
+++ b/tests/fchosttest.c
@@ -20,7 +20,6 @@
#include <config.h>
#include "virlog.h"
-#include "virstring.h"
#include "virvhba.h"
#include "testutils.h"
diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c
index 96519e91c2..5e6b347949 100644
--- a/tests/fdstreamtest.c
+++ b/tests/fdstreamtest.c
@@ -24,10 +24,7 @@
#include "virfdstream.h"
#include "datatypes.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virlog.h"
-#include "virstring.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
index 87014e3e53..b83367cb4b 100644
--- a/tests/genericxml2xmltest.c
+++ b/tests/genericxml2xmltest.c
@@ -7,7 +7,6 @@
#include "testutils.h"
#include "internal.h"
-#include "virstring.h"
#include "conf/backup_conf.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c
index 15fab88107..b23e0f589b 100644
--- a/tests/interfacexml2xmltest.c
+++ b/tests/interfacexml2xmltest.c
@@ -8,8 +8,6 @@
#include "internal.h"
#include "testutils.h"
#include "interface_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/libxlmock.c b/tests/libxlmock.c
index a52d4bc2ed..0e4bf7df52 100644
--- a/tests/libxlmock.c
+++ b/tests/libxlmock.c
@@ -28,8 +28,6 @@
# include <xenstore.h>
# include <xenctrl.h>
-# include "virfile.h"
-# include "virsocket.h"
# include "libxl/libxl_capabilities.h"
VIR_MOCK_IMPL_RET_VOID(xs_daemon_open,
diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c
index 015597eb44..a7080e0fa2 100644
--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -31,12 +31,7 @@
#if defined(WITH_LIBXL) && defined(WITH_YAJL)
# include "internal.h"
-# include "viralloc.h"
# include "libxl/libxl_conf.h"
-# include "datatypes.h"
-# include "virstring.h"
-# include "virmock.h"
-# include "virjson.h"
# include "testutilsxen.h"
# define VIR_FROM_THIS VIR_FROM_LIBXL
diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c
index 8ab32acf42..2c5d294f18 100644
--- a/tests/lxcxml2xmltest.c
+++ b/tests/lxcxml2xmltest.c
@@ -12,7 +12,6 @@
# include "internal.h"
# include "lxc/lxc_conf.h"
# include "testutilslxc.h"
-# include "virstring.h"
# define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index a062ff9c3c..bbeb849a39 100644
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -8,10 +8,8 @@
#include "internal.h"
#include "testutils.h"
#include "network_conf.h"
-#include "vircommand.h"
#include "viralloc.h"
#include "network/bridge_driver.h"
-#include "virstring.h"
#define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
#include "vircommandpriv.h"
diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c
index 11be85e06f..2648115a12 100644
--- a/tests/networkxml2firewalltest.c
+++ b/tests/networkxml2firewalltest.c
@@ -22,7 +22,6 @@
#include <config.h>
#include "testutils.h"
-#include "viralloc.h"
#if defined (__linux__)
@@ -31,7 +30,6 @@
# include "network/bridge_driver_platform.h"
# include "virbuffer.h"
# include "virmock.h"
-# include "virfirewall.h"
# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
# include "vircommandpriv.h"
diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c
index 9e8d675a10..5f39162ef1 100644
--- a/tests/networkxml2xmltest.c
+++ b/tests/networkxml2xmltest.c
@@ -8,8 +8,6 @@
#include "internal.h"
#include "testutils.h"
#include "network_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
#include "network/bridge_driver.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c
index 4471b4dd9e..c50c6c8558 100644
--- a/tests/networkxml2xmlupdatetest.c
+++ b/tests/networkxml2xmlupdatetest.c
@@ -8,8 +8,6 @@
#include "internal.h"
#include "testutils.h"
#include "network_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c
index d660d4cc21..dee4639922 100644
--- a/tests/nodedevmdevctltest.c
+++ b/tests/nodedevmdevctltest.c
@@ -2,7 +2,6 @@
#include "internal.h"
#include "testutils.h"
-#include "datatypes.h"
#include "node_device/node_device_driver.h"
#include "vircommand.h"
#define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c
index ad9562cc82..f82027fb87 100644
--- a/tests/nodedevxml2xmltest.c
+++ b/tests/nodedevxml2xmltest.c
@@ -8,8 +8,6 @@
#include "internal.h"
#include "testutils.h"
#include "node_device_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/nssmock.c b/tests/nssmock.c
index b1c1aba957..9ead6d8f97 100644
--- a/tests/nssmock.c
+++ b/tests/nssmock.c
@@ -27,8 +27,6 @@
# include <unistd.h>
# include "configmake.h"
-# include "virstring.h"
-# include "viralloc.h"
static int (*real_open)(const char *path, int flags, ...);
static DIR * (*real_opendir)(const char *name);
diff --git a/tests/nsstest.c b/tests/nsstest.c
index a03f230452..615b063118 100644
--- a/tests/nsstest.c
+++ b/tests/nsstest.c
@@ -23,7 +23,6 @@
#ifdef WITH_NSS
# include "libvirt_nss.h"
-# include "virsocket.h"
# define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c
index 35c1c772ae..f76f13fd25 100644
--- a/tests/nwfilterebiptablestest.c
+++ b/tests/nwfilterebiptablestest.c
@@ -24,7 +24,6 @@
#include "testutils.h"
#include "nwfilter/nwfilter_ebiptables_driver.h"
#include "virbuffer.h"
-#include "virfirewall.h"
#define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
#include "vircommandpriv.h"
diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c
index ec37a4ae11..1514002b8f 100644
--- a/tests/nwfilterxml2firewalltest.c
+++ b/tests/nwfilterxml2firewalltest.c
@@ -26,7 +26,6 @@
# include "testutils.h"
# include "nwfilter/nwfilter_ebiptables_driver.h"
# include "virbuffer.h"
-# include "virfirewall.h"
# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
# include "vircommandpriv.h"
diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
index 7a7e05965b..c2b6dc575b 100644
--- a/tests/nwfilterxml2xmltest.c
+++ b/tests/nwfilterxml2xmltest.c
@@ -7,12 +7,7 @@
#include "internal.h"
#include "testutils.h"
-#include "virxml.h"
-#include "virthread.h"
-#include "nwfilter_params.h"
#include "nwfilter_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c
index 5f63f6f5cb..7110f54139 100644
--- a/tests/objecteventtest.c
+++ b/tests/objecteventtest.c
@@ -23,9 +23,6 @@
#include "testutils.h"
-#include "virerror.h"
-#include "virxml.h"
-
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c
index 7e6c0b60bb..77e086e390 100644
--- a/tests/openvzutilstest.c
+++ b/tests/openvzutilstest.c
@@ -7,9 +7,7 @@
# include <unistd.h>
# include "internal.h"
-# include "viralloc.h"
# include "openvz/openvz_conf.h"
-# include "virstring.h"
# define VIR_FROM_THIS VIR_FROM_OPENVZ
diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c
index b23177385c..dd2d4984e2 100644
--- a/tests/qemuagenttest.c
+++ b/tests/qemuagenttest.c
@@ -24,9 +24,7 @@
#include "qemumonitortestutils.h"
#include "qemu/qemu_conf.h"
#include "qemu/qemu_agent.h"
-#include "virthread.h"
#include "virerror.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 6329096a68..57116c930b 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -21,8 +21,6 @@
#include "testutils.h"
#include "testutilsqemu.h"
#include "testutilsqemuschema.h"
-#include "virstoragefile.h"
-#include "virstring.h"
#include "virlog.h"
#include "qemu/qemu_block.h"
#include "qemu/qemu_qapi.h"
@@ -31,8 +29,6 @@
#include "qemu/qemu_checkpoint.h"
#include "qemu/qemu_validate.h"
-#include "qemu/qemu_command.h"
-
#define LIBVIRT_SNAPSHOT_CONF_PRIV_H_ALLOW
#include "conf/snapshot_conf_priv.h"
diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c
index 2717ed5d84..0263b0ad01 100644
--- a/tests/qemucapsprobemock.c
+++ b/tests/qemucapsprobemock.c
@@ -20,7 +20,6 @@
#include <dlfcn.h>
#include "internal.h"
-#include "viralloc.h"
#include "virjson.h"
#include "qemu/qemu_monitor.h"
#include "qemu/qemu_monitor_json.h"
diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c
index ae86ef9ea0..f92fb8f177 100644
--- a/tests/qemucommandutiltest.c
+++ b/tests/qemucommandutiltest.c
@@ -22,7 +22,6 @@
#include "util/virjson.h"
#include "util/virqemu.h"
#include "testutils.h"
-#include "testutilsqemu.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/qemucpumock.c b/tests/qemucpumock.c
index e84a0294d4..5a63308347 100644
--- a/tests/qemucpumock.c
+++ b/tests/qemucpumock.c
@@ -18,7 +18,6 @@
#include "conf/cpu_conf.h"
-#include "cpu/cpu.h"
#include "qemu/qemu_capabilities.h"
#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
#include "qemu/qemu_capspriv.h"
diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c
index 25613c8452..d49dcd9143 100644
--- a/tests/qemudomaincheckpointxml2xmltest.c
+++ b/tests/qemudomaincheckpointxml2xmltest.c
@@ -14,10 +14,8 @@
# include "internal.h"
# include "qemu/qemu_conf.h"
-# include "qemu/qemu_domain.h"
# include "checkpoint_conf.h"
# include "testutilsqemu.h"
-# include "virstring.h"
# define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxml2xmltest.c
index 3fa932e755..2f66839ae8 100644
--- a/tests/qemudomainsnapshotxml2xmltest.c
+++ b/tests/qemudomainsnapshotxml2xmltest.c
@@ -11,9 +11,7 @@
# include "internal.h"
# include "qemu/qemu_conf.h"
-# include "qemu/qemu_domain.h"
# include "testutilsqemu.h"
-# include "virstring.h"
# define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c
index d618ff9d06..89d287945a 100644
--- a/tests/qemuhotplugmock.c
+++ b/tests/qemuhotplugmock.c
@@ -24,7 +24,6 @@
#include "testutilsqemu.h"
#include "conf/domain_conf.h"
#include "virdevmapper.h"
-#include "virutil.h"
#include "virmock.h"
#include <fcntl.h>
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 21123b88ed..e98d9845e8 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -27,9 +27,6 @@
#include "testutilsqemu.h"
#include "testutilsqemuschema.h"
#include "virhostdev.h"
-#include "virerror.h"
-#include "virstring.h"
-#include "virthread.h"
#include "virfile.h"
#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c
index 86057e9a3a..b303f70e9d 100644
--- a/tests/qemumemlocktest.c
+++ b/tests/qemumemlocktest.c
@@ -9,9 +9,7 @@
#ifdef WITH_QEMU
-# include "datatypes.h"
# include "internal.h"
-# include "virstring.h"
# include "conf/domain_conf.h"
# include "qemu/qemu_domain.h"
diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c
index ae59ff6757..bcdee5f32b 100644
--- a/tests/qemumigparamstest.c
+++ b/tests/qemumigparamstest.c
@@ -22,7 +22,6 @@
#include "virjson.h"
#include "virbuffer.h"
#include "virxml.h"
-#include "virhash.h"
#include "testutils.h"
#include "testutilsqemu.h"
#include "tests/testutilsqemuschema.h"
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 1019661aa1..ca1b8c3000 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -28,9 +28,7 @@
#include "qemu/qemu_monitor_json.h"
#include "qemu/qemu_qapi.h"
#include "qemu/qemu_alias.h"
-#include "virthread.h"
#include "virerror.h"
-#include "virstring.h"
#include "cpu/cpu.h"
#include "qemu/qemu_monitor.h"
#include "qemu/qemu_migration_params.h"
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index ddd7d91b13..a5d716deee 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -30,12 +30,10 @@
#include "qemu/qemu_processpriv.h"
#include "qemu/qemu_monitor.h"
#include "qemu/qemu_agent.h"
-#include "qemu/qemu_qapi.h"
#include "rpc/virnetsocket.h"
#include "viralloc.h"
#include "virlog.h"
#include "virerror.h"
-#include "virstring.h"
#include "vireventthread.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h
index 935f9d1e1a..ffcb32a5cc 100644
--- a/tests/qemumonitortestutils.h
+++ b/tests/qemumonitortestutils.h
@@ -19,7 +19,6 @@
#pragma once
-#include "domain_conf.h"
#include "qemu/qemu_conf.h"
#include "qemu/qemu_monitor.h"
#include "qemu/qemu_agent.h"
diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c
index 03c818d8a3..a6f9d6b917 100644
--- a/tests/qemusecuritymock.c
+++ b/tests/qemusecuritymock.c
@@ -33,8 +33,6 @@
#include "virfile.h"
#include "virthread.h"
#include "virhash.h"
-#include "virstring.h"
-#include "viralloc.h"
#include "qemusecuritytest.h"
#include "security/security_manager.h"
#include "virhostuptime.h"
diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
index bb14f775f3..85bd76c315 100644
--- a/tests/qemuxml2argvmock.c
+++ b/tests/qemuxml2argvmock.c
@@ -23,25 +23,19 @@
#include "internal.h"
#include "viralloc.h"
#include "vircommand.h"
-#include "vircrypto.h"
#include "viridentitypriv.h"
#include "virmock.h"
-#include "virlog.h"
#include "virnetdev.h"
#include "virnetdevbandwidth.h"
#include "virnetdevip.h"
#include "virnetdevtap.h"
#include "virnetdevopenvswitch.h"
#include "virnuma.h"
-#include "virrandom.h"
-#include "virscsi.h"
#include "virscsivhost.h"
-#include "virstring.h"
#include "virtpm.h"
#include "virutil.h"
#include "qemu/qemu_interface.h"
#include "qemu/qemu_command.h"
-#include <time.h>
#include <unistd.h>
#include <fcntl.h>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index bffe7aef8a..9db2a543e8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -12,24 +12,16 @@
# include "internal.h"
# include "viralloc.h"
# include "viridentity.h"
-# include "qemu/qemu_alias.h"
# include "qemu/qemu_capabilities.h"
-# include "qemu/qemu_command.h"
# include "qemu/qemu_domain.h"
# include "qemu/qemu_migration.h"
# include "qemu/qemu_process.h"
# include "qemu/qemu_slirp.h"
-# include "qemu/qemu_qapi.h"
# include "datatypes.h"
# include "conf/storage_conf.h"
-# include "cpu/cpu_map.h"
-# include "virstring.h"
-# include "storage/storage_driver.h"
-# include "virmock.h"
# include "virfilewrapper.h"
# include "configmake.h"
# include "testutilsqemuschema.h"
-# include "qemu/qemu_monitor_json.h"
# define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
# include "qemu/qemu_capspriv.h"
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 3bd57306cc..b8175168ea 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -8,10 +8,7 @@
#include "testutils.h"
#include "internal.h"
-#include "qemu/qemu_domain_address.h"
-#include "qemu/qemu_domain.h"
#include "testutilsqemu.h"
-#include "virstring.h"
#include "virfilewrapper.h"
#include "configmake.h"
diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c
index cb66a479e3..28ad59f39d 100644
--- a/tests/scsihosttest.c
+++ b/tests/scsihosttest.c
@@ -26,8 +26,6 @@
# include <fcntl.h>
# include <sys/stat.h>
# include <unistd.h>
-# include "virstring.h"
-# include "virerror.h"
# include "virlog.h"
# include "virscsihost.h"
diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c
index b2a11b278c..769d6e1f29 100644
--- a/tests/seclabeltest.c
+++ b/tests/seclabeltest.c
@@ -2,7 +2,6 @@
#include <unistd.h>
#include "security/security_driver.h"
-#include "virrandom.h"
#include "testutils.h"
static int
diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c
index c3d6505ef2..24c9f3841c 100644
--- a/tests/securityselinuxhelper.c
+++ b/tests/securityselinuxhelper.c
@@ -39,7 +39,6 @@
#define VIR_FROM_THIS VIR_FROM_NONE
#include "viralloc.h"
-#include "virstring.h"
static int (*real_statfs)(const char *path, struct statfs *buf);
static int (*real_security_get_boolean_active)(const char *name);
diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c
index dfe9d38d34..4f97edad17 100644
--- a/tests/securityselinuxlabeltest.c
+++ b/tests/securityselinuxlabeltest.c
@@ -30,13 +30,11 @@
#include "internal.h"
#include "testutils.h"
#include "testutilsqemu.h"
-#include "qemu/qemu_domain.h"
#include "viralloc.h"
#include "virerror.h"
#include "virfile.h"
#include "virlog.h"
#include "security/security_manager.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index 4912cc3483..6a0f1617ae 100644
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -27,10 +27,7 @@
#include "internal.h"
#include "testutils.h"
-#include "viralloc.h"
#include "virlog.h"
-#include "virerror.h"
-#include "virfile.h"
#include "security/security_manager.h"
#include "virstring.h"
diff --git a/tests/sockettest.c b/tests/sockettest.c
index 2a35b6a829..f2b75a2e53 100644
--- a/tests/sockettest.c
+++ b/tests/sockettest.c
@@ -25,7 +25,6 @@
#include "virsocketaddr.h"
#include "testutils.h"
#include "virlog.h"
-#include "viralloc.h"
VIR_LOG_INIT("tests.sockettest");
diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c
index c7dabd976b..8f27e40d46 100644
--- a/tests/storagebackendsheepdogtest.c
+++ b/tests/storagebackendsheepdogtest.c
@@ -29,7 +29,6 @@
#include "testutils.h"
#define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW
#include "storage/storage_backend_sheepdog_priv.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c
index 449b745519..487481b7ee 100644
--- a/tests/storagepoolxml2argvtest.c
+++ b/tests/storagepoolxml2argvtest.c
@@ -2,10 +2,7 @@
#include "internal.h"
#include "testutils.h"
-#include "datatypes.h"
#include "storage/storage_util.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c
index f21f20357a..2bad858033 100644
--- a/tests/storagepoolxml2xmltest.c
+++ b/tests/storagepoolxml2xmltest.c
@@ -8,8 +8,6 @@
#include "internal.h"
#include "testutils.h"
#include "storage_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
#include "storage/storage_util.h"
diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
index 94e2de1730..6f1fc7b38c 100644
--- a/tests/storagevolxml2argvtest.c
+++ b/tests/storagevolxml2argvtest.c
@@ -2,10 +2,7 @@
#include "internal.h"
#include "testutils.h"
-#include "datatypes.h"
#include "storage/storage_util.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c
index be38f50a51..5d06821cd0 100644
--- a/tests/storagevolxml2xmltest.c
+++ b/tests/storagevolxml2xmltest.c
@@ -8,8 +8,6 @@
#include "internal.h"
#include "testutils.h"
#include "storage_conf.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index 973b8317b5..287c40c6f9 100644
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -29,7 +29,6 @@
#include "virsysinfo.h"
#include "testutils.h"
#include "virfile.h"
-#include "virstring.h"
#define LIBVIRT_VIRSYSINFOPRIV_H_ALLOW
#include "virsysinfopriv.h"
diff --git a/tests/testutils.c b/tests/testutils.c
index 9d454c23bc..30f91dcd28 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -29,13 +29,9 @@
#include "testutils.h"
#include "internal.h"
#include "viralloc.h"
-#include "virthread.h"
#include "virerror.h"
#include "virbuffer.h"
#include "virlog.h"
-#include "vircommand.h"
-#include "virrandom.h"
-#include "virprocess.h"
#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/testutils.h b/tests/testutils.h
index ff5661bb3f..869b58bd1e 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -24,7 +24,6 @@
#include "virfile.h"
#include "virstring.h"
#include "virjson.h"
-#include "capabilities.h"
#include "domain_conf.h"
#define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */
diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c
index ac7a01a4e8..356c118646 100644
--- a/tests/testutilslxc.c
+++ b/tests/testutilslxc.c
@@ -3,7 +3,6 @@
# include "testutilslxc.h"
# include "testutils.h"
-# include "viralloc.h"
# include "domain_conf.h"
# define VIR_FROM_THIS VIR_FROM_LXC
diff --git a/tests/testutilslxc.h b/tests/testutilslxc.h
index 0f7345b1c1..c8f2ad6dff 100644
--- a/tests/testutilslxc.h
+++ b/tests/testutilslxc.h
@@ -16,8 +16,6 @@
#pragma once
-#include "capabilities.h"
-
#include "lxc/lxc_conf.h"
#define FAKEDEVDIR0 "/fakedevdir0/bla/fasl"
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 6211b2a871..d26caba5fb 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -6,7 +6,6 @@
# include "testutils.h"
# include "viralloc.h"
# include "cpu_conf.h"
-# include "qemu/qemu_driver.h"
# include "qemu/qemu_domain.h"
# define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
# include "qemu/qemu_capspriv.h"
diff --git a/tests/utiltest.c b/tests/utiltest.c
index 419dfea913..e7a79f808f 100644
--- a/tests/utiltest.c
+++ b/tests/utiltest.c
@@ -3,7 +3,6 @@
#include <unistd.h>
#include "internal.h"
-#include "viralloc.h"
#include "testutils.h"
#include "virutil.h"
diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 6fd7407b97..5301fd9dea 100644
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -21,8 +21,6 @@
#include <signal.h>
#include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virlog.h"
#include "virauthconfig.h"
diff --git a/tests/virbuftest.c b/tests/virbuftest.c
index 79bd0cae8e..0ca7927c3f 100644
--- a/tests/virbuftest.c
+++ b/tests/virbuftest.c
@@ -4,8 +4,6 @@
#include "internal.h"
#include "testutils.h"
#include "virbuffer.h"
-#include "viralloc.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index b143f873a1..26a512e87f 100644
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -20,7 +20,6 @@
#include "testutils.h"
#include "capabilities.h"
-#include "virbitmap.h"
#include "virfilewrapper.h"
diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
index a213c8e686..8a0e3aec0f 100644
--- a/tests/vircgroupmock.c
+++ b/tests/vircgroupmock.c
@@ -26,8 +26,6 @@
# include <sys/sysmacros.h>
# include <stdarg.h>
# include "testutilslxc.h"
-# include "virstring.h"
-# include "virfile.h"
# include "viralloc.h"
# include "vircgroupv2devices.h"
diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
index 7d54df1a85..e29bc094b1 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -25,7 +25,6 @@
# define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
# include "vircgrouppriv.h"
-# include "virstring.h"
# include "virerror.h"
# include "virlog.h"
# include "virfile.h"
diff --git a/tests/virconftest.c b/tests/virconftest.c
index 3b203b6ae6..34a8232790 100644
--- a/tests/virconftest.c
+++ b/tests/virconftest.c
@@ -23,7 +23,6 @@
#include <unistd.h>
#include "virconf.h"
-#include "viralloc.h"
#include "testutils.h"
diff --git a/tests/virdriverconnvalidatetest.c b/tests/virdriverconnvalidatetest.c
index 6f4cefb61e..6d10628a73 100644
--- a/tests/virdriverconnvalidatetest.c
+++ b/tests/virdriverconnvalidatetest.c
@@ -19,8 +19,6 @@
#include <config.h>
#include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virlog.h"
#include "driver.h"
diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index e7930d3453..27d0f15ac5 100644
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -19,8 +19,6 @@
#include <config.h>
#include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virlog.h"
#include "driver.h"
diff --git a/tests/virfilemock.c b/tests/virfilemock.c
index d4863bd12c..093a8d7cf0 100644
--- a/tests/virfilemock.c
+++ b/tests/virfilemock.c
@@ -26,8 +26,6 @@
#endif
#include "virmock.h"
-#include "virstring.h"
-#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/virfiletest.c b/tests/virfiletest.c
index 1e95c77d06..9fbfc37e56 100644
--- a/tests/virfiletest.c
+++ b/tests/virfiletest.c
@@ -23,7 +23,6 @@
#include "testutils.h"
#include "virfile.h"
-#include "virstring.h"
#ifdef __linux__
# include <linux/falloc.h>
diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c
index aaff39866d..9cdfcfdc3f 100644
--- a/tests/virfilewrapper.c
+++ b/tests/virfilewrapper.c
@@ -23,10 +23,8 @@
# include <fcntl.h>
# include "viralloc.h"
-# include "virfile.h"
# include "virfilewrapper.h"
# include "virmock.h"
-# include "virstring.h"
/* Mapping for prefix overrides */
diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c
index 8a0ca6be07..e3d15fb67b 100644
--- a/tests/virfirewalltest.c
+++ b/tests/virfirewalltest.c
@@ -31,7 +31,6 @@
# include "vircommandpriv.h"
# define LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW
# include "virfirewalldpriv.h"
-# include "virmock.h"
# define VIR_FROM_THIS VIR_FROM_FIREWALL
diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
index 746e65727f..196f4c29b9 100644
--- a/tests/virhostcputest.c
+++ b/tests/virhostcputest.c
@@ -8,7 +8,6 @@
#define LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW
#include "virhostcpupriv.h"
#include "virfile.h"
-#include "virstring.h"
#include "virfilewrapper.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index 99c7899ed7..73ed9f73df 100644
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -28,12 +28,8 @@
#define LIBVIRT_VIRIDENTITYPRIV_H_ALLOW
#include "viridentitypriv.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virlog.h"
-#include "virlockspace.h"
-
#define VIR_FROM_THIS VIR_FROM_NONE
VIR_LOG_INIT("tests.identitytest");
diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c
index 0f0c7b17da..cd1ea1c81a 100644
--- a/tests/virkeycodetest.c
+++ b/tests/virkeycodetest.c
@@ -22,12 +22,8 @@
#include "testutils.h"
#include "virkeycode.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virlog.h"
-#include "virlockspace.h"
-
#define VIR_FROM_THIS VIR_FROM_NONE
VIR_LOG_INIT("tests.keycodetest");
diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c
index d2df3bdb04..0e662878b2 100644
--- a/tests/virkmodtest.c
+++ b/tests/virkmodtest.c
@@ -25,7 +25,6 @@
# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
# include "vircommandpriv.h"
# include "virkmod.h"
-# include "virstring.h"
# define MODNAME "vfio-pci"
diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index 109edf34d5..711164265d 100644
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -23,8 +23,6 @@
#include <sys/stat.h>
#include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virfile.h"
#include "virlog.h"
#include "virutil.h"
diff --git a/tests/virmigtest.c b/tests/virmigtest.c
index af6643397e..adc123b802 100644
--- a/tests/virmigtest.c
+++ b/tests/virmigtest.c
@@ -22,7 +22,6 @@
#include "testutils.h"
#include "virlog.h"
-#include "viruri.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c
index ecb39bb4f7..39e270eaac 100644
--- a/tests/virmockstathelpers.c
+++ b/tests/virmockstathelpers.c
@@ -21,7 +21,6 @@
*/
#include "virmock.h"
-#include "viralloc.h"
#include <sys/stat.h>
#include <unistd.h>
diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c
index f26991a48c..910009d80c 100644
--- a/tests/virnetdevmock.c
+++ b/tests/virnetdevmock.c
@@ -20,7 +20,6 @@
#ifdef __linux__
# include "internal.h"
-# include "virstring.h"
# include "virnetdev.h"
# define NET_DEV_TEST_DATA_PREFIX abs_srcdir "/virnetdevtestdata/sys/class/net"
diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c
index 3fd7b70ad0..aec84c6c35 100644
--- a/tests/virnetdevtest.c
+++ b/tests/virnetdevtest.c
@@ -21,8 +21,6 @@
#include "internal.h"
#include "testutils.h"
-#include "virnetlink.h"
-
#define LIBVIRT_VIRNETDEVPRIV_H_ALLOW
#ifdef __linux__
diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index 386c339c2c..14790c0ece 100644
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -21,10 +21,8 @@
#include <signal.h>
#include "testutils.h"
-#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
-#include "virstring.h"
#include "rpc/virnetmessage.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 4e8edb05c3..396005899a 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -29,7 +29,6 @@
#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
-#include "virstring.h"
#include "rpc/virnetsocket.h"
#include "rpc/virnetclient.h"
diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index 0ad42a77ed..403cd8d0ac 100644
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -23,12 +23,7 @@
#include "testutils.h"
#include "virnettlshelpers.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virlog.h"
-#include "virfile.h"
-#include "vircommand.h"
-#include "virsocket.h"
#if !defined WIN32 && WITH_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >= 0x020600
diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c
index 9e0d6a46e6..5b98a6de3e 100644
--- a/tests/virnettlssessiontest.c
+++ b/tests/virnettlssessiontest.c
@@ -23,12 +23,8 @@
#include "testutils.h"
#include "virnettlshelpers.h"
#include "virutil.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
-#include "vircommand.h"
-#include "virsocket.h"
#if !defined WIN32 && WITH_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >= 0x020600
diff --git a/tests/virnetworkportxml2xmltest.c b/tests/virnetworkportxml2xmltest.c
index 176f52d675..237624a752 100644
--- a/tests/virnetworkportxml2xmltest.c
+++ b/tests/virnetworkportxml2xmltest.c
@@ -28,7 +28,6 @@
#include "internal.h"
#include "testutils.h"
#include "virnetworkportdef.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/virnumamock.c b/tests/virnumamock.c
index 7f2653cb53..87c9a58c6f 100644
--- a/tests/virnumamock.c
+++ b/tests/virnumamock.c
@@ -19,11 +19,8 @@
#include <config.h>
#include "internal.h"
-#include "virmock.h"
#include "virnuma.h"
#include "virfile.h"
-#include "viralloc.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindingxml2xmltest.c
index ccdad3daa5..0c93b58a0c 100644
--- a/tests/virnwfilterbindingxml2xmltest.c
+++ b/tests/virnwfilterbindingxml2xmltest.c
@@ -28,10 +28,7 @@
#include "internal.h"
#include "testutils.h"
-#include "virxml.h"
#include "virnwfilterbindingdef.h"
-#include "testutilsqemu.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/virpcimock.c b/tests/virpcimock.c
index 77d46f0952..b2111794e6 100644
--- a/tests/virpcimock.c
+++ b/tests/virpcimock.c
@@ -31,7 +31,6 @@
# include <stdarg.h>
# include <dirent.h>
# include "viralloc.h"
-# include "virstring.h"
# include "virfile.h"
static int (*real_access)(const char *path, int mode);
diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c
index 5c0a76de6f..9e17a88eb5 100644
--- a/tests/virportallocatortest.c
+++ b/tests/virportallocatortest.c
@@ -26,11 +26,8 @@
#if defined(__linux__) && defined(RTLD_NEXT)
-# include "virerror.h"
-# include "viralloc.h"
# include "virlog.h"
# include "virportallocator.h"
-# include "virstring.h"
# define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/tests/virrandommock.c b/tests/virrandommock.c
index 6dd15213e3..e295f74446 100644
--- a/tests/virrandommock.c
+++ b/tests/virrandommock.c
@@ -23,7 +23,6 @@
# include <gnutls/gnutls.h>
# include "internal.h"
-# include "virstring.h"
# include "virrandom.h"
# include "virmock.h"
diff --git a/tests/virschematest.c b/tests/virschematest.c
index 29a5546418..dd13d82c62 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -21,8 +21,6 @@
#include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virlog.h"
#include "virxml.h"
diff --git a/tests/virshtest.c b/tests/virshtest.c
index c2c892c60d..a53a6273b9 100644
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -3,10 +3,8 @@
#include <unistd.h>
#include "internal.h"
-#include "virxml.h"
#include "testutils.h"
#include "vircommand.h"
-#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index ccfc9f7001..11f7abbda6 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -23,11 +23,8 @@
#include "storage_source.h"
#include "testutils.h"
#include "vircommand.h"
-#include "virerror.h"
#include "virfile.h"
#include "virlog.h"
-#include "virstoragefile.h"
-#include "virstring.h"
#include "storage/storage_driver.h"
diff --git a/tests/virstorageutiltest.c b/tests/virstorageutiltest.c
index d4ab818f5f..ba92ec8bcc 100644
--- a/tests/virstorageutiltest.c
+++ b/tests/virstorageutiltest.c
@@ -18,10 +18,7 @@
#include "testutils.h"
-#include "virerror.h"
-#include "virfile.h"
#include "virlog.h"
-#include "virstring.h"
#include "storage/storage_util.h"
diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index b406076020..7d8d9204cc 100644
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -20,9 +20,6 @@
#include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
-#include "virfile.h"
#include "virlog.h"
#include "virstring.h"
diff --git a/tests/virtestmock.c b/tests/virtestmock.c
index 7951f3d00f..19559aee7a 100644
--- a/tests/virtestmock.c
+++ b/tests/virtestmock.c
@@ -26,8 +26,6 @@
#include "virsocket.h"
#include "configmake.h"
-#include "virstring.h"
-#include "viralloc.h"
#include "virfile.h"
static int (*real_open)(const char *path, int flags, ...);
diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index f98165b106..5972ce585e 100644
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -21,8 +21,6 @@
#include <signal.h>
#include "testutils.h"
-#include "virerror.h"
-#include "viralloc.h"
#include "virlog.h"
#include "virtime.h"
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 96f29aafc0..94c8aa806d 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -21,7 +21,6 @@
#include <signal.h>
#include "testutils.h"
-#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virusbmock.c b/tests/virusbmock.c
index 5b09895197..971d98aa9a 100644
--- a/tests/virusbmock.c
+++ b/tests/virusbmock.c
@@ -24,9 +24,6 @@
#include <dlfcn.h>
#include <fcntl.h>
-#include "viralloc.h"
-#include "virfile.h"
-#include "virstring.h"
#include "virusb.h"
#define USB_SYSFS "/sys/bus/usb"
diff --git a/tests/virusbtest.c b/tests/virusbtest.c
index 65050d5e5f..870e136321 100644
--- a/tests/virusbtest.c
+++ b/tests/virusbtest.c
@@ -18,9 +18,7 @@
#include <config.h>
-#include "viralloc.h"
#include "virerror.h"
-#include "virfile.h"
#include "virusb.h"
#include "testutils.h"
diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index 257bda3b0e..dbd771017b 100644
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -7,9 +7,7 @@
# include <unistd.h>
# include "internal.h"
-# include "viralloc.h"
# include "vmx/vmx.h"
-# include "virstring.h"
# define VIR_FROM_THIS VIR_FROM_VMWARE
diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c
index 83d7f9b5ab..bb75a41418 100644
--- a/tests/vshtabletest.c
+++ b/tests/vshtabletest.c
@@ -27,7 +27,6 @@
#include "internal.h"
#include "testutils.h"
-#include "viralloc.h"
#include "../tools/vsh-table.h"
static int
diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index d6505f9e12..962a1f2c4b 100644
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -28,7 +28,6 @@
#include "internal.h"
#include "datatypes.h"
#include "libxl/xen_xl.h"
-#include "viralloc.h"
#include "virstring.h"
#include "testutils.h"
#include "testutilsxen.h"
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index c99d1f2bd9..dbf9f7a4c7 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -28,8 +28,6 @@
#include "libxl/xen_xm.h"
#include "testutils.h"
#include "testutilsxen.h"
-#include "viralloc.h"
-#include "virstring.h"
#include "libxl/libxl_conf.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index cd6d81947b..1a7f2e4f33 100644
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -9,7 +9,6 @@
# include "internal.h"
# include "viralloc.h"
# include "vmx/vmx.h"
-# include "virstring.h"
# define VIR_FROM_THIS VIR_FROM_VMWARE
--
2.36.1
