diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index f79a02dd00..8bd62b4d13 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -18,6 +18,7 @@
  * Foundation, Inc.
  */
 
+#include <arch/acpi.h>
 #include <chip.h>
 #include <console/console.h>
 #include <device/device.h>
@@ -40,6 +41,7 @@ static struct device_operations pci_domain_ops = {
 
 static struct device_operations cpu_bus_ops = {
 	.init             = &soc_init_cpus,
+	.acpi_fill_ssdt_generator = generate_cpu_entries,
 };
 
 static void soc_enable(device_t dev)
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index 980a05a577..1f26093794 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -23,7 +23,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
-#include <arch/acpi.h>
 #include <chip.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
@@ -503,7 +502,6 @@ static struct mp_flight_record mp_steps[] = {
 
 static struct device_operations cpu_dev_ops = {
 	.init = cpu_core_init,
-	.acpi_fill_ssdt_generator = generate_cpu_entries,
 };
 
 static struct cpu_device_id cpu_table[] = {