conf/machine/include: Rename .conf to .inc files

134 files changed, 132 insertions, 134 deletions

diff --git a/conf/machine/acern30.conf b/conf/machine/acern30.conf
index de450b14d1..22718b806e 100644
--- a/conf/machine/acern30.conf
+++ b/conf/machine/acern30.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 # Samsung S3C2xxx CPU
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -35,4 +35,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf
index c17bf7d520..349dd8eddb 100644
--- a/conf/machine/amsdelta.conf
+++ b/conf/machine/amsdelta.conf
@@ -20,7 +20,7 @@ GUI_MACHINE_CLASS="smallscreen"
 
 PREFERRED_VERSION_u-boot = "1.1.4"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 IMAGE_ROOTFS_SIZE_ext2 = "8192"
 IMAGE_ROOTFS_SIZE_ext2.gz = "8192"
diff --git a/conf/machine/asus620.conf b/conf/machine/asus620.conf
index 6c159a5f0c..ef7e8a2a39 100644
--- a/conf/machine/asus620.conf
+++ b/conf/machine/asus620.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/asus730.conf b/conf/machine/asus730.conf
index 7d8d8815f0..814641df8f 100644
--- a/conf/machine/asus730.conf
+++ b/conf/machine/asus730.conf
@@ -9,10 +9,10 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#require conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.inc
 
 ROOT_FLASH_SIZE = "64"
 VOLATILE_STORAGE_SIZE = "64"
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index 4f3ae577a9..bf45d25c43 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -18,6 +18,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
 KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf
index 32d7a2cdca..0dda9492e9 100644
--- a/conf/machine/aximx50.conf
+++ b/conf/machine/aximx50.conf
@@ -9,10 +9,10 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#require conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.inc
 
 ROOT_FLASH_SIZE = "256"
 VOLATILE_STORAGE_SIZE = "64"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 429463cc87..c91bdcfc92 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
+require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
@@ -18,7 +18,7 @@ IMAGE_LINGUAS = ""
 
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc
 
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index c82c2500d1..e6199f7e23 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -9,7 +9,7 @@ GUI_MACHINE_CLASS ?= "bigscreen"
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # used by sysvinit_2 package, so rebuild this
 # package if you change the SERIAL_CONSOLE setting
diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf
index 10b4450384..02e8e457f1 100644
--- a/conf/machine/davinci-dvevm.conf
+++ b/conf/machine/davinci-dvevm.conf
@@ -21,5 +21,5 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
index c7266fee00..db9f26861c 100644
--- a/conf/machine/devkitidp-pxa255.conf
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 PREFERRED_VERSION_u-boot = "1.1.6"
 UBOOT_MACHINE = "pxa255_idp_config"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index 146ecf9495..d490028eca 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -23,5 +23,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 
 #tune for the 405 cpu
-require conf/machine/include/tune-ppc405.conf
+require conf/machine/include/tune-ppc405.inc
 
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index ca1a7be8ff..5a2fb2dacf 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -16,4 +16,4 @@ USE_VT = "0"
 SERIAL_CONSOLE = "115200 ttyPSC0"
 
 #tune for the MPC5200B cpu
-require conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.inc
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 32f59aabd1..16d8c7097c 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -24,7 +24,7 @@ EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
 
 #tune for ep93xx cpus
 #can be used for crunch support later on
-#require conf/machine/include/tune-ep9312.conf
+#require conf/machine/include/tune-ep9312.inc
 
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index ea4b568338..0750e4d646 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -15,6 +15,4 @@ IMAGE_FSTYPES = "ext2.gz"
 MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
 MACHINE_TASK_PROVIDER = "task-base"
 
-
-require conf/machine/include/tune-c3.conf
-
+require conf/machine/include/tune-c3.inc
diff --git a/conf/machine/eteng500.conf b/conf/machine/eteng500.conf
index 7734461a03..91e3dbb5a0 100644
--- a/conf/machine/eteng500.conf
+++ b/conf/machine/eteng500.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 # Samsung S3C2xxx CPU
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -34,4 +34,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index 520f491235..385bc91234 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -40,4 +40,4 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 EXTRA_IMAGEDEPENDS += "dfu-util-native"
 
 # tune for S3C24x0
-include conf/machine/include/tune-arm920t.conf
+include conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index 3b36ffae81..099f16dbae 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -39,4 +39,4 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
 
 # tune for S3C24x0
