diff --git a/src/include/efi/efi_datatype.h b/src/include/efi/efi_datatype.h
index be96e3fd3a..7eefad3391 100644
--- a/src/include/efi/efi_datatype.h
+++ b/src/include/efi/efi_datatype.h
@@ -4,9 +4,17 @@
 #ifndef __EFI_DATATYPE_H__
 #define __EFI_DATATYPE_H__
 #include <Base.h>
-#include <PiPei.h>
 #include <Uefi/UefiBaseType.h>
 
+#if CONFIG_UDK_VERSION >= CONFIG_UDK_2017_VERSION
+#include <Pi/PiPeiCis.h>
+
+/* Data structure for EFI_PEI_SERVICE. */
+typedef EFI_PEI_SERVICES efi_pei_services;
+/*  Structure that describes information about a logical CPU. */
+typedef EFI_PROCESSOR_INFORMATION efi_processor_information;
+#endif
+
 /* Basic Data types */
 /* 8-byte unsigned value. */
 typedef UINT64 efi_uint64_t;
@@ -36,14 +44,9 @@ typedef UINTN efi_uintn_t;
 typedef INTN efi_intn_t;
 /* Status codes common to all execution phases */
 typedef EFI_STATUS efi_return_status_t;
-/* Data structure */
-/* Data structure for EFI_PEI_SERVICE. */
-typedef EFI_PEI_SERVICES efi_pei_services;
 /* Data structure for EFI_PHYSICAL_ADDRESS */
 typedef EFI_PHYSICAL_ADDRESS efi_physical_address;
 
-/*  Structure that describes information about a logical CPU. */
-typedef EFI_PROCESSOR_INFORMATION efi_processor_information;
 /*
  * The function prototype for invoking a function on an
  * Application Processor.