12 files changed, 37 insertions, 38 deletions
diff --git a/firmware/include/gpt.h b/firmware/include/gpt.h
index 0f27cef5..80e1ea52 100644
--- a/firmware/include/gpt.h
+++ b/firmware/include/gpt.h
@@ -7,8 +7,10 @@
  * To download UEFI standard, please visit UEFI homepage:
  *    http://www.uefi.org/
  */
+
 #ifndef VBOOT_REFERENCE_CGPTLIB_GPT_H_
 #define VBOOT_REFERENCE_CGPTLIB_GPT_H_
+
 #include <stdint.h>
 
 #ifdef __cplusplus
diff --git a/firmware/include/gpt_misc.h b/firmware/include/gpt_misc.h
index b3b062b1..aa46094f 100644
--- a/firmware/include/gpt_misc.h
+++ b/firmware/include/gpt_misc.h
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef VBOOT_REFERENCE_CGPT_MISC_H_
-#define VBOOT_REFERENCE_CGPT_MISC_H_
+#ifndef VBOOT_REFERENCE_GPT_MISC_H_
+#define VBOOT_REFERENCE_GPT_MISC_H_
 
 #include "gpt.h"
 #include "vboot_api.h"
@@ -217,4 +217,4 @@ void SetEntryTries(GptEntry *e, int tries);
 }
 #endif  /* __cplusplus */
 
-#endif  /* VBOOT_REFERENCE_CGPT_MISC_H_ */
+#endif  /* VBOOT_REFERENCE_GPT_MISC_H_ */
diff --git a/firmware/include/tlcl.h b/firmware/include/tlcl.h
index 383be2ef..03195c13 100644
--- a/firmware/include/tlcl.h
+++ b/firmware/include/tlcl.h
@@ -1,16 +1,15 @@
 /* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
- */
-
-/*
+ *
  * TPM Lightweight Command Library.
  *
  * A low-level library for interfacing to TPM hardware or an emulator.
  */
 
-#ifndef TPM_LITE_TLCL_H_
-#define TPM_LITE_TLCL_H_
+#ifndef VBOOT_REFERENCE_TLCL_H_
+#define VBOOT_REFERENCE_TLCL_H_
+
 #include <stdint.h>
 
 #include "tss_constants.h"
@@ -322,4 +321,4 @@ uint32_t TlclReadDelegationFamilyTable(TPM_FAMILY_TABLE_ENTRY *table,
 }
 #endif
 
-#endif  /* TPM_LITE_TLCL_H_ */
+#endif  /* VBOOT_REFERENCE_TLCL_H_ */
diff --git a/firmware/include/tpm1_tss_constants.h b/firmware/include/tpm1_tss_constants.h
index 8d92bef2..6edc4914 100644
--- a/firmware/include/tpm1_tss_constants.h
+++ b/firmware/include/tpm1_tss_constants.h
@@ -1,13 +1,13 @@
-/*
- * Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Some TPM constants and type definitions for standalone compilation for use
  * in the firmware
  */
-#ifndef __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM1_TSS_CONSTANTS_H
-#define __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM1_TSS_CONSTANTS_H
+
+#ifndef VBOOT_REFERENCE_TPM1_TSS_CONSTANTS_H_
+#define VBOOT_REFERENCE_TPM1_TSS_CONSTANTS_H_
 
 #include <stdint.h>
 
@@ -259,4 +259,4 @@ typedef struct tdTPM_NV_AUTH_POLICY
 }
 #endif  /* __cplusplus */
 
-#endif  /* ! __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM1_TSS_CONSTANTS_H */
+#endif  /* VBOOT_REFERENCE_TPM1_TSS_CONSTANTS_H_ */
diff --git a/firmware/include/tpm2_marshaling.h b/firmware/include/tpm2_marshaling.h
index 929f0fcd..9fd79da6 100644
--- a/firmware/include/tpm2_marshaling.h
+++ b/firmware/include/tpm2_marshaling.h
@@ -1,10 +1,10 @@
-/*
- * Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef __SRC_LIB_TPM2_MARSHALING_H
-#define __SRC_LIB_TPM2_MARSHALING_H
+
+#ifndef VBOOT_REFERENCE_TPM2_MARSHALING_H_
+#define VBOOT_REFERENCE_TPM2_MARSHALING_H_
 
 #include "tss_constants.h"
 
@@ -94,4 +94,4 @@ int tpm_is_ph_disabled(void);
 }
 #endif  /* __cplusplus */
 
-#endif // __SRC_LIB_TPM2_MARSHALING_H
+#endif  /* VBOOT_REFERENCE_TPM2_MARSHALING_H_ */
diff --git a/firmware/include/tpm2_tss_constants.h b/firmware/include/tpm2_tss_constants.h
index 162993e2..73747352 100644
--- a/firmware/include/tpm2_tss_constants.h
+++ b/firmware/include/tpm2_tss_constants.h
@@ -1,5 +1,4 @@
-/*
- * Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -7,8 +6,8 @@
  * in the firmware
  */
 
