diff --git a/sections/cper-section-ampere.c b/sections/cper-section-ampere.c
index 264c2f6..9fa5a8b 100644
--- a/sections/cper-section-ampere.c
+++ b/sections/cper-section-ampere.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-ampere.h"
 
diff --git a/sections/cper-section-ampere.h b/sections/cper-section-ampere.h
index 9264098..978f6db 100644
--- a/sections/cper-section-ampere.h
+++ b/sections/cper-section-ampere.h
@@ -2,7 +2,7 @@
 #define CPER_SECTION_AMPERE_H
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 json_object *cper_section_ampere_to_ir(void *section);
 void ir_section_ampere_to_cper(json_object *section, FILE *out);
diff --git a/sections/cper-section-arm.c b/sections/cper-section-arm.c
index d172a99..db0f54c 100644
--- a/sections/cper-section-arm.c
+++ b/sections/cper-section-arm.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <json.h>
 #include "base64.h"
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-arm.h"
 
diff --git a/sections/cper-section-arm.h b/sections/cper-section-arm.h
index fdefeae..8601992 100644
--- a/sections/cper-section-arm.h
+++ b/sections/cper-section-arm.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define ARM_ERROR_VALID_BITFIELD_NAMES                                         \
 	(const char *[])                                                       \
diff --git a/sections/cper-section-ccix-per.c b/sections/cper-section-ccix-per.c
index f6ffd39..6e3fa96 100644
--- a/sections/cper-section-ccix-per.c
+++ b/sections/cper-section-ccix-per.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <json.h>
 #include "base64.h"
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-ccix-per.h"
 
diff --git a/sections/cper-section-ccix-per.h b/sections/cper-section-ccix-per.h
index 69dbea2..c8bfbb0 100644
--- a/sections/cper-section-ccix-per.h
+++ b/sections/cper-section-ccix-per.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define CCIX_PER_ERROR_VALID_BITFIELD_NAMES                                    \
 	(const char *[])                                                       \
diff --git a/sections/cper-section-cxl-component.c b/sections/cper-section-cxl-component.c
index 343611f..d085189 100644
--- a/sections/cper-section-cxl-component.c
+++ b/sections/cper-section-cxl-component.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <json.h>
 #include "base64.h"
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-cxl-component.h"
 
diff --git a/sections/cper-section-cxl-component.h b/sections/cper-section-cxl-component.h
index f3b8ad1..56b092c 100644
--- a/sections/cper-section-cxl-component.h
+++ b/sections/cper-section-cxl-component.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define CXL_COMPONENT_ERROR_VALID_BITFIELD_NAMES                               \
 	(const char *[])                                                       \
diff --git a/sections/cper-section-cxl-protocol.c b/sections/cper-section-cxl-protocol.c
index 88ed2e9..fa01a8a 100644
--- a/sections/cper-section-cxl-protocol.c
+++ b/sections/cper-section-cxl-protocol.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "base64.h"
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-cxl-protocol.h"
 
diff --git a/sections/cper-section-cxl-protocol.h b/sections/cper-section-cxl-protocol.h
index e4854a3..71166a2 100644
--- a/sections/cper-section-cxl-protocol.h
+++ b/sections/cper-section-cxl-protocol.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define CXL_PROTOCOL_ERROR_VALID_BITFIELD_NAMES                                \
 	(const char *[])                                                       \
diff --git a/sections/cper-section-dmar-generic.c b/sections/cper-section-dmar-generic.c
index ef12501..6a28d88 100644
--- a/sections/cper-section-dmar-generic.c
+++ b/sections/cper-section-dmar-generic.c
@@ -6,7 +6,7 @@
  **/
 #include <stdio.h>
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-dmar-generic.h"
 
diff --git a/sections/cper-section-dmar-generic.h b/sections/cper-section-dmar-generic.h
index 8e96ecf..e305c86 100644
--- a/sections/cper-section-dmar-generic.h
+++ b/sections/cper-section-dmar-generic.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define DMAR_GENERIC_ERROR_FAULT_REASON_TYPES_KEYS                             \
 	(int[])                                                                \
