6 files changed, 4 insertions, 14 deletions
diff --git a/src/security/tpm/tss.h b/src/security/tpm/tss.h
index a85503d7fd..fa8cf52cff 100644
--- a/src/security/tpm/tss.h
+++ b/src/security/tpm/tss.h
@@ -12,7 +12,6 @@
 #include <types.h>
 #include <vb2_sha.h>
 
-#include <security/tpm/tss/common/tss_common.h>
 #include <security/tpm/tss_errors.h>
 #include <security/tpm/tss/vendor/cr50/cr50.h>
 
diff --git a/src/security/tpm/tss/common/tss_common.h b/src/security/tpm/tss/common/tss_common.h
deleted file mode 100644
index 419e429349..0000000000
--- a/src/security/tpm/tss/common/tss_common.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef TCG_TSS_COMMON_H_
-#define TCG_TSS_COMMON_H_
-
-#include <stdint.h>
-
-#define TPM_PCR_MINIMUM_DIGEST_SIZE 20
-#define TPM_SUCCESS ((uint32_t)0x00000000)
-
-#endif /* TCG_TSS_COMMON_H_ */
diff --git a/src/security/tpm/tss/tcg-1.2/tss_structures.h b/src/security/tpm/tss/tcg-1.2/tss_structures.h
index 689bb4bbf9..65b48f8f2e 100644
--- a/src/security/tpm/tss/tcg-1.2/tss_structures.h
+++ b/src/security/tpm/tss/tcg-1.2/tss_structures.h
@@ -8,7 +8,7 @@
 #define TCG1_TSS_STRUCTURES_H_
 
 #include <stdint.h>
-#include "../common/tss_common.h"
+#include <security/tpm/tss_errors.h>
 
 #define TPM_MAX_COMMAND_SIZE 4096
 #define TPM_LARGE_ENOUGH_COMMAND_SIZE 256  /* saves space in the firmware */
diff --git a/src/security/tpm/tss/tcg-2.0/tss_structures.h b/src/security/tpm/tss/tcg-2.0/tss_structures.h
index cb0283045f..a73f4c48e6 100644
--- a/src/security/tpm/tss/tcg-2.0/tss_structures.h
+++ b/src/security/tpm/tss/tcg-2.0/tss_structures.h
@@ -8,7 +8,7 @@
  * constants and structures needed for functions used in coreboot.
  */
 #include <types.h>
-#include "../common/tss_common.h"
+#include <security/tpm/tss_errors.h>
 
 /* This should be plenty for what firmware needs. */
 #define TPM_BUFFER_SIZE 256
diff --git a/src/security/tpm/tss_errors.h b/src/security/tpm/tss_errors.h
index 49a7405a7b..b28210cb88 100644
--- a/src/security/tpm/tss_errors.h
+++ b/src/security/tpm/tss_errors.h
@@ -15,6 +15,7 @@
 #define TPM_E_BASE 0x0
 #define TPM_E_NON_FATAL 0x800
 
+#define TPM_SUCCESS                 ((uint32_t)0x00000000)
 #define TPM_E_AREA_LOCKED           ((uint32_t)0x0000003c)
 #define TPM_E_BADINDEX              ((uint32_t)0x00000002)
 #define TPM_E_BAD_PRESENCE          ((uint32_t)0x0000002d)
diff --git a/src/security/vboot/tpm_common.c b/src/security/vboot/tpm_common.c
index ad333c6f9b..05685ad926 100644
--- a/src/security/vboot/tpm_common.c
+++ b/src/security/vboot/tpm_common.c
@@ -7,6 +7,7 @@
 
 #define TPM_PCR_BOOT_MODE "VBOOT: boot mode"
 #define TPM_PCR_GBB_HWID_NAME "VBOOT: GBB HWID"
+#define TPM_PCR_MINIMUM_DIGEST_SIZE 20
 
 uint32_t vboot_setup_tpm(struct vb2_context *ctx)
 {