Move the following files into the xpcom/glue dir:

nsGenericFactory.cpp
nsIGenericFactory.h
nsIInterfaceRequestorUtils.h
nsISupportsImpl.h
nsISupportsutils.h
nsIWeakReferenceUtils.h
Bug #120474 r=dougt a=asa

xpcom/base/MANIFEST

@@ -7,11 +7,7 @@ nsError.h
 nsID.h 
 nsIID.h
 nsISupportsBase.h
-nsISupportsImpl.h
-nsISupportsUtils.h
 nsISupportsObsolete.h
-nsIWeakReferenceUtils.h
 nsTraceRefcnt.h
 nsWeakPtr.h
 nscore.h
-nsIInterfaceRequestorUtils.h

xpcom/base/Makefile.in

@@ -60,13 +60,9 @@ EXPORTS		= \
 		nsCWeakReference.h \
 		nsError.h \
 		nsIID.h \
-		nsISupportsImpl.h \
-		nsISupportsUtils.h \
 		nsISupportsObsolete.h \
-		nsIWeakReferenceUtils.h \
 		nsTraceRefcnt.h \
 		nsWeakPtr.h \
-		nsIInterfaceRequestorUtils.h \
 		$(NULL)
 
 ifdef NS_TRACE_MALLOC

xpcom/base/makefile.win

@@ -43,10 +43,7 @@ EXPORTS =                  \
         nsID.h             \
         nsIID.h            \
         nsISupportsBase.h  \
-	nsISupportsImpl.h  \
         nsISupportsObsolete.h  \
-        nsISupportsUtils.h \
-        nsIWeakReferenceUtils.h  \
         nsTraceRefcnt.h    \
         nsWeakPtr.h        \
         nscore.h           \
@@ -54,7 +51,6 @@ EXPORTS =                  \
 !ifdef MOZ_TRACE_MALLOC
 	nsTraceMalloc.h    \
 !endif
-	nsIInterfaceRequestorUtils.h \
         $(NULL)			
 
 XPIDL_MODULE = xpcom_base

xpcom/components/MANIFEST

@@ -1,4 +1,3 @@
-nsIGenericFactory.h
 nsIRegistryUtils.h
 nsXPComFactory.h
 nsComponentManagerUtils.h

xpcom/components/Makefile.in

@@ -37,7 +37,6 @@ CPPSRCS		= \
 		nsCategoryManager.cpp \
 		nsComponentManager.cpp \
 		nsComponentManagerObsolete.cpp \
-		nsGenericFactory.cpp \
 		nsNativeComponentLoader.cpp \
 		nsRegistry.cpp \
 		nsServiceManagerObsolete.cpp \
@@ -53,7 +52,6 @@ endif
 EXPORTS		= \
 		nsComponentManagerUtils.h \
 		nsComponentManagerObsolete.h \
-		nsIGenericFactory.h \
 		nsIRegistryUtils.h \
 		nsIServiceManagerUtils.h \
 		nsIServiceManagerObsolete.h \

xpcom/components/makefile.win

@@ -35,7 +35,6 @@ EXPORTS =                         \
         nsComponentManagerObsolete.h \
 	nsComponentManagerUtils.h \
         nsIComponentManagerUtils.h \
-        nsIGenericFactory.h       \
         nsIRegistryUtils.h        \
         nsIServiceManagerObsolete.h \
         nsIServiceManagerUtils.h  \
@@ -80,7 +79,6 @@ LCFLAGS = $(LCFLAGS) -DENABLE_STATIC_COMPONENT_LOADER
 CPP_OBJS =                                 \
         .\$(OBJDIR)\nsComponentManager.obj \
         .\$(OBJDIR)\nsComponentManagerObsolete.obj \
-        .\$(OBJDIR)\nsGenericFactory.obj   \
         .\$(OBJDIR)\nsNativeComponentLoader.obj \
         .\$(OBJDIR)\nsServiceManagerObsolete.obj \
         .\$(OBJDIR)\nsStaticComponentLoader.obj \

xpcom/glue/MANIFEST

@@ -1,4 +1,9 @@
 nsCOMPtr.h
 nsDebug.h
+nsIGenericFactory.h
+nsIInterfaceRequestorUtils.h
+nsISupportsImpl.h
+nsISupportsUtils.h
+nsIWeakReferenceUtils.h
 nsMemory.h
 nsWeakReference.h

xpcom/glue/Makefile.in

@@ -30,11 +30,10 @@ MODULE		= xpcom
 XPIDL_MODULE	= xpcom_glue
 LIBRARY_NAME	= xpcomglue
 
-REQUIRES	= $(NULL)
-
 CPPSRCS		= \
 		nsCOMPtr.cpp \
 		nsDebug.cpp \
+		nsGenericFactory.cpp \
 		nsMemory.cpp \
 		nsWeakReference.cpp \
 		$(NULL)
@@ -43,6 +42,14 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../build \
 		$(NULL)
 
+EXPORTS		= \
+		nsIGenericFactory.h \
+		nsIInterfaceRequestorUtils.h \
+		nsISupportsImpl.h \
+		nsISupportsUtils.h \
+		nsIWeakReferenceUtils.h \
+		$(NULL)
+
 SDK_HEADERS     = \
 		nsCOMPtr.h	 \
 		nsDebug.h	 \
@@ -54,12 +61,6 @@ SDK_BINARY     =                        \
 		$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
 		$(NULL)
 
-EXPORTS		= \
-		$(NULL)
-
-XPIDLSRCS	= \
-		$(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 

xpcom/glue/makefile.win

@@ -30,6 +30,11 @@ LIBRARY_NAME=xpcomglue
 EXPORTS =                  \
         nsCOMPtr.h         \
         nsDebug.h          \
+	nsIGenericFactory.h \
+	nsIInterfaceRequestorUtils.h \
+	nsISupportsImpl.h \
+	nsISupportsUtils.h \
+	nsIWeakReferenceUtils.h \
         nsMemory.h         \
         nsWeakReference.h  \
         $(NULL)