Massive refactoring of external header files.

This reduces the number of exported header files to the minimum needed by
the existing userspace utilities and firmware implementations.

BUG=chromium:221544
BRANCH=none
TEST=manual, trybots
CQ-DEPEND=CL:47019,CL:47022,CL:47023

  sudo FEATURES=test emerge vboot_reference
  FEATURES=test emerge-$BOARD \
                vboot_reference \
                chromeos-cryptohome \
                chromeos-installer \
                chromeos-u-boot \
                peach-u-boot \
                depthcharge

Change-Id: I2946cc2dbaf5459a6c5eca92ca57d546498e6d85
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/47021
Reviewed-by: Randall Spangler <rspangler@chromium.org>

51 files changed, 91 insertions, 29 deletions

diff --git a/firmware/include/bmpblk_header.h b/firmware/include/bmpblk_header.h
index 1b04bf70..4889a6a8 100644
--- a/firmware/include/bmpblk_header.h
+++ b/firmware/include/bmpblk_header.h
@@ -41,11 +41,9 @@
  *  |        List of locale names             |
  *  +-----------------------------------------+
  */
-
 #ifndef VBOOT_REFERENCE_BMPBLK_HEADER_H_
 #define VBOOT_REFERENCE_BMPBLK_HEADER_H_
-
-#include "sysincludes.h"
+#include <stdint.h>
 
 #define BMPBLOCK_SIGNATURE      "$BMP"
 #define BMPBLOCK_SIGNATURE_SIZE (4)
@@ -130,14 +128,6 @@ typedef enum ImageFormat {
 	FORMAT_FONT,
 } ImageFormat;
 
-/* Constants for ImageInfo.compression */
-typedef enum Compression {
-	COMPRESS_NONE = 0,
-	COMPRESS_EFIv1,           /* The x86 BIOS only supports this */
-	COMPRESS_LZMA1,           /* The ARM BIOS supports LZMA1 */
-	MAX_COMPRESS,
-} Compression;
-
 /*
  * These magic image names can be used in the .yaml file to indicate that the
  * ASCII HWID should be displayed. For RENDER_HWID, the image coordinates
diff --git a/firmware/include/gbb_header.h b/firmware/include/gbb_header.h
index 5ab5121b..43aa3e76 100644
--- a/firmware/include/gbb_header.h
+++ b/firmware/include/gbb_header.h
@@ -4,11 +4,9 @@
  *
  * Data structure of Google Binary Block (GBB)
  */
-
 #ifndef VBOOT_REFERENCE_GBB_HEADER_H_
 #define VBOOT_REFERENCE_GBB_HEADER_H_
-
-#include "sysincludes.h"
+#include <stdint.h>
 
 #define GBB_HEADER_SIZE    128
 
diff --git a/firmware/lib/cgptlib/include/gpt.h b/firmware/include/gpt.h
index 0418655b..fa537397 100644
--- a/firmware/lib/cgptlib/include/gpt.h
+++ b/firmware/include/gpt.h
@@ -9,8 +9,7 @@
  */
 #ifndef VBOOT_REFERENCE_CGPTLIB_GPT_H_
 #define VBOOT_REFERENCE_CGPTLIB_GPT_H_
-
-#include "sysincludes.h"
+#include <stdint.h>
 
 #define GPT_HEADER_SIGNATURE  "EFI PART"
 #define GPT_HEADER_SIGNATURE2 "CHROMEOS"
diff --git a/firmware/include/tlcl.h b/firmware/include/tlcl.h
index 5ce05638..a71136b6 100644
--- a/firmware/include/tlcl.h
+++ b/firmware/include/tlcl.h
@@ -11,8 +11,8 @@
 
 #ifndef TPM_LITE_TLCL_H_
 #define TPM_LITE_TLCL_H_
+#include <stdint.h>
 
-#include "sysincludes.h"
 #include "tss_constants.h"
 
 /*****************************************************************************/
