--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -1,74 +1,76 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-EXPORTS.mozilla.dom += [
-    'Gamepad.h',
-    'GamepadButton.h',
-    'GamepadManager.h',
-    'GamepadMonitoring.h',
-    'GamepadPlatformService.h',
-    'GamepadServiceTest.h',
-    'ipc/GamepadEventChannelChild.h',
-    'ipc/GamepadEventChannelParent.h',
-    'ipc/GamepadTestChannelChild.h',
-    'ipc/GamepadTestChannelParent.h'
-    ]
-
-UNIFIED_SOURCES = [
-    'Gamepad.cpp',
-    'GamepadButton.cpp',
-    'GamepadManager.cpp',
-    'GamepadMonitoring.cpp',
-    'GamepadPlatformService.cpp',
-    'GamepadServiceTest.cpp',
-    'ipc/GamepadEventChannelChild.cpp',
-    'ipc/GamepadEventChannelParent.cpp',
-    'ipc/GamepadTestChannelChild.cpp',
-    'ipc/GamepadTestChannelParent.cpp'
-    ]
-
-if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
-    UNIFIED_SOURCES += [
-        'fallback/FallbackGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
-    UNIFIED_SOURCES += [
-        'cocoa/CocoaGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
-    UNIFIED_SOURCES += [
-        'windows/WindowsGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux':
-    UNIFIED_SOURCES += [
-        'linux/LinuxGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'android':
-    UNIFIED_SOURCES += [
-        'android/AndroidGamepad.cpp'
-    ]
-
-LOCAL_INCLUDES += [
-    'ipc',
-]
 
 IPDL_SOURCES += [
     'ipc/GamepadEventTypes.ipdlh',
     'ipc/PGamepadEventChannel.ipdl',
     'ipc/PGamepadTestChannel.ipdl'
 ]
 
-include('/ipc/chromium/chromium-config.mozbuild')
+if CONFIG['MOZ_GAMEPAD']:
+  EXPORTS.mozilla.dom += [
+      'Gamepad.h',
+      'GamepadButton.h',
+      'GamepadManager.h',
+      'GamepadMonitoring.h',
+      'GamepadPlatformService.h',
+      'GamepadServiceTest.h',
+      'ipc/GamepadEventChannelChild.h',
+      'ipc/GamepadEventChannelParent.h',
+      'ipc/GamepadTestChannelChild.h',
+      'ipc/GamepadTestChannelParent.h'
+      ]
+
+  UNIFIED_SOURCES = [
+      'Gamepad.cpp',
+      'GamepadButton.cpp',
+      'GamepadManager.cpp',
+      'GamepadMonitoring.cpp',
+      'GamepadPlatformService.cpp',
+      'GamepadServiceTest.cpp',
+      'ipc/GamepadEventChannelChild.cpp',
+      'ipc/GamepadEventChannelParent.cpp',
+      'ipc/GamepadTestChannelChild.cpp',
+      'ipc/GamepadTestChannelParent.cpp'
+      ]
 
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/dom/base',
-]
+  if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
+      UNIFIED_SOURCES += [
+          'fallback/FallbackGamepad.cpp'
+      ]
+  elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
+      UNIFIED_SOURCES += [
+          'cocoa/CocoaGamepad.cpp'
+      ]
+  elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
+      UNIFIED_SOURCES += [
+          'windows/WindowsGamepad.cpp'
+      ]
+  elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux':
+      UNIFIED_SOURCES += [
+          'linux/LinuxGamepad.cpp'
+      ]
+  elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'android':
+      UNIFIED_SOURCES += [
+          'android/AndroidGamepad.cpp'
+      ]
 
-CFLAGS += CONFIG['GLIB_CFLAGS']
-CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
-CXXFLAGS += CONFIG['GLIB_CFLAGS']
-CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
+  LOCAL_INCLUDES += [
+      'ipc',
+  ]
+
+  include('/ipc/chromium/chromium-config.mozbuild')
+
+  FINAL_LIBRARY = 'xul'
+  LOCAL_INCLUDES += [
+      '/dom/base',
+  ]
+
+  CFLAGS += CONFIG['GLIB_CFLAGS']
+  CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
+  CXXFLAGS += CONFIG['GLIB_CFLAGS']
+  CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']

--- a/dom/moz.build
+++ b/dom/moz.build
@@ -56,16 +56,17 @@ DIRS += [
     'devicestorage',
     'encoding',
     'events',
     'fetch',
     'filehandle',
     'filesystem',
     'flyweb',
     'fmradio',
+    'gamepad',
     'geolocation',
     'html',
     'icc',
     'inputport',
     'json',
     'jsurl',
     'asmjscache',
     'mathml',
@@ -129,19 +130,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
 if CONFIG['MOZ_B2G_RIL']:
     DIRS += [
         'wappush',
     ]
 
 if CONFIG['MOZ_PAY']:
     DIRS += ['payment']
 
-if CONFIG['MOZ_GAMEPAD']:
-    DIRS += ['gamepad']
-
 if CONFIG['MOZ_NFC']:
     DIRS += ['nfc']
 
 if CONFIG['MOZ_SIMPLEPUSH']:
     DIRS += ['simplepush']
 else:
     DIRS += ['push']