diff --git a/content/shared/src/nsLayoutAtoms.cpp b/content/shared/src/nsLayoutAtoms.cpp
index 77e1f429362..8658e78751a 100644
--- a/content/shared/src/nsLayoutAtoms.cpp
+++ b/content/shared/src/nsLayoutAtoms.cpp
@@ -17,168 +17,32 @@
  */
 #include "nsLayoutAtoms.h"
 
-// XXX make this be autogenerated. doh!
+// define storage for all atoms
+#define LAYOUT_ATOM(_name, _value) nsIAtom* nsLayoutAtoms::_name;
+#include "nsLayoutAtomList.h"
+#undef LAYOUT_ATOM
 
-// media atoms
-nsIAtom* nsLayoutAtoms::all;
-nsIAtom* nsLayoutAtoms::aural;
-nsIAtom* nsLayoutAtoms::braille;
-nsIAtom* nsLayoutAtoms::embossed;
-nsIAtom* nsLayoutAtoms::handheld;
-nsIAtom* nsLayoutAtoms::print;
-nsIAtom* nsLayoutAtoms::projection;
-nsIAtom* nsLayoutAtoms::screen;
-nsIAtom* nsLayoutAtoms::tty;
-nsIAtom* nsLayoutAtoms::tv;
-
-// name space atoms
-nsIAtom* nsLayoutAtoms::htmlNameSpace;
-nsIAtom* nsLayoutAtoms::xmlNameSpace;
-nsIAtom* nsLayoutAtoms::xmlnsNameSpace;
-
-// frame additional child lists
-nsIAtom* nsLayoutAtoms::absoluteList;
-nsIAtom* nsLayoutAtoms::bulletList;
-nsIAtom* nsLayoutAtoms::colGroupList;
-nsIAtom* nsLayoutAtoms::fixedList;
-nsIAtom* nsLayoutAtoms::floaterList;
-nsIAtom* nsLayoutAtoms::popupList;
-
-// pseudo tag names for non-element content
-nsIAtom* nsLayoutAtoms::commentTagName;
-nsIAtom* nsLayoutAtoms::textTagName;
-nsIAtom* nsLayoutAtoms::processingInstructionTagName;
-nsIAtom* nsLayoutAtoms::viewportPseudo;
-nsIAtom* nsLayoutAtoms::pagePseudo;
-
-// frame types
-nsIAtom* nsLayoutAtoms::areaFrame;
-nsIAtom* nsLayoutAtoms::blockFrame;
-nsIAtom* nsLayoutAtoms::htmlFrameInnerFrame;
-nsIAtom* nsLayoutAtoms::htmlFrameOuterFrame;
-nsIAtom* nsLayoutAtoms::inlineFrame;
-nsIAtom* nsLayoutAtoms::letterFrame;
-nsIAtom* nsLayoutAtoms::lineFrame;
-nsIAtom* nsLayoutAtoms::pageFrame;
-nsIAtom* nsLayoutAtoms::placeholderFrame;
-nsIAtom* nsLayoutAtoms::positionedInlineFrame;
-nsIAtom* nsLayoutAtoms::rootFrame;
-nsIAtom* nsLayoutAtoms::scrollFrame;
-nsIAtom* nsLayoutAtoms::tableOuterFrame;
-nsIAtom* nsLayoutAtoms::tableFrame;
-nsIAtom* nsLayoutAtoms::tableRowGroupFrame;
-nsIAtom* nsLayoutAtoms::tableRowFrame;
-nsIAtom* nsLayoutAtoms::tableCellFrame;
-nsIAtom* nsLayoutAtoms::textFrame;
-nsIAtom* nsLayoutAtoms::viewportFrame;
 
 static nsrefcnt gRefCnt;
 
