From c813d14c9ffb9c0672a28d68faf85bf3575e9a2f Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Sun, 27 Aug 2006 23:34:18 +0000
Subject: Change include x.inc -> require x.inc (sync with OE)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@666 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/binutils/binutils-cross_2.15.94.0.1.bb             | 2 +-
 meta/packages/binutils/binutils-cross_2.16.91.0.7.bb             | 2 +-
 meta/packages/binutils/binutils-cross_2.16.bb                    | 4 ++--
 meta/packages/binutils/binutils_2.16.bb                          | 2 +-
 meta/packages/bison/bison-native_2.0.bb                          | 2 +-
 meta/packages/coreutils/coreutils-native_5.1.3.bb                | 2 +-
 meta/packages/curl/curl-native_7.14.0.bb                         | 2 +-
 meta/packages/db/db-native_4.2.52.bb                             | 2 +-
 meta/packages/dbus/dbus-native_0.50.bb                           | 2 +-
 meta/packages/dbus/dbus-native_0.60.bb                           | 2 +-
 meta/packages/dbus/dbus_0.60.bb                                  | 2 +-
 meta/packages/dropbear/dropbear_0.47.bb                          | 2 +-
 meta/packages/expat/expat-native_1.95.7.bb                       | 2 +-
 meta/packages/fakeroot/fakeroot-native_1.2.13.bb                 | 2 +-
 meta/packages/file/file-native_4.16.bb                           | 2 +-
 meta/packages/flex/flex-native_2.5.31.bb                         | 2 +-
 meta/packages/flex/flex_2.5.31.bb                                | 2 +-
 meta/packages/freetype/freetype-native_2.1.10.bb                 | 2 +-
 meta/packages/gcc/gcc-cross-initial_3.3.4.bb                     | 2 +-
 meta/packages/gcc/gcc-cross-initial_3.4.3.bb                     | 2 +-
 meta/packages/gcc/gcc-cross-initial_3.4.4.bb                     | 2 +-
 meta/packages/gcc/gcc-cross-initial_4.0.2.bb                     | 2 +-
 meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb            | 2 +-
 meta/packages/gcc/gcc-cross_3.3.4.bb                             | 8 ++++----
 meta/packages/gcc/gcc-cross_3.4.3.bb                             | 8 ++++----
 meta/packages/gcc/gcc-cross_3.4.4.bb                             | 8 ++++----
 meta/packages/gcc/gcc-cross_4.0.2.bb                             | 8 ++++----
 meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb                    | 8 ++++----
 meta/packages/gcc/gcc_3.4.3.bb                                   | 4 ++--
 meta/packages/gcc/gcc_3.4.4.bb                                   | 4 ++--
 meta/packages/gcc/gcc_4.0.2.bb                                   | 4 ++--
 meta/packages/gcc/gcc_csl-arm-2005q3.bb                          | 4 ++--
 meta/packages/genext2fs/genext2fs-native_1.3.bb                  | 2 +-
 meta/packages/genext2fs/genext2fs_1.3.bb                         | 2 +-
 meta/packages/gettext/gettext-native_0.14.1.bb                   | 2 +-
 meta/packages/glibc/glibc_2.3.5+cvs20050627.bb                   | 2 +-
 meta/packages/gmp/gmp-native_4.1.2.bb                            | 2 +-
 meta/packages/gnu-config/gnu-config-native_20050701.bb           | 2 +-
 meta/packages/gtk-doc/gtk-doc-native.bb                          | 2 +-
 meta/packages/hostap/hostap-modules_0.3.9.bb                     | 2 +-
 meta/packages/hostap/hostap-utils_0.3.7.bb                       | 2 +-
 meta/packages/hostap/hostap-utils_0.4.0.bb                       | 2 +-
 meta/packages/intltool/intltool-native_0.31.bb                   | 2 +-
 meta/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb    | 2 +-
 meta/packages/ipkg/ipkg-native_0.99.154.bb                       | 4 ++--
 meta/packages/ipkg/ipkg_0.99.154.bb                              | 2 +-
 meta/packages/jpeg/jpeg-native_6b.bb                             | 2 +-
 meta/packages/libidl/libidl-native_0.8.3.bb                      | 2 +-
 meta/packages/libmatchbox/libmatchbox_1.7.bb                     | 2 +-
 meta/packages/libmatchbox/libmatchbox_1.9.bb                     | 2 +-
 meta/packages/libmatchbox/libmatchbox_svn.bb                     | 2 +-
 meta/packages/libpng/libpng-native_1.2.8.bb                      | 2 +-
 meta/packages/libtool/libtool-cross_1.5.10.bb                    | 2 +-
 meta/packages/libtool/libtool-native_1.5.10.bb                   | 2 +-
 meta/packages/linux/linux-openzaurus_2.6.16.bb                   | 2 +-
 meta/packages/linux/linux-openzaurus_2.6.17.bb                   | 2 +-
 meta/packages/m4/m4-native_1.4.2.bb                              | 2 +-
 meta/packages/makedevs/makedevs-native_1.0.0.bb                  | 2 +-
 meta/packages/matchbox-panel/matchbox-panel_0.9.2.bb             | 2 +-
 meta/packages/matchbox-panel/matchbox-panel_svn.bb               | 2 +-
 meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb | 2 +-
 meta/packages/modutils/modutils-cross_2.4.27.bb                  | 2 +-
 meta/packages/mozilla/minimo_cvs.bb                              | 2 +-
 meta/packages/mpfr/mpfr-native_2.1.1.bb                          | 2 +-
 meta/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb          | 2 +-
 meta/packages/ncurses/ncurses-native_5.4.bb                      | 2 +-
 meta/packages/ncurses/ncurses_5.4.bb                             | 2 +-
 meta/packages/perl/libxml-parser-perl-native_2.34.bb             | 2 +-
 meta/packages/pkgconfig/pkgconfig-native_0.15.0.bb               | 2 +-
 meta/packages/popt/popt-native_1.7.bb                            | 2 +-
 meta/packages/qemu/qemu-native_cvs.bb                            | 2 +-
 meta/packages/readline/readline-native_4.3.bb                    | 2 +-
 meta/packages/udev/udev_084.bb                                   | 2 +-
 meta/packages/udev/udev_089.bb                                   | 2 +-
 meta/packages/udev/udev_092.bb                                   | 2 +-
 meta/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb       | 2 +-
 meta/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb         | 2 +-
 meta/packages/xextensions/xextensions-native_1.0.1.bb            | 2 +-
 meta/packages/zaurus-updater/encdec-updater-native.bb            | 2 +-
 meta/packages/zip/zip-native_2.31.bb                             | 2 +-
 meta/packages/zlib/zlib-native_1.1.4.bb                          | 2 +-
 meta/packages/zlib/zlib-native_1.2.2.bb                          | 2 +-
 meta/packages/zlib/zlib-native_1.2.3.bb                          | 2 +-
 83 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/meta/packages/binutils/binutils-cross_2.15.94.0.1.bb b/meta/packages/binutils/binutils-cross_2.15.94.0.1.bb
