diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 60efdd0d7a..dbf46a9b1b 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -56,11 +56,11 @@
 #define OEM_ID			"COREv4"    /* Must be exactly 6 bytes long! */
 
 #if !defined(__ASSEMBLER__) && !defined(__ACPI__) && !defined(__ROMCC__)
-#include <stdint.h>
 #include <commonlib/helpers.h>
 #include <device/device.h>
 #include <uuid.h>
 #include <cper.h>
+#include <types.h>
 
 #define RSDP_SIG		"RSD PTR "  /* RSDT pointer signature */
 #define ASLC			"CORE"      /* Must be exactly 4 bytes long! */
diff --git a/src/cpu/allwinner/a10/twi.c b/src/cpu/allwinner/a10/twi.c
index 6e7f9e214a..01ee5a5c6f 100644
--- a/src/cpu/allwinner/a10/twi.c
+++ b/src/cpu/allwinner/a10/twi.c
@@ -20,12 +20,13 @@
  * Largely based on the uboot-sunxi code.
  */
 
-#include "memmap.h"
-#include "twi.h"
-
 #include <device/mmio.h>
 #include <delay.h>
 #include <device/i2c_simple.h>
+#include <types.h>
+
+#include "memmap.h"
+#include "twi.h"
 
 #define TWI_BASE(n)			(A1X_TWI0_BASE + 0x400 * (n))
 
diff --git a/src/cpu/amd/family_10h-family_15h/init_cpus.c b/src/cpu/amd/family_10h-family_15h/init_cpus.c
index 719d62fbcc..310706ba95 100644
--- a/src/cpu/amd/family_10h-family_15h/init_cpus.c
+++ b/src/cpu/amd/family_10h-family_15h/init_cpus.c
@@ -17,6 +17,8 @@
 #include <console/console.h>
 #include <cpu/amd/msr.h>
 #include <device/pci_ops.h>
+#include <types.h>
+
 #include "init_cpus.h"
 
 #if CONFIG(HAVE_OPTION_TABLE)
diff --git a/src/cpu/amd/family_10h-family_15h/powernow_acpi.c b/src/cpu/amd/family_10h-family_15h/powernow_acpi.c
index d024069e30..e648b71750 100644
--- a/src/cpu/amd/family_10h-family_15h/powernow_acpi.c
+++ b/src/cpu/amd/family_10h-family_15h/powernow_acpi.c
@@ -16,7 +16,6 @@
  */
 
 #include <console/console.h>
-#include <stdint.h>
 #include <option.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/msr.h>
@@ -30,6 +29,7 @@
 #include <northbridge/amd/amdht/AsPsDefs.h>
 #include <northbridge/amd/amdmct/mct/mct.h>
 #include <northbridge/amd/amdmct/amddefs.h>
+#include <types.h>
 
 static inline uint8_t is_fam15h(void)
 {
diff --git a/src/include/types.h b/src/include/types.h
index b76c95b5bb..d6fdc08588 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -15,6 +15,8 @@
 
 #ifndef __TYPES_H
 #define __TYPES_H
+
+/* types.h is supposed to provide stdint and stddef defined in here: */
 #include <stdint.h>
 #include <stddef.h>
 
diff --git a/src/lib/lzmadecode.c b/src/lib/lzmadecode.c
index 0a5d038638..c45e131708 100644
--- a/src/lib/lzmadecode.c
+++ b/src/lib/lzmadecode.c
@@ -20,7 +20,7 @@
 */
 
 #include "lzmadecode.h"
-#include <stdint.h>
+#include <types.h>
 
 #define kNumTopBits 24
 #define kTopValue ((UInt32)1 << kNumTopBits)