diff --git a/xpcom/build/dlldeps.cpp b/xpcom/build/dlldeps.cpp
index 8ed3046b8982..25452e7a7695 100644
--- a/xpcom/build/dlldeps.cpp
+++ b/xpcom/build/dlldeps.cpp
@@ -24,6 +24,7 @@
 // the dll that are located in the .lib files we link with
 
 #include "nsVoidArray.h"
+#include "nsVoidBTree.h"
 #include "nsIAtom.h"
 #include "nsFileSpec.h"
 //#include "nsIBuffer.h"
@@ -54,6 +55,7 @@
 #include "nsWeakReference.h"
 #include "nsISizeOfHandler.h"
 #include "nsTextFormatter.h"
+#include "nsStatistics.h"
 #include "nsStorageStream.h"
 #include "nsLinebreakConverter.h"
 #include "nsIBinaryInputStream.h"
@@ -83,6 +85,7 @@ void XXXNeverCalled()
     nsTextFormatter::smprintf_free(nsnull);
     dummyComparitor dummy;
     nsVoidArray();
+    nsVoidBTree();
     nsAVLTree(dummy, nsnull);
     nsSupportsArray();
     NS_GetNumberOfAtoms();
@@ -103,6 +106,7 @@ void XXXNeverCalled()
     nsArrayEnumerator(NULL);
     NS_NewIntersectionEnumerator(NULL, NULL, NULL);
     NS_QuickSort(NULL, 0, 0, NULL, NULL);
+    nsStatistics("dummy");
     nsString();
     nsProxyObject(NULL, 0, NULL);
     XPT_DoString(NULL, NULL, NULL);
diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in
index f4c61c5dfae8..3fcc7c64e55a 100644
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -56,6 +56,7 @@ CPPSRCS		= \
 		nsPersistentProperties.cpp \
 		nsQuickSort.cpp \
 		nsSizeOfHandler.cpp \
+		nsStatistics.cpp \
 		nsStr.cpp \
 		nsString.cpp \
 		nsString2.cpp \
@@ -64,12 +65,13 @@ CPPSRCS		= \
 		nsSupportsPrimitives.cpp \
 		nsUnicharBuffer.cpp \
 		nsVoidArray.cpp \
+		nsVoidBTree.cpp \
 		nsXPIDLString.cpp \
 		nsTextFormatter.cpp \
 		$(NULL)
 
 EXPORTS		= \
-    nsAlgorithm.h \
+		nsAlgorithm.h \
 		nsAVLTree.h \
 		nsAtomService.h \
 		nsCppSharedAllocator.h \
@@ -86,10 +88,11 @@ EXPORTS		= \
 		nsIUnicharBuffer.h \
 		nsInt64.h \
 		nsQuickSort.h \
-    nsCharTraits.h \
-    nsAReadableString.h \
-    nsAWritableString.h \
-    nsSharedString.h \
+		nsCharTraits.h \
+		nsAReadableString.h \
+		nsAWritableString.h \
+		nsSharedString.h \
+		nsStatistics.h \
 		nsStr.h \
 		nsString.h \
 		nsString2.h \
@@ -99,6 +102,7 @@ EXPORTS		= \
 		nsUnitConversion.h \
 		nsVector.h \
 		nsVoidArray.h \
+		nsVoidBTree.h \
 		nsXPIDLString.h \
 		plvector.h \
 		nsTextFormatter.h \