-include conf/machine/include/tune-arm920t.conf
+include conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/fsg3be.conf b/conf/machine/fsg3be.conf
index a909a0f43c..c6859227cb 100644
--- a/conf/machine/fsg3be.conf
+++ b/conf/machine/fsg3be.conf
@@ -17,7 +17,7 @@ KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "gcc-cross-kernel-3.4.4"
 PREFERRED_VERSION_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "csl-arm-2005q3"
 
-require conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.inc
 
 # No room for jffs2 - the rootfs needs to be installed directly to disk
 IMAGE_FSTYPES = "tar.gz"
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index c35d3b381e..626e755b1f 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -19,5 +19,5 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen"
 
-#require conf/machine/include/tune-athlonmp.conf
+#require conf/machine/include/tune-athlonmp.inc
 
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 131b6512e0..2dac4b48af 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 VOLATILE_STORAGE_SIZE = "64"
 ROOT_FLASH_SIZE = "16"
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index bc30eb780b..409eacaed5 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -23,5 +23,5 @@ SERIAL_CONSOLE = "115200 ttySAC2 vt100"
 USE_VT = "0"
 
 # tune for armv4t
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index ecaebb8535..60a732ffa6 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
 #Compile with armv5te optimizations, incompatible with armv4(t) cpus
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 #Set some hints for metadata  
 VOLATILE_STORAGE_SIZE = "64"
@@ -37,4 +37,4 @@ module_autoload_snd-pcm-oss 	= "snd-pcm-oss"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index fe204f0be4..9cf8272b51 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc
 
 # h3700, h3800 have 32, but let that be the bonus
 ROOT_FLASH_SIZE = "16"
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 8612be2ddc..f475e20c46 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index c28e651b47..f56bee00e8 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -43,4 +43,4 @@ module_conf_acx = "blacklist acx"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index 87cc4c6210..6ed836c1de 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te  h5xxx"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index a44d2d328f..711ffd314c 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -10,7 +10,7 @@ PACKAGE_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
-require conf/machine/include/tune-arm9tdmi.conf
+require conf/machine/include/tune-arm9tdmi.inc
 
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf
index 7cd36f16ae..63ab097a89 100644
--- a/conf/machine/htcalpine.conf
+++ b/conf/machine/htcalpine.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf
index b46ac688cc..1b44742874 100644
--- a/conf/machine/htcapache.conf
+++ b/conf/machine/htcapache.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index 5150b86b77..6aa1885293 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "128"
@@ -56,4 +56,4 @@ module_conf_acx = "blacklist acx"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf
index 1edd224496..8430cb57d4 100644
--- a/conf/machine/htchimalaya.conf
+++ b/conf/machine/htchimalaya.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf
index 5fb2bb4cd4..f9326475e6 100644
--- a/conf/machine/htcsable.conf
+++ b/conf/machine/htcsable.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf
index ca77ec9c04..af91bcbb9f 100644
--- a/conf/machine/htctornado.conf
+++ b/conf/machine/htctornado.conf
@@ -25,4 +25,4 @@ ROOT_FLASH_SIZE = "30"
 EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
 
 # cpu tuning
-include conf/machine/include/tune-arm926ejs.conf
+include conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index a33510290f..634b388f96 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -9,10 +9,10 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = " armv4t armv5te iwmmxt"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#require conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.inc
 
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf
index f7b0a89ee1..38b0c011be 100644
--- a/conf/machine/htcwallaby.conf
+++ b/conf/machine/htcwallaby.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc
 
 ROOT_FLASH_SIZE = "16" 
 VOLATILE_STORAGE_SIZE = "32"
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index 279b273a70..8c9d2d0146 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -30,10 +30,10 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#require conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.inc
 
 module_autoload_evdev = "evdev"
 module_autoload_pcmcia = "pcmcia"
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index d7f852079a..141470b5a4 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -9,10 +9,10 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#require conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.inc
 
 ROOT_FLASH_SIZE = "80"
 VOLATILE_STORAGE_SIZE = "64"
diff --git a/conf/machine/include/LAB-settings.conf b/conf/machine/include/LAB-settings.inc
index d0100c9968..d0100c9968 100644
--- a/conf/machine/include/LAB-settings.conf
+++ b/conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.inc
index eed8de9ab9..eed8de9ab9 100644
--- a/conf/machine/include/collie-2.4.conf
+++ b/conf/machine/include/collie-2.4.inc
diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.inc
index f22ffce6c2..f22ffce6c2 100644
--- a/conf/machine/include/collie-2.6.conf
+++ b/conf/machine/include/collie-2.6.inc
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 67fefd3835..afcec66c51 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -37,5 +37,5 @@ SERIAL_CONSOLE = "115200 ttyS0 vt100"
 #don't try to access tty1
 USE_VT = "0"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.inc
