diff --git a/src/modules/udp_transport/source/udp_socket_manager_wrapper.cc b/src/modules/udp_transport/source/udp_socket_manager_wrapper.cc
index 4113c7ea8f..9f1162e233 100644
--- a/src/modules/udp_transport/source/udp_socket_manager_wrapper.cc
+++ b/src/modules/udp_transport/source/udp_socket_manager_wrapper.cc
@@ -13,7 +13,7 @@
 #include <cassert>
 
 #ifdef _WIN32
-#include "fix_interlocked_exchange_pointer_windows.h"
+#include "fix_interlocked_exchange_pointer_win.h"
 #include "udp_socket_manager_windows.h"
 #include "udp_socket2_manager_windows.h"
 #else
diff --git a/src/system_wrappers/interface/fix_interlocked_exchange_pointer_windows.h b/src/system_wrappers/interface/fix_interlocked_exchange_pointer_win.h
similarity index 100%
rename from src/system_wrappers/interface/fix_interlocked_exchange_pointer_windows.h
rename to src/system_wrappers/interface/fix_interlocked_exchange_pointer_win.h
diff --git a/src/system_wrappers/interface/static_instance.h b/src/system_wrappers/interface/static_instance.h
index 5ad81c501a..1e37e7148c 100644
--- a/src/system_wrappers/interface/static_instance.h
+++ b/src/system_wrappers/interface/static_instance.h
@@ -15,7 +15,7 @@
 
 #include "critical_section_wrapper.h"
 #ifdef _WIN32
