Switch to standard integer types in media/, take 2.

This uses an automated script, so it'll catch things the first pass, done by hand, missed.

BUG=138542
TBR=dalecurtis@chromium.org
NOPRESUBMIT=true

Review URL: https://codereview.chromium.org/1542013004

Cr-Commit-Position: refs/heads/master@{#366712}

96 files changed, 194 insertions, 2 deletions

diff --git a/media/audio/alsa/alsa_input.cc b/media/audio/alsa/alsa_input.cc
index a6b4cc3..658dd19 100644
--- a/media/audio/alsa/alsa_input.cc
+++ b/media/audio/alsa/alsa_input.cc
@@ -4,8 +4,11 @@
 
 #include "media/audio/alsa/alsa_input.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "media/audio/alsa/alsa_output.h"
 #include "media/audio/alsa/alsa_util.h"
diff --git a/media/audio/alsa/alsa_input.h b/media/audio/alsa/alsa_input.h
index ed91446..f0b6d69 100644
--- a/media/audio/alsa/alsa_input.h
+++ b/media/audio/alsa/alsa_input.h
@@ -6,6 +6,7 @@
 #define MEDIA_AUDIO_ALSA_ALSA_INPUT_H_
 
 #include <alsa/asoundlib.h>
+#include <stdint.h>
 
 #include <string>
 
diff --git a/media/audio/alsa/alsa_output.cc b/media/audio/alsa/alsa_output.cc
index 604f2d8..4ab571e 100644
--- a/media/audio/alsa/alsa_output.cc
+++ b/media/audio/alsa/alsa_output.cc
@@ -34,6 +34,8 @@
 
 #include "media/audio/alsa/alsa_output.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/bind.h"
diff --git a/media/audio/alsa/alsa_output.h b/media/audio/alsa/alsa_output.h
index 958f733..e67253f 100644
--- a/media/audio/alsa/alsa_output.h
+++ b/media/audio/alsa/alsa_output.h
@@ -22,6 +22,7 @@
 #define MEDIA_AUDIO_ALSA_ALSA_OUTPUT_H_
 
 #include <alsa/asoundlib.h>
+#include <stdint.h>
 
 #include <string>
 
diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc
index 59cd889..1b13863 100644
--- a/media/audio/alsa/alsa_output_unittest.cc
+++ b/media/audio/alsa/alsa_output_unittest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "media/audio/alsa/alsa_output.h"
 #include "media/audio/alsa/alsa_wrapper.h"
diff --git a/media/audio/alsa/alsa_util.cc b/media/audio/alsa/alsa_util.cc
index f556dc0..76bdfbf 100644
--- a/media/audio/alsa/alsa_util.cc
+++ b/media/audio/alsa/alsa_util.cc
@@ -4,6 +4,8 @@
 
 #include "media/audio/alsa/alsa_util.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "media/audio/alsa/alsa_wrapper.h"
 
diff --git a/media/audio/alsa/audio_manager_alsa.cc b/media/audio/alsa/audio_manager_alsa.cc
index 29b6cb2..b32b4d7 100644
--- a/media/audio/alsa/audio_manager_alsa.cc
+++ b/media/audio/alsa/audio_manager_alsa.cc
@@ -4,10 +4,13 @@
 
 #include "media/audio/alsa/audio_manager_alsa.h"
 
+#include <stddef.h>
+
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/nix/xdg_util.h"
 #include "base/process/launch.h"
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
index 1946219..a918a10 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include "base/android/build_info.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
diff --git a/media/audio/android/audio_record_input.h b/media/audio/android/audio_record_input.h
index 576bf08..055b3fd 100644
--- a/media/audio/android/audio_record_input.h
+++ b/media/audio/android/audio_record_input.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_ANDROID_AUDIO_RECORD_INPUT_H_
 #define MEDIA_AUDIO_ANDROID_AUDIO_RECORD_INPUT_H_
 
+#include <stdint.h>
+
 #include "base/android/jni_android.h"
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
diff --git a/media/audio/android/opensles_input.cc b/media/audio/android/opensles_input.cc
index 6a37cbfc..afbe02e 100644
--- a/media/audio/android/opensles_input.cc
+++ b/media/audio/android/opensles_input.cc
@@ -5,6 +5,7 @@
 #include "media/audio/android/opensles_input.h"
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "media/audio/android/audio_manager_android.h"
 #include "media/base/audio_bus.h"
diff --git a/media/audio/android/opensles_input.h b/media/audio/android/opensles_input.h
index ecb4ec9..b7b7e31 100644
--- a/media/audio/android/opensles_input.h
+++ b/media/audio/android/opensles_input.h
@@ -7,6 +7,7 @@
 
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>
+#include <stdint.h>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/media/audio/android/opensles_output.cc b/media/audio/android/opensles_output.cc
index 2a89f945..005b0e7 100644
--- a/media/audio/android/opensles_output.cc
+++ b/media/audio/android/opensles_output.cc
@@ -5,6 +5,7 @@
 #include "media/audio/android/opensles_output.h"
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "media/audio/android/audio_manager_android.h"
 
diff --git a/media/audio/android/opensles_output.h b/media/audio/android/opensles_output.h
index 9571575..9a6c968 100644
--- a/media/audio/android/opensles_output.h
+++ b/media/audio/android/opensles_output.h
@@ -7,6 +7,8 @@
 
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/media/audio/android/opensles_wrapper.cc b/media/audio/android/opensles_wrapper.cc
index c2317b3..3bc3caf 100644
--- a/media/audio/android/opensles_wrapper.cc
+++ b/media/audio/android/opensles_wrapper.cc
@@ -14,6 +14,8 @@
 #include <SLES/OpenSLES_Android.h>
 #undef const
 
+#include <stddef.h>
+
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/native_library.h"
diff --git a/media/audio/audio_device_thread.cc b/media/audio/audio_device_thread.cc
index 81dab87..f4e00d4 100644
--- a/media/audio/audio_device_thread.cc
+++ b/media/audio/audio_device_thread.cc
@@ -4,6 +4,7 @@
 
 #include "media/audio/audio_device_thread.h"
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -11,6 +12,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/aligned_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/numerics/safe_conversions.h"
diff --git a/media/audio/audio_device_thread.h b/media/audio/audio_device_thread.h
index b910c71..7ec9d6e 100644
--- a/media/audio/audio_device_thread.h
+++ b/media/audio/audio_device_thread.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_
 #define MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_
 
+#include <stdint.h>
+
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h
index fb722a4..28bc4b8 100644
--- a/media/audio/audio_input_controller.h
+++ b/media/audio/audio_input_controller.h
@@ -5,7 +5,11 @@
 #ifndef MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
+
 #include "base/atomicops.h"
 #include "base/callback.h"
 #include "base/files/file.h"
@@ -16,6 +20,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/timer/timer.h"
+#include "build/build_config.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_parameters.h"
diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc
index cd17ca6..6a35d87 100644
--- a/media/audio/audio_input_controller_unittest.cc
+++ b/media/audio/audio_input_controller_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc
index 91f1c68..ae64f34 100644
--- a/media/audio/audio_input_device.cc
+++ b/media/audio/audio_input_device.cc
@@ -4,11 +4,15 @@
 
 #include "media/audio/audio_input_device.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/base/audio_bus.h"
 
diff --git a/media/audio/audio_input_ipc.h b/media/audio/audio_input_ipc.h
index cf8da50..5a0f7e0 100644
--- a/media/audio/audio_input_ipc.h
+++ b/media/audio/audio_input_ipc.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_AUDIO_INPUT_IPC_H_
 #define MEDIA_AUDIO_AUDIO_INPUT_IPC_H_
 
+#include <stdint.h>
+
 #include "base/memory/shared_memory.h"
 #include "base/sync_socket.h"
 #include "media/audio/audio_parameters.h"
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc
index cfa7084..abb47ce 100644
--- a/media/audio/audio_input_unittest.cc
+++ b/media/audio/audio_input_unittest.cc
@@ -2,13 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/environment.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
+#include "build/build_config.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_unittest_util.h"
diff --git a/media/audio/audio_io.h b/media/audio/audio_io.h
index b9665f8..66ff3f2 100644
--- a/media/audio/audio_io.h
+++ b/media/audio/audio_io.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_AUDIO_IO_H_
 #define MEDIA_AUDIO_AUDIO_IO_H_
 
+#include <stdint.h>
+
 #include "media/base/audio_bus.h"
 
 // Low-level audio output support. To make sound there are 3 objects involved:
diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc
index 9598697..010b349 100644
--- a/media/audio/audio_low_latency_input_output_unittest.cc
+++ b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -2,8 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/environment.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/synchronization/lock.h"
diff --git a/media/audio/audio_manager.cc b/media/audio/audio_manager.cc
index 3602240..5074bbfa 100644
--- a/media/audio/audio_manager.cc
+++ b/media/audio/audio_manager.cc
@@ -4,6 +4,8 @@
 
 #include "media/audio/audio_manager.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ -12,6 +14,7 @@
 #include "base/debug/dump_without_crashing.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/power_monitor/power_monitor.h"
diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h
index 1d88e44..0a61dfe 100644
--- a/media/audio/audio_manager.h
+++ b/media/audio/audio_manager.h
@@ -10,6 +10,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
+#include "build/build_config.h"
 #include "media/audio/audio_device_name.h"
 #include "media/audio/audio_logging.h"
 #include "media/audio/audio_parameters.h"
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index fadd3fe..8b57d20 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/thread_task_runner_handle.h"
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
index ced45be..0bc8f51 100644
--- a/media/audio/audio_manager_base.h
+++ b/media/audio/audio_manager_base.h
@@ -14,6 +14,7 @@
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
+#include "build/build_config.h"
 #include "media/audio/audio_manager.h"
 
 #include "media/audio/audio_output_dispatcher.h"
diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc
index 3156388..9a78152 100644
--- a/media/audio/audio_manager_unittest.cc
+++ b/media/audio/audio_manager_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/waitable_event.h"
+#include "build/build_config.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_output_proxy.h"
diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
index 434f2e3..58e1e45 100644
--- a/media/audio/audio_output_controller.h
+++ b/media/audio/audio_output_controller.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_
 
+#include <stdint.h>
+
 #include "base/atomic_ref_count.h"
 #include "base/callback.h"
 #include "base/macros.h"
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index 2e1eedf..1046893 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
index 418736f..6c5d59e 100644
--- a/media/audio/audio_output_device.cc
+++ b/media/audio/audio_output_device.cc
@@ -4,10 +4,15 @@
 
 #include "media/audio/audio_output_device.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/callback_helpers.h"
+#include "base/macros.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
 #include "media/audio/audio_output_controller.h"
 #include "media/base/limits.h"
 
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc
index aa7e649..cad47e1 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -2,11 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
diff --git a/media/audio/audio_output_dispatcher_impl.h b/media/audio/audio_output_dispatcher_impl.h
index b35a567..43c8bf8 100644
--- a/media/audio/audio_output_dispatcher_impl.h
+++ b/media/audio/audio_output_dispatcher_impl.h
@@ -13,6 +13,8 @@
 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_IMPL_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_IMPL_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <vector>
 
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index 71c2ad9..f037461 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "build/build_config.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_output_dispatcher_impl.h"
diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc
index e007d15..f3b24cd 100644
--- a/media/audio/audio_output_resampler.cc
+++ b/media/audio/audio_output_resampler.cc
@@ -4,9 +4,12 @@
 
 #include "media/audio/audio_output_resampler.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/single_thread_task_runner.h"
diff --git a/media/audio/audio_output_stream_sink.h b/media/audio/audio_output_stream_sink.h
index 39456fe..9981a66 100644
--- a/media/audio/audio_output_stream_sink.h
+++ b/media/audio/audio_output_stream_sink.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/compiler_specific.h"
diff --git a/media/audio/audio_parameters.h b/media/audio/audio_parameters.h
index e1ac6a5..3e6603b 100644
--- a/media/audio/audio_parameters.h
+++ b/media/audio/audio_parameters.h
@@ -10,6 +10,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "media/audio/point.h"
 #include "media/base/audio_bus.h"
 #include "media/base/channel_layout.h"
diff --git a/media/audio/audio_parameters_unittest.cc b/media/audio/audio_parameters_unittest.cc
index fa65a5c..194386b 100644
--- a/media/audio/audio_parameters_unittest.cc
+++ b/media/audio/audio_parameters_unittest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/audio/audio_parameters.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/audio/audio_power_monitor_unittest.cc b/media/audio/audio_power_monitor_unittest.cc
index 2b30578..35ef8fa 100644
--- a/media/audio/audio_power_monitor_unittest.cc
+++ b/media/audio/audio_power_monitor_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <limits>
 
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "media/base/audio_bus.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/audio/audio_streams_tracker.h b/media/audio/audio_streams_tracker.h
index 18d510d..f501a21 100644
--- a/media/audio/audio_streams_tracker.h
+++ b/media/audio/audio_streams_tracker.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_AUDIO_STREAMS_TRACKER_H_
 #define MEDIA_AUDIO_AUDIO_STREAMS_TRACKER_H_
 
+#include <stddef.h>
+
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
diff --git a/media/audio/audio_streams_tracker_unittest.cc b/media/audio/audio_streams_tracker_unittest.cc
index cd4addc..f42142b 100644
--- a/media/audio/audio_streams_tracker_unittest.cc
+++ b/media/audio/audio_streams_tracker_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "media/audio/audio_streams_tracker.h"
 
+#include <stddef.h>
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc
index 036f6fd..2a9b77d 100644
--- a/media/audio/cras/audio_manager_cras.cc
+++ b/media/audio/cras/audio_manager_cras.cc
@@ -4,6 +4,8 @@
 
 #include "media/audio/cras/audio_manager_cras.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/command_line.h"
diff --git a/media/audio/cras/cras_input.cc b/media/audio/cras/cras_input.cc
index d9fff0b..b464a63 100644
--- a/media/audio/cras/cras_input.cc
+++ b/media/audio/cras/cras_input.cc
@@ -7,6 +7,7 @@
 #include <math.h>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/cras/audio_manager_cras.h"
diff --git a/media/audio/cras/cras_input.h b/media/audio/cras/cras_input.h
index 2e330dc..391366a 100644
--- a/media/audio/cras/cras_input.h
+++ b/media/audio/cras/cras_input.h
@@ -6,6 +6,8 @@
 #define MEDIA_AUDIO_CRAS_CRAS_INPUT_H_
 
 #include <cras_client.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <string>
 
diff --git a/media/audio/cras/cras_input_unittest.cc b/media/audio/cras/cras_input_unittest.cc
index 7924207..3735322 100644
--- a/media/audio/cras/cras_input_unittest.cc
+++ b/media/audio/cras/cras_input_unittest.cc
@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include <string>
 
+#include "base/macros.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
diff --git a/media/audio/cras/cras_unified.cc b/media/audio/cras/cras_unified.cc
index 1a2fa3e..ccaf11c 100644
--- a/media/audio/cras/cras_unified.cc
+++ b/media/audio/cras/cras_unified.cc
@@ -5,6 +5,7 @@
 #include "media/audio/cras/cras_unified.h"
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "media/audio/cras/audio_manager_cras.h"
 
 namespace media {
diff --git a/media/audio/cras/cras_unified.h b/media/audio/cras/cras_unified.h
index b069b3c..c799d78 100644
--- a/media/audio/cras/cras_unified.h
+++ b/media/audio/cras/cras_unified.h
@@ -11,6 +11,8 @@
 #define MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_
 
 #include <cras_client.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/media/audio/cras/cras_unified_unittest.cc b/media/audio/cras/cras_unified_unittest.cc
index 8062688..cb4d71b 100644
--- a/media/audio/cras/cras_unified_unittest.cc
+++ b/media/audio/cras/cras_unified_unittest.cc
@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include <string>
 
+#include "base/macros.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
diff --git a/media/audio/fake_audio_worker.cc b/media/audio/fake_audio_worker.cc
index 44177d3..72fc163 100644
--- a/media/audio/fake_audio_worker.cc
+++ b/media/audio/fake_audio_worker.cc
@@ -9,6 +9,7 @@
 #include "base/cancelable_callback.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
diff --git a/media/audio/fake_audio_worker_unittest.cc b/media/audio/fake_audio_worker_unittest.cc
index 1cccf7e..9238109b7 100644
--- a/media/audio/fake_audio_worker_unittest.cc
+++ b/media/audio/fake_audio_worker_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "media/audio/audio_parameters.h"
diff --git a/media/audio/mac/audio_auhal_mac.h b/media/audio/mac/audio_auhal_mac.h
index fe283c5..2b2c39c 100644
--- a/media/audio/mac/audio_auhal_mac.h
+++ b/media/audio/mac/audio_auhal_mac.h
@@ -19,6 +19,8 @@
 
 #include <AudioUnit/AudioUnit.h>
 #include <CoreAudio/CoreAudio.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
diff --git a/media/audio/mac/audio_auhal_mac_unittest.cc b/media/audio/mac/audio_auhal_mac_unittest.cc
index 8e75f3e..73191cd 100644
--- a/media/audio/mac/audio_auhal_mac_unittest.cc
+++ b/media/audio/mac/audio_auhal_mac_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
diff --git a/media/audio/mac/audio_device_listener_mac_unittest.cc b/media/audio/mac/audio_device_listener_mac_unittest.cc
index 12c88b6..a714ea0 100644
--- a/media/audio/mac/audio_device_listener_mac_unittest.cc
+++ b/media/audio/mac/audio_device_listener_mac_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "media/audio/mac/audio_device_listener_mac.h"
diff --git a/media/audio/mac/audio_input_mac.h b/media/audio/mac/audio_input_mac.h
index 0a0c443..32e9575 100644
--- a/media/audio/mac/audio_input_mac.h
+++ b/media/audio/mac/audio_input_mac.h
@@ -7,6 +7,7 @@
 
 #include <AudioToolbox/AudioFormat.h>
 #include <AudioToolbox/AudioQueue.h>
+#include <stdint.h>
 
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
diff --git a/media/audio/mac/audio_low_latency_input_mac.h b/media/audio/mac/audio_low_latency_input_mac.h
index 37167dc..29af0bf 100644
--- a/media/audio/mac/audio_low_latency_input_mac.h
+++ b/media/audio/mac/audio_low_latency_input_mac.h
@@ -38,6 +38,8 @@
 
 #include <AudioUnit/AudioUnit.h>
 #include <CoreAudio/CoreAudio.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/atomicops.h"
 #include "base/cancelable_callback.h"
diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
index 22691a7..2ff9cd8 100644
--- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc
+++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include "base/environment.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
index 16490f2..b7694f7 100644
--- a/media/audio/mac/audio_manager_mac.cc
+++ b/media/audio/mac/audio_manager_mac.cc
@@ -4,10 +4,13 @@
 
 #include "media/audio/mac/audio_manager_mac.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/scoped_cftyperef.h"
+#include "base/macros.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_observer.h"
 #include "base/strings/sys_string_conversions.h"
diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h
index 013a7f7..0a88b10 100644
--- a/media/audio/mac/audio_manager_mac.h
+++ b/media/audio/mac/audio_manager_mac.h
@@ -7,6 +7,7 @@
 
 #include <AudioUnit/AudioUnit.h>
 #include <CoreAudio/AudioHardware.h>
+#include <stddef.h>
 #include <list>
 #include <string>
 
diff --git a/media/audio/mock_audio_source_callback.h b/media/audio/mock_audio_source_callback.h
index be933d3..163451b 100644
--- a/media/audio/mock_audio_source_callback.h
+++ b/media/audio/mock_audio_source_callback.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_MOCK_AUDIO_SOURCE_CALLBACK_H_
 #define MEDIA_AUDIO_MOCK_AUDIO_SOURCE_CALLBACK_H_
 
+#include <stdint.h>
+
 #include "base/macros.h"
 #include "media/audio/audio_io.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/audio/point.cc b/media/audio/point.cc
index 3246089..7745bc2 100644
--- a/media/audio/point.cc
+++ b/media/audio/point.cc
@@ -4,6 +4,8 @@
 
 #include "media/audio/point.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
diff --git a/media/audio/pulse/pulse_input.cc b/media/audio/pulse/pulse_input.cc
index b52eec6..8d4aeea 100644
--- a/media/audio/pulse/pulse_input.cc
+++ b/media/audio/pulse/pulse_input.cc
@@ -4,6 +4,8 @@
 
 #include "media/audio/pulse/pulse_input.h"
 
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "media/audio/pulse/audio_manager_pulse.h"
 #include "media/audio/pulse/pulse_util.h"
diff --git a/media/audio/pulse/pulse_input.h b/media/audio/pulse/pulse_input.h
index e93c474..e0b2be9 100644
--- a/media/audio/pulse/pulse_input.h
+++ b/media/audio/pulse/pulse_input.h
@@ -6,6 +6,7 @@
 #define MEDIA_AUDIO_PULSE_PULSE_INPUT_H_
 
 #include <pulse/pulseaudio.h>
+#include <stddef.h>
 #include <string>
 
 #include "base/macros.h"
diff --git a/media/audio/pulse/pulse_output.cc b/media/audio/pulse/pulse_output.cc
index 9cd2da4..953f9ac 100644
--- a/media/audio/pulse/pulse_output.cc
+++ b/media/audio/pulse/pulse_output.cc
@@ -5,6 +5,7 @@
 #include "media/audio/pulse/pulse_output.h"
 
 #include <pulse/pulseaudio.h>
+#include <stdint.h>
 
 #include "base/single_thread_task_runner.h"
 #include "media/audio/audio_manager_base.h"
diff --git a/media/audio/pulse/pulse_output.h b/media/audio/pulse/pulse_output.h
index c241b84..ce9a589 100644
--- a/media/audio/pulse/pulse_output.h
+++ b/media/audio/pulse/pulse_output.h
@@ -20,6 +20,8 @@
 #ifndef MEDIA_AUDIO_PULSE_PULSE_OUTPUT_H_
 #define MEDIA_AUDIO_PULSE_PULSE_OUTPUT_H_
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/macros.h"
diff --git a/media/audio/pulse/pulse_util.cc b/media/audio/pulse/pulse_util.cc
index 7221707..5044fa4 100644
--- a/media/audio/pulse/pulse_util.cc
+++ b/media/audio/pulse/pulse_util.cc
@@ -4,7 +4,10 @@
 
 #include "media/audio/pulse/pulse_util.h"
 
+#include <stdint.h>
+
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_parameters.h"
diff --git a/media/audio/simple_sources.cc b/media/audio/simple_sources.cc
index afcd8b9..6aee89f 100644
--- a/media/audio/simple_sources.cc
+++ b/media/audio/simple_sources.cc
@@ -3,11 +3,13 @@
 // found in the LICENSE file.
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
-#include <cmath>
 
 #include "media/audio/simple_sources.h"
 
+#include <stddef.h>
+
 #include <algorithm>
+#include <cmath>
 
 #include "base/files/file.h"
 #include "base/lazy_instance.h"
diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h
index 7d5c3c4..4f153e6 100644
--- a/media/audio/simple_sources.h
+++ b/media/audio/simple_sources.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_SIMPLE_SOURCES_H_
 #define MEDIA_AUDIO_SIMPLE_SOURCES_H_
 
+#include <stdint.h>
+
 #include "base/files/file_path.h"
 #include "base/synchronization/lock.h"
 #include "media/audio/audio_io.h"
diff --git a/media/audio/simple_sources_unittest.cc b/media/audio/simple_sources_unittest.cc
index c4c068e..ea52eea 100644
--- a/media/audio/simple_sources_unittest.cc
+++ b/media/audio/simple_sources_unittest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <limits>
 
 #include "base/files/file_util.h"
diff --git a/media/audio/sounds/audio_stream_handler.cc b/media/audio/sounds/audio_stream_handler.cc
index 85ee6533..373a3ed 100644
--- a/media/audio/sounds/audio_stream_handler.cc
+++ b/media/audio/sounds/audio_stream_handler.cc
@@ -4,10 +4,13 @@
 
 #include "media/audio/sounds/audio_stream_handler.h"
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/cancelable_callback.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
diff --git a/media/audio/sounds/audio_stream_handler.h b/media/audio/sounds/audio_stream_handler.h
index 865e0f6..4a6b131 100644
--- a/media/audio/sounds/audio_stream_handler.h
+++ b/media/audio/sounds/audio_stream_handler.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_SOUNDS_AUDIO_STREAM_HANDLER_H_
 #define MEDIA_AUDIO_SOUNDS_AUDIO_STREAM_HANDLER_H_
 
+#include <stddef.h>
+
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
diff --git a/media/audio/sounds/audio_stream_handler_unittest.cc b/media/audio/sounds/audio_stream_handler_unittest.cc
index a559297..1b87ca4 100644
--- a/media/audio/sounds/audio_stream_handler_unittest.cc
+++ b/media/audio/sounds/audio_stream_handler_unittest.cc
@@ -5,6 +5,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
diff --git a/media/audio/sounds/sounds_manager.cc b/media/audio/sounds/sounds_manager.cc
index 9774ce8..22ea05b 100644
--- a/media/audio/sounds/sounds_manager.cc
+++ b/media/audio/sounds/sounds_manager.cc
@@ -6,6 +6,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
diff --git a/media/audio/sounds/sounds_manager_unittest.cc b/media/audio/sounds/sounds_manager_unittest.cc
index 018fb5c..6dfcf11 100644
--- a/media/audio/sounds/sounds_manager_unittest.cc
+++ b/media/audio/sounds/sounds_manager_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
diff --git a/media/audio/sounds/test_data.h b/media/audio/sounds/test_data.h
index 1736028..c94505d 100644
--- a/media/audio/sounds/test_data.h
+++ b/media/audio/sounds/test_data.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_SOUNDS_TEST_DATA_H_
 #define MEDIA_AUDIO_SOUNDS_TEST_DATA_H_
 
+#include <stddef.h>
+
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/media/audio/sounds/wav_audio_handler.cc b/media/audio/sounds/wav_audio_handler.cc
index 22645ea..a7c2b14 100644
--- a/media/audio/sounds/wav_audio_handler.cc
+++ b/media/audio/sounds/wav_audio_handler.cc
@@ -9,6 +9,7 @@
 
 #include "base/logging.h"
 #include "base/sys_byteorder.h"
+#include "build/build_config.h"
 #include "media/base/audio_bus.h"
 
 namespace media {
diff --git a/media/audio/sounds/wav_audio_handler.h b/media/audio/sounds/wav_audio_handler.h
index 1ea1972..83c99b4 100644
--- a/media/audio/sounds/wav_audio_handler.h
+++ b/media/audio/sounds/wav_audio_handler.h
@@ -5,6 +5,9 @@
 #ifndef MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_
 #define MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
diff --git a/media/audio/sounds/wav_audio_handler_unittest.cc b/media/audio/sounds/wav_audio_handler_unittest.cc
index 0f2304a..92896fa 100644
--- a/media/audio/sounds/wav_audio_handler_unittest.cc
+++ b/media/audio/sounds/wav_audio_handler_unittest.cc
@@ -2,7 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "media/audio/sounds/test_data.h"
diff --git a/media/audio/virtual_audio_input_stream.h b/media/audio/virtual_audio_input_stream.h
index 3370f36..2618d5f 100644
--- a/media/audio/virtual_audio_input_stream.h
+++ b/media/audio/virtual_audio_input_stream.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_VIRTUAL_AUDIO_INPUT_STREAM_H_
 #define MEDIA_AUDIO_VIRTUAL_AUDIO_INPUT_STREAM_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <set>
 
diff --git a/media/audio/virtual_audio_input_stream_unittest.cc b/media/audio/virtual_audio_input_stream_unittest.cc
index 392b505..5d86a2f 100644
--- a/media/audio/virtual_audio_input_stream_unittest.cc
+++ b/media/audio/virtual_audio_input_stream_unittest.cc
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include <list>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/macros.h"
 #include "base/rand_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
diff --git a/media/audio/virtual_audio_output_stream.cc b/media/audio/virtual_audio_output_stream.cc
index 81c40cc..1740b40 100644
--- a/media/audio/virtual_audio_output_stream.cc
+++ b/media/audio/virtual_audio_output_stream.cc
@@ -4,6 +4,8 @@
 
 #include "media/audio/virtual_audio_output_stream.h"
 
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "media/audio/virtual_audio_input_stream.h"
 
diff --git a/media/audio/virtual_audio_output_stream_unittest.cc b/media/audio/virtual_audio_output_stream_unittest.cc
index 0ea753a..a391f6e 100644
--- a/media/audio/virtual_audio_output_stream_unittest.cc
+++ b/media/audio/virtual_audio_output_stream_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/macros.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_manager.h"
diff --git a/media/audio/win/audio_device_listener_win_unittest.cc b/media/audio/win/audio_device_listener_win_unittest.cc
index 4b78d93..97de0a2 100644
--- a/media/audio/win/audio_device_listener_win_unittest.cc
+++ b/media/audio/win/audio_device_listener_win_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/simple_test_tick_clock.h"
diff --git a/media/audio/win/audio_low_latency_input_win.h b/media/audio/win/audio_low_latency_input_win.h
index e5278b5..bdde764 100644
--- a/media/audio/win/audio_low_latency_input_win.h
+++ b/media/audio/win/audio_low_latency_input_win.h
@@ -58,6 +58,8 @@
 
 #include <Audioclient.h>
 #include <MMDeviceAPI.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <string>
 
diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc
index 3190b7b..8a9f366 100644
--- a/media/audio/win/audio_low_latency_input_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_input_win_unittest.cc
@@ -4,9 +4,12 @@
 
 #include <windows.h>
 #include <mmsystem.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/environment.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc
index 23467f7..87b79d0 100644
--- a/media/audio/win/audio_low_latency_output_win.cc
+++ b/media/audio/win/audio_low_latency_output_win.cc
@@ -8,6 +8,7 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
diff --git a/media/audio/win/audio_low_latency_output_win.h b/media/audio/win/audio_low_latency_output_win.h
index 16f9649..c62a44c 100644
--- a/media/audio/win/audio_low_latency_output_win.h
+++ b/media/audio/win/audio_low_latency_output_win.h
@@ -95,6 +95,8 @@
 
 #include <Audioclient.h>
 #include <MMDeviceAPI.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <string>
 
diff --git a/media/audio/win/audio_low_latency_output_win_unittest.cc b/media/audio/win/audio_low_latency_output_win_unittest.cc
index 075cd7d..5b748e7 100644
--- a/media/audio/win/audio_low_latency_output_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_output_win_unittest.cc
@@ -4,6 +4,8 @@
 
 #include <windows.h>
 #include <mmsystem.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/environment.h"
 #include "base/files/file_util.h"
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
index 70e6c1b..ba8f665 100644
--- a/media/audio/win/audio_manager_win.cc
+++ b/media/audio/win/audio_manager_win.cc
@@ -9,6 +9,7 @@
 #include <initguid.h>
 #include <mmsystem.h>
 #include <setupapi.h>
+#include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc
index 5b5a2e7..0c59d9b 100644
--- a/media/audio/win/audio_output_win_unittest.cc
+++ b/media/audio/win/audio_output_win_unittest.cc
@@ -4,18 +4,20 @@
 
 #include <windows.h>
 #include <mmsystem.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/base_paths.h"
 #include "base/memory/aligned_memory.h"
 #include "base/sync_socket.h"
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/windows_version.h"
-#include "media/base/limits.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_unittest_util.h"
 #include "media/audio/mock_audio_source_callback.h"
 #include "media/audio/simple_sources.h"
+#include "media/base/limits.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/media/audio/win/avrt_wrapper_win.cc b/media/audio/win/avrt_wrapper_win.cc
index c9f1599..ace5cba 100644
--- a/media/audio/win/avrt_wrapper_win.cc
+++ b/media/audio/win/avrt_wrapper_win.cc
@@ -5,6 +5,7 @@
 #include "media/audio/win/avrt_wrapper_win.h"
 
 #include "base/logging.h"
+#include "base/macros.h"
 
 namespace avrt {
 
diff --git a/media/audio/win/core_audio_util_win.cc b/media/audio/win/core_audio_util_win.cc
index 48d8575..fa0300c 100644
--- a/media/audio/win/core_audio_util_win.cc
+++ b/media/audio/win/core_audio_util_win.cc
@@ -7,9 +7,11 @@
 #include <devicetopology.h>
 #include <dxdiag.h>
 #include <functiondiscoverykeys_devpkey.h>
+#include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_co_mem.h"
diff --git a/media/audio/win/core_audio_util_win.h b/media/audio/win/core_audio_util_win.h
index 3b04da2..92410da 100644
--- a/media/audio/win/core_audio_util_win.h
+++ b/media/audio/win/core_audio_util_win.h
@@ -13,6 +13,7 @@
 
 #include <audioclient.h>
 #include <mmdeviceapi.h>
+#include <stdint.h>
 #include <string>
 
 #include "base/macros.h"
diff --git a/media/audio/win/core_audio_util_win_unittest.cc b/media/audio/win/core_audio_util_win_unittest.cc
index 1f5b2e0..2dc53a129 100644
--- a/media/audio/win/core_audio_util_win_unittest.cc
+++ b/media/audio/win/core_audio_util_win_unittest.cc
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
diff --git a/media/audio/win/device_enumeration_win.cc b/media/audio/win/device_enumeration_win.cc
index 47d5bbd..596389c 100644
--- a/media/audio/win/device_enumeration_win.cc
+++ b/media/audio/win/device_enumeration_win.cc
@@ -5,6 +5,7 @@
 #include <MMDeviceAPI.h>
 #include <mmsystem.h>
 #include <Functiondiscoverykeys_devpkey.h>  // MMDeviceAPI.h must come first
+#include <stddef.h>
 
 #include "media/audio/win/audio_manager_win.h"
 
diff --git a/media/audio/win/wavein_input_win.h b/media/audio/win/wavein_input_win.h
index b42b55a..7d8a40f 100644
--- a/media/audio/win/wavein_input_win.h
+++ b/media/audio/win/wavein_input_win.h
@@ -9,6 +9,7 @@
 
 #include <windows.h>
 #include <mmsystem.h>
+#include <stdint.h>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h
index 62fe828..4ff1444 100644
--- a/media/audio/win/waveout_output_win.h
+++ b/media/audio/win/waveout_output_win.h
@@ -8,6 +8,8 @@
 #include <windows.h>
 #include <mmsystem.h>
 #include <mmreg.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"