index 6f0d5b20eb..175ec80e6a 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.inc
@@ -10,8 +10,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
 
-require conf/machine/include/tune-xscale.conf
-require conf/machine/include/tune-thumb.conf
+require conf/machine/include/tune-xscale.inc
+require conf/machine/include/tune-thumb.inc
 
 #-------------------------------------------------------------------------------
 # Board defaults
diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.inc
index 064db79b29..632a9ed4cc 100644
--- a/conf/machine/include/lsppc.conf
+++ b/conf/machine/include/lsppc.inc
@@ -23,4 +23,4 @@ IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 IMAGE_FSTYPES = "tar.gz"
 
 #tune for the MPC5200B cpu
-require conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.inc
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index c1eac82e3b..82512c82ef 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -28,6 +28,6 @@ IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
                        files/device_table-ezx.txt"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/include/motorola-ezx.conf b/conf/machine/include/motorola-ezx.inc
index e87f6aa70f..e87f6aa70f 100644
--- a/conf/machine/include/motorola-ezx.conf
+++ b/conf/machine/include/motorola-ezx.inc
diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.inc
index 5371016ea9..5eb7806f6f 100644
--- a/conf/machine/include/palm.conf
+++ b/conf/machine/include/palm.inc
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2"
 
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.inc
index fa24a3281b..fa24a3281b 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.inc
diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.inc
index 26b78a6a9d..26b78a6a9d 100644
--- a/conf/machine/include/qemu.conf
+++ b/conf/machine/include/qemu.inc
diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.inc
index 06f12f532f..06f12f532f 100644
--- a/conf/machine/include/simpad-2.4.conf
+++ b/conf/machine/include/simpad-2.4.inc
diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.inc
index e485c7bf2a..e485c7bf2a 100644
--- a/conf/machine/include/simpad-2.6.conf
+++ b/conf/machine/include/simpad-2.6.inc
diff --git a/conf/machine/include/tune-arm1136jf-s.conf b/conf/machine/include/tune-arm1136jf-s.inc
index a69df825c0..a69df825c0 100644
--- a/conf/machine/include/tune-arm1136jf-s.conf
+++ b/conf/machine/include/tune-arm1136jf-s.inc
diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.inc
index b142d3325a..b142d3325a 100644
--- a/conf/machine/include/tune-arm920t.conf
+++ b/conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.inc
index c3e8d7aefc..c3e8d7aefc 100644
--- a/conf/machine/include/tune-arm926ejs.conf
+++ b/conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/include/tune-arm9tdmi.conf b/conf/machine/include/tune-arm9tdmi.inc
index d097b07739..d097b07739 100644
--- a/conf/machine/include/tune-arm9tdmi.conf
+++ b/conf/machine/include/tune-arm9tdmi.inc
diff --git a/conf/machine/include/tune-athlonmp.conf b/conf/machine/include/tune-athlonmp.inc
index b2d0e703db..b2d0e703db 100644
--- a/conf/machine/include/tune-athlonmp.conf
+++ b/conf/machine/include/tune-athlonmp.inc
diff --git a/conf/machine/include/tune-c3.conf b/conf/machine/include/tune-c3.inc
index e6a522af10..e6a522af10 100644
--- a/conf/machine/include/tune-c3.conf
+++ b/conf/machine/include/tune-c3.inc
diff --git a/conf/machine/include/tune-ep9312.conf b/conf/machine/include/tune-ep9312.inc
index 0982cf2a13..0982cf2a13 100644
--- a/conf/machine/include/tune-ep9312.conf
+++ b/conf/machine/include/tune-ep9312.inc
diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.inc
index 8376faca74..8376faca74 100644
--- a/conf/machine/include/tune-iwmmxt.conf
+++ b/conf/machine/include/tune-iwmmxt.inc
diff --git a/conf/machine/include/tune-ppc405.conf b/conf/machine/include/tune-ppc405.inc
index cf8f58c115..cf8f58c115 100644
--- a/conf/machine/include/tune-ppc405.conf
+++ b/conf/machine/include/tune-ppc405.inc
diff --git a/conf/machine/include/tune-ppc440.conf b/conf/machine/include/tune-ppc440.inc
index dff8dce684..dff8dce684 100644
--- a/conf/machine/include/tune-ppc440.conf
+++ b/conf/machine/include/tune-ppc440.inc
diff --git a/conf/machine/include/tune-ppc440e.conf b/conf/machine/include/tune-ppc440e.inc
index 5c47482a54..5c47482a54 100644
--- a/conf/machine/include/tune-ppc440e.conf
+++ b/conf/machine/include/tune-ppc440e.inc
diff --git a/conf/machine/include/tune-ppc603e.conf b/conf/machine/include/tune-ppc603e.inc
index 1a004d30b5..1a004d30b5 100644
--- a/conf/machine/include/tune-ppc603e.conf
+++ b/conf/machine/include/tune-ppc603e.inc
diff --git a/conf/machine/include/tune-ppce500.conf b/conf/machine/include/tune-ppce500.inc
index 11717eba70..11717eba70 100644
--- a/conf/machine/include/tune-ppce500.conf
+++ b/conf/machine/include/tune-ppce500.inc
diff --git a/conf/machine/include/tune-sh3.conf b/conf/machine/include/tune-sh3.inc
index 192dd8fd22..192dd8fd22 100644
--- a/conf/machine/include/tune-sh3.conf
+++ b/conf/machine/include/tune-sh3.inc
diff --git a/conf/machine/include/tune-sh4.conf b/conf/machine/include/tune-sh4.inc
index 866f7f89d5..866f7f89d5 100644
--- a/conf/machine/include/tune-sh4.conf
+++ b/conf/machine/include/tune-sh4.inc
diff --git a/conf/machine/include/tune-strongarm.conf b/conf/machine/include/tune-strongarm.inc
index 8654c996ef..8654c996ef 100644
--- a/conf/machine/include/tune-strongarm.conf
+++ b/conf/machine/include/tune-strongarm.inc
diff --git a/conf/machine/include/tune-supersparc.conf b/conf/machine/include/tune-supersparc.inc
index 1b1ec1207f..1b1ec1207f 100644
--- a/conf/machine/include/tune-supersparc.conf
+++ b/conf/machine/include/tune-supersparc.inc
diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.inc
index a25cb5320c..a25cb5320c 100644
--- a/conf/machine/include/tune-thumb.conf
+++ b/conf/machine/include/tune-thumb.inc
diff --git a/conf/machine/include/tune-x86-nocona.conf b/conf/machine/include/tune-x86-nocona.inc
index f1189a171e..f1189a171e 100644
--- a/conf/machine/include/tune-x86-nocona.conf
+++ b/conf/machine/include/tune-x86-nocona.inc
diff --git a/conf/machine/include/tune-x86-prescott.conf b/conf/machine/include/tune-x86-prescott.inc
index f3ec4e956a..f3ec4e956a 100644
--- a/conf/machine/include/tune-x86-prescott.conf
+++ b/conf/machine/include/tune-x86-prescott.inc
diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.inc
index f14aee9aed..f14aee9aed 100644
--- a/conf/machine/include/tune-xscale.conf
+++ b/conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 456555e51e..53f47d6221 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -18,7 +18,7 @@ EXTRA_IMAGEDEPENDS += "zaurus-updater"
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
+include conf/machine/include/tune-xscale.inc
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf
index f208852d3a..756024a3a7 100644
--- a/conf/machine/ixp4xxbe.conf
+++ b/conf/machine/ixp4xxbe.conf
@@ -6,6 +6,6 @@ TARGET_ARCH = "armeb"
 
 PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb"
 
