diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in
index 6347286ac11f..432842427248 100644
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -37,12 +37,10 @@ CPPSRCS		= \
 		nsAllocator.cpp \
 		nsMemoryImpl.cpp \
 		nsErrorService.cpp \
-		nsDebug.cpp \
 		nsIInterfaceRequestor.cpp \
 		nsTraceRefcnt.cpp \
 		nsID.cpp \
 		nsCWeakReference.cpp \
-		nsWeakReference.cpp \
 		nsConsoleService.cpp \
 		nsConsoleMessage.cpp \
 		nsExceptionService.cpp \
@@ -60,7 +58,6 @@ EXPORTS		= \
 		nsCom.h \
 		nsComObsolete.h \
 		nsCWeakReference.h \
-		nsDebug.h \
 		nsError.h \
 		nsID.h \
 		nsIID.h \
@@ -71,7 +68,6 @@ EXPORTS		= \
 		nsISupportsObsolete.h \
 		nsIWeakReferenceUtils.h \
 		nsTraceRefcnt.h \
-		nsWeakReference.h \
 		nsWeakPtr.h \
 		nscore.h \
 		nsIInterfaceRequestorUtils.h \
diff --git a/xpcom/base/makefile.win b/xpcom/base/makefile.win
index f830b946d88b..8be3115bdd88 100644
--- a/xpcom/base/makefile.win
+++ b/xpcom/base/makefile.win
@@ -39,7 +39,6 @@ EXPORTS =                  \
         nsCom.h            \
 	nsComObsolete.h  \
         nsCWeakReference.h \
-        nsDebug.h          \
         nsError.h          \
         nsID.h             \
         nsIID.h            \
@@ -50,7 +49,6 @@ EXPORTS =                  \
         nsISupportsUtils.h \
         nsIWeakReferenceUtils.h  \
         nsTraceRefcnt.h    \
-        nsWeakReference.h  \
         nsWeakPtr.h        \
         nscore.h           \
         pure.h             \
@@ -104,7 +102,6 @@ C_OBJS = $(C_OBJS) \
 
 CPP_OBJS =                            \
         .\$(OBJDIR)\nsErrorService.obj       \
-        .\$(OBJDIR)\nsDebug.obj       \
         .\$(OBJDIR)\nsAllocator.obj   \
         .\$(OBJDIR)\nsMemoryImpl.obj   \
         .\$(OBJDIR)\nsCWeakReference.obj \
@@ -113,7 +110,6 @@ CPP_OBJS =                            \
 #        .\$(OBJDIR)\nsSystemInfo.obj  \
         .\$(OBJDIR)\nsExceptionService.obj \
         .\$(OBJDIR)\nsTraceRefcnt.obj \
-        .\$(OBJDIR)\nsWeakReference.obj \
         .\$(OBJDIR)\nsConsoleService.obj \
         .\$(OBJDIR)\nsConsoleMessage.obj \
 !ifdef GC_LEAK_DETECTOR
diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
index de8ece9b72a9..14e9e54159c0 100644
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -34,7 +34,9 @@ REQUIRES	= $(NULL)
 
 CPPSRCS		= \
 		nsCOMPtr.cpp \
+		nsDebug.cpp \
 		nsMemory.cpp \
+		nsWeakReference.cpp \
 		$(NULL)
 
 LOCAL_INCLUDES	= \
@@ -43,7 +45,9 @@ LOCAL_INCLUDES	= \
 
 EXPORTS		= \
 		nsCOMPtr.h \
+		nsDebug.h \
 		nsMemory.h \
+		nsWeakReference.h \
 		$(NULL)
 
 XPIDLSRCS	= \
diff --git a/xpcom/glue/makefile.win b/xpcom/glue/makefile.win
index d03c129edaba..fb519e397b28 100755
--- a/xpcom/glue/makefile.win
+++ b/xpcom/glue/makefile.win
@@ -29,7 +29,9 @@ LIBRARY_NAME=xpcomglue
 
 EXPORTS =                  \
         nsCOMPtr.h         \
+        nsDebug.h          \
         nsMemory.h         \
+        nsWeakReference.h  \
         $(NULL)			
 
 XPIDLSRCS =               \
@@ -47,7 +49,9 @@ LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS =                            \
         .\$(OBJDIR)\nsCOMPtr.obj      \
+        .\$(OBJDIR)\nsDebug.obj       \
         .\$(OBJDIR)\nsMemory.obj      \
+        .\$(OBJDIR)\nsWeakReference.obj \
         $(NULL)
 
 include <$(DEPTH)\config\rules.mak>