-#include "fix_interlocked_exchange_pointer_windows.h"
+#include "fix_interlocked_exchange_pointer_win.h"
 #endif
 
 namespace webrtc {
diff --git a/src/system_wrappers/source/atomic32.cc b/src/system_wrappers/source/atomic32.cc
index 3d6849ef25..588dd3e07d 100644
--- a/src/system_wrappers/source/atomic32.cc
+++ b/src/system_wrappers/source/atomic32.cc
@@ -11,7 +11,7 @@
 #include "atomic32_wrapper.h"
 
 #if defined(_WIN32)
-    #include "atomic32_windows.h"
+    #include "atomic32_win.h"
 #elif defined(WEBRTC_LINUX)
     #include "atomic32_linux.h"
 #elif defined(WEBRTC_MAC)
diff --git a/src/system_wrappers/source/atomic32_windows.h b/src/system_wrappers/source/atomic32_win.h
similarity index 100%
rename from src/system_wrappers/source/atomic32_windows.h
rename to src/system_wrappers/source/atomic32_win.h
diff --git a/src/system_wrappers/source/condition_variable.cc b/src/system_wrappers/source/condition_variable.cc
index 184a905337..b37d03784f 100644
--- a/src/system_wrappers/source/condition_variable.cc
+++ b/src/system_wrappers/source/condition_variable.cc
@@ -11,7 +11,7 @@
 #if defined(_WIN32)
    #include <windows.h>
    #include "condition_variable_wrapper.h"
-   #include "condition_variable_windows.h"
+   #include "condition_variable_win.h"
 #elif defined(WEBRTC_LINUX)
    #include <pthread.h>
    #include "condition_variable_wrapper.h"
diff --git a/src/system_wrappers/source/condition_variable_windows.cc b/src/system_wrappers/source/condition_variable_win.cc
similarity index 99%
rename from src/system_wrappers/source/condition_variable_windows.cc
rename to src/system_wrappers/source/condition_variable_win.cc
index 1805d21ba1..f4fae0b75f 100644
--- a/src/system_wrappers/source/condition_variable_windows.cc
+++ b/src/system_wrappers/source/condition_variable_win.cc
@@ -18,9 +18,9 @@
 // TODO (hellner): probably nicer to split up native and generic
 // implementation into two different files
 
-#include "condition_variable_windows.h"
+#include "condition_variable_win.h"
 
-#include "critical_section_windows.h"
+#include "critical_section_win.h"
 #include "trace.h"
 
 namespace webrtc {
diff --git a/src/system_wrappers/source/condition_variable_windows.h b/src/system_wrappers/source/condition_variable_win.h
similarity index 100%
rename from src/system_wrappers/source/condition_variable_windows.h
rename to src/system_wrappers/source/condition_variable_win.h
diff --git a/src/system_wrappers/source/cpu.cc b/src/system_wrappers/source/cpu.cc
index 258390f26d..3df5d183e1 100644
--- a/src/system_wrappers/source/cpu.cc
+++ b/src/system_wrappers/source/cpu.cc
@@ -11,7 +11,7 @@
 #include "cpu_wrapper.h"
 
 #if defined(_WIN32)
-    #include "cpu_windows.h"
+    #include "cpu_win.h"
 #elif defined(WEBRTC_MAC)
     #include "cpu_mac.h"
 #elif defined(WEBRTC_MAC_INTEL)
diff --git a/src/system_wrappers/source/cpu_dummy.cc b/src/system_wrappers/source/cpu_no_op.cc
similarity index 100%
rename from src/system_wrappers/source/cpu_dummy.cc
rename to src/system_wrappers/source/cpu_no_op.cc
diff --git a/src/system_wrappers/source/cpu_windows.cc b/src/system_wrappers/source/cpu_win.cc
similarity index 99%
rename from src/system_wrappers/source/cpu_windows.cc
rename to src/system_wrappers/source/cpu_win.cc
index c8ff36a885..8b21a86b38 100644
--- a/src/system_wrappers/source/cpu_windows.cc
+++ b/src/system_wrappers/source/cpu_win.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "cpu_windows.h"
+#include "cpu_win.h"
 
 #define _WIN32_DCOM
 
diff --git a/src/system_wrappers/source/cpu_windows.h b/src/system_wrappers/source/cpu_win.h
similarity index 100%
rename from src/system_wrappers/source/cpu_windows.h
rename to src/system_wrappers/source/cpu_win.h
diff --git a/src/system_wrappers/source/critical_section.cc b/src/system_wrappers/source/critical_section.cc
index 413f8896b3..d3f3f01615 100644
--- a/src/system_wrappers/source/critical_section.cc
+++ b/src/system_wrappers/source/critical_section.cc
@@ -10,7 +10,7 @@
 
 #if defined(_WIN32)
     #include <windows.h>
-    #include "critical_section_windows.h"
+    #include "critical_section_win.h"
 #else
     #include "critical_section_posix.h"
 #endif
diff --git a/src/system_wrappers/source/critical_section_windows.cc b/src/system_wrappers/source/critical_section_win.cc
similarity index 95%
rename from src/system_wrappers/source/critical_section_windows.cc
rename to src/system_wrappers/source/critical_section_win.cc
index 1ca5751757..bbc66e5c7d 100644
--- a/src/system_wrappers/source/critical_section_windows.cc
+++ b/src/system_wrappers/source/critical_section_win.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "critical_section_windows.h"
+#include "critical_section_win.h"
 
 namespace webrtc {
 CriticalSectionWindows::CriticalSectionWindows()
diff --git a/src/system_wrappers/source/critical_section_windows.h b/src/system_wrappers/source/critical_section_win.h
similarity index 100%
rename from src/system_wrappers/source/critical_section_windows.h
rename to src/system_wrappers/source/critical_section_win.h
diff --git a/src/system_wrappers/source/data_log_dummy.cc b/src/system_wrappers/source/data_log_no_op.cc
similarity index 100%
rename from src/system_wrappers/source/data_log_dummy.cc
rename to src/system_wrappers/source/data_log_no_op.cc
diff --git a/src/system_wrappers/source/event.cc b/src/system_wrappers/source/event.cc
index 49477ea2da..608cd539c4 100644
--- a/src/system_wrappers/source/event.cc
+++ b/src/system_wrappers/source/event.cc
@@ -12,7 +12,7 @@
 
 #if defined(_WIN32)
     #include <windows.h>
-    #include "event_windows.h"
+    #include "event_win.h"
 #elif defined(WEBRTC_MAC_INTEL)
     #include <ApplicationServices/ApplicationServices.h>
     #include <pthread.h>
diff --git a/src/system_wrappers/source/event_windows.cc b/src/system_wrappers/source/event_win.cc
similarity index 98%
rename from src/system_wrappers/source/event_windows.cc
rename to src/system_wrappers/source/event_win.cc
index a0d559277e..4a6dc9de24 100644
--- a/src/system_wrappers/source/event_windows.cc
+++ b/src/system_wrappers/source/event_win.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "event_windows.h"
+#include "event_win.h"
 
 #include "Mmsystem.h"
 
diff --git a/src/system_wrappers/source/event_windows.h b/src/system_wrappers/source/event_win.h
similarity index 100%
rename from src/system_wrappers/source/event_windows.h
rename to src/system_wrappers/source/event_win.h
diff --git a/src/system_wrappers/source/rw_lock.cc b/src/system_wrappers/source/rw_lock.cc
index 156a992258..b308358d8a 100644
--- a/src/system_wrappers/source/rw_lock.cc
+++ b/src/system_wrappers/source/rw_lock.cc
@@ -13,7 +13,7 @@
 #include <assert.h>
 
 #if defined(_WIN32)
-    #include "rw_lock_windows.h"
+    #include "rw_lock_win.h"
 #elif defined(WEBRTC_ANDROID)
     #include <stdlib.h>
     #include "rw_lock_generic.h"
diff --git a/src/system_wrappers/source/rw_lock_windows.cc b/src/system_wrappers/source/rw_lock_win.cc
similarity index 99%
rename from src/system_wrappers/source/rw_lock_windows.cc
rename to src/system_wrappers/source/rw_lock_win.cc
index cf5db57558..82cd0ac04f 100644
--- a/src/system_wrappers/source/rw_lock_windows.cc
+++ b/src/system_wrappers/source/rw_lock_win.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rw_lock_windows.h"
+#include "rw_lock_win.h"
 
 #include "critical_section_wrapper.h"
 #include "condition_variable_wrapper.h"
diff --git a/src/system_wrappers/source/rw_lock_windows.h b/src/system_wrappers/source/rw_lock_win.h
similarity index 100%
rename from src/system_wrappers/source/rw_lock_windows.h
rename to src/system_wrappers/source/rw_lock_win.h
diff --git a/src/system_wrappers/source/thread_windows_set_name.h b/src/system_wrappers/source/set_thread_name_win.h
similarity index 100%
rename from src/system_wrappers/source/thread_windows_set_name.h
rename to src/system_wrappers/source/set_thread_name_win.h
diff --git a/src/system_wrappers/source/system_wrappers.gyp b/src/system_wrappers/source/system_wrappers.gyp
index 3167cb90a8..ce2438ffe9 100644
--- a/src/system_wrappers/source/system_wrappers.gyp
+++ b/src/system_wrappers/source/system_wrappers.gyp
@@ -6,12 +6,8 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-# TODO: Rename files to use *_linux.cpp etc. names, to automatically include relevant files. Remove conditions section.
-
 {
-  'includes': [
-    '../../common_settings.gypi', # Common settings
-  ],
+  'includes': [ '../../build/common.gypi', ],
   'targets': [
     {
       'target_name': 'system_wrappers',
@@ -38,7 +34,7 @@
         '../interface/data_log_impl.h',
         '../interface/event_wrapper.h',
         '../interface/file_wrapper.h',
-        '../interface/fix_interlocked_exchange_pointer_windows.h',
+        '../interface/fix_interlocked_exchange_pointer_win.h',
         '../interface/list_wrapper.h',
         '../interface/map_wrapper.h',
         '../interface/ref_count.h',
@@ -54,108 +50,96 @@
         'atomic32.cc',
         'atomic32_linux.h',
         'atomic32_mac.h',
-        'atomic32_windows.h',
+        'atomic32_win.h',
         'condition_variable.cc',
+        'condition_variable_posix.cc',
         'condition_variable_posix.h',
-        'condition_variable_windows.h',
+        'condition_variable_win.cc',
+        'condition_variable_win.h',
         'cpu.cc',
-        'cpu_dummy.cc',
+        'cpu_no_op.cc',
         'cpu_info.cc',
+        'cpu_linux.cc',
         'cpu_linux.h',
+        'cpu_mac.cc',
         'cpu_mac.h',
-        'cpu_windows.h',
+        'cpu_win.cc',
+        'cpu_win.h',
         'cpu_features.cc',
         'critical_section.cc',
+        'critical_section_posix.cc',
         'critical_section_posix.h',
-        'critical_section_windows.h',
+        'critical_section_win.cc',
+        'critical_section_win.h',
+        'data_log.cc',
         'data_log_c.cc',
+        'data_log_no_op.cc',
         'event.cc',
+        'event_posix.cc',
         'event_posix.h',
-        'event_windows.h',
+        'event_win.cc',
+        'event_win.h',
         'file_impl.cc',
         'file_impl.h',
         'list_no_stl.cc',
         'map.cc',
         'rw_lock.cc',
+        'rw_lock_posix.cc',
         'rw_lock_posix.h',
-        'rw_lock_windows.h',
+        'rw_lock_win.cc',
+        'rw_lock_win.h',
         'sort.cc',
         'thread.cc',
+        'thread_posix.cc',
         'thread_posix.h',
-        'thread_windows.h',
-        'thread_windows_set_name.h',
+        'thread_win.cc',
+        'thread_win.h',
+        'set_thread_name_win.h',
         'trace_impl.cc',
-        'trace_impl_no_op.cc',
         'trace_impl.h',
+        'trace_impl_no_op.cc',
+        'trace_posix.cc',
         'trace_posix.h',
-        'trace_windows.h',
+        'trace_win.cc',
+        'trace_win.h',
       ],
       'conditions': [
-        ['os_posix==1', {
-          'sources': [
-            'condition_variable_posix.cc',
-            'critical_section_posix.cc',
-            'event_posix.cc',
-            'rw_lock_posix.cc',
-            'thread_posix.cc',
-            'trace_posix.cc',
-          ],
-        }],
         ['enable_data_logging==1', {
-          'sources': [
-            'data_log.cc',
-          ],
+          'sources!': [ 'data_log_no_op.cc', ],
         },{
-          'sources': [
-            'data_log_dummy.cc',
-          ],
+          'sources!': [ 'data_log.cc', ],
         },],
         ['OS=="linux"', {
-          'sources': [
-            'cpu_linux.cc',
-          ],
           'link_settings': {
-            'libraries': [
-              '-lrt',
-            ],
+            'libraries': [ '-lrt', ],
           },
         }],
         ['OS=="mac"', {
-          'sources': [
-            'cpu_mac.cc',
-          ],
           'link_settings': {
-            'libraries': [
-              '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
-            ],
+            'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', ],
           },
         }],
         ['OS=="win"', {
-          'sources': [
-            'condition_variable_windows.cc',
-            'cpu_windows.cc',
-            'critical_section_windows.cc',
-            'event_windows.cc',
-            'rw_lock_windows.cc',
-            'thread_windows.cc',
-            'trace_windows.cc',
-          ],
           'link_settings': {
-            'libraries': [
-              '-lwinmm.lib',
-            ],
+            'libraries': [ '-lwinmm.lib', ],
           },
         }],
         ['build_with_chromium==1', {
           'sources!': [
             'cpu.cc',
+            'cpu_linux.h',
+            'cpu_mac.h',
+            'cpu_win.h',
             'trace_impl.cc',
+            'trace_impl.h',
             'trace_posix.cc',
-            'trace_windows.cc',
+            'trace_posix.h',
+            'trace_win.cc',
+            'trace_win.h',
           ],
         }, {
           'sources!': [
-            'cpu_dummy.cc',
+            'cpu_no_op.cc',
             'trace_impl_no_op.cc',
           ],
         }]
@@ -177,15 +161,17 @@
             'cpu_wrapper_unittest.cc',
             'list_unittest.cc',
             'map_unittest.cc',
+            'data_log_unittest.cc',
+            'data_log_unittest_disabled.cc',
             'data_log_helpers_unittest.cc',
             'data_log_c_helpers_unittest.c',
             'data_log_c_helpers_unittest.h',
           ],
           'conditions': [
             ['enable_data_logging==1', {
-              'sources': [ 'data_log_unittest.cc', ],
+              'sources!': [ 'data_log_unittest_disabled.cc', ],
             }, {
-              'sources': [ 'data_log_unittest_disabled.cc', ],
+              'sources!': [ 'data_log_unittest.cc', ],
             }],
           ],
         },
diff --git a/src/system_wrappers/source/thread.cc b/src/system_wrappers/source/thread.cc
index ba7323d369..32dcc63fb6 100644
--- a/src/system_wrappers/source/thread.cc
+++ b/src/system_wrappers/source/thread.cc
@@ -11,7 +11,7 @@
 #include "thread_wrapper.h"
 
 #if defined(_WIN32)
-    #include "thread_windows.h"
+    #include "thread_win.h"
 #else
     #include "thread_posix.h"
 #endif
diff --git a/src/system_wrappers/source/thread_windows.cc b/src/system_wrappers/source/thread_win.cc
similarity index 98%
rename from src/system_wrappers/source/thread_windows.cc
rename to src/system_wrappers/source/thread_win.cc
index c4a3d71aa0..705ca261bc 100644
--- a/src/system_wrappers/source/thread_windows.cc
+++ b/src/system_wrappers/source/thread_win.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "thread_windows.h"
+#include "thread_win.h"
 
 #include <assert.h>
 #include <process.h>
 #include <stdio.h>
 #include <windows.h>
 
-#include "thread_windows_set_name.h"
+#include "set_thread_name_win.h"
 #include "trace.h"
 
 #if defined(_WIN32)
diff --git a/src/system_wrappers/source/thread_windows.h b/src/system_wrappers/source/thread_win.h
similarity index 100%
rename from src/system_wrappers/source/thread_windows.h
rename to src/system_wrappers/source/thread_win.h
diff --git a/src/system_wrappers/source/trace_impl.cc b/src/system_wrappers/source/trace_impl.cc
index 50e69f3418..46b443c3bb 100644
--- a/src/system_wrappers/source/trace_impl.cc
+++ b/src/system_wrappers/source/trace_impl.cc
@@ -14,7 +14,7 @@
 #include <string.h> // memset
 
 #ifdef _WIN32
-#include "trace_windows.h"
+#include "trace_win.h"
 #else
 #include <stdio.h>
 #include <time.h>
diff --git a/src/system_wrappers/source/trace_windows.cc b/src/system_wrappers/source/trace_win.cc
similarity index 99%
rename from src/system_wrappers/source/trace_windows.cc
rename to src/system_wrappers/source/trace_win.cc
index 404ef851ad..ea8e9ff5e1 100644
--- a/src/system_wrappers/source/trace_windows.cc
+++ b/src/system_wrappers/source/trace_win.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "trace_windows.h"
+#include "trace_win.h"
 
 #include <cassert>
 #include <stdarg.h>
diff --git a/src/system_wrappers/source/trace_windows.h b/src/system_wrappers/source/trace_win.h
similarity index 100%
rename from src/system_wrappers/source/trace_windows.h
rename to src/system_wrappers/source/trace_win.h