diff --git a/BaseTools/Source/C/Include/Common/PiFirmwareFile.h b/BaseTools/Source/C/Include/Common/PiFirmwareFile.h
index a275bc3a3f..e27b53e04a 100644
--- a/BaseTools/Source/C/Include/Common/PiFirmwareFile.h
+++ b/BaseTools/Source/C/Include/Common/PiFirmwareFile.h
@@ -12,6 +12,9 @@
 
 #pragma once
 
+#ifndef __PI_FIRMWARE_FILE_H__
+#define __PI_FIRMWARE_FILE_H__
+
 #pragma pack(1)
 //
 // Used to verify the integrity of the file.
@@ -344,3 +347,5 @@ typedef union {
   EFI_FREEFORM_SUBTYPE_GUID_SECTION2 *FreeformSubtypeSection2;
   EFI_RAW_SECTION2                   *RawSection2;
 } EFI_FILE_SECTION_POINTER;
+
+#endif
diff --git a/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h b/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h
index 356da74c91..4432425ac0 100644
--- a/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h
+++ b/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h
@@ -12,6 +12,9 @@
 
 #pragma once
 
+#ifndef __PI_FIRMWAREVOLUME_H__
+#define __PI_FIRMWAREVOLUME_H__
+
 //
 // EFI_FV_FILE_ATTRIBUTES
 //
@@ -152,3 +155,5 @@ typedef struct {
   EFI_FIRMWARE_VOLUME_EXT_ENTRY Hdr;
   UINT32 UsedSize;
 } EFI_FIRMWARE_VOLUME_EXT_ENTRY_USED_SIZE_TYPE;
+
+#endif
diff --git a/BaseTools/Source/C/Include/Common/UefiBaseTypes.h b/BaseTools/Source/C/Include/Common/UefiBaseTypes.h
index c4a5307efd..eb39f4dcd2 100644
--- a/BaseTools/Source/C/Include/Common/UefiBaseTypes.h
+++ b/BaseTools/Source/C/Include/Common/UefiBaseTypes.h
@@ -9,6 +9,9 @@
 
 #pragma once
 
+#ifndef __UEFI_BASETYPE_H__
+#define __UEFI_BASETYPE_H__
+
 #include <Common/BaseTypes.h>
 
 //
@@ -163,3 +166,5 @@ typedef union {
 
 
 #define EFI_MAX_BIT               MAX_BIT
+
+#endif
diff --git a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
index 0978449960..214770ea7a 100644
--- a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
+++ b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
@@ -15,6 +15,9 @@
 
 #pragma once
 
+#ifndef __UEFI_INTERNAL_FORMREPRESENTATION_H__
+#define __UEFI_INTERNAL_FORMREPRESENTATION_H__
+
 #define EFI_HII_PLATFORM_SETUP_FORMSET_GUID \
   { 0x93039971, 0x8545, 0x4b04, { 0xb4, 0x5e, 0x32, 0xeb, 0x83, 0x26, 0x4, 0xe } }
 
@@ -1684,3 +1687,5 @@ typedef struct {
 // here for the easy access by C files and VFR source files.
 //
 #define STRING_TOKEN(t) t
+
+#endif
diff --git a/BaseTools/Source/C/Include/Common/UefiMultiPhase.h b/BaseTools/Source/C/Include/Common/UefiMultiPhase.h
index e6c1c868a7..733c55d5ce 100644
--- a/BaseTools/Source/C/Include/Common/UefiMultiPhase.h
+++ b/BaseTools/Source/C/Include/Common/UefiMultiPhase.h
@@ -11,6 +11,9 @@
 
 #pragma once
 
+#ifndef __UEFI_MULTIPHASE_H__
+#define __UEFI_MULTIPHASE_H__
+
 //
 // Enumeration of memory types introduced in UEFI.
 // +---------------------------------------------------+
@@ -233,3 +236,5 @@ typedef struct {
   UINT64                      MonotonicCount;
   WIN_CERTIFICATE_UEFI_GUID   AuthInfo;
 } EFI_VARIABLE_AUTHENTICATION;
+
+#endif
diff --git a/BaseTools/Source/C/Include/Common/VariableFormat.h b/BaseTools/Source/C/Include/Common/VariableFormat.h
index b03a5fd277..d4018405f8 100644
--- a/BaseTools/Source/C/Include/Common/VariableFormat.h
+++ b/BaseTools/Source/C/Include/Common/VariableFormat.h
@@ -9,6 +9,9 @@
 
 #pragma once
 
+#ifndef __VARIABLE_FORMAT_H__
+#define __VARIABLE_FORMAT_H__
+
 #define VARIABLE_DATA                     0x55AA
 
 //
@@ -39,3 +42,5 @@ typedef struct {
 } VARIABLE_HEADER;
 
 #pragma pack()
+
+#endif