index 7e165271d7..1f2f43ecf8 100644
--- a/meta/packages/binutils/binutils-cross_2.15.94.0.1.bb
+++ b/meta/packages/binutils/binutils-cross_2.15.94.0.1.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include binutils_${PV}.bb
+require binutils_${PV}.bb
 inherit cross
 DEPENDS += "flex-native bison-native"
 PROVIDES = "virtual/${TARGET_PREFIX}binutils"
diff --git a/meta/packages/binutils/binutils-cross_2.16.91.0.7.bb b/meta/packages/binutils/binutils-cross_2.16.91.0.7.bb
index 7e165271d7..1f2f43ecf8 100644
--- a/meta/packages/binutils/binutils-cross_2.16.91.0.7.bb
+++ b/meta/packages/binutils/binutils-cross_2.16.91.0.7.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include binutils_${PV}.bb
+require binutils_${PV}.bb
 inherit cross
 DEPENDS += "flex-native bison-native"
 PROVIDES = "virtual/${TARGET_PREFIX}binutils"
diff --git a/meta/packages/binutils/binutils-cross_2.16.bb b/meta/packages/binutils/binutils-cross_2.16.bb
index df0f17b1ef..d245f7d11a 100644
--- a/meta/packages/binutils/binutils-cross_2.16.bb
+++ b/meta/packages/binutils/binutils-cross_2.16.bb
@@ -1,3 +1,3 @@
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-include binutils_${PV}.bb
-include binutils-cross.inc
+require binutils_${PV}.bb
+require binutils-cross.inc
diff --git a/meta/packages/binutils/binutils_2.16.bb b/meta/packages/binutils/binutils_2.16.bb
index 5b936dcc66..dbb4b94d2e 100644
--- a/meta/packages/binutils/binutils_2.16.bb
+++ b/meta/packages/binutils/binutils_2.16.bb
@@ -23,4 +23,4 @@ SRC_URI += "file://binutils-2.16-thumb-glue.patch;patch=1"
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-include binutils.inc
+require binutils.inc
diff --git a/meta/packages/bison/bison-native_2.0.bb b/meta/packages/bison/bison-native_2.0.bb
index 57065cd502..db2b0b9683 100644
--- a/meta/packages/bison/bison-native_2.0.bb
+++ b/meta/packages/bison/bison-native_2.0.bb
@@ -1,4 +1,4 @@
-include bison_${PV}.bb
+require bison_${PV}.bb
 SECTION = "devel"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}"
 S = "${WORKDIR}/bison-${PV}"
diff --git a/meta/packages/coreutils/coreutils-native_5.1.3.bb b/meta/packages/coreutils/coreutils-native_5.1.3.bb
index 74b39541fa..ee90981895 100644
--- a/meta/packages/coreutils/coreutils-native_5.1.3.bb
+++ b/meta/packages/coreutils/coreutils-native_5.1.3.bb
@@ -3,5 +3,5 @@ SECTION = "base"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
 S = "${WORKDIR}/coreutils-${PV}"
 
-include coreutils_${PV}.bb
+require coreutils_${PV}.bb
 inherit native