diff --git a/firmware/include/tss_constants.h b/firmware/include/tss_constants.h
index bcceded8..883a5ad8 100644
--- a/firmware/include/tss_constants.h
+++ b/firmware/include/tss_constants.h
@@ -5,11 +5,9 @@
  * Some TPM constants and type definitions for standalone compilation for use
  * in the firmware
  */
-
 #ifndef VBOOT_REFERENCE_TSS_CONSTANTS_H_
 #define VBOOT_REFERENCE_TSS_CONSTANTS_H_
-
-#include "sysincludes.h"
+#include <stdint.h>
 
 #define TPM_MAX_COMMAND_SIZE 4096
 #define TPM_LARGE_ENOUGH_COMMAND_SIZE 256  /* saves space in the firmware */
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h
index 31e91a7b..dc8be1c4 100644
--- a/firmware/include/vboot_api.h
+++ b/firmware/include/vboot_api.h
@@ -21,9 +21,7 @@
 
 #ifndef VBOOT_REFERENCE_VBOOT_API_H_
 #define VBOOT_REFERENCE_VBOOT_API_H_
-
-#include "sysincludes.h"
-#include "bmpblk_header.h"
+#include <stdint.h>
 
 /*****************************************************************************/
 /* Error codes */
@@ -814,6 +812,14 @@ VbError_t VbExDecompress(void *inbuf, uint32_t in_size,
                          uint32_t compression_type,
                          void *outbuf, uint32_t *out_size);
 
+/* Constants for compression_type */
+enum {
+	COMPRESS_NONE = 0,
+	COMPRESS_EFIv1,           /* The x86 BIOS only supports this */
+	COMPRESS_LZMA1,           /* The ARM BIOS supports LZMA1 */
+	MAX_COMPRESS,
+};
+
 /**
  * Execute legacy boot option.
  */
diff --git a/firmware/include/vboot_nvstorage.h b/firmware/include/vboot_nvstorage.h
index 943a5664..e6b014aa 100644
--- a/firmware/include/vboot_nvstorage.h
+++ b/firmware/include/vboot_nvstorage.h
@@ -7,6 +7,7 @@
 
 #ifndef VBOOT_REFERENCE_NVSTORAGE_H_
 #define VBOOT_REFERENCE_NVSTORAGE_H_
+#include <stdint.h>
 
 #define VBNV_BLOCK_SIZE 16  /* Size of NV storage block in bytes */
 
diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h
index ee912a30..e20b0aa9 100644
--- a/firmware/include/vboot_struct.h
+++ b/firmware/include/vboot_struct.h
@@ -8,8 +8,7 @@
 
 #ifndef VBOOT_REFERENCE_VBOOT_STRUCT_H_
 #define VBOOT_REFERENCE_VBOOT_STRUCT_H_
