diff --git a/configure.ac b/configure.ac
index 61adc2a7..97aa2adc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,6 +301,7 @@ case "${host}" in
 	AC_DEFINE([JEMALLOC_HAS_ALLOCA_H])
 	AC_DEFINE([JEMALLOC_PURGE_MADVISE_DONTNEED], [ ])
 	AC_DEFINE([JEMALLOC_THREADED_INIT], [ ])
+	AC_DEFINE([JEMALLOC_USE_CXX_THROW], [ ])
 	default_munmap="0"
 	;;
   *-*-netbsd*)
diff --git a/include/jemalloc/jemalloc_defs.h.in b/include/jemalloc/jemalloc_defs.h.in
index ce6c6987..4c0335e5 100644
--- a/include/jemalloc/jemalloc_defs.h.in
+++ b/include/jemalloc/jemalloc_defs.h.in
@@ -17,5 +17,12 @@
  */
 #undef JEMALLOC_USABLE_SIZE_CONST
 
+/*
+ * If defined, specify throw() for the public function prototypes when compiling
+ * with C++.  The only justification for this is to match the prototypes that
+ * glibc defines.
+ */
+#undef JEMALLOC_USE_CXX_THROW
+
 /* sizeof(void *) == 2^LG_SIZEOF_PTR. */
 #undef LG_SIZEOF_PTR
diff --git a/include/jemalloc/jemalloc_macros.h.in b/include/jemalloc/jemalloc_macros.h.in
index 72f2a082..2183a130 100644
--- a/include/jemalloc/jemalloc_macros.h.in
+++ b/include/jemalloc/jemalloc_macros.h.in
@@ -30,14 +30,23 @@
  */
 #  define MALLOCX_ARENA(a)	((int)(((a)+1) << 20))
 
+#if defined(__cplusplus) && defined(JEMALLOC_USE_CXX_THROW)
+#  define JEMALLOC_CXX_THROW throw()
+#else
+#  define JEMALLOC_CXX_THROW
+#endif
+
 #ifdef JEMALLOC_HAVE_ATTR
 #  define JEMALLOC_ATTR(s) __attribute__((s))
 #  ifndef JEMALLOC_EXPORT
 #    define JEMALLOC_EXPORT JEMALLOC_ATTR(visibility("default"))
 #  endif
 #  define JEMALLOC_ALIGNED(s) JEMALLOC_ATTR(aligned(s))
-#  define JEMALLOC_SECTION(s) JEMALLOC_ATTR(section(s))
+#  define JEMALLOC_ALLOC_SIZE(s) JEMALLOC_ATTR(alloc_size(s))
+#  define JEMALLOC_ALLOC_SIZE2(s1, s2) JEMALLOC_ATTR(alloc_size(s1, s2))
 #  define JEMALLOC_NOINLINE JEMALLOC_ATTR(noinline)
+#  define JEMALLOC_NOTHROW JEMALLOC_ATTR(nothrow)
+#  define JEMALLOC_SECTION(s) JEMALLOC_ATTR(section(s))
 #elif _MSC_VER
 #  define JEMALLOC_ATTR(s)
 #  ifndef JEMALLOC_EXPORT
@@ -48,12 +57,18 @@
 #    endif
 #  endif
 #  define JEMALLOC_ALIGNED(s) __declspec(align(s))
-#  define JEMALLOC_SECTION(s) __declspec(allocate(s))
+#  define JEMALLOC_ALLOC_SIZE(s)
+#  define JEMALLOC_ALLOC_SIZE2(s1, s2)
 #  define JEMALLOC_NOINLINE __declspec(noinline)
+#  define JEMALLOC_NOTHROW __declspec(nothrow)
+#  define JEMALLOC_SECTION(s) __declspec(allocate(s))
 #else
 #  define JEMALLOC_ATTR(s)
 #  define JEMALLOC_EXPORT
 #  define JEMALLOC_ALIGNED(s)
