[PATCH 04/29] conf: Remove unused includes

From: Adam Tao <tcx4c70(a)gmail.com&gt; Signed-off-by: Peng Liang <tcx4c70(a)gmail.com&gt; --- src/conf/backup_conf.c | 3 --- src/conf/capabilities.c | 1 - src/conf/capabilities.h | 3 --- src/conf/checkpoint_conf.c | 4 ---- src/conf/checkpoint_conf.h | 1 - src/conf/cpu_conf.c | 2 -- src/conf/cpu_conf.h | 1 - src/conf/device_conf.c | 2 -- src/conf/device_conf.h | 1 - src/conf/domain_addr.c | 1 - src/conf/domain_audit.c | 1 - src/conf/domain_capabilities.c | 2 -- src/conf/domain_capabilities.h | 1 - src/conf/domain_conf.c | 4 ---- src/conf/domain_conf.h | 1 - src/conf/domain_event.c | 2 -- src/conf/domain_nwfilter.c | 2 -- src/conf/domain_validate.c | 1 - src/conf/interface_conf.c | 4 ---- src/conf/interface_conf.h | 2 -- src/conf/moment_conf.c | 3 --- src/conf/moment_conf.h | 1 - src/conf/netdev_bandwidth_conf.c | 1 - src/conf/netdev_vlan_conf.h | 1 - src/conf/netdev_vport_profile_conf.c | 1 - src/conf/netdev_vport_profile_conf.h | 1 - src/conf/network_conf.c | 2 -- src/conf/network_conf.h | 3 --- src/conf/network_event.h | 1 - src/conf/networkcommon_conf.c | 3 --- src/conf/networkcommon_conf.h | 2 -- src/conf/node_device_conf.c | 1 - src/conf/node_device_conf.h | 2 -- src/conf/node_device_event.h | 1 - src/conf/node_device_util.c | 1 - src/conf/nwfilter_conf.c | 2 -- src/conf/nwfilter_conf.h | 3 --- src/conf/nwfilter_ipaddrmap.c | 3 --- src/conf/nwfilter_params.c | 2 -- src/conf/nwfilter_params.h | 1 - src/conf/object_event.c | 4 ---- src/conf/object_event.h | 2 -- src/conf/secret_conf.c | 3 --- src/conf/secret_event.h | 1 - src/conf/snapshot_conf.c | 8 -------- src/conf/snapshot_conf.h | 1 - src/conf/storage_adapter_conf.c | 1 - src/conf/storage_capabilities.c | 1 - src/conf/storage_capabilities.h | 2 -- src/conf/storage_conf.c | 4 ---- src/conf/storage_conf.h | 4 ---- src/conf/storage_encryption_conf.c | 3 --- src/conf/storage_event.h | 1 - src/conf/virchrdev.c | 1 - src/conf/virchrdev.h | 1 - src/conf/virdomaincheckpointobjlist.c | 1 - src/conf/virdomaincheckpointobjlist.h | 2 -- src/conf/virdomainmomentobjlist.c | 5 ----- src/conf/virdomainobjlist.c | 2 -- src/conf/virdomainsnapshotobjlist.c | 3 --- src/conf/virdomainsnapshotobjlist.h | 2 -- src/conf/virinterfaceobj.c | 1 - src/conf/virinterfaceobj.h | 2 -- src/conf/virnetworkobj.h | 2 -- src/conf/virnetworkportdef.c | 2 -- src/conf/virnetworkportdef.h | 2 -- src/conf/virnodedeviceobj.c | 1 - src/conf/virnwfilterbindingdef.c | 1 - src/conf/virnwfilterbindingdef.h | 1 - src/conf/virnwfilterbindingobj.c | 4 ---- src/conf/virnwfilterbindingobj.h | 1 - src/conf/virnwfilterobj.h | 2 -- src/conf/virsavecookie.h | 1 - src/conf/virsecretobj.h | 3 --- src/conf/virstorageobj.c | 1 - src/conf/virstorageobj.h | 4 ---- 76 files changed, 154 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index 2a7fa95e0c..0f2fba115d 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -21,16 +21,13 @@ #include "configmake.h" #include "internal.h" #include "virbuffer.h" -#include "datatypes.h" #include "domain_conf.h" #include "virlog.h" #include "viralloc.h" #include "backup_conf.h" #include "storage_source_conf.h" -#include "virfile.h" #include "virerror.h" #include "virxml.h" -#include "virstring.h" #include "virhash.h" #include "virenum.h" diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 169aabdee1..1a7ebf4a13 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -37,7 +37,6 @@ #include "virlog.h" #include "virnuma.h" #include "virstring.h" -#include "virtypedparam.h" #include "viruuid.h" #include "virenum.h" #include "virutil.h" diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 701878332c..77fdd9f228 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -21,12 +21,9 @@ #pragma once -#include "internal.h" #include "virconftypes.h" -#include "virbuffer.h" #include "cpu_conf.h" #include "virarch.h" -#include "virmacaddr.h" #include "virobject.h" #include "virresctrl.h" diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 175a95fed7..338cf10d12 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -23,19 +23,15 @@ #include "configmake.h" #include "internal.h" -#include "virbitmap.h" #include "virbuffer.h" -#include "datatypes.h" #include "domain_conf.h" #include "virlog.h" #include "viralloc.h" #include "checkpoint_conf.h" #include "storage_source_conf.h" #include "viruuid.h" -#include "virfile.h" #include "virerror.h" #include "virxml.h" -#include "virstring.h" #include "virdomaincheckpointobjlist.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN_CHECKPOINT diff --git a/src/conf/checkpoint_conf.h b/src/conf/checkpoint_conf.h index b11ec07b68..0128551eba 100644 --- a/src/conf/checkpoint_conf.h +++ b/src/conf/checkpoint_conf.h @@ -22,7 +22,6 @@ #pragma once -#include "internal.h" #include "domain_conf.h" #include "moment_conf.h" #include "virobject.h" diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 2d447da7c3..5ec703b903 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -26,8 +26,6 @@ #include "virbuffer.h" #include "virfile.h" #include "cpu_conf.h" -#include "domain_conf.h" -#include "virstring.h" #include "virlog.h" #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 2cda4ee1f4..05523e1024 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -22,7 +22,6 @@ #include "virbuffer.h" #include "virxml.h" -#include "virbitmap.h" #include "virarch.h" #include "numa_conf.h" #include "virenum.h" diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index cb523d3a0d..e6ccdd2dd2 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -20,10 +20,8 @@ #include <config.h> #include "virerror.h" -#include "datatypes.h" #include "viralloc.h" #include "virxml.h" -#include "viruuid.h" #include "virbuffer.h" #include "device_conf.h" #include "domain_addr.h" diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index b6b710d313..c62798b51f 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -25,7 +25,6 @@ #include <libxml/xpath.h> #include "internal.h" -#include "virthread.h" #include "virbuffer.h" #include "virpci.h" #include "virnetdev.h" diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 1173143635..1b1642b04a 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -23,7 +23,6 @@ #include "viralloc.h" #include "virlog.h" -#include "virstring.h" #include "domain_addr.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 17a01c51ba..974df5a037 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -34,7 +34,6 @@ #include "viruuid.h" #include "virlog.h" #include "viralloc.h" -#include "virstring.h" VIR_LOG_INIT("conf.domain_audit"); diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 2a888da1a9..895e8d00e8 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -20,11 +20,9 @@ #include <config.h> -#include "device_conf.h" #include "domain_capabilities.h" #include "domain_conf.h" #include "viralloc.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_CAPABILITIES diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index f2eed80b15..15bb7f4eb3 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -20,7 +20,6 @@ #pragma once -#include "internal.h" #include "domain_conf.h" #include "virenum.h" diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 298ae183ce..38c363108b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -34,25 +34,21 @@ #include "domain_addr.h" #include "domain_conf.h" #include "domain_validate.h" -#include "snapshot_conf.h" #include "viralloc.h" #include "virxml.h" #include "viruuid.h" #include "virbuffer.h" #include "virlog.h" -#include "nwfilter_conf.h" #include "virnetworkportdef.h" #include "storage_conf.h" #include "storage_source_conf.h" #include "virfile.h" #include "virbitmap.h" -#include "secret_conf.h" #include "netdev_vport_profile_conf.h" #include "netdev_bandwidth_conf.h" #include "netdev_vlan_conf.h" #include "device_conf.h" #include "network_conf.h" -#include "virtpm.h" #include "virsecret.h" #include "virstring.h" #include "virnetdev.h" diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8a48646160..be0fb525d9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -29,7 +29,6 @@ #include "internal.h" #include "virconftypes.h" #include "capabilities.h" -#include "storage_encryption_conf.h" #include "cpu_conf.h" #include "virthread.h" #include "virhash.h" diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 18539e348b..ff8ea2c389 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -29,8 +29,6 @@ #include "datatypes.h" #include "viralloc.h" #include "virerror.h" -#include "virstring.h" -#include "virtypedparam.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c index 0a67b6765e..84c6b94919 100644 --- a/src/conf/domain_nwfilter.c +++ b/src/conf/domain_nwfilter.c @@ -27,9 +27,7 @@ #include "domain_conf.h" #include "domain_nwfilter.h" #include "virnwfilterbindingdef.h" -#include "virerror.h" #include "viralloc.h" -#include "virstring.h" #include "virlog.h" diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 18eb8d697d..f4f862e692 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -22,7 +22,6 @@ #include "domain_validate.h" #include "domain_conf.h" -#include "snapshot_conf.h" #include "vircgroup.h" #include "virconftypes.h" #include "virlog.h" diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index ba5dc9961a..dc61b378b9 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -20,15 +20,11 @@ #include <config.h> #include "virerror.h" -#include "datatypes.h" #include "interface_conf.h" -#include "viralloc.h" #include "virxml.h" -#include "viruuid.h" #include "virbuffer.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_INTERFACE diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index 510d83b2bf..b4d2868387 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -24,8 +24,6 @@ #include <libxml/tree.h> #include <libxml/xpath.h> -#include "internal.h" -#include "virthread.h" #include "device_conf.h" #include "virenum.h" diff --git a/src/conf/moment_conf.c b/src/conf/moment_conf.c index 0dff2cd000..8d5c7e3ef0 100644 --- a/src/conf/moment_conf.c +++ b/src/conf/moment_conf.c @@ -23,12 +23,9 @@ #include <sys/time.h> -#include "internal.h" #include "moment_conf.h" #include "domain_conf.h" #include "virlog.h" -#include "viralloc.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN diff --git a/src/conf/moment_conf.h b/src/conf/moment_conf.h index e1bc7ba138..e429a44aa6 100644 --- a/src/conf/moment_conf.h +++ b/src/conf/moment_conf.h @@ -22,7 +22,6 @@ #pragma once -#include "internal.h" #include "virconftypes.h" #include "virobject.h" diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index 7737451046..4d9f855916 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -20,7 +20,6 @@ #include "netdev_bandwidth_conf.h" #include "virerror.h" -#include "viralloc.h" #include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/conf/netdev_vlan_conf.h b/src/conf/netdev_vlan_conf.h index a2752e57ad..7b27d789b4 100644 --- a/src/conf/netdev_vlan_conf.h +++ b/src/conf/netdev_vlan_conf.h @@ -18,7 +18,6 @@ #pragma once -#include "internal.h" #include "virnetdevvlan.h" #include "virbuffer.h" #include "virxml.h" diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index d13833d7df..cdde7efcd9 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -20,7 +20,6 @@ #include "netdev_vport_profile_conf.h" #include "virerror.h" -#include "viralloc.h" #include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/conf/netdev_vport_profile_conf.h b/src/conf/netdev_vport_profile_conf.h index 58b104610a..b5fccd26d4 100644 --- a/src/conf/netdev_vport_profile_conf.h +++ b/src/conf/netdev_vport_profile_conf.h @@ -18,7 +18,6 @@ #pragma once -#include "internal.h" #include "virnetdevvportprofile.h" #include "virbuffer.h" #include "virxml.h" diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d8813ee2cc..b8450b75a9 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -26,7 +26,6 @@ #include <fcntl.h> #include "virerror.h" -#include "datatypes.h" #include "network_conf.h" #include "netdev_vport_profile_conf.h" #include "netdev_bandwidth_conf.h" @@ -35,7 +34,6 @@ #include "virxml.h" #include "viruuid.h" #include "virbuffer.h" -#include "virfile.h" #include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NETWORK diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index b374bbba48..184b83885c 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -23,15 +23,12 @@ #define DNS_RECORD_LENGTH_SRV (512 - 30) /* Limit minus overhead as mentioned in RFC-2782 */ -#include "internal.h" -#include "virthread.h" #include "virsocketaddr.h" #include "virnetdevbandwidth.h" #include "virnetdevvportprofile.h" #include "virnetdevvlan.h" #include "virmacaddr.h" #include "device_conf.h" -#include "virbitmap.h" #include "networkcommon_conf.h" #include "virobject.h" #include "virmacmap.h" diff --git a/src/conf/network_event.h b/src/conf/network_event.h index b55739ed0f..4502bfcaef 100644 --- a/src/conf/network_event.h +++ b/src/conf/network_event.h @@ -23,7 +23,6 @@ #include "internal.h" #include "object_event.h" -#include "object_event_private.h" int virNetworkEventStateRegisterID(virConnectPtr conn, diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c index 2f543ced70..7bfcd2e9b4 100644 --- a/src/conf/networkcommon_conf.c +++ b/src/conf/networkcommon_conf.c @@ -22,10 +22,7 @@ #include <config.h> #include "virerror.h" -#include "datatypes.h" #include "networkcommon_conf.h" -#include "viralloc.h" -#include "virstring.h" #include "virxml.h" #define VIR_FROM_THIS VIR_FROM_NETWORK diff --git a/src/conf/networkcommon_conf.h b/src/conf/networkcommon_conf.h index cc75af1ebb..6e1d0b1326 100644 --- a/src/conf/networkcommon_conf.h +++ b/src/conf/networkcommon_conf.h @@ -25,9 +25,7 @@ #include <libxml/tree.h> #include <libxml/xpath.h> -#include "internal.h" #include "virbuffer.h" -#include "virsocketaddr.h" #include "virnetdevip.h" virNetDevIPRoute * diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 8b20a7bee9..d689f48280 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -25,7 +25,6 @@ #include <unistd.h> #include "virerror.h" -#include "datatypes.h" #include "viralloc.h" #include "virstring.h" #include "node_device_conf.h" diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index e4d1f67d53..b28ef21dbf 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -22,14 +22,12 @@ #pragma once -#include "internal.h" #include "virbitmap.h" #include "virpcivpd.h" #include "virscsihost.h" #include "virpci.h" #include "virvhba.h" #include "device_conf.h" -#include "storage_adapter_conf.h" #include "virenum.h" #include <libxml/tree.h> diff --git a/src/conf/node_device_event.h b/src/conf/node_device_event.h index 46828ce406..3f605027c3 100644 --- a/src/conf/node_device_event.h +++ b/src/conf/node_device_event.h @@ -24,7 +24,6 @@ #include "internal.h" #include "object_event.h" -#include "object_event_private.h" int virNodeDeviceEventStateRegisterID(virConnectPtr conn, diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c index 1c1f5a0dd5..dfec1a91ce 100644 --- a/src/conf/node_device_util.c +++ b/src/conf/node_device_util.c @@ -23,7 +23,6 @@ #include "node_device_util.h" #include "virlog.h" #include "virscsihost.h" -#include "virstring.h" #include "virvhba.h" #include "viralloc.h" #include "virutil.h" diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 5171145c75..53b1dd4a8f 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -38,10 +38,8 @@ #include "viruuid.h" #include "viralloc.h" #include "virerror.h" -#include "datatypes.h" #include "nwfilter_params.h" #include "nwfilter_conf.h" -#include "domain_conf.h" #include "virfile.h" #include "virstring.h" diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 46867afc8c..980eabab00 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -24,9 +24,6 @@ #pragma once -#include "internal.h" - -#include "virhash.h" #include "virxml.h" #include "virbuffer.h" #include "virsocketaddr.h" diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c index 4090cc2769..ea4586fb1b 100644 --- a/src/conf/nwfilter_ipaddrmap.c +++ b/src/conf/nwfilter_ipaddrmap.c @@ -23,9 +23,6 @@ #include "internal.h" -#include "viralloc.h" -#include "virerror.h" -#include "virstring.h" #include "datatypes.h" #include "nwfilter_params.h" #include "nwfilter_ipaddrmap.h" diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index ca7b62874c..92385a97e6 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -25,9 +25,7 @@ #include "viralloc.h" #include "virerror.h" -#include "datatypes.h" #include "nwfilter_params.h" -#include "domain_conf.h" #include "virlog.h" #include "virstring.h" diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index f9f7f68ff3..9ce3b80ef4 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -23,7 +23,6 @@ #include "virhash.h" #include "virbuffer.h" -#include "virmacaddr.h" #include "virxml.h" typedef enum { diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 9ea9ee3496..3c998eda7f 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -22,16 +22,12 @@ #include <config.h> -#include "domain_event.h" -#include "network_event.h" #include "object_event.h" #include "object_event_private.h" #include "virlog.h" -#include "datatypes.h" #include "viralloc.h" #include "virerror.h" #include "virobject.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/conf/object_event.h b/src/conf/object_event.h index 7b5531344e..57bc5d0298 100644 --- a/src/conf/object_event.h +++ b/src/conf/object_event.h @@ -24,8 +24,6 @@ #include "internal.h" -#include "virobject.h" - /** * Dispatching domain events that come in while * in a call / response rpc diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 1dee90eba1..011fdaa12b 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -22,11 +22,8 @@ #include "internal.h" #include "virbuffer.h" -#include "datatypes.h" #include "virlog.h" -#include "viralloc.h" #include "secret_conf.h" -#include "virsecretobj.h" #include "virerror.h" #include "virsecret.h" #include "virstring.h" diff --git a/src/conf/secret_event.h b/src/conf/secret_event.h index b0b0a213ce..b1639c828a 100644 --- a/src/conf/secret_event.h +++ b/src/conf/secret_event.h @@ -24,7 +24,6 @@ #include "internal.h" #include "object_event.h" -#include "object_event_private.h" int virSecretEventStateRegisterID(virConnectPtr conn, diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 80946beba9..ae635edd08 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -27,23 +27,15 @@ #include "configmake.h" #include "internal.h" -#include "virbitmap.h" #include "virbuffer.h" -#include "datatypes.h" #include "domain_conf.h" #include "virlog.h" #include "viralloc.h" -#include "netdev_bandwidth_conf.h" -#include "netdev_vport_profile_conf.h" -#include "nwfilter_conf.h" -#include "secret_conf.h" #include "snapshot_conf.h" #include "storage_source_conf.h" #include "viruuid.h" -#include "virfile.h" #include "virerror.h" #include "virxml.h" -#include "virstring.h" #include "virdomainsnapshotobjlist.h" #define LIBVIRT_SNAPSHOT_CONF_PRIV_H_ALLOW diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h index 1f787f1a94..94d7ab129a 100644 --- a/src/conf/snapshot_conf.h +++ b/src/conf/snapshot_conf.h @@ -21,7 +21,6 @@ #pragma once -#include "internal.h" #include "domain_conf.h" #include "moment_conf.h" #include "virenum.h" diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_conf.c index 135deeb933..4c13cc4c17 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -24,7 +24,6 @@ #include "viralloc.h" #include "virerror.h" #include "virlog.h" -#include "virstring.h" #include "virutil.h" #include "virxml.h" diff --git a/src/conf/storage_capabilities.c b/src/conf/storage_capabilities.c index 22e05bbe30..b4dc2643d7 100644 --- a/src/conf/storage_capabilities.c +++ b/src/conf/storage_capabilities.c @@ -21,7 +21,6 @@ #include <config.h> #include "virerror.h" -#include "datatypes.h" #include "capabilities.h" #include "storage_capabilities.h" #include "storage_conf.h" diff --git a/src/conf/storage_capabilities.h b/src/conf/storage_capabilities.h index 2b484bbc30..ce4b3e853b 100644 --- a/src/conf/storage_capabilities.h +++ b/src/conf/storage_capabilities.h @@ -20,8 +20,6 @@ #pragma once -#include "internal.h" - typedef struct _virStoragePoolCaps virStoragePoolCaps; struct _virStoragePoolCaps { virObjectLockable parent; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 85260431e7..5da0bf20dd 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -27,8 +27,6 @@ #include <fcntl.h> #include "virerror.h" -#include "datatypes.h" -#include "node_device_conf.h" #include "storage_adapter_conf.h" #include "storage_conf.h" #include "storage_source_conf.h" @@ -38,10 +36,8 @@ #include "virbuffer.h" #include "viralloc.h" #include "virfile.h" -#include "virscsihost.h" #include "virstring.h" #include "virlog.h" -#include "virvhba.h" #include "virutil.h" #define VIR_FROM_THIS VIR_FROM_STORAGE diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index aaecf138d6..a0410d2da6 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -21,11 +21,7 @@ #pragma once -#include "internal.h" -#include "storage_encryption_conf.h" #include "storage_source_conf.h" -#include "virbitmap.h" -#include "virthread.h" #include "device_conf.h" #include "object_event.h" #include "storage_adapter_conf.h" diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index a65ef1f8a2..3651ff8cfd 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -30,10 +30,7 @@ #include "storage_encryption_conf.h" #include "virxml.h" #include "virerror.h" -#include "viruuid.h" -#include "virfile.h" #include "virsecret.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_STORAGE diff --git a/src/conf/storage_event.h b/src/conf/storage_event.h index 8a62785798..4fcf83ff50 100644 --- a/src/conf/storage_event.h +++ b/src/conf/storage_event.h @@ -24,7 +24,6 @@ #include "internal.h" #include "object_event.h" -#include "object_event_private.h" int virStoragePoolEventStateRegisterID(virConnectPtr conn, diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 8610f0ac5c..0ffd3db90a 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -35,7 +35,6 @@ #include "virlog.h" #include "virerror.h" #include "virfile.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/conf/virchrdev.h b/src/conf/virchrdev.h index 54fd110ab0..78a40a4a1a 100644 --- a/src/conf/virchrdev.h +++ b/src/conf/virchrdev.h @@ -21,7 +21,6 @@ #pragma once -#include "internal.h" #include "domain_conf.h" typedef struct _virChrdevs virChrdevs; diff --git a/src/conf/virdomaincheckpointobjlist.c b/src/conf/virdomaincheckpointobjlist.c index 797feea520..70b2f90c0e 100644 --- a/src/conf/virdomaincheckpointobjlist.c +++ b/src/conf/virdomaincheckpointobjlist.c @@ -28,7 +28,6 @@ #include "virlog.h" #include "virerror.h" #include "datatypes.h" -#include "virstring.h" #include "viralloc.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN_CHECKPOINT diff --git a/src/conf/virdomaincheckpointobjlist.h b/src/conf/virdomaincheckpointobjlist.h index 8b6f51cd89..ad01391cb8 100644 --- a/src/conf/virdomaincheckpointobjlist.h +++ b/src/conf/virdomaincheckpointobjlist.h @@ -22,9 +22,7 @@ #pragma once -#include "internal.h" #include "virdomainmomentobjlist.h" -#include "virbuffer.h" virDomainCheckpointObjList * virDomainCheckpointObjListNew(void); diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c index 2f2467d13f..f19ec3319a 100644 --- a/src/conf/virdomainmomentobjlist.c +++ b/src/conf/virdomainmomentobjlist.c @@ -26,14 +26,9 @@ #include "virdomainmomentobjlist.h" #include "virlog.h" #include "virerror.h" -#include "virstring.h" #include "moment_conf.h" #include "viralloc.h" -/* FIXME: using virObject would allow us to not need this */ -#include "virdomainsnapshotobjlist.h" -#include "virdomaincheckpointobjlist.h" - #define VIR_FROM_THIS VIR_FROM_DOMAIN VIR_LOG_INIT("conf.virdomainmomentobjlist"); diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 66bd4bcba7..f16b963eb0 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -25,8 +25,6 @@ #include "internal.h" #include "datatypes.h" #include "virdomainobjlist.h" -#include "checkpoint_conf.h" -#include "snapshot_conf.h" #include "viralloc.h" #include "virfile.h" #include "virlog.h" diff --git a/src/conf/virdomainsnapshotobjlist.c b/src/conf/virdomainsnapshotobjlist.c index 2520a4bca4..9a9ea7827e 100644 --- a/src/conf/virdomainsnapshotobjlist.c +++ b/src/conf/virdomainsnapshotobjlist.c @@ -22,13 +22,10 @@ #include <config.h> -#include "internal.h" #include "virdomainsnapshotobjlist.h" #include "snapshot_conf.h" #include "virlog.h" -#include "virerror.h" #include "datatypes.h" -#include "virstring.h" #include "viralloc.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT diff --git a/src/conf/virdomainsnapshotobjlist.h b/src/conf/virdomainsnapshotobjlist.h index ce9d77e10b..0008576d05 100644 --- a/src/conf/virdomainsnapshotobjlist.h +++ b/src/conf/virdomainsnapshotobjlist.h @@ -22,9 +22,7 @@ #pragma once -#include "internal.h" #include "virdomainmomentobjlist.h" -#include "virbuffer.h" virDomainSnapshotObjList *virDomainSnapshotObjListNew(void); void virDomainSnapshotObjListFree(virDomainSnapshotObjList *snapshots); diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 95279d5b1c..c2b81b984f 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -27,7 +27,6 @@ #include "virinterfaceobj.h" #include "virhash.h" #include "virlog.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_INTERFACE diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h index 5927484167..3e6a73fd15 100644 --- a/src/conf/virinterfaceobj.h +++ b/src/conf/virinterfaceobj.h @@ -19,8 +19,6 @@ #pragma once -#include "internal.h" - typedef struct _virInterfaceObj virInterfaceObj; typedef struct _virInterfaceObjList virInterfaceObjList; diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index fadd277cbd..fd519cced1 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -19,8 +19,6 @@ #pragma once -#include "internal.h" - #include "network_conf.h" #include "virnetworkportdef.h" diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index aa35374fb0..39fa895fae 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -23,8 +23,6 @@ #include "viralloc.h" #include "virerror.h" -#include "virstring.h" -#include "virfile.h" #include "virnetdevmacvlan.h" #include "virnetworkportdef.h" #include "network_conf.h" diff --git a/src/conf/virnetworkportdef.h b/src/conf/virnetworkportdef.h index ee13f8a084..bbc155a3ea 100644 --- a/src/conf/virnetworkportdef.h +++ b/src/conf/virnetworkportdef.h @@ -21,8 +21,6 @@ #pragma once -#include "internal.h" -#include "viruuid.h" #include "virnetdevvlan.h" #include "virnetdevvportprofile.h" #include "virnetdevbandwidth.h" diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 49947d0a58..26498fc498 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -27,7 +27,6 @@ #include "virerror.h" #include "virhash.h" #include "virlog.h" -#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NODEDEV diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbindingdef.c index c55a5d28dc..cc50ba944a 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -22,7 +22,6 @@ #include "viralloc.h" #include "virerror.h" -#include "virstring.h" #include "nwfilter_params.h" #include "virnwfilterbindingdef.h" #include "viruuid.h" diff --git a/src/conf/virnwfilterbindingdef.h b/src/conf/virnwfilterbindingdef.h index 4bf0f252f8..c3f87492aa 100644 --- a/src/conf/virnwfilterbindingdef.h +++ b/src/conf/virnwfilterbindingdef.h @@ -21,7 +21,6 @@ #pragma once -#include "internal.h" #include "virmacaddr.h" #include "virhash.h" #include "virbuffer.h" diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c index be43ae3931..47455c7e35 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -23,11 +23,7 @@ #include "viralloc.h" #include "virerror.h" -#include "virstring.h" -#include "nwfilter_params.h" #include "virnwfilterbindingobj.h" -#include "viruuid.h" -#include "virfile.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER diff --git a/src/conf/virnwfilterbindingobj.h b/src/conf/virnwfilterbindingobj.h index 93f693936e..6739b848a3 100644 --- a/src/conf/virnwfilterbindingobj.h +++ b/src/conf/virnwfilterbindingobj.h @@ -21,7 +21,6 @@ #pragma once -#include "internal.h" #include "virnwfilterbindingdef.h" #include "virobject.h" diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h index b67dc017c5..8629f0d461 100644 --- a/src/conf/virnwfilterobj.h +++ b/src/conf/virnwfilterobj.h @@ -19,8 +19,6 @@ #pragma once -#include "internal.h" - #include "nwfilter_conf.h" #include "virnwfilterbindingobjlist.h" diff --git a/src/conf/virsavecookie.h b/src/conf/virsavecookie.h index 9d275edd03..a43c47af47 100644 --- a/src/conf/virsavecookie.h +++ b/src/conf/virsavecookie.h @@ -22,7 +22,6 @@ #include <libxml/xpath.h> -#include "internal.h" #include "virobject.h" #include "virbuffer.h" diff --git a/src/conf/virsecretobj.h b/src/conf/virsecretobj.h index 93b4a46acf..0bcfd4bfc3 100644 --- a/src/conf/virsecretobj.h +++ b/src/conf/virsecretobj.h @@ -20,10 +20,7 @@ #pragma once -#include "internal.h" - #include "secret_conf.h" -#include "virobject.h" typedef struct _virSecretObj virSecretObj; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index fe868d25fa..238d4678a2 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -21,7 +21,6 @@ #include <dirent.h> #include "datatypes.h" -#include "node_device_conf.h" #include "node_device_util.h" #include "virstorageobj.h" diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h index 523bdec244..f1a2c5f89d 100644 --- a/src/conf/virstorageobj.h +++ b/src/conf/virstorageobj.h @@ -19,12 +19,8 @@ #pragma once -#include "internal.h" - #include "storage_conf.h" -#include "capabilities.h" - typedef struct _virStoragePoolObj virStoragePoolObj; typedef struct _virStoragePoolObjList virStoragePoolObjList; -- 2.36.1