diff --git a/extensions/openpower-pels/sbe_ffdc_handler.cpp b/extensions/openpower-pels/sbe_ffdc_handler.cpp
index 183db37..d1a2469 100644
--- a/extensions/openpower-pels/sbe_ffdc_handler.cpp
+++ b/extensions/openpower-pels/sbe_ffdc_handler.cpp
@@ -41,6 +41,20 @@
 
 using namespace phosphor::logging;
 
+constexpr uint32_t sbeMaxFfdcPackets = 20;
+constexpr uint32_t ffdcPkgOneWord = 1;
+const uint16_t ffdcMagicCode = 0xFFDC;
+
+typedef struct
+{
+    uint32_t magic_bytes:16;
+    uint32_t lengthinWords:16;
+    uint32_t seqId:16;
+    uint32_t cmdClass:8;
+    uint32_t cmd:8;
+    uint32_t fapiRc;
+} __attribute__((packed)) fapiFfdcBufType;
+
 SbeFFDC::SbeFFDC(const AdditionalData& aData, const PelFFDC& files) :
     ffdcType(FFDC_TYPE_NONE)
 {
diff --git a/extensions/openpower-pels/sbe_ffdc_handler.hpp b/extensions/openpower-pels/sbe_ffdc_handler.hpp
index d6ed502..effee2f 100644
--- a/extensions/openpower-pels/sbe_ffdc_handler.hpp
+++ b/extensions/openpower-pels/sbe_ffdc_handler.hpp
@@ -44,20 +44,6 @@
  *    -----------------------------------------------------------
  **/
 
-constexpr uint32_t sbeMaxFfdcPackets = 20;
-constexpr uint32_t ffdcPkgOneWord = 1;
-const uint16_t ffdcMagicCode = 0xFFDC;
-
-typedef struct
-{
-    uint32_t magic_bytes:16;
-    uint32_t lengthinWords:16;
-    uint32_t seqId:16;
-    uint32_t cmdClass:8;
-    uint32_t cmd:8;
-    uint32_t fapiRc;
-} __attribute__((packed)) fapiFfdcBufType;
-
 using LogSeverity = phosphor::logging::Entry::Level;
 
 /** @class SbeFFDC