diff --git a/cc/animation/animation.h b/cc/animation/animation.h
index 153e4ef77527f..fb8f8d822a491 100644
--- a/cc/animation/animation.h
+++ b/cc/animation/animation.h
@@ -5,7 +5,7 @@
 #ifndef CC_ANIMATION_ANIMATION_H_
 #define CC_ANIMATION_ANIMATION_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/animation/animation_host.cc b/cc/animation/animation_host.cc
index 53027e24ad5e0..512f8770402a6 100644
--- a/cc/animation/animation_host.cc
+++ b/cc/animation/animation_host.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/macros.h"
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_player.h"
diff --git a/cc/animation/animation_host.h b/cc/animation/animation_host.h
index 05f2ba3272c17..ad5117cafb19d 100644
--- a/cc/animation/animation_host.h
+++ b/cc/animation/animation_host.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
diff --git a/cc/animation/animation_id_provider.h b/cc/animation/animation_id_provider.h
index 3b14801e7d36a..22f62d23b51d1 100644
--- a/cc/animation/animation_id_provider.h
+++ b/cc/animation/animation_id_provider.h
@@ -5,7 +5,7 @@
 #ifndef CC_ANIMATION_ANIMATION_ID_PROVIDER_H_
 #define CC_ANIMATION_ANIMATION_ID_PROVIDER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 
 namespace cc {
diff --git a/cc/animation/animation_player.h b/cc/animation/animation_player.h
index 3665a2381b54a..d028930d62b24 100644
--- a/cc/animation/animation_player.h
+++ b/cc/animation/animation_player.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "base/containers/linked_list.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "cc/animation/animation.h"
diff --git a/cc/animation/animation_registrar.cc b/cc/animation/animation_registrar.cc
index a3edd74a02ce2..c300026ad9421 100644
--- a/cc/animation/animation_registrar.cc
+++ b/cc/animation/animation_registrar.cc
@@ -4,6 +4,8 @@
 
 #include "cc/animation/animation_registrar.h"
 
+#include <stddef.h>
+
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/animation/layer_animation_controller.h"
diff --git a/cc/animation/animation_registrar.h b/cc/animation/animation_registrar.h
index 530239096701c..5cb21e96a023b 100644
--- a/cc/animation/animation_registrar.h
+++ b/cc/animation/animation_registrar.h
@@ -6,6 +6,7 @@
 #define CC_ANIMATION_ANIMATION_REGISTRAR_H_
 
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/animation/animation_events.h"
diff --git a/cc/animation/animation_timeline.h b/cc/animation/animation_timeline.h
index 4cb31f5c07606..6100b446a64f1 100644
--- a/cc/animation/animation_timeline.h
+++ b/cc/animation/animation_timeline.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/animation/element_animations.cc b/cc/animation/element_animations.cc
index 09219dc2c2c0e..1264718395a22 100644
--- a/cc/animation/element_animations.cc
+++ b/cc/animation/element_animations.cc
@@ -4,6 +4,7 @@
 
 #include "cc/animation/element_animations.h"
 
+#include "base/macros.h"
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_player.h"
 #include "cc/animation/animation_registrar.h"
diff --git a/cc/animation/element_animations.h b/cc/animation/element_animations.h
index 0d4fb6ac38312..de76291a1aa66 100644
--- a/cc/animation/element_animations.h
+++ b/cc/animation/element_animations.h
@@ -6,6 +6,7 @@
 #define CC_ANIMATION_ELEMENT_ANIMATIONS_H_
 
 #include "base/containers/linked_list.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/layer_animation_controller.h"
diff --git a/cc/animation/keyframed_animation_curve.cc b/cc/animation/keyframed_animation_curve.cc
index 0d741359bd89c..a8dd9bdaa6515 100644
--- a/cc/animation/keyframed_animation_curve.cc
+++ b/cc/animation/keyframed_animation_curve.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 <stddef.h>
+
 #include <algorithm>
 
 #include "cc/animation/keyframed_animation_curve.h"
diff --git a/cc/animation/keyframed_animation_curve.h b/cc/animation/keyframed_animation_curve.h
index a589c76b63b43..24101f65740fc 100644
--- a/cc/animation/keyframed_animation_curve.h
+++ b/cc/animation/keyframed_animation_curve.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/timing_function.h"
diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc
index 721173c7a7aaf..b909dccae242d 100644
--- a/cc/animation/layer_animation_controller.cc
+++ b/cc/animation/layer_animation_controller.cc
@@ -4,6 +4,8 @@
 
 #include "cc/animation/layer_animation_controller.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <vector>
 
diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h
index 1f8522329bb3c..cbff7aa71103c 100644
--- a/cc/animation/layer_animation_controller.h
+++ b/cc/animation/layer_animation_controller.h
@@ -7,8 +7,8 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
diff --git a/cc/animation/layer_animation_controller_unittest.cc b/cc/animation/layer_animation_controller_unittest.cc
index 7f0f0332b856c..f47b0cf8ebd3f 100644
--- a/cc/animation/layer_animation_controller_unittest.cc
+++ b/cc/animation/layer_animation_controller_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/animation/layer_animation_controller.h"
 
+#include <stddef.h>
+
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/animation_delegate.h"
diff --git a/cc/animation/scroll_offset_animation_curve.h b/cc/animation/scroll_offset_animation_curve.h
index 95f3d9f5ea89d..d27a6dd17259d 100644
--- a/cc/animation/scroll_offset_animation_curve.h
+++ b/cc/animation/scroll_offset_animation_curve.h
@@ -5,6 +5,7 @@
 #ifndef CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_
 #define CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_curve.h"
diff --git a/cc/animation/scrollbar_animation_controller_linear_fade.h b/cc/animation/scrollbar_animation_controller_linear_fade.h
index f6f40112a7369..8fce90428f92b 100644
--- a/cc/animation/scrollbar_animation_controller_linear_fade.h
+++ b/cc/animation/scrollbar_animation_controller_linear_fade.h
@@ -5,6 +5,7 @@
 #ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
 #define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/animation/scrollbar_animation_controller.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/animation/scrollbar_animation_controller_thinning.h b/cc/animation/scrollbar_animation_controller_thinning.h
index 44362bd3e6e8f..b700db83e3f98 100644
--- a/cc/animation/scrollbar_animation_controller_thinning.h
+++ b/cc/animation/scrollbar_animation_controller_thinning.h
@@ -5,6 +5,7 @@
 #ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_
 #define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/animation/scrollbar_animation_controller.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/animation/timing_function.h b/cc/animation/timing_function.h
index f722dd6f1daab..ddc3c51d95df2 100644
--- a/cc/animation/timing_function.h
+++ b/cc/animation/timing_function.h
@@ -5,6 +5,7 @@
 #ifndef CC_ANIMATION_TIMING_FUNCTION_H_
 #define CC_ANIMATION_TIMING_FUNCTION_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "ui/gfx/geometry/cubic_bezier.h"
diff --git a/cc/animation/transform_operations.cc b/cc/animation/transform_operations.cc
index 29a3d90626b51..55a23abec68d9 100644
--- a/cc/animation/transform_operations.cc
+++ b/cc/animation/transform_operations.cc
@@ -4,6 +4,8 @@
 
 #include "cc/animation/transform_operations.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "ui/gfx/animation/tween.h"
diff --git a/cc/animation/transform_operations.h b/cc/animation/transform_operations.h
index 65f8511d5110a..d173ace71799b 100644
--- a/cc/animation/transform_operations.h
+++ b/cc/animation/transform_operations.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/animation/transform_operation.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/animation/transform_operations_unittest.cc b/cc/animation/transform_operations_unittest.cc
index 572ab47ec7af7..f7610aadc1915 100644
--- a/cc/animation/transform_operations_unittest.cc
+++ b/cc/animation/transform_operations_unittest.cc
@@ -2,9 +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 <limits>
 
-#include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "cc/animation/transform_operations.h"
 #include "cc/test/geometry_test_utils.h"
diff --git a/cc/base/contiguous_container.cc b/cc/base/contiguous_container.cc
index 53219f9926dbf..b56b26baad916 100644
--- a/cc/base/contiguous_container.cc
+++ b/cc/base/contiguous_container.cc
@@ -4,6 +4,8 @@
 
 #include "cc/base/contiguous_container.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 namespace cc {
diff --git a/cc/base/contiguous_container.h b/cc/base/contiguous_container.h
index f58f5f8bfe0f6..bad151141d278 100644
--- a/cc/base/contiguous_container.h
+++ b/cc/base/contiguous_container.h
@@ -5,8 +5,10 @@
 #ifndef CC_BASE_CONTIGUOUS_CONTAINER_H_
 #define CC_BASE_CONTIGUOUS_CONTAINER_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/base/contiguous_container_unittest.cc b/cc/base/contiguous_container_unittest.cc
index b5e3a6abeeb9c..dde2e62e56c5a 100644
--- a/cc/base/contiguous_container_unittest.cc
+++ b/cc/base/contiguous_container_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 <stddef.h>
+
 #include "cc/base/contiguous_container.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/base/delayed_unique_notifier.h b/cc/base/delayed_unique_notifier.h
index 0e461fe2acdff..c177a1ff95c45 100644
--- a/cc/base/delayed_unique_notifier.h
+++ b/cc/base/delayed_unique_notifier.h
@@ -6,6 +6,7 @@
 #define CC_BASE_DELAYED_UNIQUE_NOTIFIER_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/base/cc_export.h"
 
diff --git a/cc/base/histograms.cc b/cc/base/histograms.cc
index ba6f4f66794ce..58d9aedf3bf08 100644
--- a/cc/base/histograms.cc
+++ b/cc/base/histograms.cc
@@ -4,6 +4,8 @@
 
 #include "cc/base/histograms.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <cmath>
 #include <cstring>
@@ -52,7 +54,7 @@ const char* GetClientNameForMetrics() {
 }
 
 // Minimum elapsed time of 1us to limit weighting of fast calls.
-static const int64 kMinimumTimeMicroseconds = 1;
+static const int64_t kMinimumTimeMicroseconds = 1;
 
 ScopedUMAHistogramAreaTimerBase::ScopedUMAHistogramAreaTimerBase() : area_(0) {
 }
diff --git a/cc/base/histograms.h b/cc/base/histograms.h
index 8c8b4672a09be..6614f73ef6530 100644
--- a/cc/base/histograms.h
+++ b/cc/base/histograms.h
@@ -6,6 +6,7 @@
 #define CC_BASE_HISTOGRAMS_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/numerics/safe_math.h"
diff --git a/cc/base/list_container.h b/cc/base/list_container.h
index d5907407c0adc..962f6f32a0568 100644
--- a/cc/base/list_container.h
+++ b/cc/base/list_container.h
@@ -5,6 +5,8 @@
 #ifndef CC_BASE_LIST_CONTAINER_H_
 #define CC_BASE_LIST_CONTAINER_H_
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/cc/base/list_container_helper.cc b/cc/base/list_container_helper.cc
index ea30bad7df0d7..7b249ac01f7c8 100644
--- a/cc/base/list_container_helper.cc
+++ b/cc/base/list_container_helper.cc
@@ -4,10 +4,13 @@
 
 #include "cc/base/list_container_helper.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
+#include "base/macros.h"
 
 namespace {
 const size_t kDefaultNumElementTypesToReserve = 32;
diff --git a/cc/base/list_container_helper.h b/cc/base/list_container_helper.h
index 31b2310d49dd1..61ca25e8858e8 100644
--- a/cc/base/list_container_helper.h
+++ b/cc/base/list_container_helper.h
@@ -5,6 +5,9 @@
 #ifndef CC_BASE_LIST_CONTAINER_HELPER_H_
 #define CC_BASE_LIST_CONTAINER_HELPER_H_
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 
diff --git a/cc/base/list_container_unittest.cc b/cc/base/list_container_unittest.cc
index be0b2b75b4e34..13630252959be 100644
--- a/cc/base/list_container_unittest.cc
+++ b/cc/base/list_container_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/base/list_container.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <vector>
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/base/math_util_unittest.cc b/cc/base/math_util_unittest.cc
index 9d44fba8ac034..e82de664dfd45 100644
--- a/cc/base/math_util_unittest.cc
+++ b/cc/base/math_util_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/base/math_util.h"
 
+#include <stdint.h>
+
 #include <cmath>
 
 #include "cc/test/geometry_test_utils.h"
diff --git a/cc/base/random_access_list_container.h b/cc/base/random_access_list_container.h
index b2baf3064d27e..34eb699082476 100644
--- a/cc/base/random_access_list_container.h
+++ b/cc/base/random_access_list_container.h
@@ -5,6 +5,8 @@
 #ifndef CC_BASE_RANDOM_ACCESS_LIST_CONTAINER_H_
 #define CC_BASE_RANDOM_ACCESS_LIST_CONTAINER_H_
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/logging.h"
diff --git a/cc/base/random_access_list_container_unittest.cc b/cc/base/random_access_list_container_unittest.cc
index 78004b4a8f4d7..c02ca784aef65 100644
--- a/cc/base/random_access_list_container_unittest.cc
+++ b/cc/base/random_access_list_container_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/base/random_access_list_container.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <vector>
 
diff --git a/cc/base/region.cc b/cc/base/region.cc
index 3030a17fa0987..8332f9ad67cde 100644
--- a/cc/base/region.cc
+++ b/cc/base/region.cc
@@ -4,6 +4,8 @@
 
 #include "cc/base/region.h"
 
+#include <stddef.h>
+
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
 #include "cc/base/simple_enclosed_region.h"
diff --git a/cc/base/rolling_time_delta_history.cc b/cc/base/rolling_time_delta_history.cc
index db04f586b0bee..e296c4b1d1380 100644
--- a/cc/base/rolling_time_delta_history.cc
+++ b/cc/base/rolling_time_delta_history.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 <stddef.h>
+
 #include <cmath>
 
 #include "cc/base/rolling_time_delta_history.h"
diff --git a/cc/base/rolling_time_delta_history.h b/cc/base/rolling_time_delta_history.h
index e51fb86ba9688..61ed339f74038 100644
--- a/cc/base/rolling_time_delta_history.h
+++ b/cc/base/rolling_time_delta_history.h
@@ -5,9 +5,12 @@
 #ifndef CC_BASE_ROLLING_TIME_DELTA_HISTORY_H_
 #define CC_BASE_ROLLING_TIME_DELTA_HISTORY_H_
 
+#include <stddef.h>
+
 #include <deque>
 #include <set>
 
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
 
diff --git a/cc/base/rtree.cc b/cc/base/rtree.cc
index 9efc746d44630..0b389f427fe8e 100644
--- a/cc/base/rtree.cc
+++ b/cc/base/rtree.cc
@@ -4,6 +4,9 @@
 
 #include "cc/base/rtree.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <cmath>
 
 #include "base/logging.h"
diff --git a/cc/base/rtree.h b/cc/base/rtree.h
index b9bc0fbeb2b39..21cd9206cb2b6 100644
--- a/cc/base/rtree.h
+++ b/cc/base/rtree.h
@@ -5,6 +5,9 @@
 #ifndef CC_BASE_RTREE_H_
 #define CC_BASE_RTREE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <deque>
 #include <vector>
 
diff --git a/cc/base/rtree_unittest.cc b/cc/base/rtree_unittest.cc
index 9f6a46b120032..83288832a9a6c 100644
--- a/cc/base/rtree_unittest.cc
+++ b/cc/base/rtree_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/base/rtree.h"
 
+#include <stddef.h>
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
diff --git a/cc/base/simple_enclosed_region.cc b/cc/base/simple_enclosed_region.cc
index e2683f3794fe6..50e905bb68c97 100644
--- a/cc/base/simple_enclosed_region.cc
+++ b/cc/base/simple_enclosed_region.cc
@@ -4,14 +4,17 @@
 
 #include "cc/base/simple_enclosed_region.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "cc/base/region.h"
 
 namespace cc {
 
 static bool RectIsLargerArea(const gfx::Rect& a, const gfx::Rect b) {
-  int64 a_area = static_cast<int64>(a.width()) * a.height();
-  int64 b_area = static_cast<int64>(b.width()) * b.height();
+  int64_t a_area = static_cast<int64_t>(a.width()) * a.height();
+  int64_t b_area = static_cast<int64_t>(b.width()) * b.height();
   return a_area > b_area;
 }
 
diff --git a/cc/base/simple_enclosed_region.h b/cc/base/simple_enclosed_region.h
index 5e8a6b210419a..e7bb9952eb3ff 100644
--- a/cc/base/simple_enclosed_region.h
+++ b/cc/base/simple_enclosed_region.h
@@ -5,6 +5,8 @@
 #ifndef CC_BASE_SIMPLE_ENCLOSED_REGION_H_
 #define CC_BASE_SIMPLE_ENCLOSED_REGION_H_
 
+#include <stddef.h>
+
 #include <string>
 
 #include "cc/base/cc_export.h"
diff --git a/cc/base/simple_enclosed_region_unittest.cc b/cc/base/simple_enclosed_region_unittest.cc
index 869da4e16ceb8..ca3ad619874a7 100644
--- a/cc/base/simple_enclosed_region_unittest.cc
+++ b/cc/base/simple_enclosed_region_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/base/simple_enclosed_region.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <vector>
 
diff --git a/cc/base/tiling_data.h b/cc/base/tiling_data.h
index c95a6725b4886..3c3937db81541 100644
--- a/cc/base/tiling_data.h
+++ b/cc/base/tiling_data.h
@@ -7,7 +7,6 @@
 
 #include <utility>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "cc/base/cc_export.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/cc/base/tiling_data_unittest.cc b/cc/base/tiling_data_unittest.cc
index 732b04db05661..004db11c3e23f 100644
--- a/cc/base/tiling_data_unittest.cc
+++ b/cc/base/tiling_data_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/base/tiling_data.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <vector>
 
diff --git a/cc/base/time_util.h b/cc/base/time_util.h
index 06682c27e2fc1..d124f94d90d4f 100644
--- a/cc/base/time_util.h
+++ b/cc/base/time_util.h
@@ -14,7 +14,7 @@ namespace cc {
 class CC_EXPORT TimeUtil {
  public:
   static base::TimeDelta Scale(base::TimeDelta time_delta, double value) {
-    return base::TimeDelta::FromInternalValue(static_cast<int64>(
+    return base::TimeDelta::FromInternalValue(static_cast<int64_t>(
         static_cast<double>(time_delta.ToInternalValue()) * value));
   }
 
diff --git a/cc/base/unique_notifier.h b/cc/base/unique_notifier.h
index 3cbc22a0a794c..b54091a0e1601 100644
--- a/cc/base/unique_notifier.h
+++ b/cc/base/unique_notifier.h
@@ -6,6 +6,7 @@
 #define CC_BASE_UNIQUE_NOTIFIER_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/base/cc_export.h"
 
diff --git a/cc/blink/scrollbar_impl.h b/cc/blink/scrollbar_impl.h
index 617969741ab80..5f11a1b407e81 100644
--- a/cc/blink/scrollbar_impl.h
+++ b/cc/blink/scrollbar_impl.h
@@ -5,7 +5,7 @@
 #ifndef CC_BLINK_SCROLLBAR_IMPL_H_
 #define CC_BLINK_SCROLLBAR_IMPL_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/input/scrollbar.h"
 #include "third_party/WebKit/public/platform/WebScrollbarThemePainter.h"
diff --git a/cc/blink/web_animation_impl.h b/cc/blink/web_animation_impl.h
index c1bdb0efdfa3a..92029bec2a211 100644
--- a/cc/blink/web_animation_impl.h
+++ b/cc/blink/web_animation_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_ANIMATION_IMPL_H_
 #define CC_BLINK_WEB_ANIMATION_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h"
diff --git a/cc/blink/web_compositor_animation_player_impl.h b/cc/blink/web_compositor_animation_player_impl.h
index 1d4879b45a4bc..0cc69752bb2ab 100644
--- a/cc/blink/web_compositor_animation_player_impl.h
+++ b/cc/blink/web_compositor_animation_player_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_COMPOSITOR_ANIMATION_PLAYER_IMPL_H_
 #define CC_BLINK_WEB_COMPOSITOR_ANIMATION_PLAYER_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
diff --git a/cc/blink/web_compositor_animation_timeline_impl.h b/cc/blink/web_compositor_animation_timeline_impl.h
index 624d29fcec75f..556c9373f85f6 100644
--- a/cc/blink/web_compositor_animation_timeline_impl.h
+++ b/cc/blink/web_compositor_animation_timeline_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_COMPOSITOR_ANIMATION_TIMELINE_IMPL_H_
 #define CC_BLINK_WEB_COMPOSITOR_ANIMATION_TIMELINE_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
diff --git a/cc/blink/web_compositor_support_impl.h b/cc/blink/web_compositor_support_impl.h
index 73880b2e85263..d32d0e1800306 100644
--- a/cc/blink/web_compositor_support_impl.h
+++ b/cc/blink/web_compositor_support_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_COMPOSITOR_SUPPORT_IMPL_H_
 #define CC_BLINK_WEB_COMPOSITOR_SUPPORT_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/blink/cc_blink_export.h"
 #include "third_party/WebKit/public/platform/WebCompositorAnimationCurve.h"
diff --git a/cc/blink/web_content_layer_impl.cc b/cc/blink/web_content_layer_impl.cc
index 0eb381f3e6509..6f7b66c29bba4 100644
--- a/cc/blink/web_content_layer_impl.cc
+++ b/cc/blink/web_content_layer_impl.cc
@@ -4,6 +4,8 @@
 
 #include "cc/blink/web_content_layer_impl.h"
 
+#include <stddef.h>
+
 #include "base/command_line.h"
 #include "cc/base/switches.h"
 #include "cc/blink/web_display_item_list_impl.h"
diff --git a/cc/blink/web_content_layer_impl.h b/cc/blink/web_content_layer_impl.h
index 6a075ae9da8fe..53fd83c0965a9 100644
--- a/cc/blink/web_content_layer_impl.h
+++ b/cc/blink/web_content_layer_impl.h
@@ -5,6 +5,9 @@
 #ifndef CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_
 #define CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
 #include "cc/blink/web_layer_impl.h"
diff --git a/cc/blink/web_display_item_list_impl.cc b/cc/blink/web_display_item_list_impl.cc
index f5d89b0e6e921..c46e8a0b3d999 100644
--- a/cc/blink/web_display_item_list_impl.cc
+++ b/cc/blink/web_display_item_list_impl.cc
@@ -4,6 +4,9 @@
 
 #include "cc/blink/web_display_item_list_impl.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "cc/blink/web_filter_operations_impl.h"
diff --git a/cc/blink/web_display_item_list_impl.h b/cc/blink/web_display_item_list_impl.h
index 0c271f1d030f3..14278efefe70f 100644
--- a/cc/blink/web_display_item_list_impl.h
+++ b/cc/blink/web_display_item_list_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_
 #define CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/blink/cc_blink_export.h"
 #include "cc/playback/display_item_list.h"
diff --git a/cc/blink/web_external_bitmap_impl.cc b/cc/blink/web_external_bitmap_impl.cc
index 2301896027b9a..ace8725c7ca9d 100644
--- a/cc/blink/web_external_bitmap_impl.cc
+++ b/cc/blink/web_external_bitmap_impl.cc
@@ -4,6 +4,8 @@
 
 #include "cc/blink/web_external_bitmap_impl.h"
 
+#include <stdint.h>
+
 #include "cc/resources/shared_bitmap.h"
 
 namespace cc_blink {
@@ -36,7 +38,7 @@ blink::WebSize WebExternalBitmapImpl::size() {
   return size_;
 }
 
-uint8* WebExternalBitmapImpl::pixels() {
+uint8_t* WebExternalBitmapImpl::pixels() {
   if (!shared_bitmap_) {
     // crbug.com/520417: not sure why a non-null WebExternalBitmap is
     // being passed to prepareMailbox when the shared_bitmap_ is null.
diff --git a/cc/blink/web_external_bitmap_impl.h b/cc/blink/web_external_bitmap_impl.h
index 6cada7dc3c848..20e27df5dcd5e 100644
--- a/cc/blink/web_external_bitmap_impl.h
+++ b/cc/blink/web_external_bitmap_impl.h
@@ -5,7 +5,10 @@
 #ifndef CC_BLINK_WEB_EXTERNAL_BITMAP_IMPL_H_
 #define CC_BLINK_WEB_EXTERNAL_BITMAP_IMPL_H_
 
+#include <stdint.h>
+
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
 #include "third_party/WebKit/public/platform/WebExternalBitmap.h"
@@ -31,7 +34,7 @@ class WebExternalBitmapImpl : public blink::WebExternalBitmap {
   // blink::WebExternalBitmap implementation.
   blink::WebSize size() override;
   void setSize(blink::WebSize size) override;
-  uint8* pixels() override;
+  uint8_t* pixels() override;
 
   cc::SharedBitmap* shared_bitmap() { return shared_bitmap_.get(); }
 
diff --git a/cc/blink/web_external_texture_layer_impl.h b/cc/blink/web_external_texture_layer_impl.h
index 8438a89fb0f4a..d48af6458c795 100644
--- a/cc/blink/web_external_texture_layer_impl.h
+++ b/cc/blink/web_external_texture_layer_impl.h
@@ -6,6 +6,7 @@
 #define CC_BLINK_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "cc/blink/cc_blink_export.h"
diff --git a/cc/blink/web_filter_animation_curve_impl.h b/cc/blink/web_filter_animation_curve_impl.h
index e922ccbde2296..9d6ea409e1529 100644
--- a/cc/blink/web_filter_animation_curve_impl.h
+++ b/cc/blink/web_filter_animation_curve_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_FILTER_ANIMATION_CURVE_IMPL_H_
 #define CC_BLINK_WEB_FILTER_ANIMATION_CURVE_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
 #include "third_party/WebKit/public/platform/WebFilterAnimationCurve.h"
diff --git a/cc/blink/web_filter_operations_impl.cc b/cc/blink/web_filter_operations_impl.cc
index e896c6adedeea..d657d11c47d07 100644
--- a/cc/blink/web_filter_operations_impl.cc
+++ b/cc/blink/web_filter_operations_impl.cc
@@ -4,7 +4,6 @@
 
 #include "cc/blink/web_filter_operations_impl.h"
 
-#include "base/basictypes.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/platform/WebColor.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
diff --git a/cc/blink/web_filter_operations_impl.h b/cc/blink/web_filter_operations_impl.h
index d1746cea9af97..b2a9e6aea2165 100644
--- a/cc/blink/web_filter_operations_impl.h
+++ b/cc/blink/web_filter_operations_impl.h
@@ -5,8 +5,9 @@
 #ifndef CC_BLINK_WEB_FILTER_OPERATIONS_IMPL_H_
 #define CC_BLINK_WEB_FILTER_OPERATIONS_IMPL_H_
 
-#include "cc/output/filter_operations.h"
+#include "base/macros.h"
 #include "cc/blink/cc_blink_export.h"
+#include "cc/output/filter_operations.h"
 #include "third_party/WebKit/public/platform/WebFilterOperations.h"
 
 namespace cc_blink {
diff --git a/cc/blink/web_float_animation_curve_impl.h b/cc/blink/web_float_animation_curve_impl.h
index 42bab59f82bac..a47b1e1b8ab0f 100644
--- a/cc/blink/web_float_animation_curve_impl.h
+++ b/cc/blink/web_float_animation_curve_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_
 #define CC_BLINK_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
 #include "third_party/WebKit/public/platform/WebFloatAnimationCurve.h"
diff --git a/cc/blink/web_image_layer_impl.h b/cc/blink/web_image_layer_impl.h
index 74a8e76b5b1ee..d2775fb7e34eb 100644
--- a/cc/blink/web_image_layer_impl.h
+++ b/cc/blink/web_image_layer_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_IMAGE_LAYER_IMPL_H_
 #define CC_BLINK_WEB_IMAGE_LAYER_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
 #include "third_party/WebKit/public/platform/WebImageLayer.h"
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
index cdf3160366540..ddae2563a03cd 100644
--- a/cc/blink/web_layer_impl.cc
+++ b/cc/blink/web_layer_impl.cc
@@ -4,6 +4,9 @@
 
 #include "cc/blink/web_layer_impl.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <utility>
 #include <vector>
 
diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h
index e6429156557d9..a1b762bf38f50 100644
--- a/cc/blink/web_layer_impl.h
+++ b/cc/blink/web_layer_impl.h
@@ -5,9 +5,13 @@
 #ifndef CC_BLINK_WEB_LAYER_IMPL_H_
 #define CC_BLINK_WEB_LAYER_IMPL_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <utility>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
diff --git a/cc/blink/web_layer_impl_fixed_bounds.h b/cc/blink/web_layer_impl_fixed_bounds.h
index 328924542bb7e..614ccd3104711 100644
--- a/cc/blink/web_layer_impl_fixed_bounds.h
+++ b/cc/blink/web_layer_impl_fixed_bounds.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_LAYER_IMPL_FIXED_BOUNDS_H_
 #define CC_BLINK_WEB_LAYER_IMPL_FIXED_BOUNDS_H_
 
+#include "base/macros.h"
 #include "cc/blink/web_layer_impl.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
diff --git a/cc/blink/web_scroll_offset_animation_curve_impl.h b/cc/blink/web_scroll_offset_animation_curve_impl.h
index 3a218532766d9..82e77aca12849 100644
--- a/cc/blink/web_scroll_offset_animation_curve_impl.h
+++ b/cc/blink/web_scroll_offset_animation_curve_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_SCROLL_OFFSET_ANIMATION_CURVE_IMPL_H_
 #define CC_BLINK_WEB_SCROLL_OFFSET_ANIMATION_CURVE_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
 #include "third_party/WebKit/public/platform/WebScrollOffsetAnimationCurve.h"
diff --git a/cc/blink/web_scrollbar_layer_impl.h b/cc/blink/web_scrollbar_layer_impl.h
index 734e0696109ec..f9cd68cd6e34f 100644
--- a/cc/blink/web_scrollbar_layer_impl.h
+++ b/cc/blink/web_scrollbar_layer_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_SCROLLBAR_LAYER_IMPL_H_
 #define CC_BLINK_WEB_SCROLLBAR_LAYER_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
 #include "third_party/WebKit/public/platform/WebScrollbar.h"
diff --git a/cc/blink/web_to_cc_animation_delegate_adapter.h b/cc/blink/web_to_cc_animation_delegate_adapter.h
index 4d52cb478b940..72e79e6302144 100644
--- a/cc/blink/web_to_cc_animation_delegate_adapter.h
+++ b/cc/blink/web_to_cc_animation_delegate_adapter.h
@@ -5,8 +5,8 @@
 #ifndef CC_BLINK_WEB_TO_CC_ANIMATION_DELEGATE_ADAPTER_H_
 #define CC_BLINK_WEB_TO_CC_ANIMATION_DELEGATE_ADAPTER_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "cc/animation/animation_delegate.h"
 
 namespace blink {
diff --git a/cc/blink/web_transform_animation_curve_impl.h b/cc/blink/web_transform_animation_curve_impl.h
index 9143d3cc019d2..b6f1cabc0d9f1 100644
--- a/cc/blink/web_transform_animation_curve_impl.h
+++ b/cc/blink/web_transform_animation_curve_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_TRANSFORM_ANIMATION_CURVE_IMPL_H_
 #define CC_BLINK_WEB_TRANSFORM_ANIMATION_CURVE_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
 #include "third_party/WebKit/public/platform/WebTransformAnimationCurve.h"
diff --git a/cc/blink/web_transform_operations_impl.h b/cc/blink/web_transform_operations_impl.h
index f8fe22b6d88c9..c13a72b6a97ee 100644
--- a/cc/blink/web_transform_operations_impl.h
+++ b/cc/blink/web_transform_operations_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_BLINK_WEB_TRANSFORM_OPERATIONS_IMPL_H_
 #define CC_BLINK_WEB_TRANSFORM_OPERATIONS_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/animation/transform_operations.h"
 #include "cc/blink/cc_blink_export.h"
diff --git a/cc/debug/benchmark_instrumentation.h b/cc/debug/benchmark_instrumentation.h
index 99cfa21f62f3a..af70156e1c2e9 100644
--- a/cc/debug/benchmark_instrumentation.h
+++ b/cc/debug/benchmark_instrumentation.h
@@ -5,6 +5,7 @@
 #ifndef CC_DEBUG_BENCHMARK_INSTRUMENTATION_H_
 #define CC_DEBUG_BENCHMARK_INSTRUMENTATION_H_
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/rendering_stats.h"
 
diff --git a/cc/debug/debug_colors.h b/cc/debug/debug_colors.h
index 1efabde86f877..673f199cb6d77 100644
--- a/cc/debug/debug_colors.h
+++ b/cc/debug/debug_colors.h
@@ -5,7 +5,7 @@
 #ifndef CC_DEBUG_DEBUG_COLORS_H_
 #define CC_DEBUG_DEBUG_COLORS_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {
diff --git a/cc/debug/debug_rect_history.cc b/cc/debug/debug_rect_history.cc
index 10faaca4088ee..5ac2b5d8b5536 100644
--- a/cc/debug/debug_rect_history.cc
+++ b/cc/debug/debug_rect_history.cc
@@ -4,6 +4,8 @@
 
 #include "cc/debug/debug_rect_history.h"
 
+#include <stddef.h>
+
 #include "cc/base/math_util.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/layer_iterator.h"
diff --git a/cc/debug/debug_rect_history.h b/cc/debug/debug_rect_history.h
index 6bcf43853450a..bea34670fb4c7 100644
--- a/cc/debug/debug_rect_history.h
+++ b/cc/debug/debug_rect_history.h
@@ -6,7 +6,7 @@
 #define CC_DEBUG_DEBUG_RECT_HISTORY_H_
 
 #include <vector>
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/layer_lists.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/cc/debug/devtools_instrumentation.h b/cc/debug/devtools_instrumentation.h
index 3a285799840c5..f6eacdc12d497 100644
--- a/cc/debug/devtools_instrumentation.h
+++ b/cc/debug/devtools_instrumentation.h
@@ -5,6 +5,9 @@
 #ifndef CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
 #define CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 
@@ -55,7 +58,7 @@ class ScopedImageDecodeTask {
   explicit ScopedImageDecodeTask(const void* imagePtr) {
     TRACE_EVENT_BEGIN1(internal::kCategory, internal::kImageDecodeTask,
                        internal::kPixelRefId,
-                       reinterpret_cast<uint64>(imagePtr));
+                       reinterpret_cast<uint64_t>(imagePtr));
   }
   ~ScopedImageDecodeTask() {
     TRACE_EVENT_END0(internal::kCategory, internal::kImageDecodeTask);
diff --git a/cc/debug/frame_rate_counter.cc b/cc/debug/frame_rate_counter.cc
index c43270dcf1fa5..a6b4a44519bc6 100644
--- a/cc/debug/frame_rate_counter.cc
+++ b/cc/debug/frame_rate_counter.cc
@@ -4,6 +4,8 @@
 
 #include "cc/debug/frame_rate_counter.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <limits>
 
diff --git a/cc/debug/frame_rate_counter.h b/cc/debug/frame_rate_counter.h
index c50d7e222377a..ad91598a9b85e 100644
--- a/cc/debug/frame_rate_counter.h
+++ b/cc/debug/frame_rate_counter.h
@@ -5,7 +5,9 @@
 #ifndef CC_DEBUG_FRAME_RATE_COUNTER_H_
 #define CC_DEBUG_FRAME_RATE_COUNTER_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/debug/ring_buffer.h"
diff --git a/cc/debug/frame_timing_request.cc b/cc/debug/frame_timing_request.cc
index 6c54ea2817a89..211d57d51f2a0 100644
--- a/cc/debug/frame_timing_request.cc
+++ b/cc/debug/frame_timing_request.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 "cc/debug/frame_timing_request.h"
 
 namespace cc {
diff --git a/cc/debug/frame_timing_request.h b/cc/debug/frame_timing_request.h
index aedd720529835..6b2b57c5f5f24 100644
--- a/cc/debug/frame_timing_request.h
+++ b/cc/debug/frame_timing_request.h
@@ -5,6 +5,8 @@
 #ifndef CC_DEBUG_FRAME_TIMING_REQUEST_H_
 #define CC_DEBUG_FRAME_TIMING_REQUEST_H_
 
+#include <stdint.h>
+
 #include "cc/base/cc_export.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/cc/debug/frame_timing_tracker.cc b/cc/debug/frame_timing_tracker.cc
index e1e7258dd0f87..dda2e311e51da 100644
--- a/cc/debug/frame_timing_tracker.cc
+++ b/cc/debug/frame_timing_tracker.cc
@@ -4,6 +4,8 @@
 
 #include "cc/debug/frame_timing_tracker.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <limits>
 
diff --git a/cc/debug/frame_timing_tracker.h b/cc/debug/frame_timing_tracker.h
index 7b638d7f8accc..5341b6ada84f4 100644
--- a/cc/debug/frame_timing_tracker.h
+++ b/cc/debug/frame_timing_tracker.h
@@ -5,11 +5,13 @@
 #ifndef CC_DEBUG_FRAME_TIMING_TRACKER_H_
 #define CC_DEBUG_FRAME_TIMING_TRACKER_H_
 
+#include <stdint.h>
+
 #include <utility>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/debug/frame_timing_tracker_unittest.cc b/cc/debug/frame_timing_tracker_unittest.cc
index 7383497742585..141e9b745a67d 100644
--- a/cc/debug/frame_timing_tracker_unittest.cc
+++ b/cc/debug/frame_timing_tracker_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 <set>
 #include <string>
 
diff --git a/cc/debug/frame_viewer_instrumentation.h b/cc/debug/frame_viewer_instrumentation.h
index 773e8c55d1d26..119e523df232a 100644
--- a/cc/debug/frame_viewer_instrumentation.h
+++ b/cc/debug/frame_viewer_instrumentation.h
@@ -5,6 +5,7 @@
 #ifndef CC_DEBUG_FRAME_VIEWER_INSTRUMENTATION_H_
 #define CC_DEBUG_FRAME_VIEWER_INSTRUMENTATION_H_
 
+#include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/tiles/tile.h"
 #include "cc/tiles/tile_priority.h"
diff --git a/cc/debug/invalidation_benchmark.cc b/cc/debug/invalidation_benchmark.cc
index 8a9fc88322482..0cd68cb8d9a20 100644
--- a/cc/debug/invalidation_benchmark.cc
+++ b/cc/debug/invalidation_benchmark.cc
@@ -4,10 +4,11 @@
 
 #include "cc/debug/invalidation_benchmark.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <limits>
 
-#include "base/basictypes.h"
 #include "base/rand_util.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
@@ -126,10 +127,10 @@ bool InvalidationBenchmark::ProcessMessage(scoped_ptr<base::Value> value) {
 // high quality, but they need to be identical in each run. Therefore, we use a
 // LCG and keep the state locally in the benchmark.
 float InvalidationBenchmark::LCGRandom() {
-  const uint32 a = 1664525;
-  const uint32 c = 1013904223;
+  const uint32_t a = 1664525;
+  const uint32_t c = 1013904223;
   seed_ = a * seed_ + c;
-  return static_cast<float>(seed_) / std::numeric_limits<uint32>::max();
+  return static_cast<float>(seed_) / std::numeric_limits<uint32_t>::max();
 }
 
 }  // namespace cc
diff --git a/cc/debug/invalidation_benchmark.h b/cc/debug/invalidation_benchmark.h
index 9423d5d8e7946..9cd264376b84a 100644
--- a/cc/debug/invalidation_benchmark.h
+++ b/cc/debug/invalidation_benchmark.h
@@ -5,6 +5,8 @@
 #ifndef CC_DEBUG_INVALIDATION_BENCHMARK_H_
 #define CC_DEBUG_INVALIDATION_BENCHMARK_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "cc/debug/micro_benchmark_controller.h"
@@ -36,7 +38,7 @@ class CC_EXPORT InvalidationBenchmark : public MicroBenchmark {
   Mode mode_;
   int width_;
   int height_;
-  uint32 seed_;
+  uint32_t seed_;
 };
 
 }  // namespace cc
diff --git a/cc/debug/lap_timer.h b/cc/debug/lap_timer.h
index 48f99172040ab..bd1ba4fdb88a9 100644
--- a/cc/debug/lap_timer.h
+++ b/cc/debug/lap_timer.h
@@ -5,6 +5,7 @@
 #ifndef CC_DEBUG_LAP_TIMER_H_
 #define CC_DEBUG_LAP_TIMER_H_
 
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
 
diff --git a/cc/debug/layer_tree_debug_state.h b/cc/debug/layer_tree_debug_state.h
index d2f13d45a7d8b..3b5ba3af960d8 100644
--- a/cc/debug/layer_tree_debug_state.h
+++ b/cc/debug/layer_tree_debug_state.h
@@ -5,7 +5,6 @@
 #ifndef CC_DEBUG_LAYER_TREE_DEBUG_STATE_H_
 #define CC_DEBUG_LAYER_TREE_DEBUG_STATE_H_
 
-#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 
 namespace cc {
diff --git a/cc/debug/micro_benchmark_controller.h b/cc/debug/micro_benchmark_controller.h
index 8f1cdfc2410b9..95000cbaafc47 100644
--- a/cc/debug/micro_benchmark_controller.h
+++ b/cc/debug/micro_benchmark_controller.h
@@ -8,8 +8,8 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "cc/debug/micro_benchmark.h"
 
 namespace base {
diff --git a/cc/debug/micro_benchmark_controller_impl.h b/cc/debug/micro_benchmark_controller_impl.h
index 6fdf0438920de..bcb4aa0830590 100644
--- a/cc/debug/micro_benchmark_controller_impl.h
+++ b/cc/debug/micro_benchmark_controller_impl.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "cc/debug/micro_benchmark_impl.h"
 
 namespace cc {
diff --git a/cc/debug/picture_debug_util.cc b/cc/debug/picture_debug_util.cc
index 5494d99f9606b..b1879afb567e4 100644
--- a/cc/debug/picture_debug_util.cc
+++ b/cc/debug/picture_debug_util.cc
@@ -4,6 +4,8 @@
 
 #include "cc/debug/picture_debug_util.h"
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/base64.h"
diff --git a/cc/debug/rasterize_and_record_benchmark.cc b/cc/debug/rasterize_and_record_benchmark.cc
index 41cd9cc1f25d4..8e75017f74cca 100644
--- a/cc/debug/rasterize_and_record_benchmark.cc
+++ b/cc/debug/rasterize_and_record_benchmark.cc
@@ -4,11 +4,12 @@
 
 #include "cc/debug/rasterize_and_record_benchmark.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <limits>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "cc/debug/lap_timer.h"
diff --git a/cc/debug/rasterize_and_record_benchmark.h b/cc/debug/rasterize_and_record_benchmark.h
index d96f08752f832..76278aca2dca1 100644
--- a/cc/debug/rasterize_and_record_benchmark.h
+++ b/cc/debug/rasterize_and_record_benchmark.h
@@ -5,6 +5,8 @@
 #ifndef CC_DEBUG_RASTERIZE_AND_RECORD_BENCHMARK_H_
 #define CC_DEBUG_RASTERIZE_AND_RECORD_BENCHMARK_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <utility>
 #include <vector>
diff --git a/cc/debug/rasterize_and_record_benchmark_impl.cc b/cc/debug/rasterize_and_record_benchmark_impl.cc
index 2d649cc12a894..de6817005d4bd 100644
--- a/cc/debug/rasterize_and_record_benchmark_impl.cc
+++ b/cc/debug/rasterize_and_record_benchmark_impl.cc
@@ -4,10 +4,11 @@
 
 #include "cc/debug/rasterize_and_record_benchmark_impl.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <limits>
 
-#include "base/basictypes.h"
 #include "base/values.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/layers/layer_impl.h"
diff --git a/cc/debug/rasterize_and_record_benchmark_impl.h b/cc/debug/rasterize_and_record_benchmark_impl.h
index 99b22f154e7ef..bb4d9a09fb863 100644
--- a/cc/debug/rasterize_and_record_benchmark_impl.h
+++ b/cc/debug/rasterize_and_record_benchmark_impl.h
@@ -5,6 +5,8 @@
 #ifndef CC_DEBUG_RASTERIZE_AND_RECORD_BENCHMARK_IMPL_H_
 #define CC_DEBUG_RASTERIZE_AND_RECORD_BENCHMARK_IMPL_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <utility>
 #include <vector>
diff --git a/cc/debug/rendering_stats.h b/cc/debug/rendering_stats.h
index fbe0d638199d4..f2964472860c1 100644
--- a/cc/debug/rendering_stats.h
+++ b/cc/debug/rendering_stats.h
@@ -5,9 +5,10 @@
 #ifndef CC_DEBUG_RENDERING_STATS_H_
 #define CC_DEBUG_RENDERING_STATS_H_
 
+#include <stdint.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
@@ -41,12 +42,12 @@ struct CC_EXPORT RenderingStats {
   // Note: when adding new members, please remember to update Add in
   // rendering_stats.cc.
 
-  int64 frame_count;
-  int64 visible_content_area;
-  int64 approximated_visible_content_area;
-  int64 checkerboarded_visible_content_area;
-  int64 checkerboarded_no_recording_content_area;
-  int64 checkerboarded_needs_raster_content_area;
+  int64_t frame_count;
+  int64_t visible_content_area;
+  int64_t approximated_visible_content_area;
+  int64_t checkerboarded_visible_content_area;
+  int64_t checkerboarded_no_recording_content_area;
+  int64_t checkerboarded_needs_raster_content_area;
 
   TimeDeltaList draw_duration;
   TimeDeltaList draw_duration_estimate;
diff --git a/cc/debug/rendering_stats_instrumentation.cc b/cc/debug/rendering_stats_instrumentation.cc
index 94768c657d5a2..de7057e74f688 100644
--- a/cc/debug/rendering_stats_instrumentation.cc
+++ b/cc/debug/rendering_stats_instrumentation.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 "cc/debug/rendering_stats_instrumentation.h"
 
 namespace cc {
@@ -37,7 +39,7 @@ void RenderingStatsInstrumentation::AccumulateAndClearImplThreadStats() {
   impl_thread_rendering_stats_ = RenderingStats();
 }
 
-void RenderingStatsInstrumentation::IncrementFrameCount(int64 count) {
+void RenderingStatsInstrumentation::IncrementFrameCount(int64_t count) {
   if (!record_rendering_stats_)
     return;
 
@@ -45,7 +47,7 @@ void RenderingStatsInstrumentation::IncrementFrameCount(int64 count) {
   impl_thread_rendering_stats_.frame_count += count;
 }
 
-void RenderingStatsInstrumentation::AddVisibleContentArea(int64 area) {
+void RenderingStatsInstrumentation::AddVisibleContentArea(int64_t area) {
   if (!record_rendering_stats_)
     return;
 
@@ -54,7 +56,7 @@ void RenderingStatsInstrumentation::AddVisibleContentArea(int64 area) {
 }
 
 void RenderingStatsInstrumentation::AddApproximatedVisibleContentArea(
-    int64 area) {
+    int64_t area) {
   if (!record_rendering_stats_)
     return;
 
@@ -63,7 +65,7 @@ void RenderingStatsInstrumentation::AddApproximatedVisibleContentArea(
 }
 
 void RenderingStatsInstrumentation::AddCheckerboardedVisibleContentArea(
-    int64 area) {
+    int64_t area) {
   if (!record_rendering_stats_)
     return;
 
@@ -72,7 +74,7 @@ void RenderingStatsInstrumentation::AddCheckerboardedVisibleContentArea(
 }
 
 void RenderingStatsInstrumentation::AddCheckerboardedNoRecordingContentArea(
-    int64 area) {
+    int64_t area) {
   if (!record_rendering_stats_)
     return;
 
@@ -81,7 +83,7 @@ void RenderingStatsInstrumentation::AddCheckerboardedNoRecordingContentArea(
 }
 
 void RenderingStatsInstrumentation::AddCheckerboardedNeedsRasterContentArea(
-    int64 area) {
+    int64_t area) {
   if (!record_rendering_stats_)
     return;
 
diff --git a/cc/debug/rendering_stats_instrumentation.h b/cc/debug/rendering_stats_instrumentation.h
index 834e10c069d29..9197fb6ac13f5 100644
--- a/cc/debug/rendering_stats_instrumentation.h
+++ b/cc/debug/rendering_stats_instrumentation.h
@@ -5,6 +5,9 @@
 #ifndef CC_DEBUG_RENDERING_STATS_INSTRUMENTATION_H_
 #define CC_DEBUG_RENDERING_STATS_INSTRUMENTATION_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "cc/debug/rendering_stats.h"
@@ -37,12 +40,12 @@ class CC_EXPORT RenderingStatsInstrumentation {
       record_rendering_stats_ = record_rendering_stats;
   }
 
-  void IncrementFrameCount(int64 count);
-  void AddVisibleContentArea(int64 area);
-  void AddApproximatedVisibleContentArea(int64 area);
-  void AddCheckerboardedVisibleContentArea(int64 area);
-  void AddCheckerboardedNoRecordingContentArea(int64 area);
-  void AddCheckerboardedNeedsRasterContentArea(int64 area);
+  void IncrementFrameCount(int64_t count);
+  void AddVisibleContentArea(int64_t area);
+  void AddApproximatedVisibleContentArea(int64_t area);
+  void AddCheckerboardedVisibleContentArea(int64_t area);
+  void AddCheckerboardedNoRecordingContentArea(int64_t area);
+  void AddCheckerboardedNeedsRasterContentArea(int64_t area);
   void AddDrawDuration(base::TimeDelta draw_duration,
                        base::TimeDelta draw_duration_estimate);
   void AddBeginMainFrameToCommitDuration(
diff --git a/cc/debug/ring_buffer.h b/cc/debug/ring_buffer.h
index f9a6749e11622..5f7d49ae62e51 100644
--- a/cc/debug/ring_buffer.h
+++ b/cc/debug/ring_buffer.h
@@ -5,7 +5,10 @@
 #ifndef CC_DEBUG_RING_BUFFER_H_
 #define CC_DEBUG_RING_BUFFER_H_
 
+#include <stddef.h>
+
 #include "base/logging.h"
+#include "base/macros.h"
 
 namespace cc {
 
diff --git a/cc/debug/traced_display_item_list.h b/cc/debug/traced_display_item_list.h
index f7caa04b49e34..6b422435c6e82 100644
--- a/cc/debug/traced_display_item_list.h
+++ b/cc/debug/traced_display_item_list.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/debug/traced_value.h"
diff --git a/cc/input/input_handler.h b/cc/input/input_handler.h
index 7b09cc169523e..2d49543a51360 100644
--- a/cc/input/input_handler.h
+++ b/cc/input/input_handler.h
@@ -5,7 +5,7 @@
 #ifndef CC_INPUT_INPUT_HANDLER_H_
 #define CC_INPUT_INPUT_HANDLER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/input/page_scale_animation.h b/cc/input/page_scale_animation.h
index d73116c5d7d48..dbe018b2f2647 100644
--- a/cc/input/page_scale_animation.h
+++ b/cc/input/page_scale_animation.h
@@ -5,7 +5,7 @@
 #ifndef CC_INPUT_PAGE_SCALE_ANIMATION_H_
 #define CC_INPUT_PAGE_SCALE_ANIMATION_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/input/top_controls_manager.cc b/cc/input/top_controls_manager.cc
index 5fe126726af17..6547f207977a4 100644
--- a/cc/input/top_controls_manager.cc
+++ b/cc/input/top_controls_manager.cc
@@ -4,6 +4,8 @@
 
 #include "cc/input/top_controls_manager.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/logging.h"
@@ -19,7 +21,7 @@ namespace cc {
 namespace {
 // These constants were chosen empirically for their visually pleasant behavior.
 // Contact tedchoc@chromium.org for questions about changing these values.
-const int64 kShowHideMaxDurationMs = 200;
+const int64_t kShowHideMaxDurationMs = 200;
 }
 
 // static
diff --git a/cc/input/top_controls_manager.h b/cc/input/top_controls_manager.h
index fc40378f5f8ec..8cd7c2901dd0e 100644
--- a/cc/input/top_controls_manager.h
+++ b/cc/input/top_controls_manager.h
@@ -5,6 +5,7 @@
 #ifndef CC_INPUT_TOP_CONTROLS_MANAGER_H_
 #define CC_INPUT_TOP_CONTROLS_MANAGER_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/input/top_controls_state.h"
diff --git a/cc/layers/append_quads_data.h b/cc/layers/append_quads_data.h
index 3d05109c176cc..f4e82bc993a91 100644
--- a/cc/layers/append_quads_data.h
+++ b/cc/layers/append_quads_data.h
@@ -5,7 +5,8 @@
 #ifndef CC_LAYERS_APPEND_QUADS_DATA_H_
 #define CC_LAYERS_APPEND_QUADS_DATA_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "cc/quads/render_pass_id.h"
 
 namespace cc {
@@ -21,19 +22,19 @@ struct AppendQuadsData {
         checkerboarded_needs_raster_content_area(0) {}
 
   // Set by the layer appending quads.
-  int64 num_incomplete_tiles;
+  int64_t num_incomplete_tiles;
   // Set by the layer appending quads.
-  int64 num_missing_tiles;
+  int64_t num_missing_tiles;
   // Set by the layer appending quads.
-  int64 visible_layer_area;
+  int64_t visible_layer_area;
   // Set by the layer appending quads.
-  int64 approximated_visible_content_area;
+  int64_t approximated_visible_content_area;
   // Set by the layer appending quads. This is total of the following two areas.
-  int64 checkerboarded_visible_content_area;
+  int64_t checkerboarded_visible_content_area;
   // Set by the layer appending quads. This is the area outside interest rect.
-  int64 checkerboarded_no_recording_content_area;
+  int64_t checkerboarded_no_recording_content_area;
   // Set by the layer appending quads. This is the area within interest rect.
-  int64 checkerboarded_needs_raster_content_area;
+  int64_t checkerboarded_needs_raster_content_area;
 };
 
 }  // namespace cc
diff --git a/cc/layers/content_layer_client.h b/cc/layers/content_layer_client.h
index 6c9983b255e7e..24c37aeaa3f0f 100644
--- a/cc/layers/content_layer_client.h
+++ b/cc/layers/content_layer_client.h
@@ -5,6 +5,8 @@
 #ifndef CC_LAYERS_CONTENT_LAYER_CLIENT_H_
 #define CC_LAYERS_CONTENT_LAYER_CLIENT_H_
 
+#include <stddef.h>
+
 #include "cc/base/cc_export.h"
 #include "cc/playback/display_item_list.h"
 
diff --git a/cc/layers/delegated_frame_provider.cc b/cc/layers/delegated_frame_provider.cc
index 06b041f627afd..4923485d08135 100644
--- a/cc/layers/delegated_frame_provider.cc
+++ b/cc/layers/delegated_frame_provider.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/delegated_frame_provider.h"
 
+#include <stddef.h>
+
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/output/delegated_frame_data.h"
diff --git a/cc/layers/delegated_frame_provider.h b/cc/layers/delegated_frame_provider.h
index f3f93732a6eac..7757d0ccacde5 100644
--- a/cc/layers/delegated_frame_provider.h
+++ b/cc/layers/delegated_frame_provider.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/layers/delegated_frame_resource_collection.cc b/cc/layers/delegated_frame_resource_collection.cc
index a1bc759a0330e..c567b822f7e00 100644
--- a/cc/layers/delegated_frame_resource_collection.cc
+++ b/cc/layers/delegated_frame_resource_collection.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/delegated_frame_resource_collection.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "cc/trees/blocking_task_runner.h"
 
diff --git a/cc/layers/delegated_frame_resource_collection.h b/cc/layers/delegated_frame_resource_collection.h
index afbc3555a94d7..0e38c684d3e5b 100644
--- a/cc/layers/delegated_frame_resource_collection.h
+++ b/cc/layers/delegated_frame_resource_collection.h
@@ -6,6 +6,7 @@
 #define CC_LAYERS_DELEGATED_FRAME_RESOURCE_COLLECTION_H_
 
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
diff --git a/cc/layers/delegated_renderer_layer.h b/cc/layers/delegated_renderer_layer.h
index 8845258895cdb..b71b6eec20717 100644
--- a/cc/layers/delegated_renderer_layer.h
+++ b/cc/layers/delegated_renderer_layer.h
@@ -6,6 +6,7 @@
 #define CC_LAYERS_DELEGATED_RENDERER_LAYER_H_
 
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
diff --git a/cc/layers/delegated_renderer_layer_impl.cc b/cc/layers/delegated_renderer_layer_impl.cc
index 000a7ea809a44..5d511168a9b44 100644
--- a/cc/layers/delegated_renderer_layer_impl.cc
+++ b/cc/layers/delegated_renderer_layer_impl.cc
@@ -4,6 +4,9 @@
 
 #include "cc/layers/delegated_renderer_layer_impl.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <utility>
 
diff --git a/cc/layers/delegated_renderer_layer_impl.h b/cc/layers/delegated_renderer_layer_impl.h
index 5c9b46aa1a90a..0ca13ebaa83ad 100644
--- a/cc/layers/delegated_renderer_layer_impl.h
+++ b/cc/layers/delegated_renderer_layer_impl.h
@@ -5,7 +5,10 @@
 #ifndef CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_
 #define CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_
 
+#include <stddef.h>
+
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index 725fb79afc0df..b94dedf93b2e4 100644
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/delegated_renderer_layer_impl.h"
 
+#include <stddef.h>
+
 #include "cc/layers/solid_color_layer_impl.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
diff --git a/cc/layers/draw_properties.h b/cc/layers/draw_properties.h
index bcab91036be51..0c7e4795f3ae0 100644
--- a/cc/layers/draw_properties.h
+++ b/cc/layers/draw_properties.h
@@ -5,6 +5,8 @@
 #ifndef CC_LAYERS_DRAW_PROPERTIES_H_
 #define CC_LAYERS_DRAW_PROPERTIES_H_
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/trees/occlusion.h"
 #include "third_party/skia/include/core/SkXfermode.h"
diff --git a/cc/layers/heads_up_display_layer.h b/cc/layers/heads_up_display_layer.h
index 0760353ed9fde..5ffa31aa0c9e2 100644
--- a/cc/layers/heads_up_display_layer.h
+++ b/cc/layers/heads_up_display_layer.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc
index 4d65a8179ff35..dd13298303309 100644
--- a/cc/layers/heads_up_display_layer_impl.cc
+++ b/cc/layers/heads_up_display_layer_impl.cc
@@ -4,6 +4,9 @@
 
 #include "cc/layers/heads_up_display_layer_impl.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <vector>
 
diff --git a/cc/layers/heads_up_display_layer_impl.h b/cc/layers/heads_up_display_layer_impl.h
index e5880c49d39a1..07e4bedead1f7 100644
--- a/cc/layers/heads_up_display_layer_impl.h
+++ b/cc/layers/heads_up_display_layer_impl.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/layers/heads_up_display_layer_impl_unittest.cc b/cc/layers/heads_up_display_layer_impl_unittest.cc
index 77cfe55905bff..e104c33d061fc 100644
--- a/cc/layers/heads_up_display_layer_impl_unittest.cc
+++ b/cc/layers/heads_up_display_layer_impl_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 <stddef.h>
+
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
diff --git a/cc/layers/io_surface_layer.cc b/cc/layers/io_surface_layer.cc
index c2e35304b6069..7fb3f3f111af7 100644
--- a/cc/layers/io_surface_layer.cc
+++ b/cc/layers/io_surface_layer.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/io_surface_layer.h"
 
+#include <stdint.h>
+
 #include "cc/layers/io_surface_layer_impl.h"
 
 namespace cc {
diff --git a/cc/layers/io_surface_layer.h b/cc/layers/io_surface_layer.h
index 14eabd98a1e2c..a88492fb0b437 100644
--- a/cc/layers/io_surface_layer.h
+++ b/cc/layers/io_surface_layer.h
@@ -5,6 +5,9 @@
 #ifndef CC_LAYERS_IO_SURFACE_LAYER_H_
 #define CC_LAYERS_IO_SURFACE_LAYER_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
 
diff --git a/cc/layers/io_surface_layer_impl.h b/cc/layers/io_surface_layer_impl.h
index 8317760cd9214..29e9973ed426e 100644
--- a/cc/layers/io_surface_layer_impl.h
+++ b/cc/layers/io_surface_layer_impl.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/cc/layers/io_surface_layer_impl_unittest.cc b/cc/layers/io_surface_layer_impl_unittest.cc
index 75c2cf77f8378..ff3e79e0a1878 100644
--- a/cc/layers/io_surface_layer_impl_unittest.cc
+++ b/cc/layers/io_surface_layer_impl_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/io_surface_layer_impl.h"
 
+#include <stddef.h>
+
 #include "cc/test/layer_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index 526b5dd27c0a8..c085f16bedf5a 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -4,6 +4,9 @@
 
 #include "cc/layers/layer.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/atomic_sequence_num.h"
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index c5c031c383b23..6c9036c2b5e01 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -5,11 +5,15 @@
 #ifndef CC_LAYERS_LAYER_H_
 #define CC_LAYERS_LAYER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "cc/animation/layer_animation_controller.h"
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 74927e8ae501b..3837bca46148a 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -4,6 +4,9 @@
 
 #include "cc/layers/layer_impl.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/json/json_reader.h"
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 8d83a0e1d1e6d..42362c8618fb5 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -5,12 +5,16 @@
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/animation/animation_delegate.h"
diff --git a/cc/layers/layer_iterator.h b/cc/layers/layer_iterator.h
index 2c129e48cb322..cf01ca19a4126 100644
--- a/cc/layers/layer_iterator.h
+++ b/cc/layers/layer_iterator.h
@@ -5,6 +5,8 @@
 #ifndef CC_LAYERS_LAYER_ITERATOR_H_
 #define CC_LAYERS_LAYER_ITERATOR_H_
 
+#include <stddef.h>
+
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/trees/layer_tree_host_common.h"
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 789152aebb4b6..a9caa02f651b9 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/layer.h"
 
+#include <stddef.h>
+
 #include "base/thread_task_runner_handle.h"
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/animation/mutable_properties.h"
diff --git a/cc/layers/nine_patch_layer.h b/cc/layers/nine_patch_layer.h
index 714a407ddb0fc..ff766634b19a4 100644
--- a/cc/layers/nine_patch_layer.h
+++ b/cc/layers/nine_patch_layer.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_NINE_PATCH_LAYER_H_
 #define CC_LAYERS_NINE_PATCH_LAYER_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
diff --git a/cc/layers/nine_patch_layer_impl.h b/cc/layers/nine_patch_layer_impl.h
index 948758a876a00..28721b32757b3 100644
--- a/cc/layers/nine_patch_layer_impl.h
+++ b/cc/layers/nine_patch_layer_impl.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/ui_resource_layer_impl.h"
diff --git a/cc/layers/nine_patch_layer_impl_unittest.cc b/cc/layers/nine_patch_layer_impl_unittest.cc
index e4c779a1be230..967787242856c 100644
--- a/cc/layers/nine_patch_layer_impl_unittest.cc
+++ b/cc/layers/nine_patch_layer_impl_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 <stddef.h>
+
 #include "base/containers/hash_tables.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/nine_patch_layer_impl.h"
diff --git a/cc/layers/painted_scrollbar_layer.cc b/cc/layers/painted_scrollbar_layer.cc
index 0d25dbcc09a81..13826e7e462ad 100644
--- a/cc/layers/painted_scrollbar_layer.cc
+++ b/cc/layers/painted_scrollbar_layer.cc
@@ -7,7 +7,6 @@
 #include <algorithm>
 
 #include "base/auto_reset.h"
-#include "base/basictypes.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/painted_scrollbar_layer_impl.h"
diff --git a/cc/layers/painted_scrollbar_layer.h b/cc/layers/painted_scrollbar_layer.h
index 8f016018f72a0..27dc2c3dd8349 100644
--- a/cc/layers/painted_scrollbar_layer.h
+++ b/cc/layers/painted_scrollbar_layer.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_
 #define CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/input/scrollbar.h"
 #include "cc/layers/layer.h"
diff --git a/cc/layers/painted_scrollbar_layer_impl.h b/cc/layers/painted_scrollbar_layer_impl.h
index 190526f78aa4d..8ea06ab5d8c03 100644
--- a/cc/layers/painted_scrollbar_layer_impl.h
+++ b/cc/layers/painted_scrollbar_layer_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_PAINTED_SCROLLBAR_LAYER_IMPL_H_
 #define CC_LAYERS_PAINTED_SCROLLBAR_LAYER_IMPL_H_
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/input/scrollbar.h"
 #include "cc/layers/scrollbar_layer_impl_base.h"
diff --git a/cc/layers/painted_scrollbar_layer_impl_unittest.cc b/cc/layers/painted_scrollbar_layer_impl_unittest.cc
index 3edc450a25dc6..4bc3f066af7bd 100644
--- a/cc/layers/painted_scrollbar_layer_impl_unittest.cc
+++ b/cc/layers/painted_scrollbar_layer_impl_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/painted_scrollbar_layer_impl.h"
 
+#include <stddef.h>
+
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/test/layer_test_common.h"
diff --git a/cc/layers/picture_image_layer.cc b/cc/layers/picture_image_layer.cc
index 0ca203edfe5c4..b5a55c237d081 100644
--- a/cc/layers/picture_image_layer.cc
+++ b/cc/layers/picture_image_layer.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/picture_image_layer.h"
 
+#include <stddef.h>
+
 #include "cc/layers/picture_image_layer_impl.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
diff --git a/cc/layers/picture_image_layer.h b/cc/layers/picture_image_layer.h
index 146ce83c9b1b8..fd3c1a22d9a63 100644
--- a/cc/layers/picture_image_layer.h
+++ b/cc/layers/picture_image_layer.h
@@ -5,6 +5,9 @@
 #ifndef CC_LAYERS_PICTURE_IMAGE_LAYER_H_
 #define CC_LAYERS_PICTURE_IMAGE_LAYER_H_
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer.h"
diff --git a/cc/layers/picture_image_layer_impl.h b/cc/layers/picture_image_layer_impl.h
index f478951592fdb..759606a2f45b1 100644
--- a/cc/layers/picture_image_layer_impl.h
+++ b/cc/layers/picture_image_layer_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
 #define CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
 
+#include "base/macros.h"
 #include "cc/layers/picture_layer_impl.h"
 
 namespace cc {
diff --git a/cc/layers/picture_layer.h b/cc/layers/picture_layer.h
index 7eb87f082035b..7f1345e76d9d5 100644
--- a/cc/layers/picture_layer.h
+++ b/cc/layers/picture_layer.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_PICTURE_LAYER_H_
 #define CC_LAYERS_PICTURE_LAYER_H_
 
+#include "base/macros.h"
 #include "cc/base/invalidation_region.h"
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/debug/micro_benchmark_controller.h"
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 8d2efe0cff76d..b3590d43d6e0a 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -4,6 +4,9 @@
 
 #include "cc/layers/picture_layer_impl.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <cmath>
 #include <limits>
@@ -347,7 +350,7 @@ void PictureLayerImpl::AppendQuads(RenderPass* render_pass,
         append_quads_data->num_missing_tiles++;
         ++missing_tile_count;
       }
-      int64 checkerboarded_area =
+      int64_t checkerboarded_area =
           visible_geometry_rect.width() * visible_geometry_rect.height();
       append_quads_data->checkerboarded_visible_content_area +=
           checkerboarded_area;
@@ -357,7 +360,7 @@ void PictureLayerImpl::AppendQuads(RenderPass* render_pass,
       // subtraction.
       gfx::Rect visible_rect_has_recording = visible_geometry_rect;
       visible_rect_has_recording.Intersect(scaled_recorded_viewport);
-      int64 checkerboarded_has_recording_area =
+      int64_t checkerboarded_has_recording_area =
           visible_rect_has_recording.width() *
           visible_rect_has_recording.height();
       append_quads_data->checkerboarded_needs_raster_content_area +=
@@ -977,22 +980,24 @@ void PictureLayerImpl::RecalculateRasterScales() {
     if (maximum_scale) {
       gfx::Size bounds_at_maximum_scale =
           gfx::ScaleToCeiledSize(raster_source_->GetSize(), maximum_scale);
-      int64 maximum_area = static_cast<int64>(bounds_at_maximum_scale.width()) *
-                           static_cast<int64>(bounds_at_maximum_scale.height());
+      int64_t maximum_area =
+          static_cast<int64_t>(bounds_at_maximum_scale.width()) *
+          static_cast<int64_t>(bounds_at_maximum_scale.height());
       gfx::Size viewport = layer_tree_impl()->device_viewport_size();
-      int64 viewport_area = static_cast<int64>(viewport.width()) *
-                            static_cast<int64>(viewport.height());
+      int64_t viewport_area = static_cast<int64_t>(viewport.width()) *
+                              static_cast<int64_t>(viewport.height());
       if (maximum_area <= viewport_area)
         can_raster_at_maximum_scale = true;
     }
     if (starting_scale && starting_scale > maximum_scale) {
       gfx::Size bounds_at_starting_scale =
           gfx::ScaleToCeiledSize(raster_source_->GetSize(), starting_scale);
-      int64 start_area = static_cast<int64>(bounds_at_starting_scale.width()) *
-                         static_cast<int64>(bounds_at_starting_scale.height());
+      int64_t start_area =
+          static_cast<int64_t>(bounds_at_starting_scale.width()) *
+          static_cast<int64_t>(bounds_at_starting_scale.height());
       gfx::Size viewport = layer_tree_impl()->device_viewport_size();
-      int64 viewport_area = static_cast<int64>(viewport.width()) *
-                            static_cast<int64>(viewport.height());
+      int64_t viewport_area = static_cast<int64_t>(viewport.width()) *
+                              static_cast<int64_t>(viewport.height());
       if (start_area <= viewport_area)
         should_raster_at_starting_scale = true;
     }
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index 6cbd7a060d03c..8a2465a15bc38 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -5,10 +5,13 @@
 #ifndef CC_LAYERS_PICTURE_LAYER_IMPL_H_
 #define CC_LAYERS_PICTURE_LAYER_IMPL_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/tiles/picture_layer_tiling.h"
diff --git a/cc/layers/picture_layer_impl_perftest.cc b/cc/layers/picture_layer_impl_perftest.cc
index 5088df456cd9a..c38dd3ea7d880 100644
--- a/cc/layers/picture_layer_impl_perftest.cc
+++ b/cc/layers/picture_layer_impl_perftest.cc
@@ -4,6 +4,7 @@
 
 #include "cc/layers/picture_layer_impl.h"
 
+#include "base/macros.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/test/fake_display_list_raster_source.h"
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index c41ff5ab404e4..badd37fcca2ec 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -4,12 +4,15 @@
 
 #include "cc/layers/picture_layer_impl.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <utility>
 
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/append_quads_data.h"
diff --git a/cc/layers/picture_layer_unittest.cc b/cc/layers/picture_layer_unittest.cc
index 97751fde77ac5..9568bde2b5b59 100644
--- a/cc/layers/picture_layer_unittest.cc
+++ b/cc/layers/picture_layer_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/picture_layer.h"
 
+#include <stddef.h>
+
 #include "base/thread_task_runner_handle.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/layer_settings.h"
diff --git a/cc/layers/render_surface_impl.cc b/cc/layers/render_surface_impl.cc
index d93e0522d339e..d329667bab889 100644
--- a/cc/layers/render_surface_impl.cc
+++ b/cc/layers/render_surface_impl.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/render_surface_impl.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/logging.h"
diff --git a/cc/layers/render_surface_impl.h b/cc/layers/render_surface_impl.h
index 283f0eb47b612..9ba0f1870bbbd 100644
--- a/cc/layers/render_surface_impl.h
+++ b/cc/layers/render_surface_impl.h
@@ -5,10 +5,12 @@
 #ifndef CC_LAYERS_RENDER_SURFACE_IMPL_H_
 #define CC_LAYERS_RENDER_SURFACE_IMPL_H_
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_lists.h"
diff --git a/cc/layers/render_surface_impl_unittest.cc b/cc/layers/render_surface_impl_unittest.cc
index 96ca40baf136e..e8eb264460fe0 100644
--- a/cc/layers/render_surface_impl_unittest.cc
+++ b/cc/layers/render_surface_impl_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/render_surface_impl.h"
 
+#include <stddef.h>
+
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/test/fake_mask_layer_impl.h"
diff --git a/cc/layers/scrollbar_layer_impl_base.h b/cc/layers/scrollbar_layer_impl_base.h
index ebe508ba497cb..79a18e5a28c4f 100644
--- a/cc/layers/scrollbar_layer_impl_base.h
+++ b/cc/layers/scrollbar_layer_impl_base.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_
 #define CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/input/scrollbar.h"
 #include "cc/layers/layer.h"
diff --git a/cc/layers/scrollbar_layer_interface.h b/cc/layers/scrollbar_layer_interface.h
index a396a5d0a2d14..5a386b05c021d 100644
--- a/cc/layers/scrollbar_layer_interface.h
+++ b/cc/layers/scrollbar_layer_interface.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_SCROLLBAR_LAYER_INTERFACE_H_
 #define CC_LAYERS_SCROLLBAR_LAYER_INTERFACE_H_
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/input/scrollbar.h"
 
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index 99d52b6168035..0202f4b41836c 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_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 <stddef.h>
+
 #include "base/containers/hash_tables.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/animation/scrollbar_animation_controller.h"
diff --git a/cc/layers/solid_color_layer.h b/cc/layers/solid_color_layer.h
index b544f66311a55..9a16f1a76f851 100644
--- a/cc/layers/solid_color_layer.h
+++ b/cc/layers/solid_color_layer.h
@@ -6,6 +6,7 @@
 #ifndef CC_LAYERS_SOLID_COLOR_LAYER_H_
 #define CC_LAYERS_SOLID_COLOR_LAYER_H_
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
 
diff --git a/cc/layers/solid_color_layer_impl.h b/cc/layers/solid_color_layer_impl.h
index 2068ac5db3fc7..a56b69b909b21 100644
--- a/cc/layers/solid_color_layer_impl.h
+++ b/cc/layers/solid_color_layer_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_SOLID_COLOR_LAYER_IMPL_H_
 #define CC_LAYERS_SOLID_COLOR_LAYER_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
diff --git a/cc/layers/solid_color_layer_impl_unittest.cc b/cc/layers/solid_color_layer_impl_unittest.cc
index a7317ec9c2359..a4d1bfa7d83ea 100644
--- a/cc/layers/solid_color_layer_impl_unittest.cc
+++ b/cc/layers/solid_color_layer_impl_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/solid_color_layer_impl.h"
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "cc/layers/append_quads_data.h"
diff --git a/cc/layers/solid_color_scrollbar_layer.h b/cc/layers/solid_color_scrollbar_layer.h
index 8b14bce80c887..8f0c00cbed264 100644
--- a/cc/layers/solid_color_scrollbar_layer.h
+++ b/cc/layers/solid_color_scrollbar_layer.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_
 #define CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/scrollbar_layer_interface.h"
diff --git a/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc b/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc
index f1415358773c4..a285f44389e96 100644
--- a/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc
+++ b/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/solid_color_scrollbar_layer_impl.h"
 
+#include <stddef.h>
+
 #include "cc/test/layer_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/layers/surface_layer.cc b/cc/layers/surface_layer.cc
index 8d46188175399..21f927395694e 100644
--- a/cc/layers/surface_layer.cc
+++ b/cc/layers/surface_layer.cc
@@ -4,6 +4,9 @@
 
 #include "cc/layers/surface_layer.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "cc/layers/surface_layer_impl.h"
 #include "cc/output/swap_promise.h"
 #include "cc/trees/layer_tree_host.h"
@@ -27,7 +30,7 @@ class SatisfySwapPromise : public SwapPromise {
   void DidNotSwap(DidNotSwapReason reason) override {
     satisfy_callback_.Run(sequence_);
   }
-  int64 TraceId() const override { return 0; }
+  int64_t TraceId() const override { return 0; }
 
   SurfaceSequence sequence_;
   SurfaceLayer::SatisfyCallback satisfy_callback_;
diff --git a/cc/layers/surface_layer.h b/cc/layers/surface_layer.h
index e62d6a2c9dc12..c2e8a2d000e3a 100644
--- a/cc/layers/surface_layer.h
+++ b/cc/layers/surface_layer.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_SURFACE_LAYER_H_
 #define CC_LAYERS_SURFACE_LAYER_H_
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
 #include "cc/surfaces/surface_id.h"
diff --git a/cc/layers/surface_layer_impl.cc b/cc/layers/surface_layer_impl.cc
index e0dcadf0b0c40..a8a50f33fde45 100644
--- a/cc/layers/surface_layer_impl.cc
+++ b/cc/layers/surface_layer_impl.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/surface_layer_impl.h"
 
+#include <stdint.h>
+
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/quads/solid_color_draw_quad.h"
diff --git a/cc/layers/surface_layer_impl.h b/cc/layers/surface_layer_impl.h
index 4d2c48b405997..819ee738e3443 100644
--- a/cc/layers/surface_layer_impl.h
+++ b/cc/layers/surface_layer_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_SURFACE_LAYER_IMPL_H_
 #define CC_LAYERS_SURFACE_LAYER_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
diff --git a/cc/layers/surface_layer_impl_unittest.cc b/cc/layers/surface_layer_impl_unittest.cc
index 3ff8255f15163..50d4b3a911c31 100644
--- a/cc/layers/surface_layer_impl_unittest.cc
+++ b/cc/layers/surface_layer_impl_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/surface_layer_impl.h"
 
+#include <stddef.h>
+
 #include "cc/test/layer_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/layers/surface_layer_unittest.cc b/cc/layers/surface_layer_unittest.cc
index 23489094c45a9..2f8d5cd8f30d5 100644
--- a/cc/layers/surface_layer_unittest.cc
+++ b/cc/layers/surface_layer_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 <set>
 #include <vector>
 
diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h
index b1e92431e9ff4..6b529dd9a90f7 100644
--- a/cc/layers/texture_layer.h
+++ b/cc/layers/texture_layer.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/layers/texture_layer_impl.cc b/cc/layers/texture_layer_impl.cc
index 295faf416addf..0d2f4e7558a0b 100644
--- a/cc/layers/texture_layer_impl.cc
+++ b/cc/layers/texture_layer_impl.cc
@@ -4,6 +4,9 @@
 
 #include "cc/layers/texture_layer_impl.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/strings/stringprintf.h"
@@ -110,8 +113,8 @@ bool TextureLayerImpl::WillDraw(DrawMode draw_mode,
     }
 
     if (texture_copy_->id()) {
-      std::vector<uint8> swizzled;
-      uint8* pixels = texture_mailbox_.shared_bitmap()->pixels();
+      std::vector<uint8_t> swizzled;
+      uint8_t* pixels = texture_mailbox_.shared_bitmap()->pixels();
 
       if (!PlatformColor::SameComponentOrder(texture_copy_->format())) {
         // Swizzle colors. This is slow, but should be really uncommon.
diff --git a/cc/layers/texture_layer_impl.h b/cc/layers/texture_layer_impl.h
index 680aaf0aec078..e799eff5a2dde 100644
--- a/cc/layers/texture_layer_impl.h
+++ b/cc/layers/texture_layer_impl.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 
diff --git a/cc/layers/texture_layer_impl_unittest.cc b/cc/layers/texture_layer_impl_unittest.cc
index fe2e006f174c8..93e334232236a 100644
--- a/cc/layers/texture_layer_impl_unittest.cc
+++ b/cc/layers/texture_layer_impl_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/texture_layer_impl.h"
 
+#include <stddef.h>
+
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
 #include "cc/test/layer_test_common.h"
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index c7c64b6f20593..31313afa3df22 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -4,12 +4,16 @@
 
 #include "cc/layers/texture_layer.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
@@ -151,8 +155,8 @@ struct CommonMailboxObjects {
     release_mailbox2_impl_ = base::Bind(&MockMailboxCallback::ReleaseImpl,
                                         base::Unretained(&mock_callback_),
                                         mailbox_name2_);
-    const uint32 arbitrary_target1 = GL_TEXTURE_2D;
-    const uint32 arbitrary_target2 = GL_TEXTURE_EXTERNAL_OES;
+    const uint32_t arbitrary_target1 = GL_TEXTURE_2D;
+    const uint32_t arbitrary_target2 = GL_TEXTURE_EXTERNAL_OES;
     mailbox1_ = TextureMailbox(mailbox_name1_, sync_token1_, arbitrary_target1);
     mailbox2_ = TextureMailbox(mailbox_name2_, sync_token2_, arbitrary_target2);
     gfx::Size size(128, 128);
diff --git a/cc/layers/ui_resource_layer.h b/cc/layers/ui_resource_layer.h
index 600f245dd6b90..52a45b72da325 100644
--- a/cc/layers/ui_resource_layer.h
+++ b/cc/layers/ui_resource_layer.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_UI_RESOURCE_LAYER_H_
 #define CC_LAYERS_UI_RESOURCE_LAYER_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
diff --git a/cc/layers/ui_resource_layer_impl.h b/cc/layers/ui_resource_layer_impl.h
index 87d77e85a20e7..05293e6777868 100644
--- a/cc/layers/ui_resource_layer_impl.h
+++ b/cc/layers/ui_resource_layer_impl.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/resources/resource_provider.h"
diff --git a/cc/layers/ui_resource_layer_impl_unittest.cc b/cc/layers/ui_resource_layer_impl_unittest.cc
index c184dd62c153a..18759a61adf54 100644
--- a/cc/layers/ui_resource_layer_impl_unittest.cc
+++ b/cc/layers/ui_resource_layer_impl_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 <stddef.h>
+
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/ui_resource_layer_impl.h"
 #include "cc/quads/draw_quad.h"
diff --git a/cc/layers/video_frame_provider_client_impl.h b/cc/layers/video_frame_provider_client_impl.h
index e626b541405a2..17525ec4c1f37 100644
--- a/cc/layers/video_frame_provider_client_impl.h
+++ b/cc/layers/video_frame_provider_client_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_
 #define CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
diff --git a/cc/layers/video_frame_provider_client_impl_unittest.cc b/cc/layers/video_frame_provider_client_impl_unittest.cc
index 3cc4709d4aae6..e337baa9ae724 100644
--- a/cc/layers/video_frame_provider_client_impl_unittest.cc
+++ b/cc/layers/video_frame_provider_client_impl_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 "cc/layers/video_frame_provider_client_impl.h"
 #include "cc/layers/video_layer_impl.h"
 #include "cc/output/begin_frame_args.h"
diff --git a/cc/layers/video_layer.h b/cc/layers/video_layer.h
index 575de4664f0a6..a59f1cc56682d 100644
--- a/cc/layers/video_layer.h
+++ b/cc/layers/video_layer.h
@@ -6,6 +6,7 @@
 #define CC_LAYERS_VIDEO_LAYER_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
 #include "media/base/video_rotation.h"
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc
index ca5dd6ef16126..d173cc6c2b6d0 100644
--- a/cc/layers/video_layer_impl.cc
+++ b/cc/layers/video_layer_impl.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/video_layer_impl.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/logging.h"
 #include "cc/layers/video_frame_provider_client_impl.h"
diff --git a/cc/layers/video_layer_impl.h b/cc/layers/video_layer_impl.h
index 127700b8f2c6c..c1688e887c857 100644
--- a/cc/layers/video_layer_impl.h
+++ b/cc/layers/video_layer_impl.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/resources/release_callback_impl.h"
diff --git a/cc/layers/video_layer_impl_unittest.cc b/cc/layers/video_layer_impl_unittest.cc
index 48c574bcde406..b5f1c0fdc2d3e 100644
--- a/cc/layers/video_layer_impl_unittest.cc
+++ b/cc/layers/video_layer_impl_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/video_layer_impl.h"
 
+#include <stddef.h>
+
 #include "cc/layers/video_frame_provider_client_impl.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
diff --git a/cc/layers/viewport.h b/cc/layers/viewport.h
index 5d96cd3b28361..5052b5e2499e1 100644
--- a/cc/layers/viewport.h
+++ b/cc/layers/viewport.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_VIEWPORT_H_
 #define CC_LAYERS_VIEWPORT_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/layer_impl.h"
 #include "ui/gfx/geometry/vector2d_f.h"
diff --git a/cc/output/bsp_tree.h b/cc/output/bsp_tree.h
index efe4cc5111aaf..695c47e5b9fbd 100644
--- a/cc/output/bsp_tree.h
+++ b/cc/output/bsp_tree.h
@@ -5,6 +5,8 @@
 #ifndef CC_OUTPUT_BSP_TREE_H_
 #define CC_OUTPUT_BSP_TREE_H_
 
+#include <stddef.h>
+
 #include <deque>
 #include <vector>
 
diff --git a/cc/output/bsp_tree_unittest.cc b/cc/output/bsp_tree_unittest.cc
index f55577be8f581..1d71413cd4dd0 100644
--- a/cc/output/bsp_tree_unittest.cc
+++ b/cc/output/bsp_tree_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 <stddef.h>
+
 #include <deque>
 
 #include "base/macros.h"
diff --git a/cc/output/compositor_frame.h b/cc/output/compositor_frame.h
index 3ab1e8c2c9a5f..8a95fffe27136 100644
--- a/cc/output/compositor_frame.h
+++ b/cc/output/compositor_frame.h
@@ -5,6 +5,7 @@
 #ifndef CC_OUTPUT_COMPOSITOR_FRAME_H_
 #define CC_OUTPUT_COMPOSITOR_FRAME_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/compositor_frame_metadata.h"
diff --git a/cc/output/compositor_frame_ack.h b/cc/output/compositor_frame_ack.h
index aa48fa157b3c3..a4e161b3d8d43 100644
--- a/cc/output/compositor_frame_ack.h
+++ b/cc/output/compositor_frame_ack.h
@@ -5,6 +5,7 @@
 #ifndef CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_
 #define CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/gl_frame_data.h"
diff --git a/cc/output/compositor_frame_metadata.h b/cc/output/compositor_frame_metadata.h
index 392c6b0dfdf93..ad3cdd8d42805 100644
--- a/cc/output/compositor_frame_metadata.h
+++ b/cc/output/compositor_frame_metadata.h
@@ -5,6 +5,8 @@
 #ifndef CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_
 #define CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "cc/base/cc_export.h"
diff --git a/cc/output/context_provider.cc b/cc/output/context_provider.cc
index 23a8e2c8fd33c..5ff7f9306170f 100644
--- a/cc/output/context_provider.cc
+++ b/cc/output/context_provider.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/context_provider.h"
 
+#include <stddef.h>
+
 #include <limits>
 
 namespace cc {
diff --git a/cc/output/context_provider.h b/cc/output/context_provider.h
index db127064be2a5..c560ad0fa6974 100644
--- a/cc/output/context_provider.h
+++ b/cc/output/context_provider.h
@@ -5,6 +5,9 @@
 #ifndef CC_OUTPUT_CONTEXT_PROVIDER_H_
 #define CC_OUTPUT_CONTEXT_PROVIDER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
diff --git a/cc/output/delegated_frame_data.h b/cc/output/delegated_frame_data.h
index 3cb946cf009ed..8d9d2753376e2 100644
--- a/cc/output/delegated_frame_data.h
+++ b/cc/output/delegated_frame_data.h
@@ -5,6 +5,7 @@
 #ifndef CC_OUTPUT_DELEGATED_FRAME_DATA_H_
 #define CC_OUTPUT_DELEGATED_FRAME_DATA_H_
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/quads/render_pass.h"
 #include "cc/resources/transferable_resource.h"
diff --git a/cc/output/delegating_renderer.h b/cc/output/delegating_renderer.h
index b2bc01fd2eda7..4b0c9cc6b24b1 100644
--- a/cc/output/delegating_renderer.h
+++ b/cc/output/delegating_renderer.h
@@ -5,6 +5,7 @@
 #ifndef CC_OUTPUT_DELEGATING_RENDERER_H_
 #define CC_OUTPUT_DELEGATING_RENDERER_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/compositor_frame.h"
diff --git a/cc/output/delegating_renderer_unittest.cc b/cc/output/delegating_renderer_unittest.cc
index df06696079a01..73dbfddf20ad8 100644
--- a/cc/output/delegating_renderer_unittest.cc
+++ b/cc/output/delegating_renderer_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/delegating_renderer.h"
 
+#include <stdint.h>
+
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/test/render_pass_test_utils.h"
diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc
index d22d7e42a646e..3a10cbee2596b 100644
--- a/cc/output/direct_renderer.cc
+++ b/cc/output/direct_renderer.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/direct_renderer.h"
 
+#include <stddef.h>
+
 #include <utility>
 #include <vector>
 
diff --git a/cc/output/direct_renderer.h b/cc/output/direct_renderer.h
index 9c3db40dc2c06..28f25910ed7b4 100644
--- a/cc/output/direct_renderer.h
+++ b/cc/output/direct_renderer.h
@@ -5,9 +5,9 @@
 #ifndef CC_OUTPUT_DIRECT_RENDERER_H_
 #define CC_OUTPUT_DIRECT_RENDERER_H_
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/ca_layer_overlay.h"
 #include "cc/output/overlay_processor.h"
diff --git a/cc/output/dynamic_geometry_binding.cc b/cc/output/dynamic_geometry_binding.cc
index ecdf66e133e72..95fc0fb472111 100644
--- a/cc/output/dynamic_geometry_binding.cc
+++ b/cc/output/dynamic_geometry_binding.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/dynamic_geometry_binding.h"
 
+#include <stdint.h>
+
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/rect_f.h"
@@ -50,8 +52,9 @@ void DynamicGeometryBinding::InitializeCustomQuadWithUVs(const gfx::QuadF& quad,
 
   GeometryBindingQuad local_quad = {v0, v1, v2, v3};
   GeometryBindingQuadIndex quad_index(
-      static_cast<uint16>(0), static_cast<uint16>(1), static_cast<uint16>(2),
-      static_cast<uint16>(3), static_cast<uint16>(0), static_cast<uint16>(2));
+      static_cast<uint16_t>(0), static_cast<uint16_t>(1),
+      static_cast<uint16_t>(2), static_cast<uint16_t>(3),
+      static_cast<uint16_t>(0), static_cast<uint16_t>(2));
 
   gl_->BufferSubData(GL_ARRAY_BUFFER, 0, sizeof(GeometryBindingQuad),
                      &local_quad);
diff --git a/cc/output/dynamic_geometry_binding.h b/cc/output/dynamic_geometry_binding.h
index 4e4ea3d1fd1da..5f3e3fff51bf9 100644
--- a/cc/output/dynamic_geometry_binding.h
+++ b/cc/output/dynamic_geometry_binding.h
@@ -5,6 +5,7 @@
 #ifndef CC_OUTPUT_DYNAMIC_GEOMETRY_BINDING_H_
 #define CC_OUTPUT_DYNAMIC_GEOMETRY_BINDING_H_
 
+#include "base/macros.h"
 #include "cc/output/geometry_binding.h"
 
 namespace cc {
diff --git a/cc/output/filter_operation.cc b/cc/output/filter_operation.cc
index 1579e554a04be..a37d27d3b2b97 100644
--- a/cc/output/filter_operation.cc
+++ b/cc/output/filter_operation.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 <stddef.h>
+
 #include <algorithm>
 
 #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/output/filter_operations.cc b/cc/output/filter_operations.cc
index d734d4bc71d7d..40bde98eb7e7a 100644
--- a/cc/output/filter_operations.cc
+++ b/cc/output/filter_operations.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/filter_operations.h"
 
+#include <stddef.h>
+
 #include <cmath>
 
 #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/output/filter_operations.h b/cc/output/filter_operations.h
index 7018b82af186c..67699692399b4 100644
--- a/cc/output/filter_operations.h
+++ b/cc/output/filter_operations.h
@@ -5,6 +5,8 @@
 #ifndef CC_OUTPUT_FILTER_OPERATIONS_H_
 #define CC_OUTPUT_FILTER_OPERATIONS_H_
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/logging.h"
diff --git a/cc/output/filter_operations_unittest.cc b/cc/output/filter_operations_unittest.cc
index 6ba1349da61eb..05c0289ea9f3b 100644
--- a/cc/output/filter_operations_unittest.cc
+++ b/cc/output/filter_operations_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 <stddef.h>
+
 #include "cc/output/filter_operations.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/output/geometry_binding.cc b/cc/output/geometry_binding.cc
index 9a87c7f149e44..93b2d1919c568 100644
--- a/cc/output/geometry_binding.cc
+++ b/cc/output/geometry_binding.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/geometry_binding.h"
 
+#include <stdint.h>
+
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "ui/gfx/geometry/rect_f.h"
 
@@ -56,12 +58,12 @@ GeometryBindingQuadIndex::GeometryBindingQuadIndex() {
   memset(data, 0x0, sizeof(data));
 }
 
-GeometryBindingQuadIndex::GeometryBindingQuadIndex(uint16 index0,
-                                                   uint16 index1,
-                                                   uint16 index2,
-                                                   uint16 index3,
-                                                   uint16 index4,
-                                                   uint16 index5) {
+GeometryBindingQuadIndex::GeometryBindingQuadIndex(uint16_t index0,
+                                                   uint16_t index1,
+                                                   uint16_t index2,
+                                                   uint16_t index3,
+                                                   uint16_t index4,
+                                                   uint16_t index5) {
   data[0] = index0;
   data[1] = index1;
   data[2] = index2;
diff --git a/cc/output/geometry_binding.h b/cc/output/geometry_binding.h
index de7cfc90b62e4..473421640f5d4 100644
--- a/cc/output/geometry_binding.h
+++ b/cc/output/geometry_binding.h
@@ -5,7 +5,8 @@
 #ifndef CC_OUTPUT_GEOMETRY_BINDING_H_
 #define CC_OUTPUT_GEOMETRY_BINDING_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
@@ -38,14 +39,14 @@ struct GeometryBindingQuad {
 
 struct GeometryBindingQuadIndex {
   GeometryBindingQuadIndex();
-  GeometryBindingQuadIndex(uint16 index0,
-                           uint16 index1,
-                           uint16 index2,
-                           uint16 index3,
-                           uint16 index4,
-                           uint16 index5);
+  GeometryBindingQuadIndex(uint16_t index0,
+                           uint16_t index1,
+                           uint16_t index2,
+                           uint16_t index3,
+                           uint16_t index4,
+                           uint16_t index5);
 
-  uint16 data[6];
+  uint16_t data[6];
 };
 
 class DrawQuad;
diff --git a/cc/output/gl_frame_data.h b/cc/output/gl_frame_data.h
index df6227f05f5f0..a4f9af45caf5b 100644
--- a/cc/output/gl_frame_data.h
+++ b/cc/output/gl_frame_data.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/sync_token.h"
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index dda82ef10f6ab..977bfe7b03f63 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -4,6 +4,9 @@
 
 #include "cc/output/gl_renderer.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <limits>
 #include <set>
@@ -11,12 +14,13 @@
 #include <vector>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "build/build_config.h"
 #include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
 #include "cc/base/container_util.h"
 #include "cc/base/math_util.h"
 #include "cc/output/compositor_frame.h"
@@ -2837,19 +2841,19 @@ void GLRenderer::FinishedReadback(unsigned source_buffer,
   DCHECK(iter != reverse_end);
   PendingAsyncReadPixels* current_read = iter->get();
 
-  uint8* src_pixels = NULL;
+  uint8_t* src_pixels = NULL;
   scoped_ptr<SkBitmap> bitmap;
 
   if (source_buffer != 0) {
     gl_->BindBuffer(GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM, source_buffer);
-    src_pixels = static_cast<uint8*>(gl_->MapBufferCHROMIUM(
+    src_pixels = static_cast<uint8_t*>(gl_->MapBufferCHROMIUM(
         GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM, GL_READ_ONLY));
 
     if (src_pixels) {
       bitmap.reset(new SkBitmap);
       bitmap->allocN32Pixels(size.width(), size.height());
       scoped_ptr<SkAutoLockPixels> lock(new SkAutoLockPixels(*bitmap));
-      uint8* dest_pixels = static_cast<uint8*>(bitmap->getPixels());
+      uint8_t* dest_pixels = static_cast<uint8_t*>(bitmap->getPixels());
 
       size_t row_bytes = size.width() * 4;
       int num_rows = size.height();
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index 233fd3b3e5aee..8a7694ac9ed15 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/cancelable_callback.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/output/gl_renderer_draw_cache.h"
diff --git a/cc/output/gl_renderer_draw_cache.h b/cc/output/gl_renderer_draw_cache.h
index a16c8a5bde8bf..e02b73b4e381c 100644
--- a/cc/output/gl_renderer_draw_cache.h
+++ b/cc/output/gl_renderer_draw_cache.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 3e8535e93fb3a..3db6d62999894 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/gl_renderer.h"
 
+#include <stdint.h>
+
 #include <set>
 
 #include "base/location.h"
diff --git a/cc/output/latency_info_swap_promise.cc b/cc/output/latency_info_swap_promise.cc
index 3b267454076e5..f20eb2d469b51 100644
--- a/cc/output/latency_info_swap_promise.cc
+++ b/cc/output/latency_info_swap_promise.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/latency_info_swap_promise.h"
 
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 
@@ -46,7 +48,7 @@ void LatencyInfoSwapPromise::DidNotSwap(DidNotSwapReason reason) {
   // DCHECK(latency_.terminated);
 }
 
-int64 LatencyInfoSwapPromise::TraceId() const {
+int64_t LatencyInfoSwapPromise::TraceId() const {
   return latency_.trace_id();
 }
 
diff --git a/cc/output/latency_info_swap_promise.h b/cc/output/latency_info_swap_promise.h
index 9a4deb6e9c6ec..23a1c862afbc1 100644
--- a/cc/output/latency_info_swap_promise.h
+++ b/cc/output/latency_info_swap_promise.h
@@ -5,6 +5,8 @@
 #ifndef CC_OUTPUT_LATENCY_INFO_SWAP_PROMISE_H_
 #define CC_OUTPUT_LATENCY_INFO_SWAP_PROMISE_H_
 
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
 #include "cc/output/swap_promise.h"
 #include "ui/events/latency_info.h"
@@ -21,7 +23,7 @@ class CC_EXPORT LatencyInfoSwapPromise : public SwapPromise {
   void DidNotSwap(DidNotSwapReason reason) override;
   void OnCommit() override;
 
-  int64 TraceId() const override;
+  int64_t TraceId() const override;
 
  private:
   ui::LatencyInfo latency_;
diff --git a/cc/output/layer_quad.cc b/cc/output/layer_quad.cc
index 537c87bd61dfc..450bfbcf80bb0 100644
--- a/cc/output/layer_quad.cc
+++ b/cc/output/layer_quad.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/layer_quad.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "ui/gfx/geometry/quad_f.h"
 
diff --git a/cc/output/layer_quad.h b/cc/output/layer_quad.h
index 9ed3ff567bc3d..22b9357f482b9 100644
--- a/cc/output/layer_quad.h
+++ b/cc/output/layer_quad.h
@@ -6,7 +6,7 @@
 #ifndef CC_OUTPUT_LAYER_QUAD_H_
 #define CC_OUTPUT_LAYER_QUAD_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "ui/gfx/geometry/point_f.h"
 
diff --git a/cc/output/managed_memory_policy.cc b/cc/output/managed_memory_policy.cc
index f7ed2149bcc3b..0dc7def60e1c2 100644
--- a/cc/output/managed_memory_policy.cc
+++ b/cc/output/managed_memory_policy.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/managed_memory_policy.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "cc/proto/gpu_conversions.h"
 #include "cc/proto/managed_memory_policy.pb.h"
diff --git a/cc/output/managed_memory_policy.h b/cc/output/managed_memory_policy.h
index 2f68e0524928a..54fa271d0bf25 100644
--- a/cc/output/managed_memory_policy.h
+++ b/cc/output/managed_memory_policy.h
@@ -5,7 +5,8 @@
 #ifndef CC_OUTPUT_MANAGED_MEMORY_POLICY_H_
 #define CC_OUTPUT_MANAGED_MEMORY_POLICY_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "cc/base/cc_export.h"
 #include "cc/tiles/tile_priority.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
diff --git a/cc/output/managed_memory_policy_unittest.cc b/cc/output/managed_memory_policy_unittest.cc
index 3ba75461aba1f..de2ecfd52e6fd 100644
--- a/cc/output/managed_memory_policy_unittest.cc
+++ b/cc/output/managed_memory_policy_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/managed_memory_policy.h"
 
+#include <stddef.h>
+
 #include "cc/proto/managed_memory_policy.pb.h"
 #include "cc/proto/memory_allocation.pb.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
index 108f5562dca28..13e41d36f0220 100644
--- a/cc/output/output_surface.cc
+++ b/cc/output/output_surface.cc
@@ -4,8 +4,11 @@
 
 #include "cc/output/output_surface.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
@@ -53,7 +56,7 @@ class SkiaGpuTraceMemoryDump : public SkTraceMemoryDump {
   void setMemoryBacking(const char* dump_name,
                         const char* backing_type,
                         const char* backing_object_id) override {
-    const uint64 tracing_process_id =
+    const uint64_t tracing_process_id =
         base::trace_event::MemoryDumpManager::GetInstance()
             ->GetTracingProcessId();
 
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index 05b6ad3ddd3c9..1ccc9cc3f78bb 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -7,7 +7,7 @@
 
 #include <deque>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
diff --git a/cc/output/overlay_processor.h b/cc/output/overlay_processor.h
index 8f3704cd67cf6..beaae08ee9cd1 100644
--- a/cc/output/overlay_processor.h
+++ b/cc/output/overlay_processor.h
@@ -5,7 +5,7 @@
 #ifndef CC_OUTPUT_OVERLAY_PROCESSOR_H_
 #define CC_OUTPUT_OVERLAY_PROCESSOR_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/ca_layer_overlay.h"
diff --git a/cc/output/overlay_strategy_sandwich.h b/cc/output/overlay_strategy_sandwich.h
index 076ea9de7c835..f46dd03990740 100644
--- a/cc/output/overlay_strategy_sandwich.h
+++ b/cc/output/overlay_strategy_sandwich.h
@@ -5,6 +5,7 @@
 #ifndef CC_OUTPUT_OVERLAY_STRATEGY_SANDWICH_H_
 #define CC_OUTPUT_OVERLAY_STRATEGY_SANDWICH_H_
 
+#include "base/macros.h"
 #include "cc/output/overlay_processor.h"
 
 namespace cc {
diff --git a/cc/output/overlay_strategy_single_on_top.h b/cc/output/overlay_strategy_single_on_top.h
index bdf2cc2f59b52..0613b8943e0c3 100644
--- a/cc/output/overlay_strategy_single_on_top.h
+++ b/cc/output/overlay_strategy_single_on_top.h
@@ -5,6 +5,7 @@
 #ifndef CC_OUTPUT_OVERLAY_STRATEGY_SINGLE_ON_TOP_H_
 #define CC_OUTPUT_OVERLAY_STRATEGY_SINGLE_ON_TOP_H_
 
+#include "base/macros.h"
 #include "cc/output/overlay_processor.h"
 
 namespace cc {
diff --git a/cc/output/overlay_strategy_underlay.h b/cc/output/overlay_strategy_underlay.h
index f276c1cb0a0e3..806753bdcfac5 100644
--- a/cc/output/overlay_strategy_underlay.h
+++ b/cc/output/overlay_strategy_underlay.h
@@ -5,6 +5,7 @@
 #ifndef CC_OUTPUT_OVERLAY_STRATEGY_UNDERLAY_H_
 #define CC_OUTPUT_OVERLAY_STRATEGY_UNDERLAY_H_
 
+#include "base/macros.h"
 #include "cc/output/overlay_processor.h"
 
 namespace cc {
diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc
index e525025096c1c..8b2333d901300 100644
--- a/cc/output/overlay_unittest.cc
+++ b/cc/output/overlay_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 <stddef.h>
+
 #include <utility>
 
 #include "cc/base/region.h"
diff --git a/cc/output/program_binding.h b/cc/output/program_binding.h
index 8018cad76e34c..1a29436defef0 100644
--- a/cc/output/program_binding.h
+++ b/cc/output/program_binding.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/shader.h"
 
diff --git a/cc/output/render_surface_filters.cc b/cc/output/render_surface_filters.cc
index 7cccb2417d180..9405474c2ac3b 100644
--- a/cc/output/render_surface_filters.cc
+++ b/cc/output/render_surface_filters.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/render_surface_filters.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "cc/output/filter_operation.h"
diff --git a/cc/output/render_surface_filters.h b/cc/output/render_surface_filters.h
index 42b6e45150141..bf54986b9c982 100644
--- a/cc/output/render_surface_filters.h
+++ b/cc/output/render_surface_filters.h
@@ -6,7 +6,7 @@
 #ifndef CC_OUTPUT_RENDER_SURFACE_FILTERS_H_
 #define CC_OUTPUT_RENDER_SURFACE_FILTERS_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "skia/ext/refptr.h"
 
diff --git a/cc/output/renderer.h b/cc/output/renderer.h
index f91b039e67342..d22d509c60e36 100644
--- a/cc/output/renderer.h
+++ b/cc/output/renderer.h
@@ -5,7 +5,7 @@
 #ifndef CC_OUTPUT_RENDERER_H_
 #define CC_OUTPUT_RENDERER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/renderer_capabilities.h"
 #include "cc/output/renderer_settings.h"
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
index 1c7f086499e94..6c5e255822d5b 100644
--- a/cc/output/renderer_pixeltest.cc
+++ b/cc/output/renderer_pixeltest.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 "base/message_loop/message_loop.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/quads/draw_quad.h"
@@ -183,7 +186,7 @@ void CreateTestTextureDrawQuad(const gfx::Rect& rect,
 void CreateTestYUVVideoDrawQuad_FromVideoFrame(
     const SharedQuadState* shared_state,
     scoped_refptr<media::VideoFrame> video_frame,
-    uint8 alpha_value,
+    uint8_t alpha_value,
     const gfx::RectF& tex_coord_rect,
     RenderPass* render_pass,
     VideoResourceUpdater* video_resource_updater,
@@ -304,7 +307,7 @@ void CreateTestYUVVideoDrawQuad_Striped(
       v_row[j] = (v_value += 5);
     }
   }
-  uint8 alpha_value = is_transparent ? 0 : 128;
+  uint8_t alpha_value = is_transparent ? 0 : 128;
   CreateTestYUVVideoDrawQuad_FromVideoFrame(
       shared_state, video_frame, alpha_value, tex_coord_rect, render_pass,
       video_resource_updater, rect, visible_rect, resource_provider);
@@ -322,13 +325,13 @@ void CreateTestYUVVideoDrawQuad_TwoColor(
     const gfx::RectF& tex_coord_rect,
     const gfx::Size& background_size,
     const gfx::Rect& visible_rect,
-    uint8 y_background,
-    uint8 u_background,
-    uint8 v_background,
+    uint8_t y_background,
+    uint8_t u_background,
+    uint8_t v_background,
     const gfx::Rect& foreground_rect,
-    uint8 y_foreground,
-    uint8 u_foreground,
-    uint8 v_foreground,
+    uint8_t y_foreground,
+    uint8_t u_foreground,
+    uint8_t v_foreground,
     RenderPass* render_pass,
     VideoResourceUpdater* video_resource_updater,
     ResourceProvider* resource_provider) {
@@ -343,8 +346,8 @@ void CreateTestYUVVideoDrawQuad_TwoColor(
   int planes[] = {media::VideoFrame::kYPlane,
                   media::VideoFrame::kUPlane,
                   media::VideoFrame::kVPlane};
-  uint8 yuv_background[] = {y_background, u_background, v_background};
-  uint8 yuv_foreground[] = {y_foreground, u_foreground, v_foreground};
+  uint8_t yuv_background[] = {y_background, u_background, v_background};
+  uint8_t yuv_foreground[] = {y_foreground, u_foreground, v_foreground};
   int sample_size[] = {1, 2, 2};
 
   for (int i = 0; i < 3; ++i) {
@@ -372,7 +375,7 @@ void CreateTestYUVVideoDrawQuad_TwoColor(
     }
   }
 
-  uint8 alpha_value = 255;
+  uint8_t alpha_value = 255;
   CreateTestYUVVideoDrawQuad_FromVideoFrame(
       shared_state, video_frame, alpha_value, tex_coord_rect, render_pass,
       video_resource_updater, rect, visible_rect, resource_provider);
@@ -384,9 +387,9 @@ void CreateTestYUVVideoDrawQuad_Solid(
     media::ColorSpace color_space,
     bool is_transparent,
     const gfx::RectF& tex_coord_rect,
-    uint8 y,
-    uint8 u,
-    uint8 v,
+    uint8_t y,
+    uint8_t u,
+    uint8_t v,
     RenderPass* render_pass,
     VideoResourceUpdater* video_resource_updater,
     const gfx::Rect& rect,
@@ -409,7 +412,7 @@ void CreateTestYUVVideoDrawQuad_Solid(
          video_frame->stride(media::VideoFrame::kVPlane) *
              video_frame->rows(media::VideoFrame::kVPlane));
 
-  uint8 alpha_value = is_transparent ? 0 : 128;
+  uint8_t alpha_value = is_transparent ? 0 : 128;
   CreateTestYUVVideoDrawQuad_FromVideoFrame(
       shared_state, video_frame, alpha_value, tex_coord_rect, render_pass,
       video_resource_updater, rect, visible_rect, resource_provider);
diff --git a/cc/output/renderer_settings.h b/cc/output/renderer_settings.h
index 4910a25669101..46008fecdb677 100644
--- a/cc/output/renderer_settings.h
+++ b/cc/output/renderer_settings.h
@@ -5,7 +5,8 @@
 #ifndef CC_OUTPUT_RENDERER_SETTINGS_H_
 #define CC_OUTPUT_RENDERER_SETTINGS_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "cc/base/cc_export.h"
 
 namespace cc {
diff --git a/cc/output/shader.cc b/cc/output/shader.cc
index de1ddd4d0a622..75cac6cbfd61f 100644
--- a/cc/output/shader.cc
+++ b/cc/output/shader.cc
@@ -4,9 +4,10 @@
 
 #include "cc/output/shader.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "cc/output/static_geometry_binding.h"
diff --git a/cc/output/shader.h b/cc/output/shader.h
index 448ff07a8b28a..88b632e81b4bc 100644
--- a/cc/output/shader.h
+++ b/cc/output/shader.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 
 namespace gfx {
diff --git a/cc/output/software_output_device.h b/cc/output/software_output_device.h
index 127c70a5fae62..722a1928c8f3f 100644
--- a/cc/output/software_output_device.h
+++ b/cc/output/software_output_device.h
@@ -5,7 +5,7 @@
 #ifndef CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
 #define CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "skia/ext/refptr.h"
diff --git a/cc/output/software_renderer.h b/cc/output/software_renderer.h
index 58d0417cf01e0..19143a59405a6 100644
--- a/cc/output/software_renderer.h
+++ b/cc/output/software_renderer.h
@@ -5,7 +5,7 @@
 #ifndef CC_OUTPUT_SOFTWARE_RENDERER_H_
 #define CC_OUTPUT_SOFTWARE_RENDERER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/direct_renderer.h"
diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc
index 12976623da724..7f890c98e47e1 100644
--- a/cc/output/software_renderer_unittest.cc
+++ b/cc/output/software_renderer_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/software_renderer.h"
 
+#include <stdint.h>
+
 #include "base/run_loop.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/copy_output_request.h"
diff --git a/cc/output/static_geometry_binding.cc b/cc/output/static_geometry_binding.cc
index dc79c1e7f174b..df540671e9829 100644
--- a/cc/output/static_geometry_binding.cc
+++ b/cc/output/static_geometry_binding.cc
@@ -4,6 +4,9 @@
 
 #include "cc/output/static_geometry_binding.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "ui/gfx/geometry/rect_f.h"
 
@@ -40,9 +43,9 @@ StaticGeometryBinding::StaticGeometryBinding(gpu::gles2::GLES2Interface* gl,
     GeometryBindingQuad x(v0, v1, v2, v3);
     quads[i] = x;
     GeometryBindingQuadIndex y(
-        static_cast<uint16>(0 + 4 * i), static_cast<uint16>(1 + 4 * i),
-        static_cast<uint16>(2 + 4 * i), static_cast<uint16>(3 + 4 * i),
-        static_cast<uint16>(0 + 4 * i), static_cast<uint16>(2 + 4 * i));
+        static_cast<uint16_t>(0 + 4 * i), static_cast<uint16_t>(1 + 4 * i),
+        static_cast<uint16_t>(2 + 4 * i), static_cast<uint16_t>(3 + 4 * i),
+        static_cast<uint16_t>(0 + 4 * i), static_cast<uint16_t>(2 + 4 * i));
     quad_indices[i] = y;
   }
 
diff --git a/cc/output/static_geometry_binding.h b/cc/output/static_geometry_binding.h
index 85166eff81d0f..86b84ee801b45 100644
--- a/cc/output/static_geometry_binding.h
+++ b/cc/output/static_geometry_binding.h
@@ -5,6 +5,7 @@
 #ifndef CC_OUTPUT_STATIC_GEOMETRY_BINDING_H_
 #define CC_OUTPUT_STATIC_GEOMETRY_BINDING_H_
 
+#include "base/macros.h"
 #include "cc/output/geometry_binding.h"
 
 using gpu::gles2::GLES2Interface;
diff --git a/cc/output/swap_promise.h b/cc/output/swap_promise.h
index cf0b88de9ebc5..f3c3fbdde8116 100644
--- a/cc/output/swap_promise.h
+++ b/cc/output/swap_promise.h
@@ -5,6 +5,8 @@
 #ifndef CC_OUTPUT_SWAP_PROMISE_H_
 #define CC_OUTPUT_SWAP_PROMISE_H_
 
+#include <stdint.h>
+
 #include "cc/output/compositor_frame_metadata.h"
 
 namespace cc {
@@ -60,7 +62,7 @@ class CC_EXPORT SwapPromise {
   // A non-zero trace id identifies a trace flow object that is embedded in the
   // swap promise. This can be used for registering additional flow steps to
   // visualize the object's path through the system.
-  virtual int64 TraceId() const = 0;
+  virtual int64_t TraceId() const = 0;
 };
 
 }  // namespace cc
diff --git a/cc/output/texture_mailbox_deleter.cc b/cc/output/texture_mailbox_deleter.cc
index 8585938064c69..2bef8eb2590a6 100644
--- a/cc/output/texture_mailbox_deleter.cc
+++ b/cc/output/texture_mailbox_deleter.cc
@@ -4,6 +4,8 @@
 
 #include "cc/output/texture_mailbox_deleter.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
diff --git a/cc/playback/clip_display_item.cc b/cc/playback/clip_display_item.cc
index 96a2df8edb91f..90b8904c7db13 100644
--- a/cc/playback/clip_display_item.cc
+++ b/cc/playback/clip_display_item.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/clip_display_item.h"
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/logging.h"
diff --git a/cc/playback/clip_display_item.h b/cc/playback/clip_display_item.h
index 51402139f54fc..97e877e484843 100644
--- a/cc/playback/clip_display_item.h
+++ b/cc/playback/clip_display_item.h
@@ -5,6 +5,8 @@
 #ifndef CC_PLAYBACK_CLIP_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_CLIP_DISPLAY_ITEM_H_
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
diff --git a/cc/playback/clip_path_display_item.cc b/cc/playback/clip_path_display_item.cc
index 5b9b3f20d2a8c..1a39af2584be4 100644
--- a/cc/playback/clip_path_display_item.cc
+++ b/cc/playback/clip_path_display_item.cc
@@ -4,6 +4,9 @@
 
 #include "cc/playback/clip_path_display_item.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/proto/display_item.pb.h"
diff --git a/cc/playback/clip_path_display_item.h b/cc/playback/clip_path_display_item.h
index f3eaa0abb26ad..0ad1effc84add 100644
--- a/cc/playback/clip_path_display_item.h
+++ b/cc/playback/clip_path_display_item.h
@@ -5,6 +5,8 @@
 #ifndef CC_PLAYBACK_CLIP_PATH_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_CLIP_PATH_DISPLAY_ITEM_H_
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/playback/display_item.h"
diff --git a/cc/playback/compositing_display_item.cc b/cc/playback/compositing_display_item.cc
index 3c6e8b0ae75fc..6828fcf3c5e7d 100644
--- a/cc/playback/compositing_display_item.cc
+++ b/cc/playback/compositing_display_item.cc
@@ -4,6 +4,9 @@
 
 #include "cc/playback/compositing_display_item.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/proto/display_item.pb.h"
diff --git a/cc/playback/compositing_display_item.h b/cc/playback/compositing_display_item.h
index e0dd87018ea18..4745208f598d8 100644
--- a/cc/playback/compositing_display_item.h
+++ b/cc/playback/compositing_display_item.h
@@ -5,6 +5,9 @@
 #ifndef CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/playback/display_item.h"
diff --git a/cc/playback/discardable_image_map.cc b/cc/playback/discardable_image_map.cc
index e109e2be37599..93ee2c5ea541d 100644
--- a/cc/playback/discardable_image_map.cc
+++ b/cc/playback/discardable_image_map.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/discardable_image_map.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <limits>
 
diff --git a/cc/playback/discardable_image_map_unittest.cc b/cc/playback/discardable_image_map_unittest.cc
index 70253caafe664..1c7c1fb4fcf19 100644
--- a/cc/playback/discardable_image_map_unittest.cc
+++ b/cc/playback/discardable_image_map_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/discardable_image_map.h"
 
+#include <stddef.h>
+
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
diff --git a/cc/playback/display_item.h b/cc/playback/display_item.h
index aeea0505ba862..c4140f33b28a9 100644
--- a/cc/playback/display_item.h
+++ b/cc/playback/display_item.h
@@ -5,6 +5,8 @@
 #ifndef CC_PLAYBACK_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_DISPLAY_ITEM_H_
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/traced_value.h"
diff --git a/cc/playback/display_item_list.cc b/cc/playback/display_item_list.cc
index 80c713d8a6514..19b97d8ef7bd4 100644
--- a/cc/playback/display_item_list.cc
+++ b/cc/playback/display_item_list.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/display_item_list.h"
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/numerics/safe_conversions.h"
diff --git a/cc/playback/display_item_list.h b/cc/playback/display_item_list.h
index 3ce166222de61..7b68e074b86f9 100644
--- a/cc/playback/display_item_list.h
+++ b/cc/playback/display_item_list.h
@@ -5,7 +5,10 @@
 #ifndef CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
 #define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
 
+#include <stddef.h>
+
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/trace_event.h"
diff --git a/cc/playback/display_item_list_unittest.cc b/cc/playback/display_item_list_unittest.cc
index 65d12d69cccc7..191b53323a365 100644
--- a/cc/playback/display_item_list_unittest.cc
+++ b/cc/playback/display_item_list_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/display_item_list.h"
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "cc/output/filter_operation.h"
diff --git a/cc/playback/display_list_raster_source.cc b/cc/playback/display_list_raster_source.cc
index cc4f7a7807d4b..4fc0f63ed24ab 100644
--- a/cc/playback/display_list_raster_source.cc
+++ b/cc/playback/display_list_raster_source.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/display_list_raster_source.h"
 
+#include <stddef.h>
+
 #include "base/trace_event/trace_event.h"
 #include "cc/base/region.h"
 #include "cc/debug/debug_colors.h"
diff --git a/cc/playback/display_list_raster_source.h b/cc/playback/display_list_raster_source.h
index 8c06c8d68637d..377e081ff4d45 100644
--- a/cc/playback/display_list_raster_source.h
+++ b/cc/playback/display_list_raster_source.h
@@ -5,8 +5,11 @@
 #ifndef CC_PLAYBACK_DISPLAY_LIST_RASTER_SOURCE_H_
 #define CC_PLAYBACK_DISPLAY_LIST_RASTER_SOURCE_H_
 
+#include <stddef.h>
+
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
diff --git a/cc/playback/display_list_raster_source_unittest.cc b/cc/playback/display_list_raster_source_unittest.cc
index c7b3af9706144..ca746fc58ed9a 100644
--- a/cc/playback/display_list_raster_source_unittest.cc
+++ b/cc/playback/display_list_raster_source_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 <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/playback/display_list_raster_source.h"
 #include "cc/test/fake_display_list_recording_source.h"
diff --git a/cc/playback/display_list_recording_source.cc b/cc/playback/display_list_recording_source.cc
index 57602fbbc6351..905423812b00d 100644
--- a/cc/playback/display_list_recording_source.cc
+++ b/cc/playback/display_list_recording_source.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/display_list_recording_source.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/numerics/safe_math.h"
diff --git a/cc/playback/display_list_recording_source.h b/cc/playback/display_list_recording_source.h
index f8d469eebfe9a..d1caf98e03ddd 100644
--- a/cc/playback/display_list_recording_source.h
+++ b/cc/playback/display_list_recording_source.h
@@ -5,6 +5,9 @@
 #ifndef CC_PLAYBACK_DISPLAY_LIST_RECORDING_SOURCE_H_
 #define CC_PLAYBACK_DISPLAY_LIST_RECORDING_SOURCE_H_
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/playback/drawing_display_item.cc b/cc/playback/drawing_display_item.cc
index f314608f74818..78f26fe850c4c 100644
--- a/cc/playback/drawing_display_item.cc
+++ b/cc/playback/drawing_display_item.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/drawing_display_item.h"
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/strings/stringprintf.h"
diff --git a/cc/playback/drawing_display_item.h b/cc/playback/drawing_display_item.h
index 261b3b3c6033b..9e8f1103facb3 100644
--- a/cc/playback/drawing_display_item.h
+++ b/cc/playback/drawing_display_item.h
@@ -5,6 +5,8 @@
 #ifndef CC_PLAYBACK_DRAWING_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_DRAWING_DISPLAY_ITEM_H_
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/playback/display_item.h"
diff --git a/cc/playback/filter_display_item.cc b/cc/playback/filter_display_item.cc
index d51da7ceb5a82..0c6ebe0a5ad7f 100644
--- a/cc/playback/filter_display_item.cc
+++ b/cc/playback/filter_display_item.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/filter_display_item.h"
 
+#include <stddef.h>
+
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/output/render_surface_filters.h"
diff --git a/cc/playback/filter_display_item.h b/cc/playback/filter_display_item.h
index c0a8df993f1f5..d4506ed0caebe 100644
--- a/cc/playback/filter_display_item.h
+++ b/cc/playback/filter_display_item.h
@@ -5,6 +5,8 @@
 #ifndef CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/filter_operations.h"
diff --git a/cc/playback/float_clip_display_item.cc b/cc/playback/float_clip_display_item.cc
index b57e640b04490..3601e9df0fd0d 100644
--- a/cc/playback/float_clip_display_item.cc
+++ b/cc/playback/float_clip_display_item.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/float_clip_display_item.h"
 
+#include <stddef.h>
+
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/proto/display_item.pb.h"
diff --git a/cc/playback/float_clip_display_item.h b/cc/playback/float_clip_display_item.h
index 6769c986ca3f7..8c34c5fbec1cb 100644
--- a/cc/playback/float_clip_display_item.h
+++ b/cc/playback/float_clip_display_item.h
@@ -5,6 +5,8 @@
 #ifndef CC_PLAYBACK_FLOAT_CLIP_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_FLOAT_CLIP_DISPLAY_ITEM_H_
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
diff --git a/cc/playback/largest_display_item.cc b/cc/playback/largest_display_item.cc
index 0ecd3d0547a9d..7c761141c30a0 100644
--- a/cc/playback/largest_display_item.cc
+++ b/cc/playback/largest_display_item.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/largest_display_item.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "cc/playback/clip_display_item.h"
diff --git a/cc/playback/largest_display_item.h b/cc/playback/largest_display_item.h
index cce56719e4c66..8350c61f1a08e 100644
--- a/cc/playback/largest_display_item.h
+++ b/cc/playback/largest_display_item.h
@@ -5,7 +5,8 @@
 #ifndef CC_PLAYBACK_LARGEST_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_LARGEST_DISPLAY_ITEM_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "cc/base/cc_export.h"
 
 namespace cc {
diff --git a/cc/playback/transform_display_item.cc b/cc/playback/transform_display_item.cc
index 8f7303c712b4b..c4625ff357628 100644
--- a/cc/playback/transform_display_item.cc
+++ b/cc/playback/transform_display_item.cc
@@ -4,6 +4,8 @@
 
 #include "cc/playback/transform_display_item.h"
 
+#include <stddef.h>
+
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/proto/display_item.pb.h"
diff --git a/cc/playback/transform_display_item.h b/cc/playback/transform_display_item.h
index 7e0a297ad3d76..5b8913611d000 100644
--- a/cc/playback/transform_display_item.h
+++ b/cc/playback/transform_display_item.h
@@ -5,6 +5,8 @@
 #ifndef CC_PLAYBACK_TRANSFORM_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_TRANSFORM_DISPLAY_ITEM_H_
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/playback/display_item.h"
diff --git a/cc/proto/gpu_conversions_unittest.cc b/cc/proto/gpu_conversions_unittest.cc
index f845f8101f831..7ed770b326f6e 100644
--- a/cc/proto/gpu_conversions_unittest.cc
+++ b/cc/proto/gpu_conversions_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/proto/gpu_conversions.h"
 
+#include <stddef.h>
+
 #include "cc/proto/memory_allocation.pb.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/proto/skia_conversions_unittest.cc b/cc/proto/skia_conversions_unittest.cc
index 6785a0c4ea803..c8e02a7bf0e36 100644
--- a/cc/proto/skia_conversions_unittest.cc
+++ b/cc/proto/skia_conversions_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/proto/skia_conversions.h"
 
+#include <stddef.h>
+
 #include "cc/proto/skregion.pb.h"
 #include "cc/proto/skrrect.pb.h"
 #include "cc/proto/skxfermode.pb.h"
diff --git a/cc/quads/draw_polygon.cc b/cc/quads/draw_polygon.cc
index b279fe6ac6fba..a300c92026a5d 100644
--- a/cc/quads/draw_polygon.cc
+++ b/cc/quads/draw_polygon.cc
@@ -4,6 +4,8 @@
 
 #include "cc/quads/draw_polygon.h"
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "cc/output/bsp_compare_result.h"
diff --git a/cc/quads/draw_polygon_unittest.cc b/cc/quads/draw_polygon_unittest.cc
index 95eaf6b833e32..eb6d1625986bd 100644
--- a/cc/quads/draw_polygon_unittest.cc
+++ b/cc/quads/draw_polygon_unittest.cc
@@ -7,6 +7,8 @@
 #define _USE_MATH_DEFINES
 #endif
 
+#include <stddef.h>
+
 #include <limits>
 #include <vector>
 
diff --git a/cc/quads/draw_quad.cc b/cc/quads/draw_quad.cc
index f9bf6fc587452..9bf17f2397d85 100644
--- a/cc/quads/draw_quad.cc
+++ b/cc/quads/draw_quad.cc
@@ -4,6 +4,8 @@
 
 #include "cc/quads/draw_quad.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
diff --git a/cc/quads/draw_quad.h b/cc/quads/draw_quad.h
index 10b0e40d0f03e..dcc671ac9a354 100644
--- a/cc/quads/draw_quad.h
+++ b/cc/quads/draw_quad.h
@@ -5,6 +5,8 @@
 #ifndef CC_QUADS_DRAW_QUAD_H_
 #define CC_QUADS_DRAW_QUAD_H_
 
+#include <stddef.h>
+
 #include "base/callback.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/resource_id.h"
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index 838cfe07d430f..cfc20a17901de 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/quads/draw_quad.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/bind.h"
diff --git a/cc/quads/io_surface_draw_quad.h b/cc/quads/io_surface_draw_quad.h
index 4a8a072c61cd7..9deb8fa095472 100644
--- a/cc/quads/io_surface_draw_quad.h
+++ b/cc/quads/io_surface_draw_quad.h
@@ -5,6 +5,8 @@
 #ifndef CC_QUADS_IO_SURFACE_DRAW_QUAD_H_
 #define CC_QUADS_IO_SURFACE_DRAW_QUAD_H_
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/quads/draw_quad.h"
diff --git a/cc/quads/largest_draw_quad.cc b/cc/quads/largest_draw_quad.cc
index b652638488749..cd5dd387d72e8 100644
--- a/cc/quads/largest_draw_quad.cc
+++ b/cc/quads/largest_draw_quad.cc
@@ -4,6 +4,8 @@
 
 #include "cc/quads/largest_draw_quad.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "cc/quads/debug_border_draw_quad.h"
diff --git a/cc/quads/largest_draw_quad.h b/cc/quads/largest_draw_quad.h
index 85d9f17eb1771..62593e5cfe864 100644
--- a/cc/quads/largest_draw_quad.h
+++ b/cc/quads/largest_draw_quad.h
@@ -5,7 +5,8 @@
 #ifndef CC_QUADS_LARGEST_DRAW_QUAD_H_
 #define CC_QUADS_LARGEST_DRAW_QUAD_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "cc/base/cc_export.h"
 
 namespace cc {
diff --git a/cc/quads/render_pass.cc b/cc/quads/render_pass.cc
index ba5806f1a1279..15ed6a4fab542 100644
--- a/cc/quads/render_pass.cc
+++ b/cc/quads/render_pass.cc
@@ -4,6 +4,8 @@
 
 #include "cc/quads/render_pass.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/numerics/safe_conversions.h"
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h
index e6cc67a62f3b7..9ba727e6df4d3 100644
--- a/cc/quads/render_pass.h
+++ b/cc/quads/render_pass.h
@@ -5,12 +5,14 @@
 #ifndef CC_QUADS_RENDER_PASS_H_
 #define CC_QUADS_RENDER_PASS_H_
 
+#include <stddef.h>
+
 #include <utility>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/list_container.h"
 #include "cc/quads/render_pass_id.h"
diff --git a/cc/quads/render_pass_draw_quad.h b/cc/quads/render_pass_draw_quad.h
index c0d6b52bf08c0..08e0cc08ec3f5 100644
--- a/cc/quads/render_pass_draw_quad.h
+++ b/cc/quads/render_pass_draw_quad.h
@@ -5,7 +5,8 @@
 #ifndef CC_QUADS_RENDER_PASS_DRAW_QUAD_H_
 #define CC_QUADS_RENDER_PASS_DRAW_QUAD_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/filter_operations.h"
diff --git a/cc/quads/render_pass_id.cc b/cc/quads/render_pass_id.cc
index 5fea6dc8cb287..0f53e81dbc558 100644
--- a/cc/quads/render_pass_id.cc
+++ b/cc/quads/render_pass_id.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 <stddef.h>
+
 #include "cc/quads/render_pass_id.h"
 
 namespace cc {
diff --git a/cc/quads/render_pass_id.h b/cc/quads/render_pass_id.h
index f6ab9ce71de24..11cb777204eaa 100644
--- a/cc/quads/render_pass_id.h
+++ b/cc/quads/render_pass_id.h
@@ -5,9 +5,10 @@
 #ifndef CC_QUADS_RENDER_PASS_ID_H_
 #define CC_QUADS_RENDER_PASS_ID_H_
 
+#include <stddef.h>
+
 #include <tuple>
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "cc/base/cc_export.h"
 
diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc
index 140b7e19c68c9..b833a0ce1b99c 100644
--- a/cc/quads/render_pass_unittest.cc
+++ b/cc/quads/render_pass_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/quads/render_pass.h"
 
+#include <stddef.h>
+
 #include "cc/base/math_util.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/quads/render_pass_draw_quad.h"
diff --git a/cc/quads/stream_video_draw_quad.h b/cc/quads/stream_video_draw_quad.h
index 1044fdc19b845..8547b66c39524 100644
--- a/cc/quads/stream_video_draw_quad.h
+++ b/cc/quads/stream_video_draw_quad.h
@@ -5,6 +5,8 @@
 #ifndef CC_QUADS_STREAM_VIDEO_DRAW_QUAD_H_
 #define CC_QUADS_STREAM_VIDEO_DRAW_QUAD_H_
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/quads/draw_quad.h"
diff --git a/cc/quads/texture_draw_quad.cc b/cc/quads/texture_draw_quad.cc
index 370277b554e8d..46f6be43bd28a 100644
--- a/cc/quads/texture_draw_quad.cc
+++ b/cc/quads/texture_draw_quad.cc
@@ -4,6 +4,8 @@
 
 #include "cc/quads/texture_draw_quad.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
diff --git a/cc/quads/texture_draw_quad.h b/cc/quads/texture_draw_quad.h
index 9b9fab95ddd89..2ba5b9d2aaf23 100644
--- a/cc/quads/texture_draw_quad.h
+++ b/cc/quads/texture_draw_quad.h
@@ -5,6 +5,8 @@
 #ifndef CC_QUADS_TEXTURE_DRAW_QUAD_H_
 #define CC_QUADS_TEXTURE_DRAW_QUAD_H_
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/quads/draw_quad.h"
diff --git a/cc/quads/tile_draw_quad.h b/cc/quads/tile_draw_quad.h
index feb9e87c7cc15..d13ac97e2d9c0 100644
--- a/cc/quads/tile_draw_quad.h
+++ b/cc/quads/tile_draw_quad.h
@@ -5,6 +5,8 @@
 #ifndef CC_QUADS_TILE_DRAW_QUAD_H_
 #define CC_QUADS_TILE_DRAW_QUAD_H_
 
+#include <stddef.h>
+
 #include "cc/quads/content_draw_quad_base.h"
 
 namespace cc {
diff --git a/cc/quads/yuv_video_draw_quad.h b/cc/quads/yuv_video_draw_quad.h
index 3dfd85bb88b17..1a72078d1fee7 100644
--- a/cc/quads/yuv_video_draw_quad.h
+++ b/cc/quads/yuv_video_draw_quad.h
@@ -5,7 +5,8 @@
 #ifndef CC_QUADS_YUV_VIDEO_DRAW_QUAD_H_
 #define CC_QUADS_YUV_VIDEO_DRAW_QUAD_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/quads/draw_quad.h"
diff --git a/cc/raster/bitmap_tile_task_worker_pool.cc b/cc/raster/bitmap_tile_task_worker_pool.cc
index c059483cd5977..88925021d6761 100644
--- a/cc/raster/bitmap_tile_task_worker_pool.cc
+++ b/cc/raster/bitmap_tile_task_worker_pool.cc
@@ -4,8 +4,12 @@
 
 #include "cc/raster/bitmap_tile_task_worker_pool.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/raster/bitmap_tile_task_worker_pool.h b/cc/raster/bitmap_tile_task_worker_pool.h
index f53768f11ba90..4c39a1f1f1d93 100644
--- a/cc/raster/bitmap_tile_task_worker_pool.h
+++ b/cc/raster/bitmap_tile_task_worker_pool.h
@@ -5,6 +5,9 @@
 #ifndef CC_RASTER_BITMAP_TILE_TASK_WORKER_POOL_H_
 #define CC_RASTER_BITMAP_TILE_TASK_WORKER_POOL_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/values.h"
 #include "cc/raster/tile_task_runner.h"
 #include "cc/raster/tile_task_worker_pool.h"
diff --git a/cc/raster/gpu_rasterizer.h b/cc/raster/gpu_rasterizer.h
index 04b5c189579c7..e14ea26fa5cde 100644
--- a/cc/raster/gpu_rasterizer.h
+++ b/cc/raster/gpu_rasterizer.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/tiles/tile.h"
diff --git a/cc/raster/gpu_tile_task_worker_pool.cc b/cc/raster/gpu_tile_task_worker_pool.cc
index 306d5d1dbdb7c..ce5876a111ed3 100644
--- a/cc/raster/gpu_tile_task_worker_pool.cc
+++ b/cc/raster/gpu_tile_task_worker_pool.cc
@@ -4,8 +4,11 @@
 
 #include "cc/raster/gpu_tile_task_worker_pool.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 
+#include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/playback/display_list_raster_source.h"
 #include "cc/raster/gpu_rasterizer.h"
diff --git a/cc/raster/gpu_tile_task_worker_pool.h b/cc/raster/gpu_tile_task_worker_pool.h
index 20ac14c0af590..0577b51fdfb70 100644
--- a/cc/raster/gpu_tile_task_worker_pool.h
+++ b/cc/raster/gpu_tile_task_worker_pool.h
@@ -5,6 +5,9 @@
 #ifndef CC_RASTER_GPU_TILE_TASK_WORKER_POOL_H_
 #define CC_RASTER_GPU_TILE_TASK_WORKER_POOL_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "cc/raster/tile_task_runner.h"
 #include "cc/raster/tile_task_worker_pool.h"
 
diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc
index 16ac585a7b8f4..9ca1ae339e5b0 100644
--- a/cc/raster/one_copy_tile_task_worker_pool.cc
+++ b/cc/raster/one_copy_tile_task_worker_pool.cc
@@ -4,10 +4,13 @@
 
 #include "cc/raster/one_copy_tile_task_worker_pool.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <limits>
 #include <utility>
 
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/memory_dump_manager.h"
@@ -160,7 +163,7 @@ void OneCopyTileTaskWorkerPool::StagingBuffer::OnMemoryDump(
                          in_free_list ? buffer_size_in_bytes : 0);
 
   // Emit an ownership edge towards a global allocator dump node.
-  const uint64 tracing_process_id =
+  const uint64_t tracing_process_id =
       base::trace_event::MemoryDumpManager::GetInstance()
           ->GetTracingProcessId();
   base::trace_event::MemoryAllocatorDumpGuid shared_buffer_guid =
diff --git a/cc/raster/one_copy_tile_task_worker_pool.h b/cc/raster/one_copy_tile_task_worker_pool.h
index 8dc861fe9c2d9..4196b3abfab2f 100644
--- a/cc/raster/one_copy_tile_task_worker_pool.h
+++ b/cc/raster/one_copy_tile_task_worker_pool.h
@@ -5,9 +5,12 @@
 #ifndef CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_
 #define CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_
 
+#include <stdint.h>
+
 #include <deque>
 #include <set>
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
diff --git a/cc/raster/raster_buffer.h b/cc/raster/raster_buffer.h
index d3dc01cf1197b..8bd305d75fe1e 100644
--- a/cc/raster/raster_buffer.h
+++ b/cc/raster/raster_buffer.h
@@ -5,6 +5,8 @@
 #ifndef CC_RASTER_RASTER_BUFFER_H_
 #define CC_RASTER_RASTER_BUFFER_H_
 
+#include <stdint.h>
+
 #include "cc/base/cc_export.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/cc/raster/scoped_gpu_raster.h b/cc/raster/scoped_gpu_raster.h
index d9613b3c5fbd6..274772c0dd676 100644
--- a/cc/raster/scoped_gpu_raster.h
+++ b/cc/raster/scoped_gpu_raster.h
@@ -6,6 +6,7 @@
 #define CC_RASTER_SCOPED_GPU_RASTER_H_
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/context_provider.h"
diff --git a/cc/raster/single_thread_task_graph_runner.cc b/cc/raster/single_thread_task_graph_runner.cc
index 80c85db310196..ba879af6cb12d 100644
--- a/cc/raster/single_thread_task_graph_runner.cc
+++ b/cc/raster/single_thread_task_graph_runner.cc
@@ -4,6 +4,8 @@
 
 #include "cc/raster/single_thread_task_graph_runner.h"
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/threading/simple_thread.h"
diff --git a/cc/raster/synchronous_task_graph_runner.cc b/cc/raster/synchronous_task_graph_runner.cc
index 156ef9acda846..2f5055d87b163 100644
--- a/cc/raster/synchronous_task_graph_runner.cc
+++ b/cc/raster/synchronous_task_graph_runner.cc
@@ -4,6 +4,8 @@
 
 #include "cc/raster/synchronous_task_graph_runner.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <utility>
 
diff --git a/cc/raster/task_graph_runner.h b/cc/raster/task_graph_runner.h
index 181a455057234..4b3c664fa1246 100644
--- a/cc/raster/task_graph_runner.h
+++ b/cc/raster/task_graph_runner.h
@@ -5,6 +5,9 @@
 #ifndef CC_RASTER_TASK_GRAPH_RUNNER_H_
 #define CC_RASTER_TASK_GRAPH_RUNNER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <map>
 #include <vector>
diff --git a/cc/raster/task_graph_runner_perftest.cc b/cc/raster/task_graph_runner_perftest.cc
index b97b93ca2a244..f86bae571bfb4 100644
--- a/cc/raster/task_graph_runner_perftest.cc
+++ b/cc/raster/task_graph_runner_perftest.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 <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/base/completion_event.h"
diff --git a/cc/raster/task_graph_work_queue.cc b/cc/raster/task_graph_work_queue.cc
index 95faedca4b706..87800576dd517 100644
--- a/cc/raster/task_graph_work_queue.cc
+++ b/cc/raster/task_graph_work_queue.cc
@@ -4,6 +4,9 @@
 
 #include "cc/raster/task_graph_work_queue.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <map>
 #include <utility>
diff --git a/cc/raster/task_graph_work_queue.h b/cc/raster/task_graph_work_queue.h
index 7b6840c55571a..95d3c772c24f2 100644
--- a/cc/raster/task_graph_work_queue.h
+++ b/cc/raster/task_graph_work_queue.h
@@ -5,6 +5,8 @@
 #ifndef CC_RASTER_TASK_GRAPH_WORK_QUEUE_H_
 #define CC_RASTER_TASK_GRAPH_WORK_QUEUE_H_
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <map>
 #include <vector>
diff --git a/cc/raster/texture_compressor_etc1.cc b/cc/raster/texture_compressor_etc1.cc
index e02737cc078cc..55b0ca4640c98 100644
--- a/cc/raster/texture_compressor_etc1.cc
+++ b/cc/raster/texture_compressor_etc1.cc
@@ -7,6 +7,7 @@
 
 #include "cc/raster/texture_compressor_etc1.h"
 
+#include <stdint.h>
 #include <string.h>
 #include <limits>
 
diff --git a/cc/raster/texture_compressor_etc1.h b/cc/raster/texture_compressor_etc1.h
index 2d2771a888c0c..311a4c30af03f 100644
--- a/cc/raster/texture_compressor_etc1.h
+++ b/cc/raster/texture_compressor_etc1.h
@@ -7,8 +7,11 @@
 
 #include "cc/raster/texture_compressor.h"
 
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/macros.h"
 
 namespace cc {
 
diff --git a/cc/raster/texture_compressor_etc1_sse.cc b/cc/raster/texture_compressor_etc1_sse.cc
index 6f1005bf827a4..cb8579c073a53 100644
--- a/cc/raster/texture_compressor_etc1_sse.cc
+++ b/cc/raster/texture_compressor_etc1_sse.cc
@@ -5,6 +5,7 @@
 #include "cc/raster/texture_compressor_etc1_sse.h"
 
 #include <emmintrin.h>
+#include <stdint.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
diff --git a/cc/raster/texture_compressor_etc1_sse.h b/cc/raster/texture_compressor_etc1_sse.h
index 3822699e4d036..3c186c63ce75a 100644
--- a/cc/raster/texture_compressor_etc1_sse.h
+++ b/cc/raster/texture_compressor_etc1_sse.h
@@ -5,6 +5,9 @@
 #ifndef CC_RASTER_TEXTURE_COMPRESSOR_ETC1_SSE_H_
 #define CC_RASTER_TEXTURE_COMPRESSOR_ETC1_SSE_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "cc/raster/texture_compressor.h"
 
 namespace cc {
diff --git a/cc/raster/texture_compressor_etc1_unittest.cc b/cc/raster/texture_compressor_etc1_unittest.cc
index d0c63f46f6332..dc90ebb5d2b9a 100644
--- a/cc/raster/texture_compressor_etc1_unittest.cc
+++ b/cc/raster/texture_compressor_etc1_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/raster/texture_compressor.h"
 
+#include <stdint.h>
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
diff --git a/cc/raster/texture_compressor_perftest.cc b/cc/raster/texture_compressor_perftest.cc
index 4b2967c0ba646..96ab60db22179 100644
--- a/cc/raster/texture_compressor_perftest.cc
+++ b/cc/raster/texture_compressor_perftest.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/logging.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/raster/texture_compressor.h"
diff --git a/cc/raster/tile_task_runner.h b/cc/raster/tile_task_runner.h
index 1958ca25eba17..ed0f29a701c3b 100644
--- a/cc/raster/tile_task_runner.h
+++ b/cc/raster/tile_task_runner.h
@@ -5,6 +5,8 @@
 #ifndef CC_RASTER_TILE_TASK_RUNNER_H_
 #define CC_RASTER_TILE_TASK_RUNNER_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/callback.h"
diff --git a/cc/raster/tile_task_worker_pool.cc b/cc/raster/tile_task_worker_pool.cc
index b55f69d054fe5..46a10ab67b68a 100644
--- a/cc/raster/tile_task_worker_pool.cc
+++ b/cc/raster/tile_task_worker_pool.cc
@@ -4,6 +4,8 @@
 
 #include "cc/raster/tile_task_worker_pool.h"
 
+#include <stddef.h>
+
 #include "base/trace_event/trace_event.h"
 #include "cc/playback/display_list_raster_source.h"
 #include "skia/ext/refptr.h"
diff --git a/cc/raster/tile_task_worker_pool.h b/cc/raster/tile_task_worker_pool.h
index 6b550fa2f2da3..5f229619b5ddf 100644
--- a/cc/raster/tile_task_worker_pool.h
+++ b/cc/raster/tile_task_worker_pool.h
@@ -5,6 +5,8 @@
 #ifndef CC_RASTER_TILE_TASK_WORKER_POOL_H_
 #define CC_RASTER_TILE_TASK_WORKER_POOL_H_
 
+#include <stddef.h>
+
 #include "cc/raster/tile_task_runner.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/cc/raster/tile_task_worker_pool_perftest.cc b/cc/raster/tile_task_worker_pool_perftest.cc
index 32be8350d46a4..0abdf8e739a1c 100644
--- a/cc/raster/tile_task_worker_pool_perftest.cc
+++ b/cc/raster/tile_task_worker_pool_perftest.cc
@@ -4,6 +4,10 @@
 
 #include "cc/raster/tile_task_worker_pool.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
diff --git a/cc/raster/tile_task_worker_pool_unittest.cc b/cc/raster/tile_task_worker_pool_unittest.cc
index 8a2d4850a34fd..c873089e0dcb0 100644
--- a/cc/raster/tile_task_worker_pool_unittest.cc
+++ b/cc/raster/tile_task_worker_pool_unittest.cc
@@ -4,12 +4,16 @@
 
 #include "cc/raster/tile_task_worker_pool.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <limits>
 #include <vector>
 
 #include "base/cancelable_callback.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/base/unique_notifier.h"
diff --git a/cc/raster/zero_copy_tile_task_worker_pool.cc b/cc/raster/zero_copy_tile_task_worker_pool.cc
index 8830c1f021772..4310f96b27ddf 100644
--- a/cc/raster/zero_copy_tile_task_worker_pool.cc
+++ b/cc/raster/zero_copy_tile_task_worker_pool.cc
@@ -4,8 +4,11 @@
 
 #include "cc/raster/zero_copy_tile_task_worker_pool.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/raster/zero_copy_tile_task_worker_pool.h b/cc/raster/zero_copy_tile_task_worker_pool.h
index 3ca9b06ff0b51..ffbde20d782c7 100644
--- a/cc/raster/zero_copy_tile_task_worker_pool.h
+++ b/cc/raster/zero_copy_tile_task_worker_pool.h
@@ -5,6 +5,9 @@
 #ifndef CC_RASTER_ZERO_COPY_TILE_TASK_WORKER_POOL_H_
 #define CC_RASTER_ZERO_COPY_TILE_TASK_WORKER_POOL_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "cc/raster/tile_task_runner.h"
diff --git a/cc/resources/memory_history.h b/cc/resources/memory_history.h
index 15ddc75aa24c8..cdcc46aafaeaf 100644
--- a/cc/resources/memory_history.h
+++ b/cc/resources/memory_history.h
@@ -5,7 +5,10 @@
 #ifndef CC_RESOURCES_MEMORY_HISTORY_H_
 #define CC_RESOURCES_MEMORY_HISTORY_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/debug/ring_buffer.h"
@@ -26,7 +29,7 @@ class MemoryHistory {
           had_enough_memory(false) {}
 
     size_t total_budget_in_bytes;
-    int64 total_bytes_used;
+    int64_t total_bytes_used;
     bool had_enough_memory;
   };
 
diff --git a/cc/resources/platform_color.h b/cc/resources/platform_color.h
index 17eddc1faa755..f7d3705d838ee 100644
--- a/cc/resources/platform_color.h
+++ b/cc/resources/platform_color.h
@@ -5,8 +5,8 @@
 #ifndef CC_RESOURCES_PLATFORM_COLOR_H_
 #define CC_RESOURCES_PLATFORM_COLOR_H_
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "cc/resources/resource_format.h"
 #include "third_party/skia/include/core/SkTypes.h"
 
diff --git a/cc/resources/platform_color_unittest.cc b/cc/resources/platform_color_unittest.cc
index 83b2a1e47f351..bbc4c06cb1823 100644
--- a/cc/resources/platform_color_unittest.cc
+++ b/cc/resources/platform_color_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/resources/platform_color.h"
 
+#include <stddef.h>
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
diff --git a/cc/resources/resource.h b/cc/resources/resource.h
index 549a314d48eb6..1a547a7ae1cc9 100644
--- a/cc/resources/resource.h
+++ b/cc/resources/resource.h
@@ -5,6 +5,7 @@
 #ifndef CC_RESOURCES_RESOURCE_H_
 #define CC_RESOURCES_RESOURCE_H_
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/resource_util.h"
diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc
index 507aa2bc64075..b9630fafb4c62 100644
--- a/cc/resources/resource_pool.cc
+++ b/cc/resources/resource_pool.cc
@@ -4,6 +4,9 @@
 
 #include "cc/resources/resource_pool.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <utility>
 
diff --git a/cc/resources/resource_pool.h b/cc/resources/resource_pool.h
index e17032b4f81c9..df95846944043 100644
--- a/cc/resources/resource_pool.h
+++ b/cc/resources/resource_pool.h
@@ -5,9 +5,13 @@
 #ifndef CC_RESOURCES_RESOURCE_POOL_H_
 #define CC_RESOURCES_RESOURCE_POOL_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <deque>
 #include <map>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/memory_dump_provider.h"
 #include "cc/base/cc_export.h"
@@ -37,7 +41,7 @@ class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider {
   ~ResourcePool() override;
 
   Resource* AcquireResource(const gfx::Size& size, ResourceFormat format);
-  Resource* TryAcquireResourceWithContentId(uint64 content_id);
+  Resource* TryAcquireResourceWithContentId(uint64_t content_id);
   void ReleaseResource(Resource* resource, uint64_t content_id);
 
   void SetResourceUsageLimits(size_t max_memory_usage_bytes,
diff --git a/cc/resources/resource_pool_unittest.cc b/cc/resources/resource_pool_unittest.cc
index 0dc880677f2e7..af86503613636 100644
--- a/cc/resources/resource_pool_unittest.cc
+++ b/cc/resources/resource_pool_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/resources/resource_pool.h"
 
+#include <stddef.h>
+
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/resources/resource_util.h"
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index 4e490750a9907..c6e5c915d161a 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -4,11 +4,15 @@
 
 #include "cc/resources/resource_provider.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <limits>
 
 #include "base/atomic_sequence_num.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_math.h"
 #include "base/stl_util.h"
@@ -1623,7 +1627,7 @@ bool ResourceProvider::OnMemoryDump(
     base::trace_event::ProcessMemoryDump* pmd) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  const uint64 tracing_process_id =
+  const uint64_t tracing_process_id =
       base::trace_event::MemoryDumpManager::GetInstance()
           ->GetTracingProcessId();
 
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index 5a03cda2644f8..1aed50ffab7d7 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -5,15 +5,18 @@
 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_
 #define CC_RESOURCES_RESOURCE_PROVIDER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <deque>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 90ec427aae659..3374e85a384d2 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "cc/resources/resource_provider.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <deque>
 #include <map>
@@ -124,7 +127,7 @@ class ContextSharedData {
     return make_scoped_ptr(new ContextSharedData());
   }
 
-  uint32 InsertSyncPoint() { return next_sync_point_++; }
+  uint32_t InsertSyncPoint() { return next_sync_point_++; }
 
   void GenMailbox(GLbyte* mailbox) {
     memset(mailbox, 0, GL_MAILBOX_SIZE_CHROMIUM);
@@ -164,11 +167,11 @@ class ContextSharedData {
  private:
   ContextSharedData() : next_sync_point_(1), next_mailbox_(1) {}
 
-  uint32 next_sync_point_;
+  uint32_t next_sync_point_;
   unsigned next_mailbox_;
   typedef base::hash_map<unsigned, scoped_refptr<TestTexture>> TextureMap;
   TextureMap textures_;
-  base::hash_map<unsigned, uint32> sync_point_for_mailbox_;
+  base::hash_map<unsigned, uint32_t> sync_point_for_mailbox_;
 };
 
 class ResourceProviderContext : public TestWebGraphicsContext3D {
@@ -179,7 +182,7 @@ class ResourceProviderContext : public TestWebGraphicsContext3D {
   }
 
   GLuint insertSyncPoint() override {
-    uint32 sync_point = shared_data_->InsertSyncPoint();
+    uint32_t sync_point = shared_data_->InsertSyncPoint();
     // Commit the produceTextureCHROMIUM calls at this point, so that
     // they're associated with the sync point.
     for (const scoped_ptr<PendingProduceTexture>& pending_texture :
diff --git a/cc/resources/resource_util.h b/cc/resources/resource_util.h
index 9d9905b47d5d8..68a4aa59fa9fe 100644
--- a/cc/resources/resource_util.h
+++ b/cc/resources/resource_util.h
@@ -5,8 +5,11 @@
 #ifndef CC_RESOURCES_RESOURCE_UTIL_H_
 #define CC_RESOURCES_RESOURCE_UTIL_H_
 
+#include <stddef.h>
+
 #include <limits>
 
+#include "base/macros.h"
 #include "base/numerics/safe_math.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/math_util.h"
diff --git a/cc/resources/resource_util_unittest.cc b/cc/resources/resource_util_unittest.cc
index 1fabc3b4f6653..b159d1d96519a 100644
--- a/cc/resources/resource_util_unittest.cc
+++ b/cc/resources/resource_util_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 <stddef.h>
+
 #include "base/logging.h"
 #include "cc/resources/resource_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/resources/returned_resource.h b/cc/resources/returned_resource.h
index 92e57ad95d498..35de506a80621 100644
--- a/cc/resources/returned_resource.h
+++ b/cc/resources/returned_resource.h
@@ -7,7 +7,6 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/resource_id.h"
 #include "gpu/command_buffer/common/sync_token.h"
diff --git a/cc/resources/scoped_resource.h b/cc/resources/scoped_resource.h
index 8924ed972a472..0e50d0ab68e59 100644
--- a/cc/resources/scoped_resource.h
+++ b/cc/resources/scoped_resource.h
@@ -5,8 +5,8 @@
 #ifndef CC_RESOURCES_SCOPED_RESOURCE_H_
 #define CC_RESOURCES_SCOPED_RESOURCE_H_
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/resources/resource.h"
diff --git a/cc/resources/scoped_resource_unittest.cc b/cc/resources/scoped_resource_unittest.cc
index cb41bf6fc8a97..1133f2108e14b 100644
--- a/cc/resources/scoped_resource_unittest.cc
+++ b/cc/resources/scoped_resource_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/resources/scoped_resource.h"
 
+#include <stddef.h>
+
 #include "cc/output/renderer.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
diff --git a/cc/resources/scoped_ui_resource.cc b/cc/resources/scoped_ui_resource.cc
index e69b4bc936800..2db3edd12f585 100644
--- a/cc/resources/scoped_ui_resource.cc
+++ b/cc/resources/scoped_ui_resource.cc
@@ -4,7 +4,6 @@
 
 #include "cc/resources/scoped_ui_resource.h"
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "cc/trees/layer_tree_host.h"
 
diff --git a/cc/resources/scoped_ui_resource.h b/cc/resources/scoped_ui_resource.h
index 0e5a02c7dbb10..0e1676f05d2a4 100644
--- a/cc/resources/scoped_ui_resource.h
+++ b/cc/resources/scoped_ui_resource.h
@@ -5,6 +5,7 @@
 #ifndef CC_RESOURCES_SCOPED_UI_RESOURCE_H_
 #define CC_RESOURCES_SCOPED_UI_RESOURCE_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
 #include "cc/resources/ui_resource_bitmap.h"
diff --git a/cc/resources/shared_bitmap.cc b/cc/resources/shared_bitmap.cc
index fc15736315b75..2eb128af661f4 100644
--- a/cc/resources/shared_bitmap.cc
+++ b/cc/resources/shared_bitmap.cc
@@ -4,6 +4,9 @@
 
 #include "cc/resources/shared_bitmap.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "base/rand_util.h"
@@ -12,9 +15,8 @@
 
 namespace cc {
 
-SharedBitmap::SharedBitmap(uint8* pixels, const SharedBitmapId& id)
-    : pixels_(pixels), id_(id) {
-}
+SharedBitmap::SharedBitmap(uint8_t* pixels, const SharedBitmapId& id)
+    : pixels_(pixels), id_(id) {}
 
 SharedBitmap::~SharedBitmap() {
 }
diff --git a/cc/resources/shared_bitmap.h b/cc/resources/shared_bitmap.h
index 04dab7456fa92..c711a8b5ea47d 100644
--- a/cc/resources/shared_bitmap.h
+++ b/cc/resources/shared_bitmap.h
@@ -5,7 +5,10 @@
 #ifndef CC_RESOURCES_SHARED_BITMAP_H_
 #define CC_RESOURCES_SHARED_BITMAP_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/trace_event/memory_allocator_dump.h"
 #include "cc/base/cc_export.h"
 #include "gpu/command_buffer/common/mailbox.h"
@@ -19,11 +22,11 @@ GetSharedBitmapGUIDForTracing(const SharedBitmapId& bitmap_id);
 
 class CC_EXPORT SharedBitmap {
  public:
-  SharedBitmap(uint8* pixels, const SharedBitmapId& id);
+  SharedBitmap(uint8_t* pixels, const SharedBitmapId& id);
 
   virtual ~SharedBitmap();
 
-  uint8* pixels() { return pixels_; }
+  uint8_t* pixels() { return pixels_; }
 
   const SharedBitmapId& id() { return id_; }
 
@@ -41,7 +44,7 @@ class CC_EXPORT SharedBitmap {
   static SharedBitmapId GenerateId();
 
  private:
-  uint8* pixels_;
+  uint8_t* pixels_;
   SharedBitmapId id_;
 
   DISALLOW_COPY_AND_ASSIGN(SharedBitmap);
diff --git a/cc/resources/shared_bitmap_manager.h b/cc/resources/shared_bitmap_manager.h
index d5239e4b88d78..881f6fa9d2ab5 100644
--- a/cc/resources/shared_bitmap_manager.h
+++ b/cc/resources/shared_bitmap_manager.h
@@ -5,7 +5,7 @@
 #ifndef CC_RESOURCES_SHARED_BITMAP_MANAGER_H_
 #define CC_RESOURCES_SHARED_BITMAP_MANAGER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/resources/shared_bitmap.h"
diff --git a/cc/resources/texture_mailbox.cc b/cc/resources/texture_mailbox.cc
index 304567132c7b3..804080c93af96 100644
--- a/cc/resources/texture_mailbox.cc
+++ b/cc/resources/texture_mailbox.cc
@@ -4,6 +4,9 @@
 
 #include "cc/resources/texture_mailbox.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "cc/resources/shared_bitmap.h"
 
@@ -20,7 +23,7 @@ TextureMailbox::TextureMailbox(const gpu::MailboxHolder& mailbox_holder)
 
 TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
                                const gpu::SyncToken& sync_token,
-                               uint32 target)
+                               uint32_t target)
     : mailbox_holder_(mailbox, sync_token, target),
       shared_bitmap_(NULL),
       is_overlay_candidate_(false),
@@ -28,7 +31,7 @@ TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
 
 TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
                                const gpu::SyncToken& sync_token,
-                               uint32 target,
+                               uint32_t target,
                                const gfx::Size& size_in_pixels,
                                bool is_overlay_candidate)
     : mailbox_holder_(mailbox, sync_token, target),
diff --git a/cc/resources/texture_mailbox.h b/cc/resources/texture_mailbox.h
index 01cc660c0b96e..42109c686de4b 100644
--- a/cc/resources/texture_mailbox.h
+++ b/cc/resources/texture_mailbox.h
@@ -5,6 +5,9 @@
 #ifndef CC_RESOURCES_TEXTURE_MAILBOX_H_
 #define CC_RESOURCES_TEXTURE_MAILBOX_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
 #include "base/memory/shared_memory.h"
@@ -23,10 +26,10 @@ class CC_EXPORT TextureMailbox {
   explicit TextureMailbox(const gpu::MailboxHolder& mailbox_holder);
   TextureMailbox(const gpu::Mailbox& mailbox,
                  const gpu::SyncToken& sync_token,
-                 uint32 target);
+                 uint32_t target);
   TextureMailbox(const gpu::Mailbox& mailbox,
                  const gpu::SyncToken& sync_token,
-                 uint32 target,
+                 uint32_t target,
                  const gfx::Size& size_in_pixels,
                  bool is_overlay_candidate);
   TextureMailbox(SharedBitmap* shared_bitmap, const gfx::Size& size_in_pixels);
@@ -40,8 +43,8 @@ class CC_EXPORT TextureMailbox {
   bool Equals(const TextureMailbox&) const;
 
   const gpu::Mailbox& mailbox() const { return mailbox_holder_.mailbox; }
-  const int8* name() const { return mailbox().name; }
-  uint32 target() const { return mailbox_holder_.texture_target; }
+  const int8_t* name() const { return mailbox().name; }
+  uint32_t target() const { return mailbox_holder_.texture_target; }
   const gpu::SyncToken& sync_token() const {
     return mailbox_holder_.sync_token;
   }
diff --git a/cc/resources/transferable_resource.h b/cc/resources/transferable_resource.h
index a3231bc3f0477..55d2216a50f1c 100644
--- a/cc/resources/transferable_resource.h
+++ b/cc/resources/transferable_resource.h
@@ -5,9 +5,10 @@
 #ifndef CC_RESOURCES_TRANSFERABLE_RESOURCE_H_
 #define CC_RESOURCES_TRANSFERABLE_RESOURCE_H_
 
+#include <stdint.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/resource_id.h"
 #include "cc/resources/resource_format.h"
@@ -31,7 +32,7 @@ struct CC_EXPORT TransferableResource {
 
   ResourceId id;
   ResourceFormat format;
-  uint32 filter;
+  uint32_t filter;
   gfx::Size size;
   gpu::MailboxHolder mailbox_holder;
   bool read_lock_fences_enabled;
diff --git a/cc/resources/ui_resource_bitmap.cc b/cc/resources/ui_resource_bitmap.cc
index 953d419989e78..b8fbf31af9f10 100644
--- a/cc/resources/ui_resource_bitmap.cc
+++ b/cc/resources/ui_resource_bitmap.cc
@@ -4,6 +4,8 @@
 
 #include "cc/resources/ui_resource_bitmap.h"
 
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/cc/resources/ui_resource_bitmap.h b/cc/resources/ui_resource_bitmap.h
index 129be967ad776..34e73ee63a79a 100644
--- a/cc/resources/ui_resource_bitmap.h
+++ b/cc/resources/ui_resource_bitmap.h
@@ -5,6 +5,8 @@
 #ifndef CC_RESOURCES_UI_RESOURCE_BITMAP_H_
 #define CC_RESOURCES_UI_RESOURCE_BITMAP_H_
 
+#include <stdint.h>
+
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/resources/ui_resource_client.h b/cc/resources/ui_resource_client.h
index 24309a52bb7d8..07d5fd8997f0b 100644
--- a/cc/resources/ui_resource_client.h
+++ b/cc/resources/ui_resource_client.h
@@ -5,7 +5,6 @@
 #ifndef CC_RESOURCES_UI_RESOURCE_CLIENT_H_
 #define CC_RESOURCES_UI_RESOURCE_CLIENT_H_
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
index 4936daef674f5..7d57a41ffd2f2 100644
--- a/cc/resources/video_resource_updater.cc
+++ b/cc/resources/video_resource_updater.cc
@@ -4,6 +4,9 @@
 
 #include "cc/resources/video_resource_updater.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/bind.h"
diff --git a/cc/resources/video_resource_updater.h b/cc/resources/video_resource_updater.h
index 3da2023fce198..1044518a80db0 100644
--- a/cc/resources/video_resource_updater.h
+++ b/cc/resources/video_resource_updater.h
@@ -5,10 +5,13 @@
 #ifndef CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_
 #define CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <list>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
diff --git a/cc/resources/video_resource_updater_unittest.cc b/cc/resources/video_resource_updater_unittest.cc
index 689de6817943d..064829e0a57b2 100644
--- a/cc/resources/video_resource_updater_unittest.cc
+++ b/cc/resources/video_resource_updater_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "cc/resources/video_resource_updater.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "cc/resources/resource_provider.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
@@ -80,9 +83,9 @@ class VideoResourceUpdaterTest : public testing::Test {
   scoped_refptr<media::VideoFrame> CreateTestYUVVideoFrame() {
     const int kDimension = 10;
     gfx::Size size(kDimension, kDimension);
-    static uint8 y_data[kDimension * kDimension] = { 0 };
-    static uint8 u_data[kDimension * kDimension / 2] = { 0 };
-    static uint8 v_data[kDimension * kDimension / 2] = { 0 };
+    static uint8_t y_data[kDimension * kDimension] = {0};
+    static uint8_t u_data[kDimension * kDimension / 2] = {0};
+    static uint8_t v_data[kDimension * kDimension / 2] = {0};
 
     return media::VideoFrame::WrapExternalYuvData(
         media::PIXEL_FORMAT_YV16,  // format
diff --git a/cc/scheduler/begin_frame_source.cc b/cc/scheduler/begin_frame_source.cc
index 2681983185260..17b4a26375be8 100644
--- a/cc/scheduler/begin_frame_source.cc
+++ b/cc/scheduler/begin_frame_source.cc
@@ -4,6 +4,8 @@
 
 #include "cc/scheduler/begin_frame_source.h"
 
+#include <stddef.h>
+
 #include "base/auto_reset.h"
 #include "base/location.h"
 #include "base/logging.h"
diff --git a/cc/scheduler/begin_frame_source.h b/cc/scheduler/begin_frame_source.h
index 87ed17f6e29a4..ec8aaa588a6a0 100644
--- a/cc/scheduler/begin_frame_source.h
+++ b/cc/scheduler/begin_frame_source.h
@@ -5,10 +5,14 @@
 #ifndef CC_SCHEDULER_BEGIN_FRAME_SOURCE_H_
 #define CC_SCHEDULER_BEGIN_FRAME_SOURCE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <set>
 #include <string>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/scheduler/delay_based_time_source.h"
diff --git a/cc/scheduler/begin_frame_source_unittest.cc b/cc/scheduler/begin_frame_source_unittest.cc
index afc3b304b614e..43ba4fa795f40 100644
--- a/cc/scheduler/begin_frame_source_unittest.cc
+++ b/cc/scheduler/begin_frame_source_unittest.cc
@@ -4,7 +4,8 @@
 
 #include "cc/scheduler/begin_frame_source.h"
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/test/test_simple_task_runner.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/begin_frame_source_test.h"
diff --git a/cc/scheduler/compositor_timing_history.cc b/cc/scheduler/compositor_timing_history.cc
index d21696dca6ae3..f3ac0670525bd 100644
--- a/cc/scheduler/compositor_timing_history.cc
+++ b/cc/scheduler/compositor_timing_history.cc
@@ -4,6 +4,9 @@
 
 #include "cc/scheduler/compositor_timing_history.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/metrics/histogram.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
@@ -66,7 +69,7 @@ const double kActivateEstimationPercentile = 90.0;
 const double kDrawEstimationPercentile = 90.0;
 
 const int kUmaDurationMinMicros = 1;
-const int64 kUmaDurationMaxMicros = 1 * base::Time::kMicrosecondsPerSecond;
+const int64_t kUmaDurationMaxMicros = 1 * base::Time::kMicrosecondsPerSecond;
 const size_t kUmaDurationBucketCount = 100;
 
 // Deprecated because they combine Browser and Renderer stats and have low
diff --git a/cc/scheduler/compositor_timing_history.h b/cc/scheduler/compositor_timing_history.h
index 1523aeb4b3ca4..b64dc0561a52c 100644
--- a/cc/scheduler/compositor_timing_history.h
+++ b/cc/scheduler/compositor_timing_history.h
@@ -5,6 +5,7 @@
 #ifndef CC_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_
 #define CC_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/rolling_time_delta_history.h"
 
diff --git a/cc/scheduler/compositor_timing_history_unittest.cc b/cc/scheduler/compositor_timing_history_unittest.cc
index 70710db54f942..2cbc8a869f744 100644
--- a/cc/scheduler/compositor_timing_history_unittest.cc
+++ b/cc/scheduler/compositor_timing_history_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "cc/scheduler/compositor_timing_history.h"
 
+#include "base/macros.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/scheduler/delay_based_time_source.h b/cc/scheduler/delay_based_time_source.h
index cd474a5c807f3..7f97a914d2d5d 100644
--- a/cc/scheduler/delay_based_time_source.h
+++ b/cc/scheduler/delay_based_time_source.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/cancelable_callback.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/scheduler/delay_based_time_source_unittest.cc b/cc/scheduler/delay_based_time_source_unittest.cc
index 948e0205bbfa1..5e224e6a1ce84 100644
--- a/cc/scheduler/delay_based_time_source_unittest.cc
+++ b/cc/scheduler/delay_based_time_source_unittest.cc
@@ -4,7 +4,8 @@
 
 #include "cc/scheduler/delay_based_time_source.h"
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/test/test_simple_task_runner.h"
 #include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -429,7 +430,7 @@ TEST(DelayBasedTimeSourceTest, AchievesTargetRateWithNoNoise) {
 
   double total_frame_time = 0.0;
   for (int i = 0; i < num_iterations; ++i) {
-    int64 delay_ms = task_runner->NextPendingTaskDelay().InMilliseconds();
+    int64_t delay_ms = task_runner->NextPendingTaskDelay().InMilliseconds();
 
     // accumulate the "delay"
     total_frame_time += delay_ms / 1000.0;
diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h
index cbb30d185d35e..e1a067cbb5194 100644
--- a/cc/scheduler/scheduler.h
+++ b/cc/scheduler/scheduler.h
@@ -8,8 +8,8 @@
 #include <deque>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/cancelable_callback.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h
index 2cc4c637619f6..22c58d0ec5af5 100644
--- a/cc/scheduler/scheduler_state_machine.h
+++ b/cc/scheduler/scheduler_state_machine.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/begin_frame_args.h"
diff --git a/cc/scheduler/scheduler_state_machine_unittest.cc b/cc/scheduler/scheduler_state_machine_unittest.cc
index 44d16c11d795b..668f5154fbe2a 100644
--- a/cc/scheduler/scheduler_state_machine_unittest.cc
+++ b/cc/scheduler/scheduler_state_machine_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/scheduler/scheduler_state_machine.h"
 
+#include <stddef.h>
+
 #include "base/trace_event/trace_event.h"
 #include "cc/scheduler/scheduler.h"
 #include "cc/test/begin_frame_args_test.h"
diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
index 17935acf19249..7f577a64c0ef0 100644
--- a/cc/scheduler/scheduler_unittest.cc
+++ b/cc/scheduler/scheduler_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/scheduler/scheduler.h"
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index 1344847fba204..64a290657f6e7 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -4,6 +4,8 @@
 
 #include "cc/surfaces/display.h"
 
+#include <stddef.h>
+
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/debug/benchmark_instrumentation.h"
diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h
index 7bbcd6e33b8d9..6c29dc86d9901 100644
--- a/cc/surfaces/display.h
+++ b/cc/surfaces/display.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/renderer.h"
diff --git a/cc/surfaces/display_scheduler.h b/cc/surfaces/display_scheduler.h
index 7b043c04cd26a..838af40be1ea9 100644
--- a/cc/surfaces/display_scheduler.h
+++ b/cc/surfaces/display_scheduler.h
@@ -6,6 +6,7 @@
 #define CC_SURFACES_DISPLAY_SCHEDULER_H_
 
 #include "base/cancelable_callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
diff --git a/cc/surfaces/onscreen_display_client.h b/cc/surfaces/onscreen_display_client.h
index 30943066d3dc4..80d6c52563261 100644
--- a/cc/surfaces/onscreen_display_client.h
+++ b/cc/surfaces/onscreen_display_client.h
@@ -8,6 +8,7 @@
 #include "cc/surfaces/display_client.h"
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc
index 29d2c4751a8d8..b60a64f937911 100644
--- a/cc/surfaces/surface.cc
+++ b/cc/surfaces/surface.cc
@@ -4,6 +4,9 @@
 
 #include "cc/surfaces/surface.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "cc/base/container_util.h"
diff --git a/cc/surfaces/surface.h b/cc/surfaces/surface.h
index 267983dbbf5fa..a83aee38119b4 100644
--- a/cc/surfaces/surface.h
+++ b/cc/surfaces/surface.h
@@ -5,6 +5,9 @@
 #ifndef CC_SURFACES_SURFACE_H_
 #define CC_SURFACES_SURFACE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <vector>
diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc
index 3c97bdc25cd92..9901d002a0e87 100644
--- a/cc/surfaces/surface_aggregator.cc
+++ b/cc/surfaces/surface_aggregator.cc
@@ -4,11 +4,14 @@
 
 #include "cc/surfaces/surface_aggregator.h"
 
+#include <stddef.h>
+
 #include <map>
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h
index 6df7e6ba0f870..0b640a93280a5 100644
--- a/cc/surfaces/surface_aggregator.h
+++ b/cc/surfaces/surface_aggregator.h
@@ -9,6 +9,7 @@
 
 #include "base/containers/hash_tables.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/render_pass.h"
diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc
index a0ac9f0333bfa..95f02611369f8 100644
--- a/cc/surfaces/surface_aggregator_unittest.cc
+++ b/cc/surfaces/surface_aggregator_unittest.cc
@@ -4,8 +4,12 @@
 
 #include "cc/surfaces/surface_aggregator.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <utility>
 
+#include "base/macros.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass.h"
diff --git a/cc/surfaces/surface_display_output_surface.h b/cc/surfaces/surface_display_output_surface.h
index 5dbbbe00d099d..d173218fae604 100644
--- a/cc/surfaces/surface_display_output_surface.h
+++ b/cc/surfaces/surface_display_output_surface.h
@@ -5,6 +5,7 @@
 #ifndef CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
 #define CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
 
+#include "base/macros.h"
 #include "cc/output/output_surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
diff --git a/cc/surfaces/surface_factory.h b/cc/surfaces/surface_factory.h
index 1347728070a1d..fdfad179059d3 100644
--- a/cc/surfaces/surface_factory.h
+++ b/cc/surfaces/surface_factory.h
@@ -9,6 +9,7 @@
 
 #include "base/callback_forward.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc
index cf242c3e4dcea..540d9da22c303 100644
--- a/cc/surfaces/surface_factory_unittest.cc
+++ b/cc/surfaces/surface_factory_unittest.cc
@@ -4,9 +4,13 @@
 
 #include "cc/surfaces/surface_factory.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
@@ -400,7 +404,7 @@ TEST_F(SurfaceFactoryTest, BlankNoIndexIncrement) {
   factory_->Destroy(surface_id);
 }
 
-void DrawCallback(uint32* execute_count,
+void DrawCallback(uint32_t* execute_count,
                   SurfaceDrawStatus* result,
                   SurfaceDrawStatus drawn) {
   *execute_count += 1;
@@ -419,7 +423,7 @@ TEST_F(SurfaceFactoryTest, DestroyAll) {
   frame_data->resource_list.push_back(resource);
   scoped_ptr<CompositorFrame> frame(new CompositorFrame);
   frame->delegated_frame_data = std::move(frame_data);
-  uint32 execute_count = 0;
+  uint32_t execute_count = 0;
   SurfaceDrawStatus drawn = SurfaceDrawStatus::DRAW_SKIPPED;
 
   factory_->SubmitCompositorFrame(
diff --git a/cc/surfaces/surface_hittest_unittest.cc b/cc/surfaces/surface_hittest_unittest.cc
index 144d0d6e1f98e..5970d45e3ad79 100644
--- a/cc/surfaces/surface_hittest_unittest.cc
+++ b/cc/surfaces/surface_hittest_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 <stddef.h>
+
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
diff --git a/cc/surfaces/surface_id.h b/cc/surfaces/surface_id.h
index 070265a84955d..0ade6ab913592 100644
--- a/cc/surfaces/surface_id.h
+++ b/cc/surfaces/surface_id.h
@@ -5,6 +5,9 @@
 #ifndef CC_SURFACES_SURFACE_ID_H_
 #define CC_SURFACES_SURFACE_ID_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/containers/hash_tables.h"
 
 namespace cc {
diff --git a/cc/surfaces/surface_id_allocator.cc b/cc/surfaces/surface_id_allocator.cc
index 04f60d9fad7fc..d71467562e1ca 100644
--- a/cc/surfaces/surface_id_allocator.cc
+++ b/cc/surfaces/surface_id_allocator.cc
@@ -4,6 +4,8 @@
 
 #include "cc/surfaces/surface_id_allocator.h"
 
+#include <stdint.h>
+
 #include "cc/surfaces/surface_manager.h"
 
 namespace cc {
diff --git a/cc/surfaces/surface_id_allocator.h b/cc/surfaces/surface_id_allocator.h
index 31b1e8717d176..b0f8bf42b8c2d 100644
--- a/cc/surfaces/surface_id_allocator.h
+++ b/cc/surfaces/surface_id_allocator.h
@@ -5,6 +5,9 @@
 #ifndef CC_SURFACES_SURFACE_ID_ALLOCATOR_H_
 #define CC_SURFACES_SURFACE_ID_ALLOCATOR_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surfaces_export.h"
 
diff --git a/cc/surfaces/surface_manager.cc b/cc/surfaces/surface_manager.cc
index 9ced46e41bad4..03951e41145fc 100644
--- a/cc/surfaces/surface_manager.cc
+++ b/cc/surfaces/surface_manager.cc
@@ -4,6 +4,9 @@
 
 #include "cc/surfaces/surface_manager.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_id_allocator.h"
diff --git a/cc/surfaces/surface_manager.h b/cc/surfaces/surface_manager.h
index 8430ea619ab72..7466501545b02 100644
--- a/cc/surfaces/surface_manager.h
+++ b/cc/surfaces/surface_manager.h
@@ -5,6 +5,8 @@
 #ifndef CC_SURFACES_SURFACE_MANAGER_H_
 #define CC_SURFACES_SURFACE_MANAGER_H_
 
+#include <stdint.h>
+
 #include <list>
 #include <vector>
 
diff --git a/cc/surfaces/surface_sequence.h b/cc/surfaces/surface_sequence.h
index b5792962afb3d..21decf6fe90ab 100644
--- a/cc/surfaces/surface_sequence.h
+++ b/cc/surfaces/surface_sequence.h
@@ -5,6 +5,9 @@
 #ifndef CC_SURFACES_SURFACE_SEQUENCE_H_
 #define CC_SURFACES_SURFACE_SEQUENCE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <tuple>
 
 #include "base/containers/hash_tables.h"
diff --git a/cc/test/begin_frame_args_test.cc b/cc/test/begin_frame_args_test.cc
index 4c3b5a4e0462c..8b4dfd3bd97cc 100644
--- a/cc/test/begin_frame_args_test.cc
+++ b/cc/test/begin_frame_args_test.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/begin_frame_args_test.h"
 
+#include <stdint.h>
+
 #include "base/time/time.h"
 #include "cc/output/begin_frame_args.h"
 
@@ -26,9 +28,9 @@ BeginFrameArgs CreateBeginFrameArgsForTesting(
 
 BeginFrameArgs CreateBeginFrameArgsForTesting(
     BeginFrameArgs::CreationLocation location,
-    int64 frame_time,
-    int64 deadline,
-    int64 interval) {
+    int64_t frame_time,
+    int64_t deadline,
+    int64_t interval) {
   return BeginFrameArgs::Create(
       location, base::TimeTicks::FromInternalValue(frame_time),
       base::TimeTicks::FromInternalValue(deadline),
@@ -37,9 +39,9 @@ BeginFrameArgs CreateBeginFrameArgsForTesting(
 
 BeginFrameArgs CreateBeginFrameArgsForTesting(
     BeginFrameArgs::CreationLocation location,
-    int64 frame_time,
-    int64 deadline,
-    int64 interval,
+    int64_t frame_time,
+    int64_t deadline,
+    int64_t interval,
     BeginFrameArgs::BeginFrameArgsType type) {
   return BeginFrameArgs::Create(
       location, base::TimeTicks::FromInternalValue(frame_time),
diff --git a/cc/test/begin_frame_args_test.h b/cc/test/begin_frame_args_test.h
index 9ef5d53172c31..d798094d26ddc 100644
--- a/cc/test/begin_frame_args_test.h
+++ b/cc/test/begin_frame_args_test.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_BEGIN_FRAME_ARGS_TEST_H_
 #define CC_TEST_BEGIN_FRAME_ARGS_TEST_H_
 
+#include <stdint.h>
+
 #include <iosfwd>
 
 #include "base/test/simple_test_tick_clock.h"
@@ -22,14 +24,14 @@ BeginFrameArgs CreateBeginFrameArgsForTesting(
     base::TimeTicks frame_time);
 BeginFrameArgs CreateBeginFrameArgsForTesting(
     BeginFrameArgs::CreationLocation location,
-    int64 frame_time,
-    int64 deadline,
-    int64 interval);
+    int64_t frame_time,
+    int64_t deadline,
+    int64_t interval);
 BeginFrameArgs CreateBeginFrameArgsForTesting(
     BeginFrameArgs::CreationLocation location,
-    int64 frame_time,
-    int64 deadline,
-    int64 interval,
+    int64_t frame_time,
+    int64_t deadline,
+    int64_t interval,
     BeginFrameArgs::BeginFrameArgsType type);
 
 // Creates a BeginFrameArgs using the fake Now value stored on the
diff --git a/cc/test/begin_frame_source_test.h b/cc/test/begin_frame_source_test.h
index 98f5d90f9cb9a..1de8b99391ebf 100644
--- a/cc/test/begin_frame_source_test.h
+++ b/cc/test/begin_frame_source_test.h
@@ -5,7 +5,6 @@
 #ifndef CC_TEST_BEGIN_FRAME_SOURCE_TEST_H_
 #define CC_TEST_BEGIN_FRAME_SOURCE_TEST_H_
 
-#include "base/basictypes.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/test/begin_frame_args_test.h"
diff --git a/cc/test/failure_output_surface.h b/cc/test/failure_output_surface.h
index 4878ea508619a..a7aca5b3ab868 100644
--- a/cc/test/failure_output_surface.h
+++ b/cc/test/failure_output_surface.h
@@ -5,6 +5,7 @@
 #ifndef CC_TEST_FAILURE_OUTPUT_SURFACE_H_
 #define CC_TEST_FAILURE_OUTPUT_SURFACE_H_
 
+#include "base/macros.h"
 #include "cc/test/fake_output_surface.h"
 
 namespace cc {
diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc
index 6ffa8fef7de01..7876d2961126d 100644
--- a/cc/test/fake_content_layer_client.cc
+++ b/cc/test/fake_content_layer_client.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/fake_content_layer_client.h"
 
+#include <stddef.h>
+
 #include "cc/playback/clip_display_item.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
diff --git a/cc/test/fake_content_layer_client.h b/cc/test/fake_content_layer_client.h
index c63f5d2bc7045..53548338c0304 100644
--- a/cc/test/fake_content_layer_client.h
+++ b/cc/test/fake_content_layer_client.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_
 #define CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_
 
+#include <stddef.h>
+
 #include <utility>
 #include <vector>
 
diff --git a/cc/test/fake_display_list_recording_source.h b/cc/test/fake_display_list_recording_source.h
index cb526adb896ca..158c053771cbf 100644
--- a/cc/test/fake_display_list_recording_source.h
+++ b/cc/test/fake_display_list_recording_source.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_FAKE_DISPLAY_LIST_RECORDING_SOURCE_H_
 #define CC_TEST_FAKE_DISPLAY_LIST_RECORDING_SOURCE_H_
 
+#include <stddef.h>
+
 #include "cc/base/region.h"
 #include "cc/playback/display_list_recording_source.h"
 #include "cc/test/fake_content_layer_client.h"
diff --git a/cc/test/fake_layer_tree_host_impl.cc b/cc/test/fake_layer_tree_host_impl.cc
index e837ab7e81302..ae4770404fb7d 100644
--- a/cc/test/fake_layer_tree_host_impl.cc
+++ b/cc/test/fake_layer_tree_host_impl.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 <stddef.h>
+
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/layer_tree_settings_for_testing.h"
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
index 6804b137f5087..a7a68bd9f0636 100644
--- a/cc/test/fake_output_surface.h
+++ b/cc/test/fake_output_surface.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_
 #define CC_TEST_FAKE_OUTPUT_SURFACE_H_
 
+#include <stddef.h>
+
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/time/time.h"
diff --git a/cc/test/fake_painted_scrollbar_layer.h b/cc/test/fake_painted_scrollbar_layer.h
index 72ea250d4405e..95ed921b1bec9 100644
--- a/cc/test/fake_painted_scrollbar_layer.h
+++ b/cc/test/fake_painted_scrollbar_layer.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_FAKE_PAINTED_SCROLLBAR_LAYER_H_
 #define CC_TEST_FAKE_PAINTED_SCROLLBAR_LAYER_H_
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/painted_scrollbar_layer.h"
 #include "cc/test/fake_scrollbar.h"
diff --git a/cc/test/fake_picture_layer.h b/cc/test/fake_picture_layer.h
index 96dae06a38f8a..6bb9b175d0737 100644
--- a/cc/test/fake_picture_layer.h
+++ b/cc/test/fake_picture_layer.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_FAKE_PICTURE_LAYER_H_
 #define CC_TEST_FAKE_PICTURE_LAYER_H_
 
+#include <stddef.h>
+
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/picture_layer.h"
diff --git a/cc/test/fake_picture_layer_impl.cc b/cc/test/fake_picture_layer_impl.cc
index 874328711f7a8..545cc8919ce41 100644
--- a/cc/test/fake_picture_layer_impl.cc
+++ b/cc/test/fake_picture_layer_impl.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/fake_picture_layer_impl.h"
 
+#include <stddef.h>
+
 #include <vector>
 #include "cc/tiles/tile.h"
 #include "cc/trees/layer_tree_impl.h"
diff --git a/cc/test/fake_picture_layer_impl.h b/cc/test/fake_picture_layer_impl.h
index 3d8431ea2aae2..759bb83f66ece 100644
--- a/cc/test/fake_picture_layer_impl.h
+++ b/cc/test/fake_picture_layer_impl.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_FAKE_PICTURE_LAYER_IMPL_H_
 #define CC_TEST_FAKE_PICTURE_LAYER_IMPL_H_
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/playback/display_list_raster_source.h"
diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc
index 67785caf9741b..aa76d6a5eaed4 100644
--- a/cc/test/fake_picture_layer_tiling_client.cc
+++ b/cc/test/fake_picture_layer_tiling_client.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/fake_picture_layer_tiling_client.h"
 
+#include <stddef.h>
+
 #include <limits>
 
 #include "base/thread_task_runner_handle.h"
diff --git a/cc/test/fake_resource_provider.h b/cc/test/fake_resource_provider.h
index 4ad254f2e1a20..0279d73cb0e11 100644
--- a/cc/test/fake_resource_provider.h
+++ b/cc/test/fake_resource_provider.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_FAKE_RESOURCE_PROVIDER_H_
 #define CC_TEST_FAKE_RESOURCE_PROVIDER_H_
 
+#include <stddef.h>
+
 #include "cc/resources/resource_provider.h"
 #include "ui/gfx/buffer_types.h"
 
diff --git a/cc/test/fake_scrollbar.h b/cc/test/fake_scrollbar.h
index 8ae49e44116a1..6dccdc376e961 100644
--- a/cc/test/fake_scrollbar.h
+++ b/cc/test/fake_scrollbar.h
@@ -6,6 +6,7 @@
 #define CC_TEST_FAKE_SCROLLBAR_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "cc/input/scrollbar.h"
 #include "third_party/skia/include/core/SkColor.h"
 
diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc
index 102519257da37..9dde7495562ed 100644
--- a/cc/test/fake_tile_manager.cc
+++ b/cc/test/fake_tile_manager.cc
@@ -4,6 +4,9 @@
 
 #include "cc/test/fake_tile_manager.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <deque>
 #include <limits>
 
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index a2559769fe180..f482544f004b7 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/layer_test_common.h"
 
+#include <stddef.h>
+
 #include "cc/base/math_util.h"
 #include "cc/base/region.h"
 #include "cc/layers/append_quads_data.h"
diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h
index a0256296ea3f8..80c19805ec60c 100644
--- a/cc/test/layer_test_common.h
+++ b/cc/test/layer_test_common.h
@@ -5,9 +5,10 @@
 #ifndef CC_TEST_LAYER_TEST_COMMON_H_
 #define CC_TEST_LAYER_TEST_COMMON_H_
 
+#include <stddef.h>
+
 #include <utility>
 
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/quads/render_pass.h"
 #include "cc/test/fake_layer_tree_host.h"
diff --git a/cc/test/layer_tree_host_common_test.cc b/cc/test/layer_tree_host_common_test.cc
index 02b66ac2d15a6..0f07a43c4f7a7 100644
--- a/cc/test/layer_tree_host_common_test.cc
+++ b/cc/test/layer_tree_host_common_test.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/layer_tree_host_common_test.h"
 
+#include <stddef.h>
+
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/test/fake_layer_tree_host.h"
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
index f2dc8a8d87f32..4dd3d661e13fc 100644
--- a/cc/test/layer_tree_json_parser.cc
+++ b/cc/test/layer_tree_json_parser.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/layer_tree_json_parser.h"
 
+#include <stddef.h>
+
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
diff --git a/cc/test/layer_tree_json_parser_unittest.cc b/cc/test/layer_tree_json_parser_unittest.cc
index d0f75441bfa9b..f1110329edd9c 100644
--- a/cc/test/layer_tree_json_parser_unittest.cc
+++ b/cc/test/layer_tree_json_parser_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/layer_tree_json_parser.h"
 
+#include <stddef.h>
+
 #include "cc/layers/layer.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host.h"
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index fa2549ef0897b..48a5dbbd55622 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -4,6 +4,9 @@
 
 #include "cc/test/layer_tree_pixel_test.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "cc/base/switches.h"
@@ -232,7 +235,7 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
   EXPECT_EQ(static_cast<unsigned>(GL_FRAMEBUFFER_COMPLETE),
             gl->CheckFramebufferStatus(GL_FRAMEBUFFER));
 
-  scoped_ptr<uint8[]> pixels(new uint8[size.GetArea() * 4]);
+  scoped_ptr<uint8_t[]> pixels(new uint8_t[size.GetArea() * 4]);
   gl->ReadPixels(0,
                  0,
                  size.width(),
@@ -247,7 +250,7 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
   scoped_ptr<SkBitmap> bitmap(new SkBitmap);
   bitmap->allocN32Pixels(size.width(), size.height());
 
-  uint8* out_pixels = static_cast<uint8*>(bitmap->getPixels());
+  uint8_t* out_pixels = static_cast<uint8_t*>(bitmap->getPixels());
 
   size_t row_bytes = size.width() * 4;
   size_t total_bytes = size.height() * row_bytes;
diff --git a/cc/test/mock_occlusion_tracker.h b/cc/test/mock_occlusion_tracker.h
index b291bf57d1b68..47f1f0e7a45a0 100644
--- a/cc/test/mock_occlusion_tracker.h
+++ b/cc/test/mock_occlusion_tracker.h
@@ -5,6 +5,7 @@
 #ifndef CC_TEST_MOCK_OCCLUSION_TRACKER_H_
 #define CC_TEST_MOCK_OCCLUSION_TRACKER_H_
 
+#include "base/macros.h"
 #include "cc/trees/occlusion_tracker.h"
 
 namespace cc {
diff --git a/cc/test/ordered_simple_task_runner.cc b/cc/test/ordered_simple_task_runner.cc
index 3e0864c32a7c8..dea8556d52790 100644
--- a/cc/test/ordered_simple_task_runner.cc
+++ b/cc/test/ordered_simple_task_runner.cc
@@ -4,6 +4,9 @@
 
 #include "cc/test/ordered_simple_task_runner.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <limits>
 #include <set>
 #include <sstream>
diff --git a/cc/test/ordered_simple_task_runner.h b/cc/test/ordered_simple_task_runner.h
index 91ea4be75cdc6..c7abe409e9fc3 100644
--- a/cc/test/ordered_simple_task_runner.h
+++ b/cc/test/ordered_simple_task_runner.h
@@ -5,13 +5,15 @@
 #ifndef CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_
 #define CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_
 
+#include <stddef.h>
+
 #include <limits>
 #include <set>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/trace_event/trace_event.h"
diff --git a/cc/test/ordered_simple_task_runner_unittest.cc b/cc/test/ordered_simple_task_runner_unittest.cc
index 437235ea1d3a6..cb3c4c54a895c 100644
--- a/cc/test/ordered_simple_task_runner_unittest.cc
+++ b/cc/test/ordered_simple_task_runner_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/cancelable_callback.h"
 #include "base/format_macros.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_pending_task.h"
diff --git a/cc/test/ordered_texture_map.cc b/cc/test/ordered_texture_map.cc
index 649700c49795a..a474dbff88c1e 100644
--- a/cc/test/ordered_texture_map.cc
+++ b/cc/test/ordered_texture_map.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/ordered_texture_map.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "cc/test/test_texture.h"
 
diff --git a/cc/test/ordered_texture_map.h b/cc/test/ordered_texture_map.h
index 2aa311184a3a7..8b2a6ca912b0a 100644
--- a/cc/test/ordered_texture_map.h
+++ b/cc/test/ordered_texture_map.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_ORDERED_TEXTURE_MAP_H_
 #define CC_TEST_ORDERED_TEXTURE_MAP_H_
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/containers/hash_tables.h"
diff --git a/cc/test/pixel_comparator.cc b/cc/test/pixel_comparator.cc
index 4067787cef569..4b4318899b147 100644
--- a/cc/test/pixel_comparator.cc
+++ b/cc/test/pixel_comparator.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/pixel_comparator.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/logging.h"
@@ -75,10 +77,10 @@ bool FuzzyPixelComparator::Compare(const SkBitmap& actual_bmp,
   // Number of pixels with a small error
   int small_error_pixels_count = 0;
   // The per channel sums of absolute errors over all pixels.
-  int64 sum_abs_error_r = 0;
-  int64 sum_abs_error_g = 0;
-  int64 sum_abs_error_b = 0;
-  int64 sum_abs_error_a = 0;
+  int64_t sum_abs_error_r = 0;
+  int64_t sum_abs_error_g = 0;
+  int64_t sum_abs_error_b = 0;
+  int64_t sum_abs_error_a = 0;
   // The per channel maximum absolute errors over all pixels.
   int max_abs_error_r = 0;
   int max_abs_error_g = 0;
diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc
index 1bb996651e1b3..b0464c2445ffc 100644
--- a/cc/test/render_pass_test_utils.cc
+++ b/cc/test/render_pass_test_utils.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/render_pass_test_utils.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/io_surface_draw_quad.h"
diff --git a/cc/test/render_pass_test_utils.h b/cc/test/render_pass_test_utils.h
index 9182b5a7e10e4..3cf34ee5c2def 100644
--- a/cc/test/render_pass_test_utils.h
+++ b/cc/test/render_pass_test_utils.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_RENDER_PASS_TEST_UTILS_H_
 #define CC_TEST_RENDER_PASS_TEST_UTILS_H_
 
+#include <stdint.h>
+
 #include "cc/output/filter_operations.h"
 #include "cc/quads/render_pass.h"
 #include "cc/resources/resource_provider.h"
diff --git a/cc/test/scheduler_test_common.cc b/cc/test/scheduler_test_common.cc
index c04c1e00d6bd6..4d7f06d7986b6 100644
--- a/cc/test/scheduler_test_common.cc
+++ b/cc/test/scheduler_test_common.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/scheduler_test_common.h"
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/logging.h"
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index 5cb3377ce583f..e561d82f9f266 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -5,9 +5,11 @@
 #ifndef CC_TEST_SCHEDULER_TEST_COMMON_H_
 #define CC_TEST_SCHEDULER_TEST_COMMON_H_
 
+#include <stddef.h>
+
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/scheduler/compositor_timing_history.h"
diff --git a/cc/test/skia_common.cc b/cc/test/skia_common.cc
index aed402563dca6..c237c39e9b455 100644
--- a/cc/test/skia_common.cc
+++ b/cc/test/skia_common.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/skia_common.h"
 
+#include <stddef.h>
+
 #include "cc/playback/display_item_list.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
diff --git a/cc/test/solid_color_content_layer_client.cc b/cc/test/solid_color_content_layer_client.cc
index a4f01ca280804..2973afff26e2c 100644
--- a/cc/test/solid_color_content_layer_client.cc
+++ b/cc/test/solid_color_content_layer_client.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/solid_color_content_layer_client.h"
 
+#include <stddef.h>
+
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "third_party/skia/include/core/SkCanvas.h"
diff --git a/cc/test/solid_color_content_layer_client.h b/cc/test/solid_color_content_layer_client.h
index 1176abec9c5d1..d765f94d346d7 100644
--- a/cc/test/solid_color_content_layer_client.h
+++ b/cc/test/solid_color_content_layer_client.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_SOLID_COLOR_CONTENT_LAYER_CLIENT_H_
 #define CC_TEST_SOLID_COLOR_CONTENT_LAYER_CLIENT_H_
 
+#include <stddef.h>
+
 #include "base/compiler_specific.h"
 #include "cc/layers/content_layer_client.h"
 #include "third_party/skia/include/core/SkColor.h"
diff --git a/cc/test/surface_aggregator_test_helpers.cc b/cc/test/surface_aggregator_test_helpers.cc
index 05e54b7a41348..2b0aff51fb88a 100644
--- a/cc/test/surface_aggregator_test_helpers.cc
+++ b/cc/test/surface_aggregator_test_helpers.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/surface_aggregator_test_helpers.h"
 
+#include <stddef.h>
+
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "cc/layers/append_quads_data.h"
diff --git a/cc/test/surface_aggregator_test_helpers.h b/cc/test/surface_aggregator_test_helpers.h
index ae3347c74a8a9..356033d55d6c5 100644
--- a/cc/test/surface_aggregator_test_helpers.h
+++ b/cc/test/surface_aggregator_test_helpers.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_
 #define CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "cc/quads/draw_quad.h"
diff --git a/cc/test/test_context_provider.cc b/cc/test/test_context_provider.cc
index 3a570cabf0781..c9de320431eaa 100644
--- a/cc/test/test_context_provider.cc
+++ b/cc/test/test_context_provider.cc
@@ -4,6 +4,9 @@
 
 #include "cc/test/test_context_provider.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <set>
 #include <vector>
 
diff --git a/cc/test/test_context_provider.h b/cc/test/test_context_provider.h
index 1b7a915c42bb8..b0ac88eadc1dd 100644
--- a/cc/test/test_context_provider.h
+++ b/cc/test/test_context_provider.h
@@ -5,7 +5,11 @@
 #ifndef CC_TEST_TEST_CONTEXT_PROVIDER_H_
 #define CC_TEST_TEST_CONTEXT_PROVIDER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
diff --git a/cc/test/test_context_support.cc b/cc/test/test_context_support.cc
index 0c74ec8fd96df..bf033fc62a5c9 100644
--- a/cc/test/test_context_support.cc
+++ b/cc/test/test_context_support.cc
@@ -4,6 +4,9 @@
 
 #include "cc/test/test_context_support.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ -16,7 +19,7 @@ TestContextSupport::TestContextSupport()
 
 TestContextSupport::~TestContextSupport() {}
 
-void TestContextSupport::SignalSyncPoint(uint32 sync_point,
+void TestContextSupport::SignalSyncPoint(uint32_t sync_point,
                                          const base::Closure& callback) {
   sync_point_callbacks_.push_back(callback);
   base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ -32,7 +35,7 @@ void TestContextSupport::SignalSyncToken(const gpu::SyncToken& sync_token,
                             weak_ptr_factory_.GetWeakPtr()));
 }
 
-void TestContextSupport::SignalQuery(uint32 query,
+void TestContextSupport::SignalQuery(uint32_t query,
                                      const base::Closure& callback) {
   sync_point_callbacks_.push_back(callback);
   base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ -68,12 +71,12 @@ void TestContextSupport::SetScheduleOverlayPlaneCallback(
 void TestContextSupport::Swap() {
 }
 
-uint32 TestContextSupport::InsertFutureSyncPointCHROMIUM() {
+uint32_t TestContextSupport::InsertFutureSyncPointCHROMIUM() {
   NOTIMPLEMENTED();
   return 0;
 }
 
-void TestContextSupport::RetireSyncPointCHROMIUM(uint32 sync_point) {
+void TestContextSupport::RetireSyncPointCHROMIUM(uint32_t sync_point) {
   NOTIMPLEMENTED();
 }
 
diff --git a/cc/test/test_context_support.h b/cc/test/test_context_support.h
index f619ac18281b5..d82c7ae43d311 100644
--- a/cc/test/test_context_support.h
+++ b/cc/test/test_context_support.h
@@ -5,8 +5,11 @@
 #ifndef CC_TEST_TEST_CONTEXT_SUPPORT_H_
 #define CC_TEST_TEST_CONTEXT_SUPPORT_H_
 
+#include <stdint.h>
+
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "gpu/command_buffer/client/context_support.h"
 
@@ -23,17 +26,17 @@ class TestContextSupport : public gpu::ContextSupport {
   ~TestContextSupport() override;
 
   // gpu::ContextSupport implementation.
-  void SignalSyncPoint(uint32 sync_point,
+  void SignalSyncPoint(uint32_t sync_point,
                        const base::Closure& callback) override;
   void SignalSyncToken(const gpu::SyncToken& sync_token,
                        const base::Closure& callback) override;
-  void SignalQuery(uint32 query, const base::Closure& callback) override;
+  void SignalQuery(uint32_t query, const base::Closure& callback) override;
   void SetAggressivelyFreeResources(bool aggressively_free_resources) override;
   void Swap() override;
   void PartialSwapBuffers(const gfx::Rect& sub_buffer) override;
   void CommitOverlayPlanes() override;
-  uint32 InsertFutureSyncPointCHROMIUM() override;
-  void RetireSyncPointCHROMIUM(uint32 sync_point) override;
+  uint32_t InsertFutureSyncPointCHROMIUM() override;
+  void RetireSyncPointCHROMIUM(uint32_t sync_point) override;
   void ScheduleOverlayPlane(int plane_z_order,
                             gfx::OverlayTransform plane_transform,
                             unsigned overlay_texture_id,
diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc
index 273ed36eb21a0..e1e6e89298574 100644
--- a/cc/test/test_gpu_memory_buffer_manager.cc
+++ b/cc/test/test_gpu_memory_buffer_manager.cc
@@ -4,6 +4,9 @@
 
 #include "cc/test/test_gpu_memory_buffer_manager.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "ui/gfx/buffer_format_util.h"
diff --git a/cc/test/test_gpu_memory_buffer_manager.h b/cc/test/test_gpu_memory_buffer_manager.h
index 85f642cb1fcd0..fcaaa32afe923 100644
--- a/cc/test/test_gpu_memory_buffer_manager.h
+++ b/cc/test/test_gpu_memory_buffer_manager.h
@@ -5,6 +5,7 @@
 #ifndef CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_
 #define CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_
 
+#include "base/macros.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 
 namespace cc {
diff --git a/cc/test/test_image_factory.cc b/cc/test/test_image_factory.cc
index 79c2e7e3c0c8d..e9a09bee45247 100644
--- a/cc/test/test_image_factory.cc
+++ b/cc/test/test_image_factory.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/test_image_factory.h"
 
+#include <stddef.h>
+
 #include "base/numerics/safe_conversions.h"
 #include "ui/gl/gl_image_shared_memory.h"
 
diff --git a/cc/test/test_image_factory.h b/cc/test/test_image_factory.h
index 3cf0c19896d80..42a92e37a1bd3 100644
--- a/cc/test/test_image_factory.h
+++ b/cc/test/test_image_factory.h
@@ -5,6 +5,7 @@
 #ifndef CC_TEST_TEST_IMAGE_FACTORY_H_
 #define CC_TEST_TEST_IMAGE_FACTORY_H_
 
+#include "base/macros.h"
 #include "gpu/command_buffer/service/image_factory.h"
 
 namespace cc {
diff --git a/cc/test/test_in_process_context_provider.cc b/cc/test/test_in_process_context_provider.cc
index a0b4c28312930..fd1745e29489a 100644
--- a/cc/test/test_in_process_context_provider.cc
+++ b/cc/test/test_in_process_context_provider.cc
@@ -4,7 +4,10 @@
 
 #include "cc/test/test_in_process_context_provider.h"
 
+#include <stdint.h>
+
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "cc/resources/platform_color.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
diff --git a/cc/test/test_in_process_context_provider.h b/cc/test/test_in_process_context_provider.h
index 904ac6d1a5e5d..b8e1bf80fde28 100644
--- a/cc/test/test_in_process_context_provider.h
+++ b/cc/test/test_in_process_context_provider.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_
 #define CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_
 
+#include <stdint.h>
+
 #include "base/synchronization/lock.h"
 #include "cc/output/context_provider.h"
 #include "cc/test/test_gpu_memory_buffer_manager.h"
diff --git a/cc/test/test_occlusion_tracker.h b/cc/test/test_occlusion_tracker.h
index 7697bd1e16bab..d074168b90872 100644
--- a/cc/test/test_occlusion_tracker.h
+++ b/cc/test/test_occlusion_tracker.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_TEST_OCCLUSION_TRACKER_H_
 #define CC_TEST_TEST_OCCLUSION_TRACKER_H_
 
+#include <stddef.h>
+
 #include "cc/layers/render_surface_impl.h"
 #include "cc/trees/occlusion_tracker.h"
 
diff --git a/cc/test/test_shared_bitmap_manager.cc b/cc/test/test_shared_bitmap_manager.cc
index ef3b484fd793c..589a782382ac4 100644
--- a/cc/test/test_shared_bitmap_manager.cc
+++ b/cc/test/test_shared_bitmap_manager.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/test_shared_bitmap_manager.h"
 
+#include <stdint.h>
+
 #include "base/memory/shared_memory.h"
 
 namespace cc {
@@ -13,7 +15,7 @@ class OwnedSharedBitmap : public SharedBitmap {
  public:
   OwnedSharedBitmap(scoped_ptr<base::SharedMemory> shared_memory,
                     const SharedBitmapId& id)
-      : SharedBitmap(static_cast<uint8*>(shared_memory->memory()), id),
+      : SharedBitmap(static_cast<uint8_t*>(shared_memory->memory()), id),
         shared_memory_(std::move(shared_memory)) {}
 
   ~OwnedSharedBitmap() override {}
@@ -44,7 +46,7 @@ scoped_ptr<SharedBitmap> TestSharedBitmapManager::GetSharedBitmapFromId(
   base::AutoLock lock(lock_);
   if (bitmap_map_.find(id) == bitmap_map_.end())
     return nullptr;
-  uint8* pixels = static_cast<uint8*>(bitmap_map_[id]->memory());
+  uint8_t* pixels = static_cast<uint8_t*>(bitmap_map_[id]->memory());
   return make_scoped_ptr(new SharedBitmap(pixels, id));
 }
 
diff --git a/cc/test/test_task_graph_runner.h b/cc/test/test_task_graph_runner.h
index 60ddca1bfc7ff..b0e9bc4073ea9 100644
--- a/cc/test/test_task_graph_runner.h
+++ b/cc/test/test_task_graph_runner.h
@@ -5,6 +5,7 @@
 #ifndef CC_TEST_TEST_TASK_GRAPH_RUNNER_H_
 #define CC_TEST_TEST_TASK_GRAPH_RUNNER_H_
 
+#include "base/macros.h"
 #include "base/threading/simple_thread.h"
 #include "cc/raster/single_thread_task_graph_runner.h"
 
diff --git a/cc/test/test_texture.cc b/cc/test/test_texture.cc
index b9fff8d8e31d5..fea16fbdd5ea7 100644
--- a/cc/test/test_texture.cc
+++ b/cc/test/test_texture.cc
@@ -4,6 +4,9 @@
 
 #include "cc/test/test_texture.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "gpu/GLES2/gl2extchromium.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
diff --git a/cc/test/test_texture.h b/cc/test/test_texture.h
index 9265589776267..c5b6e21d40efe 100644
--- a/cc/test/test_texture.h
+++ b/cc/test/test_texture.h
@@ -5,6 +5,9 @@
 #ifndef CC_TEST_TEST_TEXTURE_H_
 #define CC_TEST_TEST_TEXTURE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/cc/test/test_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc
index 72ac8ade5e9b7..96b11b4ae12f3 100644
--- a/cc/test/test_web_graphics_context_3d.cc
+++ b/cc/test/test_web_graphics_context_3d.cc
@@ -4,6 +4,9 @@
 
 #include "cc/test/test_web_graphics_context_3d.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <string>
 
@@ -548,7 +551,7 @@ void TestWebGraphicsContext3D::bufferData(GLenum target,
 
   size_t old_size = buffer->size;
 
-  buffer->pixels.reset(new uint8[size]);
+  buffer->pixels.reset(new uint8_t[size]);
   buffer->size = size;
   if (data != NULL)
     memcpy(buffer->pixels.get(), data, size);
diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
index 4e6d76115ea75..08447f7ce64ce 100644
--- a/cc/test/test_web_graphics_context_3d.h
+++ b/cc/test/test_web_graphics_context_3d.h
@@ -5,12 +5,16 @@
 #ifndef CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
 #define CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -407,7 +411,7 @@ class TestWebGraphicsContext3D {
     ~Buffer();
 
     GLenum target;
-    scoped_ptr<uint8[]> pixels;
+    scoped_ptr<uint8_t[]> pixels;
     size_t size;
 
    private:
@@ -418,7 +422,7 @@ class TestWebGraphicsContext3D {
     Image();
     ~Image();
 
-    scoped_ptr<uint8[]> pixels;
+    scoped_ptr<uint8_t[]> pixels;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Image);
diff --git a/cc/tiles/eviction_tile_priority_queue.h b/cc/tiles/eviction_tile_priority_queue.h
index 31988892a0ead..558c1fe939b02 100644
--- a/cc/tiles/eviction_tile_priority_queue.h
+++ b/cc/tiles/eviction_tile_priority_queue.h
@@ -9,6 +9,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/tiles/tile_priority.h"
diff --git a/cc/tiles/image_decode_controller.cc b/cc/tiles/image_decode_controller.cc
index 70b6dc7892573..914f7e5bccd83 100644
--- a/cc/tiles/image_decode_controller.cc
+++ b/cc/tiles/image_decode_controller.cc
@@ -4,6 +4,9 @@
 
 #include "cc/tiles/image_decode_controller.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "cc/debug/devtools_instrumentation.h"
 
 namespace cc {
diff --git a/cc/tiles/image_decode_controller.h b/cc/tiles/image_decode_controller.h
index f07892c13f5cc..f63361af4699b 100644
--- a/cc/tiles/image_decode_controller.h
+++ b/cc/tiles/image_decode_controller.h
@@ -5,6 +5,8 @@
 #ifndef CC_TILES_IMAGE_DECODE_CONTROLLER_H_
 #define CC_TILES_IMAGE_DECODE_CONTROLLER_H_
 
+#include <stdint.h>
+
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/tiles/picture_layer_tiling.cc b/cc/tiles/picture_layer_tiling.cc
index 747dd94c50395..73909131d9da3 100644
--- a/cc/tiles/picture_layer_tiling.cc
+++ b/cc/tiles/picture_layer_tiling.cc
@@ -4,6 +4,8 @@
 
 #include "cc/tiles/picture_layer_tiling.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <cmath>
 #include <limits>
diff --git a/cc/tiles/picture_layer_tiling.h b/cc/tiles/picture_layer_tiling.h
index 0d38f1ea92cfd..9185d5d690c46 100644
--- a/cc/tiles/picture_layer_tiling.h
+++ b/cc/tiles/picture_layer_tiling.h
@@ -5,12 +5,15 @@
 #ifndef CC_TILES_PICTURE_LAYER_TILING_H_
 #define CC_TILES_PICTURE_LAYER_TILING_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <utility>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
@@ -70,9 +73,9 @@ namespace BASE_HASH_NAMESPACE {
 template <>
 struct hash<cc::TileMapKey> {
   size_t operator()(const cc::TileMapKey& key) const {
-    uint16 value1 = static_cast<uint16>(key.index_x);
-    uint16 value2 = static_cast<uint16>(key.index_y);
-    uint32 value1_32 = value1;
+    uint16_t value1 = static_cast<uint16_t>(key.index_x);
+    uint16_t value2 = static_cast<uint16_t>(key.index_y);
+    uint32_t value1_32 = value1;
     return (value1_32 << 16) | value2;
   }
 };
diff --git a/cc/tiles/picture_layer_tiling_set.cc b/cc/tiles/picture_layer_tiling_set.cc
index 77589c19db6da..014e281003122 100644
--- a/cc/tiles/picture_layer_tiling_set.cc
+++ b/cc/tiles/picture_layer_tiling_set.cc
@@ -4,6 +4,8 @@
 
 #include "cc/tiles/picture_layer_tiling_set.h"
 
+#include <stddef.h>
+
 #include <limits>
 #include <set>
 #include <vector>
diff --git a/cc/tiles/picture_layer_tiling_set.h b/cc/tiles/picture_layer_tiling_set.h
index ed1038f819cd7..56122870de5a2 100644
--- a/cc/tiles/picture_layer_tiling_set.h
+++ b/cc/tiles/picture_layer_tiling_set.h
@@ -5,9 +5,12 @@
 #ifndef CC_TILES_PICTURE_LAYER_TILING_SET_H_
 #define CC_TILES_PICTURE_LAYER_TILING_SET_H_
 
+#include <stddef.h>
+
 #include <set>
 #include <vector>
 
+#include "base/macros.h"
 #include "cc/base/region.h"
 #include "cc/tiles/picture_layer_tiling.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/cc/tiles/picture_layer_tiling_unittest.cc b/cc/tiles/picture_layer_tiling_unittest.cc
index b3aeecc51b7f5..b937804e8852a 100644
--- a/cc/tiles/picture_layer_tiling_unittest.cc
+++ b/cc/tiles/picture_layer_tiling_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 <stddef.h>
+
 #include <limits>
 #include <set>
 
+#include "base/macros.h"
 #include "cc/base/math_util.h"
 #include "cc/test/fake_display_list_raster_source.h"
 #include "cc/test/fake_output_surface.h"
diff --git a/cc/tiles/raster_tile_priority_queue.h b/cc/tiles/raster_tile_priority_queue.h
index e2187d2c627d6..828f3cf9810cd 100644
--- a/cc/tiles/raster_tile_priority_queue.h
+++ b/cc/tiles/raster_tile_priority_queue.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/tiles/tile_priority.h"
diff --git a/cc/tiles/raster_tile_priority_queue_all.h b/cc/tiles/raster_tile_priority_queue_all.h
index 10dc1f72ef7b3..275a73183bdf4 100644
--- a/cc/tiles/raster_tile_priority_queue_all.h
+++ b/cc/tiles/raster_tile_priority_queue_all.h
@@ -9,6 +9,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/tiles/raster_tile_priority_queue.h"
diff --git a/cc/tiles/raster_tile_priority_queue_required.h b/cc/tiles/raster_tile_priority_queue_required.h
index 3719d95f7864f..f88993fd6cb44 100644
--- a/cc/tiles/raster_tile_priority_queue_required.h
+++ b/cc/tiles/raster_tile_priority_queue_required.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/tiles/raster_tile_priority_queue.h"
 #include "cc/tiles/tiling_set_raster_queue_required.h"
diff --git a/cc/tiles/tile.cc b/cc/tiles/tile.cc
index 87ec3f7befd6f..81dce76513fe2 100644
--- a/cc/tiles/tile.cc
+++ b/cc/tiles/tile.cc
@@ -4,6 +4,8 @@
 
 #include "cc/tiles/tile.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/numerics/safe_conversions.h"
diff --git a/cc/tiles/tile.h b/cc/tiles/tile.h
index e245e0111d9ff..6ca9e87e21c32 100644
--- a/cc/tiles/tile.h
+++ b/cc/tiles/tile.h
@@ -5,6 +5,10 @@
 #ifndef CC_TILES_TILE_H_
 #define CC_TILES_TILE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/tiles/tile_draw_info.h"
 #include "ui/gfx/geometry/rect.h"
@@ -45,7 +49,7 @@ class CC_EXPORT Tile {
 
   enum TileRasterFlags { USE_PICTURE_ANALYSIS = 1 << 0, IS_OPAQUE = 1 << 1 };
 
-  typedef uint64 Id;
+  typedef uint64_t Id;
 
   Id id() const {
     return id_;
diff --git a/cc/tiles/tile_manager.cc b/cc/tiles/tile_manager.cc
index 0e9cb1c3a5f74..400fff20646bf 100644
--- a/cc/tiles/tile_manager.cc
+++ b/cc/tiles/tile_manager.cc
@@ -4,6 +4,9 @@
 
 #include "cc/tiles/tile_manager.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <limits>
 #include <string>
@@ -11,6 +14,7 @@
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/trace_event/trace_event_argument.h"
@@ -1102,14 +1106,14 @@ TileManager::MemoryUsage::MemoryUsage()
 
 TileManager::MemoryUsage::MemoryUsage(size_t memory_bytes,
                                       size_t resource_count)
-    : memory_bytes_(static_cast<int64>(memory_bytes)),
+    : memory_bytes_(static_cast<int64_t>(memory_bytes)),
       resource_count_(static_cast<int>(resource_count)) {
   // MemoryUsage is constructed using size_ts, since it deals with memory and
   // the inputs are typically size_t. However, during the course of usage (in
   // particular operator-=) can cause internal values to become negative. Thus,
   // member variables are signed.
   DCHECK_LE(memory_bytes,
-            static_cast<size_t>(std::numeric_limits<int64>::max()));
+            static_cast<size_t>(std::numeric_limits<int64_t>::max()));
   DCHECK_LE(resource_count,
             static_cast<size_t>(std::numeric_limits<int>::max()));
 }
diff --git a/cc/tiles/tile_manager.h b/cc/tiles/tile_manager.h
index c041ce24d3b65..00f22e3af4857 100644
--- a/cc/tiles/tile_manager.h
+++ b/cc/tiles/tile_manager.h
@@ -5,11 +5,15 @@
 #ifndef CC_TILES_TILE_MANAGER_H_
 #define CC_TILES_TILE_MANAGER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/base/unique_notifier.h"
@@ -228,10 +232,10 @@ class CC_EXPORT TileManager {
     MemoryUsage operator-(const MemoryUsage& other);
 
     bool Exceeds(const MemoryUsage& limit) const;
-    int64 memory_bytes() const { return memory_bytes_; }
+    int64_t memory_bytes() const { return memory_bytes_; }
 
    private:
-    int64 memory_bytes_;
+    int64_t memory_bytes_;
     int resource_count_;
   };
 
diff --git a/cc/tiles/tile_manager_perftest.cc b/cc/tiles/tile_manager_perftest.cc
index 2806b04b672ef..07bbb2b618cde 100644
--- a/cc/tiles/tile_manager_perftest.cc
+++ b/cc/tiles/tile_manager_perftest.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 "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/thread_task_runner_handle.h"
diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc
index 2c69999b235a9..ff67be2c6e13a 100644
--- a/cc/tiles/tile_manager_unittest.cc
+++ b/cc/tiles/tile_manager_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 "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/playback/display_list_raster_source.h"
diff --git a/cc/tiles/tile_priority.h b/cc/tiles/tile_priority.h
index 184fc2dd181f2..023fac53cf042 100644
--- a/cc/tiles/tile_priority.h
+++ b/cc/tiles/tile_priority.h
@@ -5,6 +5,8 @@
 #ifndef CC_TILES_TILE_PRIORITY_H_
 #define CC_TILES_TILE_PRIORITY_H_
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <limits>
 #include <string>
diff --git a/cc/tiles/tiling_set_eviction_queue.cc b/cc/tiles/tiling_set_eviction_queue.cc
index 4b314d721b8be..45bab034708a1 100644
--- a/cc/tiles/tiling_set_eviction_queue.cc
+++ b/cc/tiles/tiling_set_eviction_queue.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 <stddef.h>
+
 #include <utility>
 
 #include "cc/tiles/tiling_set_eviction_queue.h"
diff --git a/cc/tiles/tiling_set_eviction_queue.h b/cc/tiles/tiling_set_eviction_queue.h
index dc9b686697460..493d74a8c82c1 100644
--- a/cc/tiles/tiling_set_eviction_queue.h
+++ b/cc/tiles/tiling_set_eviction_queue.h
@@ -5,6 +5,8 @@
 #ifndef CC_TILES_TILING_SET_EVICTION_QUEUE_H_
 #define CC_TILES_TILING_SET_EVICTION_QUEUE_H_
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "cc/base/cc_export.h"
diff --git a/cc/tiles/tiling_set_raster_queue_all.cc b/cc/tiles/tiling_set_raster_queue_all.cc
index 1cac85d2ad001..1ed618a862b64 100644
--- a/cc/tiles/tiling_set_raster_queue_all.cc
+++ b/cc/tiles/tiling_set_raster_queue_all.cc
@@ -4,6 +4,8 @@
 
 #include "cc/tiles/tiling_set_raster_queue_all.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "cc/tiles/picture_layer_tiling_set.h"
diff --git a/cc/tiles/tiling_set_raster_queue_all.h b/cc/tiles/tiling_set_raster_queue_all.h
index d6f79463fed3f..c49a37e79284c 100644
--- a/cc/tiles/tiling_set_raster_queue_all.h
+++ b/cc/tiles/tiling_set_raster_queue_all.h
@@ -5,7 +5,10 @@
 #ifndef CC_TILES_TILING_SET_RASTER_QUEUE_ALL_H_
 #define CC_TILES_TILING_SET_RASTER_QUEUE_ALL_H_
 
+#include <stddef.h>
+
 #include "base/containers/stack_container.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/tiles/picture_layer_tiling_set.h"
 #include "cc/tiles/prioritized_tile.h"
diff --git a/cc/tiles/tiling_set_raster_queue_required.cc b/cc/tiles/tiling_set_raster_queue_required.cc
index 59696e40d22be..b0173c92326aa 100644
--- a/cc/tiles/tiling_set_raster_queue_required.cc
+++ b/cc/tiles/tiling_set_raster_queue_required.cc
@@ -4,6 +4,8 @@
 
 #include "cc/tiles/tiling_set_raster_queue_required.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "cc/tiles/picture_layer_tiling_set.h"
diff --git a/cc/trees/blocking_task_runner.cc b/cc/trees/blocking_task_runner.cc
index b0a935e25291e..c276044af3473 100644
--- a/cc/trees/blocking_task_runner.cc
+++ b/cc/trees/blocking_task_runner.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/blocking_task_runner.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "base/callback.h"
diff --git a/cc/trees/blocking_task_runner.h b/cc/trees/blocking_task_runner.h
index eb43b91441cc7..a0101766671a3 100644
--- a/cc/trees/blocking_task_runner.h
+++ b/cc/trees/blocking_task_runner.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "base/location.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/cc/trees/damage_tracker.cc b/cc/trees/damage_tracker.cc
index 6c90c6c6b5f89..f534c73e40be3 100644
--- a/cc/trees/damage_tracker.cc
+++ b/cc/trees/damage_tracker.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/damage_tracker.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "cc/base/math_util.h"
diff --git a/cc/trees/damage_tracker.h b/cc/trees/damage_tracker.h
index aafbd033bcd0d..6550db1653bf3 100644
--- a/cc/trees/damage_tracker.h
+++ b/cc/trees/damage_tracker.h
@@ -6,6 +6,7 @@
 #define CC_TREES_DAMAGE_TRACKER_H_
 
 #include <vector>
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_lists.h"
diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc
index 9a00403a82154..c8a3d3f330316 100644
--- a/cc/trees/damage_tracker_unittest.cc
+++ b/cc/trees/damage_tracker_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/damage_tracker.h"
 
+#include <stddef.h>
+
 #include "cc/base/math_util.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/output/filter_operation.h"
diff --git a/cc/trees/draw_property_utils.cc b/cc/trees/draw_property_utils.cc
index 7a086a7b5f163..2d79a5eed3957 100644
--- a/cc/trees/draw_property_utils.cc
+++ b/cc/trees/draw_property_utils.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/draw_property_utils.h"
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "cc/base/math_util.h"
diff --git a/cc/trees/latency_info_swap_promise_monitor.cc b/cc/trees/latency_info_swap_promise_monitor.cc
index 9f2bc82fe1d65..23635cd856602 100644
--- a/cc/trees/latency_info_swap_promise_monitor.cc
+++ b/cc/trees/latency_info_swap_promise_monitor.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/latency_info_swap_promise_monitor.h"
 
+#include <stdint.h>
+
 #include "base/threading/platform_thread.h"
 #include "cc/output/latency_info_swap_promise.h"
 #include "cc/trees/layer_tree_host.h"
@@ -70,14 +72,14 @@ void LatencyInfoSwapPromiseMonitor::OnSetNeedsRedrawOnImpl() {
 
 void LatencyInfoSwapPromiseMonitor::OnForwardScrollUpdateToMainThreadOnImpl() {
   if (AddForwardingScrollUpdateToMainComponent(latency_)) {
-    int64 new_sequence_number = 0;
+    int64_t new_sequence_number = 0;
     for (ui::LatencyInfo::LatencyMap::const_iterator it =
              latency_->latency_components().begin();
          it != latency_->latency_components().end(); ++it) {
       if (it->first.first == ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT) {
         new_sequence_number =
-            ((static_cast<int64>(base::PlatformThread::CurrentId()) << 32) ^
-             (reinterpret_cast<uint64>(this) << 32)) |
+            ((static_cast<int64_t>(base::PlatformThread::CurrentId()) << 32) ^
+             (reinterpret_cast<uint64_t>(this) << 32)) |
             (it->second.sequence_number & 0xffffffff);
         if (new_sequence_number == it->second.sequence_number)
           return;
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 2ef633b302e7f..70740935217a4 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -4,6 +4,9 @@
 
 #include "cc/trees/layer_tree_host.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <stack>
 #include <string>
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index e7e3318f332a5..f7bd43368c3ab 100644
--- a/cc/trees/layer_tree_host.h
+++ b/cc/trees/layer_tree_host.h
@@ -5,14 +5,17 @@
 #ifndef CC_TREES_LAYER_TREE_HOST_H_
 #define CC_TREES_LAYER_TREE_HOST_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <limits>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/cancelable_callback.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index ff6ba4044dae2..c1e3d1080904c 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/layer_tree_host_common.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/trace_event/trace_event.h"
diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
index 6ebd86a35e7c3..df74721539771 100644
--- a/cc/trees/layer_tree_host_common.h
+++ b/cc/trees/layer_tree_host_common.h
@@ -5,6 +5,8 @@
 #ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_
 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_
 
+#include <stddef.h>
+
 #include <limits>
 #include <vector>
 
diff --git a/cc/trees/layer_tree_host_common_perftest.cc b/cc/trees/layer_tree_host_common_perftest.cc
index 9bb4550eaadaa..3cf35fb1cea21 100644
--- a/cc/trees/layer_tree_host_common_perftest.cc
+++ b/cc/trees/layer_tree_host_common_perftest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/layer_tree_host_common.h"
 
+#include <stddef.h>
+
 #include <deque>
 #include <sstream>
 
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index c4e46ed88ff76..bbe4ec5c91e1a 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/layer_tree_host_common.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <set>
 #include <vector>
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 14c167eae63da..203670f6be57d 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -4,13 +4,15 @@
 
 #include "cc/trees/layer_tree_host_impl.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
 
 #include "base/auto_reset.h"
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/containers/small_map.h"
 #include "base/json/json_writer.h"
@@ -823,7 +825,7 @@ DrawResult LayerTreeHostImpl::CalculateRenderPasses(
   TRACE_EVENT_BEGIN2(
       "cc", "LayerTreeHostImpl::CalculateRenderPasses",
       "render_surface_layer_list.size()",
-      static_cast<uint64>(frame->render_surface_layer_list->size()),
+      static_cast<uint64_t>(frame->render_surface_layer_list->size()),
       "RequiresHighResToDraw", RequiresHighResToDraw());
 
   // Create the render passes in dependency order.
@@ -885,8 +887,8 @@ DrawResult LayerTreeHostImpl::CalculateRenderPasses(
 
   int num_missing_tiles = 0;
   int num_incomplete_tiles = 0;
-  int64 checkerboarded_no_recording_content_area = 0;
-  int64 checkerboarded_needs_raster_content_area = 0;
+  int64_t checkerboarded_no_recording_content_area = 0;
+  int64_t checkerboarded_needs_raster_content_area = 0;
   bool have_copy_request = false;
   bool have_missing_animated_tiles = false;
 
@@ -1269,7 +1271,7 @@ void LayerTreeHostImpl::UpdateTileManagerMemoryPolicy(
     global_tile_state_.hard_memory_limit_in_bytes =
         policy.bytes_limit_when_visible;
     global_tile_state_.soft_memory_limit_in_bytes =
-        (static_cast<int64>(global_tile_state_.hard_memory_limit_in_bytes) *
+        (static_cast<int64_t>(global_tile_state_.hard_memory_limit_in_bytes) *
          settings_.max_memory_for_prepaint_percentage) /
         100;
   }
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 7f2cc34687efd..f7391beba013a 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -5,12 +5,14 @@
 #ifndef CC_TREES_LAYER_TREE_HOST_IMPL_H_
 #define CC_TREES_LAYER_TREE_HOST_IMPL_H_
 
+#include <stddef.h>
+
 #include <set>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_events.h"
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 066302b6be537..78be80f89f0f7 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/layer_tree_host_impl.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <cmath>
 #include <utility>
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index 3acd9a5499583..9f3f3ac693699 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/layer_tree_host.h"
 
+#include <stdint.h>
+
 #include <sstream>
 
 #include "base/files/file_path.h"
@@ -291,7 +293,7 @@ class BrowserCompositorInvalidateLayerTreePerfTest
     std::ostringstream name_stream;
     name_stream << "name" << next_sync_point_;
     gpu_mailbox.SetName(
-        reinterpret_cast<const int8*>(name_stream.str().c_str()));
+        reinterpret_cast<const int8_t*>(name_stream.str().c_str()));
     scoped_ptr<SingleReleaseCallback> callback = SingleReleaseCallback::Create(
         base::Bind(&EmptyReleaseCallback));
     TextureMailbox mailbox(gpu_mailbox, gpu::SyncToken(next_sync_point_),
diff --git a/cc/trees/layer_tree_host_pixeltest_blending.cc b/cc/trees/layer_tree_host_pixeltest_blending.cc
index 29ab0d0a6dc8a..980d692ee88a1 100644
--- a/cc/trees/layer_tree_host_pixeltest_blending.cc
+++ b/cc/trees/layer_tree_host_pixeltest_blending.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 "cc/layers/picture_image_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/test/layer_tree_pixel_resource_test.h"
@@ -50,11 +52,11 @@ SkColor kCSSTestColors[] = {
 const int kBlendModesCount = arraysize(kBlendModes);
 const int kCSSTestColorsCount = arraysize(kCSSTestColors);
 
-using RenderPassOptions = uint32;
-const uint32 kUseMasks = 1 << 0;
-const uint32 kUseAntialiasing = 1 << 1;
-const uint32 kUseColorMatrix = 1 << 2;
-const uint32 kForceShaders = 1 << 3;
+using RenderPassOptions = uint32_t;
+const uint32_t kUseMasks = 1 << 0;
+const uint32_t kUseAntialiasing = 1 << 1;
+const uint32_t kUseColorMatrix = 1 << 2;
+const uint32_t kForceShaders = 1 << 3;
 
 class LayerTreeHostBlendingPixelTest : public LayerTreeHostPixelResourceTest {
  public:
diff --git a/cc/trees/layer_tree_host_pixeltest_filters.cc b/cc/trees/layer_tree_host_pixeltest_filters.cc
index 33a76830ab229..971fc3751708d 100644
--- a/cc/trees/layer_tree_host_pixeltest_filters.cc
+++ b/cc/trees/layer_tree_host_pixeltest_filters.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 <stddef.h>
+
 #include "build/build_config.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/test/layer_tree_pixel_test.h"
diff --git a/cc/trees/layer_tree_host_pixeltest_masks.cc b/cc/trees/layer_tree_host_pixeltest_masks.cc
index f913d51a80028..a79186d02179c 100644
--- a/cc/trees/layer_tree_host_pixeltest_masks.cc
+++ b/cc/trees/layer_tree_host_pixeltest_masks.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 <stddef.h>
+
 #include "build/build_config.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_image_layer.h"
diff --git a/cc/trees/layer_tree_host_pixeltest_tiles.cc b/cc/trees/layer_tree_host_pixeltest_tiles.cc
index 51457be4870c6..fa315991550dc 100644
--- a/cc/trees/layer_tree_host_pixeltest_tiles.cc
+++ b/cc/trees/layer_tree_host_pixeltest_tiles.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 <stddef.h>
+
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/output/copy_output_request.h"
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index de5995037ddd7..6974c92a40600 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "cc/trees/layer_tree_host.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/auto_reset.h"
@@ -4095,7 +4098,7 @@ class TestSwapPromise : public SwapPromise {
     result_->reason = reason;
   }
 
-  int64 TraceId() const override { return 0; }
+  int64_t TraceId() const override { return 0; }
 
  private:
   // Not owned.
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
index b6d8505e72d5b..624aa6886af63 100644
--- a/cc/trees/layer_tree_host_unittest_animation.cc
+++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/layer_tree_host.h"
 
+#include <stdint.h>
+
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/animation/scroll_offset_animation_curve.h"
@@ -1302,8 +1304,8 @@ class LayerTreeHostAnimationTestNotifyAnimationFinished
                               Animation::TargetProperty target_property,
                               int group) override {
     called_animation_started_ = true;
-    layer_tree_host()->AnimateLayers(
-        base::TimeTicks::FromInternalValue(std::numeric_limits<int64>::max()));
+    layer_tree_host()->AnimateLayers(base::TimeTicks::FromInternalValue(
+        std::numeric_limits<int64_t>::max()));
     PostSetNeedsCommitToMainThread();
   }
 
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index 8c5dd8aa544fa..c7ce754c43e6c 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -4,7 +4,9 @@
 
 #include "cc/trees/layer_tree_host.h"
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/layers/heads_up_display_layer.h"
diff --git a/cc/trees/layer_tree_host_unittest_copyrequest.cc b/cc/trees/layer_tree_host_unittest_copyrequest.cc
index 96b18da3d8bff..97362f4193402 100644
--- a/cc/trees/layer_tree_host_unittest_copyrequest.cc
+++ b/cc/trees/layer_tree_host_unittest_copyrequest.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 <stddef.h>
+
 #include "cc/layers/layer_iterator.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
index 897f225d35597..b0ddf86563521 100644
--- a/cc/trees/layer_tree_host_unittest_delegated.cc
+++ b/cc/trees/layer_tree_host_unittest_delegated.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/layer_tree_host.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/bind.h"
diff --git a/cc/trees/layer_tree_host_unittest_proxy.cc b/cc/trees/layer_tree_host_unittest_proxy.cc
index e00b0854adc3f..4136221624489 100644
--- a/cc/trees/layer_tree_host_unittest_proxy.cc
+++ b/cc/trees/layer_tree_host_unittest_proxy.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_picture_layer.h"
 #include "cc/test/layer_tree_test.h"
diff --git a/cc/trees/layer_tree_host_unittest_video.cc b/cc/trees/layer_tree_host_unittest_video.cc
index 9488cadcf8d59..c1c3cb4d6c644 100644
--- a/cc/trees/layer_tree_host_unittest_video.cc
+++ b/cc/trees/layer_tree_host_unittest_video.cc
@@ -4,7 +4,6 @@
 
 #include "cc/trees/layer_tree_host.h"
 
-#include "base/basictypes.h"
 #include "cc/layers/render_surface_impl.h"
 #include "cc/layers/video_layer.h"
 #include "cc/layers/video_layer_impl.h"
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 93e8145ecedf5..3519f293b6256 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -4,6 +4,9 @@
 
 #include "cc/trees/layer_tree_impl.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <limits>
 #include <set>
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
index a70351adcdfa4..6d4ba2677e79b 100644
--- a/cc/trees/layer_tree_impl.h
+++ b/cc/trees/layer_tree_impl.h
@@ -5,12 +5,16 @@
 #ifndef CC_TREES_LAYER_TREE_IMPL_H_
 #define CC_TREES_LAYER_TREE_IMPL_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/values.h"
 #include "cc/base/synced_property.h"
 #include "cc/input/layer_selection_bound.h"
diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc
index 7c27273be1fb2..0eb18491296a7 100644
--- a/cc/trees/layer_tree_settings.cc
+++ b/cc/trees/layer_tree_settings.cc
@@ -5,6 +5,7 @@
 #include "cc/trees/layer_tree_settings.h"
 
 #include <GLES2/gl2.h>
+#include <stddef.h>
 #include <limits>
 
 #include "base/command_line.h"
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index 0939ba071d768..b5e983bcaf4a7 100644
--- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h
@@ -5,9 +5,10 @@
 #ifndef CC_TREES_LAYER_TREE_SETTINGS_H_
 #define CC_TREES_LAYER_TREE_SETTINGS_H_
 
+#include <stddef.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/layer_tree_debug_state.h"
 #include "cc/output/managed_memory_policy.h"
diff --git a/cc/trees/occlusion.h b/cc/trees/occlusion.h
index fec4915e2db3b..7e856aa66d27e 100644
--- a/cc/trees/occlusion.h
+++ b/cc/trees/occlusion.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/simple_enclosed_region.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/cc/trees/occlusion_tracker.cc b/cc/trees/occlusion_tracker.cc
index 38015a408e869..250ac4d008771 100644
--- a/cc/trees/occlusion_tracker.cc
+++ b/cc/trees/occlusion_tracker.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/occlusion_tracker.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "cc/base/math_util.h"
diff --git a/cc/trees/occlusion_tracker.h b/cc/trees/occlusion_tracker.h
index 9a9294c779d2f..847de7b6390bc 100644
--- a/cc/trees/occlusion_tracker.h
+++ b/cc/trees/occlusion_tracker.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/simple_enclosed_region.h"
 #include "cc/layers/layer_iterator.h"
diff --git a/cc/trees/occlusion_tracker_perftest.cc b/cc/trees/occlusion_tracker_perftest.cc
index 3ae39e6792a1d..ccaa75ae560f3 100644
--- a/cc/trees/occlusion_tracker_perftest.cc
+++ b/cc/trees/occlusion_tracker_perftest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/occlusion_tracker.h"
 
+#include <stddef.h>
+
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc
index 5c658c337c0e2..5bfd312007755 100644
--- a/cc/trees/occlusion_tracker_unittest.cc
+++ b/cc/trees/occlusion_tracker_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/occlusion_tracker.h"
 
+#include <stddef.h>
+
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/layer.h"
diff --git a/cc/trees/occlusion_unittest.cc b/cc/trees/occlusion_unittest.cc
index becc7a3889c95..da2f6fd0b6ebe 100644
--- a/cc/trees/occlusion_unittest.cc
+++ b/cc/trees/occlusion_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/occlusion.h"
 
+#include <stddef.h>
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
index 9c0e6161f1f97..1120d30cf3920 100644
--- a/cc/trees/property_tree.cc
+++ b/cc/trees/property_tree.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 <stddef.h>
+
 #include <set>
 #include <vector>
 
diff --git a/cc/trees/property_tree.h b/cc/trees/property_tree.h
index 5afbcac485d35..ff5c8a5a52ba0 100644
--- a/cc/trees/property_tree.h
+++ b/cc/trees/property_tree.h
@@ -5,9 +5,10 @@
 #ifndef CC_TREES_PROPERTY_TREE_H_
 #define CC_TREES_PROPERTY_TREE_H_
 
+#include <stddef.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/scroll_offset.h"
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index 7c5980730ae53..3a41a56d3320d 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/property_tree_builder.h"
 
+#include <stddef.h>
+
 #include <map>
 #include <set>
 
diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h
index 5798fa8efb51f..f4d7becd8d3c2 100644
--- a/cc/trees/proxy.h
+++ b/cc/trees/proxy.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/cc/trees/proxy_common.h b/cc/trees/proxy_common.h
index 5fce5e48a643f..a9e991c64e7d1 100644
--- a/cc/trees/proxy_common.h
+++ b/cc/trees/proxy_common.h
@@ -5,6 +5,8 @@
 #ifndef CC_TREES_PROXY_COMMON_H_
 #define CC_TREES_PROXY_COMMON_H_
 
+#include <stddef.h>
+
 #include "cc/base/cc_export.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/trees/layer_tree_host_common.h"
diff --git a/cc/trees/scoped_abort_remaining_swap_promises.h b/cc/trees/scoped_abort_remaining_swap_promises.h
index e35fbf9154166..1d46ec47bcfd3 100644
--- a/cc/trees/scoped_abort_remaining_swap_promises.h
+++ b/cc/trees/scoped_abort_remaining_swap_promises.h
@@ -5,6 +5,7 @@
 #ifndef CC_TREES_SCOPED_ABORT_REMAINING_SWAP_PROMISES_H_
 #define CC_TREES_SCOPED_ABORT_REMAINING_SWAP_PROMISES_H_
 
+#include "base/macros.h"
 #include "cc/output/swap_promise.h"
 #include "cc/trees/layer_tree_host.h"
 
diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
index e7bcd6dc0f1a9..ec82b706c138d 100644
--- a/cc/trees/single_thread_proxy.h
+++ b/cc/trees/single_thread_proxy.h
@@ -8,6 +8,7 @@
 #include <limits>
 
 #include "base/cancelable_callback.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_events.h"
 #include "cc/output/begin_frame_args.h"
diff --git a/cc/trees/task_runner_provider.h b/cc/trees/task_runner_provider.h
index 38ca31f01193c..cab850e52d82c 100644
--- a/cc/trees/task_runner_provider.h
+++ b/cc/trees/task_runner_provider.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
diff --git a/cc/trees/threaded_channel.h b/cc/trees/threaded_channel.h
index 5d10f4af5cdbf..71d2c547e337b 100644
--- a/cc/trees/threaded_channel.h
+++ b/cc/trees/threaded_channel.h
@@ -5,6 +5,7 @@
 #ifndef CC_TREES_THREADED_CHANNEL_H_
 #define CC_TREES_THREADED_CHANNEL_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
diff --git a/cc/trees/threaded_channel_unittest.cc b/cc/trees/threaded_channel_unittest.cc
index 17350d8444b7c..359a7f9a39409 100644
--- a/cc/trees/threaded_channel_unittest.cc
+++ b/cc/trees/threaded_channel_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "cc/trees/threaded_channel.h"
 
+#include "base/macros.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/trees/tree_synchronizer.cc b/cc/trees/tree_synchronizer.cc
index 993514716e115..72b6daade02d2 100644
--- a/cc/trees/tree_synchronizer.cc
+++ b/cc/trees/tree_synchronizer.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/tree_synchronizer.h"
 
+#include <stddef.h>
+
 #include <set>
 
 #include "base/containers/hash_tables.h"
diff --git a/cc/trees/tree_synchronizer.h b/cc/trees/tree_synchronizer.h
index ef13b1dba8137..a580362c3eb7f 100644
--- a/cc/trees/tree_synchronizer.h
+++ b/cc/trees/tree_synchronizer.h
@@ -5,7 +5,7 @@
 #ifndef CC_TREES_TREE_SYNCHRONIZER_H_
 #define CC_TREES_TREE_SYNCHRONIZER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 
diff --git a/cc/trees/tree_synchronizer_unittest.cc b/cc/trees/tree_synchronizer_unittest.cc
index 8782d5dca79d3..a288da37ce92b 100644
--- a/cc/trees/tree_synchronizer_unittest.cc
+++ b/cc/trees/tree_synchronizer_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/trees/tree_synchronizer.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <set>
 #include <vector>