-require conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += "--big-endian"
diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf
index d39fa1f603..622db3ec27 100644
--- a/conf/machine/ixp4xxle.conf
+++ b/conf/machine/ixp4xxle.conf
@@ -6,6 +6,6 @@ TARGET_ARCH = "arm"
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
-require conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += " --little-endian"
diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index 385af0864a..72fff1ed5e 100644
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index 40d3848df7..a322f1a60c 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "sh3"
 
-require conf/machine/include/tune-sh3.conf
+require conf/machine/include/tune-sh3.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
 PCMCIA_MANAGER = "pcmciautils"
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index f08fb6f253..461d0c8326 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "arm"
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
diff --git a/conf/machine/kb9202.conf b/conf/machine/kb9202.conf
index 6501896780..5b88f457fa 100644
--- a/conf/machine/kb9202.conf
+++ b/conf/machine/kb9202.conf
@@ -7,7 +7,7 @@ TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 # used by sysvinit_2
 # Needs at91 serial port
diff --git a/conf/machine/ks8695.conf b/conf/machine/ks8695.conf
index 5d214f7cfb..0b0d31742f 100644
--- a/conf/machine/ks8695.conf
+++ b/conf/machine/ks8695.conf
@@ -8,7 +8,7 @@ TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf
index 26d2d655ce..b67d3dc500 100644
--- a/conf/machine/lite5200.conf
+++ b/conf/machine/lite5200.conf
@@ -5,4 +5,4 @@ SERIAL_CONSOLE="38400 ttyS0"
 
 IMAGE_FSTYPES = "jffs2 tar.bz2"
 
