diff --git a/mozilla/content/html/content/src/nsHTMLAtomList.h b/mozilla/content/html/content/src/nsHTMLAtomList.h
index 6028e2b4278..696535acaf7 100644
--- a/mozilla/content/html/content/src/nsHTMLAtomList.h
+++ b/mozilla/content/html/content/src/nsHTMLAtomList.h
@@ -224,14 +224,12 @@ HTML_ATOM(rel, "rel")
 HTML_ATOM(repeat, "repeat")
 HTML_ATOM(rev, "rev")
 HTML_ATOM(rightpadding, "rightpadding")
-HTML_ATOM(rootPseudo, ":root")
 HTML_ATOM(rows, "rows")
 HTML_ATOM(rowspan, "rowspan")
 HTML_ATOM(rules, "rules")
 HTML_ATOM(scheme, "scheme")
 HTML_ATOM(scope, "scope")
 HTML_ATOM(script, "script")
-HTML_ATOM(scrolledContentPseudo, ":scrolled-content")
 HTML_ATOM(scrolling, "scrolling")
 HTML_ATOM(select, "select")
 HTML_ATOM(selected, "selected")
diff --git a/mozilla/content/shared/public/nsHTMLAtomList.h b/mozilla/content/shared/public/nsHTMLAtomList.h
index 6028e2b4278..696535acaf7 100644
--- a/mozilla/content/shared/public/nsHTMLAtomList.h
+++ b/mozilla/content/shared/public/nsHTMLAtomList.h
@@ -224,14 +224,12 @@ HTML_ATOM(rel, "rel")
 HTML_ATOM(repeat, "repeat")
 HTML_ATOM(rev, "rev")
 HTML_ATOM(rightpadding, "rightpadding")
-HTML_ATOM(rootPseudo, ":root")
 HTML_ATOM(rows, "rows")
 HTML_ATOM(rowspan, "rowspan")
 HTML_ATOM(rules, "rules")
 HTML_ATOM(scheme, "scheme")
 HTML_ATOM(scope, "scope")
 HTML_ATOM(script, "script")
-HTML_ATOM(scrolledContentPseudo, ":scrolled-content")
 HTML_ATOM(scrolling, "scrolling")
 HTML_ATOM(select, "select")
 HTML_ATOM(selected, "selected")
diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
index 16933fd3d2d..e2b221469c1 100644
--- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp
+++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
@@ -23,7 +23,7 @@
 #include "nsStyleConsts.h"
 #include "nsCSSRendering.h"
 #include "nsIContent.h"
-#include "nsHTMLAtoms.h"
+#include "nsLayoutAtoms.h"
 #include "nsIWidget.h"
 #include "nsILinkHandler.h"
 #include "nsHTMLValue.h"
@@ -298,7 +298,7 @@ nsHTMLContainerFrame::CreateViewForFrame(nsIPresContext& aPresContext,
     if (!aForce) {
       nsIAtom*  pseudoTag;
       aStyleContext->GetPseudoType(pseudoTag);
-      if (pseudoTag == nsHTMLAtoms::scrolledContentPseudo) {
+      if (pseudoTag == nsLayoutAtoms::scrolledContentPseudo) {
         NS_FRAME_LOG(NS_FRAME_TRACE_CALLS,
           ("nsHTMLContainerFrame::CreateViewForFrame: scrolled frame=%p", aFrame));
         aForce = PR_TRUE;
diff --git a/mozilla/layout/html/base/src/nsHTMLAtomList.h b/mozilla/layout/html/base/src/nsHTMLAtomList.h
index 6028e2b4278..696535acaf7 100644
--- a/mozilla/layout/html/base/src/nsHTMLAtomList.h
+++ b/mozilla/layout/html/base/src/nsHTMLAtomList.h
@@ -224,14 +224,12 @@ HTML_ATOM(rel, "rel")
 HTML_ATOM(repeat, "repeat")
 HTML_ATOM(rev, "rev")
 HTML_ATOM(rightpadding, "rightpadding")
-HTML_ATOM(rootPseudo, ":root")
 HTML_ATOM(rows, "rows")
 HTML_ATOM(rowspan, "rowspan")
 HTML_ATOM(rules, "rules")
 HTML_ATOM(scheme, "scheme")
 HTML_ATOM(scope, "scope")
 HTML_ATOM(script, "script")
-HTML_ATOM(scrolledContentPseudo, ":scrolled-content")
 HTML_ATOM(scrolling, "scrolling")
 HTML_ATOM(select, "select")
 HTML_ATOM(selected, "selected")
diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
index 16933fd3d2d..e2b221469c1 100644
--- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
+++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
@@ -23,7 +23,7 @@
 #include "nsStyleConsts.h"
 #include "nsCSSRendering.h"
 #include "nsIContent.h"
-#include "nsHTMLAtoms.h"
+#include "nsLayoutAtoms.h"
 #include "nsIWidget.h"
 #include "nsILinkHandler.h"
 #include "nsHTMLValue.h"
@@ -298,7 +298,7 @@ nsHTMLContainerFrame::CreateViewForFrame(nsIPresContext& aPresContext,
     if (!aForce) {
       nsIAtom*  pseudoTag;
       aStyleContext->GetPseudoType(pseudoTag);
-      if (pseudoTag == nsHTMLAtoms::scrolledContentPseudo) {
+      if (pseudoTag == nsLayoutAtoms::scrolledContentPseudo) {
         NS_FRAME_LOG(NS_FRAME_TRACE_CALLS,
           ("nsHTMLContainerFrame::CreateViewForFrame: scrolled frame=%p", aFrame));
         aForce = PR_TRUE;