src: Include <stdint.h> instead of <inttypes.h>

The <inttypes.h> header currently does nothing but include the
definitions from <stdint.h>, so let's #include that directly instead.

Change-Id: I9d83ad37d0d7300a093001596ce3f0b3830c5701
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34800
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>

59 files changed, 58 insertions, 59 deletions

diff --git a/src/cpu/amd/family_10h-family_15h/fidvid.c b/src/cpu/amd/family_10h-family_15h/fidvid.c
index c5d523a74c..667880e407 100644
--- a/src/cpu/amd/family_10h-family_15h/fidvid.c
+++ b/src/cpu/amd/family_10h-family_15h/fidvid.c
@@ -92,7 +92,7 @@ b.-  prep_fid_change(...)
 #include <console/console.h>
 #include <cpu/amd/msr.h>
 #include <device/pci_ops.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <northbridge/amd/amdht/AsPsDefs.h>
 
 static inline void print_debug_fv(const char *str, u32 val)
diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c
index 95b8020002..3539d18f73 100644
--- a/src/drivers/intel/fsp2_0/hand_off_block.c
+++ b/src/drivers/intel/fsp2_0/hand_off_block.c
@@ -16,7 +16,7 @@
 #include <console/console.h>
 #include <fsp/api.h>
 #include <fsp/util.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <string.h>
 
 #define HOB_HEADER_LEN		8
diff --git a/src/drivers/uart/pl011.h b/src/drivers/uart/pl011.h
index 9247ef7725..2568dbcb80 100644
--- a/src/drivers/uart/pl011.h
+++ b/src/drivers/uart/pl011.h
@@ -10,7 +10,7 @@
 #ifndef __DRIVERS_UART_PL011_H
 #define __DRIVERS_UART_PL011_H
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <types.h>
 
 /* PL011 r1p5 registers */
diff --git a/src/drivers/vpd/vpd_tables.h b/src/drivers/vpd/vpd_tables.h
index 0bd215a5a6..4add5bd49d 100644
--- a/src/drivers/vpd/vpd_tables.h
+++ b/src/drivers/vpd/vpd_tables.h
@@ -9,7 +9,7 @@
 #ifndef __LIB_VPD_TABLES_H__
 #define __LIB_VPD_TABLES_H__
 
-#include <inttypes.h>
+#include <stdint.h>
 
 #define VPD_ENTRY_MAGIC    "_SM_"
 #define VPD_INFO_MAGIC     \
diff --git a/src/lib/primitive_memtest.c b/src/lib/primitive_memtest.c
index c699e8906b..aa013772a8 100644
--- a/src/lib/primitive_memtest.c
+++ b/src/lib/primitive_memtest.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <lib.h>
 #include <console/console.h>
 
diff --git a/src/northbridge/amd/amdfam10/amdfam10.h b/src/northbridge/amd/amdfam10/amdfam10.h
index 0fbcea687c..321e87d7d0 100644
--- a/src/northbridge/amd/amdfam10/amdfam10.h
+++ b/src/northbridge/amd/amdfam10/amdfam10.h
@@ -17,7 +17,7 @@
 #ifndef AMDFAM10_H
 #define AMDFAM10_H
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <device/device.h>
 #include "early_ht.h"
 
diff --git a/src/northbridge/amd/amdfam10/debug.h b/src/northbridge/amd/amdfam10/debug.h
index 3710d15b77..01d87d96af 100644
--- a/src/northbridge/amd/amdfam10/debug.h
+++ b/src/northbridge/amd/amdfam10/debug.h
@@ -16,7 +16,7 @@
 #ifndef AMDFAM10_DEBUG_H
 #define AMDFAM10_DEBUG_H
 
-#include <inttypes.h>
+#include <stdint.h>
 #include "pci.h"
 
 void print_debug_addr(const char *str, void *val);
diff --git a/src/northbridge/amd/amdfam10/early_ht.c b/src/northbridge/amd/amdfam10/early_ht.c
index d8784ac728..3f2b138533 100644
--- a/src/northbridge/amd/amdfam10/early_ht.c
+++ b/src/northbridge/amd/amdfam10/early_ht.c
@@ -14,7 +14,7 @@
  */
 
 #include "early_ht.h"