-require conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.inc
diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
index 2038aa483f..a046c5d00c 100644
--- a/conf/machine/logicpd-pxa270.conf
+++ b/conf/machine/logicpd-pxa270.conf
@@ -9,7 +9,7 @@ GUI_MACHINE_CLASS = "smallscreen"
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf
index c191349498..f4fd23eec9 100644
--- a/conf/machine/looxc550.conf
+++ b/conf/machine/looxc550.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf
index 15477f59c6..2df6ce0802 100644
--- a/conf/machine/lsarm.conf
+++ b/conf/machine/lsarm.conf
@@ -14,7 +14,7 @@ PREFERRED_PROVIDER_virtual/bootloader = ""
 
 USE_DEVFS = "0"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
 IMAGE_FSTYPES = "tar.gz"
 
diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
index ac22703de9..9841678887 100644
--- a/conf/machine/lsppchd.conf
+++ b/conf/machine/lsppchd.conf
@@ -3,6 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
 UBOOT_MACHINE = "linkstation_HDLAN"
 IMAGE_FSTYPES = "tar.gz"
-require conf/machine/include/lsppc.conf
+require conf/machine/include/lsppc.inc
 
 INHERIT += "lsppchd-image"
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
index 9f03febba6..1472155a22 100644
--- a/conf/machine/lsppchg.conf
+++ b/conf/machine/lsppchg.conf
@@ -3,6 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
 UBOOT_MACHINE = "linkstation_HGLAN"
 IMAGE_FSTYPES = "tar.gz"
-require conf/machine/include/lsppc.conf
+require conf/machine/include/lsppc.inc
 
 INHERIT += "lsppchg-image"
diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf
index 756e064c6a..178c242056 100644
--- a/conf/machine/magicbox.conf
+++ b/conf/machine/magicbox.conf
@@ -27,5 +27,5 @@ EXTRA_IMAGECMD_squashfs-lzma = " -be -all-root -nopad -noappend -root-owned"
 
 
 #tune for the 405 cpu
-require conf/machine/include/tune-ppc405.conf
+require conf/machine/include/tune-ppc405.inc
 
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index fab936707b..60cc9af3d1 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -9,10 +9,10 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#require conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.inc
 
 ROOT_FLASH_SIZE = "80"
 VOLATILE_STORAGE_SIZE = "64"
diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf
index 291c68ebd2..a6681a9030 100644
--- a/conf/machine/mainstone.conf
+++ b/conf/machine/mainstone.conf
@@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf
index 020c5075a3..ac7a6c19f3 100644
--- a/conf/machine/mtx-3.conf
+++ b/conf/machine/mtx-3.conf
@@ -9,7 +9,7 @@
 # For compiling the kernel, ARCH will be derived form it by kernel-arch.bbclass 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3"
diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf
index 160b9fd207..0a092563fe 100644
--- a/conf/machine/mx21ads.conf
+++ b/conf/machine/mx21ads.conf
@@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttymxc0"
diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf
index 55a29186e3..e600af8bf2 100644
--- a/conf/machine/mx31ads.conf
+++ b/conf/machine/mx31ads.conf
@@ -12,7 +12,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
-require conf/machine/include/tune-arm1136jf-s.conf
+require conf/machine/include/tune-arm1136jf-s.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttymxc0"
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index f275d617de..89f79fa185 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -24,4 +24,4 @@ EXTRA_IMAGECMD = "--little-endian"
 EXTRA_IMAGEDEPENDS = "openssl-native"
 IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/navman-icn330.conf b/conf/machine/navman-icn330.conf
