8 files changed, 15 insertions, 15 deletions
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 39ab571d1e..2f21b4ee91 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -8,7 +8,7 @@ OVERRIDES =. "${KERNEL}:"
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 5c7440403b..f14b9b24a5 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -35,8 +35,8 @@ USE_VT = "0"
 
 IMAGE_LINGUAS = ""
 
-include conf/machine/include/ipaq-common.conf
-include conf/machine/include/handheld-common.conf
-include conf/machine/include/tune-strongarm.conf
+require conf/machine/include/ipaq-common.conf
+require conf/machine/include/handheld-common.conf
+require conf/machine/include/tune-strongarm.conf
 
 SERIAL_CONSOLE = "115200 ttySA0"
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 485bb88892..849cdf8299 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -30,10 +30,10 @@ SERIAL_CONSOLE = "115200 tts/0 vt100"
 USE_DEVFS_kernel24 = "1"
 USE_VT = "0"
 
-include conf/machine/include/ipaq-common.conf
-include conf/machine/include/handheld-common.conf
+require conf/machine/include/ipaq-common.conf
+require conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "smallscreen"
 
 # not using tune-xscale so as to retain backwards compatibility
-include conf/machine/tune-xscale.conf
+require conf/machine/tune-xscale.conf
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
index 6e9e951132..a7208209eb 100644
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5xxx.conf
@@ -28,4 +28,4 @@ USE_VT = "0"
 
 GUI_MACHINE_CLASS = "smallscreen"
 
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 42eabeb588..18d08ebfcc 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -41,4 +41,4 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
-include conf/machine/include/tune-arm9tdmi.conf
+require conf/machine/include/tune-arm9tdmi.conf
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index d7272c9ec7..58fb5c7166 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -30,10 +30,10 @@ MACHINE_EXTRA__RRECOMMENDS = "  kernel-module-nls_cp437 \
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#include conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.conf
 
 module_autoload_acx = "acx"
 module_autoload_htcuniversal_acx = "htcuniversal_acx"
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index 0a88932e3e..b0c962c1d0 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -33,10 +33,10 @@ SERIAL_CONSOLE = "115200 ttyS0"
 GUI_MACHINE_CLASS = "smallscreen"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#include conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.conf
 
 module_autoload_evdev = "evdev"
 module_autoload_pcmcia = "pcmcia"
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index caaead2d93..fad812759b 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -39,10 +39,10 @@ SERIAL_CONSOLE = "115200 ttyS0"
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#include conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.conf
 
 
 #define which modules to load at boot