diff --git a/edk/BaseTypes.h b/BaseTypes.h
similarity index 100%
rename from edk/BaseTypes.h
rename to BaseTypes.h
diff --git a/edk/Cper.c b/Cper.c
similarity index 100%
rename from edk/Cper.c
rename to Cper.c
diff --git a/edk/Cper.h b/Cper.h
similarity index 100%
rename from edk/Cper.h
rename to Cper.h
diff --git a/base64.c b/base64.c
index fb26100..723d9d3 100644
--- a/base64.c
+++ b/base64.c
@@ -1,5 +1,5 @@
 #include "base64.h"
-#include "edk/BaseTypes.h"
+#include "BaseTypes.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/base64.h b/base64.h
index 5e91efb..74d05f7 100644
--- a/base64.h
+++ b/base64.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include "edk/BaseTypes.h"
+#include "BaseTypes.h"
 
 /**
  * base64_decode
diff --git a/common-utils.c b/common-utils.c
index a473b6a..c26f046 100644
--- a/common-utils.c
+++ b/common-utils.c
@@ -5,7 +5,7 @@
  * Author: Lawrence.Tang@arm.com
  **/
 
-#include "edk/BaseTypes.h"
+#include "BaseTypes.h"
 #include "common-utils.h"
 
 //Converts the given BCD byte to a standard integer.
diff --git a/common-utils.h b/common-utils.h
index 6cdccb6..4d5fb4a 100644
--- a/common-utils.h
+++ b/common-utils.h
@@ -1,7 +1,7 @@
 #ifndef CPER_LIB_COMMON_UTILS_H
 #define CPER_LIB_COMMON_UTILS_H
 
-#include "edk/BaseTypes.h"
+#include "BaseTypes.h"
 
 int bcd_to_int(UINT8 bcd);
 UINT8 int_to_bcd(int value);
diff --git a/cper-parse.c b/cper-parse.c
index afedc9d..91de189 100644
--- a/cper-parse.c
+++ b/cper-parse.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <json.h>
 #include "base64.h"
-#include "edk/Cper.h"
+#include "Cper.h"
 #include "cper-parse.h"
 #include "cper-parse-str.h"
 #include "cper-utils.h"
diff --git a/cper-utils.c b/cper-utils.c
index c0f5b51..ed21f87 100644
--- a/cper-utils.c
+++ b/cper-utils.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <json.h>
-#include "edk/Cper.h"
+#include "Cper.h"
 #include "cper-utils.h"
 
 //The available severity types for CPER.
diff --git a/docs/GeneratorExtensions.md b/docs/GeneratorExtensions.md
index 128e888..683646d 100644
--- a/docs/GeneratorExtensions.md
+++ b/docs/GeneratorExtensions.md
@@ -42,11 +42,11 @@
 ## Adding a Section GUID
 
 To identify our section for parsing, we must define a section GUID within
-`edk/Cper.h` and `edk/Cper.c` respectively. This is the same step taken when
-adding an OEM extension to `cper-parse`, so if you've already done this, you do
-not need to repeat it again.
+`Cper.h` and `Cper.c` respectively. This is the same step taken when adding an
+OEM extension to `cper-parse`, so if you've already done this, you do not need
+to repeat it again.
 
-_edk/Cper.h_:
+_Cper.h_:
 
 ```c
 ...
@@ -55,7 +55,7 @@
 extern EFI_GUID   gMyVendorSectionGuid;
 ```
 
-_edk/Cper.c_:
+Cper.c\_:
 
 ```c
 ...
diff --git a/docs/OEMExtensions.md b/docs/OEMExtensions.md
index 90b9696..b734b41 100644
--- a/docs/OEMExtensions.md
+++ b/docs/OEMExtensions.md
@@ -19,7 +19,7 @@
 #define CPER_SECTION_MYVENDOR
 
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 
 json_object* cper_section_myvendor_to_ir(void* section, EFI_ERROR_SECTION_DESCRIPTOR* descriptor);
 void ir_section_myvendor_to_cper(json_object* section, FILE* out);
@@ -38,7 +38,7 @@
  **/
 #include <stdio.h>
 #include <json.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "cper-section-ccix-per.h"
 
 json_object* cper_section_myvendor_to_ir(void* section, EFI_ERROR_SECTION_DESCRIPTOR* descriptor)
@@ -61,11 +61,11 @@
 ## Adding a Section GUID
 
 To identify our section for parsing, we must define a section GUID within
-`edk/Cper.h` and `edk/Cper.c` respectively. They are defined here for shared use
-in both `cper-parse` and also `cper-generator` if you wish to write a generation
-method for your section.
+`Cper.h` and `Cper.c` respectively. They are defined here for shared use in both
+`cper-parse` and also `cper-generator` if you wish to write a generation method
+for your section.
 
-_edk/Cper.h_:
+_Cper.h_:
 
 ```c
 ...
