conf: Remove unused includes

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

diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c
index 2a7fa95e0cc99e1a84a724c928a5edf9257dbd7f..0f2fba115d5f39bdbda1db0c91f5a310a04f04a7 100644 (file)
--- 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 169aabdee19df79a69ee3b270bd43f080d7cb409..1a7ebf4a134b69a8c974888bde13df82e18d13bd 100644 (file)
--- 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 701878332cbe6e53669ab967a654aa13245190c5..6fe7818b2ec678c328fa2458522d2fd0729ed7bb 100644 (file)
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -23,10 +23,8 @@
 
 #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 175a95fed7163866da705634355e180e8a72374e..338cf10d12348d1079471dd7f075daaa1160d962 100644 (file)
--- 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/cpu_conf.c b/src/conf/cpu_conf.c
index 2d447da7c3548e756f96902b8cd6a8e57795b4f0..5ec703b903f8a770d166fd9cf791e968e1cce075 100644 (file)
--- 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 2cda4ee1f4512d9002bfed6231c15b053892d351..05523e102401c83dad61be0f922422d1ae84e8ce 100644 (file)
--- 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 e93fd57341443906e7b311e708efdd60faefaf28..762efe5f0be16a13b5ba8390c910e97f22a8f442 100644 (file)
--- 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 910e6b77920151d4144933bf1001b7ec87908aaf..f2907dc5969c1818cd1b718254d356f2bbe29cee 100644 (file)
--- 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 "virccw.h"
 #include "virpci.h"

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index edc254a6ee22a0240fd52eeecc262d463d4a06a0..76f9c12ca69e3ce7ccc8eb56b296a1f9f9234cf6 100644 (file)
--- 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 17a01c51ba55d908cd25d4a8c071f8434e6ab283..974df5a037bb020e47b1896fc0db27efa73e232f 100644 (file)
--- 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 2a888da1a9b48a2beecf88ecc82098689d45b293..895e8d00e8bcdb6a64b1ecda0ea73ed611d81024 100644 (file)
--- 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_conf.c b/src/conf/domain_conf.c
index 020d58845d2766dcce5b6459188b553ae94b55ec..015ce0bce14a1ddc2c02fcc46821637f99b6a051 100644 (file)
--- 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 292fd62beb14c95c53e651d9e2123f9973b77545..612ebc80b760703c631be62559ebeb40e779fdea 100644 (file)
--- 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 18539e348bcc232ff07279be8c209c93e5b57d50..ff8ea2c3896b3e842358f2555f207df6a6e287e9 100644 (file)
--- 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 0a67b6765e45c58b65c909cc7597ec0c1bb2f5c8..84c6b949195a62882822d4c8caf2af5be6da2b68 100644 (file)
--- 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 9c55d05cacc054f8be7af0089bb0d3abbedfb392..10fb490e3c7caefc31748b6a2d25e163550f7784 100644 (file)
--- 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 ba5dc9961a76c9f3a12291a218fa3ac38c6834fe..dc61b378b94d8f4aecb8de28166faf2754b6c0e2 100644 (file)
--- 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 510d83b2bf0744aa4d6ec4f4c6eef0f65bdfe4bb..fa6bce9a00d0a0aec4dd1b28be0b722ce83228be 100644 (file)
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -25,7 +25,6 @@
 #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 0dff2cd00081e7b99151f63c104e32824a6eb937..2afefa67814775e809c486268a9c9ee968ab203b 100644 (file)
--- a/src/conf/moment_conf.c
+++ b/src/conf/moment_conf.c
@@ -27,8 +27,6 @@
 #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/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index 77374510469cf6ae3f5e570439d8ceb1eb252b93..4d9f855916d723a90a71564c4cb3b55e26baa55e 100644 (file)
