diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in
index fae1c68f08f..9ecb7721bc4 100644
--- a/mozilla/toolkit/library/Makefile.in
+++ b/mozilla/toolkit/library/Makefile.in
@@ -260,6 +260,10 @@ ifdef GC_LEAK_DETECTOR
 EXTRA_DSO_LIBS += boehm
 endif
 
+ifdef NS_TRACE_MALLOC
+EXTRA_DSO_LIBS += tracemalloc
+endif
+
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LIBS += macmorefiles_s
 EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
diff --git a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c
index d23a4a94fc0..24f566ecab1 100644
--- a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c
+++ b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c
@@ -2083,7 +2083,7 @@ NS_TraceMallocFlushLogfiles()
 }
 
 PR_IMPLEMENT(void)
-NS_TrackAllocation(__ptr_t ptr, FILE *ofp)
+NS_TrackAllocation(void* ptr, FILE *ofp)
 {
     PLHashEntry **hep;
     allocation *alloc;
diff --git a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h
index c4f5c9a6df4..9d821a32903 100644
--- a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h
+++ b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h
@@ -43,6 +43,10 @@
 #include <stdio.h> /* for FILE */
 #include "prtypes.h"
 
+#ifdef XP_WIN
+#define setlinebuf(stream) setvbuf((stream), (char *)NULL, _IOLBF, 0)
+#endif
+
 PR_BEGIN_EXTERN_C
 
 /**
@@ -220,7 +224,7 @@ NS_TraceMallocFlushLogfiles(void);
  * Track all realloc and free calls operating on a given allocation.
  */
 PR_EXTERN(void)
-NS_TrackAllocation(__ptr_t ptr, FILE *ofp);
+NS_TrackAllocation(void* ptr, FILE *ofp);
 
 PR_END_EXTERN_C