tests: Remove unused includes

Signed-off-by: Peng Liang <tcx4c70@gmail.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

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"
 

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"

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"

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"

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");
 

tests/fchosttest.c

@@ -20,7 +20,6 @@
 #include <config.h>
 
 #include "virlog.h"
-#include "virstring.h"
 #include "virvhba.h"
 #include "testutils.h"
 

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

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

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
 

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,

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

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
 

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"
 

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"

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

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
 

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

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
 

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);

tests/nsstest.c

@@ -23,7 +23,6 @@
 #ifdef WITH_NSS
 
 # include "libvirt_nss.h"
-# include "virsocket.h"
 
 # define VIR_FROM_THIS VIR_FROM_NONE
 

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"

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"

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
 

tests/objecteventtest.c

@@ -23,9 +23,6 @@
 
 #include "testutils.h"
 
-#include "virerror.h"
-#include "virxml.h"
-
 #define VIR_FROM_THIS VIR_FROM_NONE
 
 

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
 

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

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"
 

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"

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
 

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"

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
 

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
 

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>
 

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

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"
 

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"

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"

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

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"

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"

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>
 

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"

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"
 

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"
 

tests/seclabeltest.c

@@ -2,7 +2,6 @@
 
 #include <unistd.h>
 #include "security/security_driver.h"
-#include "virrandom.h"
 #include "testutils.h"
 
 static int

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);

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
 

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"
 

tests/sockettest.c

@@ -25,7 +25,6 @@
 #include "virsocketaddr.h"
 #include "testutils.h"
 #include "virlog.h"
-#include "viralloc.h"
 
 VIR_LOG_INIT("tests.sockettest");
 

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
 

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
 

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"
 

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
 

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
 

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"

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

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 */

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

tests/testutilslxc.h

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "capabilities.h"
-
 #include "lxc/lxc_conf.h"
 
 #define FAKEDEVDIR0 "/fakedevdir0/bla/fasl"

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"

tests/utiltest.c

@@ -3,7 +3,6 @@
 #include <unistd.h>
 
 #include "internal.h"
-#include "viralloc.h"
 #include "testutils.h"
 #include "virutil.h"
 

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"

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
 

tests/vircaps2xmltest.c

@@ -20,7 +20,6 @@
 
 #include "testutils.h"
 #include "capabilities.h"
-#include "virbitmap.h"
 #include "virfilewrapper.h"
 
 

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"
 

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"

tests/virconftest.c

@@ -23,7 +23,6 @@
 
 #include <unistd.h>
 #include "virconf.h"
-#include "viralloc.h"
 #include "testutils.h"
 
 

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"
 

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"
 

tests/virfilemock.c

@@ -26,8 +26,6 @@
 #endif
 
 #include "virmock.h"
-#include "virstring.h"
-#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

tests/virfiletest.c

@@ -23,7 +23,6 @@
 
 #include "testutils.h"
 #include "virfile.h"
-#include "virstring.h"
 
 #ifdef __linux__
 # include <linux/falloc.h>

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 */

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
 

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

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");

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");

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"
 

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"

tests/virmigtest.c

@@ -22,7 +22,6 @@
 
 #include "testutils.h"
 #include "virlog.h"
-#include "viruri.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 

tests/virmockstathelpers.c

@@ -21,7 +21,6 @@
  */
 
 #include "virmock.h"
-#include "viralloc.h"
 
 #include <sys/stat.h>
 #include <unistd.h>

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"

tests/virnetdevtest.c

@@ -21,8 +21,6 @@
 #include "internal.h"
 #include "testutils.h"
 
-#include "virnetlink.h"
-
 #define LIBVIRT_VIRNETDEVPRIV_H_ALLOW
 
 #ifdef __linux__

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

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"

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
 

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
 

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
 

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
 

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
 

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);

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
 

tests/virrandommock.c

@@ -23,7 +23,6 @@
 # include <gnutls/gnutls.h>
 
 # include "internal.h"
-# include "virstring.h"
 # include "virrandom.h"
 # include "virmock.h"
 

tests/virschematest.c

@@ -21,8 +21,6 @@
 
 #include "testutils.h"
 
-#include "virerror.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "virxml.h"
 

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
 

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"
 

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"
 

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"
 

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, ...);

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"

tests/viruritest.c

@@ -21,7 +21,6 @@
 #include <signal.h>
 
 #include "testutils.h"
-#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"