-void nsLayoutAtoms::AddrefAtoms()
+void nsLayoutAtoms::AddRefAtoms()
 {
-  if (0 == gRefCnt) {
-    all = NS_NewAtom("all");  // Media atoms must be lower case
-    aural = NS_NewAtom("aural");
-    braille = NS_NewAtom("braille");
-    embossed = NS_NewAtom("embossed");
-    handheld = NS_NewAtom("handheld");
-    print = NS_NewAtom("print");
-    projection = NS_NewAtom("projection");
-    screen = NS_NewAtom("screen");
-    tty = NS_NewAtom("tty");
-    tv = NS_NewAtom("tv");
-
-    htmlNameSpace = NS_NewAtom("html");
-    xmlNameSpace = NS_NewAtom("xml");
-    xmlnsNameSpace = NS_NewAtom("xmlns");
-
-    absoluteList = NS_NewAtom("Absolute-list");
-    bulletList = NS_NewAtom("Bullet-list");
-    colGroupList = NS_NewAtom("ColGroup-list");
-    fixedList = NS_NewAtom("Fixed-list");
-    floaterList = NS_NewAtom("Floater-list");
-    popupList = NS_NewAtom("Popup-list");
-
-    commentTagName = NS_NewAtom("__moz_comment");
-    textTagName = NS_NewAtom("__moz_text");
-    processingInstructionTagName = NS_NewAtom("__moz_pi");
-    viewportPseudo = NS_NewAtom(":-moz-viewport");
-    pagePseudo = NS_NewAtom(":-moz-page");
-
-    areaFrame = NS_NewAtom("AreaFrame");
-    blockFrame = NS_NewAtom("BlockFrame");
-    htmlFrameInnerFrame = NS_NewAtom("htmlFrameInnerFrame");
-    htmlFrameOuterFrame = NS_NewAtom("htmlFrameOuterFrame");
-    inlineFrame = NS_NewAtom("InlineFrame");
-    letterFrame = NS_NewAtom("LetterFrame");
-    lineFrame = NS_NewAtom("LineFrame");
-    pageFrame = NS_NewAtom("PageFrame");
-    placeholderFrame = NS_NewAtom("PlaceholderFrame");
-    positionedInlineFrame = NS_NewAtom("PositionedInlineFrame");
-    rootFrame = NS_NewAtom("RootFrame");
-    scrollFrame = NS_NewAtom("ScrollFrame");
-    tableOuterFrame = NS_NewAtom("TableOuterFrame");
-    tableFrame = NS_NewAtom("TableFrame");
-    tableRowGroupFrame = NS_NewAtom("TableRowGroupFrame");
-    tableRowFrame = NS_NewAtom("TableRowFrame");
-    tableCellFrame = NS_NewAtom("TableCellFrame");
-    textFrame = NS_NewAtom("TextFrame");
-    viewportFrame = NS_NewAtom("ViewportFrame");
+  if (0 == gRefCnt++) {
+    // create atoms
+#define LAYOUT_ATOM(_name, _value) _name = NS_NewAtom(_value);
+#include "nsLayoutAtomList.h"
+#undef LAYOUT_ATOM
   }
-  ++gRefCnt;
 }
 
 void nsLayoutAtoms::ReleaseAtoms()
 {
   NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
   if (--gRefCnt == 0) {
-    NS_RELEASE(all);
-    NS_RELEASE(aural);
-    NS_RELEASE(braille);
-    NS_RELEASE(embossed);
-    NS_RELEASE(handheld);
-    NS_RELEASE(print);
-    NS_RELEASE(projection);
-    NS_RELEASE(screen);
-    NS_RELEASE(tty);
-    NS_RELEASE(tv);
-    
-    NS_RELEASE(htmlNameSpace);
-    NS_RELEASE(xmlNameSpace);
-    NS_RELEASE(xmlnsNameSpace);
-
-    NS_RELEASE(absoluteList);
-    NS_RELEASE(bulletList);
-    NS_RELEASE(colGroupList);
-    NS_RELEASE(fixedList);
-    NS_RELEASE(floaterList);
-    NS_RELEASE(popupList);
-
-    NS_RELEASE(commentTagName);
-    NS_RELEASE(textTagName);
-    NS_RELEASE(processingInstructionTagName);
-    NS_RELEASE(viewportPseudo);
-    NS_RELEASE(pagePseudo);
-    
-    NS_RELEASE(areaFrame);
-    NS_RELEASE(blockFrame);
-    NS_RELEASE(htmlFrameInnerFrame);
-    NS_RELEASE(htmlFrameOuterFrame);
-    NS_RELEASE(inlineFrame);
-    NS_RELEASE(letterFrame);
-    NS_RELEASE(lineFrame);
-    NS_RELEASE(pageFrame);
-    NS_RELEASE(placeholderFrame);
-    NS_RELEASE(positionedInlineFrame);
-    NS_RELEASE(rootFrame);
-    NS_RELEASE(scrollFrame);
-    NS_RELEASE(tableOuterFrame);
-    NS_RELEASE(tableFrame);
-    NS_RELEASE(tableRowGroupFrame);
-    NS_RELEASE(tableRowFrame);
-    NS_RELEASE(tableCellFrame);
-    NS_RELEASE(textFrame);
-    NS_RELEASE(viewportFrame);
+    // release atoms
+#define LAYOUT_ATOM(_name, _value) NS_RELEASE(_name);
+#include "nsLayoutAtomList.h"
+#undef LAYOUT_ATOM
   }
 }
 
diff --git a/layout/base/nsLayoutAtoms.cpp b/layout/base/nsLayoutAtoms.cpp
index 77e1f429362..8658e78751a 100644
--- a/layout/base/nsLayoutAtoms.cpp
+++ b/layout/base/nsLayoutAtoms.cpp
@@ -17,168 +17,32 @@
  */
 #include "nsLayoutAtoms.h"
 
-// XXX make this be autogenerated. doh!
+// define storage for all atoms
+#define LAYOUT_ATOM(_name, _value) nsIAtom* nsLayoutAtoms::_name;
+#include "nsLayoutAtomList.h"
+#undef LAYOUT_ATOM
 
-// media atoms
-nsIAtom* nsLayoutAtoms::all;
-nsIAtom* nsLayoutAtoms::aural;
-nsIAtom* nsLayoutAtoms::braille;
-nsIAtom* nsLayoutAtoms::embossed;
-nsIAtom* nsLayoutAtoms::handheld;
-nsIAtom* nsLayoutAtoms::print;
-nsIAtom* nsLayoutAtoms::projection;
-nsIAtom* nsLayoutAtoms::screen;
-nsIAtom* nsLayoutAtoms::tty;
-nsIAtom* nsLayoutAtoms::tv;
-
-// name space atoms
-nsIAtom* nsLayoutAtoms::htmlNameSpace;
-nsIAtom* nsLayoutAtoms::xmlNameSpace;
-nsIAtom* nsLayoutAtoms::xmlnsNameSpace;
-
-// frame additional child lists
-nsIAtom* nsLayoutAtoms::absoluteList;
-nsIAtom* nsLayoutAtoms::bulletList;
-nsIAtom* nsLayoutAtoms::colGroupList;
-nsIAtom* nsLayoutAtoms::fixedList;
-nsIAtom* nsLayoutAtoms::floaterList;
-nsIAtom* nsLayoutAtoms::popupList;
-
-// pseudo tag names for non-element content
-nsIAtom* nsLayoutAtoms::commentTagName;
-nsIAtom* nsLayoutAtoms::textTagName;
-nsIAtom* nsLayoutAtoms::processingInstructionTagName;
-nsIAtom* nsLayoutAtoms::viewportPseudo;
-nsIAtom* nsLayoutAtoms::pagePseudo;
-
-// frame types
-nsIAtom* nsLayoutAtoms::areaFrame;
-nsIAtom* nsLayoutAtoms::blockFrame;
-nsIAtom* nsLayoutAtoms::htmlFrameInnerFrame;
-nsIAtom* nsLayoutAtoms::htmlFrameOuterFrame;
-nsIAtom* nsLayoutAtoms::inlineFrame;
-nsIAtom* nsLayoutAtoms::letterFrame;
-nsIAtom* nsLayoutAtoms::lineFrame;
-nsIAtom* nsLayoutAtoms::pageFrame;
-nsIAtom* nsLayoutAtoms::placeholderFrame;
-nsIAtom* nsLayoutAtoms::positionedInlineFrame;
-nsIAtom* nsLayoutAtoms::rootFrame;
-nsIAtom* nsLayoutAtoms::scrollFrame;
-nsIAtom* nsLayoutAtoms::tableOuterFrame;
-nsIAtom* nsLayoutAtoms::tableFrame;
-nsIAtom* nsLayoutAtoms::tableRowGroupFrame;
-nsIAtom* nsLayoutAtoms::tableRowFrame;
-nsIAtom* nsLayoutAtoms::tableCellFrame;
-nsIAtom* nsLayoutAtoms::textFrame;
-nsIAtom* nsLayoutAtoms::viewportFrame;
 
 static nsrefcnt gRefCnt;
 
-void nsLayoutAtoms::AddrefAtoms()
+void nsLayoutAtoms::AddRefAtoms()
 {
-  if (0 == gRefCnt) {
-    all = NS_NewAtom("all");  // Media atoms must be lower case
-    aural = NS_NewAtom("aural");
-    braille = NS_NewAtom("braille");
-    embossed = NS_NewAtom("embossed");
-    handheld = NS_NewAtom("handheld");
-    print = NS_NewAtom("print");
-    projection = NS_NewAtom("projection");
-    screen = NS_NewAtom("screen");
-    tty = NS_NewAtom("tty");
-    tv = NS_NewAtom("tv");
-
-    htmlNameSpace = NS_NewAtom("html");
-    xmlNameSpace = NS_NewAtom("xml");
-    xmlnsNameSpace = NS_NewAtom("xmlns");
-
-    absoluteList = NS_NewAtom("Absolute-list");
-    bulletList = NS_NewAtom("Bullet-list");
-    colGroupList = NS_NewAtom("ColGroup-list");
-    fixedList = NS_NewAtom("Fixed-list");
-    floaterList = NS_NewAtom("Floater-list");
-    popupList = NS_NewAtom("Popup-list");
-
-    commentTagName = NS_NewAtom("__moz_comment");
-    textTagName = NS_NewAtom("__moz_text");
-    processingInstructionTagName = NS_NewAtom("__moz_pi");
-    viewportPseudo = NS_NewAtom(":-moz-viewport");
-    pagePseudo = NS_NewAtom(":-moz-page");
-
-    areaFrame = NS_NewAtom("AreaFrame");
-    blockFrame = NS_NewAtom("BlockFrame");
-    htmlFrameInnerFrame = NS_NewAtom("htmlFrameInnerFrame");
-    htmlFrameOuterFrame = NS_NewAtom("htmlFrameOuterFrame");
-    inlineFrame = NS_NewAtom("InlineFrame");
-    letterFrame = NS_NewAtom("LetterFrame");
-    lineFrame = NS_NewAtom("LineFrame");
-    pageFrame = NS_NewAtom("PageFrame");
-    placeholderFrame = NS_NewAtom("PlaceholderFrame");
-    positionedInlineFrame = NS_NewAtom("PositionedInlineFrame");
-    rootFrame = NS_NewAtom("RootFrame");
-    scrollFrame = NS_NewAtom("ScrollFrame");
-    tableOuterFrame = NS_NewAtom("TableOuterFrame");
-    tableFrame = NS_NewAtom("TableFrame");
-    tableRowGroupFrame = NS_NewAtom("TableRowGroupFrame");
-    tableRowFrame = NS_NewAtom("TableRowFrame");
-    tableCellFrame = NS_NewAtom("TableCellFrame");
-    textFrame = NS_NewAtom("TextFrame");
-    viewportFrame = NS_NewAtom("ViewportFrame");
+  if (0 == gRefCnt++) {
+    // create atoms
+#define LAYOUT_ATOM(_name, _value) _name = NS_NewAtom(_value);
+#include "nsLayoutAtomList.h"
+#undef LAYOUT_ATOM
   }
-  ++gRefCnt;
 }
 
 void nsLayoutAtoms::ReleaseAtoms()
 {
   NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
   if (--gRefCnt == 0) {
-    NS_RELEASE(all);
-    NS_RELEASE(aural);
-    NS_RELEASE(braille);
-    NS_RELEASE(embossed);
-    NS_RELEASE(handheld);
-    NS_RELEASE(print);
-    NS_RELEASE(projection);
-    NS_RELEASE(screen);
-    NS_RELEASE(tty);
-    NS_RELEASE(tv);
-    
-    NS_RELEASE(htmlNameSpace);
-    NS_RELEASE(xmlNameSpace);
-    NS_RELEASE(xmlnsNameSpace);
-
-    NS_RELEASE(absoluteList);
-    NS_RELEASE(bulletList);
-    NS_RELEASE(colGroupList);
-    NS_RELEASE(fixedList);
-    NS_RELEASE(floaterList);
-    NS_RELEASE(popupList);
-
-    NS_RELEASE(commentTagName);
-    NS_RELEASE(textTagName);
-    NS_RELEASE(processingInstructionTagName);
-    NS_RELEASE(viewportPseudo);
-    NS_RELEASE(pagePseudo);
-    
-    NS_RELEASE(areaFrame);
-    NS_RELEASE(blockFrame);
-    NS_RELEASE(htmlFrameInnerFrame);
-    NS_RELEASE(htmlFrameOuterFrame);
-    NS_RELEASE(inlineFrame);
-    NS_RELEASE(letterFrame);
-    NS_RELEASE(lineFrame);
-    NS_RELEASE(pageFrame);
-    NS_RELEASE(placeholderFrame);
-    NS_RELEASE(positionedInlineFrame);
-    NS_RELEASE(rootFrame);
-    NS_RELEASE(scrollFrame);
-    NS_RELEASE(tableOuterFrame);
-    NS_RELEASE(tableFrame);
-    NS_RELEASE(tableRowGroupFrame);
-    NS_RELEASE(tableRowFrame);
-    NS_RELEASE(tableCellFrame);
-    NS_RELEASE(textFrame);
-    NS_RELEASE(viewportFrame);
+    // release atoms
+#define LAYOUT_ATOM(_name, _value) NS_RELEASE(_name);
+#include "nsLayoutAtomList.h"
+#undef LAYOUT_ATOM
   }
 }
 
diff --git a/layout/base/src/nsLayoutAtoms.cpp b/layout/base/src/nsLayoutAtoms.cpp
index 77e1f429362..8658e78751a 100644
--- a/layout/base/src/nsLayoutAtoms.cpp
+++ b/layout/base/src/nsLayoutAtoms.cpp
@@ -17,168 +17,32 @@
  */
 #include "nsLayoutAtoms.h"
 
-// XXX make this be autogenerated. doh!
+// define storage for all atoms
+#define LAYOUT_ATOM(_name, _value) nsIAtom* nsLayoutAtoms::_name;
+#include "nsLayoutAtomList.h"
+#undef LAYOUT_ATOM
 
-// media atoms
-nsIAtom* nsLayoutAtoms::all;
-nsIAtom* nsLayoutAtoms::aural;
-nsIAtom* nsLayoutAtoms::braille;
-nsIAtom* nsLayoutAtoms::embossed;
-nsIAtom* nsLayoutAtoms::handheld;
-nsIAtom* nsLayoutAtoms::print;
-nsIAtom* nsLayoutAtoms::projection;
-nsIAtom* nsLayoutAtoms::screen;
-nsIAtom* nsLayoutAtoms::tty;
-nsIAtom* nsLayoutAtoms::tv;
-
-// name space atoms
-nsIAtom* nsLayoutAtoms::htmlNameSpace;
-nsIAtom* nsLayoutAtoms::xmlNameSpace;
-nsIAtom* nsLayoutAtoms::xmlnsNameSpace;
-
-// frame additional child lists
-nsIAtom* nsLayoutAtoms::absoluteList;
-nsIAtom* nsLayoutAtoms::bulletList;
-nsIAtom* nsLayoutAtoms::colGroupList;
-nsIAtom* nsLayoutAtoms::fixedList;
-nsIAtom* nsLayoutAtoms::floaterList;
-nsIAtom* nsLayoutAtoms::popupList;
-
-// pseudo tag names for non-element content
-nsIAtom* nsLayoutAtoms::commentTagName;
-nsIAtom* nsLayoutAtoms::textTagName;
-nsIAtom* nsLayoutAtoms::processingInstructionTagName;
-nsIAtom* nsLayoutAtoms::viewportPseudo;
-nsIAtom* nsLayoutAtoms::pagePseudo;
-
-// frame types
-nsIAtom* nsLayoutAtoms::areaFrame;
-nsIAtom* nsLayoutAtoms::blockFrame;
-nsIAtom* nsLayoutAtoms::htmlFrameInnerFrame;
-nsIAtom* nsLayoutAtoms::htmlFrameOuterFrame;
-nsIAtom* nsLayoutAtoms::inlineFrame;
-nsIAtom* nsLayoutAtoms::letterFrame;
-nsIAtom* nsLayoutAtoms::lineFrame;
-nsIAtom* nsLayoutAtoms::pageFrame;
-nsIAtom* nsLayoutAtoms::placeholderFrame;
-nsIAtom* nsLayoutAtoms::positionedInlineFrame;
-nsIAtom* nsLayoutAtoms::rootFrame;
-nsIAtom* nsLayoutAtoms::scrollFrame;
-nsIAtom* nsLayoutAtoms::tableOuterFrame;
-nsIAtom* nsLayoutAtoms::tableFrame;
-nsIAtom* nsLayoutAtoms::tableRowGroupFrame;
-nsIAtom* nsLayoutAtoms::tableRowFrame;
-nsIAtom* nsLayoutAtoms::tableCellFrame;
-nsIAtom* nsLayoutAtoms::textFrame;
-nsIAtom* nsLayoutAtoms::viewportFrame;
 
 static nsrefcnt gRefCnt;
 
-void nsLayoutAtoms::AddrefAtoms()
+void nsLayoutAtoms::AddRefAtoms()
 {
-  if (0 == gRefCnt) {
-    all = NS_NewAtom("all");  // Media atoms must be lower case
-    aural = NS_NewAtom("aural");
-    braille = NS_NewAtom("braille");
-    embossed = NS_NewAtom("embossed");
-    handheld = NS_NewAtom("handheld");
-    print = NS_NewAtom("print");
-    projection = NS_NewAtom("projection");
-    screen = NS_NewAtom("screen");
-    tty = NS_NewAtom("tty");
-    tv = NS_NewAtom("tv");
-
-    htmlNameSpace = NS_NewAtom("html");
-    xmlNameSpace = NS_NewAtom("xml");
-    xmlnsNameSpace = NS_NewAtom("xmlns");
-
-    absoluteList = NS_NewAtom("Absolute-list");
-    bulletList = NS_NewAtom("Bullet-list");
-    colGroupList = NS_NewAtom("ColGroup-list");
-    fixedList = NS_NewAtom("Fixed-list");
-    floaterList = NS_NewAtom("Floater-list");
-    popupList = NS_NewAtom("Popup-list");
-
-    commentTagName = NS_NewAtom("__moz_comment");
-    textTagName = NS_NewAtom("__moz_text");
-    processingInstructionTagName = NS_NewAtom("__moz_pi");
-    viewportPseudo = NS_NewAtom(":-moz-viewport");
-    pagePseudo = NS_NewAtom(":-moz-page");
-
-    areaFrame = NS_NewAtom("AreaFrame");
-    blockFrame = NS_NewAtom("BlockFrame");
-    htmlFrameInnerFrame = NS_NewAtom("htmlFrameInnerFrame");
-    htmlFrameOuterFrame = NS_NewAtom("htmlFrameOuterFrame");
-    inlineFrame = NS_NewAtom("InlineFrame");
-    letterFrame = NS_NewAtom("LetterFrame");
-    lineFrame = NS_NewAtom("LineFrame");
-    pageFrame = NS_NewAtom("PageFrame");
-    placeholderFrame = NS_NewAtom("PlaceholderFrame");
-    positionedInlineFrame = NS_NewAtom("PositionedInlineFrame");
-    rootFrame = NS_NewAtom("RootFrame");
-    scrollFrame = NS_NewAtom("ScrollFrame");
-    tableOuterFrame = NS_NewAtom("TableOuterFrame");
-    tableFrame = NS_NewAtom("TableFrame");
-    tableRowGroupFrame = NS_NewAtom("TableRowGroupFrame");
-    tableRowFrame = NS_NewAtom("TableRowFrame");
-    tableCellFrame = NS_NewAtom("TableCellFrame");
-    textFrame = NS_NewAtom("TextFrame");
-    viewportFrame = NS_NewAtom("ViewportFrame");
+  if (0 == gRefCnt++) {
+    // create atoms
+#define LAYOUT_ATOM(_name, _value) _name = NS_NewAtom(_value);
+#include "nsLayoutAtomList.h"
+#undef LAYOUT_ATOM
   }
-  ++gRefCnt;
 }
 
 void nsLayoutAtoms::ReleaseAtoms()
 {
   NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
   if (--gRefCnt == 0) {
-    NS_RELEASE(all);
-    NS_RELEASE(aural);
-    NS_RELEASE(braille);
-    NS_RELEASE(embossed);
-    NS_RELEASE(handheld);
-    NS_RELEASE(print);
-    NS_RELEASE(projection);
-    NS_RELEASE(screen);
-    NS_RELEASE(tty);
-    NS_RELEASE(tv);
-    
-    NS_RELEASE(htmlNameSpace);
-    NS_RELEASE(xmlNameSpace);
-    NS_RELEASE(xmlnsNameSpace);
-
-    NS_RELEASE(absoluteList);
-    NS_RELEASE(bulletList);
-    NS_RELEASE(colGroupList);
-    NS_RELEASE(fixedList);
-    NS_RELEASE(floaterList);
-    NS_RELEASE(popupList);
-
-    NS_RELEASE(commentTagName);
-    NS_RELEASE(textTagName);
-    NS_RELEASE(processingInstructionTagName);
-    NS_RELEASE(viewportPseudo);
-    NS_RELEASE(pagePseudo);
-    
-    NS_RELEASE(areaFrame);
-    NS_RELEASE(blockFrame);
-    NS_RELEASE(htmlFrameInnerFrame);
-    NS_RELEASE(htmlFrameOuterFrame);
-    NS_RELEASE(inlineFrame);
-    NS_RELEASE(letterFrame);
-    NS_RELEASE(lineFrame);
-    NS_RELEASE(pageFrame);
-    NS_RELEASE(placeholderFrame);
-    NS_RELEASE(positionedInlineFrame);
-    NS_RELEASE(rootFrame);
-    NS_RELEASE(scrollFrame);
-    NS_RELEASE(tableOuterFrame);
-    NS_RELEASE(tableFrame);
-    NS_RELEASE(tableRowGroupFrame);
-    NS_RELEASE(tableRowFrame);
-    NS_RELEASE(tableCellFrame);
-    NS_RELEASE(textFrame);
-    NS_RELEASE(viewportFrame);
+    // release atoms
+#define LAYOUT_ATOM(_name, _value) NS_RELEASE(_name);
+#include "nsLayoutAtomList.h"
+#undef LAYOUT_ATOM
   }
 }