10 files changed, 6 insertions, 14 deletions
diff --git a/Private/NewBoot/BootKit/BootKit.hxx b/Private/NewBoot/BootKit/BootKit.hxx
index 5128d02f..81624ce5 100644
--- a/Private/NewBoot/BootKit/BootKit.hxx
+++ b/Private/NewBoot/BootKit/BootKit.hxx
@@ -19,7 +19,7 @@ class BFileReader;
 class BFileRunner;
 
 #include <BootKit/Arch/ATA.hxx>
-#include <EFIKit/EFI.hxx>
+#include <FirmwareKit/EFI.hxx>
 #include <NewKit/Defines.hpp>
 
 using namespace HCore;
diff --git a/Private/NewBoot/BootKit/Protocol.hxx b/Private/NewBoot/BootKit/Protocol.hxx
index 055858a8..d3dc1ab1 100644
--- a/Private/NewBoot/BootKit/Protocol.hxx
+++ b/Private/NewBoot/BootKit/Protocol.hxx
@@ -9,5 +9,5 @@
 
 #pragma once
 
-#include <EFIKit/EFI.hxx>
-#include <EFIKit/Handover.hxx>
+#include <FirmwareKit/EFI.hxx>
+#include <FirmwareKit/Handover.hxx>
diff --git a/Private/NewBoot/NetBoot/EfiModule.cxx b/Private/NewBoot/NetBoot/EfiModule.cxx
index a0ce13a5..36a7288c 100644
--- a/Private/NewBoot/NetBoot/EfiModule.cxx
+++ b/Private/NewBoot/NetBoot/EfiModule.cxx
@@ -7,8 +7,7 @@
  * 	========================================================
  */
 
-#include <EFIKit/Api.hxx>
-#include <EFIKit/EFI.hxx>
+#include <FirmwareKit/EFI.hxx>
 
 extern "C" Int32 EfiMain(EfiHandlePtr handle, EfiSystemTable* SystemTable) {
   return kEfiOk;
diff --git a/Private/NewBoot/Source/BootMain.cxx b/Private/NewBoot/Source/BootMain.cxx
index c2ee87e3..35270b4b 100644
--- a/Private/NewBoot/Source/BootMain.cxx
+++ b/Private/NewBoot/Source/BootMain.cxx
@@ -10,7 +10,6 @@
 #define __BOOTLOADER__ 1
 
 #include <BootKit/BootKit.hxx>
-#include <EFIKit/Api.hxx>
 #include <HALKit/AMD64/ACPI/ACPI.hpp>
 #include <KernelKit/MSDOS.hpp>
 #include <KernelKit/PE.hpp>
diff --git a/Private/NewBoot/Source/FileReader.cxx b/Private/NewBoot/Source/FileReader.cxx
index 6696a1b4..193184c4 100644
--- a/Private/NewBoot/Source/FileReader.cxx
+++ b/Private/NewBoot/Source/FileReader.cxx
@@ -13,8 +13,7 @@
 ------------------------------------------- */
 
 #include <BootKit/BootKit.hxx>
-#include <EFIKit/Api.hxx>
-#include <EFIKit/Handover.hxx>
+#include <FirmwareKit/Handover.hxx>
 
 /// BUGS: 0
 
diff --git a/Private/NewBoot/Source/HEL/AMD64/AMD64-ATA.cxx b/Private/NewBoot/Source/HEL/AMD64/AMD64-ATA.cxx
index 04755dcf..0adf7707 100644
--- a/Private/NewBoot/Source/HEL/AMD64/AMD64-ATA.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/AMD64-ATA.cxx
@@ -20,7 +20,6 @@
 
 #include <BootKit/Arch/ATA.hxx>
 #include <BootKit/BootKit.hxx>
-#include <EFIKit/Api.hxx>
 
 /// bugs: 0
 
diff --git a/Private/NewBoot/Source/HEL/AMD64/AMD64-Platform.cxx b/Private/NewBoot/Source/HEL/AMD64/AMD64-Platform.cxx
index e6c962b1..ff07b4c7 100644
--- a/Private/NewBoot/Source/HEL/AMD64/AMD64-Platform.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/AMD64-Platform.cxx
@@ -16,7 +16,6 @@
 
 #include <BootKit/BootKit.hxx>
 #include <BootKit/Platform.hxx>
-#include <EFIKit/Api.hxx>
 
 #ifndef __BUNDLE_KERNEL__
 
diff --git a/Private/NewBoot/Source/String.cxx b/Private/NewBoot/Source/String.cxx
index c59e2bba..9fbe1a11 100644
--- a/Private/NewBoot/Source/String.cxx
+++ b/Private/NewBoot/Source/String.cxx
@@ -12,7 +12,6 @@
 ------------------------------------------- */
 
 #include <BootKit/BootKit.hxx>
-#include <EFIKit/Api.hxx>
 
 /// bugs 0
 
diff --git a/Private/NewBoot/Source/TextWriter.cxx b/Private/NewBoot/Source/TextWriter.cxx
index fe058aa4..b35866a5 100644
--- a/Private/NewBoot/Source/TextWriter.cxx
+++ b/Private/NewBoot/Source/TextWriter.cxx
@@ -12,7 +12,6 @@
 ------------------------------------------- */
 
 #include <BootKit/BootKit.hxx>
-#include <EFIKit/Api.hxx>
 
 /// BUGS: 0
 
diff --git a/Private/NewBoot/Source/Utils.cxx b/Private/NewBoot/Source/Utils.cxx
index 4165af2e..4f7293bc 100644
--- a/Private/NewBoot/Source/Utils.cxx
+++ b/Private/NewBoot/Source/Utils.cxx
@@ -8,8 +8,7 @@
  */
 
 #include <BootKit/BootKit.hxx>
-#include <EFIKit/Api.hxx>
-#include <EFIKit/EFI.hxx>
+#include <FirmwareKit/EFI.hxx>
 
 /// BUGS: 0