diff --git a/mozilla/htmlparser/src/CNavDTD.h b/mozilla/htmlparser/src/CNavDTD.h
index aec5db5fc1f..79578795cda 100644
--- a/mozilla/htmlparser/src/CNavDTD.h
+++ b/mozilla/htmlparser/src/CNavDTD.h
@@ -528,13 +528,8 @@ protected:
     nsParser*           mParser;
     nsITokenizer*       mTokenizer;
 
-// FAILING to define these variables causes 
-// the non-debug build to fail. -- gpk
-//#ifdef  NS_DEBUG
     PRUint32            mComputedCRC32;
     PRUint32            mExpectedCRC32;
-//#endif
-
 };
 
 extern NS_HTMLPARS nsresult NS_NewNavHTMLDTD(nsIDTD** aInstancePtrResult);
diff --git a/mozilla/htmlparser/src/nsDTDUtils.h b/mozilla/htmlparser/src/nsDTDUtils.h
index da57c8814f2..015998e5a43 100644
--- a/mozilla/htmlparser/src/nsDTDUtils.h
+++ b/mozilla/htmlparser/src/nsDTDUtils.h
@@ -214,7 +214,6 @@ inline PRBool BufferContainsHTML(nsString& aBuffer){
 }
 
 
-#ifdef  NS_DEBUG
 /******************************************************************************
   This little structure is used to compute CRC32 values for our debug validator
  ******************************************************************************/
@@ -225,8 +224,6 @@ struct CRCStruct {
   PRInt32   mOperation; //usually open or close
 };
 
-#endif 
-
 #endif
 
 
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.h b/mozilla/parser/htmlparser/src/CNavDTD.h
index aec5db5fc1f..79578795cda 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.h
+++ b/mozilla/parser/htmlparser/src/CNavDTD.h
@@ -528,13 +528,8 @@ protected:
     nsParser*           mParser;
     nsITokenizer*       mTokenizer;
 
-// FAILING to define these variables causes 
-// the non-debug build to fail. -- gpk
-//#ifdef  NS_DEBUG
     PRUint32            mComputedCRC32;
     PRUint32            mExpectedCRC32;
-//#endif
-
 };
 
 extern NS_HTMLPARS nsresult NS_NewNavHTMLDTD(nsIDTD** aInstancePtrResult);
diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.h b/mozilla/parser/htmlparser/src/nsDTDUtils.h
index da57c8814f2..015998e5a43 100644
--- a/mozilla/parser/htmlparser/src/nsDTDUtils.h
+++ b/mozilla/parser/htmlparser/src/nsDTDUtils.h
@@ -214,7 +214,6 @@ inline PRBool BufferContainsHTML(nsString& aBuffer){
 }
 
 
-#ifdef  NS_DEBUG
 /******************************************************************************
   This little structure is used to compute CRC32 values for our debug validator
  ******************************************************************************/
@@ -225,8 +224,6 @@ struct CRCStruct {
   PRInt32   mOperation; //usually open or close
 };
 
-#endif 
-
 #endif