diff --git a/mozilla/xpcom/Makefile b/mozilla/xpcom/Makefile
index ee4b5d71799..d2a07a25c61 100644
--- a/mozilla/xpcom/Makefile
+++ b/mozilla/xpcom/Makefile
@@ -15,6 +15,6 @@
 # Reserved.
 
 DEPTH	= ..
-DIRS	= src tests
+DIRS	= public src tests
 
 include $(DEPTH)/config/rules.mk
diff --git a/mozilla/xpcom/src/Makefile b/mozilla/xpcom/src/Makefile
index 376319c979f..f31455a5da1 100644
--- a/mozilla/xpcom/src/Makefile
+++ b/mozilla/xpcom/src/Makefile
@@ -28,25 +28,8 @@ CPPSRCS		= nsDebug.cpp \
 		  nsTraceRefcnt.cpp \
 		  $(NULL)
 
-EXPORTS		= nsCom.h \
-		  nsAgg.h \
-		  nsDebug.h \
-		  nsError.h \
-		  nsHashtable.h \
-		  nsID.h \
-		  nsIFactory.h \
-		  nsISupports.h \
-		  nsIPtr.h \
-		  nsIServiceManager.h \
-		  nsISupportsArray.h \
-		  nsRepository.h \
-		  nsIEnumerator.h \
-		  nsTraceRefcnt.h \
-		  nsVector.h \
-		  $(NULL)
-
 LCFLAGS		= -D_IMPL_NS_COM -DUSE_NSREG
 
-REQUIRES	= libreg
+REQUIRES	= $(MODULE) libreg
 
 include $(DEPTH)/config/rules.mk