diff --git a/mozilla/htmlparser/src/nsXIFDTD.cpp b/mozilla/htmlparser/src/nsXIFDTD.cpp
index 787098c379a..eb839a303af 100644
--- a/mozilla/htmlparser/src/nsXIFDTD.cpp
+++ b/mozilla/htmlparser/src/nsXIFDTD.cpp
@@ -452,7 +452,7 @@ nsresult nsXIFDTD::DidBuildModel(nsresult anErrorCode,PRBool aNotifySink,nsIPars
  *  @return  
  */
 
-nsresult nsXIFDTD::WillHandleToken(CToken* aToken,eHTMLTokenTypes& aType) {
+nsresult nsXIFDTD::WillHandleToken(CToken* aToken,PRInt32& aType) {
   NS_ASSERTION(aToken!=nsnull,"invalid token");
 
   if(aToken) {
@@ -486,7 +486,7 @@ nsresult nsXIFDTD::HandleToken(CToken* aToken,nsIParser* aParser){
 
   if(aToken) {
 
-    eHTMLTokenTypes theType=eToken_unknown;
+    PRInt32 theType=eToken_unknown;
     result=WillHandleToken(aToken,theType);
     
     if(result==NS_OK) {
diff --git a/mozilla/htmlparser/src/nsXIFDTD.h b/mozilla/htmlparser/src/nsXIFDTD.h
index 5c1d477a90a..14b03fb1d8b 100644
--- a/mozilla/htmlparser/src/nsXIFDTD.h
+++ b/mozilla/htmlparser/src/nsXIFDTD.h
@@ -37,9 +37,9 @@
 #include "nshtmlpars.h"
 #include "nsIDTD.h"
 #include "nsIContentSink.h"
-#include "nsHTMLTokens.h"
 #include "nsVoidArray.h"
 #include "nsParserCIID.h"
+#include "nsHTMLTags.h"
 
 
 class nsParser;
@@ -53,6 +53,7 @@ class nsEntryStack;
 class nsCParserNode;
 class nsTokenAllocator;
 class CNodeRecycler;
+class CToken;
 
 //*** This enum is used to define the known universe of XIF tags.
 //*** The use of this table doesn't preclude of from using non-standard
@@ -339,12 +340,6 @@ private:
     void InitializeDefaultTokenHandlers();
 
    
-    /**
-     * DEPRECATED
-     * @update	gpk 06/18/98
-     */
-    CTokenHandler* GetTokenHandler(eHTMLTokenTypes aType) const;
-
     /**
      * DEPRECATED
      * @update	gpk 06/18/98
@@ -419,7 +414,7 @@ private:
 
 protected:
 
-    nsresult    WillHandleToken(CToken* aToken,eHTMLTokenTypes& aType);
+    nsresult    WillHandleToken(CToken* aToken,PRInt32& aType);
     nsresult    DidHandleToken(CToken* aToken, nsresult aResult=NS_OK);
     nsresult    WillHandleStartToken(CToken* aToken,eXIFTags aTag, nsIParserNode& aNode);
     nsresult    DidHandleStartToken(CToken* aToken,eXIFTags aTag, nsIParserNode& aNode);
diff --git a/mozilla/htmlparser/tests/outsinks/Convert.cpp b/mozilla/htmlparser/tests/outsinks/Convert.cpp
index 5da25adf4b9..43022206249 100644
--- a/mozilla/htmlparser/tests/outsinks/Convert.cpp
+++ b/mozilla/htmlparser/tests/outsinks/Convert.cpp
@@ -23,6 +23,7 @@
 #include <ctype.h>      // for isdigit()
 
 #include "CNavDTD.h"
+#include "nsXIFDTD.h"
 #include "nsParserCIID.h"
 #include "nsIParser.h"
 #include "nsIHTMLContentSink.h"
@@ -32,21 +33,6 @@
 
 extern "C" void NS_SetupRegistry();
 
-// This is copied from the header files so that we don't accidentally
-// include nsHTMLTokens.h and get all the inline junk that confuses
-// gcc-2.7.2.3.
-
-inline nsresult NS_NewXIFDTD(nsIDTD** aInstancePtrResult)
-{
-  NS_DEFINE_CID(kXIFDTDCID, NS_XIF_DTD_CID);
-  return nsComponentManager::CreateInstance(kXIFDTDCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIDTD),
-                                            (void**)aInstancePtrResult);
-}
-
-
-
 #ifdef XP_PC
 #define PARSER_DLL "gkparser.dll"
 #endif
diff --git a/mozilla/parser/htmlparser/src/nsXIFDTD.cpp b/mozilla/parser/htmlparser/src/nsXIFDTD.cpp
index 787098c379a..eb839a303af 100644
--- a/mozilla/parser/htmlparser/src/nsXIFDTD.cpp
+++ b/mozilla/parser/htmlparser/src/nsXIFDTD.cpp
@@ -452,7 +452,7 @@ nsresult nsXIFDTD::DidBuildModel(nsresult anErrorCode,PRBool aNotifySink,nsIPars
  *  @return  
  */
 
-nsresult nsXIFDTD::WillHandleToken(CToken* aToken,eHTMLTokenTypes& aType) {
+nsresult nsXIFDTD::WillHandleToken(CToken* aToken,PRInt32& aType) {
   NS_ASSERTION(aToken!=nsnull,"invalid token");
 
   if(aToken) {
@@ -486,7 +486,7 @@ nsresult nsXIFDTD::HandleToken(CToken* aToken,nsIParser* aParser){
 
   if(aToken) {
 
-    eHTMLTokenTypes theType=eToken_unknown;
+    PRInt32 theType=eToken_unknown;
     result=WillHandleToken(aToken,theType);
     
     if(result==NS_OK) {
diff --git a/mozilla/parser/htmlparser/src/nsXIFDTD.h b/mozilla/parser/htmlparser/src/nsXIFDTD.h
index 5c1d477a90a..14b03fb1d8b 100644
--- a/mozilla/parser/htmlparser/src/nsXIFDTD.h
+++ b/mozilla/parser/htmlparser/src/nsXIFDTD.h
@@ -37,9 +37,9 @@
 #include "nshtmlpars.h"
 #include "nsIDTD.h"
 #include "nsIContentSink.h"
-#include "nsHTMLTokens.h"
 #include "nsVoidArray.h"
 #include "nsParserCIID.h"
+#include "nsHTMLTags.h"
 
 
 class nsParser;
@@ -53,6 +53,7 @@ class nsEntryStack;
 class nsCParserNode;
 class nsTokenAllocator;
 class CNodeRecycler;
+class CToken;
 
 //*** This enum is used to define the known universe of XIF tags.
 //*** The use of this table doesn't preclude of from using non-standard
@@ -339,12 +340,6 @@ private:
     void InitializeDefaultTokenHandlers();
 
    
-    /**
-     * DEPRECATED
-     * @update	gpk 06/18/98
-     */
-    CTokenHandler* GetTokenHandler(eHTMLTokenTypes aType) const;
-
     /**
      * DEPRECATED
      * @update	gpk 06/18/98
@@ -419,7 +414,7 @@ private:
 
 protected:
 
-    nsresult    WillHandleToken(CToken* aToken,eHTMLTokenTypes& aType);
+    nsresult    WillHandleToken(CToken* aToken,PRInt32& aType);
     nsresult    DidHandleToken(CToken* aToken, nsresult aResult=NS_OK);
     nsresult    WillHandleStartToken(CToken* aToken,eXIFTags aTag, nsIParserNode& aNode);
     nsresult    DidHandleStartToken(CToken* aToken,eXIFTags aTag, nsIParserNode& aNode);
diff --git a/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp b/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp
index 5da25adf4b9..43022206249 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp
+++ b/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp
@@ -23,6 +23,7 @@
 #include <ctype.h>      // for isdigit()
 
 #include "CNavDTD.h"
+#include "nsXIFDTD.h"
 #include "nsParserCIID.h"
 #include "nsIParser.h"
 #include "nsIHTMLContentSink.h"
@@ -32,21 +33,6 @@
 
 extern "C" void NS_SetupRegistry();
 
-// This is copied from the header files so that we don't accidentally
-// include nsHTMLTokens.h and get all the inline junk that confuses
-// gcc-2.7.2.3.
-
-inline nsresult NS_NewXIFDTD(nsIDTD** aInstancePtrResult)
-{
-  NS_DEFINE_CID(kXIFDTDCID, NS_XIF_DTD_CID);
-  return nsComponentManager::CreateInstance(kXIFDTDCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIDTD),
-                                            (void**)aInstancePtrResult);
-}
-
-
-
 #ifdef XP_PC
 #define PARSER_DLL "gkparser.dll"
 #endif