vboot: remove unnecessary vboot_common.h includes

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

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

31 files changed, 6 insertions, 27 deletions

diff --git a/firmware/2lib/2ec_sync.c b/firmware/2lib/2ec_sync.c
index d2c663d1..aa06303b 100644
--- a/firmware/2lib/2ec_sync.c
+++ b/firmware/2lib/2ec_sync.c
@@ -11,7 +11,6 @@
 #include "2nvstorage.h"
 #include "2sysincludes.h"
 #include "vboot_api.h"
-#include "vboot_common.h"
 #include "vboot_display.h"
 #include "vboot_kernel.h"
 
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
index 7b9d50e9..0c825519 100644
--- a/firmware/lib/vboot_api_kernel.c
+++ b/firmware/lib/vboot_api_kernel.c
@@ -17,8 +17,8 @@
 #include "utility.h"
 #include "vb2_common.h"
 #include "vboot_api.h"
-#include "vboot_common.h"
 #include "vboot_kernel.h"
+#include "vboot_struct.h"
 #include "vboot_test.h"
 
 /* Global variables */
diff --git a/firmware/lib/vboot_audio.c b/firmware/lib/vboot_audio.c
index c5212013..20b14376 100644
--- a/firmware/lib/vboot_audio.c
+++ b/firmware/lib/vboot_audio.c
@@ -11,7 +11,6 @@
 #include "utility.h"
 #include "vboot_api.h"
 #include "vboot_audio.h"
-#include "vboot_common.h"
 
 int audio_open_count = 0;	/* Times audio has been opened */
 static int audio_use_short;	/* Use short delay? */
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index 0c62a86d..42a0c7bd 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -15,6 +15,7 @@
 #include "vboot_common.h"
 #include "vboot_display.h"
 #include "vboot_kernel.h"
+#include "vboot_struct.h"
 
 static uint32_t disp_current_screen = VB_SCREEN_BLANK;
 static uint32_t disp_current_index = 0;
diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c
index a354a8d5..4fc4d347 100644
--- a/firmware/lib/vboot_kernel.c
+++ b/firmware/lib/vboot_kernel.c
@@ -21,8 +21,8 @@
 #include "utility.h"
 #include "vb2_common.h"
 #include "vboot_api.h"
-#include "vboot_common.h"
 #include "vboot_kernel.h"
+#include "vboot_struct.h"
 
 #define LOWEST_TPM_VERSION 0xffffffff
 
diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui.c
index da78171f..77e9e69e 100644
--- a/firmware/lib/vboot_ui.c
+++ b/firmware/lib/vboot_ui.c
@@ -21,6 +21,7 @@
 #include "vboot_common.h"
 #include "vboot_display.h"
 #include "vboot_kernel.h"
+#include "vboot_struct.h"
 #include "vboot_ui_common.h"
 
 /* Global variables */
diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c
index f07a814e..d8f2d15f 100644
--- a/firmware/lib/vboot_ui_menu.c
+++ b/firmware/lib/vboot_ui_menu.c
@@ -20,6 +20,7 @@
 #include "vboot_common.h"
 #include "vboot_display.h"
 #include "vboot_kernel.h"
+#include "vboot_struct.h"
 #include "vboot_ui_common.h"
 #include "vboot_ui_menu_private.h"
 
diff --git a/futility/cmd_sign.c b/futility/cmd_sign.c
index fb096763..1973143b 100644
--- a/futility/cmd_sign.c
+++ b/futility/cmd_sign.c
@@ -31,7 +31,6 @@
 #include "vb21_common.h"
 #include "vb2_common.h"
 #include "vb2_struct.h"
