Fix MOZ_PHOENIX bustage.

uriloader/exthandler/Makefile.in

@@ -65,6 +65,10 @@ REQUIRES	= xpcom \
 		  appcomps \
 		  $(NULL)
 
+ifdef MOZ_PHOENIX
+REQUIRES	+= toolkitcomps history
+endif
+
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 REQUIRES		+= windowwatcher \
 	             $(NULL)

uriloader/exthandler/nsExternalHelperAppService.cpp

@@ -86,6 +86,9 @@
 #include "nsIPrefService.h"
 
 #include "nsIGlobalHistory.h"
+#ifdef MOZ_PHOENIX
+#include "nsToolkitCompsCID.h"
+#endif
 
 #include "nsCRT.h"
 #include "plstr.h"