diff --git a/meta-oe/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass
similarity index 100%
rename from meta-oe/classes/waf-samba.bbclass
rename to meta-networking/classes/waf-samba.bbclass
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
index 63bb07d5a8..5fd636a87e 100644
--- a/meta-networking/conf/layer.conf
+++ b/meta-networking/conf/layer.conf
@@ -18,3 +18,6 @@ LAYERDEPENDS_networking-layer += "openembedded-layer"
 LAYERDEPENDS_networking-layer += "meta-python"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
+
+# used by waf-samba.bbclass
+WAF_CROSS_ANSWERS_PATH = "${LAYERDIR}/files/waf-cross-answers"
diff --git a/meta-oe/files/waf-cross-answers/README b/meta-networking/files/waf-cross-answers/README
similarity index 100%
rename from meta-oe/files/waf-cross-answers/README
rename to meta-networking/files/waf-cross-answers/README
diff --git a/meta-oe/files/waf-cross-answers/cross-answers-aarch64.txt b/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt
similarity index 100%
rename from meta-oe/files/waf-cross-answers/cross-answers-aarch64.txt
rename to meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt
diff --git a/meta-oe/files/waf-cross-answers/cross-answers-arm.txt b/meta-networking/files/waf-cross-answers/cross-answers-arm.txt
similarity index 100%
rename from meta-oe/files/waf-cross-answers/cross-answers-arm.txt
rename to meta-networking/files/waf-cross-answers/cross-answers-arm.txt
diff --git a/meta-oe/files/waf-cross-answers/cross-answers-i586.txt b/meta-networking/files/waf-cross-answers/cross-answers-i586.txt
similarity index 100%
rename from meta-oe/files/waf-cross-answers/cross-answers-i586.txt
rename to meta-networking/files/waf-cross-answers/cross-answers-i586.txt
diff --git a/meta-oe/files/waf-cross-answers/cross-answers-i686.txt b/meta-networking/files/waf-cross-answers/cross-answers-i686.txt
similarity index 100%
rename from meta-oe/files/waf-cross-answers/cross-answers-i686.txt
rename to meta-networking/files/waf-cross-answers/cross-answers-i686.txt
diff --git a/meta-oe/files/waf-cross-answers/cross-answers-mips.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips.txt
similarity index 100%
rename from meta-oe/files/waf-cross-answers/cross-answers-mips.txt
rename to meta-networking/files/waf-cross-answers/cross-answers-mips.txt
diff --git a/meta-oe/files/waf-cross-answers/cross-answers-mips64.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt
similarity index 100%
rename from meta-oe/files/waf-cross-answers/cross-answers-mips64.txt
rename to meta-networking/files/waf-cross-answers/cross-answers-mips64.txt
diff --git a/meta-oe/files/waf-cross-answers/cross-answers-powerpc.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt
similarity index 100%
rename from meta-oe/files/waf-cross-answers/cross-answers-powerpc.txt
rename to meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt
diff --git a/meta-oe/files/waf-cross-answers/cross-answers-powerpc64.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt
similarity index 100%
rename from meta-oe/files/waf-cross-answers/cross-answers-powerpc64.txt
rename to meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt
diff --git a/meta-oe/files/waf-cross-answers/cross-answers-x86_64.txt b/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt
similarity index 100%
rename from meta-oe/files/waf-cross-answers/cross-answers-x86_64.txt
rename to meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index 87f11f0285..a67cc1a19d 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -30,7 +30,6 @@ LAYERVERSION_openembedded-layer = "1"
 LAYERDEPENDS_openembedded-layer = "core"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
-WAF_CROSS_ANSWERS_PATH = "${LAYERDIR}/files/waf-cross-answers"
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   mplayer-common \