--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -6,41 +6,41 @@
 
 
 IPDL_SOURCES += [
     'ipc/GamepadEventTypes.ipdlh',
     'ipc/PGamepadEventChannel.ipdl',
     'ipc/PGamepadTestChannel.ipdl'
 ]
 
+EXPORTS.mozilla.dom += [
+    'GamepadServiceTest.h',
+    'ipc/GamepadEventChannelChild.h',
+    'ipc/GamepadEventChannelParent.h',
+    'ipc/GamepadTestChannelChild.h',
+    'ipc/GamepadTestChannelParent.h'
+    ]
+
+
 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'
+      'GamepadPlatformService.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'
+      'GamepadServiceTest.cpp'
       ]
 
   if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
       UNIFIED_SOURCES += [
           'fallback/FallbackGamepad.cpp'
       ]
   elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
       UNIFIED_SOURCES += [