diff --git a/edk/BaseTypes.h b/edk/BaseTypes.h
index 9958889..93320e4 100644
--- a/edk/BaseTypes.h
+++ b/edk/BaseTypes.h
@@ -11,6 +11,10 @@
 #ifndef CPER_BASETYPES_H
 #define CPER_BASETYPES_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 ///
 /// 8-byte unsigned value
 ///
@@ -98,4 +102,8 @@
 #define SIGNATURE_32(A, B, C, D)                                               \
 	(SIGNATURE_16(A, B) | (SIGNATURE_16(C, D) << 16))
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/edk/Cper.h b/edk/Cper.h
index 5fd5b48..f1bbdb1 100644
--- a/edk/Cper.h
+++ b/edk/Cper.h
@@ -9,11 +9,16 @@
   GUIDs defined in UEFI 2.7 Specification.
 
 **/
-#include "BaseTypes.h"
 
 #ifndef __CPER_GUID_H__
 #define __CPER_GUID_H__
 
+#include "BaseTypes.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #pragma pack(push, 1)
 
 #define EFI_ERROR_RECORD_SIGNATURE_START SIGNATURE_32('C', 'P', 'E', 'R')
@@ -1400,4 +1405,8 @@
 extern EFI_GUID gEfiNvidiaErrorSectionGuid;
 #pragma pack(pop)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif