diff --git a/src/cpu/amd/family_10h-family_15h/fidvid.c b/src/cpu/amd/family_10h-family_15h/fidvid.c
index 917cde307f..57207a431a 100644
--- a/src/cpu/amd/family_10h-family_15h/fidvid.c
+++ b/src/cpu/amd/family_10h-family_15h/fidvid.c
@@ -91,6 +91,7 @@ b.-  prep_fid_change(...)
 #include <device/pci_ops.h>
 #include <stdint.h>
 #include <northbridge/amd/amdht/AsPsDefs.h>
+#include <stdlib.h>
 
 static inline void print_debug_fv(const char *str, u32 val)
 {
diff --git a/src/cpu/amd/family_10h-family_15h/processor_name.c b/src/cpu/amd/family_10h-family_15h/processor_name.c
index fbd2bb5a33..c5e31fd59d 100644
--- a/src/cpu/amd/family_10h-family_15h/processor_name.c
+++ b/src/cpu/amd/family_10h-family_15h/processor_name.c
@@ -27,6 +27,8 @@
 #include <device/pci.h>
 #include <device/pnp.h>
 #include <device/pci_ops.h>
+#include <stdlib.h>
+#include <types.h>
 
 /* The maximum length of CPU names is 48 bytes, including the final NULL byte.
  * If you change these names your BIOS will _NOT_ pass the AMD validation and
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 668988a70e..e7dfc5798d 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -28,6 +28,7 @@
 #include <smp/spinlock.h>
 #include <cpu/cpu.h>
 #include <cpu/intel/speedstep.h>
+#include <stdlib.h>
 #include <thread.h>
 
 /* This is a lot more paranoid now, since Linux can NOT handle
diff --git a/src/cpu/x86/mirror_payload.c b/src/cpu/x86/mirror_payload.c
index 9dec8dbc68..9987347f33 100644
--- a/src/cpu/x86/mirror_payload.c
+++ b/src/cpu/x86/mirror_payload.c
@@ -11,13 +11,12 @@
  * GNU General Public License for more details.
  */
 
-#include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <bootmem.h>
 #include <program_loading.h>
+#include <types.h>
 
 void mirror_payload(struct prog *payload)
 {