@@ -74,7 +74,7 @@
 extern EFI_GUID   gMyVendorSectionGuid;
 ```
 
-_edk/Cper.c_:
+Cper.c\_:
 
 ```c
 ...
@@ -97,7 +97,7 @@
  *
  * Author: Lawrence.Tang@arm.com
  **/
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "cper-section.h"
 ...
 #include "cper-section-myvendor.h"
diff --git a/generator/cper-generate-cli.c b/generator/cper-generate-cli.c
index f34719e..b0bf14d 100644
--- a/generator/cper-generate-cli.c
+++ b/generator/cper-generate-cli.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "cper-generate.h"
 #include "sections/gen-section.h"
 
diff --git a/generator/cper-generate.c b/generator/cper-generate.c
index 8627c3b..58f14a3 100644
--- a/generator/cper-generate.c
+++ b/generator/cper-generate.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../edk/Cper.h"
+#include "Cper.h"
 #include "gen-utils.h"
 #include "sections/gen-section.h"
 #include "cper-generate.h"
diff --git a/generator/cper-generate.h b/generator/cper-generate.h
index 042431f..ad196bd 100644
--- a/generator/cper-generate.h
+++ b/generator/cper-generate.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <stdio.h>
-#include "../edk/BaseTypes.h"
+#include "BaseTypes.h"
 
 void generate_cper_record(char **types, UINT16 num_sections, FILE *out);
 void generate_single_section_record(char *type, FILE *out);
diff --git a/generator/gen-utils.c b/generator/gen-utils.c
index 872a223..e69f0b5 100644
--- a/generator/gen-utils.c
+++ b/generator/gen-utils.c
@@ -5,7 +5,7 @@
  **/
 #include <stdlib.h>
 #include <time.h>
-#include "../edk/BaseTypes.h"
+#include "BaseTypes.h"
 #include "gen-utils.h"
 
 //Generates a random section of the given byte size, saving the result to the given location.
diff --git a/generator/gen-utils.h b/generator/gen-utils.h
index 1228253..5a19d85 100644
--- a/generator/gen-utils.h
+++ b/generator/gen-utils.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <stdlib.h>
-#include "../edk/BaseTypes.h"
+#include "BaseTypes.h"
 #include "../common-utils.h"
 
 #define CPER_ERROR_TYPES_KEYS                                                  \
diff --git a/generator/sections/gen-section-ampere.c b/generator/sections/gen-section-ampere.c
index 85fa765..90c521c 100644
--- a/generator/sections/gen-section-ampere.c
+++ b/generator/sections/gen-section-ampere.c
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section-arm.c b/generator/sections/gen-section-arm.c
index f4edc70..c98bf84 100644
--- a/generator/sections/gen-section-arm.c
+++ b/generator/sections/gen-section-arm.c
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 #define ARM_ERROR_INFO_SIZE 32
diff --git a/generator/sections/gen-section-ccix-per.c b/generator/sections/gen-section-ccix-per.c
index f35f505..7323427 100644
--- a/generator/sections/gen-section-ccix-per.c
+++ b/generator/sections/gen-section-ccix-per.c
@@ -5,7 +5,7 @@
  **/
 
 #include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section-cxl-component.c b/generator/sections/gen-section-cxl-component.c
index 602dd19..6d702b4 100644
--- a/generator/sections/gen-section-cxl-component.c
+++ b/generator/sections/gen-section-cxl-component.c
@@ -5,7 +5,7 @@
  **/
 
 #include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section-cxl-protocol.c b/generator/sections/gen-section-cxl-protocol.c
index 076de96..424366d 100644
--- a/generator/sections/gen-section-cxl-protocol.c
+++ b/generator/sections/gen-section-cxl-protocol.c
@@ -5,7 +5,7 @@
  **/
 
 #include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section-dmar.c b/generator/sections/gen-section-dmar.c
index e7916be..e0ac603 100644
--- a/generator/sections/gen-section-dmar.c
+++ b/generator/sections/gen-section-dmar.c
@@ -5,7 +5,7 @@
  **/
 
 #include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section-firmware.c b/generator/sections/gen-section-firmware.c
