diff --git a/xpcom/idl/Makefile.in b/xpcom/idl/Makefile.in
index 64da51cd586..467c14ad4a6 100644
--- a/xpcom/idl/Makefile.in
+++ b/xpcom/idl/Makefile.in
@@ -21,26 +21,12 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# IDLSRCS = \
-# 	nsISupports.idl	\
-# 	nsISupportsArray.idl \
-# 	nsIShutdownListener.idl \
-# 	nsIServiceManager.idl \
-# 	nsIFactory.idl \
-# 	nsIBaseStream.idl	\
-# 	nsIInputStream.idl	\
-# 	nsICollection.idl \
-# 	nsIEnumerator.idl \
-# 	nsID.idl	\
-# 	nsrootidl.idl	\
-# 	nsISimpleEnumerator.idl	\
-# 	$(NULL)
-
-# for testing purposes
-#EXPORTS = $(XIDLSRCS:.idl=.h)
-
-# to build in the static methods
-#CPPSRCS = $(XIDLSRCS:.idl=.cpp)
-#LIBRARY_NAME = xpcomidl
+MODULE = xpcom
+XPIDLSRCS = \
+	nsrootidl.idl	\
+	nsISupports.idl	\
+	nsIEnumerator.idl \
+	nsIFactory.idl \
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/xpcom/public/Makefile.in b/xpcom/public/Makefile.in
index d323a9c01dc..bc1b45048e7 100644
--- a/xpcom/public/Makefile.in
+++ b/xpcom/public/Makefile.in
@@ -35,16 +35,13 @@ EXPORTS		= \
 		  nsICollection.h \
 		  nsID.h \
 		  nsIID.h \
-		  nsIFactory.h \
 		  nsISimpleEnumerator.h \
-		  nsISupports.h \
 		  nsISupportsUtils.h \
 		  nsIPtr.h \
 		  nsIComponentManager.h \
 		  nsRepository.h \
 		  nsIServiceManager.h \
 		  nsISupportsArray.h \
-		  nsIEnumerator.h \
 		  nsTraceRefcnt.h \
 		  nsVector.h \
 		  plvector.h \
@@ -55,7 +52,6 @@ EXPORTS		= \
 		  nsIEventQueue.h \
 		  nsIGenericFactory.h \
 		  nsIRegistry.h \
-		  nsrootidl.h \
 		  $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))