--- xnu/xnu-792.6.56/libsa/bootstrap.cpp
+++ xnu/xnu-344.49/libsa/bootstrap.cpp
@@ -2,6 +2,8 @@
  * 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
@@ -24,12 +26,15 @@
 #include <mach/kmod.h>
 #include <libkern/c++/OSDictionary.h>
 
-#include <libsa/kext.h>
+#include <libsa/kmod.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
@@ -49,6 +54,7 @@
  * about loading and matching drivers.
  */
 extern int kernelLinkerPresent;
+};
 
 
 class KLDBootstrap {
@@ -65,8 +71,6 @@
  * table for functions used to record and load kmods.
  */
 KLDBootstrap::KLDBootstrap() {
-
-    malloc_init();
 
     kmod_load_function = &load_kernel_extension;