--- 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_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c
index d13833d7dfd4c156ba03d9796256314738677f61..cdde7efcd9c6b852b4a0dd040bf88061570d34d5 100644 (file)
--- 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/network_conf.c b/src/conf/network_conf.c
index d8813ee2ccc17c427065ff8fa2bbaf3f3d9c98d7..b8450b75a96dd83955dd89314f3ef7b99ae2e96c 100644 (file)
--- 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 b374bbba48c4f79a90542b678d0a33a333214c4f..48b07ea13c1bdd7e5d1d97efacfb795f8af427de 100644 (file)
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -24,14 +24,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 b55739ed0f0ba81bb334afe5fe32cdcb9a427819..4502bfcaef6c7a1024d4c41ef85a14e2152509ab 100644 (file)
--- 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 2f543ced70b58f22be8369fb3642b05cd26331d5..7bfcd2e9b406c87dd88cbe7a16a1a71fca906947 100644 (file)
--- 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 cc75af1ebb2f71e3d99f7cb52f078c7c1b71dc3c..b5955d9f9960b4057c80c1a5b342478f511efddc 100644 (file)
--- a/src/conf/networkcommon_conf.h
+++ b/src/conf/networkcommon_conf.h
@@ -27,7 +27,6 @@
 
 #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 e7dd0939726d0c6adffd9693e35478cc64ad14e7..51746229fcdb189db1836ed89d7316885069074c 100644 (file)
--- 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 d1751ed874984c98b174632176c4c6224c5ef435..a234b4147bdb37e29af13dab8777cda1476ecf95 100644 (file)
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -30,7 +30,6 @@
 #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 46828ce406beb0e1a0f7a734fea49f7dd3d326df..3f605027c31a7e9d6e42ca1cf2aaab630df0d907 100644 (file)
--- 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 1c1f5a0dd54539a89b81f7a814cdb81955c492ef..dfec1a91ce677ada8fc2087939c60a084a6a5021 100644 (file)
--- 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 a4baa75117496f7f766cd5092033b892b6f03c14..b5fd26645713082270a476ca879eb30ff8a7d60a 100644 (file)
--- 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 46867afc8c5f4867ca190690995c2a7244fe8725..b67364714acbefcb53b91481f70d2108a5fa58de 100644 (file)
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -26,7 +26,6 @@
 
 #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 4090cc27699d656ff968929aae9175d20e579847..ea4586fb1b13e5443c073543b745a9ea9e0ea19a 100644 (file)
--- 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 ca7b62874cffee26583f47e4400f1798ee767ad7..92385a97e61dc356dbb3e3b9223c777575e47761 100644 (file)
--- 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 f9f7f68ff376b6a1d37920211c8e47eb7647fa22..9ce3b80ef41a2b9b7b3625b29dad23822473418a 100644 (file)
--- 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 9ea9ee349681e4a6d60d646eea0ab9c92bd67ccf..3c998eda7f4018340f59571ee9722744cb80a12b 100644 (file)
--- 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 7b5531344ebd3d0953513728f1f39a6832709524..57bc5d029897d81c911bc395463cfab9a465ae22 100644 (file)
--- 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 1dee90eba113da4b192613a0e66b00f59fa55970..011fdaa12b1d01e7108a3ae6b0d29f9f29ba35d4 100644 (file)
--- 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 b0b0a213ce49102f031101ea96d2ff98ee12ee96..b1639c828a585c93f968dd20323ddbffd195b06d 100644 (file)
--- 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 80946beba973603e97262e83e39078db92d8b05c..ae635edd089266897c8ded05c8256966b89c68f6 100644 (file)
--- 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/storage_adapter_conf.c b/src/conf/storage_adapter_conf.c
index 135deeb933dfacbf511f2ddb790c49ac59f59da0..4c13cc4c17838d4f86f82093ceb67e35a67ac0a7 100644 (file)
--- 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 22e05bbe3019a13faf3dfead8c0574fb6c1d12c7..b4dc2643d795d2338318394c9754565024bf3092 100644 (file)
--- 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_conf.c b/src/conf/storage_conf.c
index 85260431e7f4efe9d0d55ccedb740a8e6cec3ce1..5da0bf20ddce42fe2594d367ce9fdefb0b40944a 100644 (file)
--- 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 aaecf138d626e3ac936ade25ec9e6316129e156e..de39c3f2949feb42036cc368766b5de734b3c8a6 100644 (file)
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -22,10 +22,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 a65ef1f8a21419caa56d01d53c52cd7c4eaab48a..3651ff8cfd9df659f95c1c0554a611a87382ef4e 100644 (file)
--- 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 8a62785798287fffbdd2f4f60b0593c8931a0120..4fcf83ff50dc17d0e731073a97c7e58b7e27ff12 100644 (file)
--- 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 8610f0ac5cc7f8396509a99b62c638b1fb5a8fd2..0ffd3db90ac25f12af1cd60f42b670b9066ad4b7 100644 (file)
--- 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/virdomaincheckpointobjlist.c b/src/conf/virdomaincheckpointobjlist.c
index 797feea520be40f4141baaaca3fbc600402a20a9..70b2f90c0eee681c6c14ca5599442a4c8ea3974d 100644 (file)
--- 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 8b6f51cd89236746fe2930a1eeefa0556d8eb9a9..ece652c7369b4503b0b7c2c96ee0a95a222cabe8 100644 (file)
--- a/src/conf/virdomaincheckpointobjlist.h
+++ b/src/conf/virdomaincheckpointobjlist.h
@@ -24,7 +24,6 @@
 
 #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 2f2467d13f14234ffa4433d63bdb3633e4198156..f19ec3319abfbacab3e93bbfe687e5a6c423e015 100644 (file)
