diff --git a/mozilla/extensions/transformiix/source/base/List.cpp b/mozilla/extensions/transformiix/source/base/List.cpp
index 754651e61b9..55746f19d62 100644
--- a/mozilla/extensions/transformiix/source/base/List.cpp
+++ b/mozilla/extensions/transformiix/source/base/List.cpp
@@ -283,9 +283,9 @@ void txListIterator::addBefore(void* objPtr) {
 MBool txListIterator::hasNext() {
     MBool hasNext = MB_FALSE;
     if (currentItem)
-        hasNext = (MBool) currentItem->nextItem;
+        hasNext = (currentItem->nextItem != 0);
     else if (!atEndOfList)
-        hasNext = (MBool) list->firstItem;
+        hasNext = (list->firstItem != 0);
 
     return hasNext;
 } //-- hasNext
@@ -298,9 +298,9 @@ MBool txListIterator::hasNext() {
 MBool txListIterator::hasPrevious() {
     MBool hasPrevious = MB_FALSE;
     if (currentItem)
-        hasPrevious = (MBool) currentItem->prevItem;
+        hasPrevious = (currentItem->prevItem != 0);
     else if (atEndOfList)
-        hasPrevious = (MBool) list->lastItem;
+        hasPrevious = (list->lastItem != 0);
 
     return hasPrevious;
 } //-- hasPrevious
diff --git a/mozilla/extensions/transformiix/source/base/StringList.cpp b/mozilla/extensions/transformiix/source/base/StringList.cpp
index 0f612438dba..e0ba6f9b9ff 100644
--- a/mozilla/extensions/transformiix/source/base/StringList.cpp
+++ b/mozilla/extensions/transformiix/source/base/StringList.cpp
@@ -239,9 +239,9 @@ void StringListIterator::add(String* strptr) {
 **/
 MBool StringListIterator::hasNext() {
     if (currentItem) {
-        return (MBool)(currentItem->nextItem);
+        return (currentItem->nextItem != 0);
     }
-    return (MBool)(stringList->firstItem);
+    return (stringList->firstItem != 0);
 } //-- hasNext
 
 /**
@@ -249,7 +249,7 @@ MBool StringListIterator::hasNext() {
 **/
 MBool StringListIterator::hasPrevious() {
     if (currentItem) {
-        return (MBool)(currentItem->prevItem);
+        return (currentItem->prevItem != 0);
     }
     return MB_FALSE;
 } //-- hasPrevious
diff --git a/mozilla/extensions/transformiix/source/base/TxObject.h b/mozilla/extensions/transformiix/source/base/TxObject.h
index 6c7d41b8011..f56c08046d2 100644
--- a/mozilla/extensions/transformiix/source/base/TxObject.h
+++ b/mozilla/extensions/transformiix/source/base/TxObject.h
@@ -45,7 +45,7 @@ class TxObject {
      * Returns the Hashcode for this TxObject
     **/
     virtual PRInt32 hashCode() {
-        return (PRInt32)this;
+        return NS_PTR_TO_INT32(this);
     } //-- hashCode
 
     /**
diff --git a/mozilla/extensions/transformiix/source/base/baseutils.h b/mozilla/extensions/transformiix/source/base/baseutils.h
index aebf640527c..2c80d1dcf68 100644
--- a/mozilla/extensions/transformiix/source/base/baseutils.h
+++ b/mozilla/extensions/transformiix/source/base/baseutils.h
@@ -51,9 +51,14 @@
     #else
       #define NS_ASSERTION(_cond, _msg) {}
     #endif
+
+  #define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0)
+  #define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x)))
+
 #else
   // Mozilla module
   #include "prtypes.h"
+  #include "nscore.h"
 
   typedef PRBool MBool;
 
diff --git a/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp b/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp
index 961526f71fb..285d8f66870 100644
--- a/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp
+++ b/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp
@@ -25,6 +25,7 @@
  * A class used to overcome DOM 1.0 deficiencies
 **/
 
+#include "baseutils.h"
 #include "DOMHelper.h"
 #include "primitives.h"
 
@@ -83,11 +84,11 @@ void DOMHelper::generateId(Node* node, String& dest) {
     dest.append("id");
 
     if (node->getNodeType() == Node::DOCUMENT_NODE) {
-        Integer::toString((int)node,dest);
+        Integer::toString(NS_PTR_TO_INT32(node),dest);
         return;
     }
 
-    Integer::toString((int)node->getOwnerDocument(), dest);
+    Integer::toString(NS_PTR_TO_INT32(node->getOwnerDocument()), dest);
 
     OrderInfo* orderInfo = getDocumentOrder(node);
 
diff --git a/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp b/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp
index 2db26ad8323..069418977fe 100644
--- a/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp
@@ -168,7 +168,7 @@ ExprLexer::~ExprLexer()
 
 MBool ExprLexer::hasMoreTokens()
 {
-  return (MBool)currentItem;
+  return (currentItem != 0);
 } //-- hasMoreTokens
 
 Token* ExprLexer::nextToken()