index bc17fb2..dd2d69d 100644
--- a/generator/sections/gen-section-firmware.c
+++ b/generator/sections/gen-section-firmware.c
@@ -5,7 +5,7 @@
  **/
 
 #include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section-generic.c b/generator/sections/gen-section-generic.c
index 743c40e..02e2ee5 100644
--- a/generator/sections/gen-section-generic.c
+++ b/generator/sections/gen-section-generic.c
@@ -5,7 +5,7 @@
  **/
 
 #include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section-ia32x64.c b/generator/sections/gen-section-ia32x64.c
index 0e96d31..e1fb60d 100644
--- a/generator/sections/gen-section-ia32x64.c
+++ b/generator/sections/gen-section-ia32x64.c
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "../../edk/Cper.h"
+#include "../../Cper.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 #define IA32X64_ERROR_STRUCTURE_SIZE 64
diff --git a/generator/sections/gen-section-memory.c b/generator/sections/gen-section-memory.c
index cecb319..b573dbd 100644
--- a/generator/sections/gen-section-memory.c
+++ b/generator/sections/gen-section-memory.c
@@ -5,7 +5,7 @@
  **/
 
 #include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section-nvidia.c b/generator/sections/gen-section-nvidia.c
index 0cb4cb4..a505089 100644
--- a/generator/sections/gen-section-nvidia.c
+++ b/generator/sections/gen-section-nvidia.c
@@ -7,7 +7,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section-pci-bus.c b/generator/sections/gen-section-pci-bus.c
index ebdeb7e..decfb53 100644
--- a/generator/sections/gen-section-pci-bus.c
+++ b/generator/sections/gen-section-pci-bus.c
@@ -5,7 +5,7 @@
  **/
 
 #include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section-pci-dev.c b/generator/sections/gen-section-pci-dev.c
index 6182b1c..58ae95e 100644
--- a/generator/sections/gen-section-pci-dev.c
+++ b/generator/sections/gen-section-pci-dev.c
@@ -5,7 +5,7 @@
  **/
 
 #include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section-pcie.c b/generator/sections/gen-section-pcie.c
index 3547f1d..611ef62 100644
--- a/generator/sections/gen-section-pcie.c
+++ b/generator/sections/gen-section-pcie.c
@@ -5,7 +5,7 @@
  **/
 
 #include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
 #include "../gen-utils.h"
 #include "gen-section.h"
 
diff --git a/generator/sections/gen-section.h b/generator/sections/gen-section.h
index 1c6e227..6ce5a88 100644
--- a/generator/sections/gen-section.h
+++ b/generator/sections/gen-section.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <stdlib.h>
-#include "../../edk/Cper.h"
+#include "../../Cper.h"
 
 //Section generator function predefinitions.
 size_t generate_section_generic(void **location);
diff --git a/ir-parse.c b/ir-parse.c
index 2aadc81..cacccc0 100644
--- a/ir-parse.c
+++ b/ir-parse.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <json.h>
 #include "base64.h"
-#include "edk/Cper.h"
+#include "Cper.h"
 #include "cper-parse.h"
 #include "cper-utils.h"
 #include "sections/cper-section.h"
diff --git a/json-schema.c b/json-schema.c
index 949739e..dbbffbc 100644
--- a/json-schema.c
+++ b/json-schema.c
@@ -13,7 +13,7 @@
 #include <stdarg.h>
 #include <json.h>
 #include "json-schema.h"
-#include "edk/BaseTypes.h"
+#include "BaseTypes.h"
 
 //Field definitions.
 int json_validator_debug = 0;
diff --git a/meson.build b/meson.build
index f85ae36..acfb2d0 100644
--- a/meson.build
+++ b/meson.build
@@ -44,7 +44,7 @@
     'sections/cper-section.c',
 )
 
-edk_sources = files('edk/Cper.c')
+edk_sources = files('Cper.c')
 
 generator_section_sources = files(
     'generator/sections/gen-section-ampere.c',
@@ -137,12 +137,14 @@
     'cper-parse-str.h',
     'cper-utils.h',
     'common-utils.h',
+    'Cper.h',
+    'Cper.c',
+    'BaseTypes.h',
     subdir: 'libcper',
     preserve_path : true
 )
 
 install_headers('generator/cper-generate.h', subdir: 'libcper/generator')