index 5f035c33fa..b265503ff5 100644
--- a/conf/machine/navman-icn330.conf
+++ b/conf/machine/navman-icn330.conf
@@ -11,7 +11,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
 #Compile with armv5te optimizations, incompatible with armv4(t) cpus
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 #Set some hints for metadata  
 VOLATILE_STORAGE_SIZE = "32"
diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf
index 3baf1c2878..1c9fc7af9d 100755
--- a/conf/machine/netbook-pro.conf
+++ b/conf/machine/netbook-pro.conf
@@ -31,4 +31,4 @@ GUI_MACHINE_CLASS = "bigscreen"
 #The initrd needs /initrd present to be able to do pivot_root 
 ROOTFS_POSTPROCESS_COMMAND += " mkdir -p ${IMAGE_ROOTFS}/initrd; "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 1affae1389..2727fd44d3 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -14,7 +14,7 @@ XSERVER = "xserver-kdrive-omap"
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
 #size of the root partition (yes, it is 123 MB)
 ROOT_FLASH_SIZE = "123"
diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf
index e31438819e..703fc1984d 100644
--- a/conf/machine/nokia800.conf
+++ b/conf/machine/nokia800.conf
@@ -10,7 +10,7 @@ XSERVER = "xserver-kdrive-xomap"
 GUI_MACHINE_CLASS = "bigscreen"
 
 TARGET_FPU = "hard"
-include conf/machine/include/tune-arm1136jf-s.conf
+include conf/machine/include/tune-arm1136jf-s.inc
 
 ROOT_FLASH_SIZE = "174"
 EXTRA_IMAGECMD_jffs2_nokia800 = "--pad --little-endian --eraseblock=0x20000 -n"
diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 104bbdb397..3162eb3342 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -12,7 +12,7 @@ OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}
 
 ROOT_FLASH_SIZE ?= "6"
 
-require conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += "--big-endian"
 
diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index 86c4ce7a31..1aced19de2 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -12,7 +12,7 @@ OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}
 
 ROOT_FLASH_SIZE ?= "6"
 
-require conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += "--little-endian"
 
diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf
index 0b26436bf5..3dc19a4a31 100644
--- a/conf/machine/omap1510inn.conf
+++ b/conf/machine/omap1510inn.conf
@@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
index 0b26436bf5..3dc19a4a31 100644
--- a/conf/machine/omap1610h2.conf
+++ b/conf/machine/omap1610h2.conf
@@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf
index 73dced352e..9a97150981 100644
--- a/conf/machine/omap1710h3.conf
+++ b/conf/machine/omap1710h3.conf
@@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf
index fb9f4669da..82be4e3f79 100644
--- a/conf/machine/omap2420h4.conf
+++ b/conf/machine/omap2420h4.conf
@@ -13,4 +13,4 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 MACHINE_FEATURES = "kernel26"
 
-require conf/machine/include/tune-arm1136jf-s.conf
+require conf/machine/include/tune-arm1136jf-s.inc
diff --git a/conf/machine/omap2430sdp.conf b/conf/machine/omap2430sdp.conf
index f13fa7def2..39e6896b3b 100644
--- a/conf/machine/omap2430sdp.conf
+++ b/conf/machine/omap2430sdp.conf
@@ -13,4 +13,4 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 MACHINE_FEATURES = "kernel26"
 
-require conf/machine/include/tune-arm1136jf-s.conf
+require conf/machine/include/tune-arm1136jf-s.inc
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index 091d511118..7418054f49 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -25,5 +25,5 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \
                           kernel-module-nls-base \
                           kernel-module-vfat"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index 3d1d90fbd8..2f92eb4158 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm LifeDrive
 #@DESCRIPTION: Machine configuration for the Palm LifeDrive
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 
diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf
index 4d1032dae8..272c0dca1c 100644
--- a/conf/machine/palmt650.conf
+++ b/conf/machine/palmt650.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Treo 650
 #@DESCRIPTION: Machine configuration for the Palm Treo 650
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 
diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf
index 1852455e2b..b984667e8a 100644
--- a/conf/machine/palmt680.conf
+++ b/conf/machine/palmt680.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Treo 680
 #@DESCRIPTION: Machine configuration for the Palm Treo 680
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 
diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf
index 24d13c1381..28db830d0a 100644
--- a/conf/machine/palmtc.conf
+++ b/conf/machine/palmtc.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm TC
 #@DESCRIPTION: Machine configuration for the Palm Tungsten C
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 MACHINE_FEATURES += "wifi"
 
