2 files changed, 8 insertions, 3 deletions
diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h
index 646cf72f..003d3d9e 100644
--- a/dev/Boot/BootKit/BootKit.h
+++ b/dev/Boot/BootKit/BootKit.h
@@ -389,7 +389,6 @@ namespace Boot
 
 		fDiskDev.Write((Char*)&epm_boot, sizeof(BOOT_BLOCK_STRUCT));
 
-		BTextWriter writer;
 		writer.Write(L"BootZ: Drive has been formatted Successfully.\r");
 #endif
 
diff --git a/dev/Boot/BootKit/Support.h b/dev/Boot/BootKit/Support.h
index 9d662219..37111df3 100644
--- a/dev/Boot/BootKit/Support.h
+++ b/dev/Boot/BootKit/Support.h
@@ -9,7 +9,9 @@
 /// @file Support.h
 /// @brief Purpose of this file is to help port libs into the bootloader.
 
+#ifndef __aarch64__
 #include <string.h>
+#endif
 
 #define kLongMax ((long)(~0UL >> 1))
 #define kLongMin (~kLongMax)
@@ -34,14 +36,18 @@ EXTERN_C size_t strlen(const char* whatToCheck);
 /// @brief strcmp definition in C++.
 EXTERN_C int strcmp(const char* whatToCheck, const char* whatToCheckRight);
 
+#else
+
+#include <string.h>
+
+#endif // __ZBAOSLDR__
+
 #define SetMem(dst, c, sz)	  memset(dst, c, sz)
 #define MoveMem(dst, src, sz) memcpy(dst, src, sz)
 #define CopyMem(dst, src, sz) memcpy(dst, src, sz)
 #define StrLen(src)			  strlen(src)
 #define StrCmp(dst, src)	  strcmp(dst, src)
 
-#endif // __ZBAOSLDR__
-
 inline int IsSpace(int c)
 {
 	return c == ' ';