diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
index f3202dfee3..08f2fac392 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -55,37 +55,6 @@ source_set("audio_device") {
   }
   if (rtc_include_internal_audio_device) {
     sources += [
-      "linux/alsasymboltable_linux.cc",
-      "linux/alsasymboltable_linux.h",
-      "linux/audio_device_alsa_linux.cc",
-      "linux/audio_device_alsa_linux.h",
-      "linux/audio_device_utility_linux.cc",
-      "linux/audio_device_utility_linux.h",
-      "linux/audio_mixer_manager_alsa_linux.cc",
-      "linux/audio_mixer_manager_alsa_linux.h",
-      "linux/latebindingsymboltable_linux.cc",
-      "linux/latebindingsymboltable_linux.h",
-      "ios/audio_device_ios.mm",
-      "ios/audio_device_ios.h",
-      "ios/audio_device_utility_ios.cc",
-      "ios/audio_device_utility_ios.h",
-      "mac/audio_device_mac.cc",
-      "mac/audio_device_mac.h",
-      "mac/audio_device_utility_mac.cc",
-      "mac/audio_device_utility_mac.h",
-      "mac/audio_mixer_manager_mac.cc",
-      "mac/audio_mixer_manager_mac.h",
-      "mac/portaudio/pa_memorybarrier.h",
-      "mac/portaudio/pa_ringbuffer.c",
-      "mac/portaudio/pa_ringbuffer.h",
-      "win/audio_device_core_win.cc",
-      "win/audio_device_core_win.h",
-      "win/audio_device_wave_win.cc",
-      "win/audio_device_wave_win.h",
-      "win/audio_device_utility_win.cc",
-      "win/audio_device_utility_win.h",
-      "win/audio_mixer_manager_win.cc",
-      "win/audio_mixer_manager_win.h",
       "android/audio_device_template.h",
       "android/audio_device_utility_android.cc",
       "android/audio_device_utility_android.h",
@@ -101,6 +70,37 @@ source_set("audio_device") {
       "android/opensles_common.h",
       "android/opensles_player.cc",
       "android/opensles_player.h",
+      "ios/audio_device_ios.h",
+      "ios/audio_device_ios.mm",
+      "ios/audio_device_utility_ios.cc",
+      "ios/audio_device_utility_ios.h",
+      "linux/alsasymboltable_linux.cc",
+      "linux/alsasymboltable_linux.h",
+      "linux/audio_device_alsa_linux.cc",
+      "linux/audio_device_alsa_linux.h",
+      "linux/audio_device_utility_linux.cc",
+      "linux/audio_device_utility_linux.h",
+      "linux/audio_mixer_manager_alsa_linux.cc",
+      "linux/audio_mixer_manager_alsa_linux.h",
+      "linux/latebindingsymboltable_linux.cc",
+      "linux/latebindingsymboltable_linux.h",
+      "mac/audio_device_mac.cc",
+      "mac/audio_device_mac.h",
+      "mac/audio_device_utility_mac.cc",
+      "mac/audio_device_utility_mac.h",
+      "mac/audio_mixer_manager_mac.cc",
+      "mac/audio_mixer_manager_mac.h",
+      "mac/portaudio/pa_memorybarrier.h",
+      "mac/portaudio/pa_ringbuffer.c",
+      "mac/portaudio/pa_ringbuffer.h",
+      "win/audio_device_core_win.cc",
+      "win/audio_device_core_win.h",
+      "win/audio_device_utility_win.cc",
+      "win/audio_device_utility_win.h",
+      "win/audio_device_wave_win.cc",
+      "win/audio_device_wave_win.h",
+      "win/audio_mixer_manager_win.cc",
+      "win/audio_mixer_manager_win.h",
     ]
     if (is_linux) {
       defines += [ "LINUX_ALSA" ]
diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi
index d8e45efae2..22b779d81c 100644
--- a/webrtc/modules/audio_device/audio_device.gypi
+++ b/webrtc/modules/audio_device/audio_device.gypi
@@ -90,6 +90,27 @@
         }],
         ['include_internal_audio_device==1', {
           'sources': [
+            'android/audio_device_template.h',
+            'android/audio_device_utility_android.cc',
+            'android/audio_device_utility_android.h',
+            'android/audio_manager.cc',
+            'android/audio_manager.h',
+            'android/audio_record_jni.cc',
+            'android/audio_record_jni.h',
+            'android/audio_track_jni.cc',
+            'android/audio_track_jni.h',
+            'android/build_info.cc',
+            'android/build_info.h',
+            'android/fine_audio_buffer.cc',
+            'android/fine_audio_buffer.h',
+            'android/opensles_common.cc',
+            'android/opensles_common.h',
+            'android/opensles_player.cc',
+            'android/opensles_player.h',
+            'ios/audio_device_ios.h',
+            'ios/audio_device_ios.mm',
+            'ios/audio_device_utility_ios.cc',
+            'ios/audio_device_utility_ios.h',
             'linux/alsasymboltable_linux.cc',
             'linux/alsasymboltable_linux.h',
             'linux/audio_device_alsa_linux.cc',
@@ -100,10 +121,6 @@
             'linux/audio_mixer_manager_alsa_linux.h',
             'linux/latebindingsymboltable_linux.cc',
             'linux/latebindingsymboltable_linux.h',
-            'ios/audio_device_ios.mm',
-            'ios/audio_device_ios.h',
-            'ios/audio_device_utility_ios.cc',
-            'ios/audio_device_utility_ios.h',
             'mac/audio_device_mac.cc',
             'mac/audio_device_mac.h',
             'mac/audio_device_utility_mac.cc',
@@ -115,29 +132,12 @@
             'mac/portaudio/pa_ringbuffer.h',
             'win/audio_device_core_win.cc',
             'win/audio_device_core_win.h',
-            'win/audio_device_wave_win.cc',
-            'win/audio_device_wave_win.h',
             'win/audio_device_utility_win.cc',
             'win/audio_device_utility_win.h',
+            'win/audio_device_wave_win.cc',
+            'win/audio_device_wave_win.h',
             'win/audio_mixer_manager_win.cc',
             'win/audio_mixer_manager_win.h',
-            'android/build_info.cc',
-            'android/build_info.h',
-            'android/audio_device_template.h',
-            'android/audio_device_utility_android.cc',
-            'android/audio_device_utility_android.h',
-            'android/audio_manager.cc',
-            'android/audio_manager.h',
-            'android/audio_record_jni.cc',
-            'android/audio_record_jni.h',
-            'android/audio_track_jni.cc',
-            'android/audio_track_jni.h',
-            'android/fine_audio_buffer.cc',
-            'android/fine_audio_buffer.h',
-            'android/opensles_common.cc',
-            'android/opensles_common.h',
-            'android/opensles_player.cc',
-            'android/opensles_player.h',
           ],
           'conditions': [
             ['OS=="android"', {