-#include <inttypes.h>
+#include <stdint.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 
diff --git a/src/northbridge/amd/amdfam10/pci.h b/src/northbridge/amd/amdfam10/pci.h
index 2893949135..21623c1168 100644
--- a/src/northbridge/amd/amdfam10/pci.h
+++ b/src/northbridge/amd/amdfam10/pci.h
@@ -16,7 +16,7 @@
 #ifndef AMDFAM10_PCI_H
 #define AMDFAM10_PCI_H
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <device/pci_type.h>
 #include <device/pci_def.h>
 
diff --git a/src/northbridge/amd/amdfam10/raminit_amdmct.c b/src/northbridge/amd/amdfam10/raminit_amdmct.c
index 440a02635b..a25a1510c8 100644
--- a/src/northbridge/amd/amdfam10/raminit_amdmct.c
+++ b/src/northbridge/amd/amdfam10/raminit_amdmct.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <arch/acpi.h>
 #include <arch/cpu.h>
 #include <device/pci.h>
diff --git a/src/northbridge/amd/amdfam10/setup_resource_map.c b/src/northbridge/amd/amdfam10/setup_resource_map.c
index 3e6a437934..735d72bbf7 100644
--- a/src/northbridge/amd/amdfam10/setup_resource_map.c
+++ b/src/northbridge/amd/amdfam10/setup_resource_map.c
@@ -15,7 +15,7 @@
  */
 
 #include <arch/io.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 #include <device/pci_ops.h>
 #include <northbridge/amd/amdfam10/raminit.h>
diff --git a/src/northbridge/amd/amdht/comlib.h b/src/northbridge/amd/amdht/comlib.h
index dbc19f3cfa..98326b280f 100644
--- a/src/northbridge/amd/amdht/comlib.h
+++ b/src/northbridge/amd/amdht/comlib.h
@@ -17,7 +17,7 @@
 #define COMLIB_H
 
 #include <assert.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include "porting.h"
 
diff --git a/src/northbridge/amd/amdht/h3ncmn.h b/src/northbridge/amd/amdht/h3ncmn.h
index c007089e03..db057c0f1c 100644
--- a/src/northbridge/amd/amdht/h3ncmn.h
+++ b/src/northbridge/amd/amdht/h3ncmn.h
@@ -17,7 +17,7 @@
 #ifndef H3NCMN_H
 #define H3NCMN_H
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <device/pci.h>
 #include <cpu/amd/msr.h>
 
diff --git a/src/northbridge/amd/amdht/ht_wrapper.h b/src/northbridge/amd/amdht/ht_wrapper.h
index 331c3df5f3..629e08f4fe 100644
--- a/src/northbridge/amd/amdht/ht_wrapper.h
+++ b/src/northbridge/amd/amdht/ht_wrapper.h
@@ -18,7 +18,7 @@
 
 #include <northbridge/amd/amdfam10/raminit.h>
 #include <northbridge/amd/amdfam10/amdfam10.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include "h3finit.h"
 
 void amd_ht_fixup(struct sys_info *sysinfo);
diff --git a/src/northbridge/amd/amdmct/mct/mct_d.h b/src/northbridge/amd/amdmct/mct/mct_d.h
index 14da928719..b985137987 100644
--- a/src/northbridge/amd/amdmct/mct/mct_d.h
+++ b/src/northbridge/amd/amdmct/mct/mct_d.h
@@ -22,7 +22,7 @@
 
 #define DQS_TRAIN_DEBUG 0
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <northbridge/amd/amdfam10/debug.h>
 #include <northbridge/amd/amdfam10/raminit.h>
 
diff --git a/src/northbridge/amd/amdmct/mct/mct_d_gcc.h b/src/northbridge/amd/amdmct/mct/mct_d_gcc.h
index 0b9a7d19f1..993aa21d74 100644
--- a/src/northbridge/amd/amdmct/mct/mct_d_gcc.h
+++ b/src/northbridge/amd/amdmct/mct/mct_d_gcc.h
@@ -16,7 +16,7 @@
 #ifndef MCT_D_GCC_H
 #define MCT_D_GCC_H
 
-#include <inttypes.h>
+#include <stdint.h>
 
 void _WRMSR(u32 addr, u32 lo, u32 hi);
 void _RDMSR(u32 addr, u32 *lo, u32 *hi);