diff --git a/conf/machine/palmtt.conf b/conf/machine/palmtt.conf
index 1f6d5c377d..ab78e881b8 100644
--- a/conf/machine/palmtt.conf
+++ b/conf/machine/palmtt.conf
@@ -15,4 +15,4 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-palm-omap1"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/palmtt3.conf b/conf/machine/palmtt3.conf
index b4d65284ae..3834feb2c5 100644
--- a/conf/machine/palmtt3.conf
+++ b/conf/machine/palmtt3.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Tungsten|T3
 #@DESCRIPTION: Machine configuration for the Palm Tungsten|T3
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 
diff --git a/conf/machine/palmtt5.conf b/conf/machine/palmtt5.conf
index d2de3fa87b..997c1572e0 100644
--- a/conf/machine/palmtt5.conf
+++ b/conf/machine/palmtt5.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Tungsten T5
 #@DESCRIPTION: Machine configuration for the Palm Tungsten T5
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 
diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf
index e0db5f246b..e1991c8b32 100644
--- a/conf/machine/palmtx.conf
+++ b/conf/machine/palmtx.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm TX
 #@DESCRIPTION: Machine configuration for the Palm TX
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "320"
diff --git a/conf/machine/palmz31.conf b/conf/machine/palmz31.conf
index da074a80bf..0332952edc 100644
--- a/conf/machine/palmz31.conf
+++ b/conf/machine/palmz31.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Zire 31
 #@DESCRIPTION: Machine configuration for the Palm Zire 31
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "16"
 MACHINE_GUI_CLASS = "smallscreen"
@@ -12,7 +12,7 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "160"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-thumb.conf
+require conf/machine/include/tune-thumb.inc
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \
 			     kernel-module-i2c-algo-pxa \
diff --git a/conf/machine/palmz71.conf b/conf/machine/palmz71.conf
index 4be181e961..7837c5d564 100644
--- a/conf/machine/palmz71.conf
+++ b/conf/machine/palmz71.conf
@@ -12,4 +12,4 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf
index a654877d36..502c11a284 100644
--- a/conf/machine/palmz72.conf
+++ b/conf/machine/palmz72.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Zire 72
 #@DESCRIPTION: Machine configuration for the Palm Zire 72
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 MACHINE_GUI_CLASS = "bigscreen"
@@ -12,7 +12,7 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-thumb.conf
+require conf/machine/include/tune-thumb.inc
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \
 			     kernel-module-i2c-algo-pxa \
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 0e8a081df5..9ef4f8e113 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -5,8 +5,8 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
-require conf/machine/include/qemu.conf
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/qemu.inc
+require conf/machine/include/tune-arm926ejs.inc
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
index 60aa12ad7f..db0eb1a966 100644
--- a/conf/machine/qemux86.conf
+++ b/conf/machine/qemux86.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "i586"
 PACKAGE_EXTRA_ARCHS = "x86"
 
-require conf/machine/include/qemu.conf
+require conf/machine/include/qemu.inc
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf
index d49679e820..ba2c956d87 100644
--- a/conf/machine/rx1950.conf
+++ b/conf/machine/rx1950.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 # Samsung S3C2xxx CPU
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -34,4 +34,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf
index f0bd1fefd2..4b3acc0a85 100644
--- a/conf/machine/rx3000.conf
+++ b/conf/machine/rx3000.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 # Samsung S3C2xxx CPU
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -38,4 +38,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/sarge-at91.conf b/conf/machine/sarge-at91.conf
index f1a8b7f271..60026a39b5 100644
--- a/conf/machine/sarge-at91.conf
+++ b/conf/machine/sarge-at91.conf
@@ -14,7 +14,7 @@ IMAGE_FSTYPES = "tar.gz"
 
 MACHINE_FEATURES = "kernel26"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf
index a6f31ab84a..72f0a8feb2 100644
--- a/conf/machine/sequoia.conf
+++ b/conf/machine/sequoia.conf
@@ -25,4 +25,4 @@ ERASEBLOCK_SIZE = "0x10000"
 IMAGE_FSTYPES = "jffs2"
 
 #tune for the AMCC440 cpu
-require conf/machine/include/tune-ppc440e.conf
+require conf/machine/include/tune-ppc440e.inc
diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf
index 61bec7f6f2..d7d35cfda1 100644
--- a/conf/machine/shark.conf
+++ b/conf/machine/shark.conf
@@ -15,7 +15,7 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100"
 ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
 MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 8e2cc276d8..3b527293df 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -8,8 +8,8 @@ TARGET_ARCH = "arm"
 
 MACHINE_FEATURES = " apm pcmcia irda screen touchscreen "
 
