--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -86,47 +86,51 @@ CPPSRCS += \
   LinuxPower.cpp \
   GonkSensor.cpp \
   UeventPoller.cpp \
   GonkSwitch.cpp \
   $(NULL)
 else ifeq (Linux,$(OS_TARGET))
 CPPSRCS += \
   LinuxPower.cpp \
+  FallbackScreenConfiguration.cpp \
   FallbackSensor.cpp \
   FallbackVibration.cpp \
   $(NULL)
 ifdef MOZ_ENABLE_DBUS
 CPPSRCS += UPowerClient.cpp
 else
 CPPSRCS += FallbackBattery.cpp
 endif
 else ifeq (WINNT,$(OS_TARGET))
 CPPSRCS += \
   WindowsBattery.cpp \
   WindowsSensor.cpp \
   FallbackVibration.cpp \
+  FallbackScreenConfiguration.cpp \
   FallbackPower.cpp \
   $(NULL)
 else ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += \
   FallbackBattery.cpp \
   FallbackVibration.cpp \
   FallbackPower.cpp \
+  FallbackScreenConfiguration.cpp \
   $(NULL)
 CMMSRCS += \
   CocoaSensor.mm \
   smslib.mm \
   $(NULL)
 else
 CPPSRCS += \
   FallbackBattery.cpp \
   FallbackSensor.cpp \
   FallbackVibration.cpp \
   FallbackPower.cpp \
+  FallbackScreenConfiguration.cpp \
   $(NULL)
 endif
 
 # Fallbacks for backends implemented on Gonk only.
 ifneq (gonk,$(MOZ_WIDGET_TOOLKIT)) #{
 CPPSRCS += \
   FallbackLights.cpp  \
   FallbackTime.cpp \
@@ -136,21 +140,16 @@ CPPSRCS += \
   $(NULL)
 endif #}
 
 # Fallbacks for backends implemented on Android only.
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += FallbackNetwork.cpp
 endif
 
-# Fallbacks for backends implemented on Gonk and Android only.
-ifeq (,$(filter android gonk,$(MOZ_WIDGET_TOOLKIT)))
-CPPSRCS += FallbackScreenOrientation.cpp
-endif
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS          += $(MOZ_DBUS_GLIB_CFLAGS)
 CXXFLAGS        += $(MOZ_DBUS_GLIB_CFLAGS)
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))

rename from hal/fallback/FallbackScreenOrientation.cpp
rename to hal/fallback/FallbackScreenConfiguration.cpp
--- a/hal/fallback/FallbackScreenOrientation.cpp
+++ b/hal/fallback/FallbackScreenConfiguration.cpp
@@ -35,18 +35,18 @@ GetCurrentScreenConfiguration(hal::Scree
   dom::ScreenOrientation orientation;
   nsCOMPtr<nsIScreen> screen;
 
   screenMgr->GetPrimaryScreen(getter_AddRefs(screen));
   screen->GetRect(&rect.x, &rect.y, &rect.width, &rect.height);
   screen->GetColorDepth(&colorDepth);
   screen->GetPixelDepth(&pixelDepth);
   orientation = rect.width >= rect.height
-      ? dom::eScreenOrientation_LandscapePrimary
-      : dom::eScreenOrientation_PortraitPrimary;
+                ? dom::eScreenOrientation_LandscapePrimary
+                : dom::eScreenOrientation_PortraitPrimary;
 
   *aScreenConfiguration =
       hal::ScreenConfiguration(rect, orientation, colorDepth, pixelDepth);
 }
 
 bool
 LockScreenOrientation(const dom::ScreenOrientation& aOrientation)
 {

--- a/widget/android/AndroidBridge.h
+++ b/widget/android/AndroidBridge.h
@@ -373,20 +373,20 @@ public:
     jobject CreateSurface();
     void DestroySurface(jobject surface);
     void ShowSurface(jobject surface, const gfxRect& aRect, bool aInverted, bool aBlend);
     void HideSurface(jobject surface);
 
     void AddPluginView(jobject view, const gfxRect& rect);
     void RemovePluginView(jobject view);
 
-    // This method doesn't take a ScreenOrientation because it's an enum and
-    // that would require including the header which requires include IPC
-    // headers which requires including basictypes.h which requires a lot of
-    // changes...
+    // These methods don't use a ScreenOrientation because it's an
+    // enum and that would require including the header which requires
+    // include IPC headers which requires including basictypes.h which
+    // requires a lot of changes...
     uint32_t GetScreenOrientation();
     void EnableScreenOrientationNotifications();
     void DisableScreenOrientationNotifications();
     void LockScreenOrientation(uint32_t aOrientation);
     void UnlockScreenOrientation();
 
     void PumpMessageLoop();