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);