--- a/memory/mozalloc/Makefile.in
+++ b/memory/mozalloc/Makefile.in
@@ -109,9 +109,11 @@ endif #}
 endif #}
 
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SDK_LIBRARY = $(IMPORT_LIBRARY)
 else
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
+LOCAL_INCLUDES += -I$(DEPTH)/xpcom
+
 include $(topsrcdir)/config/rules.mk

--- a/memory/mozalloc/mozalloc.h
+++ b/memory/mozalloc/mozalloc.h
@@ -45,17 +45,17 @@
  * https://bugzilla.mozilla.org/show_bug.cgi?id=427099
  */
 
 #include <stdlib.h>
 #include <string.h>
 #if defined(__cplusplus)
 #  include <new>
 #endif
-
+#include "xpcom-config.h"
 
 #define MOZALLOC_HAVE_XMALLOC
 
 #if defined(MOZALLOC_EXPORT)
 /* do nothing: it's been defined to __declspec(dllexport) by
  * mozalloc*.cpp on platforms where that's required. */
 #elif defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
 #  define MOZALLOC_EXPORT __declspec(dllimport)

--- a/xpcom/xpcom-config.h.in
+++ b/xpcom/xpcom-config.h.in
@@ -60,9 +60,15 @@
 /* Define if the c++ compiler requires implementations of 
  * unused virtual methods
  */
 #undef NEED_CPP_UNUSED_IMPLEMENTATIONS
 
 /* Define to either <new> or <new.h> */
 #undef NEW_H
 
+/* Define to either __attribute__((malloc)) or nothing */
+#undef NS_ATTR_MALLOC
+
+/* Define to either __attribute__((warn_unused_result)) or nothing */
+#undef NS_WARN_UNUSED_RESULT
+
 #endif /* _XPCOM_CONFIG_H_ */