-include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf
-require conf/machine/include/tune-strongarm.conf
+include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
+require conf/machine/include/tune-strongarm.inc
 
 
 ROOT_FLASH_SIZE = "16"
diff --git a/conf/machine/smdk2440.conf b/conf/machine/smdk2440.conf
index 903685e8dd..b11ca6e972 100644
--- a/conf/machine/smdk2440.conf
+++ b/conf/machine/smdk2440.conf
@@ -15,4 +15,4 @@ IMAGE_FSTYPES = "tar.gz"
 
 MACHINE_FEATURES = "kernel26 apm screen"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/smdk2443.conf b/conf/machine/smdk2443.conf
index 199adb515f..d3fccf1352 100644
--- a/conf/machine/smdk2443.conf
+++ b/conf/machine/smdk2443.conf
@@ -16,4 +16,4 @@ IMAGE_FSTYPES = "tar.gz"
 
 MACHINE_FEATURES = "kernel26 apm screen"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf
index 0898da1520..519c565061 100644
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -20,4 +20,4 @@ EXTRA_IMAGECMD = "--big-endian"
 ERASEBLOCK_SIZE = "0x10000"
 IMAGE_FSTYPES = "jffs2"
 
-require conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.inc
diff --git a/conf/machine/titan.conf b/conf/machine/titan.conf
index bbf1e23b15..9fba78a651 100644
--- a/conf/machine/titan.conf
+++ b/conf/machine/titan.conf
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-titan-sh4"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 # SH4 specific settings
-require conf/machine/include/tune-sh4.conf
+require conf/machine/include/tune-sh4.inc
 
 # Serial console settings for sysvinit
 SERIAL_CONSOLE = "38400 ttySC1"
diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf
index ab98a07278..2dbe3ea863 100644
--- a/conf/machine/triton.conf
+++ b/conf/machine/triton.conf
@@ -14,5 +14,5 @@ SERIAL_CONSOLE = "38400 ttyS0"
 KERNEL_CONSOLE = "ttys0,38400"
 USE_VT = "0"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index 33e0427a8e..5c86a5fa2b 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -25,4 +25,4 @@ IMAGE_FSTYPES = "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--big-endian --eraseblock=0x20000"
 IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 
-require conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.inc
diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf
index ebb7a14b06..ad5badf84a 100644
--- a/conf/machine/x86-32-nocona.conf
+++ b/conf/machine/x86-32-nocona.conf
@@ -7,7 +7,7 @@ TARGET_ARCH = "i686"
 MACHINE_ARCH = "x86-32-nocona"
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686"
 
-require conf/machine/include/tune-x86-nocona.conf
+require conf/machine/include/tune-x86-nocona.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 OLDEST_KERNEL = "2.6.20"
diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf
index 2b0ef0e922..b4021a6496 100644
--- a/conf/machine/x86-prescott.conf
+++ b/conf/machine/x86-prescott.conf
@@ -6,7 +6,7 @@ TARGET_ARCH = "i686"
 MACHINE_ARCH = "x86-prescott"
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686"
 
-require conf/machine/include/tune-x86-prescott.conf
+require conf/machine/include/tune-x86-prescott.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 OLDEST_KERNEL = "2.6.20"
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index af0cf8996b..51757e950c 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -20,4 +20,4 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-#require conf/machine/include/tune-x86.conf
+#require conf/machine/include/tune-x86.inc
diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf
index 1ab8721508..9b51b87a7f 100644
--- a/conf/machine/xilinx-ml403.conf
+++ b/conf/machine/xilinx-ml403.conf
@@ -17,5 +17,5 @@ TARGET_CPU = "405"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 #tune for the 405 cpu
-require conf/machine/include/tune-ppc405.conf
+require conf/machine/include/tune-ppc405.inc
 
diff --git a/conf/machine/xilinx-ml410.conf b/conf/machine/xilinx-ml410.conf
index 9adb26e43e..ea61b7a7fd 100644
--- a/conf/machine/xilinx-ml410.conf
+++ b/conf/machine/xilinx-ml410.conf
@@ -18,5 +18,5 @@ OLDEST_KERNEL = "2.6.12"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 #tune for the 405 cpu
-require conf/machine/include/tune-ppc405.conf
+require conf/machine/include/tune-ppc405.inc