1 files changed, 0 insertions, 13 deletions
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index 014176f03..e9095ce03 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -75,7 +75,6 @@
 #include "mozilla/dom/PromiseDebugging.h"
 #include "mozilla/dom/WebCryptoThreadPool.h"
 
-#ifdef MOZ_XUL
 #include "nsXULPopupManager.h"
 #include "nsXULContentUtils.h"
 #include "nsXULPrototypeCache.h"
@@ -84,7 +83,6 @@
 #include "inDOMView.h"
 
 #include "nsMenuBarListener.h"
-#endif
 
 #include "nsTextServicesDocument.h"
 
@@ -208,15 +206,12 @@ nsLayoutStatics::Initialize()
     return rv;
   }
 
-#ifdef MOZ_XUL
   rv = nsXULContentUtils::Init();
   if (NS_FAILED(rv)) {
     NS_ERROR("Could not initialize nsXULContentUtils");
     return rv;
   }
 
-#endif
-
   nsMathMLOperators::AddRefTable();
 
 #ifdef DEBUG
@@ -245,13 +240,11 @@ nsLayoutStatics::Initialize()
   nsCSSParser::Startup();
   nsCSSRuleProcessor::Startup();
 
-#ifdef MOZ_XUL
   rv = nsXULPopupManager::Init();
   if (NS_FAILED(rv)) {
     NS_ERROR("Could not initialize nsXULPopupManager");
     return rv;
   }
-#endif
 
   rv = nsFocusManager::Init();
   if (NS_FAILED(rv)) {
@@ -288,9 +281,7 @@ nsLayoutStatics::Initialize()
 
   HTMLVideoElement::Init();
 
-#ifdef MOZ_XUL
   nsMenuBarListener::InitializeStatics();
-#endif
 
   CacheObserver::Init();
 
@@ -328,9 +319,7 @@ nsLayoutStatics::Shutdown()
 
   nsMessageManagerScriptExecutor::Shutdown();
   nsFocusManager::Shutdown();
-#ifdef MOZ_XUL
   nsXULPopupManager::Shutdown();
-#endif
   DOMStorageObserver::Shutdown();
   txMozillaXSLTProcessor::Shutdown();
   Attr::Shutdown();
@@ -355,11 +344,9 @@ nsLayoutStatics::Shutdown()
   nsStackLayout::Shutdown();
   nsBox::Shutdown();
 
-#ifdef MOZ_XUL
   nsXULContentUtils::Finish();
   nsXULPrototypeCache::ReleaseGlobals();
   nsSprocketLayout::Shutdown();
-#endif
 
   SVGElementFactory::Shutdown();
   nsMathMLOperators::ReleaseTable();