--- 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 66bd4bcba79e8b4fad6bd4b685054580fb570806..f16b963eb0fc688d1e3b33884d73fe9e1ef8e730 100644 (file)
--- 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 2520a4bca464d8dee7f35f55231ec20aec22705b..aff4fc204d73ecb60c6af41b714188b429eb3c77 100644 (file)
--- a/src/conf/virdomainsnapshotobjlist.c
+++ b/src/conf/virdomainsnapshotobjlist.c
@@ -26,9 +26,7 @@
 #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 ce9d77e10bd1f65007a24682d95257cbca3bb863..8bcad50d4c9633d412b56dbe98af441a18cc7079 100644 (file)
--- a/src/conf/virdomainsnapshotobjlist.h
+++ b/src/conf/virdomainsnapshotobjlist.h
@@ -24,7 +24,6 @@
 
 #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 95279d5b1ccb8f94ab8471e3098e76e63e49a827..c2b81b984fe351d7484dcecda515122df56f15d9 100644 (file)
--- 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/virnetworkportdef.c b/src/conf/virnetworkportdef.c
index aa35374fb0bc1578e935511e2d06b311ce87b511..39fa895fae43ca2b67b8d5eaf731e89fc5846a91 100644 (file)
--- 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 ee13f8a0846b0b23ac33ad5db3e26ffe1c546d06..c661534046acb5a65ea17b19103c0f7f05827cb6 100644 (file)
--- a/src/conf/virnetworkportdef.h
+++ b/src/conf/virnetworkportdef.h
@@ -22,7 +22,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 49947d0a580676c7d21b264e018f09493a8c0b4f..26498fc498a5e075084b6efeefef005ccd135a73 100644 (file)
--- 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 c55a5d28dcf25900b8975f2e997030a3b00400bb..cc50ba944a26e860a407079e4427a81923596e14 100644 (file)
--- 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/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c
index be43ae3931a0efb547d07a6db3cbfd7b1059e71b..47455c7e350fd5dbcdb2186fcf792b24d3c1a12e 100644 (file)
--- 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/virsecretobj.h b/src/conf/virsecretobj.h
index 93b4a46acf806553d7717776f469f55feb4361e0..17897c55137784379573e97d024c2adf0cbe6bc4 100644 (file)
--- a/src/conf/virsecretobj.h
+++ b/src/conf/virsecretobj.h
@@ -23,7 +23,6 @@
 #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 fe868d25fa755f200f903ba578458495660f78d5..238d4678a24aae13677e40d89b6b984cbcf9bcb3 100644 (file)
--- 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 523bdec24409f090647837b08b2fc9ed72993c6e..d9dae9ceb9c00c5d279b0e9769c38647425b8ea7 100644 (file)
--- a/src/conf/virstorageobj.h
+++ b/src/conf/virstorageobj.h
@@ -23,8 +23,6 @@
 
 #include "storage_conf.h"
 
-#include "capabilities.h"
-
 typedef struct _virStoragePoolObj virStoragePoolObj;
 
 typedef struct _virStoragePoolObjList virStoragePoolObjList;