-#  define JEMALLOC_SECTION(s)
+#  define JEMALLOC_ALLOC_SIZE(s)
+#  define JEMALLOC_ALLOC_SIZE2(s1, s2)
 #  define JEMALLOC_NOINLINE
+#  define JEMALLOC_NOTHROW
+#  define JEMALLOC_SECTION(s)
 #endif
diff --git a/include/jemalloc/jemalloc_protos.h.in b/include/jemalloc/jemalloc_protos.h.in
index f81adc14..e77bd28e 100644
--- a/include/jemalloc/jemalloc_protos.h.in
+++ b/include/jemalloc/jemalloc_protos.h.in
@@ -7,44 +7,52 @@ extern JEMALLOC_EXPORT const char	*@je_@malloc_conf;
 extern JEMALLOC_EXPORT void		(*@je_@malloc_message)(void *cbopaque,
     const char *s);
 
-JEMALLOC_EXPORT void	*@je_@malloc(size_t size) JEMALLOC_ATTR(malloc);
-JEMALLOC_EXPORT void	*@je_@calloc(size_t num, size_t size)
-    JEMALLOC_ATTR(malloc);
+JEMALLOC_EXPORT void	*@je_@malloc(size_t size) JEMALLOC_CXX_THROW
+    JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1) JEMALLOC_NOTHROW;
+JEMALLOC_EXPORT void	*@je_@calloc(size_t num, size_t size) JEMALLOC_CXX_THROW
+    JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE2(1, 2) JEMALLOC_NOTHROW;
 JEMALLOC_EXPORT int	@je_@posix_memalign(void **memptr, size_t alignment,
-    size_t size) JEMALLOC_ATTR(nonnull(1));
+    size_t size) JEMALLOC_CXX_THROW JEMALLOC_ATTR(nonnull(1))
+    JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW;
 JEMALLOC_EXPORT void	*@je_@aligned_alloc(size_t alignment, size_t size)
-    JEMALLOC_ATTR(malloc);
-JEMALLOC_EXPORT void	*@je_@realloc(void *ptr, size_t size);
-JEMALLOC_EXPORT void	@je_@free(void *ptr);
+    JEMALLOC_CXX_THROW JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(2)
+    JEMALLOC_NOTHROW;
+JEMALLOC_EXPORT void	*@je_@realloc(void *ptr, size_t size) JEMALLOC_CXX_THROW
+    JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW;
+JEMALLOC_EXPORT void	@je_@free(void *ptr) JEMALLOC_CXX_THROW
+    JEMALLOC_NOTHROW;
 
 JEMALLOC_EXPORT void	*@je_@mallocx(size_t size, int flags)
-    JEMALLOC_ATTR(malloc);
-JEMALLOC_EXPORT void	*@je_@rallocx(void *ptr, size_t size, int flags);
+    JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1) JEMALLOC_NOTHROW;
+JEMALLOC_EXPORT void	*@je_@rallocx(void *ptr, size_t size, int flags)
+    JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW;
 JEMALLOC_EXPORT size_t	@je_@xallocx(void *ptr, size_t size, size_t extra,
-    int flags);
+    int flags) JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW;
 JEMALLOC_EXPORT size_t	@je_@sallocx(const void *ptr, int flags)
-    JEMALLOC_ATTR(pure);
-JEMALLOC_EXPORT void	@je_@dallocx(void *ptr, int flags);
-JEMALLOC_EXPORT void	@je_@sdallocx(void *ptr, size_t size, int flags);
+    JEMALLOC_ATTR(pure) JEMALLOC_NOTHROW;
+JEMALLOC_EXPORT void	@je_@dallocx(void *ptr, int flags) JEMALLOC_NOTHROW;
+JEMALLOC_EXPORT void	@je_@sdallocx(void *ptr, size_t size, int flags)
+    JEMALLOC_NOTHROW;
 JEMALLOC_EXPORT size_t	@je_@nallocx(size_t size, int flags)
