6 files changed, 15 insertions, 25 deletions
diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb
index 0cee079550..68cfac7490 100644
--- a/packages/images/bootstrap-image-bootchart.bb
+++ b/packages/images/bootstrap-image-bootchart.bb
@@ -1,20 +1,10 @@
-# 
-# old_revision [bbd3a2811e13a3b99224c1a846af2a244d292c41]
-# 
-# add_file "packages/images/bootstrap-image-bootchart.bb"
-#  content [c85210cae1668b832e717ed0f45cba34e24fd811]
-# 
-============================================================
---- packages/images/bootstrap-image-bootchart.bb	c85210cae1668b832e717ed0f45cba34e24fd811
-+++ packages/images/bootstrap-image-bootchart.bb	c85210cae1668b832e717ed0f45cba34e24fd811
-@@ -0,0 +1,10 @@
-+export IMAGE_BASENAME = "bootstrap-image-bootchart"
-+export IMAGE_LINGUAS = ""
-+export IPKG_INSTALL = "task-bootstrap bootchart acct"
-+
-+DEPENDS = "task-bootstrap bootchart"
-+RDEPENDS = "acct"
-+
-+inherit image_ipk
-+
-+LICENSE = MIT
+export IMAGE_BASENAME = "bootstrap-image-bootchart"
+export IMAGE_LINGUAS = ""
+export IPKG_INSTALL = "task-bootstrap bootchart acct"
+
+DEPENDS = "task-bootstrap bootchart"
+RDEPENDS = "acct"
+
+inherit image_ipk
+
+LICENSE = MIT
diff --git a/packages/images/e-image.bb b/packages/images/e-image.bb
index 99f3858f66..86aff41230 100644
--- a/packages/images/e-image.bb
+++ b/packages/images/e-image.bb
@@ -1,4 +1,4 @@
-include e-image-core.bb
+require e-image-core.bb
 DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
 PR = "r5"
 
diff --git a/packages/images/gpe-image-blank-user.bb b/packages/images/gpe-image-blank-user.bb
index c8e24ae035..60e78ba414 100644
--- a/packages/images/gpe-image-blank-user.bb
+++ b/packages/images/gpe-image-blank-user.bb
@@ -1,4 +1,4 @@
-include gpe-image.bb
+require gpe-image.bb
 
 MAINTAINER = "Rob Taylor <rjt@cambridgebroadband.com"
 
diff --git a/packages/images/nylon-image-extra.bb b/packages/images/nylon-image-extra.bb
index be20ddde78..194783af7e 100644
--- a/packages/images/nylon-image-extra.bb
+++ b/packages/images/nylon-image-extra.bb
@@ -1,4 +1,4 @@
-include nylon-image-standard.bb
+require nylon-image-standard.bb
 
 export IMAGE_BASENAME = "nylon-extra"
  
diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb
index 8d10e9a30f..d7acf29142 100644
--- a/packages/images/nylon-image-standard.bb
+++ b/packages/images/nylon-image-standard.bb
@@ -1,4 +1,4 @@
-include nylon-image-base.bb
+require nylon-image-base.bb
 
 export IMAGE_BASENAME = "nylon-standard"
  
diff --git a/packages/images/opie-kdepim-image.bb b/packages/images/opie-kdepim-image.bb
index 113608736a..7fdc22126b 100644
--- a/packages/images/opie-kdepim-image.bb
+++ b/packages/images/opie-kdepim-image.bb
@@ -1,4 +1,4 @@
-include opie-image.bb
+require opie-image.bb
 
 DEPENDS += "kdepimpi"
 PR = "r1"