--- xnu/xnu-344.2/libsa/bootstrap.cpp
+++ xnu/xnu-517.9.5/libsa/bootstrap.cpp
@@ -23,15 +23,12 @@
 #include <mach/kmod.h>
 #include <libkern/c++/OSDictionary.h>
 
-#include <libsa/kmod.h>
+#include <libsa/kext.h>
 #include <libsa/catalogue.h>
-extern "C" {
 #include <libsa/malloc.h>
-};
 
 #include "kld_patch.h"
 
-extern "C" {
 /*****
  * This function is used by IOCatalogue to load a kernel
  * extension. libsa initially sets it to be a function
@@ -51,7 +48,6 @@
  * about loading and matching drivers.
  */
 extern int kernelLinkerPresent;
-};
 
 
 class KLDBootstrap {
@@ -68,6 +64,8 @@
  * table for functions used to record and load kmods.
  */
 KLDBootstrap::KLDBootstrap() {
+
+    malloc_init();
 
     kmod_load_function = &load_kernel_extension;