diff --git a/src/northbridge/amd/amdmct/mct/mctardk3.c b/src/northbridge/amd/amdmct/mct/mctardk3.c
index 4eac790d5c..c36ba8ea7a 100644
--- a/src/northbridge/amd/amdmct/mct/mctardk3.c
+++ b/src/northbridge/amd/amdmct/mct/mctardk3.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include "mct_d.h"
 
 static void Get_ChannelPS_Cfg0_D(u8 MAAdimms, u8 Speed, u8 MAAload,
diff --git a/src/northbridge/amd/amdmct/mct/mctardk4.c b/src/northbridge/amd/amdmct/mct/mctardk4.c
index 2e16a80002..c700593740 100644
--- a/src/northbridge/amd/amdmct/mct/mctardk4.c
+++ b/src/northbridge/amd/amdmct/mct/mctardk4.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include "mct_d.h"
 
 static void Get_ChannelPS_Cfg0_D(u8 MAAdimms, u8 Speed, u8 MAAload,
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
index 3cda13fd35..952a66f71a 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
@@ -22,7 +22,7 @@
 
 #define DQS_TRAIN_DEBUG 0
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <northbridge/amd/amdfam10/raminit.h>
 
 /*===========================================================================
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.c b/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.c
index 82911c02d5..ccea732709 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.c
@@ -15,7 +15,7 @@
  */
 
 #include "mct_d_gcc.h"
-#include <inttypes.h>
+#include <stdint.h>
 #include <arch/cpu.h>
 
 void _WRMSR(u32 addr, u32 lo, u32 hi)
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.h b/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.h
index f0d0f76d69..629e6e639b 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.h
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.h
@@ -17,7 +17,7 @@
 #ifndef MCT_D_GCC_H
 #define MCT_D_GCC_H
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <cpu/x86/cr.h>
 
 void _WRMSR(u32 addr, u32 lo, u32 hi);
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctardk5.c b/src/northbridge/amd/amdmct/mct_ddr3/mctardk5.c
index 2e5a5009d6..e8116340c4 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctardk5.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctardk5.c
@@ -17,7 +17,7 @@
 /* AM3/ASB2/C32/G34 DDR3 */
 
 #include <arch/cpu.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
 
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctchi_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctchi_d.c
index 55cf3a1eda..d458f3a48e 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctchi_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctchi_d.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
 #include <console/console.h>
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctcsi_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctcsi_d.c
index 716e419a5d..85e7930b24 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctcsi_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctcsi_d.c
@@ -20,7 +20,7 @@
  * ;page size), and subtract 8.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
 #include <console/console.h>
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
index 6b31294586..3f4f1bf01d 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 #include <cpu/x86/cr.h>
 #include <string.h>
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
index 9aea1d79eb..4c33b9e4b6 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
@@ -15,7 +15,7 @@
  */
 
 #include <arch/cpu.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 #include <device/pci_ops.h>
 
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mcthdi.c b/src/northbridge/amd/amdmct/mct_ddr3/mcthdi.c
index 2038af9b6c..c821ec0628 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mcthdi.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mcthdi.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
 
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c b/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c
index 57f0e96581..1ee10608b9 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c
@@ -15,7 +15,7 @@
  */
 
 #include <arch/cpu.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 #include <string.h>
 #include "mct_d.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
index efe1e8f52a..73370e715b 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
index e878649d75..29949e02d4 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 
 #include "mct_d.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c b/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
index 6918e9ca9d..3cb75675df 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c b/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
index 8bed3b7d33..ddaaaab8d5 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c b/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
index 76e0c5c029..b203942058 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c b/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
index d9ae58ec70..93cfb4bf1b 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
@@ -15,7 +15,7 @@
  */
 
 #include <arch/cpu.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 
 #include "mct_d.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
index d75d1be036..f215695580 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
@@ -15,7 +15,7 @@
  */
 
 #include <arch/cpu.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 
 #include "mct_d.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c
index 032152c39d..dbb989fe3d 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c
@@ -20,7 +20,7 @@
 ******************************************************************************/
 
 #include <arch/cpu.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 #include <cpu/x86/cr.h>
 #include <string.h>
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
index 9f9fc80a76..98aadddc6c 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
@@ -15,7 +15,7 @@
  */
 
 #include <arch/cpu.h>
-#include <inttypes.h>
+#include <stdint.h>
 
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c b/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
index ec9b8e4327..b6ab65e2f8 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
@@ -18,7 +18,7 @@
  * Description: Max Read Latency Training feature for DDR 3 MCT
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 #include <cpu/amd/msr.h>
 #include <cpu/x86/cr.h>
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c b/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
index 89edf6eee9..82523e01b8 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
@@ -15,7 +15,7 @@
  */
 
 #include <arch/cpu.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 
 #include "mct_d.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
index 42f313ab92..76f72ae917 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 #include <northbridge/amd/amdfam10/amdfam10.h>
 
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c b/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
index 2904cfb3ad..954dd6f2ef 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c b/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
index 5157a5ce8f..06bfdba84f 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
@@ -16,7 +16,7 @@
 
 /* This file contains functions for odt setting on registered DDR3 dimms */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <console/console.h>
 
 #include "mct_d.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
index ef99af8c5c..999cb94f24 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
@@ -14,7 +14,7 @@
  */
 
 #include <arch/io.h>
-#include <inttypes.h>
+#include <stdint.h>
 
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
index 61a00562f4..0420b660b9 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
@@ -17,7 +17,7 @@
 /* This file contains functions for common utility functions */
 
 #include <arch/cpu.h>
-#include <inttypes.h>
+#include <stdint.h>
 
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
index d991002f5b..1517398a33 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
@@ -29,7 +29,7 @@
 #include <spi-generic.h>
 #include <spi_flash.h>
 #include <pc80/mc146818rtc.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <types.h>
 
 #include "mct_d.h"
diff --git a/src/northbridge/amd/amdmct/wrappers/mcti.h b/src/northbridge/amd/amdmct/wrappers/mcti.h
index 92dc0b853c..cc0e1b29b2 100644
--- a/src/northbridge/amd/amdmct/wrappers/mcti.h
+++ b/src/northbridge/amd/amdmct/wrappers/mcti.h
@@ -18,7 +18,7 @@
 #ifndef MCTI_H
 #define MCTI_H
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <pc80/mc146818rtc.h>
 
diff --git a/src/soc/cavium/cn81xx/include/soc/soc.h b/src/soc/cavium/cn81xx/include/soc/soc.h
index a751e64846..582cff3e29 100644
--- a/src/soc/cavium/cn81xx/include/soc/soc.h
+++ b/src/soc/cavium/cn81xx/include/soc/soc.h
@@ -16,7 +16,7 @@
 #ifndef __SOC_CAVIUM_CN81XX_INCLUDE_SOC_SOC_H
 #define __SOC_CAVIUM_CN81XX_INCLUDE_SOC_SOC_H
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <types.h>
 
 /* MIO BOOT Registers */
diff --git a/src/soc/cavium/cn81xx/include/soc/timer.h b/src/soc/cavium/cn81xx/include/soc/timer.h
index 4e4131136e..5e6673e0ea 100644
--- a/src/soc/cavium/cn81xx/include/soc/timer.h
+++ b/src/soc/cavium/cn81xx/include/soc/timer.h
@@ -16,7 +16,7 @@
 #ifndef __SOC_CAVIUM_CN81XX_TIMER_H__
 #define __SOC_CAVIUM_CN81XX_TIMER_H__
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <types.h>
 
 /* Watchdog functions */
diff --git a/src/soc/cavium/cn81xx/include/soc/uart.h b/src/soc/cavium/cn81xx/include/soc/uart.h
index e4022068bc..baa06e1f89 100644
--- a/src/soc/cavium/cn81xx/include/soc/uart.h
+++ b/src/soc/cavium/cn81xx/include/soc/uart.h
@@ -16,7 +16,7 @@
 #ifndef __SOC_CAVIUM_COMMON_INCLUDE_SOC_UART_H
 #define __SOC_CAVIUM_COMMON_INCLUDE_SOC_UART_H
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <types.h>
 
 int uart_is_enabled(const size_t bus);
diff --git a/src/soc/cavium/cn81xx/timer.c b/src/soc/cavium/cn81xx/timer.c
index b333c7e4d6..bd67d8a888 100644
--- a/src/soc/cavium/cn81xx/timer.c
+++ b/src/soc/cavium/cn81xx/timer.c
@@ -20,7 +20,6 @@
 #include <device/mmio.h>
 #include <arch/lib_helpers.h>
 #include <console/console.h>
-#include <inttypes.h>
 #include <soc/clock.h>
 #include <soc/timer.h>
 #include <stdint.h>
diff --git a/src/soc/nvidia/tegra124/dma.c b/src/soc/nvidia/tegra124/dma.c
index 73d050f602..761bb6bce5 100644
--- a/src/soc/nvidia/tegra124/dma.c
+++ b/src/soc/nvidia/tegra124/dma.c
@@ -17,7 +17,7 @@
 
 #include <device/mmio.h>
 #include <console/console.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <soc/addressmap.h>
 #include <soc/dma.h>
 #include <stddef.h>
diff --git a/src/soc/nvidia/tegra124/include/soc/dma.h b/src/soc/nvidia/tegra124/include/soc/dma.h
index 42c70275f5..3d6d209153 100644
--- a/src/soc/nvidia/tegra124/include/soc/dma.h
+++ b/src/soc/nvidia/tegra124/include/soc/dma.h
@@ -18,7 +18,7 @@
 #ifndef __NVIDIA_TEGRA124_DMA_H__
 #define __NVIDIA_TEGRA124_DMA_H__
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <soc/addressmap.h>
 
 /*
diff --git a/src/soc/nvidia/tegra124/spi.c b/src/soc/nvidia/tegra124/spi.c
index 4bd0ab7d1a..2d6469cc3f 100644
--- a/src/soc/nvidia/tegra124/spi.c
+++ b/src/soc/nvidia/tegra124/spi.c
@@ -20,7 +20,7 @@
 #include <boot_device.h>
 #include <console/console.h>
 #include <delay.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <soc/addressmap.h>
 #include <soc/dma.h>
 #include <soc/spi.h>
diff --git a/src/soc/nvidia/tegra210/dma.c b/src/soc/nvidia/tegra210/dma.c
index 03c5e6783e..75376d98f0 100644
--- a/src/soc/nvidia/tegra210/dma.c
+++ b/src/soc/nvidia/tegra210/dma.c
@@ -17,7 +17,7 @@
 
 #include <device/mmio.h>
 #include <console/console.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <soc/addressmap.h>
 #include <soc/dma.h>
 #include <stddef.h>
diff --git a/src/soc/nvidia/tegra210/include/soc/dma.h b/src/soc/nvidia/tegra210/include/soc/dma.h
index 3cb94ce8d3..6d934191a4 100644
--- a/src/soc/nvidia/tegra210/include/soc/dma.h
+++ b/src/soc/nvidia/tegra210/include/soc/dma.h
@@ -17,7 +17,7 @@
 #ifndef __NVIDIA_TEGRA210_DMA_H__
 #define __NVIDIA_TEGRA210_DMA_H__
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <soc/addressmap.h>
 #include <types.h>
 
diff --git a/src/soc/nvidia/tegra210/spi.c b/src/soc/nvidia/tegra210/spi.c
index 6ec8b641ab..5a065ba199 100644
--- a/src/soc/nvidia/tegra210/spi.c
+++ b/src/soc/nvidia/tegra210/spi.c
@@ -20,7 +20,7 @@
 #include <boot_device.h>
 #include <console/console.h>
 #include <delay.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <spi-generic.h>
 #include <spi_flash.h>
 #include <soc/addressmap.h>
diff --git a/src/soc/rockchip/rk3288/include/soc/timer.h b/src/soc/rockchip/rk3288/include/soc/timer.h
index 04efeaf917..1d08fcc1e2 100644
--- a/src/soc/rockchip/rk3288/include/soc/timer.h
+++ b/src/soc/rockchip/rk3288/include/soc/timer.h
@@ -16,7 +16,7 @@
 #ifndef __SOC_ROCKCHIP_RK3288_TIMER_H__
 #define __SOC_ROCKCHIP_RK3288_TIMER_H__
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
 #include <timer.h>
diff --git a/src/soc/rockchip/rk3399/include/soc/timer.h b/src/soc/rockchip/rk3399/include/soc/timer.h
index 8513cfa5bc..46c69e6a2f 100644
--- a/src/soc/rockchip/rk3399/include/soc/timer.h
+++ b/src/soc/rockchip/rk3399/include/soc/timer.h
@@ -16,7 +16,7 @@
 #ifndef __SOC_ROCKCHIP_RK3399_TIMER_H__
 #define __SOC_ROCKCHIP_RK3399_TIMER_H__
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <soc/addressmap.h>
 #include <timer.h>
 
diff --git a/src/vendorcode/cavium/include/bdk/libbdk-hal/bdk-config.h b/src/vendorcode/cavium/include/bdk/libbdk-hal/bdk-config.h
index 9aa1a47251..8c950837cf 100644
--- a/src/vendorcode/cavium/include/bdk/libbdk-hal/bdk-config.h
+++ b/src/vendorcode/cavium/include/bdk/libbdk-hal/bdk-config.h
@@ -39,7 +39,7 @@
 * ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 ***********************license end**************************************/
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <bdk-devicetree.h>
 
 /**