diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi
index f0c0d366a..bca05be95 100644
--- a/webrtc/modules/video_capture/video_capture.gypi
+++ b/webrtc/modules/video_capture/video_capture.gypi
@@ -29,9 +29,9 @@
         'include/video_capture_factory.h',
         'video_capture_config.h',
         'video_capture_delay.h',
-        'video_capture_impl.h',
         'video_capture_factory.cc',
         'video_capture_impl.cc',
+        'video_capture_impl.h',
       ],
       'conditions': [
         ['include_internal_video_capture==0', {
@@ -46,25 +46,25 @@
                 'linux',
               ],
               'sources': [
-                'linux/device_info_linux.h',
-                'linux/video_capture_linux.h',
                 'linux/device_info_linux.cc',
+                'linux/device_info_linux.h',
                 'linux/video_capture_linux.cc',
+                'linux/video_capture_linux.h',
               ],
             }],  # linux
             ['OS=="mac"', {
               'sources': [
-                'mac/qtkit/video_capture_recursive_lock.h',
                 'mac/qtkit/video_capture_qtkit.h',
-                'mac/qtkit/video_capture_qtkit_info.h',
-                'mac/qtkit/video_capture_qtkit_info_objc.h',
-                'mac/qtkit/video_capture_qtkit_objc.h',
-                'mac/qtkit/video_capture_qtkit_utility.h',
                 'mac/qtkit/video_capture_qtkit.mm',
-                'mac/qtkit/video_capture_qtkit_objc.mm',
-                'mac/qtkit/video_capture_recursive_lock.mm',
+                'mac/qtkit/video_capture_qtkit_info.h',
                 'mac/qtkit/video_capture_qtkit_info.mm',
+                'mac/qtkit/video_capture_qtkit_info_objc.h',
                 'mac/qtkit/video_capture_qtkit_info_objc.mm',
+                'mac/qtkit/video_capture_qtkit_objc.h',
+                'mac/qtkit/video_capture_qtkit_objc.mm',
+                'mac/qtkit/video_capture_qtkit_utility.h',
+                'mac/qtkit/video_capture_recursive_lock.h',
+                'mac/qtkit/video_capture_recursive_lock.mm',
                 'mac/video_capture_mac.mm',
               ],
               'include_dirs': [
@@ -86,16 +86,16 @@
                 'windows',
               ],
               'sources': [
-                'windows/help_functions_windows.h',
-                'windows/sink_filter_windows.h',
-                'windows/video_capture_windows.h',
-                'windows/device_info_windows.h',
                 'windows/capture_delay_values_windows.h',
-                'windows/help_functions_windows.cc',
-                'windows/sink_filter_windows.cc',
-                'windows/video_capture_windows.cc',
                 'windows/device_info_windows.cc',
+                'windows/device_info_windows.h',
+                'windows/help_functions_windows.cc',
+                'windows/help_functions_windows.h',
+                'windows/sink_filter_windows.cc',
+                'windows/sink_filter_windows.h',
                 'windows/video_capture_factory_windows.cc',
+                'windows/video_capture_windows.cc',
+                'windows/video_capture_windows.h',
               ],
               'link_settings': {
                 'libraries': [