vboot: fix up some more includes

Should have no extra line breaks in between local includes,
and should be sorted alphabetically.

BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none

Change-Id: I83c25d30d7376712857314965a7d93f57190aa3f
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1776281
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>

cgpt/cgpt_add.c

@@ -6,8 +6,8 @@
 #include <string.h>
 
 #include "cgpt.h"
-#include "cgpt_params.h"
 #include "cgptlib_internal.h"
+#include "cgpt_params.h"
 #include "utility.h"
 #include "vboot_host.h"
 

cgpt/cgpt_boot.c

@@ -9,8 +9,8 @@
 #include <unistd.h>
 
 #include "cgpt.h"
-#include "cgpt_params.h"
 #include "cgptlib_internal.h"
+#include "cgpt_params.h"
 #include "vboot_host.h"
 
 int CgptGetBootPartitionNumber(CgptBootParams *params) {

cgpt/cgpt_edit.c

@@ -4,8 +4,8 @@
  */
 
 #include "cgpt.h"
-#include "cgpt_params.h"
 #include "cgptlib_internal.h"
+#include "cgpt_params.h"
 #include "vboot_host.h"
 
 int CgptEdit(CgptEditParams *params) {

cgpt/cgpt_find.c

@@ -10,8 +10,8 @@
 #include <unistd.h>
 
 #include "cgpt.h"
-#include "cgpt_nor.h"
 #include "cgptlib_internal.h"
+#include "cgpt_nor.h"
 #include "vboot_host.h"
 
 #define BUFSIZE 1024

cgpt/cgpt_wrapper.c

@@ -22,10 +22,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
-
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "cgpt.h"
 #include "cgpt_nor.h"
 #include "file_keys.h"

firmware/2lib/2api.c

@@ -6,14 +6,14 @@
  * (Firmware portion)
  */
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"
+#include "2rsa.h"
 #include "2secdata.h"
 #include "2sha.h"
-#include "2rsa.h"
+#include "2sysincludes.h"
 #include "2tpm_bootmode.h"
 
 void vb2api_fail(struct vb2_context *ctx, uint8_t reason, uint8_t subcode)

firmware/2lib/2common.c

@@ -6,10 +6,10 @@
  * (Firmware portion)
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 
 vb2_error_t vb2_safe_memcmp(const void *s1, const void *s2, size_t size)
 {

firmware/2lib/2crc8.c

@@ -5,8 +5,8 @@
  * Very simple 8-bit CRC function.
  */
 
-#include "2sysincludes.h"
 #include "2crc8.h"
+#include "2sysincludes.h"
 
 /* Uses CRC-8 ITU version, with x^8 + x^2 + x + 1 polynomial.
    Note that result will evaluate to zero for a buffer of all zeroes. */

firmware/2lib/2hmac.c

@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include "2sysincludes.h"
-#include "2sha.h"
 #include "2hmac.h"
+#include "2sha.h"
+#include "2sysincludes.h"
 
 int hmac(enum vb2_hash_algorithm alg,
 	 const void *key, uint32_t key_size,

firmware/2lib/2misc.c

@@ -5,14 +5,14 @@
  * Misc functions which need access to vb2_context but are not public APIs
  */
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"
+#include "2rsa.h"
 #include "2secdata.h"
 #include "2sha.h"
-#include "2rsa.h"
+#include "2sysincludes.h"
 
 vb2_error_t vb2_validate_gbb_signature(uint8_t *sig)
 {

firmware/2lib/2nvstorage.c

@@ -5,12 +5,12 @@
 
 /* Non-volatile storage routines */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2crc8.h"
 #include "2misc.h"
-#include "2nvstorage.h"
 #include "2nvstorage_fields.h"
+#include "2nvstorage.h"
+#include "2sysincludes.h"
 
 static void vb2_nv_regen_crc(struct vb2_context *ctx)
 {

firmware/2lib/2rsa.c

@@ -9,10 +9,10 @@
  * multiple RSA key lengths and hash digest algorithms.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "vboot_test.h"
 
 /**

firmware/2lib/2secdata_firmware.c

@@ -5,12 +5,12 @@
  * Secure storage APIs
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2crc8.h"
 #include "2misc.h"
 #include "2secdata.h"
 #include "2secdata_struct.h"
+#include "2sysincludes.h"
 
 vb2_error_t vb2api_secdata_firmware_check(struct vb2_context *ctx)
 {

firmware/2lib/2secdata_fwmp.c

@@ -5,8 +5,8 @@
  * Firmware management parameters (FWMP) APIs
  */
 
-#include "2crc8.h"
 #include "2common.h"
+#include "2crc8.h"
 #include "2misc.h"
 #include "2secdata.h"
 #include "2secdata_struct.h"

firmware/2lib/2secdata_kernel.c

@@ -5,12 +5,12 @@
  * Secure storage APIs - kernel version space
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2crc8.h"
 #include "2misc.h"
 #include "2secdata.h"
 #include "2secdata_struct.h"
+#include "2sysincludes.h"
 
 vb2_error_t vb2api_secdata_kernel_check(struct vb2_context *ctx)
 {

firmware/2lib/2sha1.c

@@ -6,9 +6,9 @@
  * Open Source Project (platorm/system/core.git/libmincrypt/sha.c
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 
 /*
  * Some machines lack byteswap.h and endian.h. These have to use the

firmware/2lib/2sha256.c

@@ -35,9 +35,9 @@
  * SUCH DAMAGE.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 
 #define SHFR(x, n)    (x >> n)
 #define ROTR(x, n)   ((x >> n) | (x << ((sizeof(x) << 3) - n)))

firmware/2lib/2sha512.c

@@ -35,9 +35,9 @@
  * SUCH DAMAGE.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 
 #define SHFR(x, n)    (x >> n)
 #define ROTR(x, n)   ((x >> n) | (x << ((sizeof(x) << 3) - n)))

firmware/2lib/2sha_utility.c

@@ -5,9 +5,9 @@
  * Utility functions for message digest functions.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 
 #if VB2_SUPPORT_SHA1
 #define CTH_SHA1 VB2_HASH_SHA1

firmware/2lib/2stub.c

@@ -8,8 +8,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "2sysincludes.h"
 #include "2api.h"
+#include "2sysincludes.h"
 
 __attribute__((weak))
 void vb2ex_printf(const char *func, const char *fmt, ...)

firmware/2lib/2tpm_bootmode.c

@@ -5,9 +5,9 @@
  * Functions for updating the TPM state with the status of boot path.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "2tpm_bootmode.h"
 
 /*

firmware/2lib/include/2return_codes.h

@@ -6,6 +6,8 @@
 #ifndef VBOOT_REFERENCE_2RETURN_CODES_H_
 #define VBOOT_REFERENCE_2RETURN_CODES_H_
 
+#include "2sysincludes.h"
+
 /*
  * Functions which return an error all return this type.  This is a 32-bit
  * value rather than an int so it's consistent across different architectures.

firmware/lib/cgptlib/cgptlib.c

@@ -3,9 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
-
+#include "2sysincludes.h"
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
 #include "crc32.h"

firmware/lib/cgptlib/cgptlib_internal.c

@@ -4,7 +4,6 @@
  */
 
 #include "2sysincludes.h"
-
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
 #include "crc32.h"

firmware/lib/cgptlib/crc32.c

@@ -39,8 +39,8 @@
 /*      polynomial $edb88320                                              */
 /*                                                                        */
 /*  --------------------------------------------------------------------  */
-#include "2sysincludes.h"
 
+#include "2sysincludes.h"
 #include "crc32.h"
 
 static uint32_t crc32_tab[] = {

firmware/lib/ec_sync.c

@@ -5,11 +5,10 @@
  * EC software sync routines for vboot
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"
-
+#include "2sysincludes.h"
 #include "ec_sync.h"
 #include "vboot_api.h"
 #include "vboot_common.h"

firmware/lib/ec_sync_all.c

@@ -5,11 +5,10 @@
  * EC software sync routines for vboot
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"
-
+#include "2sysincludes.h"
 #include "ec_sync.h"
 #include "vboot_api.h"
 #include "vboot_common.h"

firmware/lib/gpt_misc.c

@@ -3,9 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
-
+#include "2sysincludes.h"
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
 #include "crc32.h"
@@ -13,7 +12,6 @@
 #include "utility.h"
 #include "vboot_api.h"
 
-
 /**
  * Allocate and read GPT data from the drive.
  *

firmware/lib/mocked_secdata_tpm.c

@@ -6,9 +6,9 @@
  * stored in the TPM NVRAM.
  */
 
-#include "utility.h"
 #include "secdata_tpm.h"
 #include "tss_constants.h"
+#include "utility.h"
 
 vb2_error_t SetVirtualDevMode(int val)
 {

firmware/lib/secdata_tpm.c

@@ -6,9 +6,11 @@
  * stored in the TPM NVRAM.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2crc8.h"
+#include "2nvstorage.h"
+#include "2secdata.h"
+#include "2sysincludes.h"
 #include "secdata_tpm.h"
 #include "tlcl.h"
 #include "tss_constants.h"

firmware/lib/tpm2_lite/marshaling.c

@@ -3,9 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
-
+#include "2sysincludes.h"
 #include "tpm2_marshaling.h"
 #include "utility.h"
 

firmware/lib/tpm2_lite/tlcl.c

@@ -7,8 +7,8 @@
  */
 
 #include "2common.h"
-#include "secdata_tpm.h"
 #include "2sysincludes.h"
+#include "secdata_tpm.h"
 #include "tlcl.h"
 #include "tpm2_marshaling.h"
 #include "utility.h"

firmware/lib/tpm_lite/mocked_tlcl.c

@@ -4,7 +4,6 @@
  */
 
 #include "2sysincludes.h"
-
 #include "tlcl.h"
 #include "tlcl_internal.h"
 #include "utility.h"

firmware/lib/tpm_lite/tlcl.c

@@ -14,11 +14,10 @@
  * time.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2hmac.h"
 #include "2sha.h"
-
+#include "2sysincludes.h"
 #include "tlcl.h"
 #include "tlcl_internal.h"
 #include "tlcl_structures.h"

firmware/lib/utility_string.c

@@ -6,10 +6,8 @@
  */
 
 #include "2sysincludes.h"
-
 #include "utility.h"
 
-
 uint32_t Uint64ToString(char *buf, uint32_t bufsize, uint64_t value,
 			uint32_t radix, uint32_t zero_pad_width)
 {

firmware/lib/vboot_api_kernel.c

@@ -5,7 +5,6 @@
  * High-level firmware wrapper API - entry points for kernel selection
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"

firmware/lib/vboot_audio.c

@@ -5,10 +5,9 @@
  * Delay/beep functions used in dev-mode kernel selection.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2misc.h"
-
+#include "2sysincludes.h"
 #include "utility.h"
 #include "vboot_api.h"
 #include "vboot_audio.h"

firmware/lib/vboot_common.c

@@ -6,14 +6,14 @@
  * (Firmware portion)
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2rsa.h"
 #include "2sha.h"
+#include "2sysincludes.h"
+#include "utility.h"
 #include "vboot_api.h"
 #include "vboot_common.h"
-#include "utility.h"
 
 const char *kVbootErrors[VBOOT_ERROR_MAX] = {
 	"Success.",

firmware/lib/vboot_common_init.c

@@ -6,12 +6,11 @@
  * (Firmware portion)
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
-
+#include "2sysincludes.h"
+#include "utility.h"
 #include "vboot_api.h"
 #include "vboot_common.h"
-#include "utility.h"
 
 vb2_error_t VbSharedDataInit(VbSharedDataHeader *header, uint64_t size)
 {

firmware/lib/vboot_display.c

@@ -5,11 +5,11 @@
  * Display functions used in kernel selection.
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "utility.h"
 #include "vboot_api.h"
 #include "vboot_common.h"

firmware/lib/vboot_ui.c

@@ -5,12 +5,12 @@
  * High-level firmware wrapper API - user interface for RW firmware
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2rsa.h"
 #include "2secdata.h"
+#include "2sysincludes.h"
 #include "ec_sync.h"
 #include "load_kernel_fw.h"
 #include "secdata_tpm.h"

firmware/lib/vboot_ui_common.c

@@ -6,8 +6,8 @@
  */
 
 #include "2common.h"
-#include "secdata_tpm.h"
 #include "2sysincludes.h"
+#include "secdata_tpm.h"
 #include "vboot_api.h"
 #include "vboot_kernel.h"
 #include "vboot_ui_common.h"

firmware/lib20/api.c

@@ -6,13 +6,13 @@
  * (Firmware portion)
  */
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2misc.h"
 #include "2nvstorage.h"
+#include "2rsa.h"
 #include "2secdata.h"
 #include "2sha.h"
-#include "2rsa.h"
+#include "2sysincludes.h"
 #include "vb2_common.h"
 
 vb2_error_t vb2api_fw_phase3(struct vb2_context *ctx)

firmware/lib20/api_kernel.c

@@ -6,13 +6,13 @@
  * (Kernel portion)
  */
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2misc.h"
 #include "2nvstorage.h"
+#include "2rsa.h"
 #include "2secdata.h"
 #include "2sha.h"
-#include "2rsa.h"
+#include "2sysincludes.h"
 #include "vb2_common.h"
 
 vb2_error_t vb2api_kernel_phase1(struct vb2_context *ctx)

firmware/lib20/common.c

@@ -6,9 +6,9 @@
  * (Firmware portion)
  */
 
-#include "2sysincludes.h"
 #include "2rsa.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "vb2_common.h"
 
 uint8_t *vb2_signature_data(struct vb2_signature *sig)

firmware/lib20/kernel.c

@@ -6,12 +6,12 @@
  */
 
 #include "2common.h"
-#include "2sysincludes.h"
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2rsa.h"
 #include "2secdata.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "vb2_common.h"
 
 static const uint8_t *vb2_signature_data_const(const struct vb2_signature *sig)

firmware/lib20/misc.c

@@ -5,13 +5,13 @@
  * Misc functions which need access to vb2_context but are not public APIs
  */
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2misc.h"
 #include "2nvstorage.h"
+#include "2rsa.h"
 #include "2secdata.h"
 #include "2sha.h"
-#include "2rsa.h"
+#include "2sysincludes.h"
 #include "vb2_common.h"
 
 /*

firmware/lib20/packed_key.c

@@ -6,8 +6,8 @@
  */
 
 #include "2common.h"
-#include "2sysincludes.h"
 #include "2rsa.h"
+#include "2sysincludes.h"
 #include "vb2_common.h"
 
 vb2_error_t vb2_unpack_key_buffer(struct vb2_public_key *key,

firmware/lib21/api.c

@@ -6,14 +6,14 @@
  * (Firmware portion)
  */
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"
+#include "2rsa.h"
 #include "2secdata.h"
 #include "2sha.h"
-#include "2rsa.h"
+#include "2sysincludes.h"
 #include "vb21_common.h"
 
 vb2_error_t vb21api_fw_phase3(struct vb2_context *ctx)

firmware/lib21/common.c

@@ -5,10 +5,10 @@
  * Signature validation functions
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "vb21_common.h"
 
 const char *vb21_common_desc(const void *buf)

firmware/lib21/misc.c

@@ -5,14 +5,14 @@
  * Misc functions which need access to vb2_context but are not public APIs
  */
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"
+#include "2rsa.h"
 #include "2secdata.h"
 #include "2sha.h"
-#include "2rsa.h"
+#include "2sysincludes.h"
 #include "vb21_common.h"
 
 /**

firmware/lib21/packed_key.c

@@ -5,9 +5,9 @@
  * Key unpacking functions
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
+#include "2sysincludes.h"
 #include "vb21_common.h"
 
 vb2_error_t vb2_unpack_key_data(struct vb2_public_key *key,

firmware/linktest/main.c

@@ -11,7 +11,6 @@
 #include "vboot_common.h"
 #include "vboot_kernel.h"
 
-
 int main(void)
 {
 	/* cgptlib.h */

firmware/stub/tpm_lite_stub.c

@@ -7,15 +7,6 @@
  */
 
 #include <stdint.h>
-
-#include "2sysincludes.h"
-#include "2common.h"
-
-#include "tlcl.h"
-#include "tlcl_internal.h"
-#include "utility.h"
-#include "vboot_api.h"
-
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
@@ -28,6 +19,12 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "2common.h"
+#include "2sysincludes.h"
+#include "tlcl.h"
+#include "tlcl_internal.h"
+#include "utility.h"
+#include "vboot_api.h"
 
 #define TPM_DEVICE_PATH "/dev/tpm0"
 /* Retry failed open()s for 5 seconds in 10ms polling intervals. */

futility/cmd_create.c

@@ -3,28 +3,26 @@
  * found in the LICENSE file.
  */
 
+#include <openssl/pem.h>
+
 #include <getopt.h>
 #include <stdio.h>
 #include <unistd.h>
 
-#include <openssl/pem.h>
-
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2id.h"
 #include "2rsa.h"
 #include "2sha.h"
-#include "openssl_compat.h"
-#include "util_misc.h"
-#include "vb2_common.h"
-#include "vb21_common.h"
-
-#include "host_key.h"
-#include "host_key2.h"
-#include "host_misc2.h"
-
+#include "2sysincludes.h"
 #include "futility.h"
 #include "futility_options.h"
+#include "host_key2.h"
+#include "host_key.h"
+#include "host_misc2.h"
+#include "openssl_compat.h"
+#include "util_misc.h"
+#include "vb21_common.h"
+#include "vb2_common.h"
 
 /* Command line options */
 enum {

futility/cmd_load_fmap.c

@@ -20,7 +20,6 @@
 #include "fmap.h"
 #include "futility.h"
 
-
 static const char usage[] = "\n"
 	"Usage:  " MYNAME " %s [OPTIONS] FILE AREA:file [AREA:file ...]\n"
 	"\n"

futility/cmd_pcr.c

@@ -9,9 +9,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "futility.h"
 
 static const char usage[] = "\n"

futility/cmd_show.c

@@ -18,12 +18,12 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2common.h"
 #include "2sha.h"
-#include "file_type.h"
+#include "2sysincludes.h"
 #include "file_type_bios.h"
+#include "file_type.h"
 #include "fmap.h"
 #include "futility.h"
 #include "futility_options.h"

futility/cmd_sign.c

@@ -18,8 +18,8 @@
 #include <unistd.h>
 
 #include "2common.h"
-#include "file_type.h"
 #include "file_type_bios.h"
+#include "file_type.h"
 #include "fmap.h"
 #include "futility.h"
 #include "futility_options.h"
@@ -28,9 +28,9 @@
 #include "kernel_blob.h"
 #include "util_misc.h"
 #include "vb1_helper.h"
+#include "vb21_common.h"
 #include "vb2_common.h"
 #include "vb2_struct.h"
-#include "vb21_common.h"
 #include "vboot_common.h"
 
 /* Options */

futility/cmd_vbutil_firmware.c

@@ -12,18 +12,18 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2common.h"
 #include "2rsa.h"
+#include "2sysincludes.h"
 #include "futility.h"
 #include "host_common.h"
 #include "host_key2.h"
 #include "kernel_blob.h"
 #include "util_misc.h"
-#include "vboot_common.h"
 #include "vb1_helper.h"
 #include "vb2_common.h"
+#include "vboot_common.h"
 
 /* Command line options */
 enum {

futility/cmd_vbutil_kernel.c

@@ -19,8 +19,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
+#include "2sysincludes.h"
 #include "file_type.h"
 #include "futility.h"
 #include "host_common.h"

futility/cmd_vbutil_keyblock.c

@@ -11,9 +11,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
+#include "2sysincludes.h"
 #include "futility.h"
 #include "host_common.h"
 #include "host_key2.h"

futility/file_type_bios.c

@@ -9,9 +9,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "fmap.h"
-#include "file_type.h"
 #include "file_type_bios.h"
+#include "file_type.h"
+#include "fmap.h"
 #include "futility.h"
 #include "futility_options.h"
 #include "host_common.h"

futility/file_type_rwsig.c

@@ -14,20 +14,20 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "file_type.h"
 #include "fmap.h"
 #include "futility.h"
 #include "futility_options.h"
-#include "vb21_common.h"
 #include "host_common.h"
 #include "host_key2.h"
 #include "host_misc.h"
 #include "host_signature2.h"
 #include "util_misc.h"
+#include "vb21_common.h"
 
 #define SIGNATURE_RSVD_SIZE 1024
 #define EC_RW_FILENAME "EC_RW.bin"

futility/file_type_usbpd1.c

@@ -16,18 +16,18 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
-#include "2sha.h"
 #include "2rsa.h"
+#include "2sha.h"
+#include "2sysincludes.h"
 #include "file_type.h"
 #include "futility.h"
 #include "futility_options.h"
-#include "vb21_common.h"
 #include "host_common.h"
 #include "host_key2.h"
 #include "host_signature2.h"
 #include "util_misc.h"
+#include "vb21_common.h"
 
 /* Return 1 if okay, 0 if not */
 static int parse_size_opts(uint32_t len,

futility/futility_options.h

@@ -10,9 +10,10 @@
 #define VBOOT_REFERENCE_FUTILITY_OPTIONS_H_
 
 #include <stdint.h>
-#include "vboot_common.h"
-#include "file_type.h"
+
 #include "2rsa.h"
+#include "file_type.h"
+#include "vboot_common.h"
 
 struct vb2_private_key;
 struct vb21_packed_key;

futility/misc.c

@@ -20,10 +20,9 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
-
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "cgptlib_internal.h"
 #include "file_type.h"
 #include "futility.h"

futility/ryu_root_header.c

@@ -15,9 +15,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "futility.h"
 
 #define SEARCH_STRIDE 4

futility/updater.c

@@ -13,8 +13,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "2rsa.h"
 #include "2common.h"
+#include "2rsa.h"
 #include "crossystem.h"
 #include "fmap.h"
 #include "futility.h"

futility/vb1_helper.c

@@ -10,11 +10,11 @@
 #include <unistd.h>
 #include <openssl/rsa.h>
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "file_type.h"
 #include "futility.h"
 #include "host_common.h"

futility/vb2_helper.c

@@ -5,22 +5,20 @@
 
 #include <openssl/pem.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2id.h"
 #include "2rsa.h"
 #include "2sha.h"
-#include "openssl_compat.h"
-#include "util_misc.h"
-#include "vb21_common.h"
-
-#include "host_common.h"
-#include "host_key2.h"
-#include "host_misc2.h"
-
+#include "2sysincludes.h"
 #include "file_type.h"
 #include "futility.h"
 #include "futility_options.h"
+#include "host_common.h"
+#include "host_key2.h"
+#include "host_misc2.h"
+#include "openssl_compat.h"
+#include "util_misc.h"
+#include "vb21_common.h"
 
 int vb2_lookup_hash_alg(const char *str, enum vb2_hash_algorithm *alg)
 {

host/arch/arm/lib/crossystem_arch.c

@@ -22,11 +22,11 @@
 #include <unistd.h>
 #include <netinet/in.h>
 
-#include "vboot_common.h"
-#include "host_common.h"
-#include "crossystem.h"
 #include "crossystem_arch.h"
+#include "crossystem.h"
 #include "crossystem_vbnv.h"
+#include "host_common.h"
+#include "vboot_common.h"
 
 /* Base name for firmware FDT files */
 #define FDT_BASE_PATH "/proc/device-tree/firmware/chromeos"

host/arch/mips/lib/crossystem_arch.c

@@ -5,10 +5,10 @@
 
 #include <string.h>
 
-#include "vboot_common.h"
-#include "host_common.h"
-#include "crossystem.h"
 #include "crossystem_arch.h"
+#include "crossystem.h"
+#include "host_common.h"
+#include "vboot_common.h"
 
 /* TODO: Currently these are stub implementations providing reasonable defaults
  * wherever possible. They will need real implementation as part of of MIPS

host/arch/x86/lib/crossystem_arch.c

@@ -16,15 +16,14 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "crossystem.h"
 #include "crossystem_arch.h"
+#include "crossystem.h"
 #include "crossystem_vbnv.h"
 #include "host_common.h"
 #include "utility.h"
 #include "vboot_common.h"
 #include "vboot_struct.h"
 
-
 /* ACPI constants from Chrome OS Main Processor Firmware Spec */
 /* Boot reasons from BINF.0, from early H2C firmware */
 /* Unknown */

host/lib/crossystem.c

@@ -16,16 +16,14 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2common.h"
 #include "2nvstorage.h"
-
-#include "host_common.h"
-
-#include "crossystem.h"
+#include "2sysincludes.h"
 #include "crossystem_arch.h"
+#include "crossystem.h"
 #include "crossystem_vbnv.h"
+#include "host_common.h"
 #include "utility.h"
 #include "vboot_struct.h"
 

host/lib/extract_vmlinuz.c

@@ -14,7 +14,6 @@
 #include "vboot_host.h"
 #include "vboot_struct.h"
 
-
 int ExtractVmlinuz(void *kpart_data, size_t kpart_size,
 		   void **vmlinuz_out, size_t *vmlinuz_size) {
 	size_t now = 0;

host/lib/file_keys.c

@@ -13,10 +13,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
-
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "file_keys.h"
 #include "host_common.h"
 #include "signature_digest.h"

host/lib/host_common.c

@@ -7,9 +7,9 @@
 
 #include <string.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
+#include "2sysincludes.h"
 #include "host_common.h"
 #include "host_key2.h"
 #include "utility.h"

host/lib/host_key.c

@@ -13,10 +13,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "host_common.h"
 #include "host_misc.h"
 #include "vb2_common.h"

host/lib/host_key2.c

@@ -13,13 +13,13 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "host_common.h"
-#include "host_key.h"
 #include "host_key2.h"
+#include "host_key.h"
 #include "host_misc.h"
 #include "vb2_common.h"
 #include "vboot_common.h"

host/lib/host_keyblock.c

@@ -14,9 +14,9 @@
 #include "2rsa.h"
 #include "2sha.h"
 #include "host_common.h"
-#include "host_key.h"
 #include "host_key2.h"
 #include "host_keyblock.h"
+#include "host_key.h"
 #include "vb2_common.h"
 #include "vb2_struct.h"
 #include "vboot_common.h"

host/lib/host_signature.c

@@ -15,11 +15,10 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
-
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "host_common.h"
 #include "host_signature2.h"
 #include "vb2_common.h"

host/lib/include/util_misc.h

@@ -10,6 +10,7 @@
 
 #include "host_key.h"
 #include "vboot_struct.h"
+
 struct rsa_st;
 struct vb2_packed_key;
 struct vb2_private_key;

host/lib/signature_digest.c

@@ -9,11 +9,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
-
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "host_common.h"
 #include "host_signature2.h"
 #include "signature_digest.h"

host/lib/util_misc.c

@@ -13,15 +13,14 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
-
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "host_common.h"
+#include "host_key2.h"
 #include "openssl_compat.h"
 #include "util_misc.h"
 #include "vb2_common.h"
-#include "host_key2.h"
 #include "vboot_common.h"
 
 const char *packed_key_sha1_string(const struct vb2_packed_key *key)

host/lib21/host_fw_preamble.c

@@ -5,9 +5,9 @@
  * Host functions for keyblocks
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
+#include "2sysincludes.h"
 #include "host_common.h"
 #include "host_fw_preamble2.h"
 #include "host_key2.h"

host/lib21/host_key.c

@@ -9,15 +9,15 @@
 
 #include <openssl/pem.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
-#include "vb21_common.h"
+#include "2sysincludes.h"
 #include "host_common.h"
 #include "host_key2.h"
 #include "host_misc.h"
 #include "openssl_compat.h"
+#include "vb21_common.h"
 
 const struct vb2_text_vs_enum vb2_text_vs_sig[] = {
 	{"RSA1024", VB2_SIG_RSA1024},

host/lib21/host_keyblock.c

@@ -5,15 +5,15 @@
  * Host functions for keyblocks
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
-#include "vb21_common.h"
+#include "2sysincludes.h"
 #include "host_common.h"
 #include "host_key2.h"
 #include "host_keyblock2.h"
 #include "host_misc.h"
 #include "host_signature2.h"
+#include "vb21_common.h"
 
 vb2_error_t vb21_keyblock_create(struct vb21_keyblock **kb_ptr,
 				 const struct vb2_public_key *data_key,

host/lib21/host_misc.c

@@ -10,12 +10,12 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2sha.h"
-#include "vb21_common.h"
+#include "2sysincludes.h"
 #include "host_common.h"
 #include "host_misc2.h"
+#include "vb21_common.h"
 
 vb2_error_t vb2_read_file(const char *filename, uint8_t **data_ptr,
 			  uint32_t *size_ptr)

host/lib21/host_signature.c

@@ -7,15 +7,15 @@
 
 #include <openssl/rsa.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
-#include "vb21_common.h"
+#include "2sysincludes.h"
 #include "host_common.h"
 #include "host_key2.h"
-#include "host_signature2.h"
 #include "host_misc.h"
+#include "host_signature2.h"
+#include "vb21_common.h"
 
 vb2_error_t vb2_digest_info(enum vb2_hash_algorithm hash_alg,
 			    const uint8_t **buf_ptr, uint32_t *size_ptr)

tests/crc32_test.c

@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include "crc32_test.h"
 #include "cgptlib_test.h"
 #include "crc32.h"
+#include "crc32_test.h"
 #include "test_common.h"
 #include "utility.h"
 

tests/ec_sync_tests.c

@@ -9,10 +9,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"
+#include "2sysincludes.h"
 #include "ec_sync.h"
 #include "host_common.h"
 #include "load_kernel_fw.h"

tests/futility/test_not_really.c

@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+
 #include "2struct.h"
 #include "test_common.h"
 

tests/sha_benchmark.c

@@ -7,9 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "2sysincludes.h"
 #include "2common.h"
 #include "2sha.h"
+#include "2sysincludes.h"
 #include "host_common.h"
 #include "timer_utils.h"
 

tests/timer_utils.h

@@ -7,7 +7,6 @@
 #define VBOOT_REFERENCE_TIMER_UTILS_H_
 
 #include <inttypes.h>
-
 #include <time.h>
 
 typedef struct ClockTimer {

tests/utility_string_tests.c

@@ -14,7 +14,6 @@
 #include "utility.h"
 #include "vboot_common.h"
 
-
 /* Test string concatenation */
 static void StrncatTest(void) {
 	char dest[128];

tests/vb20_api_kernel_tests.c

@@ -7,15 +7,15 @@
 
 #include <stdio.h>
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2rsa.h"
 #include "2secdata.h"
-#include "vb2_common.h"
+#include "2sysincludes.h"
 #include "test_common.h"
+#include "vb2_common.h"
 
 /* Common context for tests */
 static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE]

tests/vb20_api_tests.c

@@ -7,14 +7,14 @@
 
 #include <stdio.h>
 
-#include "2sysincludes.h"
 #include "2api.h"
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2rsa.h"
 #include "2secdata.h"
-#include "vb2_common.h"
+#include "2sysincludes.h"
 #include "test_common.h"
+#include "vb2_common.h"
 
 /* Common context for tests */
 static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]

tests/vb20_common2_tests.c

@@ -9,15 +9,14 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "2sysincludes.h"
 #include "2rsa.h"
+#include "2sysincludes.h"
 #include "file_keys.h"
 #include "host_common.h"
 #include "host_key2.h"
+#include "test_common.h"
 #include "vb2_common.h"
 #include "vboot_common.h"
-#include "test_common.h"
-
 
 static const uint8_t test_data[] = "This is some test data to sign.";
 static const uint32_t test_size = sizeof(test_data);

tests/vb20_common3_tests.c

@@ -7,17 +7,16 @@
 
 #include <stdio.h>
 
-#include "2sysincludes.h"
 #include "2rsa.h"
-
+#include "2sysincludes.h"
 #include "file_keys.h"
 #include "host_common.h"
-#include "host_key.h"
 #include "host_keyblock.h"
+#include "host_key.h"
 #include "host_signature.h"
+#include "test_common.h"
 #include "vb2_common.h"
 #include "vboot_common.h"
-#include "test_common.h"
 
 static void resign_keyblock(struct vb2_keyblock *h,
 			    const struct vb2_private_key *key)