Index: mozilla/layout/base/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/layout/base/Makefile.in,v
retrieving revision 1.31
diff -u -r1.31 mozilla/layout/base/Makefile.in
--- mozilla/layout/base/Makefile.in
+++ mozilla/layout/base/Makefile.in
@@ -81,6 +81,7 @@
 endif
 
 XPIDLSRCS	= \
+		nsIBoxObject.idl                \
 		nsIChromeEventHandler.idl	\
 		nsIStyleSheetService.idl	\
 		$(NULL)
@@ -122,6 +123,7 @@
 
 CPPSRCS		= \
 		nsBidiUtils.cpp \
+		nsBoxObject.cpp \
 		nsCSSColorUtils.cpp \
 		nsCSSFrameConstructor.cpp \
 		nsCSSRendering.cpp \
Index: mozilla/layout/build/nsLayoutModule.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/build/nsLayoutModule.cpp,v
retrieving revision 1.158
diff -u -r1.158 mozilla/layout/build/nsLayoutModule.cpp
--- mozilla/layout/build/nsLayoutModule.cpp
+++ mozilla/layout/build/nsLayoutModule.cpp
@@ -157,8 +157,9 @@
 
 static NS_DEFINE_CID(kWindowCommandTableCID, NS_WINDOWCOMMANDTABLE_CID);
 
-#ifdef MOZ_XUL
 #include "nsIBoxObject.h"
+
+#ifdef MOZ_XUL
 #include "nsIXULDocument.h"
 #include "nsIXULPopupListener.h"
 #include "nsIXULPrototypeCache.h"
@@ -304,8 +305,9 @@
 nsresult NS_NewLayoutDebugger(nsILayoutDebugger** aResult);
 #endif
 
-#ifdef MOZ_XUL
 nsresult NS_NewBoxObject(nsIBoxObject** aResult);
+
+#ifdef MOZ_XUL
 nsresult NS_NewListBoxObject(nsIBoxObject** aResult);
 nsresult NS_NewScrollBoxObject(nsIBoxObject** aResult);
 nsresult NS_NewMenuBoxObject(nsIBoxObject** aResult);
@@ -373,8 +375,9 @@
 
 MAKE_CTOR(CreateNewFrameTraversal,      nsIFrameTraversal,      NS_CreateFrameTraversal)
 MAKE_CTOR(CreateNewPresShell,           nsIPresShell,           NS_NewPresShell)
-#ifdef MOZ_XUL
 MAKE_CTOR(CreateNewBoxObject,           nsIBoxObject,           NS_NewBoxObject)
+
+#ifdef MOZ_XUL
 MAKE_CTOR(CreateNewListBoxObject,       nsIBoxObject,           NS_NewListBoxObject)
 MAKE_CTOR(CreateNewMenuBoxObject,       nsIBoxObject,           NS_NewMenuBoxObject)
 MAKE_CTOR(CreateNewPopupBoxObject,      nsIBoxObject,           NS_NewPopupBoxObject)
@@ -727,12 +730,12 @@
 
   // XXX end ick
 
-#ifdef MOZ_XUL
-  { "XUL Box Object",
+  { "Box Object",
     NS_BOXOBJECT_CID,
     "@mozilla.org/layout/xul-boxobject;1",
     CreateNewBoxObject },
 
+#ifdef MOZ_XUL
   { "XUL Listbox Box Object",
     NS_LISTBOXOBJECT_CID,
     "@mozilla.org/layout/xul-boxobject-listbox;1",
Index: mozilla/layout/xul/base/public/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/layout/xul/base/public/Makefile.in,v
retrieving revision 1.21
diff -u -r1.21 mozilla/layout/xul/base/public/Makefile.in
--- mozilla/layout/xul/base/public/Makefile.in
+++ mozilla/layout/xul/base/public/Makefile.in
@@ -53,7 +53,7 @@
 		nsIScrollbarMediator.h \
 		$(NULL)
 
-XPIDLSRCS=      nsIBoxObject.idl                  \
+XPIDLSRCS=      \
                 nsIScrollBoxObject.idl              \
                 nsIBoxLayoutManager.idl              \
                 nsIBoxPaintManager.idl               \
Index: mozilla/layout/xul/base/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/layout/xul/base/src/Makefile.in,v
retrieving revision 1.122
diff -u -r1.122 mozilla/layout/xul/base/src/Makefile.in
--- mozilla/layout/xul/base/src/Makefile.in
+++ mozilla/layout/xul/base/src/Makefile.in
@@ -107,7 +107,6 @@
 		nsMenuBoxObject.cpp \
 		nsPopupBoxObject.cpp \
 		nsListBoxObject.cpp \
-		nsBoxObject.cpp \
 		nsImageBoxFrame.cpp \
 		nsDocElementBoxFrame.cpp \
 		nsLeafBoxFrame.cpp \
Index: mozilla/layout/xul/base/src/nsBoxObject.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/xul/base/src/nsBoxObject.cpp,v
retrieving revision 1.57
diff -u -r1.57 mozilla/layout/xul/base/src/nsBoxObject.cpp
--- mozilla/layout/xul/base/src/nsBoxObject.cpp
+++ mozilla/layout/xul/base/src/nsBoxObject.cpp
@@ -54,7 +54,6 @@
 #include "nsIDOMClassInfo.h"
 #include "nsIView.h"
 #include "nsIWidget.h"
-#include "nsIDOMXULElement.h"
 #include "nsIFrame.h"
 
 // Static IIDs/CIDs. Try to minimize these.