-#include "vboot_common.h"
 
 /* Options */
 struct sign_option_s sign_option = {
diff --git a/futility/cmd_vbutil_firmware.c b/futility/cmd_vbutil_firmware.c
index 2b169a47..d5a86863 100644
--- a/futility/cmd_vbutil_firmware.c
+++ b/futility/cmd_vbutil_firmware.c
@@ -23,7 +23,6 @@
 #include "util_misc.h"
 #include "vb1_helper.h"
 #include "vb2_common.h"
-#include "vboot_common.h"
 
 /* Command line options */
 enum {
diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c
index 125debb4..99ffcfc2 100644
--- a/futility/cmd_vbutil_kernel.c
+++ b/futility/cmd_vbutil_kernel.c
@@ -28,6 +28,7 @@
 #include "vb1_helper.h"
 #include "vb2_common.h"
 #include "vb2_struct.h"
+#include "vboot_common.h"
 
 /* Global opts */
 static int opt_verbose;
diff --git a/futility/cmd_vbutil_key.c b/futility/cmd_vbutil_key.c
index 48abfbe5..b0b7675e 100644
--- a/futility/cmd_vbutil_key.c
+++ b/futility/cmd_vbutil_key.c
@@ -18,7 +18,6 @@
 #include "util_misc.h"
 #include "vb1_helper.h"
 #include "vb2_common.h"
-#include "vboot_common.h"
 
 /* Command line options */
 enum {
diff --git a/futility/cmd_vbutil_keyblock.c b/futility/cmd_vbutil_keyblock.c
index 0bb59abe..2be7a850 100644
--- a/futility/cmd_vbutil_keyblock.c
+++ b/futility/cmd_vbutil_keyblock.c
@@ -20,7 +20,6 @@
 #include "util_misc.h"
 #include "vb1_helper.h"
 #include "vb2_common.h"
-#include "vboot_common.h"
 
 /* Command line options */
 enum {
diff --git a/futility/futility.h b/futility/futility.h
index d196cee2..881189cd 100644
--- a/futility/futility.h
+++ b/futility/futility.h
@@ -9,7 +9,6 @@
 #include <stdint.h>
 
 #include "2common.h"
-#include "vboot_common.h"
 #include "host_key.h"
 
 /* This program */
diff --git a/futility/futility_options.h b/futility/futility_options.h
index dc31728d..a3bdd650 100644
--- a/futility/futility_options.h
+++ b/futility/futility_options.h
@@ -13,7 +13,6 @@
 
 #include "2rsa.h"
 #include "file_type.h"
-#include "vboot_common.h"
 
 struct vb2_private_key;
 struct vb21_packed_key;
diff --git a/host/arch/arm/lib/crossystem_arch.c b/host/arch/arm/lib/crossystem_arch.c
index 5a6649ee..43a59cf2 100644
--- a/host/arch/arm/lib/crossystem_arch.c
+++ b/host/arch/arm/lib/crossystem_arch.c
@@ -26,7 +26,6 @@
 #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"
diff --git a/host/arch/mips/lib/crossystem_arch.c b/host/arch/mips/lib/crossystem_arch.c
index ed4fb064..ab7d0a49 100644
--- a/host/arch/mips/lib/crossystem_arch.c
+++ b/host/arch/mips/lib/crossystem_arch.c
@@ -8,7 +8,6 @@
 #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
diff --git a/host/arch/x86/lib/crossystem_arch.c b/host/arch/x86/lib/crossystem_arch.c
index 0f3ea8d2..6aeaa141 100644
--- a/host/arch/x86/lib/crossystem_arch.c
+++ b/host/arch/x86/lib/crossystem_arch.c
@@ -22,7 +22,6 @@
 #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 */
diff --git a/host/lib/host_common.c b/host/lib/host_common.c
index 68f06265..67ad1c07 100644
--- a/host/lib/host_common.c
+++ b/host/lib/host_common.c
@@ -14,7 +14,6 @@
 #include "host_key2.h"
 #include "utility.h"
 #include "vb2_common.h"
-#include "vboot_common.h"
 
 struct vb2_fw_preamble *vb2_create_fw_preamble(
 	uint32_t firmware_version,
diff --git a/host/lib/host_key.c b/host/lib/host_key.c
index 8651f4f0..3278d88a 100644
--- a/host/lib/host_key.c
+++ b/host/lib/host_key.c
@@ -20,7 +20,6 @@
 #include "host_common.h"
 #include "host_misc.h"
 #include "vb2_common.h"
-#include "vboot_common.h"
 
 int packed_key_looks_ok(const struct vb2_packed_key *key, uint32_t size)
 {
diff --git a/host/lib/host_key2.c b/host/lib/host_key2.c
index 705576b3..f845f86f 100644
--- a/host/lib/host_key2.c
+++ b/host/lib/host_key2.c
@@ -22,7 +22,6 @@
 #include "host_key.h"
 #include "host_misc.h"
 #include "vb2_common.h"
-#include "vboot_common.h"
 
 enum vb2_crypto_algorithm vb2_get_crypto_algorithm(
 	enum vb2_hash_algorithm hash_alg,
diff --git a/host/lib/host_keyblock.c b/host/lib/host_keyblock.c
index 6f3ae4f6..34071f4a 100644
--- a/host/lib/host_keyblock.c
+++ b/host/lib/host_keyblock.c
@@ -19,7 +19,6 @@
 #include "host_key.h"
 #include "vb2_common.h"
 #include "vb2_struct.h"
-#include "vboot_common.h"
 
 struct vb2_keyblock *vb2_create_keyblock(
 		const struct vb2_packed_key *data_key,
diff --git a/host/lib/host_misc.c b/host/lib/host_misc.c
index 3dc6112f..4b6c8638 100644
--- a/host/lib/host_misc.c
+++ b/host/lib/host_misc.c
@@ -13,7 +13,6 @@
 #include <unistd.h>
 
 #include "host_common.h"
-#include "vboot_common.h"
 
 char* StrCopy(char* dest, const char* src, int dest_size)
 {
diff --git a/host/lib/host_signature2.c b/host/lib/host_signature2.c
index 30ef1b24..6bc900dd 100644
--- a/host/lib/host_signature2.c
+++ b/host/lib/host_signature2.c
@@ -23,7 +23,6 @@
 #include "host_key2.h"
 #include "host_signature2.h"
 #include "vb2_common.h"
-#include "vboot_common.h"
 
 struct vb2_signature *vb2_alloc_signature(uint32_t sig_size,
 					  uint32_t data_size)
diff --git a/host/lib/util_misc.c b/host/lib/util_misc.c
index 535ede28..8b9388a4 100644
--- a/host/lib/util_misc.c
+++ b/host/lib/util_misc.c
@@ -21,7 +21,6 @@
 #include "openssl_compat.h"
 #include "util_misc.h"
 #include "vb2_common.h"
-#include "vboot_common.h"
 
 const char *packed_key_sha1_string(const struct vb2_packed_key *key)
 {
diff --git a/tests/tlcl_tests.c b/tests/tlcl_tests.c
index c9521f97..b7573751 100644
--- a/tests/tlcl_tests.c
+++ b/tests/tlcl_tests.c
@@ -14,7 +14,6 @@
 #include "test_common.h"
 #include "tlcl.h"
 #include "tlcl_internal.h"
-#include "vboot_common.h"
 
 /* Mock data */
 static char debug_info[4096];
diff --git a/tests/utility_string_tests.c b/tests/utility_string_tests.c
index af74d329..d41cbe87 100644
--- a/tests/utility_string_tests.c
+++ b/tests/utility_string_tests.c
@@ -12,7 +12,6 @@
 
 #include "test_common.h"
 #include "utility.h"
-#include "vboot_common.h"
 
 /* Test string concatenation */
 static void StrncatTest(void) {
diff --git a/tests/vb20_common2_tests.c b/tests/vb20_common2_tests.c
index e938d79c..4f68f9b8 100644
--- a/tests/vb20_common2_tests.c
+++ b/tests/vb20_common2_tests.c
@@ -16,7 +16,6 @@
 #include "host_key2.h"
 #include "test_common.h"
 #include "vb2_common.h"
-#include "vboot_common.h"
 
 static const uint8_t test_data[] = "This is some test data to sign.";
 static const uint32_t test_size = sizeof(test_data);
diff --git a/tests/vb20_common3_tests.c b/tests/vb20_common3_tests.c
index 2b0d1145..42192225 100644
--- a/tests/vb20_common3_tests.c
+++ b/tests/vb20_common3_tests.c
@@ -16,7 +16,6 @@
 #include "host_signature.h"
 #include "test_common.h"
 #include "vb2_common.h"
-#include "vboot_common.h"
 
 static void resign_keyblock(struct vb2_keyblock *h,
 			    const struct vb2_private_key *key)
diff --git a/tests/vb2_nvstorage_tests.c b/tests/vb2_nvstorage_tests.c
index 269caa21..b5941f8b 100644
--- a/tests/vb2_nvstorage_tests.c
+++ b/tests/vb2_nvstorage_tests.c
@@ -17,7 +17,6 @@
 #include "2nvstorage.h"
 #include "2sysincludes.h"
 #include "test_common.h"
-#include "vboot_common.h"
 
 /* Single NV storage field to test */
 struct nv_field {
diff --git a/tests/vb2_secdata_firmware_tests.c b/tests/vb2_secdata_firmware_tests.c
index c2d8e273..387cda36 100644
--- a/tests/vb2_secdata_firmware_tests.c
+++ b/tests/vb2_secdata_firmware_tests.c
@@ -13,7 +13,6 @@
 #include "2secdata_struct.h"
 #include "2sysincludes.h"
 #include "test_common.h"
-#include "vboot_common.h"
 
 static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]
 	__attribute__((aligned(VB2_WORKBUF_ALIGN)));
diff --git a/tests/vb2_secdata_kernel_tests.c b/tests/vb2_secdata_kernel_tests.c
index 44d0603a..d141c876 100644
--- a/tests/vb2_secdata_kernel_tests.c
+++ b/tests/vb2_secdata_kernel_tests.c
@@ -13,7 +13,6 @@
 #include "2secdata_struct.h"
 #include "2sysincludes.h"
 #include "test_common.h"
-#include "vboot_common.h"
 
 static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]
 	__attribute__((aligned(VB2_WORKBUF_ALIGN)));