-install_headers('edk/Cper.h', 'edk/BaseTypes.h', subdir: 'libcper/edk')
 
 if get_option('utility').allowed()
     executable(
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 {
diff --git a/specification/document/cper-json-specification.tex b/specification/document/cper-json-specification.tex
index 1e93781..7edb6bc 100644
--- a/specification/document/cper-json-specification.tex
+++ b/specification/document/cper-json-specification.tex
@@ -383,7 +383,7 @@
 \label{subsection:ia32x64processorerrorinfostructure}
 This structure describes a single IA32/x64 Processor Error Info sub-section, which is part of the larger IA32/x64 record (\ref{section:ia32x64errorsection}).
 \jsontable{table:ia32x64processorerrorinfostructure}
-type.guid & string & A GUID indicating the type of processor error defined in this structure. See \texttt{edk/Cper.h} in the library repository for the defined GUID values.\\
+type.guid & string & A GUID indicating the type of processor error defined in this structure. See \texttt{Cper.h} in the library repository for the defined GUID values.\\
 type.name & string & The human readable name, if available, of the type of processor error defined in this structure.\\
 \hline
 validationBits & object & An IA32/x64 Processor Error Info Validation structure, as defined in Subsection \ref{subsection:ia32x64processorerrorinfovalidationstructure}.\\
@@ -420,7 +420,7 @@
 \subsection{IA32/x64 Processor Error Check Info (Cache/TLB Error) Structure}
 \label{subsection:ia32x64processorerrorcheckinfocachetlbstructure}
 This structure describes check info for an IA32/x64 Processor Error Info structure (\ref{subsection:ia32x64processorerrorinfostructure}) stemming from a cache or TLB error.
-The GUIDs for cache and TLB error check info structures can be found in the library repository's \texttt{edk/Cper.h}.
+The GUIDs for cache and TLB error check info structures can be found in the library repository's \texttt{Cper.h}.
 \jsontable{table:ia32x64processorerrorcheckinfocachetlbstructure}
 validationBits & object & An IA32/x64 Processor Error Check Info (Cache/TLB/Bus) Validation structure, as defined in Subsection \ref{subsection:ia32x64processorerrorcheckinfovalidationstructure}.\\
 \hline
@@ -447,7 +447,7 @@
 \subsection{IA32/x64 Processor Error Check Info (Bus Error) Structure}
 \label{subsection:ia32x64processorerrorcheckinfobusstructure}
 This structure describes check info for an IA32/x64 Processor Error Info structure (\ref{subsection:ia32x64processorerrorinfostructure}) stemming from a bus error.
-The GUID for bus error check info structures can be found in the library repository's \texttt{edk/Cper.h}.
+The GUID for bus error check info structures can be found in the library repository's \texttt{Cper.h}.
 \jsontable{table:ia32x64processorerrorcheckinfobusstructure}
 validationBits & object & An IA32/x64 Processor Error Check Info (Cache/TLB/Bus) Validation structure, as defined in Subsection \ref{subsection:ia32x64processorerrorcheckinfovalidationstructure}.\\
 \hline
@@ -482,7 +482,7 @@
 \subsection{IA32/x64 Processor Error Check Info (MS Check Error) Structure}
 \label{subsection:ia32x64processorerrorcheckinfomscheckstructure}
 This structure describes check info for an IA32/x64 Processor Error Info structure (\ref{subsection:ia32x64processorerrorinfostructure}) stemming from an MS check error.
-The GUID for MS check check info structures can be found in the library repository's \texttt{edk/Cper.h}.
+The GUID for MS check check info structures can be found in the library repository's \texttt{Cper.h}.
 \jsontable{table:ia32x64processorerrorcheckinfomscheckstructure}
 validationBits & object & An IA32/x64 Processor Error Check Info (MS Check) Validation structure, as defined in Subsection \ref{subsection:ia32x64processorerrorcheckinfomscheckvalidationstructure}.\\
 \hline
diff --git a/tests/test-utils.cpp b/tests/test-utils.cpp
index 53aecd3..c508e8d 100644
--- a/tests/test-utils.cpp
+++ b/tests/test-utils.cpp
@@ -8,7 +8,7 @@
 #include <cstdlib>
 #include "test-utils.hpp"
 
-#include "../edk/BaseTypes.h"
+#include "BaseTypes.h"
 #include "../generator/cper-generate.h"
 
 //Returns a ready-for-use memory stream containing a CPER record with the given sections inside.
diff --git a/tests/test-utils.hpp b/tests/test-utils.hpp
index 2dedf8b..af9390e 100644
--- a/tests/test-utils.hpp
+++ b/tests/test-utils.hpp
@@ -2,7 +2,7 @@
 #define CPER_IR_TEST_UTILS_H
 
 extern "C" {
-#include "../edk/BaseTypes.h"
+#include "BaseTypes.h"
 }
 
 FILE *generate_record_memstream(const char **types, UINT16 num_types,