From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/access/viraccessdriver.h | 1 - src/access/viraccessdriverpolkit.c | 4 ---- src/access/viraccessdriverstack.c | 1 - src/access/viraccessmanager.h | 1 - src/access/viraccessperm.h | 1 - 5 files changed, 8 deletions(-) diff --git a/src/access/viraccessdriver.h b/src/access/viraccessdriver.h index c1bccfe90f..f4bc4b6ced 100644 --- a/src/access/viraccessdriver.h +++ b/src/access/viraccessdriver.h @@ -20,7 +20,6 @@ #pragma once -#include "conf/domain_conf.h" #include "access/viraccessmanager.h" typedef int (*virAccessDriverCheckConnectDrv)(virAccessManager *manager, diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c index c8d1421ad8..2473bd6258 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -21,13 +21,9 @@ #include <config.h> #include "viraccessdriverpolkit.h" -#include "viralloc.h" -#include "vircommand.h" #include "virlog.h" -#include "virprocess.h" #include "virerror.h" #include "virpolkit.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_ACCESS diff --git a/src/access/viraccessdriverstack.c b/src/access/viraccessdriverstack.c index e6fe285a54..fb9ea71665 100644 --- a/src/access/viraccessdriverstack.c +++ b/src/access/viraccessdriverstack.c @@ -22,7 +22,6 @@ #include "viraccessdriverstack.h" #include "viralloc.h" -#include "virerror.h" #define VIR_FROM_THIS VIR_FROM_ACCESS diff --git a/src/access/viraccessmanager.h b/src/access/viraccessmanager.h index 9e3da355da..2050ac9b85 100644 --- a/src/access/viraccessmanager.h +++ b/src/access/viraccessmanager.h @@ -21,7 +21,6 @@ #pragma once #include "viridentity.h" -#include "conf/domain_conf.h" #include "conf/network_conf.h" #include "conf/nwfilter_conf.h" #include "conf/node_device_conf.h" diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h index 051246a7b6..b0ee36ed3a 100644 --- a/src/access/viraccessperm.h +++ b/src/access/viraccessperm.h @@ -20,7 +20,6 @@ #pragma once -#include "internal.h" #include "virenum.h" typedef enum { -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/ch/ch_conf.c | 1 - src/ch/ch_domain.c | 1 - src/ch/ch_driver.c | 7 ------- src/ch/ch_monitor.c | 2 -- src/ch/ch_process.c | 2 -- src/ch/ch_process.h | 1 - 6 files changed, 14 deletions(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index bae245adf3..775596e9f5 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -21,7 +21,6 @@ #include <config.h> #include "configmake.h" -#include "viralloc.h" #include "vircommand.h" #include "virlog.h" #include "virobject.h" diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index bb489a74e3..08420fd5f5 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -22,7 +22,6 @@ #include "ch_domain.h" #include "domain_driver.h" -#include "viralloc.h" #include "virchrdev.h" #include "virlog.h" #include "virtime.h" diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index d14899044e..e7c172c894 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -29,18 +29,11 @@ #include "datatypes.h" #include "driver.h" #include "viraccessapicheck.h" -#include "viralloc.h" -#include "virbuffer.h" #include "virchrdev.h" -#include "vircommand.h" #include "virerror.h" -#include "virfile.h" #include "virlog.h" -#include "virnetdevtap.h" #include "virobject.h" -#include "virstring.h" #include "virtypedparam.h" -#include "viruri.h" #include "virutil.h" #include "viruuid.h" #include "virnuma.h" diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 2c6b83a1b5..fe3c1237c4 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -24,7 +24,6 @@ #include <unistd.h> #include <curl/curl.h> -#include "ch_conf.h" #include "ch_monitor.h" #include "viralloc.h" #include "vircommand.h" @@ -33,7 +32,6 @@ #include "virjson.h" #include "virlog.h" #include "virstring.h" -#include "virtime.h" #define VIR_FROM_THIS VIR_FROM_CH diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index 977082d585..192a027b3e 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -27,8 +27,6 @@ #include "ch_monitor.h" #include "ch_process.h" #include "domain_cgroup.h" -#include "virnuma.h" -#include "viralloc.h" #include "virerror.h" #include "virjson.h" #include "virlog.h" diff --git a/src/ch/ch_process.h b/src/ch/ch_process.h index 800e3f4e23..6eccf5e608 100644 --- a/src/ch/ch_process.h +++ b/src/ch/ch_process.h @@ -21,7 +21,6 @@ #pragma once #include "ch_conf.h" -#include "internal.h" int virCHProcessStart(virCHDriver *driver, virDomainObj *vm, -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/cpu/cpu.c | 3 --- src/cpu/cpu.h | 1 - src/cpu/cpu_arm.c | 1 - src/cpu/cpu_map.c | 2 -- src/cpu/cpu_ppc64.c | 1 - src/cpu/cpu_s390.c | 2 -- src/cpu/cpu_x86.c | 1 - 7 files changed, 11 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 285c7eee44..d97ef5e873 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -21,16 +21,13 @@ #include <config.h> #include "virlog.h" -#include "viralloc.h" #include "virxml.h" #include "cpu.h" -#include "cpu_map.h" #include "cpu_x86.h" #include "cpu_ppc64.h" #include "cpu_s390.h" #include "cpu_arm.h" #include "capabilities.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 071b33fe76..06b5858ef3 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -20,7 +20,6 @@ #pragma once -#include "virerror.h" #include "datatypes.h" #include "virarch.h" #include "domain_capabilities.h" diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 51a3c1f3ee..599bb836ed 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -35,7 +35,6 @@ #include "cpu_arm.h" #include "cpu_map.h" #include "virlog.h" -#include "virstring.h" #include "virxml.h" #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 6baaa77776..1d8051a13b 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -20,12 +20,10 @@ #include <config.h> -#include "viralloc.h" #include "virfile.h" #include "cpu.h" #include "cpu_map.h" #include "configmake.h" -#include "virstring.h" #include "virlog.h" #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 314d2f7c86..5ff076e337 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -26,7 +26,6 @@ #include "cpu.h" #include "virstring.h" #include "cpu_map.h" -#include "virbuffer.h" #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index 8fda4a49a6..d908a83928 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -21,8 +21,6 @@ #include <config.h> -#include "viralloc.h" -#include "virstring.h" #include "cpu.h" diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index a4aca6055d..695d095baa 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -31,7 +31,6 @@ #include "cpu_x86.h" #include "virbuffer.h" #include "virendian.h" -#include "virstring.h" #include "virhostcpu.h" #define VIR_FROM_THIS VIR_FROM_CPU -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/hyperv/hyperv_private.h | 3 --- src/hyperv/hyperv_util.c | 3 --- src/hyperv/hyperv_util.h | 1 - 3 files changed, 7 deletions(-) diff --git a/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h index da37a8fd20..3d0606bac3 100644 --- a/src/hyperv/hyperv_private.h +++ b/src/hyperv/hyperv_private.h @@ -22,12 +22,9 @@ #pragma once -#include "internal.h" -#include "virerror.h" #include "hyperv_util.h" #include "hyperv_wsman.h" #include "capabilities.h" -#include "domain_conf.h" typedef struct _hypervPrivate hypervPrivate; struct _hypervPrivate { diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index ede786be25..fe71e47285 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -22,13 +22,10 @@ #include <config.h> #include "internal.h" -#include "datatypes.h" #include "viralloc.h" #include "virlog.h" -#include "viruuid.h" #include "hyperv_private.h" #include "hyperv_util.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_HYPERV diff --git a/src/hyperv/hyperv_util.h b/src/hyperv/hyperv_util.h index 3c3cf56c13..93c45a639b 100644 --- a/src/hyperv/hyperv_util.h +++ b/src/hyperv/hyperv_util.h @@ -21,7 +21,6 @@ #pragma once -#include "internal.h" #include "viruri.h" typedef struct _hypervParsedUri hypervParsedUri; -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/libxl/libxl_capabilities.c | 1 - src/libxl/libxl_capabilities.h | 2 -- src/libxl/libxl_conf.c | 3 --- src/libxl/libxl_conf.h | 3 --- src/libxl/libxl_domain.c | 1 - src/libxl/libxl_domain.h | 2 -- src/libxl/libxl_driver.c | 3 --- src/libxl/libxl_logger.c | 2 -- src/libxl/libxl_migration.c | 3 --- src/libxl/xen_common.h | 1 - src/libxl/xen_xl.c | 1 - src/libxl/xen_xl.h | 1 - src/libxl/xen_xm.c | 1 - src/libxl/xen_xm.h | 1 - 14 files changed, 25 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 6c7dfcb15e..c2975d637e 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -27,7 +27,6 @@ #include "virerror.h" #include "virfile.h" #include "viralloc.h" -#include "virstring.h" #include "domain_conf.h" #include "capabilities.h" #include "domain_capabilities.h" diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h index fd2b72620b..6611786dd5 100644 --- a/src/libxl/libxl_capabilities.h +++ b/src/libxl/libxl_capabilities.h @@ -22,8 +22,6 @@ #include <libxl.h> -#include "virobject.h" -#include "capabilities.h" #include "domain_capabilities.h" #include "virfirmware.h" diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index e5fe209718..26f69543f3 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -28,20 +28,17 @@ #include "internal.h" #include "virlog.h" #include "virerror.h" -#include "datatypes.h" #include "virconf.h" #include "virfile.h" #include "viridentity.h" #include "virstring.h" #include "viralloc.h" #include "viruuid.h" -#include "vircommand.h" #include "virsocketaddr.h" #include "libxl_api_wrapper.h" #include "libxl_domain.h" #include "libxl_conf.h" #include "libxl_utils.h" -#include "virstoragefile.h" #include "virsecret.h" #include "cpu/cpu.h" #include "xen_common.h" diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 16a7195bfd..cf160f11b7 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -23,15 +23,12 @@ #include <libxl.h> -#include "internal.h" #include "libvirt_internal.h" #include "virdomainobjlist.h" #include "domain_event.h" -#include "capabilities.h" #include "configmake.h" #include "virportallocator.h" #include "virobject.h" -#include "virchrdev.h" #include "virhostdev.h" #include "locking/lock_manager.h" #include "virfirmware.h" diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index dbe44f4ffc..41775be0e8 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -32,7 +32,6 @@ #include "virerror.h" #include "virhook.h" #include "virlog.h" -#include "virstring.h" #include "virtime.h" #include "locking/domain_lock.h" #include "xen_common.h" diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index aa15e0352f..5ce4d518a9 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -22,10 +22,8 @@ #include <libxl.h> -#include "domain_conf.h" #include "libxl_conf.h" #include "virchrdev.h" -#include "virenum.h" #include "domain_job.h" diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 9ffa20161d..aee3056636 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -36,7 +36,6 @@ #include "viralloc.h" #include "viruuid.h" #include "virhook.h" -#include "vircommand.h" #include "libxl_api_wrapper.h" #include "libxl_domain.h" #include "libxl_driver.h" @@ -47,8 +46,6 @@ #include "xen_xl.h" #include "virtypedparam.h" #include "viruri.h" -#include "virstring.h" -#include "virsysinfo.h" #include "viraccessapicheck.h" #include "virhostdev.h" #include "virpidfile.h" diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 45cdc32f38..69565823a0 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -24,10 +24,8 @@ #include "internal.h" #include "libxl_logger.h" #include "util/viralloc.h" -#include "util/virerror.h" #include "util/virfile.h" #include "util/virhash.h" -#include "util/virstring.h" #include "util/virthread.h" #include "util/virtime.h" diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 5bb8747890..0fd2b3206e 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -23,12 +23,10 @@ #include "internal.h" #include "virlog.h" #include "virerror.h" -#include "virconf.h" #include "datatypes.h" #include "virfile.h" #include "viralloc.h" #include "viruuid.h" -#include "vircommand.h" #include "virstring.h" #include "virobject.h" #include "virthread.h" @@ -36,7 +34,6 @@ #include "rpc/virnetsocket.h" #include "libxl_api_wrapper.h" #include "libxl_domain.h" -#include "libxl_driver.h" #include "libxl_conf.h" #include "libxl_migration.h" #include "locking/domain_lock.h" diff --git a/src/libxl/xen_common.h b/src/libxl/xen_common.h index b21046e959..7436a7643c 100644 --- a/src/libxl/xen_common.h +++ b/src/libxl/xen_common.h @@ -20,7 +20,6 @@ #pragma once -#include "internal.h" #include "virconf.h" #include "domain_conf.h" diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 6b7f638783..3b5825eaa3 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -29,7 +29,6 @@ #include "domain_conf.h" #include "viralloc.h" #include "virstring.h" -#include "storage_source.h" #include "storage_source_backingstore.h" #include "xen_xl.h" #include "libxl_capabilities.h" diff --git a/src/libxl/xen_xl.h b/src/libxl/xen_xl.h index c997562956..f8b1ebfde9 100644 --- a/src/libxl/xen_xl.h +++ b/src/libxl/xen_xl.h @@ -23,7 +23,6 @@ #pragma once #include "virconf.h" -#include "domain_conf.h" #include "xen_common.h" virDomainDef *xenParseXL(virConf *conn, diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index a962da9cad..d6213a852d 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -29,7 +29,6 @@ #include "xenxs_private.h" #include "xen_xm.h" #include "domain_conf.h" -#include "virstring.h" #include "xen_common.h" #define VIR_FROM_THIS VIR_FROM_XENXM diff --git a/src/libxl/xen_xm.h b/src/libxl/xen_xm.h index afb4f51ff7..25d3d2bfbd 100644 --- a/src/libxl/xen_xm.h +++ b/src/libxl/xen_xm.h @@ -22,7 +22,6 @@ #pragma once -#include "internal.h" #include "virconf.h" #include "domain_conf.h" -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/logging/log_daemon.c | 5 ----- src/logging/log_daemon_config.c | 4 ---- src/logging/log_daemon_dispatch.c | 1 - src/logging/log_handler.c | 1 - src/logging/log_handler.h | 1 - src/logging/log_manager.c | 1 - 6 files changed, 13 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 8ab334ff6d..91ed119c7f 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -33,15 +33,10 @@ #include "virutil.h" #include "virfile.h" #include "virpidfile.h" -#include "virprocess.h" #include "virerror.h" #include "virlog.h" #include "viralloc.h" -#include "virconf.h" #include "rpc/virnetdaemon.h" -#include "virrandom.h" -#include "virhash.h" -#include "viruuid.h" #include "virstring.h" #include "virgettext.h" #include "virdaemon.h" diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c index 84a2946395..4436745488 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -23,12 +23,8 @@ #include "log_daemon_config.h" #include "virconf.h" -#include "viralloc.h" -#include "virerror.h" #include "virlog.h" -#include "rpc/virnetserver.h" #include "configmake.h" -#include "virstring.h" #include "virutil.h" #define VIR_FROM_THIS VIR_FROM_CONF diff --git a/src/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dispatch.c index 7a0a310576..f7448155fc 100644 --- a/src/logging/log_daemon_dispatch.c +++ b/src/logging/log_daemon_dispatch.c @@ -23,7 +23,6 @@ #include "rpc/virnetserver.h" #include "rpc/virnetserverclient.h" #include "virlog.h" -#include "virstring.h" #include "log_daemon.h" #include "log_protocol.h" #include "virerror.h" diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 5c3df37415..bf1e3f35c5 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -25,7 +25,6 @@ #include "virobject.h" #include "virfile.h" #include "viralloc.h" -#include "virstring.h" #include "virlog.h" #include "virrotatingfile.h" #include "viruuid.h" diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h index 099378b361..cdd5352a35 100644 --- a/src/logging/log_handler.h +++ b/src/logging/log_handler.h @@ -20,7 +20,6 @@ #pragma once -#include "internal.h" #include "virjson.h" typedef struct _virLogHandler virLogHandler; diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index e605ed9930..6e8e7e9f1a 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -24,7 +24,6 @@ #include "log_protocol.h" #include "viralloc.h" #include "virutil.h" -#include "virstring.h" #include "virerror.h" #include "virfile.h" -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/node_device/node_device_driver.c | 3 --- src/node_device/node_device_driver.h | 1 - src/node_device/node_device_udev.c | 3 --- 3 files changed, 7 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 1eb452b989..8069f49cac 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -32,14 +32,11 @@ #include "viralloc.h" #include "virfile.h" #include "virjson.h" -#include "virstring.h" #include "node_device_conf.h" #include "node_device_event.h" #include "node_device_driver.h" -#include "node_device_util.h" #include "virvhba.h" #include "viraccessapicheck.h" -#include "virnetdev.h" #include "virutil.h" #include "vircommand.h" #include "virlog.h" diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index 7311b603ac..e64145afeb 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -21,7 +21,6 @@ #pragma once -#include "internal.h" #include "driver.h" #include "virnodedeviceobj.h" #include "vircommand.h" diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index b68dc12158..61c0986cf0 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -30,11 +30,9 @@ #include "node_device_udev.h" #include "virerror.h" #include "driver.h" -#include "datatypes.h" #include "virlog.h" #include "viralloc.h" #include "viruuid.h" -#include "virbuffer.h" #include "virfile.h" #include "virpci.h" #include "virpidfile.h" @@ -42,7 +40,6 @@ #include "virnetdev.h" #include "virmdev.h" #include "virutil.h" -#include "virpcivpd.h" #include "configmake.h" -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/openvz/openvz_conf.c | 1 - src/openvz/openvz_conf.h | 1 - src/openvz/openvz_driver.h | 2 -- src/openvz/openvz_util.c | 1 - 4 files changed, 5 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 191c79e1e2..2253796b2c 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -34,7 +34,6 @@ #include "openvz_conf.h" #include "openvz_util.h" #include "viruuid.h" -#include "virbuffer.h" #include "viralloc.h" #include "virfile.h" #include "vircommand.h" diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index 9c3eff9aaf..558dad0f2d 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -23,7 +23,6 @@ #pragma once -#include "internal.h" #include "virdomainobjlist.h" #include "virthread.h" diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h index 1570fd82ac..93edd7ca01 100644 --- a/src/openvz/openvz_driver.h +++ b/src/openvz/openvz_driver.h @@ -22,8 +22,6 @@ #pragma once -#include "internal.h" - #define OPENVZ_MIGRATION_FLAGS \ (VIR_MIGRATE_LIVE) diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c index 9419ce122c..6c64ba0bdc 100644 --- a/src/openvz/openvz_util.c +++ b/src/openvz/openvz_util.c @@ -29,7 +29,6 @@ #include "virerror.h" #include "vircommand.h" #include "datatypes.h" -#include "viralloc.h" #include "openvz_conf.h" #include "openvz_util.h" -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/remote/remote_daemon.c | 3 --- src/remote/remote_daemon.h | 1 - src/remote/remote_daemon_config.c | 1 - src/remote/remote_daemon_dispatch.c | 5 ----- src/remote/remote_daemon_dispatch.h | 1 - src/remote/remote_daemon_stream.c | 1 - src/remote/remote_driver.c | 3 --- src/remote/remote_driver.h | 1 - 8 files changed, 16 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 26469e0d9f..ca9d4fd4d1 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -32,7 +32,6 @@ #include "virfile.h" #include "virlog.h" #include "virpidfile.h" -#include "virprocess.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -43,14 +42,12 @@ #include "viruuid.h" #include "remote_driver.h" #include "viralloc.h" -#include "virconf.h" #include "virnetlink.h" #include "virnetdaemon.h" #include "remote_daemon_dispatch.h" #include "virhook.h" #include "viraudit.h" #include "virstring.h" -#include "locking/lock_manager.h" #include "viraccessmanager.h" #include "virutil.h" #include "virgettext.h" diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h index 1a69311029..7c3f50d9d4 100644 --- a/src/remote/remote_daemon.h +++ b/src/remote/remote_daemon.h @@ -25,7 +25,6 @@ #include <rpc/types.h> #include <rpc/xdr.h> -#include "remote_protocol.h" #include "lxc_protocol.h" #include "qemu_protocol.h" #include "virthread.h" diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c index 30653e82cf..330db54651 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -31,7 +31,6 @@ #include "remote_protocol.h" #include "remote_driver.h" #include "util/virnetdevopenvswitch.h" -#include "virstring.h" #include "virutil.h" #define VIR_FROM_THIS VIR_FROM_CONF diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 2463386e39..305311c208 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -30,18 +30,13 @@ #include "viralloc.h" #include "virlog.h" #include "remote_daemon_stream.h" -#include "viruuid.h" -#include "vircommand.h" #include "virnetserverservice.h" #include "virnetserver.h" #include "virfile.h" #include "virtypedparam.h" -#include "virprocess.h" #include "remote_protocol.h" #include "qemu_protocol.h" #include "lxc_protocol.h" -#include "virstring.h" -#include "object_event.h" #include "domain_conf.h" #include "network_conf.h" #include "virprobe.h" diff --git a/src/remote/remote_daemon_dispatch.h b/src/remote/remote_daemon_dispatch.h index 0d5f243203..e6cde23244 100644 --- a/src/remote/remote_daemon_dispatch.h +++ b/src/remote/remote_daemon_dispatch.h @@ -20,7 +20,6 @@ #pragma once -#include "remote_protocol.h" #include "rpc/virnetserverprogram.h" #include "rpc/virnetserverclient.h" diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c index a6d2c915e6..645be6eafd 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -22,7 +22,6 @@ #include <config.h> #include "remote_daemon_stream.h" -#include "remote_daemon_dispatch.h" #include "viralloc.h" #include "virlog.h" #include "virnetserverclient.h" diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 423f5f9fb9..85bda3b785 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -35,7 +35,6 @@ #include "node_device_event.h" #include "secret_event.h" #include "driver.h" -#include "virbuffer.h" #include "remote_driver.h" #include "remote_protocol.h" #include "remote_sockets.h" @@ -43,13 +42,11 @@ #include "qemu_protocol.h" #include "viralloc.h" #include "virfile.h" -#include "vircommand.h" #include "virtypedparam.h" #include "viruri.h" #include "virauth.h" #include "virauthconfig.h" #include "virstring.h" -#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_REMOTE diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h index 5e9b04da63..68cac1c244 100644 --- a/src/remote/remote_driver.h +++ b/src/remote/remote_driver.h @@ -21,7 +21,6 @@ #pragma once -#include "internal.h" #include "configmake.h" int remoteRegister (void); -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/secret/secret_driver.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 09782b38d3..080ed962a9 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -35,11 +35,9 @@ #include "virthread.h" #include "viruuid.h" #include "virerror.h" -#include "virfile.h" #include "viridentity.h" #include "virpidfile.h" #include "configmake.h" -#include "virstring.h" #include "viraccessapicheck.h" #include "secret_event.h" #include "virutil.h" -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/storage/parthelper.c | 1 - src/storage/storage_backend.c | 3 --- src/storage/storage_backend.h | 1 - src/storage/storage_backend_fs.c | 1 - src/storage/storage_backend_gluster.c | 1 - src/storage/storage_backend_iscsi.c | 4 ---- src/storage/storage_backend_iscsi_direct.c | 2 -- src/storage/storage_backend_mpath.c | 1 - src/storage/storage_backend_rbd.c | 1 - src/storage/storage_backend_scsi.c | 3 --- src/storage/storage_backend_vstorage.c | 2 -- src/storage/storage_driver.c | 2 -- src/storage/storage_util.c | 3 --- src/storage/storage_util.h | 1 - 14 files changed, 26 deletions(-) diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index 73ae28f718..da67455335 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -37,7 +37,6 @@ #include <unistd.h> #include "virfile.h" -#include "virstring.h" #include "virgettext.h" #include "virdevmapper.h" #include "virerror.h" diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index c5b36801ba..3e7a5ae67d 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -23,12 +23,9 @@ #include <sys/stat.h> -#include "datatypes.h" #include "virerror.h" -#include "viralloc.h" #include "internal.h" #include "storage_backend.h" -#include "storage_source_conf.h" #include "virlog.h" #include "virmodule.h" #include "virfile.h" diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 75b5220a7b..682e479b6f 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -20,7 +20,6 @@ #include <sys/stat.h> -#include "internal.h" #include "virstorageobj.h" #include "storage_driver.h" diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index be3c3c6839..ea5bf7ef83 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -33,7 +33,6 @@ #include "viralloc.h" #include "virfile.h" #include "virlog.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_STORAGE diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 52007db2ba..1fe21b4a2b 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -28,7 +28,6 @@ #include "viralloc.h" #include "virerror.h" #include "virlog.h" -#include "virstring.h" #include "viruri.h" #include "storage_file_probe.h" #include "storage_util.h" diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index eef1d91062..968a70158b 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -26,19 +26,15 @@ #include <unistd.h> #include <sys/stat.h> -#include "datatypes.h" #include "driver.h" #include "storage_backend_iscsi.h" #include "viralloc.h" -#include "vircommand.h" #include "virerror.h" #include "virfile.h" #include "viriscsi.h" #include "viridentity.h" #include "virlog.h" #include "virobject.h" -#include "virstring.h" -#include "viruuid.h" #include "virsecret.h" #include "storage_util.h" #include "virutil.h" diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 302a338ec6..5df5447066 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -27,14 +27,12 @@ #include "virsecret.h" #include "storage_backend_iscsi_direct.h" #include "storage_util.h" -#include "viralloc.h" #include "virerror.h" #include "viridentity.h" #include "virlog.h" #include "virobject.h" #include "virstring.h" #include "virtime.h" -#include "viruuid.h" #include "virsecureerase.h" #define VIR_FROM_THIS VIR_FROM_STORAGE diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index ac90a38fa3..b33fe3846d 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -33,7 +33,6 @@ #include "viralloc.h" #include "virlog.h" #include "virfile.h" -#include "virstring.h" #include "virutil.h" #include "storage_util.h" diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 2559991bc0..52407f8e6f 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -30,7 +30,6 @@ #include "viridentity.h" #include "virlog.h" #include "viruuid.h" -#include "virstring.h" #include "virrandom.h" #include "rados/librados.h" #include "rbd/librbd.h" diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index fc99e0414a..afc98960a8 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -26,11 +26,8 @@ #include "virerror.h" #include "storage_backend_scsi.h" -#include "viralloc.h" #include "virlog.h" #include "virfile.h" -#include "vircommand.h" -#include "virstring.h" #include "storage_util.h" #include "node_device_conf.h" #include "node_device_util.h" diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index 52e9895234..21e538f2a2 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -1,11 +1,9 @@ #include <config.h> -#include "viralloc.h" #include "virerror.h" #include "virfile.h" #include "storage_backend_vstorage.h" #include "virlog.h" -#include "virstring.h" #include "virutil.h" #include <mntent.h> #include <paths.h> diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index e3e1604311..8dc2cfa7c9 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -45,8 +45,6 @@ #include "virfdstream.h" #include "virpidfile.h" #include "configmake.h" -#include "virsecret.h" -#include "virstring.h" #include "viraccessapicheck.h" #include "storage_util.h" #include "virutil.h" diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index f543dc9f3d..6ed2078b65 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -47,9 +47,7 @@ #include "virerror.h" #include "viralloc.h" #include "internal.h" -#include "secret_conf.h" #include "virsecret.h" -#include "vircrypto.h" #include "viruuid.h" #include "virstoragefile.h" #include "storage_file_probe.h" @@ -59,7 +57,6 @@ #include "virlog.h" #include "virfile.h" #include "viridentity.h" -#include "virjson.h" #include "virqemu.h" #include "virstring.h" #include "virxml.h" diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h index aa3c25e9fc..70b5d4e94d 100644 --- a/src/storage/storage_util.h +++ b/src/storage/storage_util.h @@ -22,7 +22,6 @@ #include "internal.h" #include "vircommand.h" -#include "storage_driver.h" #include "storage_backend.h" /* Storage Pool Namespace options to share w/ storage_backend_fs.c and -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/util/iohelper.c | 3 --- src/util/virarch.h | 2 -- src/util/virarptable.c | 2 -- src/util/virarptable.h | 2 -- src/util/viraudit.h | 1 - src/util/virauth.c | 1 - src/util/virauth.h | 1 - src/util/virauthconfig.c | 1 - src/util/virbpf.c | 1 - src/util/virbuffer.c | 2 -- src/util/vircgroup.c | 3 --- src/util/vircgroupv2devices.c | 1 - src/util/vircgroupv2devices.h | 2 -- src/util/virconf.c | 1 - src/util/vircrypto.c | 2 -- src/util/virdnsmasq.c | 2 -- src/util/virebtables.c | 4 ---- src/util/virendian.h | 2 -- src/util/virenum.c | 1 - src/util/virerror.c | 1 - src/util/virevent.h | 1 - src/util/vireventglib.c | 1 - src/util/vireventglib.h | 2 -- src/util/vireventthread.h | 1 - src/util/virfcp.c | 2 -- src/util/virfdstream.c | 1 - src/util/virfilecache.c | 2 -- src/util/virfilecache.h | 2 -- src/util/virfirewall.c | 1 - src/util/virfirmware.c | 1 - src/util/virgic.c | 1 - src/util/virhook.c | 2 -- src/util/virhook.h | 2 -- src/util/virhostcpu.c | 2 -- src/util/virhostcpu.h | 1 - src/util/virhostmem.c | 2 -- src/util/virhostuptime.c | 1 - src/util/viridentity.c | 3 --- src/util/virinitctl.c | 3 --- src/util/viriptables.c | 6 ------ src/util/viriscsi.c | 2 -- src/util/virjson.c | 1 - src/util/virkmod.c | 1 - src/util/virlease.c | 2 -- src/util/virlockspace.c | 1 - src/util/virlockspace.h | 1 - src/util/virmacaddr.c | 1 - src/util/virmacmap.c | 2 -- src/util/virmacmap.h | 1 - src/util/virmdev.h | 1 - src/util/virnetdevbandwidth.c | 2 -- src/util/virnetdevbridge.c | 2 -- src/util/virnetdevip.c | 1 - src/util/virnetdevmacvlan.c | 2 -- src/util/virnetdevmacvlan.h | 2 -- src/util/virnetdevmidonet.c | 1 - src/util/virnetdevopenvswitch.c | 1 - src/util/virnetdevtap.c | 1 - src/util/virnetdevveth.c | 3 --- src/util/virnetdevvlan.c | 2 -- src/util/virnetlink.c | 1 - src/util/virnetlink.h | 1 - src/util/virnodesuspend.c | 4 ---- src/util/virnodesuspend.h | 2 -- src/util/virnvme.c | 1 - src/util/virobject.c | 2 -- src/util/virpci.c | 1 - src/util/virpcivpd.c | 1 - src/util/virperf.c | 2 -- src/util/virpidfile.c | 1 - src/util/virpolkit.c | 2 -- src/util/virportallocator.c | 3 --- src/util/virprobe.h | 1 - src/util/virprocess.h | 1 - src/util/virqemu.c | 2 -- src/util/virqemu.h | 1 - src/util/virrandom.c | 3 --- src/util/virresctrl.h | 3 --- src/util/virrotatingfile.c | 1 - src/util/virscsi.h | 1 - src/util/virscsivhost.c | 1 - src/util/virscsivhost.h | 1 - src/util/virseclabel.c | 2 -- src/util/virsecret.c | 1 - src/util/virsocketaddr.c | 2 -- src/util/virstoragefile.c | 4 ---- src/util/virtpm.c | 1 - src/util/virusb.h | 1 - src/util/virutil.c | 2 -- src/util/viruuid.c | 3 --- 90 files changed, 154 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 055540c8c4..dd77bda723 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -31,11 +31,8 @@ #include <sys/types.h> #include <sys/stat.h> -#include "virthread.h" #include "virfile.h" -#include "viralloc.h" #include "virerror.h" -#include "virrandom.h" #include "virstring.h" #include "virgettext.h" diff --git a/src/util/virarch.h b/src/util/virarch.h index 81b1b27a57..cbfc893bbd 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -21,8 +21,6 @@ #pragma once -#include "internal.h" - typedef enum { VIR_ARCH_NONE, VIR_ARCH_ALPHA, /* Alpha 64 BE https://en.wikipedia.org/wiki/DEC_Alpha */ diff --git a/src/util/virarptable.c b/src/util/virarptable.c index 3b9ece3d9b..7f9fefc160 100644 --- a/src/util/virarptable.c +++ b/src/util/virarptable.c @@ -27,11 +27,9 @@ #include "viralloc.h" #include "virarptable.h" #include "virerror.h" -#include "virfile.h" #include "virlog.h" #include "virnetlink.h" #include "virsocketaddr.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virarptable.h b/src/util/virarptable.h index 825c7966b7..c3c90cfd11 100644 --- a/src/util/virarptable.h +++ b/src/util/virarptable.h @@ -20,8 +20,6 @@ #pragma once -#include "internal.h" - typedef struct _virArpTableEntry virArpTableEntry; typedef struct _virArpTable virArpTable; diff --git a/src/util/viraudit.h b/src/util/viraudit.h index bc2325da58..a38a61c9f9 100644 --- a/src/util/viraudit.h +++ b/src/util/viraudit.h @@ -21,7 +21,6 @@ #pragma once -#include "internal.h" #include "virlog.h" typedef enum { diff --git a/src/util/virauth.c b/src/util/virauth.c index e7fe8c97dd..b9c2ae3ed1 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -31,7 +31,6 @@ #include "virerror.h" #include "configmake.h" #include "virauthconfig.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_AUTH diff --git a/src/util/virauth.h b/src/util/virauth.h index a0fd84962b..df67ab1d34 100644 --- a/src/util/virauth.h +++ b/src/util/virauth.h @@ -22,7 +22,6 @@ #pragma once -#include "internal.h" #include "viruri.h" int virAuthGetConfigFilePath(virConnectPtr conn, diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index 63d9cebdf7..dabd7cd217 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -24,7 +24,6 @@ #include "virlog.h" #include "virerror.h" -#include "virstring.h" #include "viralloc.h" struct _virAuthConfig { diff --git a/src/util/virbpf.c b/src/util/virbpf.c index df4f333614..1169b99d07 100644 --- a/src/util/virbpf.c +++ b/src/util/virbpf.c @@ -18,7 +18,6 @@ #include <config.h> #include "virlog.h" -#include "virerror.h" #include "virbpf.h" VIR_LOG_INIT("util.bpf"); diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index 19cf775a8c..01d04cc4f9 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -23,8 +23,6 @@ #include <stdarg.h> #include "virbuffer.h" -#include "virstring.h" -#include "viralloc.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 5cfc20f1ed..9918430cca 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -35,19 +35,16 @@ #define LIBVIRT_VIRCGROUPPRIV_H_ALLOW #include "vircgrouppriv.h" -#include "virutil.h" #include "viralloc.h" #include "vircgroupbackend.h" #include "virerror.h" #include "virlog.h" #include "virfile.h" #include "virgdbus.h" -#include "virhash.h" #include "virstring.h" #include "virsystemd.h" #include "virtypedparam.h" #include "virhostcpu.h" -#include "virthread.h" VIR_LOG_INIT("util.cgroup"); diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c index ffa65bdd00..1769c499c8 100644 --- a/src/util/vircgroupv2devices.c +++ b/src/util/vircgroupv2devices.c @@ -30,7 +30,6 @@ #define LIBVIRT_VIRCGROUPPRIV_H_ALLOW #include "vircgrouppriv.h" -#include "viralloc.h" #include "virbpf.h" #include "vircgroup.h" #include "vircgroupv2devices.h" diff --git a/src/util/vircgroupv2devices.h b/src/util/vircgroupv2devices.h index 1ff46987e8..db83bb13db 100644 --- a/src/util/vircgroupv2devices.h +++ b/src/util/vircgroupv2devices.h @@ -20,8 +20,6 @@ #include <sys/types.h> -#include "internal.h" - #include "vircgroup.h" bool diff --git a/src/util/virconf.c b/src/util/virconf.c index 0d0c04a824..8a96805642 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -32,7 +32,6 @@ #include "virlog.h" #include "viralloc.h" #include "virfile.h" -#include "virstring.h" #include "configmake.h" #define VIR_FROM_THIS VIR_FROM_CONF diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 23692d22fb..828e822d8e 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -23,8 +23,6 @@ #include "vircrypto.h" #include "virlog.h" #include "virerror.h" -#include "viralloc.h" -#include "virrandom.h" #include "virsecureerase.h" #include <gnutls/gnutls.h> diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index fd4efa802c..342b489ab7 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -31,8 +31,6 @@ #include <signal.h> #include "internal.h" -#include "datatypes.h" -#include "virbitmap.h" #include "virdnsmasq.h" #include "vircommand.h" #include "viralloc.h" diff --git a/src/util/virebtables.c b/src/util/virebtables.c index e296cf2578..9fc066a693 100644 --- a/src/util/virebtables.c +++ b/src/util/virebtables.c @@ -21,12 +21,8 @@ #include <config.h> -#include "internal.h" #include "virebtables.h" -#include "viralloc.h" -#include "virerror.h" #include "virlog.h" -#include "virstring.h" #include "virfirewall.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virendian.h b/src/util/virendian.h index e5b82026ac..db9c147c08 100644 --- a/src/util/virendian.h +++ b/src/util/virendian.h @@ -21,8 +21,6 @@ #pragma once -#include "internal.h" - /* The interfaces in this file are provided as macros for speed. */ /** diff --git a/src/util/virenum.c b/src/util/virenum.c index 103f00b524..c6936e58ff 100644 --- a/src/util/virenum.c +++ b/src/util/virenum.c @@ -18,7 +18,6 @@ #include <config.h> #include "virenum.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virerror.c b/src/util/virerror.c index 5c8b9ebeb5..d114c0a346 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 "virstring.h" #include "virbuffer.h" #define LIBVIRT_VIRERRORPRIV_H_ALLOW diff --git a/src/util/virevent.h b/src/util/virevent.h index 6c8fdcbac4..321bbe67f7 100644 --- a/src/util/virevent.h +++ b/src/util/virevent.h @@ -20,6 +20,5 @@ */ #pragma once -#include "internal.h" int virEventRequireImpl(void); diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c index fc04d8f712..b01ddb814e 100644 --- a/src/util/vireventglib.c +++ b/src/util/vireventglib.c @@ -27,7 +27,6 @@ #include "vireventglib.h" #include "vireventglibwatch.h" -#include "virerror.h" #include "virlog.h" #include "virprobe.h" diff --git a/src/util/vireventglib.h b/src/util/vireventglib.h index ef68abaa20..ea6f2149ac 100644 --- a/src/util/vireventglib.h +++ b/src/util/vireventglib.h @@ -21,8 +21,6 @@ #pragma once -#include "internal.h" - void virEventGLibRegister(void); int virEventGLibRunOnce(void); diff --git a/src/util/vireventthread.h b/src/util/vireventthread.h index 5826c25cf4..79bdff479b 100644 --- a/src/util/vireventthread.h +++ b/src/util/vireventthread.h @@ -20,7 +20,6 @@ #pragma once -#include "internal.h" #include <glib-object.h> #define VIR_TYPE_EVENT_THREAD vir_event_thread_get_type() diff --git a/src/util/virfcp.c b/src/util/virfcp.c index 5e8fe72fec..bb62fa9025 100644 --- a/src/util/virfcp.c +++ b/src/util/virfcp.c @@ -22,10 +22,8 @@ #include "internal.h" -#include "viralloc.h" #include "virfile.h" #include "virerror.h" -#include "virstring.h" #include "virfcp.h" diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index b596659702..3de0d59a8b 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -39,7 +39,6 @@ #include "configmake.h" #include "virstring.h" #include "virtime.h" -#include "virprocess.h" #include "virsocket.h" #define VIR_FROM_THIS VIR_FROM_STREAMS diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index cfcfc26e19..c4bc984020 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -24,7 +24,6 @@ #include "internal.h" -#include "viralloc.h" #include "virbuffer.h" #include "vircrypto.h" #include "virerror.h" @@ -33,7 +32,6 @@ #include "virhash.h" #include "virlog.h" #include "virobject.h" -#include "virstring.h" #include <sys/stat.h> #include <sys/types.h> diff --git a/src/util/virfilecache.h b/src/util/virfilecache.h index 81be8feef5..eb37d4cf15 100644 --- a/src/util/virfilecache.h +++ b/src/util/virfilecache.h @@ -21,8 +21,6 @@ #pragma once -#include "internal.h" - #include "virobject.h" #include "virhash.h" diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 31a8352d4e..3183e0aec7 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -26,7 +26,6 @@ #include "virfirewalld.h" #include "viralloc.h" #include "virerror.h" -#include "virstring.h" #include "vircommand.h" #include "virlog.h" #include "virfile.h" diff --git a/src/util/virfirmware.c b/src/util/virfirmware.c index b2e3491544..9b333cf04b 100644 --- a/src/util/virfirmware.c +++ b/src/util/virfirmware.c @@ -20,7 +20,6 @@ #include <config.h> -#include "viralloc.h" #include "virerror.h" #include "virfirmware.h" #include "virlog.h" diff --git a/src/util/virgic.c b/src/util/virgic.c index dcae97356d..fd0d248777 100644 --- a/src/util/virgic.c +++ b/src/util/virgic.c @@ -19,7 +19,6 @@ */ #include <config.h> -#include "internal.h" #include "virgic.h" VIR_ENUM_IMPL(virGICVersion, diff --git a/src/util/virhook.c b/src/util/virhook.c index b52e2cd814..871bfcc670 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -27,9 +27,7 @@ #include "virerror.h" #include "virhook.h" -#include "virutil.h" #include "virlog.h" -#include "viralloc.h" #include "virfile.h" #include "configmake.h" #include "vircommand.h" diff --git a/src/util/virhook.h b/src/util/virhook.h index d8237c837e..277d3118b4 100644 --- a/src/util/virhook.h +++ b/src/util/virhook.h @@ -21,8 +21,6 @@ #pragma once -#include "internal.h" - typedef enum { VIR_HOOK_DRIVER_DAEMON = 0, /* Daemon related events */ VIR_HOOK_DRIVER_QEMU, /* QEMU domains related events */ diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index e3f2d6d4b7..639dd9b51e 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -45,9 +45,7 @@ #include "virerror.h" #include "virarch.h" #include "virfile.h" -#include "virtypedparam.h" #include "virstring.h" -#include "virnuma.h" #include "virlog.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 86a231daa2..9c6f1855b9 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -21,7 +21,6 @@ #pragma once -#include "internal.h" #include "virarch.h" #include "virbitmap.h" #include "virenum.h" diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 5984dfab3f..052f7cd935 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -36,10 +36,8 @@ # include <windows.h> #endif -#include "viralloc.h" #include "virhostmem.h" #include "virerror.h" -#include "virarch.h" #include "virfile.h" #include "virtypedparam.h" #include "virstring.h" diff --git a/src/util/virhostuptime.c b/src/util/virhostuptime.c index 7508a5a9b6..3d41fa081d 100644 --- a/src/util/virhostuptime.c +++ b/src/util/virhostuptime.c @@ -25,7 +25,6 @@ #endif #include "virhostuptime.h" -#include "viralloc.h" #include "virfile.h" #include "virlog.h" #include "virstring.h" diff --git a/src/util/viridentity.c b/src/util/viridentity.c index 70843ecf9f..3e0dd687f3 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -30,15 +30,12 @@ #define LIBVIRT_VIRIDENTITYPRIV_H_ALLOW #include "internal.h" -#include "viralloc.h" #include "virerror.h" #include "viridentitypriv.h" #include "virlog.h" -#include "virobject.h" #include "virrandom.h" #include "virthread.h" #include "virutil.h" -#include "virstring.h" #include "virprocess.h" #include "virtypedparam.h" #include "virfile.h" diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index d7e29f24c3..1b9f2ad022 100644 --- a/src/util/virinitctl.c +++ b/src/util/virinitctl.c @@ -26,10 +26,7 @@ #include "internal.h" #include "virinitctl.h" #include "virerror.h" -#include "virutil.h" -#include "viralloc.h" #include "virfile.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_INITCTL diff --git a/src/util/viriptables.c b/src/util/viriptables.c index 7db09a0d80..e9886a200e 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -29,14 +29,8 @@ #include "internal.h" #include "viriptables.h" #include "virfirewalld.h" -#include "vircommand.h" -#include "viralloc.h" #include "virerror.h" -#include "virfile.h" #include "virlog.h" -#include "virthread.h" -#include "virstring.h" -#include "virutil.h" #include "virhash.h" VIR_LOG_INIT("util.iptables"); diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index e84d49b03c..fbf84c9305 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -27,10 +27,8 @@ #include "viralloc.h" #include "vircommand.h" #include "virerror.h" -#include "virfile.h" #include "virlog.h" #include "virrandom.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virjson.c b/src/util/virjson.c index 6e13e97e15..1334886f9c 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -28,7 +28,6 @@ #include "virerror.h" #include "virlog.h" #include "virstring.h" -#include "virutil.h" #include "virbuffer.h" #include "virenum.h" #include "virbitmap.h" diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 6a996ebb04..4c709f8659 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -23,7 +23,6 @@ #include "viralloc.h" #include "virkmod.h" #include "vircommand.h" -#include "virstring.h" static int doModprobe(const char *opts, const char *module, char **outbuf, char **errbuf) diff --git a/src/util/virlease.c b/src/util/virlease.c index 48b0f6fe57..357bacd83d 100644 --- a/src/util/virlease.c +++ b/src/util/virlease.c @@ -29,8 +29,6 @@ #include "virfile.h" #include "virstring.h" #include "virerror.h" -#include "viralloc.h" -#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_NETWORK diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 79925053bf..d54162b3d7 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -29,7 +29,6 @@ #include "virfile.h" #include "virhash.h" #include "virthread.h" -#include "virstring.h" #include <fcntl.h> #include <unistd.h> diff --git a/src/util/virlockspace.h b/src/util/virlockspace.h index da83c001e9..fc087f1e35 100644 --- a/src/util/virlockspace.h +++ b/src/util/virlockspace.h @@ -21,7 +21,6 @@ #pragma once -#include "internal.h" #include "virjson.h" typedef struct _virLockSpace virLockSpace; diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 6b22384cee..073f298b5b 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -23,7 +23,6 @@ #include "virmacaddr.h" #include "virrandom.h" -#include "viralloc.h" static const unsigned char virMacAddrBroadcastAddrRaw[VIR_MAC_BUFLEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index cf554205a8..98be64fb31 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -26,8 +26,6 @@ #include "virjson.h" #include "virfile.h" #include "virhash.h" -#include "virstring.h" -#include "viralloc.h" #define VIR_FROM_THIS VIR_FROM_NETWORK diff --git a/src/util/virmacmap.h b/src/util/virmacmap.h index c0efa2b20f..09d2f32755 100644 --- a/src/util/virmacmap.h +++ b/src/util/virmacmap.h @@ -20,7 +20,6 @@ #pragma once -#include "internal.h" #include "virobject.h" typedef struct virMacMap virMacMap; diff --git a/src/util/virmdev.h b/src/util/virmdev.h index 4d3655a091..9514080421 100644 --- a/src/util/virmdev.h +++ b/src/util/virmdev.h @@ -18,7 +18,6 @@ #pragma once -#include "internal.h" #include "virobject.h" #include "virenum.h" diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 2895be8d27..ce65615bca 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -24,8 +24,6 @@ #include "viralloc.h" #include "virerror.h" #include "virlog.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 a9667b48ce..f1a1c7f509 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -22,10 +22,8 @@ #include "virnetdev.h" #include "virerror.h" #include "virfile.h" -#include "viralloc.h" #include "virlog.h" #include "virstring.h" -#include "virsocket.h" #ifdef WITH_NET_IF_H # include <net/if.h> diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 2eacb64ebe..5b1c76c347 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 "vircommand.h" #include "viralloc.h" #if WITH_GETIFADDRS diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index fd8c20e059..69c34cf016 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -27,8 +27,6 @@ #include "virnetdevmacvlan.h" #include "virmacaddr.h" #include "virerror.h" -#include "virthread.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NET diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 0a013fc242..405e48088f 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -21,8 +21,6 @@ #include "internal.h" #include "virmacaddr.h" -#include "virsocketaddr.h" -#include "virnetdevbandwidth.h" #include "virnetdevvportprofile.h" #include "virnetdevvlan.h" #include "virenum.h" diff --git a/src/util/virnetdevmidonet.c b/src/util/virnetdevmidonet.c index 72b2fd4467..202808ef0f 100644 --- a/src/util/virnetdevmidonet.c +++ b/src/util/virnetdevmidonet.c @@ -20,7 +20,6 @@ #include "virnetdevmidonet.h" #include "vircommand.h" -#include "viralloc.h" #include "virerror.h" #include "viruuid.h" diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 7418716600..b54b2ddd99 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -30,7 +30,6 @@ #include "virlog.h" #include "virjson.h" #include "virfile.h" -#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index cdaf67a72e..112a1e8b99 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -29,7 +29,6 @@ #include "viralloc.h" #include "virlog.h" #include "virstring.h" -#include "datatypes.h" #include <unistd.h> #include <sys/types.h> diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index b580e105ac..d9a73358a6 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -22,10 +22,7 @@ #include "virnetdevveth.h" #include "viralloc.h" #include "virlog.h" -#include "vircommand.h" #include "virerror.h" -#include "virfile.h" -#include "virstring.h" #include "virnetdev.h" #include "virnetlink.h" diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c index 64fbacd4f8..5a0fa4e491 100644 --- a/src/util/virnetdevvlan.c +++ b/src/util/virnetdevvlan.c @@ -18,8 +18,6 @@ #include <config.h> -#include "internal.h" -#include "virerror.h" #include "virnetdevvlan.h" #include "viralloc.h" diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 04a39a905b..1711966cad 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -32,7 +32,6 @@ #include "virmacaddr.h" #include "virerror.h" #include "viralloc.h" -#include "virsocket.h" #define VIR_FROM_THIS VIR_FROM_NET diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 75192f645f..acab39dde4 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -19,7 +19,6 @@ #pragma once -#include "internal.h" #include "virmacaddr.h" #if defined(WITH_LIBNL) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 5feef79c43..0fec5647c1 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -26,10 +26,6 @@ #include "virsystemd.h" #include "vircommand.h" #include "virthread.h" -#include "datatypes.h" - -#include "viralloc.h" -#include "virfile.h" #include "virlog.h" #include "virerror.h" diff --git a/src/util/virnodesuspend.h b/src/util/virnodesuspend.h index f767961bff..fa5e7d6274 100644 --- a/src/util/virnodesuspend.h +++ b/src/util/virnodesuspend.h @@ -21,8 +21,6 @@ #pragma once -#include "internal.h" - int virNodeSuspend(unsigned int target, unsigned long long duration, unsigned int flags); diff --git a/src/util/virnvme.c b/src/util/virnvme.c index 3ce02b5000..d0f0c04aba 100644 --- a/src/util/virnvme.c +++ b/src/util/virnvme.c @@ -23,7 +23,6 @@ #include "virpci.h" #include "viralloc.h" #include "virlog.h" -#include "virstring.h" VIR_LOG_INIT("util.nvme"); #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virobject.c b/src/util/virobject.c index 74cc84205e..d1cd4d32f1 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -24,11 +24,9 @@ #define VIR_PARENT_REQUIRED /* empty, to allow virObject to have no parent */ #include "virobject.h" #include "virthread.h" -#include "viralloc.h" #include "virerror.h" #include "virlog.h" #include "virprobe.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virpci.c b/src/util/virpci.c index d141fde814..03d1d7b074 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -31,7 +31,6 @@ #include <unistd.h> #include "virlog.h" -#include "vircommand.h" #include "virerror.h" #include "virfile.h" #include "virkmod.h" diff --git a/src/util/virpcivpd.c b/src/util/virpcivpd.c index 9af0566d19..4ba4fea237 100644 --- a/src/util/virpcivpd.c +++ b/src/util/virpcivpd.c @@ -30,7 +30,6 @@ #include "virpcivpdpriv.h" #include "virlog.h" #include "virerror.h" -#include "virfile.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virperf.c b/src/util/virperf.c index fde8ca7e34..434d1d99c4 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -30,8 +30,6 @@ #include "virlog.h" #include "virfile.h" #include "virstring.h" -#include "virtypedparam.h" -#include "viralloc.h" VIR_LOG_INIT("util.perf"); diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 9d194f7336..bfd967c1af 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -29,7 +29,6 @@ #include "virpidfile.h" #include "virfile.h" -#include "viralloc.h" #include "virbuffer.h" #include "virutil.h" #include "virlog.h" diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 8970de192f..6c83eaf412 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -26,8 +26,6 @@ #include "virpolkit.h" #include "virerror.h" #include "virlog.h" -#include "virstring.h" -#include "virprocess.h" #include "viralloc.h" #include "virgdbus.h" #include "virfile.h" diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 44edd8f99a..96474b789a 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -24,13 +24,10 @@ #include <unistd.h> #include "virsocket.h" -#include "viralloc.h" #include "virbitmap.h" #include "virportallocator.h" #include "virthread.h" #include "virerror.h" -#include "virfile.h" -#include "virstring.h" #include "virutil.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virprobe.h b/src/util/virprobe.h index 80a5f48ec8..e8b195826a 100644 --- a/src/util/virprobe.h +++ b/src/util/virprobe.h @@ -21,7 +21,6 @@ #pragma once -#include "internal.h" #include "virlog.h" #if WITH_DTRACE_PROBES diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 086fbe0e4d..168255ba38 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -23,7 +23,6 @@ #include <sys/types.h> -#include "internal.h" #include "virbitmap.h" #include "virenum.h" diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 8ff61b22b0..9dc0eab386 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -26,8 +26,6 @@ #include "virerror.h" #include "virlog.h" #include "virqemu.h" -#include "virstring.h" -#include "viralloc.h" #include "virbitmap.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virqemu.h b/src/util/virqemu.h index 472f24de53..76c521e7c8 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -22,7 +22,6 @@ #pragma once -#include "internal.h" #include "virbuffer.h" #include "virjson.h" diff --git a/src/util/virrandom.c b/src/util/virrandom.c index c3f3aa1fa6..e23ddf8e1d 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -28,11 +28,8 @@ #include <gnutls/crypto.h> #include "virrandom.h" -#include "virthread.h" #include "virerror.h" -#include "virfile.h" #include "virlog.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h index 5d7b23c3c4..6fadacbfc6 100644 --- a/src/util/virresctrl.h +++ b/src/util/virresctrl.h @@ -18,10 +18,7 @@ #pragma once -#include "internal.h" - #include "virobject.h" -#include "virbitmap.h" #include "virenum.h" typedef enum { diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 4e6fa382a8..d339e58e1c 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -28,7 +28,6 @@ #include "virrotatingfile.h" #include "viralloc.h" #include "virerror.h" -#include "virstring.h" #include "virfile.h" #include "virlog.h" diff --git a/src/util/virscsi.h b/src/util/virscsi.h index 65ad15ed76..6915241a22 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -20,7 +20,6 @@ #pragma once -#include "internal.h" #include "virobject.h" typedef struct _virSCSIDevice virSCSIDevice; diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 487301ab64..1ea6a1ee2a 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -25,7 +25,6 @@ #include "virlog.h" #include "virerror.h" #include "virfile.h" -#include "virstring.h" #include "viralloc.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h index d030aea397..e5b6f237a7 100644 --- a/src/util/virscsivhost.h +++ b/src/util/virscsivhost.h @@ -20,7 +20,6 @@ #pragma once -#include "internal.h" #include "virobject.h" typedef struct _virSCSIVHostDevice virSCSIVHostDevice; diff --git a/src/util/virseclabel.c b/src/util/virseclabel.c index 907e154d14..d7e4834d5f 100644 --- a/src/util/virseclabel.c +++ b/src/util/virseclabel.c @@ -22,9 +22,7 @@ #include <config.h> #include "internal.h" -#include "viralloc.h" #include "virseclabel.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virsecret.c b/src/util/virsecret.c index 604d900f77..c01f3fb967 100644 --- a/src/util/virsecret.c +++ b/src/util/virsecret.c @@ -26,7 +26,6 @@ #include "virerror.h" #include "virlog.h" #include "virsecret.h" -#include "virstring.h" #include "viruuid.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 430e43f2eb..0480485ab7 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -20,9 +20,7 @@ #include "virsocketaddr.h" #include "virerror.h" -#include "virstring.h" #include "virbuffer.h" -#include "viralloc.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index e3ec64486e..873da65d42 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -23,14 +23,10 @@ #include "virstoragefile.h" #include "viralloc.h" -#include "viruuid.h" #include "virerror.h" #include "virlog.h" #include "vircommand.h" -#include "virhash.h" #include "virstring.h" -#include "virbuffer.h" -#include "virsecret.h" #define VIR_FROM_THIS VIR_FROM_STORAGE diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 65126f8160..b898f3a6db 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -22,7 +22,6 @@ #include <sys/stat.h> -#include "virstring.h" #include "virerror.h" #include "viralloc.h" #include "virfile.h" diff --git a/src/util/virusb.h b/src/util/virusb.h index d2b3f69942..fcc6259dc0 100644 --- a/src/util/virusb.h +++ b/src/util/virusb.h @@ -20,7 +20,6 @@ #pragma once -#include "internal.h" #include "virobject.h" #define USB_DEVFS "/dev/bus/usb/" diff --git a/src/util/virutil.c b/src/util/virutil.c index 176e2f8f59..7e246d22d1 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -48,11 +48,9 @@ #include "virerror.h" #include "virlog.h" -#include "virbuffer.h" #include "viralloc.h" #include "virfile.h" #include "vircommand.h" -#include "virprocess.h" #include "virstring.h" #include "virutil.h" #include "virsocket.h" diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 558fbb9c0d..a63b91c645 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -28,10 +28,7 @@ #include <time.h> #include <unistd.h> -#include "internal.h" -#include "virerror.h" #include "virlog.h" -#include "viralloc.h" #include "virfile.h" #include "virrandom.h" -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/vmware/vmware_conf.c | 1 - src/vmware/vmware_conf.h | 1 - src/vmware/vmware_driver.c | 1 - 3 files changed, 3 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index ebba435cc4..80a85f4d0f 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -26,7 +26,6 @@ #include "cpu/cpu.h" #include "viralloc.h" #include "virfile.h" -#include "viruuid.h" #include "virerror.h" #include "vmx.h" #include "vmware_conf.h" diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h index d91b84f38f..5c3eaa9219 100644 --- a/src/vmware/vmware_conf.h +++ b/src/vmware/vmware_conf.h @@ -22,7 +22,6 @@ #define NOGUI "nogui" -#include "internal.h" #include "virdomainobjlist.h" #include "virthread.h" #include "virenum.h" diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index da66f98db0..2a18d73988 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -34,7 +34,6 @@ #include "vmx.h" #include "vmware_conf.h" #include "vmware_driver.h" -#include "virstring.h" /* Various places we may find the "vmrun" binary, * without a leading / it will be searched in PATH -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/test/test_driver.c | 2 -- src/test/test_driver.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a824ef0186..24ff6e8967 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -31,7 +31,6 @@ #include "virerror.h" #include "datatypes.h" #include "test_driver.h" -#include "virbuffer.h" #include "viruuid.h" #include "capabilities.h" #include "configmake.h" @@ -56,7 +55,6 @@ #include "virlog.h" #include "virfile.h" #include "virtypedparam.h" -#include "virrandom.h" #include "virstring.h" #include "cpu/cpu.h" #include "virauth.h" diff --git a/src/test/test_driver.h b/src/test/test_driver.h index 8c8a462db7..c7821b1975 100644 --- a/src/test/test_driver.h +++ b/src/test/test_driver.h @@ -21,6 +21,4 @@ #pragma once -#include "internal.h" - int testRegister(void); -- 2.36.1

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- 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 | 2 -- tests/interfacexml2xmltest.c | 2 -- tests/libxlmock.c | 2 -- tests/libxlxml2domconfigtest.c | 6 ------ tests/lxcxml2xmltest.c | 2 -- tests/networkxml2conftest.c | 2 -- tests/networkxml2firewalltest.c | 2 -- tests/networkxml2xmltest.c | 3 --- tests/networkxml2xmlupdatetest.c | 3 --- tests/nodedevmdevctltest.c | 2 -- tests/nodedevxml2xmltest.c | 3 --- tests/nssmock.c | 2 -- tests/nsstest.c | 1 - tests/nwfilterebiptablestest.c | 1 - tests/nwfilterxml2firewalltest.c | 1 - tests/nwfilterxml2xmltest.c | 6 ------ 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/qemumigrationcookiexmltest.c | 1 - tests/qemumonitorjsontest.c | 2 -- tests/qemumonitortestutils.c | 2 -- tests/qemumonitortestutils.h | 1 - tests/qemusecuritymock.c | 2 -- tests/qemuxml2argvmock.c | 5 ----- tests/qemuxml2argvtest.c | 8 -------- tests/qemuxml2xmltest.c | 3 --- tests/scsihosttest.c | 2 -- tests/seclabeltest.c | 1 - tests/secretxml2xmltest.c | 2 -- tests/securityselinuxhelper.c | 1 - tests/securityselinuxlabeltest.c | 2 -- tests/securityselinuxtest.c | 3 --- tests/sockettest.c | 1 - tests/storagebackendsheepdogtest.c | 1 - tests/storagepoolxml2argvtest.c | 4 ---- tests/storagepoolxml2xmltest.c | 3 --- tests/storagevolxml2argvtest.c | 4 ---- tests/storagevolxml2xmltest.c | 3 --- 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/virfirewallmock.c | 1 - tests/virfirewalltest.c | 1 - tests/virhostcputest.c | 1 - tests/viridentitytest.c | 4 ---- tests/virkeycodetest.c | 4 ---- tests/virkmodtest.c | 1 - tests/virlockspacetest.c | 3 --- tests/virmigtest.c | 1 - tests/virmockstathelpers.c | 1 - tests/virnetdaemonmock.c | 1 - tests/virnetdevmock.c | 2 -- tests/virnetdevtest.c | 2 -- tests/virnetmessagetest.c | 2 -- tests/virnetserverclientmock.c | 1 - tests/virnetsockettest.c | 1 - tests/virnettlscontexttest.c | 5 ----- tests/virnettlshelpers.c | 1 - tests/virnettlssessiontest.c | 4 ---- tests/virnetworkportxml2xmltest.c | 2 -- tests/virnumamock.c | 3 --- tests/virnwfilterbindingxml2xmltest.c | 4 ---- 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 - 113 files changed, 238 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..b5560e3a45 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -6,8 +6,6 @@ #include <fcntl.h> #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..27783d0014 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -30,13 +30,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..e6e4989099 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -9,10 +9,8 @@ #ifdef WITH_LXC -# 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 0bc9e128e3..3141bff512 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 ca24305ace..0c0ead9877 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -5,11 +5,8 @@ #include <sys/types.h> #include <fcntl.h> -#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..4ba6f08690 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -5,11 +5,8 @@ #include <sys/types.h> #include <fcntl.h> -#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..94579edc79 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -1,8 +1,6 @@ #include <config.h> -#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 557347fb07..f24472bb6a 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -5,11 +5,8 @@ #include <sys/types.h> #include <fcntl.h> -#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 2c2e57769b..e90d870b77 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..ee7b9c243b 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -5,14 +5,8 @@ #include <sys/types.h> #include <fcntl.h> -#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 21302e0fce..dbbeecdd68 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/qemumigrationcookiexmltest.c b/tests/qemumigrationcookiexmltest.c index 316bfedd15..acc1a46e57 100644 --- a/tests/qemumigrationcookiexmltest.c +++ b/tests/qemumigrationcookiexmltest.c @@ -23,7 +23,6 @@ #include "testutils.h" -#include "internal.h" #include "testutilsqemu.h" #include "testutilsqemuschema.h" #include "configmake.h" diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 278d7ba765..ee6608cd5b 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 86300da68a..9281f90bcf 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 56e3d56056..b50884e1fe 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 08f176667d..005635fd52 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -23,20 +23,15 @@ #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" diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1d6e03490d..94c406ee77 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 518842112e..e9506b1b96 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/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 828e44a32b..da7daef6ba 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -1,7 +1,5 @@ #include <config.h> - -#include "internal.h" #include "testutils.h" #include "secret_conf.h" 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..9fe31207fb 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -1,11 +1,7 @@ #include <config.h> -#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..f0460afcf5 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -5,11 +5,8 @@ #include <sys/types.h> #include <fcntl.h> -#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..0764c8e29c 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -1,11 +1,7 @@ #include <config.h> -#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..627bf24ddf 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -5,11 +5,8 @@ #include <sys/types.h> #include <fcntl.h> -#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 7f6d9ee06f..628834910b 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/virfirewallmock.c b/tests/virfirewallmock.c index 6b096701c9..aa6b83a340 100644 --- a/tests/virfirewallmock.c +++ b/tests/virfirewallmock.c @@ -16,7 +16,6 @@ #include <config.h> -#include "internal.h" #include "virfile.h" char * 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..49d2c60ff7 100644 --- a/tests/virlockspacetest.c +++ b/tests/virlockspacetest.c @@ -23,11 +23,8 @@ #include <sys/stat.h> #include "testutils.h" -#include "virerror.h" -#include "viralloc.h" #include "virfile.h" #include "virlog.h" -#include "virutil.h" #include "virlockspace.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/virnetdaemonmock.c b/tests/virnetdaemonmock.c index c523da0791..a5bb01c34c 100644 --- a/tests/virnetdaemonmock.c +++ b/tests/virnetdaemonmock.c @@ -18,7 +18,6 @@ #include <config.h> -#include "internal.h" #include <time.h> #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c index f26991a48c..71a7922152 100644 --- a/tests/virnetdevmock.c +++ b/tests/virnetdevmock.c @@ -19,8 +19,6 @@ #include <config.h> #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/virnetserverclientmock.c b/tests/virnetserverclientmock.c index 277d6ce930..08ec7d7e73 100644 --- a/tests/virnetserverclientmock.c +++ b/tests/virnetserverclientmock.c @@ -20,7 +20,6 @@ #include "rpc/virnetsocket.h" #include "virutil.h" -#include "internal.h" int virEventAddTimeout(int frequency G_GNUC_UNUSED, virEventTimeoutCallback cb G_GNUC_UNUSED, 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/virnettlshelpers.c b/tests/virnettlshelpers.c index ca293eb6d6..a46381fdf9 100644 --- a/tests/virnettlshelpers.c +++ b/tests/virnettlshelpers.c @@ -25,7 +25,6 @@ #include "virlog.h" #include "virfile.h" #include "virsocketaddr.h" -#include "virutil.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..0c13068912 100644 --- a/tests/virnetworkportxml2xmltest.c +++ b/tests/virnetworkportxml2xmltest.c @@ -25,10 +25,8 @@ #include <sys/types.h> #include <fcntl.h> -#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..adce70010c 100644 --- a/tests/virnwfilterbindingxml2xmltest.c +++ b/tests/virnwfilterbindingxml2xmltest.c @@ -26,12 +26,8 @@ #include <sys/types.h> #include <fcntl.h> -#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