diff --git a/sections/cper-section-dmar-iommu.c b/sections/cper-section-dmar-iommu.c
index b813a6e..3606021 100644
--- a/sections/cper-section-dmar-iommu.c
+++ b/sections/cper-section-dmar-iommu.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <json.h>
 #include "base64.h"
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-dmar-iommu.h"
 
diff --git a/sections/cper-section-dmar-iommu.h b/sections/cper-section-dmar-iommu.h
index 2f990ab..24204b7 100644
--- a/sections/cper-section-dmar-iommu.h
+++ b/sections/cper-section-dmar-iommu.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 json_object *cper_section_dmar_iommu_to_ir(void *section);
 void ir_section_dmar_iommu_to_cper(json_object *section, FILE *out);
diff --git a/sections/cper-section-dmar-vtd.c b/sections/cper-section-dmar-vtd.c
index f954094..88a4835 100644
--- a/sections/cper-section-dmar-vtd.c
+++ b/sections/cper-section-dmar-vtd.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <json.h>
 #include "base64.h"
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-dmar-vtd.h"
 
diff --git a/sections/cper-section-dmar-vtd.h b/sections/cper-section-dmar-vtd.h
index 3c3a134..1d1e91e 100644
--- a/sections/cper-section-dmar-vtd.h
+++ b/sections/cper-section-dmar-vtd.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define VTD_FAULT_RECORD_TYPES_KEYS                                            \
 	(int[])                                                                \
diff --git a/sections/cper-section-firmware.c b/sections/cper-section-firmware.c
index c7b10e0..3f17fe7 100644
--- a/sections/cper-section-firmware.c
+++ b/sections/cper-section-firmware.c
@@ -6,7 +6,7 @@
  **/
 #include <stdio.h>
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-firmware.h"
 
diff --git a/sections/cper-section-firmware.h b/sections/cper-section-firmware.h
index 858ee5d..c37ee1f 100644
--- a/sections/cper-section-firmware.h
+++ b/sections/cper-section-firmware.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define FIRMWARE_ERROR_RECORD_TYPES_KEYS                                       \
 	(int[])                                                                \
diff --git a/sections/cper-section-generic.c b/sections/cper-section-generic.c
index 8882b78..b803bc1 100644
--- a/sections/cper-section-generic.c
+++ b/sections/cper-section-generic.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-generic.h"
 
diff --git a/sections/cper-section-generic.h b/sections/cper-section-generic.h
index 7148cfd..26fec69 100644
--- a/sections/cper-section-generic.h
+++ b/sections/cper-section-generic.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define GENERIC_PROC_TYPES_KEYS                                                \
 	(int[])                                                                \
diff --git a/sections/cper-section-ia32x64.c b/sections/cper-section-ia32x64.c
index bb07da6..2762867 100644
--- a/sections/cper-section-ia32x64.c
+++ b/sections/cper-section-ia32x64.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <json.h>
 #include "base64.h"
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-ia32x64.h"
 
diff --git a/sections/cper-section-ia32x64.h b/sections/cper-section-ia32x64.h
index 4670d48..b087099 100644
--- a/sections/cper-section-ia32x64.h
+++ b/sections/cper-section-ia32x64.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define IA32X64_PROCESSOR_ERROR_VALID_BITFIELD_NAMES                           \
 	(const char *[])                                                       \
diff --git a/sections/cper-section-ipf.c b/sections/cper-section-ipf.c
index dc50b76..3c47504 100644
--- a/sections/cper-section-ipf.c
+++ b/sections/cper-section-ipf.c
@@ -6,7 +6,7 @@
  **/
 #include <stdio.h>
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-ipf.h"
 
diff --git a/sections/cper-section-ipf.h b/sections/cper-section-ipf.h
index 9e265db..02cc025 100644
--- a/sections/cper-section-ipf.h
+++ b/sections/cper-section-ipf.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define IPF_MOD_ERROR_VALID_BITFIELD_NAMES                                     \
 	(const char *[])                                                       \
