diff --git a/src/northbridge/intel/sandybridge/chip.h b/src/northbridge/intel/sandybridge/chip.h
index 8f388ec..98baaa2 100644
--- a/src/northbridge/intel/sandybridge/chip.h
+++ b/src/northbridge/intel/sandybridge/chip.h
@@ -4,6 +4,8 @@
 #define NORTHBRIDGE_INTEL_SANDYBRIDGE_CHIP_H
 
 #include <drivers/intel/gma/i915.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 /*
  * Digital Port Hotplug Enable:
diff --git a/src/northbridge/intel/sandybridge/common.c b/src/northbridge/intel/sandybridge/common.c
index b27911d..5cd49cc 100644
--- a/src/northbridge/intel/sandybridge/common.c
+++ b/src/northbridge/intel/sandybridge/common.c
@@ -2,6 +2,7 @@
 
 #include <console/console.h>
 #include <device/device.h>
+#include <cpu/intel/model_206ax/model_206ax.h>
 #include "sandybridge.h"
 
 enum platform_type get_platform_type(void)
diff --git a/src/northbridge/intel/sandybridge/gma.h b/src/northbridge/intel/sandybridge/gma.h
index c15ad53..bbff461 100644
--- a/src/northbridge/intel/sandybridge/gma.h
+++ b/src/northbridge/intel/sandybridge/gma.h
@@ -3,6 +3,8 @@
 #ifndef NORTHBRIDGE_INTEL_SANDYBRIDGE_GMA_H
 #define NORTHBRIDGE_INTEL_SANDYBRIDGE_GMA_H
 
+#include <stdint.h>
+
 struct i915_gpu_controller_info;
 
 int i915lightup_sandy(const struct i915_gpu_controller_info *info, u32 physbase, u16 pio,
diff --git a/src/northbridge/intel/sandybridge/memmap.c b/src/northbridge/intel/sandybridge/memmap.c
index 8da4ec9..b0a5149 100644
--- a/src/northbridge/intel/sandybridge/memmap.c
+++ b/src/northbridge/intel/sandybridge/memmap.c
@@ -10,6 +10,8 @@
 #include <cpu/x86/smm.h>
 #include <program_loading.h>
 #include "sandybridge.h"
+#include <stddef.h>
+#include <stdint.h>
 
 static uintptr_t smm_region_start(void)
 {
diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c
index 371527e..6588db5 100644
--- a/src/northbridge/intel/sandybridge/raminit_common.c
+++ b/src/northbridge/intel/sandybridge/raminit_common.c
@@ -9,6 +9,7 @@
 #include <northbridge/intel/sandybridge/chip.h>
 #include <device/pci_def.h>
 #include <delay.h>
+#include <types.h>
 
 #include "raminit_native.h"
 #include "raminit_common.h"
diff --git a/src/northbridge/intel/sandybridge/raminit_mrc.c b/src/northbridge/intel/sandybridge/raminit_mrc.c
index cea32af..b6b3989 100644
--- a/src/northbridge/intel/sandybridge/raminit_mrc.c
+++ b/src/northbridge/intel/sandybridge/raminit_mrc.c
@@ -14,6 +14,8 @@
 #include <device/pci_def.h>
 #include <lib.h>
 #include <mrc_cache.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <timestamp.h>
 #include "raminit.h"
 #include "pei_data.h"
diff --git a/src/northbridge/intel/sandybridge/raminit_native.c b/src/northbridge/intel/sandybridge/raminit_native.c
index e95f154..62715a1 100644
--- a/src/northbridge/intel/sandybridge/raminit_native.c
+++ b/src/northbridge/intel/sandybridge/raminit_native.c
@@ -8,6 +8,9 @@
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <northbridge/intel/sandybridge/chip.h>
+#include <stdbool.h>
+#include <stdint.h>
+
 #include "raminit_native.h"
 #include "raminit_common.h"
 #include "raminit_tables.h"
diff --git a/src/northbridge/intel/sandybridge/raminit_native.h b/src/northbridge/intel/sandybridge/raminit_native.h
index 1bba180..22aea5b 100644
--- a/src/northbridge/intel/sandybridge/raminit_native.h
+++ b/src/northbridge/intel/sandybridge/raminit_native.h
@@ -5,6 +5,8 @@
 
 #include "sandybridge.h"
 #include <device/dram/ddr3.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 /* The order is: ch0dimmA, ch0dimmB, ch1dimmA, ch1dimmB */
 void read_spd(spd_raw_data *spd, u8 addr, bool id_only);
diff --git a/src/northbridge/intel/sandybridge/raminit_tables.c b/src/northbridge/intel/sandybridge/raminit_tables.c
index bd0d117..c3ba9de 100644
--- a/src/northbridge/intel/sandybridge/raminit_tables.c
+++ b/src/northbridge/intel/sandybridge/raminit_tables.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <stdint.h>
 #include "raminit_tables.h"
 
 const u32 frq_refi_map[2][8] = {
diff --git a/src/northbridge/intel/sandybridge/raminit_tables.h b/src/northbridge/intel/sandybridge/raminit_tables.h
index 99077a4..6bf6a1f 100644
--- a/src/northbridge/intel/sandybridge/raminit_tables.h
+++ b/src/northbridge/intel/sandybridge/raminit_tables.h
@@ -3,7 +3,7 @@
 #ifndef RAMINIT_TABLES_H
 #define RAMINIT_TABLES_H
 
-#include <types.h>
+#include <stdint.h>
 
 extern const u32 frq_refi_map[2][8];
 
diff --git a/src/northbridge/intel/sandybridge/sandybridge.h b/src/northbridge/intel/sandybridge/sandybridge.h
index 4cd833f..264d1e2 100644
--- a/src/northbridge/intel/sandybridge/sandybridge.h
+++ b/src/northbridge/intel/sandybridge/sandybridge.h
@@ -36,7 +36,7 @@
 
 /* Everything below this line is ignored in the DSDT */
 #ifndef __ACPI__
-#include <cpu/intel/model_206ax/model_206ax.h>
+#include <stdint.h>
 
 /* Chipset types */
 enum platform_type {