diff --git a/cfg.mk b/cfg.mk index c26556fb2f51f32ee95fdac26d807e6700e571f0..78f805b27ee6e8079b4b840a8df11ede1ff2886f 100644 --- a/cfg.mk +++ b/cfg.mk @@ -769,7 +769,7 @@ sc_prohibit_gettext_markup: # lower-level code must not include higher-level headers. cross_dirs=$(patsubst $(srcdir)/src/%.,%,$(wildcard $(srcdir)/src/*/.)) cross_dirs_re=($(subst / ,/|,$(cross_dirs))) -mid_dirs=access|admin|conf|cpu|locking|logging|network|node_device|rpc|security|storage +mid_dirs=access|admin|conf|cpu|locking|logging|rpc|security sc_prohibit_cross_inclusion: @for dir in $(cross_dirs); do \ case $$dir in \ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24b434a458993a0bc0f4f4c4fe03bf841a00d82b..ee4e0b20de1cce9c2fb091c54a7172ee0654f2a7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -51,7 +51,6 @@ #include "snapshot_conf.h" #include "storage_conf.h" #include "secret_conf.h" -#include "network/bridge_driver.h" #include "virnetdevtap.h" #include "virnetdevopenvswitch.h" #include "device_conf.h" diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index db8586360fc88e776b4ef5dda13465b5462b2357..84207db16a14c3e55da332e7c029af7ba89e22c5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -55,8 +55,6 @@ #include "logging/log_manager.h" #include "locking/domain_lock.h" -#include "storage/storage_driver.h" - #ifdef MAJOR_IN_MKDEV # include #elif MAJOR_IN_SYSMACROS diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a14e27aac29d8f9e59f8e52f149d822aa72dee5e..3641b801f6b6e6a590f514206e8e5efefb2e72d1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -58,7 +58,6 @@ #include "virtypedparam.h" #include "virprocess.h" #include "nwfilter_conf.h" -#include "storage/storage_driver.h" #define VIR_FROM_THIS VIR_FROM_QEMU diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index eea5f6fc689bedea97e058f8cd71e9c07fc6779a..41b09162c36cb53ab5306f618899a71be1c93201 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -33,7 +33,6 @@ #include "virhostcpu.h" #include "virsocketaddr.h" -#include "storage/storage_driver.h" #include "vz_sdk.h" #define VIR_FROM_THIS VIR_FROM_PARALLELS