-#ifndef __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM2_TSS_CONSTANTS_H
-#define __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM2_TSS_CONSTANTS_H
+#ifndef VBOOT_REFERENCE_TPM2_TSS_CONSTANTS_H_
+#define VBOOT_REFERENCE_TPM2_TSS_CONSTANTS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -319,4 +318,4 @@ typedef struct tdTPM_IFX_FIELDUPGRADEINFO
 }
 #endif  /* __cplusplus */
 
-#endif  /* ! __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM2_TSS_CONSTANTS_H */
+#endif  /* VBOOT_REFERENCE_TPM2_TSS_CONSTANTS_H_ */
diff --git a/firmware/include/tss_constants.h b/firmware/include/tss_constants.h
index d579933e..e73b4ef1 100644
--- a/firmware/include/tss_constants.h
+++ b/firmware/include/tss_constants.h
@@ -1,11 +1,11 @@
 /* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
- *
  */
 
 #ifndef VBOOT_REFERENCE_TSS_CONSTANTS_H_
 #define VBOOT_REFERENCE_TSS_CONSTANTS_H_
+
 #include <stdint.h>
 
 #define TPM_SUCCESS ((uint32_t) 0x00000000)
diff --git a/firmware/include/vb2_api.h b/firmware/include/vb2_api.h
index e9a1e7b5..4774a1a8 100644
--- a/firmware/include/vb2_api.h
+++ b/firmware/include/vb2_api.h
@@ -1,9 +1,8 @@
 /* Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
- */
-
-/* APIs between calling firmware and vboot_reference
+ *
+ * APIs between calling firmware and vboot_reference
  *
  * DO NOT INCLUDE THE HEADERS BELOW DIRECTLY!  ONLY INCLUDE THIS FILE!
  *
@@ -18,8 +17,8 @@
  *   this switch is a bug, and it should be removed when it is no longer used.
  */
 
-#ifndef VBOOT_VB2_API_H_
-#define VBOOT_VB2_API_H_
+#ifndef VBOOT_REFERENCE_VB2_API_H_
+#define VBOOT_REFERENCE_VB2_API_H_
 
 /* Standard APIs */
 #include "../2lib/include/2api.h"
@@ -40,4 +39,4 @@
 #include "../lib20/include/vb2_struct.h"
 #endif
 
-#endif  /* VBOOT_VB2_API_H_ */
+#endif  /* VBOOT_REFERENCE_VB2_API_H_ */
diff --git a/firmware/include/vb2_sha.h b/firmware/include/vb2_sha.h
index fe8b2aaf..41ef0501 100644
--- a/firmware/include/vb2_sha.h
+++ b/firmware/include/vb2_sha.h
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * This header may be imported to expose vboot SHA implemenation.
+ * This header may be imported to expose vboot SHA implementation.
  */
 
 #ifndef VBOOT_REFERENCE_VB2_SHA_H_
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h
index a1825952..ace9afa1 100644
--- a/firmware/include/vboot_api.h
+++ b/firmware/include/vboot_api.h
@@ -1,9 +1,8 @@
 /* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
- */
-
-/* APIs provided by firmware to vboot_reference.
+ *
+ * APIs provided by firmware to vboot_reference.
  *
  * General notes:
  *
@@ -21,6 +20,7 @@
 
 #ifndef VBOOT_REFERENCE_VBOOT_API_H_
 #define VBOOT_REFERENCE_VBOOT_API_H_
+
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h
index 021be1b8..6e16c910 100644
--- a/firmware/include/vboot_struct.h
+++ b/firmware/include/vboot_struct.h
@@ -8,6 +8,7 @@
 
 #ifndef VBOOT_REFERENCE_VBOOT_STRUCT_H_
 #define VBOOT_REFERENCE_VBOOT_STRUCT_H_
+
 #include <stdint.h>
 
 /*
diff --git a/firmware/include/vboot_test.h b/firmware/include/vboot_test.h
index 03dc54db..a825bd9c 100644
--- a/firmware/include/vboot_test.h
+++ b/firmware/include/vboot_test.h
@@ -1,14 +1,13 @@
 /* Copyright 2019 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
- *
+ * 
+ * This header is for APIs that are only used by test code.
  */
 
 #ifndef VBOOT_REFERENCE_TEST_API_H_
 #define VBOOT_REFERENCE_TEST_API_H_
 
-/* This header is for APIs that are only used by test code. */
-
 /*
  * Internal functions from 2rsa.c that have error conditions we can't trigger
  * from the public APIs.  These include checks for bad algorithms where the