diff --git a/sections/cper-section-memory.c b/sections/cper-section-memory.c
index 67d0c70..073041d 100644
--- a/sections/cper-section-memory.c
+++ b/sections/cper-section-memory.c
@@ -6,7 +6,7 @@
  **/
 #include <stdio.h>
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-memory.h"
 
diff --git a/sections/cper-section-memory.h b/sections/cper-section-memory.h
index 4d293d8..ed2bc70 100644
--- a/sections/cper-section-memory.h
+++ b/sections/cper-section-memory.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define MEMORY_ERROR_VALID_BITFIELD_NAMES                                      \
 	(const char *[])                                                       \
diff --git a/sections/cper-section-nvidia.c b/sections/cper-section-nvidia.c
index c5eb493..259eef1 100644
--- a/sections/cper-section-nvidia.c
+++ b/sections/cper-section-nvidia.c
@@ -7,7 +7,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-nvidia.h"
 
diff --git a/sections/cper-section-nvidia.h b/sections/cper-section-nvidia.h
index b05fdde..c3b9deb 100644
--- a/sections/cper-section-nvidia.h
+++ b/sections/cper-section-nvidia.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 json_object *cper_section_nvidia_to_ir(void *section);
 void ir_section_nvidia_to_cper(json_object *section, FILE *out);
diff --git a/sections/cper-section-pci-bus.c b/sections/cper-section-pci-bus.c
index bdc6beb..a4fc3c8 100644
--- a/sections/cper-section-pci-bus.c
+++ b/sections/cper-section-pci-bus.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-pci-bus.h"
 
diff --git a/sections/cper-section-pci-bus.h b/sections/cper-section-pci-bus.h
index 93f61be..69e2522 100644
--- a/sections/cper-section-pci-bus.h
+++ b/sections/cper-section-pci-bus.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define PCI_BUS_ERROR_VALID_BITFIELD_NAMES                                     \
 	(const char *[])                                                       \
diff --git a/sections/cper-section-pci-dev.c b/sections/cper-section-pci-dev.c
index 50c073b..5245e3f 100644
--- a/sections/cper-section-pci-dev.c
+++ b/sections/cper-section-pci-dev.c
@@ -6,7 +6,7 @@
  **/
 #include <stdio.h>
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-pci-dev.h"
 
diff --git a/sections/cper-section-pci-dev.h b/sections/cper-section-pci-dev.h
index 9d161c9..3ceba5a 100644
--- a/sections/cper-section-pci-dev.h
+++ b/sections/cper-section-pci-dev.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define PCI_DEV_ERROR_VALID_BITFIELD_NAMES                                     \
 	(const char *[])                                                       \
diff --git a/sections/cper-section-pcie.c b/sections/cper-section-pcie.c
index 1c6534f..fa6b0b2 100644
--- a/sections/cper-section-pcie.c
+++ b/sections/cper-section-pcie.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <json.h>
 #include "base64.h"
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-pcie.h"
 
diff --git a/sections/cper-section-pcie.h b/sections/cper-section-pcie.h
index b2581e5..1a2d729 100644
--- a/sections/cper-section-pcie.h
+++ b/sections/cper-section-pcie.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 #define PCIE_ERROR_VALID_BITFIELD_NAMES                                        \
 	(const char *[])                                                       \
diff --git a/sections/cper-section.c b/sections/cper-section.c
index 63ce9f8..11832c8 100644
--- a/sections/cper-section.c
+++ b/sections/cper-section.c
@@ -3,7 +3,7 @@
  *
  * Author: Lawrence.Tang@arm.com
  **/
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "cper-section.h"
 #include "cper-section-arm.h"
 #include "cper-section-generic.h"
diff --git a/sections/cper-section.h b/sections/cper-section.h
index 4ccc178..dec0b1b 100644
--- a/sections/cper-section.h
+++ b/sections/cper-section.h
@@ -8,7 +8,7 @@
 #include <json.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 //Definition structure for a single CPER section type.
 typedef struct {