2 files changed, 19 insertions, 14 deletions
diff --git a/Private/KernelKit/MSDOS.hpp b/Private/KernelKit/MSDOS.hpp
index 4f098249..2276f3cb 100644
--- a/Private/KernelKit/MSDOS.hpp
+++ b/Private/KernelKit/MSDOS.hpp
@@ -16,6 +16,8 @@
 
 #include <NewKit/Defines.hpp>
 
+#include "PE.hpp"
+
 typedef HCore::UInt32 DosWord;
 typedef HCore::Long DosLong;
 
@@ -41,4 +43,15 @@ typedef struct _DosHeader {
   DosLong eLfanew;
 } DosHeader, *DosHeaderPtr;
 
+namespace HCore {
+/// @brief Find the PE header inside the the blob.
+inline auto rt_find_exec_header(DosHeaderPtr ptrDos) -> VoidPtr {
+  if (!ptrDos) return nullptr;
+  if (ptrDos->eMagic[0] != kMagMz0) return nullptr;
+  if (ptrDos->eMagic[0] != kMagMz1) return nullptr;
+
+  return (VoidPtr)(&ptrDos->eLfanew + 1);
+}
+}  // namespace HCore
+
 #endif /* ifndef __MSDOS_EXEC__ */
diff --git a/Private/NewBoot/Source/RuntimeMain.cxx b/Private/NewBoot/Source/RuntimeMain.cxx
index a520b980..a6e4015c 100644
--- a/Private/NewBoot/Source/RuntimeMain.cxx
+++ b/Private/NewBoot/Source/RuntimeMain.cxx
@@ -15,15 +15,7 @@
 #include <KernelKit/PE.hpp>
 #include <NewKit/Ref.hpp>
 
-namespace Detail {
-constexpr Int32 kBufferReadSz = 2048;
-
-auto FindPEHeader(DosHeaderPtr ptrDos) -> ExecHeaderPtr {
-  if (!ptrDos) return nullptr;
-
-  return (ExecHeaderPtr)(&ptrDos->eLfanew + 1);
-}
-}  // namespace Detail
+#define kBufferReadSz 2048
 
 EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
                                  EfiSystemTable* SystemTable) {
@@ -54,17 +46,17 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
 
   BFileReader img(L"HCOREKRNL.EXE", ImageHandle);
 
-  img.Size() = Detail::kBufferReadSz;
+  img.Size() = kBufferReadSz;
   img.Read();
 
   if (img.Error() == BFileReader::kOperationOkay) {
     BlobType blob = (BlobType)img.Blob();
 
-    DosHeaderPtr ptrDos = reinterpret_cast<DosHeaderPtr>(blob);
-    ExecHeaderPtr ptrHdr = Detail::FindPEHeader(ptrDos);
+    ExecHeaderPtr ptrHdr = reinterpret_cast<ExecHeaderPtr>(
+        HCore::rt_find_exec_header(reinterpret_cast<DosHeaderPtr>(blob)));
 
-    if (ptrDos->eMagic[0] == kMagMz0 && ptrDos->eMagic[1] == kMagMz1 &&
-        ptrHdr->mMachine == EFI::Platform() && ptrHdr->mMagic == kPeMagic) {
+    if (ptrHdr && ptrHdr->mMachine == EFI::Platform() &&
+        ptrHdr->mMagic == kPeMagic) {
       if (ptrHdr->mNumberOfSections > 1) {
         UInt64 MapKey = 0;