diff --git a/conf/distro/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc
similarity index 100%
rename from conf/distro/include/rpi-default-providers.inc
rename to conf/machine/include/rpi-default-providers.inc
diff --git a/conf/distro/include/rpi-default-settings.inc b/conf/machine/include/rpi-default-settings.inc
similarity index 100%
rename from conf/distro/include/rpi-default-settings.inc
rename to conf/machine/include/rpi-default-settings.inc
diff --git a/conf/distro/include/rpi-default-versions.inc b/conf/machine/include/rpi-default-versions.inc
similarity index 100%
rename from conf/distro/include/rpi-default-versions.inc
rename to conf/machine/include/rpi-default-versions.inc
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index cd2d3fd..775c8c1 100644
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -3,9 +3,9 @@
 #@DESCRIPTION: Machine configuration for the RaspberryPi http://www.raspberrypi.org/ Board
 #@MAINTAINER: John Willis
 
-include conf/distro/include/rpi-default-settings.inc
-include conf/distro/include/rpi-default-versions.inc
-include conf/distro/include/rpi-default-providers.inc
+include conf/machine/include/rpi-default-settings.inc
+include conf/machine/include/rpi-default-versions.inc
+include conf/machine/include/rpi-default-providers.inc
 require conf/machine/include/tune-arm1176jzf-s.inc
 
 IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg"