Bug 904962 (part 1) - Don't #include js/CharacterEncoding.h in jsapi.h. r=luke.

--HG--
extra : rebase_source : abe40ea3e55059dc6271d0f7c9f4d19ed9413186

content/xbl/src/nsXBLProtoImplField.cpp

@@ -8,6 +8,7 @@
 #include "nsString.h"
 #include "nsJSUtils.h"
 #include "jsapi.h"
+#include "js/CharacterEncoding.h"
 #include "nsUnicharUtils.h"
 #include "nsReadableUtils.h"
 #include "nsXBLProtoImplField.h"

js/src/jsapi.h

@@ -24,7 +24,6 @@
 #include "jspubtd.h"
 
 #include "js/CallArgs.h"
-#include "js/CharacterEncoding.h"
 #include "js/HashTable.h"
 #include "js/RootingAPI.h"
 #include "js/Utility.h"
@@ -35,6 +34,9 @@
 
 namespace JS {
 
+class Latin1CharsZ;
+class TwoByteChars;
+
 typedef mozilla::RangedPtr<const jschar> CharPtr;
 
 class StableCharPtr : public CharPtr {