diff --git a/meta/packages/curl/curl-native_7.14.0.bb b/meta/packages/curl/curl-native_7.14.0.bb
index 59af4ef32e..c70dd3b9dc 100644
--- a/meta/packages/curl/curl-native_7.14.0.bb
+++ b/meta/packages/curl/curl-native_7.14.0.bb
@@ -1,4 +1,4 @@
-include curl_${PV}.bb
+require curl_${PV}.bb
 inherit native
 
 do_stage () {
diff --git a/meta/packages/db/db-native_4.2.52.bb b/meta/packages/db/db-native_4.2.52.bb
index 5aaeb4329e..12a875ff13 100644
--- a/meta/packages/db/db-native_4.2.52.bb
+++ b/meta/packages/db/db-native_4.2.52.bb
@@ -8,6 +8,6 @@ CONFLICTS = "db3-native"
 
 inherit native
 
-include db_${PV}.bb
+require db_${PV}.bb
 
 PACKAGES = ""
diff --git a/meta/packages/dbus/dbus-native_0.50.bb b/meta/packages/dbus/dbus-native_0.50.bb
index 9e661dbccf..39ea2ae0b7 100644
--- a/meta/packages/dbus/dbus-native_0.50.bb
+++ b/meta/packages/dbus/dbus-native_0.50.bb
@@ -1,4 +1,4 @@
-include dbus_${PV}.inc
+require dbus_${PV}.inc
 
 SRC_URI_EXTRA=""
 
diff --git a/meta/packages/dbus/dbus-native_0.60.bb b/meta/packages/dbus/dbus-native_0.60.bb
index 9e661dbccf..39ea2ae0b7 100644
--- a/meta/packages/dbus/dbus-native_0.60.bb
+++ b/meta/packages/dbus/dbus-native_0.60.bb
@@ -1,4 +1,4 @@
-include dbus_${PV}.inc
+require dbus_${PV}.inc
 
 SRC_URI_EXTRA=""
 
diff --git a/meta/packages/dbus/dbus_0.60.bb b/meta/packages/dbus/dbus_0.60.bb
index e827457371..a290d3da08 100644
--- a/meta/packages/dbus/dbus_0.60.bb
+++ b/meta/packages/dbus/dbus_0.60.bb
@@ -1,4 +1,4 @@
-include dbus_${PV}.inc
+require dbus_${PV}.inc
 
 
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
diff --git a/meta/packages/dropbear/dropbear_0.47.bb b/meta/packages/dropbear/dropbear_0.47.bb
index 5990260b87..b8467e1e7c 100644
--- a/meta/packages/dropbear/dropbear_0.47.bb
+++ b/meta/packages/dropbear/dropbear_0.47.bb
@@ -1,3 +1,3 @@
-include dropbear.inc
+require dropbear.inc
 
 PR = "r2"
diff --git a/meta/packages/expat/expat-native_1.95.7.bb b/meta/packages/expat/expat-native_1.95.7.bb
index 2c40ba8488..edfa53ae48 100644
--- a/meta/packages/expat/expat-native_1.95.7.bb
+++ b/meta/packages/expat/expat-native_1.95.7.bb
@@ -1,4 +1,4 @@
 SECTION = "libs"
-include expat_${PV}.bb
+require expat_${PV}.bb
 inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/expat-${PV}"
diff --git a/meta/packages/fakeroot/fakeroot-native_1.2.13.bb b/meta/packages/fakeroot/fakeroot-native_1.2.13.bb
index cc3dfd2231..eb58e92b6e 100644
--- a/meta/packages/fakeroot/fakeroot-native_1.2.13.bb
+++ b/meta/packages/fakeroot/fakeroot-native_1.2.13.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 PR = "r0"
-include fakeroot_${PV}.bb
+require fakeroot_${PV}.bb
 inherit native
 
 SRC_URI += "file://fix-prefix.patch;patch=1"
diff --git a/meta/packages/file/file-native_4.16.bb b/meta/packages/file/file-native_4.16.bb
index 3228ed683c..63554b01fb 100644
--- a/meta/packages/file/file-native_4.16.bb
+++ b/meta/packages/file/file-native_4.16.bb
@@ -1,4 +1,4 @@
-include file_${PV}.bb
+require file_${PV}.bb
 inherit native
 
 # avoid dependency loop
diff --git a/meta/packages/flex/flex-native_2.5.31.bb b/meta/packages/flex/flex-native_2.5.31.bb
index ff8a42772b..1e9354afde 100644
--- a/meta/packages/flex/flex-native_2.5.31.bb
+++ b/meta/packages/flex/flex-native_2.5.31.bb
@@ -1,4 +1,4 @@
-include flex.inc
+require flex.inc
 inherit native
 PR = "r2"
 
diff --git a/meta/packages/flex/flex_2.5.31.bb b/meta/packages/flex/flex_2.5.31.bb
index b96c645136..3062e2d8dc 100644
--- a/meta/packages/flex/flex_2.5.31.bb
+++ b/meta/packages/flex/flex_2.5.31.bb
@@ -1,4 +1,4 @@
-include flex.inc
+require flex.inc
 PR = "r4"
 
 SRC_URI += "file://include.patch;patch=1"
diff --git a/meta/packages/freetype/freetype-native_2.1.10.bb b/meta/packages/freetype/freetype-native_2.1.10.bb
index 64fac71cbe..b5e8b307cd 100644
--- a/meta/packages/freetype/freetype-native_2.1.10.bb
+++ b/meta/packages/freetype/freetype-native_2.1.10.bb
@@ -1,4 +1,4 @@
-include freetype_${PV}.bb
+require freetype_${PV}.bb
 inherit native
 DEPENDS = ""
 FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
diff --git a/meta/packages/gcc/gcc-cross-initial_3.3.4.bb b/meta/packages/gcc/gcc-cross-initial_3.3.4.bb
index e3b365da18..c650e4fe57 100644
--- a/meta/packages/gcc/gcc-cross-initial_3.3.4.bb
+++ b/meta/packages/gcc/gcc-cross-initial_3.3.4.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/meta/packages/gcc/gcc-cross-initial_3.4.3.bb b/meta/packages/gcc/gcc-cross-initial_3.4.3.bb
index 48c80864e2..307c6f7d4c 100644
--- a/meta/packages/gcc/gcc-cross-initial_3.4.3.bb
+++ b/meta/packages/gcc/gcc-cross-initial_3.4.3.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/meta/packages/gcc/gcc-cross-initial_3.4.4.bb b/meta/packages/gcc/gcc-cross-initial_3.4.4.bb
index 48c80864e2..307c6f7d4c 100644
--- a/meta/packages/gcc/gcc-cross-initial_3.4.4.bb
+++ b/meta/packages/gcc/gcc-cross-initial_3.4.4.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/meta/packages/gcc/gcc-cross-initial_4.0.2.bb b/meta/packages/gcc/gcc-cross-initial_4.0.2.bb
index 68dafe3f1a..037f3032a6 100644
--- a/meta/packages/gcc/gcc-cross-initial_4.0.2.bb
+++ b/meta/packages/gcc/gcc-cross-initial_4.0.2.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
index 48c80864e2..307c6f7d4c 100644
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
+++ b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/meta/packages/gcc/gcc-cross_3.3.4.bb b/meta/packages/gcc/gcc-cross_3.3.4.bb
index 597b47fba8..f7a2cded51 100644
--- a/meta/packages/gcc/gcc-cross_3.3.4.bb
+++ b/meta/packages/gcc/gcc-cross_3.3.4.bb
@@ -1,6 +1,6 @@
 SECTION = "devel"
-include gcc_${PV}.bb
-include gcc-paths-cross.inc
+require gcc_${PV}.bb
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
@@ -9,5 +9,5 @@ PR="r3"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
-include gcc3-build-cross.inc
-include gcc-package-cross.inc
\ No newline at end of file
+require gcc3-build-cross.inc
+require gcc-package-cross.inc
\ No newline at end of file
diff --git a/meta/packages/gcc/gcc-cross_3.4.3.bb b/meta/packages/gcc/gcc-cross_3.4.3.bb
index a5d1bda170..b61223b39c 100644
--- a/meta/packages/gcc/gcc-cross_3.4.3.bb
+++ b/meta/packages/gcc/gcc-cross_3.4.3.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc-cross_3.4.4.bb b/meta/packages/gcc/gcc-cross_3.4.4.bb
index d965e5b399..ef679365e1 100644
--- a/meta/packages/gcc/gcc-cross_3.4.4.bb
+++ b/meta/packages/gcc/gcc-cross_3.4.4.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc-cross_4.0.2.bb b/meta/packages/gcc/gcc-cross_4.0.2.bb
index 6e299e8299..d2dc240126 100644
--- a/meta/packages/gcc/gcc-cross_4.0.2.bb
+++ b/meta/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 93c58aca53..c61dc67bfc 100644
--- a/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,6 +1,6 @@
-include gcc_csl-arm-2005q3.bb
+require gcc_csl-arm-2005q3.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
@@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-cross-build.inc
+require gcc3-cross-build.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc_3.4.3.bb b/meta/packages/gcc/gcc_3.4.3.bb
index c92746be58..f1a1545274 100644
--- a/meta/packages/gcc/gcc_3.4.3.bb
+++ b/meta/packages/gcc/gcc_3.4.3.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-reverse-compare.patch;patch=1 \
@@ -24,4 +24,4 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://15342.patch;patch=1 \
 	   file://always-fixincperm.patch;patch=1"
 
-include gcc3-build.inc
+require gcc3-build.inc
diff --git a/meta/packages/gcc/gcc_3.4.4.bb b/meta/packages/gcc/gcc_3.4.4.bb
index 5be603f2ca..66bc4381d0 100644
--- a/meta/packages/gcc/gcc_3.4.4.bb
+++ b/meta/packages/gcc/gcc_3.4.4.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-reverse-compare.patch;patch=1 \
@@ -27,4 +27,4 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 SRC_URI += "file://gcc34-configure.in.patch;patch=1"
 SRC_URI += "file://gcc34-thumb-support.patch;patch=1"
 
-include gcc3-build.inc
+require gcc3-build.inc
diff --git a/meta/packages/gcc/gcc_4.0.2.bb b/meta/packages/gcc/gcc_4.0.2.bb
index f4eeb9bdef..29f0b0f63e 100644
--- a/meta/packages/gcc/gcc_4.0.2.bb
+++ b/meta/packages/gcc/gcc_4.0.2.bb
@@ -8,7 +8,7 @@ PR = "r1"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
@@ -25,4 +25,4 @@ SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
                    file://zecke-host-cpp-ac-hack.patch;patch=1 "
 
 
-include gcc4-build.inc
+require gcc4-build.inc
diff --git a/meta/packages/gcc/gcc_csl-arm-2005q3.bb b/meta/packages/gcc/gcc_csl-arm-2005q3.bb
index 62bacda147..aab1825621 100644
--- a/meta/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/meta/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -10,7 +10,7 @@ FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \
            file://gcc_optab_arm.patch;patch=1"
@@ -22,6 +22,6 @@ do_unpack2() {
 
 addtask unpack2 after do_unpack before do_patch
 
-include gcc3-build.inc
+require gcc3-build.inc
 
 S = "${WORKDIR}/gcc-2005q3"
diff --git a/meta/packages/genext2fs/genext2fs-native_1.3.bb b/meta/packages/genext2fs/genext2fs-native_1.3.bb
index b840a30104..2e26fa0110 100644
--- a/meta/packages/genext2fs/genext2fs-native_1.3.bb
+++ b/meta/packages/genext2fs/genext2fs-native_1.3.bb
@@ -1,4 +1,4 @@
-include genext2fs_${PV}.bb
+require genext2fs_${PV}.bb
 inherit native
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/genext2fs-${PV}', '${FILE_DIRNAME}/genext2fs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
diff --git a/meta/packages/genext2fs/genext2fs_1.3.bb b/meta/packages/genext2fs/genext2fs_1.3.bb
index d32d17ae08..ab74a76a25 100644
--- a/meta/packages/genext2fs/genext2fs_1.3.bb
+++ b/meta/packages/genext2fs/genext2fs_1.3.bb
@@ -1,4 +1,4 @@
-include genext2fs.inc
+require genext2fs.inc
 
 PR = "r3"
 
diff --git a/meta/packages/gettext/gettext-native_0.14.1.bb b/meta/packages/gettext/gettext-native_0.14.1.bb
index 07c9361a19..6203b1f9d7 100644
--- a/meta/packages/gettext/gettext-native_0.14.1.bb
+++ b/meta/packages/gettext/gettext-native_0.14.1.bb
@@ -1,4 +1,4 @@
-include gettext_${PV}.bb
+require gettext_${PV}.bb
 S = "${WORKDIR}/gettext-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
 inherit native
diff --git a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
index b6af34efdd..12f56262f1 100644
--- a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -174,5 +174,5 @@ do_stage() {
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
-include glibc-package.bbclass
+require glibc-package.bbclass
 include glibc.inc
diff --git a/meta/packages/gmp/gmp-native_4.1.2.bb b/meta/packages/gmp/gmp-native_4.1.2.bb
index 9a35da292b..c8160ca14e 100644
--- a/meta/packages/gmp/gmp-native_4.1.2.bb
+++ b/meta/packages/gmp/gmp-native_4.1.2.bb
@@ -1,4 +1,4 @@
-include gmp_${PV}.bb
+require gmp_${PV}.bb
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gmp-${PV}"
 S = "${WORKDIR}/gmp-${PV}"
diff --git a/meta/packages/gnu-config/gnu-config-native_20050701.bb b/meta/packages/gnu-config/gnu-config-native_20050701.bb
index 7ee47fe5d5..e729520d60 100644
--- a/meta/packages/gnu-config/gnu-config-native_20050701.bb
+++ b/meta/packages/gnu-config/gnu-config-native_20050701.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-include gnu-config_${PV}.bb
+require gnu-config_${PV}.bb
 
 inherit native
 
diff --git a/meta/packages/gtk-doc/gtk-doc-native.bb b/meta/packages/gtk-doc/gtk-doc-native.bb
index de7d00b273..60a8907baf 100644
--- a/meta/packages/gtk-doc/gtk-doc-native.bb
+++ b/meta/packages/gtk-doc/gtk-doc-native.bb
@@ -1,3 +1,3 @@
 SECTION = "x11/base"
 inherit native
-include gtk-doc.bb
+require gtk-doc.bb
diff --git a/meta/packages/hostap/hostap-modules_0.3.9.bb b/meta/packages/hostap/hostap-modules_0.3.9.bb
index cc09fd5952..051afadca0 100644
--- a/meta/packages/hostap/hostap-modules_0.3.9.bb
+++ b/meta/packages/hostap/hostap-modules_0.3.9.bb
@@ -1,4 +1,4 @@
-include hostap-modules.inc
+require hostap-modules.inc
 PR = "r10"
 
 SRC_URI += "file://Makefile.patch;patch=1 \
diff --git a/meta/packages/hostap/hostap-utils_0.3.7.bb b/meta/packages/hostap/hostap-utils_0.3.7.bb
index ad06cd3d6d..abfcf53663 100644
--- a/meta/packages/hostap/hostap-utils_0.3.7.bb
+++ b/meta/packages/hostap/hostap-utils_0.3.7.bb
@@ -1,3 +1,3 @@
-include hostap-utils.inc
+require hostap-utils.inc
 
 PR = "r3"
diff --git a/meta/packages/hostap/hostap-utils_0.4.0.bb b/meta/packages/hostap/hostap-utils_0.4.0.bb
index ad06cd3d6d..abfcf53663 100644
--- a/meta/packages/hostap/hostap-utils_0.4.0.bb
+++ b/meta/packages/hostap/hostap-utils_0.4.0.bb
@@ -1,3 +1,3 @@
-include hostap-utils.inc
+require hostap-utils.inc
 
 PR = "r3"
diff --git a/meta/packages/intltool/intltool-native_0.31.bb b/meta/packages/intltool/intltool-native_0.31.bb
index f200d26dd1..7cf3c4e11f 100644
--- a/meta/packages/intltool/intltool-native_0.31.bb
+++ b/meta/packages/intltool/intltool-native_0.31.bb
@@ -1,4 +1,4 @@
 SECTION = "devel"
-include intltool_${PV}.bb
+require intltool_${PV}.bb
 inherit native
 DEPENDS = "libxml-parser-perl-native"
diff --git a/meta/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/meta/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index bfb91f2f56..8079b46267 100644
--- a/meta/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/meta/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,4 +1,4 @@
-include ipkg-utils_${PV}.bb
+require ipkg-utils_${PV}.bb
 SRC_URI += "file://ipkg-utils-fix.patch;patch=1"
 
 RDEPENDS = ""
diff --git a/meta/packages/ipkg/ipkg-native_0.99.154.bb b/meta/packages/ipkg/ipkg-native_0.99.154.bb
index d59eab3a61..64868b1e1f 100644
--- a/meta/packages/ipkg/ipkg-native_0.99.154.bb
+++ b/meta/packages/ipkg/ipkg-native_0.99.154.bb
@@ -1,2 +1,2 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
+require ipkg_${PV}.bb
+require ipkg-native.inc
diff --git a/meta/packages/ipkg/ipkg_0.99.154.bb b/meta/packages/ipkg/ipkg_0.99.154.bb
index 532072d387..20a1996658 100644
--- a/meta/packages/ipkg/ipkg_0.99.154.bb
+++ b/meta/packages/ipkg/ipkg_0.99.154.bb
@@ -1,2 +1,2 @@
-include ipkg.inc
+require ipkg.inc
 PR = "r4"
diff --git a/meta/packages/jpeg/jpeg-native_6b.bb b/meta/packages/jpeg/jpeg-native_6b.bb
index b617f1b6c0..450e4b36a7 100644
--- a/meta/packages/jpeg/jpeg-native_6b.bb
+++ b/meta/packages/jpeg/jpeg-native_6b.bb
@@ -1,5 +1,5 @@
 SECTION = "libs"
-include jpeg_${PV}.bb
+require jpeg_${PV}.bb
 inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/jpeg-${PV}"
 DEPENDS = ""
diff --git a/meta/packages/libidl/libidl-native_0.8.3.bb b/meta/packages/libidl/libidl-native_0.8.3.bb
index bcc1ec61a8..ce59fd4b86 100644
--- a/meta/packages/libidl/libidl-native_0.8.3.bb
+++ b/meta/packages/libidl/libidl-native_0.8.3.bb
@@ -1,5 +1,5 @@
 SECTION = "libs"
-include libidl_${PV}.bb
+require libidl_${PV}.bb
 inherit native
 
 DEPENDS = "glib-2.0-native"
diff --git a/meta/packages/libmatchbox/libmatchbox_1.7.bb b/meta/packages/libmatchbox/libmatchbox_1.7.bb
index afcf058663..52b320d661 100644
--- a/meta/packages/libmatchbox/libmatchbox_1.7.bb
+++ b/meta/packages/libmatchbox/libmatchbox_1.7.bb
@@ -1,4 +1,4 @@
-include libmatchbox.inc
+require libmatchbox.inc
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
 	   file://check.m4"
diff --git a/meta/packages/libmatchbox/libmatchbox_1.9.bb b/meta/packages/libmatchbox/libmatchbox_1.9.bb
index afcf058663..52b320d661 100644
--- a/meta/packages/libmatchbox/libmatchbox_1.9.bb
+++ b/meta/packages/libmatchbox/libmatchbox_1.9.bb
@@ -1,4 +1,4 @@
-include libmatchbox.inc
+require libmatchbox.inc
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
 	   file://check.m4"
diff --git a/meta/packages/libmatchbox/libmatchbox_svn.bb b/meta/packages/libmatchbox/libmatchbox_svn.bb
index aa3bfcd444..179c2d254b 100644
--- a/meta/packages/libmatchbox/libmatchbox_svn.bb
+++ b/meta/packages/libmatchbox/libmatchbox_svn.bb
@@ -1,4 +1,4 @@
-include libmatchbox.inc
+require libmatchbox.inc
 
 PV = "1.7+svn${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta/packages/libpng/libpng-native_1.2.8.bb b/meta/packages/libpng/libpng-native_1.2.8.bb
index b03056f08d..231b956678 100644
--- a/meta/packages/libpng/libpng-native_1.2.8.bb
+++ b/meta/packages/libpng/libpng-native_1.2.8.bb
@@ -1,4 +1,4 @@
-include libpng_${PV}.bb
+require libpng_${PV}.bb
 inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
 DEPENDS = "zlib-native"
diff --git a/meta/packages/libtool/libtool-cross_1.5.10.bb b/meta/packages/libtool/libtool-cross_1.5.10.bb
index 22e404c9d5..81a4990d28 100644
--- a/meta/packages/libtool/libtool-cross_1.5.10.bb
+++ b/meta/packages/libtool/libtool-cross_1.5.10.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include libtool_${PV}.bb
+require libtool_${PV}.bb
 
 PR = "r4"
 PACKAGES = ""
diff --git a/meta/packages/libtool/libtool-native_1.5.10.bb b/meta/packages/libtool/libtool-native_1.5.10.bb
index ff001be63c..c8c406b1c8 100644
--- a/meta/packages/libtool/libtool-native_1.5.10.bb
+++ b/meta/packages/libtool/libtool-native_1.5.10.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include libtool_${PV}.bb
+require libtool_${PV}.bb
 
 PR = "r4"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
diff --git a/meta/packages/linux/linux-openzaurus_2.6.16.bb b/meta/packages/linux/linux-openzaurus_2.6.16.bb
index 08a64160c1..3cebde76c5 100644
--- a/meta/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/meta/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,4 +1,4 @@
-include linux-openzaurus.inc
+require linux-openzaurus.inc
 
 PR = "r38"
 
diff --git a/meta/packages/linux/linux-openzaurus_2.6.17.bb b/meta/packages/linux/linux-openzaurus_2.6.17.bb
index 292bfbe720..8cc7517a8f 100644
--- a/meta/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/meta/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,4 +1,4 @@
-include linux-openzaurus.inc
+require linux-openzaurus.inc
 
 PR = "r15"
 
diff --git a/meta/packages/m4/m4-native_1.4.2.bb b/meta/packages/m4/m4-native_1.4.2.bb
index 67fe36c7a1..8beb8748e3 100644
--- a/meta/packages/m4/m4-native_1.4.2.bb
+++ b/meta/packages/m4/m4-native_1.4.2.bb
@@ -1,4 +1,4 @@
-include m4_${PV}.bb
+require m4_${PV}.bb
 
 inherit native
 
diff --git a/meta/packages/makedevs/makedevs-native_1.0.0.bb b/meta/packages/makedevs/makedevs-native_1.0.0.bb
index 1a79403550..28544e12f2 100644
--- a/meta/packages/makedevs/makedevs-native_1.0.0.bb
+++ b/meta/packages/makedevs/makedevs-native_1.0.0.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-include makedevs_${PV}.bb
+require makedevs_${PV}.bb
 inherit native 
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/makedevs-${PV}"
diff --git a/meta/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/meta/packages/matchbox-panel/matchbox-panel_0.9.2.bb
index 78d1b282d9..2b5f4693a7 100644
--- a/meta/packages/matchbox-panel/matchbox-panel_0.9.2.bb
+++ b/meta/packages/matchbox-panel/matchbox-panel_0.9.2.bb
@@ -1,4 +1,4 @@
-include matchbox-panel.inc
+require matchbox-panel.inc
 
 PR="r3"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz"
diff --git a/meta/packages/matchbox-panel/matchbox-panel_svn.bb b/meta/packages/matchbox-panel/matchbox-panel_svn.bb
index 211cf3caa2..a279954fe2 100644
--- a/meta/packages/matchbox-panel/matchbox-panel_svn.bb
+++ b/meta/packages/matchbox-panel/matchbox-panel_svn.bb
@@ -1,4 +1,4 @@
-include matchbox-panel.inc
+require matchbox-panel.inc
 PV = "0.9.2+svn${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
index fc8b461945..9e6bcd6eee 100644
--- a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
+++ b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-include module-init-tools_${PV}.bb
+require module-init-tools_${PV}.bb
 inherit cross
 DEFAULT_PREFERENCE = "0"
 PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
diff --git a/meta/packages/modutils/modutils-cross_2.4.27.bb b/meta/packages/modutils/modutils-cross_2.4.27.bb
index 834f13adbd..23c9c755f4 100644
--- a/meta/packages/modutils/modutils-cross_2.4.27.bb
+++ b/meta/packages/modutils/modutils-cross_2.4.27.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-include modutils_${PV}.bb
+require modutils_${PV}.bb
 PR = "r8"
 inherit cross
 S = "${WORKDIR}/modutils-${PV}"
diff --git a/meta/packages/mozilla/minimo_cvs.bb b/meta/packages/mozilla/minimo_cvs.bb
index 7904951277..273e4da56b 100644
--- a/meta/packages/mozilla/minimo_cvs.bb
+++ b/meta/packages/mozilla/minimo_cvs.bb
@@ -22,7 +22,7 @@ export MOZ_CO_PROJECT="suite"
 export MINIMO=1
 export MOZ_OBJDIR="${WORKDIR}/build-${TARGET_SYS}"
 
-include mozilla-cvs.inc
+require mozilla-cvs.inc
 
 do_compile () {
 	mozilla_do_compile
diff --git a/meta/packages/mpfr/mpfr-native_2.1.1.bb b/meta/packages/mpfr/mpfr-native_2.1.1.bb
index 119249895d..01ba37c8bf 100644
--- a/meta/packages/mpfr/mpfr-native_2.1.1.bb
+++ b/meta/packages/mpfr/mpfr-native_2.1.1.bb
@@ -1,4 +1,4 @@
-include mpfr_${PV}.bb
+require mpfr_${PV}.bb
 inherit native
 DEPENDS = "gmp-native"
 
diff --git a/meta/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb b/meta/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb
index cd1fb7d11b..ac060ecef2 100644
--- a/meta/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb
+++ b/meta/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPLv2"
 SECTION = "base"
-include mtd-utils_${PV}.bb
+require mtd-utils_${PV}.bb
 inherit native
 DEPENDS = "zlib-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils"
diff --git a/meta/packages/ncurses/ncurses-native_5.4.bb b/meta/packages/ncurses/ncurses-native_5.4.bb
index 26d0897c9f..19e379a15c 100644
--- a/meta/packages/ncurses/ncurses-native_5.4.bb
+++ b/meta/packages/ncurses/ncurses-native_5.4.bb
@@ -1,5 +1,5 @@
 SECTION = "libs"
-include ncurses_${PV}.bb
+require ncurses_${PV}.bb
 inherit native
 EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
 DEPENDS = ""
diff --git a/meta/packages/ncurses/ncurses_5.4.bb b/meta/packages/ncurses/ncurses_5.4.bb
index 5b03eaaeed..63272b4779 100644
--- a/meta/packages/ncurses/ncurses_5.4.bb
+++ b/meta/packages/ncurses/ncurses_5.4.bb
@@ -4,4 +4,4 @@ SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
 	   file://visibility.patch;patch=1"
 S = "${WORKDIR}/ncurses-${PV}"
 
-include ncurses.inc
+require ncurses.inc
diff --git a/meta/packages/perl/libxml-parser-perl-native_2.34.bb b/meta/packages/perl/libxml-parser-perl-native_2.34.bb
index be4ddc6da0..12bb476caa 100644
--- a/meta/packages/perl/libxml-parser-perl-native_2.34.bb
+++ b/meta/packages/perl/libxml-parser-perl-native_2.34.bb
@@ -1,4 +1,4 @@
 SECTION = "libs"
-include libxml-parser-perl_${PV}.bb
+require libxml-parser-perl_${PV}.bb
 inherit native
 DEPENDS = "perl-native expat-native"
diff --git a/meta/packages/pkgconfig/pkgconfig-native_0.15.0.bb b/meta/packages/pkgconfig/pkgconfig-native_0.15.0.bb
index d8e47c5d09..daab8ab422 100644
--- a/meta/packages/pkgconfig/pkgconfig-native_0.15.0.bb
+++ b/meta/packages/pkgconfig/pkgconfig-native_0.15.0.bb
@@ -1,5 +1,5 @@
 SECTION = "console/utils"
-include pkgconfig_${PV}.bb
+require pkgconfig_${PV}.bb
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
 
 S = "${WORKDIR}/pkgconfig-${PV}"
diff --git a/meta/packages/popt/popt-native_1.7.bb b/meta/packages/popt/popt-native_1.7.bb
index da39fb8bb2..f8644f1425 100644
--- a/meta/packages/popt/popt-native_1.7.bb
+++ b/meta/packages/popt/popt-native_1.7.bb
@@ -1,5 +1,5 @@
 SECTION = "unknown"
-include popt_${PV}.bb
+require popt_${PV}.bb
 inherit native
 
 S = "${WORKDIR}/popt-${PV}"
diff --git a/meta/packages/qemu/qemu-native_cvs.bb b/meta/packages/qemu/qemu-native_cvs.bb
index 976d2d664f..49d6c17b64 100644
--- a/meta/packages/qemu/qemu-native_cvs.bb
+++ b/meta/packages/qemu/qemu-native_cvs.bb
@@ -1,4 +1,4 @@
-include qemu_cvs.bb
+require qemu_cvs.bb
 inherit native
 prefix = "${STAGING_DIR}/${BUILD_SYS}"
 
diff --git a/meta/packages/readline/readline-native_4.3.bb b/meta/packages/readline/readline-native_4.3.bb
index e9cede7cd1..c3ce970b4c 100644
--- a/meta/packages/readline/readline-native_4.3.bb
+++ b/meta/packages/readline/readline-native_4.3.bb
@@ -1,4 +1,4 @@
-include readline_${PV}.bb
+require readline_${PV}.bb
 inherit native
 DEPENDS = "ncurses-native"
 FILESPATH = "${FILE_DIRNAME}/readline-${PV}:${FILE_DIRNAME}/readline:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
diff --git a/meta/packages/udev/udev_084.bb b/meta/packages/udev/udev_084.bb
index 71c8e048ff..81a14eaf86 100644
--- a/meta/packages/udev/udev_084.bb
+++ b/meta/packages/udev/udev_084.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://mount.blacklist \
 	   file://udev_network_queue.sh"
 	   
-include udev.inc
+require udev.inc
 
 INITSCRIPT_PARAMS = "start 03 S ."
 
diff --git a/meta/packages/udev/udev_089.bb b/meta/packages/udev/udev_089.bb
index 3ab31addee..d081cc8cc2 100644
--- a/meta/packages/udev/udev_089.bb
+++ b/meta/packages/udev/udev_089.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://udevsynthesize.sh \
 	   file://mount.blacklist"
 
-include udev.inc
+require udev.inc
 
 INITSCRIPT_PARAMS = "start 03 S ."
 
diff --git a/meta/packages/udev/udev_092.bb b/meta/packages/udev/udev_092.bb
index 4badbfc075..e5bb53a59d 100644
--- a/meta/packages/udev/udev_092.bb
+++ b/meta/packages/udev/udev_092.bb
@@ -13,7 +13,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://udevsynthesize.sh \
 	   file://mount.blacklist"
 
-include udev.inc
+require udev.inc
 
 INITSCRIPT_PARAMS = "start 03 S ."
 
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb b/meta/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb
index 2e9e1b879f..fe1a30b58b 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb
+++ b/meta/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb
@@ -4,4 +4,4 @@ with the AP and to generate dynamic encryption keys (TKIP or CCMP)."
 
 PR = "r3"
 
-include wpa-supplicant_${PV}.inc
+require wpa-supplicant_${PV}.inc
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb b/meta/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb
index 85cdbb3379..34f370a10e 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb
+++ b/meta/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb
@@ -6,4 +6,4 @@ PR = "r3"
 
 EXTRA_OEMAKE="LIBS='-L${STAGING_LIBDIR} -lssl -lcrypto' LIBS_p='-L${STAGING_LIBDIR} -lssl -lcrypto'"
 
-include wpa-supplicant_${PV}.inc
+require wpa-supplicant_${PV}.inc
diff --git a/meta/packages/xextensions/xextensions-native_1.0.1.bb b/meta/packages/xextensions/xextensions-native_1.0.1.bb
index bbbfd934ce..732ced4584 100644
--- a/meta/packages/xextensions/xextensions-native_1.0.1.bb
+++ b/meta/packages/xextensions/xextensions-native_1.0.1.bb
@@ -1,4 +1,4 @@
 SECTION = "unknown"
-include xextensions_${PV}.bb
+require xextensions_${PV}.bb
 inherit native
 PROVIDES = ""
diff --git a/meta/packages/zaurus-updater/encdec-updater-native.bb b/meta/packages/zaurus-updater/encdec-updater-native.bb
index d6593193f7..3bf49d5010 100644
--- a/meta/packages/zaurus-updater/encdec-updater-native.bb
+++ b/meta/packages/zaurus-updater/encdec-updater-native.bb
@@ -1,4 +1,4 @@
-include encdec-updater.bb
+require encdec-updater.bb
 inherit native
 
 do_stage() {
diff --git a/meta/packages/zip/zip-native_2.31.bb b/meta/packages/zip/zip-native_2.31.bb
index 7cd0261827..fde61efcb7 100644
--- a/meta/packages/zip/zip-native_2.31.bb
+++ b/meta/packages/zip/zip-native_2.31.bb
@@ -1,6 +1,6 @@
 SECTION = "console/utils"
 inherit native
-include zip_${PV}.bb
+require zip_${PV}.bb
 S = "${WORKDIR}/zip-${PV}"
 
 do_stage() {
diff --git a/meta/packages/zlib/zlib-native_1.1.4.bb b/meta/packages/zlib/zlib-native_1.1.4.bb
index 5edd4b0b28..eb551364ac 100644
--- a/meta/packages/zlib/zlib-native_1.1.4.bb
+++ b/meta/packages/zlib/zlib-native_1.1.4.bb
@@ -1,4 +1,4 @@
 SECTION = "libs"
-include zlib_${PV}.bb
+require zlib_${PV}.bb
 inherit native
 DEPENDS = ""
diff --git a/meta/packages/zlib/zlib-native_1.2.2.bb b/meta/packages/zlib/zlib-native_1.2.2.bb
index 5edd4b0b28..eb551364ac 100644
--- a/meta/packages/zlib/zlib-native_1.2.2.bb
+++ b/meta/packages/zlib/zlib-native_1.2.2.bb
@@ -1,4 +1,4 @@
 SECTION = "libs"
-include zlib_${PV}.bb
+require zlib_${PV}.bb
 inherit native
 DEPENDS = ""
diff --git a/meta/packages/zlib/zlib-native_1.2.3.bb b/meta/packages/zlib/zlib-native_1.2.3.bb
index 14e1be63e1..10ac3da045 100644
--- a/meta/packages/zlib/zlib-native_1.2.3.bb
+++ b/meta/packages/zlib/zlib-native_1.2.3.bb
@@ -1,5 +1,5 @@
 SECTION = "libs"
-include zlib_${PV}.bb
+require zlib_${PV}.bb
 inherit native
 DEPENDS = ""
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/zlib-${PV}', '${FILE_DIRNAME}/zlib', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-- 
cgit v1.2.3