Fix static build bustage from bug 223084 - r=bryner Sorry about that!

xpcom/components/Makefile.in

@@ -78,7 +78,7 @@ SDK_XPIDLSRCS	= \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-LOCAL_INCLUDES	= -I$(srcdir)/../base -I$(srcdir)/../thread -I$(srcdir)/../ds
+LOCAL_INCLUDES	= -I$(srcdir)/../base -I$(srcdir)/../thread -I$(srcdir)/../ds -I..
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
@@ -88,5 +88,3 @@ FORCE_USE_PIC	= 1
 include $(topsrcdir)/config/rules.mk
 
 DEFINES	+= -D_IMPL_NS_COM -DEXPORT_XPTI_API
-
-

xpcom/components/nsComponentManager.h

@@ -41,6 +41,7 @@
 #include "nsXPCOM.h"
 
 #include "nsIComponentLoader.h"
+#include "xpcom-private.h"
 #include "nsNativeComponentLoader.h"
 #include "nsIComponentManager.h"
 #include "nsIComponentRegistrar.h"