diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc
index 93afed487f..aa2a60eb90 100644
--- a/brightray/browser/browser_main_parts.cc
+++ b/brightray/browser/browser_main_parts.cc
@@ -24,6 +24,7 @@
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
+#include "ui/wm/core/wm_state.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
@@ -40,7 +41,6 @@
 #include "ui/base/x/x11_util.h"
 #include "ui/base/x/x11_util_internal.h"
 #include "ui/views/linux_ui/linux_ui.h"
-#include "ui/wm/core/wm_state.h"
 #endif
 
 #if defined(OS_WIN)
@@ -178,6 +178,9 @@ void BrowserMainParts::ToolkitInitialized() {
 
 #if defined(USE_AURA) && defined(USE_X11)
   views::LinuxUI::instance()->Initialize();
+#endif
+
+#if defined(USE_AURA)
   wm_state_.reset(new wm::WMState);
 #endif
 
diff --git a/brightray/browser/browser_main_parts.h b/brightray/browser/browser_main_parts.h
index 209e95d87b..ab9b086d78 100644
--- a/brightray/browser/browser_main_parts.h
+++ b/brightray/browser/browser_main_parts.h
@@ -15,7 +15,7 @@ class ViewsDelegate;
 }
 #endif
 
-#if defined(USE_AURA) && defined(USE_X11)
+#if defined(USE_AURA)
 namespace wm {
 class WMState;
 }
@@ -48,7 +48,7 @@ class BrowserMainParts : public content::BrowserMainParts {
   std::unique_ptr<ViewsDelegate> views_delegate_;
 #endif
 
-#if defined(USE_AURA) && defined(USE_X11)
+#if defined(USE_AURA)
   std::unique_ptr<wm::WMState> wm_state_;
 #endif