Index: include/malloc.h
===================================================================
--- include/malloc.h
+++ include/malloc.h
@@ -1,6 +1,6 @@
-/* $FreeBSD$ */
-#if __STDC__
-#error "<malloc.h> has been replaced by <stdlib.h>"
-#else
+/*-
+ * This file is in the public domain.
+ * $FreeBSD$
+ */
 #include <stdlib.h>
-#endif
+#include <malloc_np.h>
Index: include/malloc_np.h
===================================================================
--- include/malloc_np.h
+++ include/malloc_np.h
@@ -35,27 +35,32 @@
 #define	_MALLOC_NP_H_
 #include <sys/cdefs.h>
 #include <sys/types.h>
-#include <stdbool.h>
 #include <strings.h>
 
+#ifdef __cplusplus
+#ifndef _Bool
+#define	_Bool	bool
+#endif
+#endif
+
 __BEGIN_DECLS
 typedef struct extent_hooks_s extent_hooks_t;
-typedef void *(extent_alloc_t)(extent_hooks_t *, void *, size_t, size_t, bool *,
-    bool *, unsigned);
-typedef bool (extent_dalloc_t)(extent_hooks_t *, void *, size_t, bool,
-    unsigned);
-typedef void (extent_destroy_t)(extent_hooks_t *, void *, size_t, bool,
+typedef void *(extent_alloc_t)(extent_hooks_t *, void *, size_t, size_t,
+    _Bool *, _Bool *, unsigned);
+typedef _Bool (extent_dalloc_t)(extent_hooks_t *, void *, size_t, _Bool,
     unsigned);
-typedef bool (extent_commit_t)(extent_hooks_t *, void *, size_t, size_t, size_t,
+typedef void (extent_destroy_t)(extent_hooks_t *, void *, size_t, _Bool,
     unsigned);
-typedef bool (extent_decommit_t)(extent_hooks_t *, void *, size_t, size_t,
+typedef _Bool (extent_commit_t)(extent_hooks_t *, void *, size_t, size_t,
+    size_t, unsigned);
+typedef _Bool (extent_decommit_t)(extent_hooks_t *, void *, size_t, size_t,
     size_t, unsigned);
-typedef bool (extent_purge_t)(extent_hooks_t *, void *, size_t, size_t, size_t,
+typedef _Bool (extent_purge_t)(extent_hooks_t *, void *, size_t, size_t, size_t,
     unsigned);
-typedef bool (extent_split_t)(extent_hooks_t *, void *, size_t, size_t, size_t,
-    bool, unsigned);
-typedef bool (extent_merge_t)(extent_hooks_t *, void *, size_t, void *, size_t,
-    bool, unsigned);
+typedef _Bool (extent_split_t)(extent_hooks_t *, void *, size_t, size_t, size_t,
+    _Bool, unsigned);
+typedef _Bool (extent_merge_t)(extent_hooks_t *, void *, size_t, void *, size_t,
+    _Bool, unsigned);
 struct extent_hooks_s {
 	extent_alloc_t		*alloc;
 	extent_dalloc_t		*dalloc;