diff --git a/conf/machine/include/ia32-base.inc b/conf/machine/include/ia32-base.inc
index f8b7b94c..af583ae1 100644
--- a/conf/machine/include/ia32-base.inc
+++ b/conf/machine/include/ia32-base.inc
@@ -55,11 +55,4 @@ XSERVER_IA32_I965 = "xf86-video-intel \
            mesa-dri-driver-i965 \
            "
 
-XSERVER_IA32_EMGD = "emgd-driver-bin \
-           "
-
 XSERVER_IA32_VESA = "xf86-video-vesa"
-
-XSERVER_IA32_MATROX_MGA = "xserver-xorg-module-xaa \
-           xf86-video-mga \
-           "
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
new file mode 100644
index 00000000..f0e538d4
--- /dev/null
+++ b/conf/machine/include/meta-intel.inc
@@ -0,0 +1,16 @@
+#
+# BSP variables and settings specific to the meta-intel layer.
+# You must include the meta-intel layer in your bblayers.conf
+# to use them.
+#
+
+#
+# XSERVER subcomponents, used to build the XSERVER variable
+#
+XSERVER_IA32_EMGD = "emgd-driver-bin \
+           "
+
+XSERVER_IA32_MATROX_MGA = "xserver-xorg-module-xaa \
+           xf86-video-mga \
+           "
+