Bug 316778 - Make some gfx headers external-linking-safe, r=roc

gfx/Makefile.in

@@ -55,7 +55,9 @@ endif
 DIRS		+= public idl src
 
 ifdef ENABLE_TESTS
+ifndef MOZ_ENABLE_LIBXUL
 TOOL_DIRS	+= tests
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk

gfx/public/nsColor.h

@@ -39,6 +39,7 @@
 #define nsColor_h___
 
 #include "gfxCore.h"
+#include "nscore.h"
 
 class nsAString;
 class nsString;

gfx/public/nsFont.h

@@ -40,7 +40,7 @@
 
 #include "gfxCore.h"
 #include "nsCoord.h"
-#include "nsString.h"
+#include "nsStringGlue.h"
 
 // XXX we need a method to enumerate all of the possible fonts on the
 // system across family, weight, style, size, etc. But not here!