diff --git a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
index 694b93de..e00ff9f1 100644
--- a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
+++ b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
@@ -11,12 +11,11 @@
 PREFERRED_VERSION_linux-yocto ?= "3.10%"
 MACHINE_FEATURES += "pcbios efi va-impl-intel"
 
-require conf/machine/include/tune-x86_64.inc
-require conf/machine/include/ia32-base.inc
+require conf/machine/include/intel-corei7-64-common.inc
 
 MACHINE_HWCODECS ?= "va-intel gst-va-intel"
 
-XSERVER ?= "${XSERVER_IA32_BASE} \
-	    ${XSERVER_IA32_EXT} \
-	    ${XSERVER_IA32_I965} \
+XSERVER ?= "${XSERVER_X86_BASE} \
+	    ${XSERVER_X86_EXT} \
+	    ${XSERVER_X86_I965} \
 	   "