diff --git a/src/southbridge/intel/wildcatpoint/Makefile.mk b/src/southbridge/intel/wildcatpoint/Makefile.mk
index ee631d44cd..ec54db4632 100644
--- a/src/southbridge/intel/wildcatpoint/Makefile.mk
+++ b/src/southbridge/intel/wildcatpoint/Makefile.mk
@@ -47,4 +47,6 @@ bootblock-$(CONFIG_SERIALIO_UART_CONSOLE) += ../lynxpoint/uart_init.c
 all-$(CONFIG_SERIALIO_UART_CONSOLE) += ../lynxpoint/uart.c
 smm-$(CONFIG_SERIALIO_UART_CONSOLE) += ../lynxpoint/uart.c
 
+CPPFLAGS_common += -Isrc/southbridge/intel/wildcatpoint/include
+
 endif
diff --git a/src/northbridge/intel/broadwell/include/soc/adsp.h b/src/southbridge/intel/wildcatpoint/include/soc/adsp.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/adsp.h
rename to src/southbridge/intel/wildcatpoint/include/soc/adsp.h
diff --git a/src/northbridge/intel/broadwell/include/soc/cfr.h b/src/southbridge/intel/wildcatpoint/include/soc/cfr.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/cfr.h
rename to src/southbridge/intel/wildcatpoint/include/soc/cfr.h
diff --git a/src/northbridge/intel/broadwell/include/soc/chromeos.h b/src/southbridge/intel/wildcatpoint/include/soc/chromeos.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/chromeos.h
rename to src/southbridge/intel/wildcatpoint/include/soc/chromeos.h
diff --git a/src/northbridge/intel/broadwell/include/soc/ehci.h b/src/southbridge/intel/wildcatpoint/include/soc/ehci.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/ehci.h
rename to src/southbridge/intel/wildcatpoint/include/soc/ehci.h
diff --git a/src/northbridge/intel/broadwell/include/soc/gpio.h b/src/southbridge/intel/wildcatpoint/include/soc/gpio.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/gpio.h
rename to src/southbridge/intel/wildcatpoint/include/soc/gpio.h
diff --git a/src/northbridge/intel/broadwell/include/soc/iomap.h b/src/southbridge/intel/wildcatpoint/include/soc/iomap.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/iomap.h
rename to src/southbridge/intel/wildcatpoint/include/soc/iomap.h
diff --git a/src/northbridge/intel/broadwell/include/soc/lpc.h b/src/southbridge/intel/wildcatpoint/include/soc/lpc.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/lpc.h
rename to src/southbridge/intel/wildcatpoint/include/soc/lpc.h
diff --git a/src/northbridge/intel/broadwell/include/soc/me.h b/src/southbridge/intel/wildcatpoint/include/soc/me.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/me.h
rename to src/southbridge/intel/wildcatpoint/include/soc/me.h
diff --git a/src/northbridge/intel/broadwell/include/soc/nvs.h b/src/southbridge/intel/wildcatpoint/include/soc/nvs.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/nvs.h
rename to src/southbridge/intel/wildcatpoint/include/soc/nvs.h
diff --git a/src/northbridge/intel/broadwell/include/soc/pch.h b/src/southbridge/intel/wildcatpoint/include/soc/pch.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/pch.h
rename to src/southbridge/intel/wildcatpoint/include/soc/pch.h
diff --git a/src/northbridge/intel/broadwell/include/soc/pm.h b/src/southbridge/intel/wildcatpoint/include/soc/pm.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/pm.h
rename to src/southbridge/intel/wildcatpoint/include/soc/pm.h
diff --git a/src/northbridge/intel/broadwell/include/soc/rcba.h b/src/southbridge/intel/wildcatpoint/include/soc/rcba.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/rcba.h
rename to src/southbridge/intel/wildcatpoint/include/soc/rcba.h
diff --git a/src/northbridge/intel/broadwell/include/soc/sata.h b/src/southbridge/intel/wildcatpoint/include/soc/sata.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/sata.h
rename to src/southbridge/intel/wildcatpoint/include/soc/sata.h
diff --git a/src/northbridge/intel/broadwell/include/soc/serialio.h b/src/southbridge/intel/wildcatpoint/include/soc/serialio.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/serialio.h
rename to src/southbridge/intel/wildcatpoint/include/soc/serialio.h
diff --git a/src/northbridge/intel/broadwell/include/soc/spi.h b/src/southbridge/intel/wildcatpoint/include/soc/spi.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/spi.h
rename to src/southbridge/intel/wildcatpoint/include/soc/spi.h
diff --git a/src/northbridge/intel/broadwell/include/soc/xhci.h b/src/southbridge/intel/wildcatpoint/include/soc/xhci.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/xhci.h
rename to src/southbridge/intel/wildcatpoint/include/soc/xhci.h