-    JEMALLOC_ATTR(pure);
+    JEMALLOC_ATTR(pure) JEMALLOC_NOTHROW;
 
 JEMALLOC_EXPORT int	@je_@mallctl(const char *name, void *oldp,
-    size_t *oldlenp, void *newp, size_t newlen);
+    size_t *oldlenp, void *newp, size_t newlen) JEMALLOC_NOTHROW;
 JEMALLOC_EXPORT int	@je_@mallctlnametomib(const char *name, size_t *mibp,
-    size_t *miblenp);
+    size_t *miblenp) JEMALLOC_NOTHROW;
 JEMALLOC_EXPORT int	@je_@mallctlbymib(const size_t *mib, size_t miblen,
-    void *oldp, size_t *oldlenp, void *newp, size_t newlen);
+    void *oldp, size_t *oldlenp, void *newp, size_t newlen) JEMALLOC_NOTHROW;
 JEMALLOC_EXPORT void	@je_@malloc_stats_print(void (*write_cb)(void *,
-    const char *), void *@je_@cbopaque, const char *opts);
+    const char *), void *@je_@cbopaque, const char *opts) JEMALLOC_NOTHROW;
 JEMALLOC_EXPORT size_t	@je_@malloc_usable_size(
-    JEMALLOC_USABLE_SIZE_CONST void *ptr);
+    JEMALLOC_USABLE_SIZE_CONST void *ptr) JEMALLOC_CXX_THROW JEMALLOC_NOTHROW;
 
 #ifdef JEMALLOC_OVERRIDE_MEMALIGN
-JEMALLOC_EXPORT void *	@je_@memalign(size_t alignment, size_t size)
+JEMALLOC_EXPORT void	*@je_@memalign(size_t alignment, size_t size)
     JEMALLOC_ATTR(malloc);
 #endif
 
 #ifdef JEMALLOC_OVERRIDE_VALLOC
-JEMALLOC_EXPORT void *	@je_@valloc(size_t size) JEMALLOC_ATTR(malloc);
+JEMALLOC_EXPORT void	*@je_@valloc(size_t size) JEMALLOC_CXX_THROW
+    JEMALLOC_ATTR(malloc);
 #endif
diff --git a/src/jemalloc.c b/src/jemalloc.c
index 43c4c81e..fc223dae 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -1395,7 +1395,8 @@ imalloc_body(size_t size, tsd_t **tsd, size_t *usize)
 	return (imalloc(*tsd, size));
 }
 
-void *
+JEMALLOC_EXPORT void *
+JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1) JEMALLOC_NOTHROW
 je_malloc(size_t size)
 {
 	void *ret;
@@ -1529,7 +1530,8 @@ label_oom:
 	goto label_return;
 }
 
-int
+JEMALLOC_EXPORT int
+JEMALLOC_ATTR(nonnull(1)) JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW
 je_posix_memalign(void **memptr, size_t alignment, size_t size)
 {
 	int ret = imemalign(memptr, alignment, size, sizeof(void *));
@@ -1538,7 +1540,8 @@ je_posix_memalign(void **memptr, size_t alignment, size_t size)
 	return (ret);
 }
 
-void *
+JEMALLOC_EXPORT void *
+JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW
 je_aligned_alloc(size_t alignment, size_t size)
 {
 	void *ret;
@@ -1591,7 +1594,8 @@ icalloc_prof(tsd_t *tsd, size_t usize)
 	return (p);
 }
 
-void *
+JEMALLOC_EXPORT void *
+JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE2(1, 2) JEMALLOC_NOTHROW
 je_calloc(size_t num, size_t size)
 {
 	void *ret;
@@ -1735,7 +1739,8 @@ isfree(tsd_t *tsd, void *ptr, size_t usize, tcache_t *tcache)
 	JEMALLOC_VALGRIND_FREE(ptr, rzsize);
 }
 
