5 files changed, 13 insertions, 5 deletions
diff --git a/src/import/hwpf/fapi2/include/error_info.H b/src/import/hwpf/fapi2/include/error_info.H
index 28c6945c4..df38467c2 100644
--- a/src/import/hwpf/fapi2/include/error_info.H
+++ b/src/import/hwpf/fapi2/include/error_info.H
@@ -32,7 +32,9 @@
 #define FAPI2_ERRORINFO_H_
 
 #include <stdint.h>
-#include <memory>
+#ifndef __PPE__
+    #include <memory>
+#endif
 #include <vector>
 #include <target.H>
 #include <error_info_defs.H>
diff --git a/src/import/hwpf/fapi2/include/fapi2_target.H b/src/import/hwpf/fapi2/include/fapi2_target.H
index d1b52bfa7..5c7067c4f 100644
--- a/src/import/hwpf/fapi2/include/fapi2_target.H
+++ b/src/import/hwpf/fapi2/include/fapi2_target.H
@@ -31,7 +31,9 @@
 #define __FAPI2_COMMON_TARGET__
 
 #include <stdint.h>
-#include <stdlib.h>
+#ifndef __PPE__
+    #include <stdlib.h>
+#endif // __PPE__
 #include <vector>
 #include <target_types.H>
 #include <target_states.H>
diff --git a/src/import/hwpf/fapi2/include/ffdc.H b/src/import/hwpf/fapi2/include/ffdc.H
index 4f6f4e153..674435e9d 100644
--- a/src/import/hwpf/fapi2/include/ffdc.H
+++ b/src/import/hwpf/fapi2/include/ffdc.H
@@ -30,6 +30,8 @@
 #ifndef FAPI2_FFDC_H_
 #define FAPI2_FFDC_H_
 
+#if !defined (FAPI2_NO_FFDC) && !defined (MINIMUM_FFDC)
+
 #include <memory>
 #include <hwp_return_codes.H>
 #include <return_code_defs.H>
@@ -235,4 +237,5 @@ class FirstFailureData
 };
 
 }
+#endif // !defined (FAPI2_NO_FFDC) && !defined (MINIMUM_FFDC)
 #endif // FAPI2_FFDC_H_
diff --git a/src/import/hwpf/fapi2/include/return_code.H b/src/import/hwpf/fapi2/include/return_code.H
index 0aedf7602..2804451a6 100644
--- a/src/import/hwpf/fapi2/include/return_code.H
+++ b/src/import/hwpf/fapi2/include/return_code.H
@@ -31,6 +31,7 @@
 #define __FAPI2_RETURN_CODE__
 
 #include <stdint.h>
+#include <return_code_defs.H>
 
 #ifndef FAPI2_NO_FFDC
     #include <ffdc.H>
@@ -43,7 +44,7 @@ namespace fapi2
 ///
 // Remove the inheritance relationship with FirstFailureData if
 // the platform doesn't support FFDC.
-#ifdef FAPI2_NO_FFDC
+#if defined (FAPI2_NO_FFDC) || defined (MINIMUM_FFDC)
 class ReturnCode
 #else
 class ReturnCode : public FirstFailureData<ReturnCode>
diff --git a/src/import/hwpf/fapi2/include/utils.H b/src/import/hwpf/fapi2/include/utils.H
index 5f998188e..d41b7de50 100644
--- a/src/import/hwpf/fapi2/include/utils.H
+++ b/src/import/hwpf/fapi2/include/utils.H
@@ -38,7 +38,7 @@
 
 namespace fapi2
 {
-
+#ifndef __PPE__
 ///
 /// @brief Enable/Disable special wakeup on processor chip core(s)
 ///
@@ -128,7 +128,7 @@ void createPlatLog(
     fapi2::ReturnCode& io_rc,
     fapi2::errlSeverity_t i_sev = fapi2::FAPI2_ERRL_SEV_UNRECOVERABLE
 );
-
+#endif // __PPE__
 ///
 /// @brief Delay this thread. Hostboot will use the nanoseconds parameter
 /// and make a syscall to nanosleep. While in the syscall, the hostboot