diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in
index 34847e8b1d6a..a5aaea44cc92 100644
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@@ -50,3 +50,7 @@ INCLUDES	+= \
 		-I$(DIST)/public/raptor \
 		$(NULL)
 
+ifdef MOZ_MATHML
+INCLUDES += \
+        -I$(srcdir)/../../../mathml/content/src
+endif
diff --git a/content/xml/document/src/makefile.win b/content/xml/document/src/makefile.win
index e4ca418b5dc4..141de6e9fae7 100644
--- a/content/xml/document/src/makefile.win
+++ b/content/xml/document/src/makefile.win
@@ -43,6 +43,9 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
   -I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \
   -I..\..\..\html\content\src -I..\..\..\html\document\src \
   -I..\..\..\xul\content\src -I..\..\..\xsl\document\src \
+!ifdef MOZ_MATHML
+  -I..\..\..\mathml\content\src \
+!endif
   -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref \
   -I$(PUBLIC)\expat
 
diff --git a/content/xml/document/src/nsXMLDocument.cpp b/content/xml/document/src/nsXMLDocument.cpp
index 7d17831b1e88..e8faa22c1a81 100644
--- a/content/xml/document/src/nsXMLDocument.cpp
+++ b/content/xml/document/src/nsXMLDocument.cpp
@@ -58,6 +58,12 @@
 #include "nsXULAtoms.h"
 #endif
 
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+#include "nsMathMLAtoms.h"
+#include "nsMathMLOperators.h"
+#endif
+
 static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID);
 static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
 static NS_DEFINE_IID(kIXMLDocumentIID, NS_IXMLDOCUMENT_IID);
@@ -96,6 +102,11 @@ nsXMLDocument::nsXMLDocument()
 #ifdef XSL
   mTransformMediator = nsnull;
 #endif
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+  nsMathMLOperators::AddRefTable();
+  nsMathMLAtoms::AddRefAtoms();
+#endif
 }
 
 nsXMLDocument::~nsXMLDocument()
@@ -116,6 +127,11 @@ nsXMLDocument::~nsXMLDocument()
 #ifdef XSL
   NS_IF_RELEASE(mTransformMediator);
 #endif
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+  nsMathMLOperators::ReleaseTable();
+  nsMathMLAtoms::ReleaseAtoms();
+#endif
 }
 
 NS_IMETHODIMP 
diff --git a/layout/xml/document/src/Makefile.in b/layout/xml/document/src/Makefile.in
index 34847e8b1d6a..a5aaea44cc92 100644
--- a/layout/xml/document/src/Makefile.in
+++ b/layout/xml/document/src/Makefile.in
@@ -50,3 +50,7 @@ INCLUDES	+= \
 		-I$(DIST)/public/raptor \
 		$(NULL)
 
+ifdef MOZ_MATHML
+INCLUDES += \
+        -I$(srcdir)/../../../mathml/content/src
+endif
diff --git a/layout/xml/document/src/makefile.win b/layout/xml/document/src/makefile.win
index e4ca418b5dc4..141de6e9fae7 100644
--- a/layout/xml/document/src/makefile.win
+++ b/layout/xml/document/src/makefile.win
@@ -43,6 +43,9 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
   -I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \
   -I..\..\..\html\content\src -I..\..\..\html\document\src \
   -I..\..\..\xul\content\src -I..\..\..\xsl\document\src \
+!ifdef MOZ_MATHML
+  -I..\..\..\mathml\content\src \
+!endif
   -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref \
   -I$(PUBLIC)\expat
 
diff --git a/layout/xml/document/src/nsXMLDocument.cpp b/layout/xml/document/src/nsXMLDocument.cpp
index 7d17831b1e88..e8faa22c1a81 100644
--- a/layout/xml/document/src/nsXMLDocument.cpp
+++ b/layout/xml/document/src/nsXMLDocument.cpp
@@ -58,6 +58,12 @@
 #include "nsXULAtoms.h"
 #endif
 
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+#include "nsMathMLAtoms.h"
+#include "nsMathMLOperators.h"
+#endif
+
 static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID);
 static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
 static NS_DEFINE_IID(kIXMLDocumentIID, NS_IXMLDOCUMENT_IID);
@@ -96,6 +102,11 @@ nsXMLDocument::nsXMLDocument()
 #ifdef XSL
   mTransformMediator = nsnull;
 #endif
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+  nsMathMLOperators::AddRefTable();
+  nsMathMLAtoms::AddRefAtoms();
+#endif
 }
 
 nsXMLDocument::~nsXMLDocument()
@@ -116,6 +127,11 @@ nsXMLDocument::~nsXMLDocument()
 #ifdef XSL
   NS_IF_RELEASE(mTransformMediator);
 #endif
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+  nsMathMLOperators::ReleaseTable();
+  nsMathMLAtoms::ReleaseAtoms();
+#endif
 }
 
 NS_IMETHODIMP