-
-#include "sysincludes.h"
+#include <stdint.h>
 
 /* Public key data */
 typedef struct VbPublicKey {
diff --git a/firmware/lib/cgptlib/cgptlib.c b/firmware/lib/cgptlib/cgptlib.c
index 370530f1..6fc29f62 100644
--- a/firmware/lib/cgptlib/cgptlib.c
+++ b/firmware/lib/cgptlib/cgptlib.c
@@ -3,6 +3,8 @@
  * found in the LICENSE file.
  */
 
+#include "sysincludes.h"
+
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
 #include "crc32.h"
diff --git a/firmware/lib/cgptlib/cgptlib_internal.c b/firmware/lib/cgptlib/cgptlib_internal.c
index d51ce33b..c87f981c 100644
--- a/firmware/lib/cgptlib/cgptlib_internal.c
+++ b/firmware/lib/cgptlib/cgptlib_internal.c
@@ -3,6 +3,8 @@
  * found in the LICENSE file.
  */
 
+#include "sysincludes.h"
+
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
 #include "crc32.h"
diff --git a/firmware/lib/cgptlib/crc32.c b/firmware/lib/cgptlib/crc32.c
index 002c5b9a..286cfa09 100644
--- a/firmware/lib/cgptlib/crc32.c
+++ b/firmware/lib/cgptlib/crc32.c
@@ -39,6 +39,8 @@
 /*      polynomial $edb88320                                              */
 /*                                                                        */
 /*  --------------------------------------------------------------------  */
+#include "sysincludes.h"
+
 #include "crc32.h"
 
 static uint32_t crc32_tab[] = {
diff --git a/firmware/lib/crc8.c b/firmware/lib/crc8.c
index b0ee8679..0e38e1eb 100644
--- a/firmware/lib/crc8.c
+++ b/firmware/lib/crc8.c
@@ -3,6 +3,8 @@
  * found in the LICENSE file.
  */
 
+#include "sysincludes.h"
+
 #include "crc8.h"
 
 /**
diff --git a/firmware/lib/cryptolib/padding.c b/firmware/lib/cryptolib/padding.c
index 24b1c15d..4fc939a5 100644
--- a/firmware/lib/cryptolib/padding.c
+++ b/firmware/lib/cryptolib/padding.c
@@ -5,6 +5,8 @@
  * arrays corresponding to various combinations of algorithms for RSA signatures.
  */
 
+#include "sysincludes.h"
+
 #include "cryptolib.h"
 
 
diff --git a/firmware/lib/cryptolib/rsa.c b/firmware/lib/cryptolib/rsa.c
index 897816e8..6d61a216 100644
--- a/firmware/lib/cryptolib/rsa.c
+++ b/firmware/lib/cryptolib/rsa.c
@@ -8,6 +8,8 @@
  * support multiple RSA key lengths and hash digest algorithms.
  */
 
+#include "sysincludes.h"
+
 #include "cryptolib.h"
 #include "vboot_api.h"
 #include "utility.h"
diff --git a/firmware/lib/cryptolib/rsa_utility.c b/firmware/lib/cryptolib/rsa_utility.c
index ab4650c0..f6eefe2b 100644
--- a/firmware/lib/cryptolib/rsa_utility.c
+++ b/firmware/lib/cryptolib/rsa_utility.c
@@ -5,6 +5,8 @@
  * Implementation of RSA utility functions.
  */
 
+#include "sysincludes.h"
+
 #include "cryptolib.h"
 #include "stateful_util.h"
 #include "utility.h"
diff --git a/firmware/lib/cryptolib/sha1.c b/firmware/lib/cryptolib/sha1.c
index 0a3f8f6a..b34b8a95 100644
--- a/firmware/lib/cryptolib/sha1.c
+++ b/firmware/lib/cryptolib/sha1.c
@@ -6,6 +6,8 @@
  * Open Source Project (platorm/system/core.git/libmincrypt/sha.c
  */
 
+#include "sysincludes.h"
+
 #include "cryptolib.h"
 #include "utility.h"
 
diff --git a/firmware/lib/cryptolib/sha256.c b/firmware/lib/cryptolib/sha256.c
index 6d3c08dd..664b876c 100644
--- a/firmware/lib/cryptolib/sha256.c
+++ b/firmware/lib/cryptolib/sha256.c
@@ -35,6 +35,8 @@
  * SUCH DAMAGE.
  */
 
+#include "sysincludes.h"
+
 #include "cryptolib.h"
 #include "utility.h"
 
diff --git a/firmware/lib/cryptolib/sha512.c b/firmware/lib/cryptolib/sha512.c
index 66c9a35f..96b2bef6 100644
--- a/firmware/lib/cryptolib/sha512.c
+++ b/firmware/lib/cryptolib/sha512.c
@@ -35,6 +35,8 @@
  * SUCH DAMAGE.
  */
 
+#include "sysincludes.h"
+
 #include "cryptolib.h"
 #include "utility.h"
 
diff --git a/firmware/lib/cryptolib/sha_utility.c b/firmware/lib/cryptolib/sha_utility.c
index bd7e1400..6c7aa493 100644
--- a/firmware/lib/cryptolib/sha_utility.c
+++ b/firmware/lib/cryptolib/sha_utility.c
@@ -5,6 +5,8 @@
  * Utility functions for message digest functions.
  */
 
+#include "sysincludes.h"
+
 #include "cryptolib.h"
 #include "utility.h"
 #include "vboot_api.h"
diff --git a/firmware/include/load_firmware_fw.h b/firmware/lib/include/load_firmware_fw.h
index f582e880..555cf6fd 100644
--- a/firmware/include/load_firmware_fw.h
+++ b/firmware/lib/include/load_firmware_fw.h
@@ -9,7 +9,6 @@
 #ifndef VBOOT_REFERENCE_LOAD_FIRMWARE_FW_H_
 #define VBOOT_REFERENCE_LOAD_FIRMWARE_FW_H_
 
-#include "sysincludes.h"
 #include "vboot_api.h"
 #include "vboot_nvstorage.h"
 #include "vboot_struct.h"
diff --git a/firmware/include/load_kernel_fw.h b/firmware/lib/include/load_kernel_fw.h
index 7439e57c..dd6e1a84 100644
--- a/firmware/include/load_kernel_fw.h
+++ b/firmware/lib/include/load_kernel_fw.h
@@ -9,7 +9,6 @@
 #ifndef VBOOT_REFERENCE_LOAD_KERNEL_FW_H_
 #define VBOOT_REFERENCE_LOAD_KERNEL_FW_H_
 
-#include "sysincludes.h"
 #include "vboot_api.h"
 #include "vboot_nvstorage.h"
 
diff --git a/firmware/include/sysincludes.h b/firmware/lib/include/sysincludes.h
index 490b51cc..490b51cc 100644
--- a/firmware/include/sysincludes.h
+++ b/firmware/lib/include/sysincludes.h
diff --git a/firmware/include/utility.h b/firmware/lib/include/utility.h
index f6575ed5..f6575ed5 100644
--- a/firmware/include/utility.h
+++ b/firmware/lib/include/utility.h
diff --git a/firmware/lib/mocked_rollback_index.c b/firmware/lib/mocked_rollback_index.c
index 65dfd4de..e866f137 100644
--- a/firmware/lib/mocked_rollback_index.c
+++ b/firmware/lib/mocked_rollback_index.c
@@ -6,6 +6,8 @@
  * stored in the TPM NVRAM.
  */
 
+#include "sysincludes.h"
+
 #include "rollback_index.h"
 
 #include "tss_constants.h"
diff --git a/firmware/lib/mocked_tpm_bootmode.c b/firmware/lib/mocked_tpm_bootmode.c
index b42c2c79..e9d82def 100644
--- a/firmware/lib/mocked_tpm_bootmode.c
+++ b/firmware/lib/mocked_tpm_bootmode.c
@@ -5,8 +5,9 @@
  * Functions for updating the TPM state with the status of boot path.
  */
 
-#include "tpm_bootmode.h"
+#include "sysincludes.h"
 
+#include "tpm_bootmode.h"
 #include "tss_constants.h"
 
 const char* kBootStateSHA1Digests[] = {
diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c
index e430bea6..3744f4bb 100644
--- a/firmware/lib/rollback_index.c
+++ b/firmware/lib/rollback_index.c
@@ -6,6 +6,8 @@
  * stored in the TPM NVRAM.
  */
 
+#include "sysincludes.h"
+
 #include "crc8.h"
 #include "rollback_index.h"
 #include "tlcl.h"
diff --git a/firmware/lib/stateful_util.c b/firmware/lib/stateful_util.c
index 6db03fc5..fbbc48c9 100644
--- a/firmware/lib/stateful_util.c
+++ b/firmware/lib/stateful_util.c
@@ -5,6 +5,8 @@
  * Implementations of stateful memory operations.
  */
 
+#include "sysincludes.h"
+
 #include "stateful_util.h"
 #include "utility.h"
 
diff --git a/firmware/lib/tpm_bootmode.c b/firmware/lib/tpm_bootmode.c
index 218db207..a8e1a7cc 100644
--- a/firmware/lib/tpm_bootmode.c
+++ b/firmware/lib/tpm_bootmode.c
@@ -5,9 +5,10 @@
  * Functions for updating the TPM state with the status of boot path.
  */
 
-#include "tpm_bootmode.h"
+#include "sysincludes.h"
 
 #include "tlcl.h"
+#include "tpm_bootmode.h"
 #include "utility.h"
 #include "vboot_api.h"
 
diff --git a/firmware/lib/tpm_lite/mocked_tlcl.c b/firmware/lib/tpm_lite/mocked_tlcl.c
index e977cd5d..2657cb63 100644
--- a/firmware/lib/tpm_lite/mocked_tlcl.c
+++ b/firmware/lib/tpm_lite/mocked_tlcl.c
@@ -3,6 +3,8 @@
  * found in the LICENSE file.
  */
 
+#include "sysincludes.h"
+
 #include "tlcl.h"
 #include "tlcl_internal.h"
 #include "utility.h"
diff --git a/firmware/lib/tpm_lite/tlcl.c b/firmware/lib/tpm_lite/tlcl.c
index 50b3877b..c015e895 100644
--- a/firmware/lib/tpm_lite/tlcl.c
+++ b/firmware/lib/tpm_lite/tlcl.c
@@ -15,6 +15,7 @@
  */
 
 #include "sysincludes.h"
+
 #include "tlcl.h"
 #include "tlcl_internal.h"
 #include "tlcl_structures.h"
diff --git a/firmware/lib/utility.c b/firmware/lib/utility.c
index 66b8eff3..2f8c90dc 100644
--- a/firmware/lib/utility.c
+++ b/firmware/lib/utility.c
@@ -6,6 +6,7 @@
  */
 
 #include "sysincludes.h"
+
 #include "utility.h"
 
 int SafeMemcmp(const void *s1, const void *s2, size_t n) {
diff --git a/firmware/lib/utility_string.c b/firmware/lib/utility_string.c
index 4a7e3e38..361d1809 100644
--- a/firmware/lib/utility_string.c
+++ b/firmware/lib/utility_string.c
@@ -6,6 +6,7 @@
  */
 
 #include "sysincludes.h"
+
 #include "utility.h"
 
 
diff --git a/firmware/lib/vboot_api_firmware.c b/firmware/lib/vboot_api_firmware.c
index 5889e939..e0c93a37 100644
--- a/firmware/lib/vboot_api_firmware.c
+++ b/firmware/lib/vboot_api_firmware.c
@@ -5,6 +5,8 @@
  * High-level firmware wrapper API - entry points for init, firmware selection
  */
 
+#include "sysincludes.h"
+
 #include "gbb_header.h"
 #include "load_firmware_fw.h"
 #include "rollback_index.h"
diff --git a/firmware/lib/vboot_api_init.c b/firmware/lib/vboot_api_init.c
index 39c90562..b6c70642 100644
--- a/firmware/lib/vboot_api_init.c
+++ b/firmware/lib/vboot_api_init.c
@@ -5,6 +5,8 @@
  * High-level firmware wrapper API - entry points for init, firmware selection
  */
 
+#include "sysincludes.h"
+
 #include "gbb_header.h"
 #include "load_firmware_fw.h"
 #include "rollback_index.h"
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
index 483d47ed..3f1dfc5c 100644
--- a/firmware/lib/vboot_api_kernel.c
+++ b/firmware/lib/vboot_api_kernel.c
@@ -5,6 +5,8 @@
  * High-level firmware wrapper API - entry points for kernel selection
  */
 
+#include "sysincludes.h"
+
 #include "gbb_header.h"
 #include "load_kernel_fw.h"
 #include "rollback_index.h"
diff --git a/firmware/lib/vboot_audio.c b/firmware/lib/vboot_audio.c
index d89bc43f..2694b0eb 100644
--- a/firmware/lib/vboot_audio.c
+++ b/firmware/lib/vboot_audio.c
@@ -5,6 +5,8 @@
  * Delay/beep functions used in dev-mode kernel selection.
  */
 
+#include "sysincludes.h"
+
 #include "crc32.h"
 #include "gbb_header.h"
 #include "utility.h"
diff --git a/firmware/lib/vboot_common.c b/firmware/lib/vboot_common.c
index 3e3375f1..bd937102 100644
--- a/firmware/lib/vboot_common.c
+++ b/firmware/lib/vboot_common.c
@@ -6,6 +6,8 @@
  * (Firmware portion)
  */
 
+#include "sysincludes.h"
+
 #include "vboot_api.h"
 #include "vboot_common.h"
 #include "utility.h"
diff --git a/firmware/lib/vboot_common_init.c b/firmware/lib/vboot_common_init.c
index 9d6670ea..0e5e9f3e 100644
--- a/firmware/lib/vboot_common_init.c
+++ b/firmware/lib/vboot_common_init.c
@@ -6,6 +6,8 @@
  * (Firmware portion)
  */
 
+#include "sysincludes.h"
+
 #include "vboot_api.h"
 #include "vboot_common.h"
 #include "utility.h"
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index adf4a3f3..f79dfe13 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -5,6 +5,8 @@
  * Display functions used in kernel selection.
  */
 
+#include "sysincludes.h"
+
 #include "bmpblk_font.h"
 #include "gbb_header.h"
 #include "utility.h"
diff --git a/firmware/lib/vboot_firmware.c b/firmware/lib/vboot_firmware.c
index 405a545a..8d165f2a 100644
--- a/firmware/lib/vboot_firmware.c
+++ b/firmware/lib/vboot_firmware.c
@@ -6,6 +6,8 @@
  * (Firmware portion)
  */
 
+#include "sysincludes.h"
+
 #include "gbb_header.h"
 #include "load_firmware_fw.h"
 #include "utility.h"
diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c
index 41d44f6a..d63d4eed 100644
--- a/firmware/lib/vboot_kernel.c
+++ b/firmware/lib/vboot_kernel.c
@@ -6,6 +6,7 @@
  * (Firmware portion)
  */
 
+#include "sysincludes.h"
 
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
diff --git a/firmware/lib/vboot_nvstorage.c b/firmware/lib/vboot_nvstorage.c
index 618c7124..9b2eca1b 100644
--- a/firmware/lib/vboot_nvstorage.c
+++ b/firmware/lib/vboot_nvstorage.c
@@ -5,6 +5,8 @@
 
 /* Non-volatile storage routines.
  */
+#include "sysincludes.h"
+
 
 #include "crc8.h"
 #include "utility.h"
diff --git a/firmware/linktest/main.c b/firmware/linktest/main.c
index c5ce2c1c..2a55248c 100644
--- a/firmware/linktest/main.c
+++ b/firmware/linktest/main.c
@@ -3,6 +3,8 @@
  * found in the LICENSE file.
  */
 
+#include "sysincludes.h"
+
 #include "cgptlib.h"
 #include "load_firmware_fw.h"
 #include "load_kernel_fw.h"
diff --git a/firmware/linktest/main_vbinit.c b/firmware/linktest/main_vbinit.c
index a3d50196..0300c915 100644
--- a/firmware/linktest/main_vbinit.c
+++ b/firmware/linktest/main_vbinit.c
@@ -3,6 +3,8 @@
  * found in the LICENSE file.
  */
 
+#include "sysincludes.h"
+
 #include "vboot_api.h"
 
 int main(void)
diff --git a/firmware/linktest/main_vbsf.c b/firmware/linktest/main_vbsf.c
index 1a3825a8..db5c2660 100644
--- a/firmware/linktest/main_vbsf.c
+++ b/firmware/linktest/main_vbsf.c
@@ -3,6 +3,8 @@
  * found in the LICENSE file.
  */
 
+#include "sysincludes.h"
+
 #include "vboot_api.h"
 
 int main(void)
diff --git a/firmware/stub/tpm_lite_stub.c b/firmware/stub/tpm_lite_stub.c
index 6818f2b1..5e6c7192 100644
--- a/firmware/stub/tpm_lite_stub.c
+++ b/firmware/stub/tpm_lite_stub.c
@@ -6,6 +6,8 @@
  * equivalents.
  */
 
+#include <stdint.h>
+
 #define _STUB_IMPLEMENTATION_
 #include "tlcl.h"
 #include "tlcl_internal.h"
@@ -24,6 +26,7 @@
 #include <time.h>
 #include <unistd.h>
 
+
 #define TPM_DEVICE_PATH "/dev/tpm0"
 /* Retry failed open()s for 5 seconds in 10ms polling intervals. */
 #define OPEN_RETRY_DELAY_NS (10 * 1000 * 1000)
diff --git a/firmware/stub/utility_stub.c b/firmware/stub/utility_stub.c
index 549ee851..a1daed08 100644
--- a/firmware/stub/utility_stub.c
+++ b/firmware/stub/utility_stub.c
@@ -6,6 +6,8 @@
  * equivalents.
  */
 
+#include <stdint.h>
+
 #define _STUB_IMPLEMENTATION_
 #include "utility.h"
 
diff --git a/firmware/stub/vboot_api_stub.c b/firmware/stub/vboot_api_stub.c
index fd531ac7..36d56032 100644
--- a/firmware/stub/vboot_api_stub.c
+++ b/firmware/stub/vboot_api_stub.c
@@ -5,6 +5,8 @@
  * Stub implementations of firmware-provided API functions.
  */
 
+#include <stdint.h>
+
 #define _STUB_IMPLEMENTATION_
 
 #include <stdarg.h>
diff --git a/firmware/stub/vboot_api_stub_disk.c b/firmware/stub/vboot_api_stub_disk.c
index aca38afa..186cd97d 100644
--- a/firmware/stub/vboot_api_stub_disk.c
+++ b/firmware/stub/vboot_api_stub_disk.c
@@ -5,6 +5,8 @@
  * Stub implementations of disk APIs.
  */
 
+#include <stdint.h>
+
 #define _STUB_IMPLEMENTATION_
 
 #include <stdarg.h>
diff --git a/firmware/stub/vboot_api_stub_init.c b/firmware/stub/vboot_api_stub_init.c
index 76052da1..9e4f6370 100644
--- a/firmware/stub/vboot_api_stub_init.c
+++ b/firmware/stub/vboot_api_stub_init.c
@@ -5,6 +5,8 @@
  * Stub implementations of firmware-provided API functions.
  */
 
+#include <stdint.h>
+
 #define _STUB_IMPLEMENTATION_
 
 #include <stdarg.h>
diff --git a/firmware/stub/vboot_api_stub_sf.c b/firmware/stub/vboot_api_stub_sf.c
index 96eeb85c..e2f1c1ae 100644
--- a/firmware/stub/vboot_api_stub_sf.c
+++ b/firmware/stub/vboot_api_stub_sf.c
@@ -5,6 +5,8 @@
  * Stub implementations of firmware-provided API functions.
  */
 
+#include <stdint.h>
+
 #define _STUB_IMPLEMENTATION_
 
 #include <stdarg.h>