--- xnu/xnu-344.49/libsa/bootstrap.cpp
+++ xnu/xnu-792.6.56/libsa/bootstrap.cpp
@@ -2,8 +2,6 @@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
@@ -26,15 +24,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
@@ -54,7 +49,6 @@
  * about loading and matching drivers.
  */
 extern int kernelLinkerPresent;
-};
 
 
 class KLDBootstrap {
@@ -71,6 +65,8 @@
  * table for functions used to record and load kmods.
  */
 KLDBootstrap::KLDBootstrap() {
+
+    malloc_init();
 
     kmod_load_function = &load_kernel_extension;