-void *
+JEMALLOC_EXPORT void *
+JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW
 je_realloc(void *ptr, size_t size)
 {
 	void *ret;
@@ -1798,7 +1803,8 @@ je_realloc(void *ptr, size_t size)
 	return (ret);
 }
 
-void
+JEMALLOC_EXPORT void
+JEMALLOC_NOTHROW
 je_free(void *ptr)
 {
 
@@ -1818,7 +1824,8 @@ je_free(void *ptr)
  */
 
 #ifdef JEMALLOC_OVERRIDE_MEMALIGN
-void *
+JEMALLOC_EXPORT void *
+JEMALLOC_ATTR(malloc)
 je_memalign(size_t alignment, size_t size)
 {
 	void *ret JEMALLOC_CC_SILENCE_INIT(NULL);
@@ -1830,7 +1837,8 @@ je_memalign(size_t alignment, size_t size)
 #endif
 
 #ifdef JEMALLOC_OVERRIDE_VALLOC
-void *
+JEMALLOC_EXPORT void *
+JEMALLOC_ATTR(malloc)
 je_valloc(size_t size)
 {
 	void *ret JEMALLOC_CC_SILENCE_INIT(NULL);
@@ -2024,7 +2032,8 @@ imallocx_no_prof(tsd_t *tsd, size_t size, int flags, size_t *usize)
 	return (p);
 }
 
-void *
+JEMALLOC_EXPORT void *
+JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1) JEMALLOC_NOTHROW
 je_mallocx(size_t size, int flags)
 {
 	tsd_t *tsd;
@@ -2121,7 +2130,8 @@ irallocx_prof(tsd_t *tsd, void *oldptr, size_t old_usize, size_t size,
 	return (p);
 }
 
-void *
+JEMALLOC_EXPORT void *
+JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW
 je_rallocx(void *ptr, size_t size, int flags)
 {
 	void *p;
@@ -2266,7 +2276,8 @@ ixallocx_prof(tsd_t *tsd, void *ptr, size_t old_usize, size_t size,
 	return (usize);
 }
 
-size_t
+JEMALLOC_EXPORT size_t
+JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW
 je_xallocx(void *ptr, size_t size, size_t extra, int flags)
 {
 	tsd_t *tsd;
@@ -2307,7 +2318,8 @@ label_not_resized:
 	return (usize);
 }
 
-size_t
+JEMALLOC_EXPORT size_t
+JEMALLOC_ATTR(pure) JEMALLOC_NOTHROW
 je_sallocx(const void *ptr, int flags)
 {
 	size_t usize;
@@ -2323,7 +2335,8 @@ je_sallocx(const void *ptr, int flags)
 	return (usize);
 }
 
-void
+JEMALLOC_EXPORT void
+JEMALLOC_NOTHROW
 je_dallocx(void *ptr, int flags)
 {
 	tsd_t *tsd;
@@ -2358,7 +2371,8 @@ inallocx(size_t size, int flags)
 	return (usize);
 }
 
-void
+JEMALLOC_EXPORT void
+JEMALLOC_NOTHROW
 je_sdallocx(void *ptr, size_t size, int flags)
 {
 	tsd_t *tsd;
@@ -2383,7 +2397,8 @@ je_sdallocx(void *ptr, size_t size, int flags)
 	isfree(tsd, ptr, usize, tcache);
 }
 
-size_t
+JEMALLOC_EXPORT size_t
+JEMALLOC_ATTR(pure) JEMALLOC_NOTHROW
 je_nallocx(size_t size, int flags)
 {
 
@@ -2395,7 +2410,8 @@ je_nallocx(size_t size, int flags)
 	return (inallocx(size, flags));
 }
 
-int
+JEMALLOC_EXPORT int
+JEMALLOC_NOTHROW
 je_mallctl(const char *name, void *oldp, size_t *oldlenp, void *newp,
     size_t newlen)
 {
@@ -2406,7 +2422,8 @@ je_mallctl(const char *name, void *oldp, size_t *oldlenp, void *newp,
 	return (ctl_byname(name, oldp, oldlenp, newp, newlen));
 }
 
-int
+JEMALLOC_EXPORT int
+JEMALLOC_NOTHROW
 je_mallctlnametomib(const char *name, size_t *mibp, size_t *miblenp)
 {
 
@@ -2416,7 +2433,8 @@ je_mallctlnametomib(const char *name, size_t *mibp, size_t *miblenp)
 	return (ctl_nametomib(name, mibp, miblenp));
 }
 
-int
+JEMALLOC_EXPORT int
+JEMALLOC_NOTHROW
 je_mallctlbymib(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp,
   void *newp, size_t newlen)
 {
@@ -2427,7 +2445,8 @@ je_mallctlbymib(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp,
 	return (ctl_bymib(mib, miblen, oldp, oldlenp, newp, newlen));
 }
 
-void
+JEMALLOC_EXPORT void
+JEMALLOC_NOTHROW
 je_malloc_stats_print(void (*write_cb)(void *, const char *), void *cbopaque,
     const char *opts)
 {
@@ -2435,7 +2454,8 @@ je_malloc_stats_print(void (*write_cb)(void *, const char *), void *cbopaque,
 	stats_print(write_cb, cbopaque, opts);
 }
 
-size_t
+JEMALLOC_EXPORT size_t
+JEMALLOC_NOTHROW
 je_malloc_usable_size(JEMALLOC_USABLE_SIZE_CONST void *ptr)
 {
 	size_t ret;
diff --git a/test/unit/bitmap.c b/test/unit/bitmap.c
index 4ea94f85..7da583d8 100644
--- a/test/unit/bitmap.c
+++ b/test/unit/bitmap.c
@@ -23,7 +23,7 @@ TEST_BEGIN(test_bitmap_init)
 		bitmap_info_init(&binfo, i);
 		{
 			size_t j;
-			bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
+			bitmap_t *bitmap = (bitmap_t *)malloc(sizeof(bitmap_t) *
 				bitmap_info_ngroups(&binfo));
 			bitmap_init(bitmap, &binfo);
 
@@ -46,7 +46,7 @@ TEST_BEGIN(test_bitmap_set)
 		bitmap_info_init(&binfo, i);
 		{
 			size_t j;
-			bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
+			bitmap_t *bitmap = (bitmap_t *)malloc(sizeof(bitmap_t) *
 				bitmap_info_ngroups(&binfo));
 			bitmap_init(bitmap, &binfo);
 
@@ -69,7 +69,7 @@ TEST_BEGIN(test_bitmap_unset)
 		bitmap_info_init(&binfo, i);
 		{
 			size_t j;
-			bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
+			bitmap_t *bitmap = (bitmap_t *)malloc(sizeof(bitmap_t) *
 				bitmap_info_ngroups(&binfo));
 			bitmap_init(bitmap, &binfo);
 
@@ -98,7 +98,7 @@ TEST_BEGIN(test_bitmap_sfu)
 		bitmap_info_init(&binfo, i);
 		{
 			ssize_t j;
-			bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
+			bitmap_t *bitmap = (bitmap_t *)malloc(sizeof(bitmap_t) *
 				bitmap_info_ngroups(&binfo));
 			bitmap_init(bitmap, &binfo);
 
diff --git a/test/unit/rtree.c b/test/unit/rtree.c
index 3f955542..3d75bd0a 100644
--- a/test/unit/rtree.c
+++ b/test/unit/rtree.c
@@ -4,7 +4,7 @@ static rtree_node_elm_t *
 node_alloc(size_t nelms)
 {
 
-	return (calloc(nelms, sizeof(rtree_node_elm_t)));
+	return ((rtree_node_elm_t *)calloc(nelms, sizeof(rtree_node_elm_t)));
 }
 
 static void