Switch to standard integer types in ui/gfx/.

BUG=138542
TBR=sky@chromium.org

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

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

193 files changed, 595 insertions, 314 deletions

diff --git a/ui/gfx/android/device_display_info.h b/ui/gfx/android/device_display_info.h
index c8f9bc1..bf717dc 100644
--- a/ui/gfx/android/device_display_info.h
+++ b/ui/gfx/android/device_display_info.h
@@ -8,7 +8,7 @@
 #include <jni.h>
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace gfx {
diff --git a/ui/gfx/android/gfx_jni_registrar.cc b/ui/gfx/android/gfx_jni_registrar.cc
index 5b9ab1d..bd59ef8 100644
--- a/ui/gfx/android/gfx_jni_registrar.cc
+++ b/ui/gfx/android/gfx_jni_registrar.cc
@@ -6,6 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
+#include "base/macros.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/android/shared_device_display_info.h"
 #include "ui/gfx/android/view_configuration.h"
diff --git a/ui/gfx/android/java_bitmap.h b/ui/gfx/android/java_bitmap.h
index 6c615ab..97f85d4 100644
--- a/ui/gfx/android/java_bitmap.h
+++ b/ui/gfx/android/java_bitmap.h
@@ -6,8 +6,10 @@
 #define UI_GFX_ANDROID_JAVA_BITMAP_H_
 
 #include <jni.h>
+#include <stdint.h>
 
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
 
diff --git a/ui/gfx/android/shared_device_display_info.h b/ui/gfx/android/shared_device_display_info.h
index 0018b37..ec54109 100644
--- a/ui/gfx/android/shared_device_display_info.h
+++ b/ui/gfx/android/shared_device_display_info.h
@@ -6,7 +6,7 @@
 #define UI_GFX_ANDROID_SHARED_DEVICE_DISPLAY_INFO_H_
 
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 
diff --git a/ui/gfx/android/view_configuration.cc b/ui/gfx/android/view_configuration.cc
index 2f26756..b30f232 100644
--- a/ui/gfx/android/view_configuration.cc
+++ b/ui/gfx/android/view_configuration.cc
@@ -7,6 +7,7 @@
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/threading/non_thread_safe.h"
 #include "jni/ViewConfigurationHelper_jni.h"
 
diff --git a/ui/gfx/animation/animation.cc b/ui/gfx/animation/animation.cc
index 7823155..d065adc 100644
--- a/ui/gfx/animation/animation.cc
+++ b/ui/gfx/animation/animation.cc
@@ -4,6 +4,7 @@
 
 #include "ui/gfx/animation/animation.h"
 
+#include "build/build_config.h"
 #include "ui/gfx/animation/animation_container.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/tween.h"
diff --git a/ui/gfx/animation/animation.h b/ui/gfx/animation/animation.h
index d7d7d3a..44823b0 100644
--- a/ui/gfx/animation/animation.h
+++ b/ui/gfx/animation/animation.h
@@ -6,6 +6,7 @@
 #define UI_GFX_ANIMATION_ANIMATION_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "ui/gfx/animation/animation_container_element.h"
diff --git a/ui/gfx/animation/animation_container.h b/ui/gfx/animation/animation_container.h
index 726fdda..4597738 100644
--- a/ui/gfx/animation/animation_container.h
+++ b/ui/gfx/animation/animation_container.h
@@ -7,6 +7,7 @@
 
 #include <set>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
diff --git a/ui/gfx/animation/animation_container_unittest.cc b/ui/gfx/animation/animation_container_unittest.cc
index c97485a..bffe387 100644
--- a/ui/gfx/animation/animation_container_unittest.cc
+++ b/ui/gfx/animation/animation_container_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ui/gfx/animation/animation_container.h"
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/animation/animation_container_observer.h"
diff --git a/ui/gfx/animation/animation_unittest.cc b/ui/gfx/animation/animation_unittest.cc
index 906e4e5..8901b696 100644
--- a/ui/gfx/animation/animation_unittest.cc
+++ b/ui/gfx/animation/animation_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 "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/linear_animation.h"
diff --git a/ui/gfx/animation/linear_animation.cc b/ui/gfx/animation/linear_animation.cc
index dd114a0..7c73279 100644
--- a/ui/gfx/animation/linear_animation.cc
+++ b/ui/gfx/animation/linear_animation.cc
@@ -5,6 +5,7 @@
 #include "ui/gfx/animation/linear_animation.h"
 
 #include <math.h>
+#include <stdint.h>
 
 #include <algorithm>
 
@@ -50,7 +51,7 @@ double LinearAnimation::GetCurrentValue() const {
 void LinearAnimation::SetCurrentValue(double new_value) {
   new_value = std::max(0.0, std::min(1.0, new_value));
   base::TimeDelta time_delta = base::TimeDelta::FromMicroseconds(
-      static_cast<int64>(duration_.InMicroseconds() * (new_value - state_)));
+      static_cast<int64_t>(duration_.InMicroseconds() * (new_value - state_)));
   SetStartTime(start_time() - time_delta);
   state_ = new_value;
 }
diff --git a/ui/gfx/animation/linear_animation.h b/ui/gfx/animation/linear_animation.h
index e47a783..d9e6de3 100644
--- a/ui/gfx/animation/linear_animation.h
+++ b/ui/gfx/animation/linear_animation.h
@@ -5,6 +5,7 @@
 #ifndef UI_GFX_ANIMATION_LINEAR_ANIMATION_H_
 #define UI_GFX_ANIMATION_LINEAR_ANIMATION_H_
 
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/gfx/animation/animation.h"
 
diff --git a/ui/gfx/animation/multi_animation.h b/ui/gfx/animation/multi_animation.h
index 9e60b66..fd28e38 100644
--- a/ui/gfx/animation/multi_animation.h
+++ b/ui/gfx/animation/multi_animation.h
@@ -5,8 +5,11 @@
 #ifndef UI_GFX_ANIMATION_MULTI_ANIMATION_H_
 #define UI_GFX_ANIMATION_MULTI_ANIMATION_H_
 
+#include <stddef.h>
+
 #include <vector>
 
+#include "base/macros.h"
 #include "ui/gfx/animation/animation.h"
 #include "ui/gfx/animation/tween.h"
 
diff --git a/ui/gfx/animation/slide_animation.h b/ui/gfx/animation/slide_animation.h
index 58effac3f..5db11d5 100644
--- a/ui/gfx/animation/slide_animation.h
+++ b/ui/gfx/animation/slide_animation.h
@@ -5,6 +5,7 @@
 #ifndef UI_GFX_ANIMATION_SLIDE_ANIMATION_H_
 #define UI_GFX_ANIMATION_SLIDE_ANIMATION_H_
 
+#include "base/macros.h"
 #include "ui/gfx/animation/linear_animation.h"
 #include "ui/gfx/animation/tween.h"
 
diff --git a/ui/gfx/animation/slide_animation_unittest.cc b/ui/gfx/animation/slide_animation_unittest.cc
index 9d4f534..07ebfc4 100644
--- a/ui/gfx/animation/slide_animation_unittest.cc
+++ b/ui/gfx/animation/slide_animation_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ui/gfx/animation/slide_animation.h"
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/gfx/animation/test_animation_delegate.h b/ui/gfx/animation/test_animation_delegate.h
index 9d8b8c71..6cc65af 100644
--- a/ui/gfx/animation/test_animation_delegate.h
+++ b/ui/gfx/animation/test_animation_delegate.h
@@ -5,6 +5,7 @@
 #ifndef UI_GFX_ANIMATION_TEST_ANIMATION_DELEGATE_H_
 #define UI_GFX_ANIMATION_TEST_ANIMATION_DELEGATE_H_
 
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/gfx/animation/animation_delegate.h"
 
diff --git a/ui/gfx/animation/throb_animation.h b/ui/gfx/animation/throb_animation.h
index 0523b44..1eaedd1 100644
--- a/ui/gfx/animation/throb_animation.h
+++ b/ui/gfx/animation/throb_animation.h
@@ -5,6 +5,7 @@
 #ifndef UI_GFX_ANIMATION_THROB_ANIMATION_H_
 #define UI_GFX_ANIMATION_THROB_ANIMATION_H_
 
+#include "base/macros.h"
 #include "ui/gfx/animation/slide_animation.h"
 
 namespace gfx {
diff --git a/ui/gfx/animation/tween.cc b/ui/gfx/animation/tween.cc
index 79b074c..15bdf5d 100644
--- a/ui/gfx/animation/tween.cc
+++ b/ui/gfx/animation/tween.cc
@@ -5,19 +5,20 @@
 #include "ui/gfx/animation/tween.h"
 
 #include <math.h>
-
-#if defined(OS_WIN)
-#include <float.h>
-#endif
+#include <stdint.h>
 
 #include <algorithm>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
+#include "build/build_config.h"
 #include "ui/gfx/geometry/cubic_bezier.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 
+#if defined(OS_WIN)
+#include <float.h>
+#endif
+
 namespace gfx {
 
 // static
@@ -71,16 +72,16 @@ double Tween::CalculateValue(Tween::Type type, double state) {
 }
 
 namespace {
-uint8 FloatToColorByte(float f) {
-  return base::saturated_cast<uint8>(ToRoundedInt(f * 255.f));
+uint8_t FloatToColorByte(float f) {
+  return base::saturated_cast<uint8_t>(ToRoundedInt(f * 255.f));
 }
 
-uint8 BlendColorComponents(uint8 start,
-                           uint8 target,
-                           float start_alpha,
-                           float target_alpha,
-                           float blended_alpha,
-                           double progress) {
+uint8_t BlendColorComponents(uint8_t start,
+                             uint8_t target,
+                             float start_alpha,
+                             float target_alpha,
+                             float blended_alpha,
+                             double progress) {
   // Since progress can be outside [0, 1], blending can produce a value outside
   // [0, 255].
   float blended_premultiplied = Tween::FloatValueBetween(
@@ -99,24 +100,15 @@ SkColor Tween::ColorValueBetween(double value, SkColor start, SkColor target) {
     return SkColorSetARGB(0, 0, 0, 0);
   blended_a = std::min(blended_a, 1.f);
 
-  uint8 blended_r = BlendColorComponents(SkColorGetR(start),
-                                         SkColorGetR(target),
-                                         start_a,
-                                         target_a,
-                                         blended_a,
-                                         value);
-  uint8 blended_g = BlendColorComponents(SkColorGetG(start),
-                                         SkColorGetG(target),
-                                         start_a,
-                                         target_a,
-                                         blended_a,
-                                         value);
-  uint8 blended_b = BlendColorComponents(SkColorGetB(start),
-                                         SkColorGetB(target),
-                                         start_a,
-                                         target_a,
-                                         blended_a,
-                                         value);
+  uint8_t blended_r =
+      BlendColorComponents(SkColorGetR(start), SkColorGetR(target), start_a,
+                           target_a, blended_a, value);
+  uint8_t blended_g =
+      BlendColorComponents(SkColorGetG(start), SkColorGetG(target), start_a,
+                           target_a, blended_a, value);
+  uint8_t blended_b =
+      BlendColorComponents(SkColorGetB(start), SkColorGetB(target), start_a,
+                           target_a, blended_a, value);
 
   return SkColorSetARGB(
       FloatToColorByte(blended_a), blended_r, blended_g, blended_b);
diff --git a/ui/gfx/animation/tween.h b/ui/gfx/animation/tween.h
index 2eaedee..c7fbc0f 100644
--- a/ui/gfx/animation/tween.h
+++ b/ui/gfx/animation/tween.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_ANIMATION_TWEEN_H_
 #define UI_GFX_ANIMATION_TWEEN_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/gfx_export.h"
diff --git a/ui/gfx/animation/tween_unittest.cc b/ui/gfx/animation/tween_unittest.cc
index f71a77d..a25aed3 100644
--- a/ui/gfx/animation/tween_unittest.cc
+++ b/ui/gfx/animation/tween_unittest.cc
@@ -6,13 +6,14 @@
 
 #include <math.h>
 
+#include "build/build_config.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/test/gfx_util.h"
+
 #if defined(OS_WIN)
 #include <float.h>
 #endif
 
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/test/gfx_util.h"
-
 namespace gfx {
 namespace {
 
diff --git a/ui/gfx/blit.cc b/ui/gfx/blit.cc
index 61a7d90..edac6ea 100644
--- a/ui/gfx/blit.cc
+++ b/ui/gfx/blit.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/blit.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/ui/gfx/blit_unittest.cc b/ui/gfx/blit_unittest.cc
index cac364b..e624591 100644
--- a/ui/gfx/blit_unittest.cc
+++ b/ui/gfx/blit_unittest.cc
@@ -2,8 +2,10 @@
 // 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 <stdint.h>
+
 #include "base/memory/shared_memory.h"
+#include "build/build_config.h"
 #include "skia/ext/platform_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/blit.h"
@@ -18,17 +20,17 @@ namespace {
 // Example values = {{0x0, 0x01}, {0x12, 0xFF}} would give a canvas with:
 //   0x00000000 0x01010101
 //   0x12121212 0xFFFFFFFF
-template<int w, int h>
-void SetToCanvas(skia::PlatformCanvas* canvas, uint8 values[h][w]) {
+template <int w, int h>
+void SetToCanvas(skia::PlatformCanvas* canvas, uint8_t values[h][w]) {
   ASSERT_EQ(w, canvas->imageInfo().width());
   ASSERT_EQ(h, canvas->imageInfo().height());
 
   // This wouldn't be necessary if we extended the values in the inputs, but
-  // the uint8 values are a little bit easier to read and maintain.
+  // the uint8_t values are a little bit easier to read and maintain.
   uint32_t extendedValues[w*h];
   for (int y = 0; y < h; y++) {
     for (int x = 0; x < w; x++) {
-      uint8 value = values[y][x];
+      uint8_t value = values[y][x];
       extendedValues[y*w+x] =
           (value << 24) | (value << 16) | (value << 8) | value;
     }
@@ -41,8 +43,8 @@ void SetToCanvas(skia::PlatformCanvas* canvas, uint8 values[h][w]) {
 // Checks each pixel in the given canvas and see if it is made up of the given
 // values, where each value has been duplicated into each channel of the given
 // bitmap (see SetToCanvas above).
-template<int w, int h>
-void VerifyCanvasValues(skia::PlatformCanvas* canvas, uint8 values[h][w]) {
+template <int w, int h>
+void VerifyCanvasValues(skia::PlatformCanvas* canvas, uint8_t values[h][w]) {
   SkBitmap bitmap = skia::ReadPixels(canvas);
   SkAutoLockPixels lock(bitmap);
   ASSERT_EQ(w, bitmap.width());
@@ -50,9 +52,8 @@ void VerifyCanvasValues(skia::PlatformCanvas* canvas, uint8 values[h][w]) {
 
   for (int y = 0; y < h; y++) {
     for (int x = 0; x < w; x++) {
-      uint8 value = values[y][x];
-      uint32 expected =
-          (value << 24) | (value << 16) | (value << 8) | value;
+      uint8_t value = values[y][x];
+      uint32_t expected = (value << 24) | (value << 16) | (value << 8) | value;
       ASSERT_EQ(expected, *bitmap.getAddr32(x, y));
     }
   }
@@ -65,12 +66,12 @@ TEST(Blit, ScrollCanvas) {
   static const int kCanvasHeight = 5;
   skia::RefPtr<SkCanvas> canvas = skia::AdoptRef(
       skia::CreatePlatformCanvas(kCanvasWidth, kCanvasHeight, true));
-  uint8 initial_values[kCanvasHeight][kCanvasWidth] = {
-      { 0x00, 0x01, 0x02, 0x03, 0x04 },
-      { 0x10, 0x11, 0x12, 0x13, 0x14 },
-      { 0x20, 0x21, 0x22, 0x23, 0x24 },
-      { 0x30, 0x31, 0x32, 0x33, 0x34 },
-      { 0x40, 0x41, 0x42, 0x43, 0x44 }};
+  uint8_t initial_values[kCanvasHeight][kCanvasWidth] = {
+      {0x00, 0x01, 0x02, 0x03, 0x04},
+      {0x10, 0x11, 0x12, 0x13, 0x14},
+      {0x20, 0x21, 0x22, 0x23, 0x24},
+      {0x30, 0x31, 0x32, 0x33, 0x34},
+      {0x40, 0x41, 0x42, 0x43, 0x44}};
   SetToCanvas<5, 5>(canvas.get(), initial_values);
 
   // Sanity check on input.
@@ -90,56 +91,56 @@ TEST(Blit, ScrollCanvas) {
   // Scroll the center 3 pixels up one.
   gfx::Rect center_three(1, 1, 3, 3);
   gfx::ScrollCanvas(canvas.get(), center_three, gfx::Vector2d(0, -1));
-  uint8 scroll_up_expected[kCanvasHeight][kCanvasWidth] = {
-      { 0x00, 0x01, 0x02, 0x03, 0x04 },
-      { 0x10, 0x21, 0x22, 0x23, 0x14 },
-      { 0x20, 0x31, 0x32, 0x33, 0x24 },
-      { 0x30, 0x31, 0x32, 0x33, 0x34 },
-      { 0x40, 0x41, 0x42, 0x43, 0x44 }};
+  uint8_t scroll_up_expected[kCanvasHeight][kCanvasWidth] = {
+      {0x00, 0x01, 0x02, 0x03, 0x04},
+      {0x10, 0x21, 0x22, 0x23, 0x14},
+      {0x20, 0x31, 0x32, 0x33, 0x24},
+      {0x30, 0x31, 0x32, 0x33, 0x34},
+      {0x40, 0x41, 0x42, 0x43, 0x44}};
   VerifyCanvasValues<5, 5>(canvas.get(), scroll_up_expected);
 
   // Reset and scroll the center 3 pixels down one.
   SetToCanvas<5, 5>(canvas.get(), initial_values);
   gfx::ScrollCanvas(canvas.get(), center_three, gfx::Vector2d(0, 1));
-  uint8 scroll_down_expected[kCanvasHeight][kCanvasWidth] = {
-      { 0x00, 0x01, 0x02, 0x03, 0x04 },
-      { 0x10, 0x11, 0x12, 0x13, 0x14 },
-      { 0x20, 0x11, 0x12, 0x13, 0x24 },
-      { 0x30, 0x21, 0x22, 0x23, 0x34 },
-      { 0x40, 0x41, 0x42, 0x43, 0x44 }};
+  uint8_t scroll_down_expected[kCanvasHeight][kCanvasWidth] = {
+      {0x00, 0x01, 0x02, 0x03, 0x04},
+      {0x10, 0x11, 0x12, 0x13, 0x14},
+      {0x20, 0x11, 0x12, 0x13, 0x24},
+      {0x30, 0x21, 0x22, 0x23, 0x34},
+      {0x40, 0x41, 0x42, 0x43, 0x44}};
   VerifyCanvasValues<5, 5>(canvas.get(), scroll_down_expected);
 
   // Reset and scroll the center 3 pixels right one.
   SetToCanvas<5, 5>(canvas.get(), initial_values);
   gfx::ScrollCanvas(canvas.get(), center_three, gfx::Vector2d(1, 0));
-  uint8 scroll_right_expected[kCanvasHeight][kCanvasWidth] = {
-      { 0x00, 0x01, 0x02, 0x03, 0x04 },
-      { 0x10, 0x11, 0x11, 0x12, 0x14 },
-      { 0x20, 0x21, 0x21, 0x22, 0x24 },
-      { 0x30, 0x31, 0x31, 0x32, 0x34 },
-      { 0x40, 0x41, 0x42, 0x43, 0x44 }};
+  uint8_t scroll_right_expected[kCanvasHeight][kCanvasWidth] = {
+      {0x00, 0x01, 0x02, 0x03, 0x04},
+      {0x10, 0x11, 0x11, 0x12, 0x14},
+      {0x20, 0x21, 0x21, 0x22, 0x24},
+      {0x30, 0x31, 0x31, 0x32, 0x34},
+      {0x40, 0x41, 0x42, 0x43, 0x44}};
   VerifyCanvasValues<5, 5>(canvas.get(), scroll_right_expected);
 
   // Reset and scroll the center 3 pixels left one.
   SetToCanvas<5, 5>(canvas.get(), initial_values);
   gfx::ScrollCanvas(canvas.get(), center_three, gfx::Vector2d(-1, 0));
-  uint8 scroll_left_expected[kCanvasHeight][kCanvasWidth] = {
-      { 0x00, 0x01, 0x02, 0x03, 0x04 },
-      { 0x10, 0x12, 0x13, 0x13, 0x14 },
-      { 0x20, 0x22, 0x23, 0x23, 0x24 },
-      { 0x30, 0x32, 0x33, 0x33, 0x34 },
-      { 0x40, 0x41, 0x42, 0x43, 0x44 }};
+  uint8_t scroll_left_expected[kCanvasHeight][kCanvasWidth] = {
+      {0x00, 0x01, 0x02, 0x03, 0x04},
+      {0x10, 0x12, 0x13, 0x13, 0x14},
+      {0x20, 0x22, 0x23, 0x23, 0x24},
+      {0x30, 0x32, 0x33, 0x33, 0x34},
+      {0x40, 0x41, 0x42, 0x43, 0x44}};
   VerifyCanvasValues<5, 5>(canvas.get(), scroll_left_expected);
 
   // Diagonal scroll.
   SetToCanvas<5, 5>(canvas.get(), initial_values);
   gfx::ScrollCanvas(canvas.get(), center_three, gfx::Vector2d(2, 2));
-  uint8 scroll_diagonal_expected[kCanvasHeight][kCanvasWidth] = {
-      { 0x00, 0x01, 0x02, 0x03, 0x04 },
-      { 0x10, 0x11, 0x12, 0x13, 0x14 },
-      { 0x20, 0x21, 0x22, 0x23, 0x24 },
-      { 0x30, 0x31, 0x32, 0x11, 0x34 },
-      { 0x40, 0x41, 0x42, 0x43, 0x44 }};
+  uint8_t scroll_diagonal_expected[kCanvasHeight][kCanvasWidth] = {
+      {0x00, 0x01, 0x02, 0x03, 0x04},
+      {0x10, 0x11, 0x12, 0x13, 0x14},
+      {0x20, 0x21, 0x22, 0x23, 0x24},
+      {0x30, 0x31, 0x32, 0x11, 0x34},
+      {0x40, 0x41, 0x42, 0x43, 0x44}};
   VerifyCanvasValues<5, 5>(canvas.get(), scroll_diagonal_expected);
 }
 
@@ -157,12 +158,12 @@ TEST(Blit, WithSharedMemory) {
   ASSERT_TRUE(canvas);
   shared_mem.Close();
 
-  uint8 initial_values[kCanvasHeight][kCanvasWidth] = {
-      { 0x00, 0x01, 0x02, 0x03, 0x04 },
-      { 0x10, 0x11, 0x12, 0x13, 0x14 },
-      { 0x20, 0x21, 0x22, 0x23, 0x24 },
-      { 0x30, 0x31, 0x32, 0x33, 0x34 },
-      { 0x40, 0x41, 0x42, 0x43, 0x44 }};
+  uint8_t initial_values[kCanvasHeight][kCanvasWidth] = {
+      {0x00, 0x01, 0x02, 0x03, 0x04},
+      {0x10, 0x11, 0x12, 0x13, 0x14},
+      {0x20, 0x21, 0x22, 0x23, 0x24},
+      {0x30, 0x31, 0x32, 0x33, 0x34},
+      {0x40, 0x41, 0x42, 0x43, 0x44}};
   SetToCanvas<5, 5>(canvas.get(), initial_values);
 
   // Sanity check on input.
diff --git a/ui/gfx/break_list.h b/ui/gfx/break_list.h
index b55debf..97d23c5 100644
--- a/ui/gfx/break_list.h
+++ b/ui/gfx/break_list.h
@@ -5,10 +5,11 @@
 #ifndef UI_GFX_BREAK_LIST_H_
 #define UI_GFX_BREAK_LIST_H_
 
+#include <stddef.h>
+
 #include <utility>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "ui/gfx/range/range.h"
 
diff --git a/ui/gfx/break_list_unittest.cc b/ui/gfx/break_list_unittest.cc
index 9d2168d..e84d80e 100644
--- a/ui/gfx/break_list_unittest.cc
+++ b/ui/gfx/break_list_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "ui/gfx/break_list.h"
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/range/range.h"
diff --git a/ui/gfx/buffer_format_util.cc b/ui/gfx/buffer_format_util.cc
index 01d5b9f..5d74a50 100644
--- a/ui/gfx/buffer_format_util.cc
+++ b/ui/gfx/buffer_format_util.cc
@@ -5,6 +5,7 @@
 #include "ui/gfx/buffer_format_util.h"
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/numerics/safe_math.h"
 
 namespace gfx {
diff --git a/ui/gfx/buffer_format_util.h b/ui/gfx/buffer_format_util.h
index 4e42039..81e7cdf 100644
--- a/ui/gfx/buffer_format_util.h
+++ b/ui/gfx/buffer_format_util.h
@@ -5,9 +5,10 @@
 #ifndef UI_GFX_BUFFER_FORMAT_UTIL_H_
 #define UI_GFX_BUFFER_FORMAT_UTIL_H_
 
+#include <stddef.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
 #include "ui/gfx/buffer_types.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gfx_export.h"
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index 1fe2d3c..f612a8e 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -186,11 +186,11 @@ void Canvas::Save() {
   canvas_->save();
 }
 
-void Canvas::SaveLayerAlpha(uint8 alpha) {
+void Canvas::SaveLayerAlpha(uint8_t alpha) {
   canvas_->saveLayerAlpha(NULL, alpha);
 }
 
-void Canvas::SaveLayerAlpha(uint8 alpha, const Rect& layer_bounds) {
+void Canvas::SaveLayerAlpha(uint8_t alpha, const Rect& layer_bounds) {
   SkRect bounds(RectToSkRect(layer_bounds));
   canvas_->saveLayerAlpha(&bounds, alpha);
 }
@@ -340,7 +340,7 @@ void Canvas::DrawImageInt(const ImageSkia& image, int x, int y) {
   DrawImageInt(image, x, y, paint);
 }
 
-void Canvas::DrawImageInt(const ImageSkia& image, int x, int y, uint8 a) {
+void Canvas::DrawImageInt(const ImageSkia& image, int x, int y, uint8_t a) {
   SkPaint paint;
   paint.setAlpha(a);
   DrawImageInt(image, x, y, paint);
diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h
index d154962..d1d031c 100644
--- a/ui/gfx/canvas.h
+++ b/ui/gfx/canvas.h
@@ -5,9 +5,11 @@
 #ifndef UI_GFX_CANVAS_H_
 #define UI_GFX_CANVAS_H_
 
+#include <stdint.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "skia/ext/platform_canvas.h"
@@ -179,8 +181,8 @@ class GFX_EXPORT Canvas {
   // at the specified alpha once Restore() is called.
   // |layer_bounds| are the bounds of the layer relative to the current
   // transform.
-  void SaveLayerAlpha(uint8 alpha);
-  void SaveLayerAlpha(uint8 alpha, const Rect& layer_bounds);
+  void SaveLayerAlpha(uint8_t alpha);
+  void SaveLayerAlpha(uint8_t alpha, const Rect& layer_bounds);
 
   // Restores the drawing state after a call to Save*(). It is an error to
   // call Restore() more times than Save*().
@@ -268,7 +270,7 @@ class GFX_EXPORT Canvas {
 
   // Helper for DrawImageInt(..., paint) that constructs a temporary paint and
   // calls paint.setAlpha(alpha).
-  void DrawImageInt(const ImageSkia&, int x, int y, uint8 alpha);
+  void DrawImageInt(const ImageSkia&, int x, int y, uint8_t alpha);
 
   // Draws an image with the origin at the specified location, using the
   // specified paint. The upper left corner of the bitmap is rendered at the
diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc
index 88744c9..60daeef 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas_skia.cc
@@ -4,10 +4,14 @@
 
 #include "ui/gfx/canvas.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/numerics/safe_conversions.h"
+#include "build/build_config.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkPixmap.h"
 #include "ui/gfx/font_list.h"
diff --git a/ui/gfx/canvas_unittest.cc b/ui/gfx/canvas_unittest.cc
index b377d5a..0141651 100644
--- a/ui/gfx/canvas_unittest.cc
+++ b/ui/gfx/canvas_unittest.cc
@@ -7,6 +7,7 @@
 #include <limits>
 
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/ui/gfx/chromeos/codec/jpeg_codec_robust_slow_unittest.cc b/ui/gfx/chromeos/codec/jpeg_codec_robust_slow_unittest.cc
index 56f64e7..35e53ea 100644
--- a/ui/gfx/chromeos/codec/jpeg_codec_robust_slow_unittest.cc
+++ b/ui/gfx/chromeos/codec/jpeg_codec_robust_slow_unittest.cc
@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 #include <math.h>
+#include <stdint.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h"
 
@@ -12,7 +13,7 @@ namespace {
 
 // A JPEG image used by TopSitesMigrationTest, whose size is 1x1.
 // This image causes an invalid-read error to libjpeg-turbo 1.0.1.
-const uint8 kTopSitesMigrationTestImage[] =
+const uint8_t kTopSitesMigrationTestImage[] =
     "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x00\x00\x01"
     "\x00\x01\x00\x00\xff\xdb\x00\x43\x00\x03\x02\x02\x03\x02\x02\x03"
     "\x03\x03\x03\x04\x03\x03\x04\x05\x08\x05\x05\x04\x04\x05\x0a\x07"
diff --git a/ui/gfx/codec/jpeg_codec_unittest.cc b/ui/gfx/codec/jpeg_codec_unittest.cc
index 7a8756a..8849102 100644
--- a/ui/gfx/codec/jpeg_codec_unittest.cc
+++ b/ui/gfx/codec/jpeg_codec_unittest.cc
@@ -3,8 +3,10 @@
 // found in the LICENSE file.
 
 #include <math.h>
+#include <stddef.h>
+#include <stdint.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 
@@ -12,7 +14,7 @@ namespace {
 
 // A JPEG image used by TopSitesMigrationTest, whose size is 1x1.
 // This image causes an invalid-read error to libjpeg-turbo 1.0.1.
-const uint8 kTopSitesMigrationTestImage[] =
+const uint8_t kTopSitesMigrationTestImage[] =
     "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x00\x00\x01"
     "\x00\x01\x00\x00\xff\xdb\x00\x43\x00\x03\x02\x02\x03\x02\x02\x03"
     "\x03\x03\x03\x04\x03\x03\x04\x05\x08\x05\x05\x04\x04\x05\x0a\x07"
diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc
index ea82f13..ac386ad 100644
--- a/ui/gfx/codec/png_codec.cc
+++ b/ui/gfx/codec/png_codec.cc
@@ -4,7 +4,10 @@
 
 #include "ui/gfx/codec/png_codec.h"
 
+#include <stdint.h>
+
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "third_party/libpng/png.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/ui/gfx/codec/png_codec.h b/ui/gfx/codec/png_codec.h
index 5f849c4..ba8c815 100644
--- a/ui/gfx/codec/png_codec.h
+++ b/ui/gfx/codec/png_codec.h
@@ -5,10 +5,12 @@
 #ifndef UI_GFX_CODEC_PNG_CODEC_H_
 #define UI_GFX_CODEC_PNG_CODEC_H_
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/gfx/gfx_export.h"
 
 class SkBitmap;
diff --git a/ui/gfx/codec/png_codec_unittest.cc b/ui/gfx/codec/png_codec_unittest.cc
index 610421a..b0d1e3d 100644
--- a/ui/gfx/codec/png_codec_unittest.cc
+++ b/ui/gfx/codec/png_codec_unittest.cc
@@ -2,10 +2,14 @@
 // 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 <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libpng/png.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/ui/gfx/color_analysis.h b/ui/gfx/color_analysis.h
index e6d1d96..7ac9146 100644
--- a/ui/gfx/color_analysis.h
+++ b/ui/gfx/color_analysis.h
@@ -5,7 +5,8 @@
 #ifndef UI_GFX_COLOR_ANALYSIS_H_
 #define UI_GFX_COLOR_ANALYSIS_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
diff --git a/ui/gfx/color_analysis_unittest.cc b/ui/gfx/color_analysis_unittest.cc
index 6f53f78..01acfe2 100644
--- a/ui/gfx/color_analysis_unittest.cc
+++ b/ui/gfx/color_analysis_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "ui/gfx/color_analysis.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/gfx/color_profile.cc b/ui/gfx/color_profile.cc
index 4fb4c9f..220d993 100644
--- a/ui/gfx/color_profile.cc
+++ b/ui/gfx/color_profile.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 "build/build_config.h"
 #include "ui/gfx/color_profile.h"
 
 namespace gfx {
diff --git a/ui/gfx/color_profile.h b/ui/gfx/color_profile.h
index 8f3f1f6..7bd5d44 100644
--- a/ui/gfx/color_profile.h
+++ b/ui/gfx/color_profile.h
@@ -5,8 +5,12 @@
 #ifndef UI_GFX_COLOR_PROFILE_H_
 #define UI_GFX_COLOR_PROFILE_H_
 
+#include <stddef.h>
+
 #include <vector>
 
+#include "base/macros.h"
+#include "build/build_config.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/ui/gfx/color_profile_mac.mm b/ui/gfx/color_profile_mac.mm
index 1d4b00e..9590e3e 100644
--- a/ui/gfx/color_profile_mac.mm
+++ b/ui/gfx/color_profile_mac.mm
@@ -5,6 +5,7 @@
 #include "ui/gfx/color_profile.h"
 
 #import <Cocoa/Cocoa.h>
+#include <stddef.h>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
diff --git a/ui/gfx/color_profile_win.cc b/ui/gfx/color_profile_win.cc
index c88f969..030e8a6 100644
--- a/ui/gfx/color_profile_win.cc
+++ b/ui/gfx/color_profile_win.cc
@@ -5,10 +5,12 @@
 #include "ui/gfx/color_profile.h"
 
 #include <windows.h>
+#include <stddef.h>
 #include <map>
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/synchronization/lock.h"
 
 namespace gfx {
diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc
index 494f04b..574169b 100644
--- a/ui/gfx/color_utils.cc
+++ b/ui/gfx/color_utils.cc
@@ -5,21 +5,20 @@
 #include "ui/gfx/color_utils.h"
 
 #include <math.h>
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
+#include <stdint.h>
 
 #include <algorithm>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/color_palette.h"
+
 #if defined(OS_WIN)
+#include <windows.h>
 #include "skia/ext/skia_utils_win.h"
 #endif
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/color_palette.h"
 
 namespace color_utils {
 
@@ -135,14 +134,14 @@ SkColor HSLToSkColor(const HSL& hsl, SkAlpha alpha) {
   // If there's no color, we don't care about hue and can do everything based on
   // brightness.
   if (!saturation) {
-    uint8 light;
+    uint8_t light;
 
     if (lightness < 0)
       light = 0;
     else if (lightness >= 1.0)
       light = 255;
     else
-      light = static_cast<uint8>(SkDoubleToFixed(lightness) >> 8);
+      light = static_cast<uint8_t>(SkDoubleToFixed(lightness) >> 8);
 
     return SkColorSetARGB(alpha, light, light, light);
   }
diff --git a/ui/gfx/color_utils.h b/ui/gfx/color_utils.h
index 55bd3e1..44302c8 100644
--- a/ui/gfx/color_utils.h
+++ b/ui/gfx/color_utils.h
@@ -5,7 +5,6 @@
 #ifndef UI_GFX_COLOR_UTILS_H_
 #define UI_GFX_COLOR_UTILS_H_
 
-#include "base/basictypes.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/gfx_export.h"
 
diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc
index e31e737..1777e87 100644
--- a/ui/gfx/display.cc
+++ b/ui/gfx/display.cc
@@ -10,6 +10,7 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/point_f.h"
@@ -48,7 +49,7 @@ float GetForcedDeviceScaleFactorImpl() {
   return static_cast<float>(scale_in_double);
 }
 
-int64 internal_display_id_ = -1;
+int64_t internal_display_id_ = -1;
 
 }  // namespace
 
@@ -79,14 +80,13 @@ Display::Display()
       touch_support_(TOUCH_SUPPORT_UNKNOWN) {
 }
 
-Display::Display(int64 id)
+Display::Display(int64_t id)
     : id_(id),
       device_scale_factor_(GetForcedDeviceScaleFactor()),
       rotation_(ROTATE_0),
-      touch_support_(TOUCH_SUPPORT_UNKNOWN) {
-}
+      touch_support_(TOUCH_SUPPORT_UNKNOWN) {}
 
-Display::Display(int64 id, const gfx::Rect& bounds)
+Display::Display(int64_t id, const gfx::Rect& bounds)
     : id_(id),
       bounds_(bounds),
       work_area_(bounds),
@@ -196,18 +196,18 @@ bool Display::IsInternal() const {
 }
 
 // static
-int64 Display::InternalDisplayId() {
+int64_t Display::InternalDisplayId() {
   DCHECK_NE(kInvalidDisplayID, internal_display_id_);
   return internal_display_id_;
 }
 
 // static
-void Display::SetInternalDisplayId(int64 internal_display_id) {
+void Display::SetInternalDisplayId(int64_t internal_display_id) {
   internal_display_id_ = internal_display_id;
 }
 
 // static
-bool Display::IsInternalDisplayId(int64 display_id) {
+bool Display::IsInternalDisplayId(int64_t display_id) {
   DCHECK_NE(kInvalidDisplayID, display_id);
   return HasInternalDisplay() && internal_display_id_ == display_id;
 }
diff --git a/ui/gfx/display.h b/ui/gfx/display.h
index b24f274..c6df7e7 100644
--- a/ui/gfx/display.h
+++ b/ui/gfx/display.h
@@ -5,7 +5,8 @@
 #ifndef UI_GFX_DISPLAY_H_
 #define UI_GFX_DISPLAY_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/gfx_export.h"
@@ -51,12 +52,12 @@ class GFX_EXPORT Display {
     TOUCH_SUPPORT_UNAVAILABLE,
   };
 
-  enum : int64 { kInvalidDisplayID = -1 };
+  enum : int64_t { kInvalidDisplayID = -1 };
 
   // Creates a display with kInvalidDisplayID as default.
   Display();
-  explicit Display(int64 id);
-  Display(int64 id, const Rect& bounds);
+  explicit Display(int64_t id);
+  Display(int64_t id, const Rect& bounds);
   ~Display();
 
   // Returns the forced device scale factor, which is given by
@@ -74,8 +75,8 @@ class GFX_EXPORT Display {
 
   // Sets/Gets unique identifier associated with the display.
   // -1 means invalid display and it doesn't not exit.
-  int64 id() const { return id_; }
-  void set_id(int64 id) { id_ = id; }
+  int64_t id() const { return id_; }
+  void set_id(int64_t id) { id_ = id; }
 
   // Gets/Sets the display's bounds in gfx::Screen's coordinates.
   const Rect& bounds() const { return bounds_; }
@@ -135,17 +136,17 @@ class GFX_EXPORT Display {
   bool IsInternal() const;
 
   // Gets/Sets an id of display corresponding to internal panel.
-  static int64 InternalDisplayId();
-  static void SetInternalDisplayId(int64 internal_display_id);
+  static int64_t InternalDisplayId();
+  static void SetInternalDisplayId(int64_t internal_display_id);
 
   // Test if the |id| is for the internal display if any.
-  static bool IsInternalDisplayId(int64 id);
+  static bool IsInternalDisplayId(int64_t id);
 
   // True if there is an internal display.
   static bool HasInternalDisplay();
 
  private:
-  int64 id_;
+  int64_t id_;
   Rect bounds_;
   Rect work_area_;
   float device_scale_factor_;
diff --git a/ui/gfx/display_change_notifier.cc b/ui/gfx/display_change_notifier.cc
index 380c32c..b8cf54d 100644
--- a/ui/gfx/display_change_notifier.cc
+++ b/ui/gfx/display_change_notifier.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/display_change_notifier.h"
 
+#include <stdint.h>
+
 #include "ui/gfx/display.h"
 #include "ui/gfx/display_observer.h"
 
@@ -22,7 +24,7 @@ class DisplayComparator {
   }
 
  private:
-  int64 display_id_;
+  int64_t display_id_;
 };
 
 } // anonymous namespace
diff --git a/ui/gfx/display_change_notifier.h b/ui/gfx/display_change_notifier.h
index 2a93217..458dd6a 100644
--- a/ui/gfx/display_change_notifier.h
+++ b/ui/gfx/display_change_notifier.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/gfx/gfx_export.h"
 
diff --git a/ui/gfx/display_change_notifier_unittest.cc b/ui/gfx/display_change_notifier_unittest.cc
index 9c1dda2..396130b 100644
--- a/ui/gfx/display_change_notifier_unittest.cc
+++ b/ui/gfx/display_change_notifier_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "ui/gfx/display_change_notifier.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/display_observer.h"
diff --git a/ui/gfx/font.cc b/ui/gfx/font.cc
index 2990205..60a7acd 100644
--- a/ui/gfx/font.cc
+++ b/ui/gfx/font.cc
@@ -5,6 +5,7 @@
 #include "ui/gfx/font.h"
 
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "ui/gfx/platform_font.h"
 
 namespace gfx {
diff --git a/ui/gfx/font.h b/ui/gfx/font.h
index da26a90..b7a7f9d 100644
--- a/ui/gfx/font.h
+++ b/ui/gfx/font.h
@@ -9,6 +9,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
+#include "build/build_config.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 
diff --git a/ui/gfx/font_fallback_win.cc b/ui/gfx/font_fallback_win.cc
index 058c0d9..8b45b2e 100644
--- a/ui/gfx/font_fallback_win.cc
+++ b/ui/gfx/font_fallback_win.cc
@@ -8,6 +8,7 @@
 
 #include <map>
 
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/strings/string_split.h"
diff --git a/ui/gfx/font_fallback_win.h b/ui/gfx/font_fallback_win.h
index 6c35412..31fbd68 100644
--- a/ui/gfx/font_fallback_win.h
+++ b/ui/gfx/font_fallback_win.h
@@ -5,9 +5,12 @@
 #ifndef UI_GFX_FONT_FALLBACK_WIN_H_
 #define UI_GFX_FONT_FALLBACK_WIN_H_
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/font_fallback.h"
 
diff --git a/ui/gfx/font_fallback_win_unittest.cc b/ui/gfx/font_fallback_win_unittest.cc
index 3d5eaad..d0f0da1 100644
--- a/ui/gfx/font_fallback_win_unittest.cc
+++ b/ui/gfx/font_fallback_win_unittest.cc
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/font_fallback_win.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/font_fallback_win.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/font_list_impl.cc b/ui/gfx/font_list_impl.cc
index 3eb55be..3bab76f 100644
--- a/ui/gfx/font_list_impl.cc
+++ b/ui/gfx/font_list_impl.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/font_list_impl.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/logging.h"
diff --git a/ui/gfx/font_list_unittest.cc b/ui/gfx/font_list_unittest.cc
index 1295839..ccca315 100644
--- a/ui/gfx/font_list_unittest.cc
+++ b/ui/gfx/font_list_unittest.cc
@@ -10,6 +10,7 @@
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/ui/gfx/font_render_params_linux.cc b/ui/gfx/font_render_params_linux.cc
index b62c525..a9afcf3 100644
--- a/ui/gfx/font_render_params_linux.cc
+++ b/ui/gfx/font_render_params_linux.cc
@@ -5,6 +5,8 @@
 #include "ui/gfx/font_render_params.h"
 
 #include <fontconfig/fontconfig.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/containers/mru_cache.h"
@@ -16,6 +18,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
+#include "build/build_config.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/linux_font_delegate.h"
@@ -49,7 +52,7 @@ struct QueryResult {
 
 // Keyed by hashes of FontRenderParamQuery structs from
 // HashFontRenderParamsQuery().
-typedef base::MRUCache<uint32, QueryResult> Cache;
+typedef base::MRUCache<uint32_t, QueryResult> Cache;
 
 // A cache and the lock that must be held while accessing it.
 // GetFontRenderParams() is called by both the UI thread and the sandbox IPC
@@ -189,7 +192,7 @@ bool QueryFontconfig(const FontRenderParamsQuery& query,
 
 // Serialize |query| into a string and hash it to a value suitable for use as a
 // cache key.
-uint32 HashFontRenderParamsQuery(const FontRenderParamsQuery& query) {
+uint32_t HashFontRenderParamsQuery(const FontRenderParamsQuery& query) {
   return base::Hash(base::StringPrintf(
       "%d|%d|%d|%s|%f", query.pixel_size, query.point_size, query.style,
       base::JoinString(query.families, ",").c_str(),
@@ -214,7 +217,7 @@ FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
     }
 #endif
   }
-  const uint32 hash = HashFontRenderParamsQuery(actual_query);
+  const uint32_t hash = HashFontRenderParamsQuery(actual_query);
   SynchronizedCache* synchronized_cache = g_synchronized_cache.Pointer();
 
   {
diff --git a/ui/gfx/font_render_params_linux_unittest.cc b/ui/gfx/font_render_params_linux_unittest.cc
index 42c665c..27d1ff3 100644
--- a/ui/gfx/font_render_params_linux_unittest.cc
+++ b/ui/gfx/font_render_params_linux_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/linux_font_delegate.h"
diff --git a/ui/gfx/font_render_params_win.cc b/ui/gfx/font_render_params_win.cc
index 1fd15ab..b7c3af2 100644
--- a/ui/gfx/font_render_params_win.cc
+++ b/ui/gfx/font_render_params_win.cc
@@ -5,6 +5,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/win/registry.h"
diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc
index 102c7c8..2552b13e 100644
--- a/ui/gfx/font_unittest.cc
+++ b/ui/gfx/font_unittest.cc
@@ -4,9 +4,11 @@
 
 #include "ui/gfx/font.h"
 
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
diff --git a/ui/gfx/gdi_util.cc b/ui/gfx/gdi_util.cc
index 8cdff0a..be5d134 100644
--- a/ui/gfx/gdi_util.cc
+++ b/ui/gfx/gdi_util.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/gdi_util.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/logging.h"
diff --git a/ui/gfx/generic_shared_memory_id.h b/ui/gfx/generic_shared_memory_id.h
index 1c3be79..51f553b 100644
--- a/ui/gfx/generic_shared_memory_id.h
+++ b/ui/gfx/generic_shared_memory_id.h
@@ -5,6 +5,9 @@
 #ifndef UI_GFX_GENERIC_SHARED_MEMORY_ID_H_
 #define UI_GFX_GENERIC_SHARED_MEMORY_ID_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/trace_event/memory_allocator_dump.h"
 #include "ui/gfx/gfx_export.h"
 
diff --git a/ui/gfx/geometry/box_unittest.cc b/ui/gfx/geometry/box_unittest.cc
index 449c50f..990fccc 100644
--- a/ui/gfx/geometry/box_unittest.cc
+++ b/ui/gfx/geometry/box_unittest.cc
@@ -2,7 +2,6 @@
 // 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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/box_f.h"
 
diff --git a/ui/gfx/geometry/matrix3_unittest.cc b/ui/gfx/geometry/matrix3_unittest.cc
index 0f57e8e..9d7da0e 100644
--- a/ui/gfx/geometry/matrix3_unittest.cc
+++ b/ui/gfx/geometry/matrix3_unittest.cc
@@ -5,7 +5,6 @@
 #include <cmath>
 #include <limits>
 
-#include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/matrix3_f.h"
 
diff --git a/ui/gfx/geometry/point.cc b/ui/gfx/geometry/point.cc
index 0f18afd..285b208 100644
--- a/ui/gfx/geometry/point.cc
+++ b/ui/gfx/geometry/point.cc
@@ -4,6 +4,11 @@
 
 #include "ui/gfx/geometry/point.h"
 
+#include "base/strings/stringprintf.h"
+#include "build/build_config.h"
+#include "ui/gfx/geometry/point_conversions.h"
+#include "ui/gfx/geometry/point_f.h"
+
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_IOS)
@@ -12,10 +17,6 @@
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
-#include "base/strings/stringprintf.h"
-#include "ui/gfx/geometry/point_conversions.h"
-#include "ui/gfx/geometry/point_f.h"
-
 namespace gfx {
 
 #if defined(OS_WIN)
diff --git a/ui/gfx/geometry/point.h b/ui/gfx/geometry/point.h
index 635577e..0d46751 100644
--- a/ui/gfx/geometry/point.h
+++ b/ui/gfx/geometry/point.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <tuple>
 
+#include "build/build_config.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/gfx_export.h"
 
diff --git a/ui/gfx/geometry/point3_unittest.cc b/ui/gfx/geometry/point3_unittest.cc
index d8a7f19..999b1f4 100644
--- a/ui/gfx/geometry/point3_unittest.cc
+++ b/ui/gfx/geometry/point3_unittest.cc
@@ -2,7 +2,9 @@
 // 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 <stddef.h>
+
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/point3_f.h"
 
diff --git a/ui/gfx/geometry/point_unittest.cc b/ui/gfx/geometry/point_unittest.cc
index dd5ea1d..6acef25 100644
--- a/ui/gfx/geometry/point_unittest.cc
+++ b/ui/gfx/geometry/point_unittest.cc
@@ -2,7 +2,9 @@
 // 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 <stddef.h>
+
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_conversions.h"
diff --git a/ui/gfx/geometry/quad_f.h b/ui/gfx/geometry/quad_f.h
index d795064..f9eb3bc 100644
--- a/ui/gfx/geometry/quad_f.h
+++ b/ui/gfx/geometry/quad_f.h
@@ -5,6 +5,8 @@
 #ifndef UI_GFX_GEOMETRY_QUAD_F_H_
 #define UI_GFX_GEOMETRY_QUAD_F_H_
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <cmath>
 #include <iosfwd>
diff --git a/ui/gfx/geometry/quad_unittest.cc b/ui/gfx/geometry/quad_unittest.cc
index a5c200d..44cd366 100644
--- a/ui/gfx/geometry/quad_unittest.cc
+++ b/ui/gfx/geometry/quad_unittest.cc
@@ -2,7 +2,9 @@
 // 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 <stddef.h>
+
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/rect_f.h"
diff --git a/ui/gfx/geometry/rect.cc b/ui/gfx/geometry/rect.cc
index 077e32c..e7a3aa2 100644
--- a/ui/gfx/geometry/rect.cc
+++ b/ui/gfx/geometry/rect.cc
@@ -16,6 +16,7 @@
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "ui/gfx/geometry/insets.h"
 
 namespace gfx {
diff --git a/ui/gfx/geometry/rect.h b/ui/gfx/geometry/rect.h
index c778396..a01e719 100644
--- a/ui/gfx/geometry/rect.h
+++ b/ui/gfx/geometry/rect.h
@@ -17,6 +17,7 @@
 #include <string>
 
 #include "base/numerics/safe_conversions.h"
+#include "build/build_config.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/vector2d.h"
diff --git a/ui/gfx/geometry/rect_f.cc b/ui/gfx/geometry/rect_f.cc
index a15bdf3..14043d8 100644
--- a/ui/gfx/geometry/rect_f.cc
+++ b/ui/gfx/geometry/rect_f.cc
@@ -14,6 +14,7 @@
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "ui/gfx/geometry/insets_f.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 
diff --git a/ui/gfx/geometry/rect_f.h b/ui/gfx/geometry/rect_f.h
index 1bc0e2f..93e6291 100644
--- a/ui/gfx/geometry/rect_f.h
+++ b/ui/gfx/geometry/rect_f.h
@@ -8,6 +8,7 @@
 #include <iosfwd>
 #include <string>
 
+#include "build/build_config.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size_f.h"
diff --git a/ui/gfx/geometry/rect_unittest.cc b/ui/gfx/geometry/rect_unittest.cc
index 0ecde65..be4b462 100644
--- a/ui/gfx/geometry/rect_unittest.cc
+++ b/ui/gfx/geometry/rect_unittest.cc
@@ -4,7 +4,10 @@
 
 #include <limits>
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
+#include "base/macros.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
diff --git a/ui/gfx/geometry/scroll_offset_unittest.cc b/ui/gfx/geometry/scroll_offset_unittest.cc
index 72073c1..2d19a6a 100644
--- a/ui/gfx/geometry/scroll_offset_unittest.cc
+++ b/ui/gfx/geometry/scroll_offset_unittest.cc
@@ -2,10 +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 <cmath>
 #include <limits>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/scroll_offset.h"
 
diff --git a/ui/gfx/geometry/size.cc b/ui/gfx/geometry/size.cc
index 7b5b522..7cda8e1 100644
--- a/ui/gfx/geometry/size.cc
+++ b/ui/gfx/geometry/size.cc
@@ -14,6 +14,7 @@
 
 #include "base/numerics/safe_math.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace gfx {
diff --git a/ui/gfx/geometry/size.h b/ui/gfx/geometry/size.h
index de1df59..8c2f778 100644
--- a/ui/gfx/geometry/size.h
+++ b/ui/gfx/geometry/size.h
@@ -10,6 +10,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/numerics/safe_math.h"
+#include "build/build_config.h"
 #include "ui/gfx/gfx_export.h"
 
 #if defined(OS_WIN)
diff --git a/ui/gfx/geometry/vector2d.cc b/ui/gfx/geometry/vector2d.cc
index d9f57fd..43f25e9 100644
--- a/ui/gfx/geometry/vector2d.cc
+++ b/ui/gfx/geometry/vector2d.cc
@@ -24,8 +24,8 @@ void Vector2d::Subtract(const Vector2d& other) {
   y_ -= other.y_;
 }
 
-int64 Vector2d::LengthSquared() const {
-  return static_cast<int64>(x_) * x_ + static_cast<int64>(y_) * y_;
+int64_t Vector2d::LengthSquared() const {
+  return static_cast<int64_t>(x_) * x_ + static_cast<int64_t>(y_) * y_;
 }
 
 float Vector2d::Length() const {
diff --git a/ui/gfx/geometry/vector2d.h b/ui/gfx/geometry/vector2d.h
index 86215d8..6e315a5 100644
--- a/ui/gfx/geometry/vector2d.h
+++ b/ui/gfx/geometry/vector2d.h
@@ -10,10 +10,11 @@
 #ifndef UI_GFX_GEOMETRY_VECTOR2D_H_
 #define UI_GFX_GEOMETRY_VECTOR2D_H_
 
+#include <stdint.h>
+
 #include <iosfwd>
 #include <string>
 
-#include "base/basictypes.h"
 #include "ui/gfx/geometry/vector2d_f.h"
 #include "ui/gfx/gfx_export.h"
 
@@ -54,7 +55,7 @@ class GFX_EXPORT Vector2d {
   // Gives the square of the diagonal length of the vector. Since this is
   // cheaper to compute than Length(), it is useful when you want to compare
   // relative lengths of different vectors without needing the actual lengths.
-  int64 LengthSquared() const;
+  int64_t LengthSquared() const;
   // Gives the diagonal length of the vector.
   float Length() const;
 
diff --git a/ui/gfx/geometry/vector2d_unittest.cc b/ui/gfx/geometry/vector2d_unittest.cc
index b87609f..98d75f2 100644
--- a/ui/gfx/geometry/vector2d_unittest.cc
+++ b/ui/gfx/geometry/vector2d_unittest.cc
@@ -2,10 +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 <cmath>
 #include <limits>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/geometry/vector2d_f.h"
diff --git a/ui/gfx/geometry/vector3d_unittest.cc b/ui/gfx/geometry/vector3d_unittest.cc
index 2a3a1a0..3bec7a8 100644
--- a/ui/gfx/geometry/vector3d_unittest.cc
+++ b/ui/gfx/geometry/vector3d_unittest.cc
@@ -2,10 +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 <cmath>
 #include <limits>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/vector3d_f.h"
 
diff --git a/ui/gfx/gpu_memory_buffer.cc b/ui/gfx/gpu_memory_buffer.cc
index 9ccd410..f70badb 100644
--- a/ui/gfx/gpu_memory_buffer.cc
+++ b/ui/gfx/gpu_memory_buffer.cc
@@ -7,7 +7,7 @@
 namespace gfx {
 
 base::trace_event::MemoryAllocatorDumpGuid GetGpuMemoryBufferGUIDForTracing(
-    uint64 tracing_process_id,
+    uint64_t tracing_process_id,
     GpuMemoryBufferId buffer_id) {
   // TODO(ericrk): Currently this function just wraps
   // GetGenericSharedMemoryGUIDForTracing, we may want to special case this if
diff --git a/ui/gfx/gpu_memory_buffer.h b/ui/gfx/gpu_memory_buffer.h
index 47d277e..6b769c8 100644
--- a/ui/gfx/gpu_memory_buffer.h
+++ b/ui/gfx/gpu_memory_buffer.h
@@ -5,6 +5,9 @@
 #ifndef UI_GFX_GPU_MEMORY_BUFFER_H_
 #define UI_GFX_GPU_MEMORY_BUFFER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/memory/shared_memory.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "build/build_config.h"
@@ -46,7 +49,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
 };
 
 base::trace_event::MemoryAllocatorDumpGuid GFX_EXPORT
-GetGpuMemoryBufferGUIDForTracing(uint64 tracing_process_id,
+GetGpuMemoryBufferGUIDForTracing(uint64_t tracing_process_id,
                                  GpuMemoryBufferId buffer_id);
 
 // This interface typically correspond to a type of shared memory that is also
diff --git a/ui/gfx/harfbuzz_font_skia.cc b/ui/gfx/harfbuzz_font_skia.cc
index d837533..723b68a 100644
--- a/ui/gfx/harfbuzz_font_skia.cc
+++ b/ui/gfx/harfbuzz_font_skia.cc
@@ -4,11 +4,15 @@
 
 #include "ui/gfx/harfbuzz_font_skia.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <limits>
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "ui/gfx/render_text.h"
diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc
index 1497a29..092ab68 100644
--- a/ui/gfx/icon_util.cc
+++ b/ui/gfx/icon_util.cc
@@ -7,6 +7,7 @@
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/resource_util.h"
@@ -199,17 +200,17 @@ base::win::ScopedHICON IconUtil::CreateHICONFromSkBitmap(
   // bitmap has an alpha channel, Windows might not agree when all alpha values
   // are zero. So the monochrome bitmap is created with all pixels transparent
   // for this case. Otherwise, it is created with all pixels opaque.
-  bool bitmap_has_alpha_channel = PixelsHaveAlpha(
-      static_cast<const uint32*>(bitmap.getPixels()),
-      bitmap.width() * bitmap.height());
+  bool bitmap_has_alpha_channel =
+      PixelsHaveAlpha(static_cast<const uint32_t*>(bitmap.getPixels()),
+                      bitmap.width() * bitmap.height());
 
-  scoped_ptr<uint8[]> mask_bits;
+  scoped_ptr<uint8_t[]> mask_bits;
   if (!bitmap_has_alpha_channel) {
     // Bytes per line with paddings to make it word alignment.
     size_t bytes_per_line = (bitmap.width() + 0xF) / 16 * 2;
     size_t mask_bits_size = bytes_per_line * bitmap.height();
 
-    mask_bits.reset(new uint8[mask_bits_size]);
+    mask_bits.reset(new uint8_t[mask_bits_size]);
     DCHECK(mask_bits.get());
 
     // Make all pixels transparent.
@@ -380,7 +381,7 @@ SkBitmap IconUtil::CreateSkBitmapFromHICONHelper(HICON icon,
   BITMAPV5HEADER h;
   InitializeBitmapHeader(&h, s.width(), s.height());
   HDC hdc = ::GetDC(NULL);
-  uint32* bits;
+  uint32_t* bits;
   HBITMAP dib = ::CreateDIBSection(hdc, reinterpret_cast<BITMAPINFO*>(&h),
       DIB_RGB_COLORS, reinterpret_cast<void**>(&bits), NULL, 0);
   DCHECK(dib);
@@ -422,12 +423,12 @@ SkBitmap IconUtil::CreateSkBitmapFromHICONHelper(HICON icon,
 
   // Finding out whether the bitmap has an alpha channel.
   bool bitmap_has_alpha_channel = PixelsHaveAlpha(
-      static_cast<const uint32*>(bitmap.getPixels()), num_pixels);
+      static_cast<const uint32_t*>(bitmap.getPixels()), num_pixels);
 
   // If the bitmap does not have an alpha channel, we need to build it using
   // the previously captured AND mask. Otherwise, we are done.
   if (!bitmap_has_alpha_channel) {
-    uint32* p = static_cast<uint32*>(bitmap.getPixels());
+    uint32_t* p = static_cast<uint32_t*>(bitmap.getPixels());
     for (size_t i = 0; i < num_pixels; ++p, ++i) {
       DCHECK_EQ((*p & 0xff000000), 0u);
       if (opaque[i])
@@ -479,7 +480,7 @@ bool IconUtil::CreateIconFileFromImageFamily(
   // First, we set the information which doesn't require iterating through the
   // bitmap set and then we set the bitmap specific structures. In the latter
   // step we also copy the actual bits.
-  std::vector<uint8> buffer(buffer_size);
+  std::vector<uint8_t> buffer(buffer_size);
   ICONDIR* icon_dir = reinterpret_cast<ICONDIR*>(&buffer[0]);
   icon_dir->idType = kResourceTypeIcon;
   icon_dir->idCount = static_cast<WORD>(image_count);
@@ -527,8 +528,8 @@ bool IconUtil::CreateIconFileFromImageFamily(
   }
 }
 
-bool IconUtil::PixelsHaveAlpha(const uint32* pixels, size_t num_pixels) {
-  for (const uint32* end = pixels + num_pixels; pixels != end; ++pixels) {
+bool IconUtil::PixelsHaveAlpha(const uint32_t* pixels, size_t num_pixels) {
+  for (const uint32_t* end = pixels + num_pixels; pixels != end; ++pixels) {
     if ((*pixels & 0xff000000) != 0)
       return true;
   }
diff --git a/ui/gfx/icon_util.h b/ui/gfx/icon_util.h
index deb935f..10f46c1 100644
--- a/ui/gfx/icon_util.h
+++ b/ui/gfx/icon_util.h
@@ -6,10 +6,12 @@
 #define UI_GFX_ICON_UTIL_H_
 
 #include <windows.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_gdi_object.h"
 #include "ui/gfx/geometry/point.h"
@@ -204,7 +206,7 @@ class GFX_EXPORT IconUtil {
   friend class IconUtilTest;
 
   // Returns true if any pixel in the given pixels buffer has an non-zero alpha.
-  static bool PixelsHaveAlpha(const uint32* pixels, size_t num_pixels);
+  static bool PixelsHaveAlpha(const uint32_t* pixels, size_t num_pixels);
 
   // A helper function that initializes a BITMAPV5HEADER structure with a set
   // of values.
diff --git a/ui/gfx/icon_util_unittest.cc b/ui/gfx/icon_util_unittest.cc
index ffb9864..7daa8cb 100644
--- a/ui/gfx/icon_util_unittest.cc
+++ b/ui/gfx/icon_util_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/icon_util.h"
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/files/file_util.h"
diff --git a/ui/gfx/image/canvas_image_source.h b/ui/gfx/image/canvas_image_source.h
index ef9422a..f41c281 100644
--- a/ui/gfx/image/canvas_image_source.h
+++ b/ui/gfx/image/canvas_image_source.h
@@ -5,8 +5,8 @@
 #ifndef UI_GFX_IMAGE_CANVAS_IMAGE_SOURCE_H_
 #define UI_GFX_IMAGE_CANVAS_IMAGE_SOURCE_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/image/image_skia_source.h"
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc
index a197374..9b59496 100644
--- a/ui/gfx/image/image.cc
+++ b/ui/gfx/image/image.cc
@@ -9,6 +9,8 @@
 #include <utility>
 
 #include "base/logging.h"
+#include "base/macros.h"
+#include "build/build_config.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_png_rep.h"
diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h
index 931fe2a..ec05b26 100644
--- a/ui/gfx/image/image.h
+++ b/ui/gfx/image/image.h
@@ -19,12 +19,14 @@
 #ifndef UI_GFX_IMAGE_IMAGE_H_
 #define UI_GFX_IMAGE_IMAGE_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 
diff --git a/ui/gfx/image/image_ios.mm b/ui/gfx/image/image_ios.mm
index 9448b2e..9520f32 100644
--- a/ui/gfx/image/image_ios.mm
+++ b/ui/gfx/image/image_ios.mm
@@ -4,6 +4,7 @@
 
 #include "ui/gfx/image/image.h"
 
+#include <stddef.h>
 #import <UIKit/UIKit.h>
 #include <cmath>
 #include <limits>
diff --git a/ui/gfx/image/image_ios_unittest.mm b/ui/gfx/image/image_ios_unittest.mm
index a9558b0..1e8c5e8 100644
--- a/ui/gfx/image/image_ios_unittest.mm
+++ b/ui/gfx/image/image_ios_unittest.mm
@@ -3,10 +3,12 @@
 // found in the LICENSE file.
 
 #import <QuartzCore/QuartzCore.h>
+#include <stddef.h>
 #import <UIKit/UIKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
diff --git a/ui/gfx/image/image_mac.mm b/ui/gfx/image/image_mac.mm
index 42fcb6b..6358a36 100644
--- a/ui/gfx/image/image_mac.mm
+++ b/ui/gfx/image/image_mac.mm
@@ -5,6 +5,7 @@
 #include "ui/gfx/image/image.h"
 
 #import <AppKit/AppKit.h>
+#include <stddef.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
diff --git a/ui/gfx/image/image_mac_unittest.mm b/ui/gfx/image/image_mac_unittest.mm
index c3439ee..f54b9bc 100644
--- a/ui/gfx/image/image_mac_unittest.mm
+++ b/ui/gfx/image/image_mac_unittest.mm
@@ -3,9 +3,11 @@
 // found in the LICENSE file.
 
 #include <Cocoa/Cocoa.h>
+#include <stddef.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_png_rep.h"
diff --git a/ui/gfx/image/image_skia.cc b/ui/gfx/image/image_skia.cc
index 04b9014..b46d38d 100644
--- a/ui/gfx/image/image_skia.cc
+++ b/ui/gfx/image/image_skia.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/image/image_skia.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <cmath>
 #include <limits>
@@ -12,6 +14,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
+#include "build/build_config.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/size_conversions.h"
diff --git a/ui/gfx/image/image_skia.h b/ui/gfx/image/image_skia.h
index 7bf5e58..ad02a1e 100644
--- a/ui/gfx/image/image_skia.h
+++ b/ui/gfx/image/image_skia.h
@@ -7,7 +7,6 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/ui/gfx/image/image_skia_operations.cc b/ui/gfx/image/image_skia_operations.cc
index edeb869..f523abf 100644
--- a/ui/gfx/image/image_skia_operations.cc
+++ b/ui/gfx/image/image_skia_operations.cc
@@ -4,8 +4,11 @@
 
 #include "ui/gfx/image/image_skia_operations.h"
 
+#include <stddef.h>
+
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "skia/ext/image_operations.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
diff --git a/ui/gfx/image/image_skia_unittest.cc b/ui/gfx/image/image_skia_unittest.cc
index 7f87202..3ff867d 100644
--- a/ui/gfx/image/image_skia_unittest.cc
+++ b/ui/gfx/image/image_skia_unittest.cc
@@ -4,8 +4,11 @@
 
 #include "ui/gfx/image/image_skia.h"
 
+#include <stddef.h>
+
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/threading/simple_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/ui/gfx/image/image_skia_util_mac.mm b/ui/gfx/image/image_skia_util_mac.mm
index 8b19769..a06a566 100644
--- a/ui/gfx/image/image_skia_util_mac.mm
+++ b/ui/gfx/image/image_skia_util_mac.mm
@@ -8,6 +8,7 @@
 #include <limits>
 
 #import <AppKit/AppKit.h>
+#include <stddef.h>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
diff --git a/ui/gfx/image/image_unittest.cc b/ui/gfx/image/image_unittest.cc
index 7c8d95f..d39adac 100644
--- a/ui/gfx/image/image_unittest.cc
+++ b/ui/gfx/image/image_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 "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
diff --git a/ui/gfx/image/image_unittest_util.cc b/ui/gfx/image/image_unittest_util.cc
index a766037..2e150a8 100644
--- a/ui/gfx/image/image_unittest_util.cc
+++ b/ui/gfx/image/image_unittest_util.cc
@@ -7,9 +7,12 @@
 
 #include "ui/gfx/image/image_unittest_util.h"
 
+#include <stddef.h>
+
 #include <cmath>
 
 #include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
diff --git a/ui/gfx/image/image_unittest_util.h b/ui/gfx/image/image_unittest_util.h
index 985506b..cf74edb 100644
--- a/ui/gfx/image/image_unittest_util.h
+++ b/ui/gfx/image/image_unittest_util.h
@@ -8,8 +8,9 @@
 #ifndef UI_GFX_IMAGE_IMAGE_UNITTEST_UTIL_H_
 #define UI_GFX_IMAGE_IMAGE_UNITTEST_UTIL_H_
 
-#include "ui/gfx/image/image.h"
+#include "build/build_config.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/image/image.h"
 
 namespace gfx {
 namespace test {
diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc
index a9ed68c..e991da9 100644
--- a/ui/gfx/image/image_util.cc
+++ b/ui/gfx/image/image_util.cc
@@ -4,9 +4,12 @@
 
 #include "ui/gfx/image/image_util.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/image/image.h"
diff --git a/ui/gfx/image/image_util.h b/ui/gfx/image/image_util.h
index 2711850..c2ce2a1 100644
--- a/ui/gfx/image/image_util.h
+++ b/ui/gfx/image/image_util.h
@@ -5,9 +5,10 @@
 #ifndef UI_GFX_IMAGE_IMAGE_UTIL_H_
 #define UI_GFX_IMAGE_IMAGE_UTIL_H_
 
+#include <stddef.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace gfx {
diff --git a/ui/gfx/interpolated_transform.h b/ui/gfx/interpolated_transform.h
index 691ea97..139e77b 100644
--- a/ui/gfx/interpolated_transform.h
+++ b/ui/gfx/interpolated_transform.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_INTERPOLATED_TRANSFORM_H_
 #define UI_GFX_INTERPOLATED_TRANSFORM_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point3_f.h"
diff --git a/ui/gfx/interpolated_transform_unittest.cc b/ui/gfx/interpolated_transform_unittest.cc
index 75b2c73..7580264 100644
--- a/ui/gfx/interpolated_transform_unittest.cc
+++ b/ui/gfx/interpolated_transform_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "ui/gfx/interpolated_transform.h"
 
-#include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/ui/gfx/ios/NSString+CrStringDrawing.mm b/ui/gfx/ios/NSString+CrStringDrawing.mm
index 6d41f3f..f7a684d 100644
--- a/ui/gfx/ios/NSString+CrStringDrawing.mm
+++ b/ui/gfx/ios/NSString+CrStringDrawing.mm
@@ -4,6 +4,8 @@
 
 #import "ui/gfx/ios/NSString+CrStringDrawing.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "ui/gfx/ios/uikit_util.h"
 
diff --git a/ui/gfx/ios/uikit_util_unittest.mm b/ui/gfx/ios/uikit_util_unittest.mm
index b343f4e..f6cf49d 100644
--- a/ui/gfx/ios/uikit_util_unittest.mm
+++ b/ui/gfx/ios/uikit_util_unittest.mm
@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 #import <Foundation/Foundation.h>
+#include <stddef.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "testing/platform_test.h"
 #import "ui/gfx/ios/uikit_util.h"
 
diff --git a/ui/gfx/ipc/gfx_param_traits.cc b/ui/gfx/ipc/gfx_param_traits.cc
index 32fd2da..2eeefbf 100644
--- a/ui/gfx/ipc/gfx_param_traits.cc
+++ b/ui/gfx/ipc/gfx_param_traits.cc
@@ -4,6 +4,9 @@
 
 #include "ui/gfx/ipc/gfx_param_traits.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -23,10 +26,10 @@ struct SkBitmap_Data {
   SkAlphaType fAlphaType;
 
   // The width of the bitmap in pixels.
-  uint32 fWidth;
+  uint32_t fWidth;
 
   // The height of the bitmap in pixels.
-  uint32 fHeight;
+  uint32_t fHeight;
 
   void InitSkBitmapDataForTransfer(const SkBitmap& bitmap) {
     const SkImageInfo& info = bitmap.info();
diff --git a/ui/gfx/mac/io_surface_manager.cc b/ui/gfx/mac/io_surface_manager.cc
index 580196e..9e3e9cf 100644
--- a/ui/gfx/mac/io_surface_manager.cc
+++ b/ui/gfx/mac/io_surface_manager.cc
@@ -5,9 +5,12 @@
 #include "ui/gfx/mac/io_surface_manager.h"
 
 #include <IOSurface/IOSurface.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
+#include "base/macros.h"
 #include "ui/gfx/buffer_format_util.h"
 
 namespace gfx {
@@ -17,13 +20,13 @@ IOSurfaceManager* g_instance = NULL;
 
 void AddIntegerValue(CFMutableDictionaryRef dictionary,
                      const CFStringRef key,
-                     int32 value) {
+                     int32_t value) {
   base::ScopedCFTypeRef<CFNumberRef> number(
       CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
   CFDictionaryAddValue(dictionary, key, number.get());
 }
 
-int32 BytesPerElement(gfx::BufferFormat format, int plane) {
+int32_t BytesPerElement(gfx::BufferFormat format, int plane) {
   switch (format) {
     case gfx::BufferFormat::R_8:
       DCHECK_EQ(plane, 0);
@@ -33,7 +36,7 @@ int32 BytesPerElement(gfx::BufferFormat format, int plane) {
       DCHECK_EQ(plane, 0);
       return 4;
     case gfx::BufferFormat::YUV_420_BIPLANAR:
-      static int32 bytes_per_element[] = {1, 2};
+      static int32_t bytes_per_element[] = {1, 2};
       DCHECK_LT(static_cast<size_t>(plane), arraysize(bytes_per_element));
       return bytes_per_element[plane];
     case gfx::BufferFormat::UYVY_422:
@@ -56,7 +59,7 @@ int32 BytesPerElement(gfx::BufferFormat format, int plane) {
   return 0;
 }
 
-int32 PixelFormat(gfx::BufferFormat format) {
+int32_t PixelFormat(gfx::BufferFormat format) {
   switch (format) {
     case gfx::BufferFormat::R_8:
       return 'L008';
diff --git a/ui/gfx/mac/scoped_cocoa_disable_screen_updates.h b/ui/gfx/mac/scoped_cocoa_disable_screen_updates.h
index 61c9f58..e431ecd 100644
--- a/ui/gfx/mac/scoped_cocoa_disable_screen_updates.h
+++ b/ui/gfx/mac/scoped_cocoa_disable_screen_updates.h
@@ -7,8 +7,8 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/basictypes.h"
 #include "base/mac/mac_util.h"
+#include "base/macros.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/native_pixmap_handle_ozone.h b/ui/gfx/native_pixmap_handle_ozone.h
index 14d5560..149f243 100644
--- a/ui/gfx/native_pixmap_handle_ozone.h
+++ b/ui/gfx/native_pixmap_handle_ozone.h
@@ -5,6 +5,8 @@
 #ifndef UI_GFX_NATIVE_PIXMAP_HANDLE_OZONE_H_
 #define UI_GFX_NATIVE_PIXMAP_HANDLE_OZONE_H_
 
+#include <stdint.h>
+
 #include "base/file_descriptor_posix.h"
 
 namespace gfx {
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
index b39ab51..8297630 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -5,16 +5,16 @@
 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_
 #define UI_GFX_NATIVE_WIDGET_TYPES_H_
 
+#include <stdint.h>
+
+#include "base/logging.h"
 #include "build/build_config.h"
+#include "ui/gfx/gfx_export.h"
 
 #if defined(OS_ANDROID)
 #include <jni.h>
 #endif
 
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "ui/gfx/gfx_export.h"
-
 // This file provides cross platform typedefs for native widget types.
 //   NativeWindow: this is a handle to a native, top-level window
 //   NativeView: this is a handle to a native UI element. It may be the
@@ -203,13 +203,13 @@ typedef intptr_t NativeViewId;
   typedef unsigned long PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #elif defined(OS_ANDROID)
-  typedef uint32 PluginWindowHandle;
+  typedef uint32_t PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #elif defined(USE_OZONE)
   typedef intptr_t PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #else
-  typedef uint32 PluginWindowHandle;
+  typedef uint32_t PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #endif
 
diff --git a/ui/gfx/nine_image_painter.cc b/ui/gfx/nine_image_painter.cc
index cfed62a..1f14f0e 100644
--- a/ui/gfx/nine_image_painter.cc
+++ b/ui/gfx/nine_image_painter.cc
@@ -4,8 +4,11 @@
 
 #include "ui/gfx/nine_image_painter.h"
 
+#include <stddef.h>
+
 #include <limits>
 
+#include "base/macros.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkScalar.h"
@@ -79,12 +82,12 @@ Size NineImagePainter::GetMinimumSize() const {
 
 void NineImagePainter::Paint(Canvas* canvas, const Rect& bounds) {
   // When no alpha value is specified, use default value of 100% opacity.
-  Paint(canvas, bounds, std::numeric_limits<uint8>::max());
+  Paint(canvas, bounds, std::numeric_limits<uint8_t>::max());
 }
 
 void NineImagePainter::Paint(Canvas* canvas,
                              const Rect& bounds,
-                             const uint8 alpha) {
+                             const uint8_t alpha) {
   if (IsEmpty())
     return;
 
diff --git a/ui/gfx/nine_image_painter.h b/ui/gfx/nine_image_painter.h
index 224bada..9a579ed 100644
--- a/ui/gfx/nine_image_painter.h
+++ b/ui/gfx/nine_image_painter.h
@@ -5,10 +5,13 @@
 #ifndef UI_GFX_NINE_IMAGE_PAINTER_H_
 #define UI_GFX_NINE_IMAGE_PAINTER_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/image/image_skia.h"
 
@@ -27,7 +30,7 @@ class GFX_EXPORT NineImagePainter {
   bool IsEmpty() const;
   Size GetMinimumSize() const;
   void Paint(Canvas* canvas, const Rect& bounds);
-  void Paint(Canvas* canvas, const Rect& bounds, uint8 alpha);
+  void Paint(Canvas* canvas, const Rect& bounds, uint8_t alpha);
 
  private:
   friend class NineImagePainterTest;
diff --git a/ui/gfx/paint_throbber.h b/ui/gfx/paint_throbber.h
index c4adab5..adc2f06 100644
--- a/ui/gfx/paint_throbber.h
+++ b/ui/gfx/paint_throbber.h
@@ -5,7 +5,8 @@
 #ifndef UI_GFX_PAINT_THROBBER_H_
 #define UI_GFX_PAINT_THROBBER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/time/time.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/gfx_export.h"
diff --git a/ui/gfx/paint_vector_icon.cc b/ui/gfx/paint_vector_icon.cc
index ef249bc..7121fde 100644
--- a/ui/gfx/paint_vector_icon.cc
+++ b/ui/gfx/paint_vector_icon.cc
@@ -9,6 +9,7 @@
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "third_party/skia/include/core/SkPaint.h"
diff --git a/ui/gfx/paint_vector_icon.h b/ui/gfx/paint_vector_icon.h
index 73650a5..a9adb79 100644
--- a/ui/gfx/paint_vector_icon.h
+++ b/ui/gfx/paint_vector_icon.h
@@ -5,7 +5,8 @@
 #ifndef UI_GFX_PAINT_VECTOR_ICON_H_
 #define UI_GFX_PAINT_VECTOR_ICON_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/image/image_skia.h"
diff --git a/ui/gfx/path.h b/ui/gfx/path.h
index 9ccdc0c..bb00e13 100644
--- a/ui/gfx/path.h
+++ b/ui/gfx/path.h
@@ -5,7 +5,9 @@
 #ifndef UI_GFX_PATH_H_
 #define UI_GFX_PATH_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/ui/gfx/path_win_unittest.cc b/ui/gfx/path_win_unittest.cc
index 1e3395c..ca9e13a 100644
--- a/ui/gfx/path_win_unittest.cc
+++ b/ui/gfx/path_win_unittest.cc
@@ -4,9 +4,12 @@
 
 #include "ui/gfx/path_win.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/win/scoped_gdi_object.h"
 #include "skia/ext/skia_utils_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/gfx/platform_font.h b/ui/gfx/platform_font.h
index a854743..4490779 100644
--- a/ui/gfx/platform_font.h
+++ b/ui/gfx/platform_font.h
@@ -9,6 +9,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
+#include "build/build_config.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 
diff --git a/ui/gfx/platform_font_ios.h b/ui/gfx/platform_font_ios.h
index e42b1f4..fea67ac 100644
--- a/ui/gfx/platform_font_ios.h
+++ b/ui/gfx/platform_font_ios.h
@@ -5,6 +5,7 @@
 #ifndef UI_GFX_PLATFORM_FONT_IOS_H_
 #define UI_GFX_PLATFORM_FONT_IOS_H_
 
+#include "base/macros.h"
 #include "ui/gfx/platform_font.h"
 
 namespace gfx {
diff --git a/ui/gfx/platform_font_ios.mm b/ui/gfx/platform_font_ios.mm
index 676fef0..c6ca541 100644
--- a/ui/gfx/platform_font_ios.mm
+++ b/ui/gfx/platform_font_ios.mm
@@ -8,7 +8,6 @@
 
 #include <cmath>
 
-#include "base/basictypes.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/gfx/font.h"
diff --git a/ui/gfx/platform_font_linux.cc b/ui/gfx/platform_font_linux.cc
index 16a8bbc..d2652a2 100644
--- a/ui/gfx/platform_font_linux.cc
+++ b/ui/gfx/platform_font_linux.cc
@@ -12,6 +12,7 @@
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkString.h"
 #include "third_party/skia/include/core/SkTypeface.h"
diff --git a/ui/gfx/platform_font_linux.h b/ui/gfx/platform_font_linux.h
index dc8cd55..0d8f2af3 100644
--- a/ui/gfx/platform_font_linux.h
+++ b/ui/gfx/platform_font_linux.h
@@ -8,7 +8,9 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/font_render_params.h"
diff --git a/ui/gfx/platform_font_linux_unittest.cc b/ui/gfx/platform_font_linux_unittest.cc
index b729c8e..86216b1 100644
--- a/ui/gfx/platform_font_linux_unittest.cc
+++ b/ui/gfx/platform_font_linux_unittest.cc
@@ -6,7 +6,9 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/font_render_params.h"
diff --git a/ui/gfx/platform_font_mac.h b/ui/gfx/platform_font_mac.h
index 95c0f50..12734ac 100644
--- a/ui/gfx/platform_font_mac.h
+++ b/ui/gfx/platform_font_mac.h
@@ -7,6 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/mac/scoped_nsobject.h"
+#include "base/macros.h"
 #include "ui/gfx/font_render_params.h"
 #include "ui/gfx/platform_font.h"
 
diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm
index 185e9b3..dfe83fc7 100644
--- a/ui/gfx/platform_font_mac.mm
+++ b/ui/gfx/platform_font_mac.mm
@@ -8,7 +8,6 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include "base/basictypes.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/ui/gfx/platform_font_mac_unittest.mm b/ui/gfx/platform_font_mac_unittest.mm
index dd4ba43..d2ae55f 100644
--- a/ui/gfx/platform_font_mac_unittest.mm
+++ b/ui/gfx/platform_font_mac_unittest.mm
@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 #include <Cocoa/Cocoa.h>
+#include <stddef.h>
 
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font.h"
 
diff --git a/ui/gfx/platform_font_win.cc b/ui/gfx/platform_font_win.cc
index 57606b8..894aec2d 100644
--- a/ui/gfx/platform_font_win.cc
+++ b/ui/gfx/platform_font_win.cc
@@ -4,10 +4,11 @@
 
 #include "ui/gfx/platform_font_win.h"
 
+#include <windows.h>
 #include <dwrite.h>
 #include <math.h>
+#include <stdint.h>
 #include <wchar.h>
-#include <windows.h>
 
 #include <algorithm>
 
@@ -189,7 +190,7 @@ HRESULT GetMatchingDirectWriteFont(LOGFONT* font_info,
   //    use that.
   base::win::ScopedComPtr<IDWriteFontFamily> font_family;
   BOOL exists = FALSE;
-  uint32 index = 0;
+  uint32_t index = 0;
   hr = font_collection->FindFamilyName(font_info->lfFaceName, &index, &exists);
   // If we fail to find a match then try fallback to the default font on the
   // system. This is what skia does as well.
@@ -259,7 +260,7 @@ HRESULT GetMatchingDirectWriteFont(LOGFONT* font_info,
   base::win::ScopedComPtr<IDWriteFontList> matching_font_list;
   hr = font_family->GetMatchingFonts(weight, stretch, italic,
                                      matching_font_list.Receive());
-  uint32 matching_font_count = 0;
+  uint32_t matching_font_count = 0;
   if (SUCCEEDED(hr))
     matching_font_count = matching_font_list->GetFontCount();
 
diff --git a/ui/gfx/platform_font_win.h b/ui/gfx/platform_font_win.h
index 825acac..f696453 100644
--- a/ui/gfx/platform_font_win.h
+++ b/ui/gfx/platform_font_win.h
@@ -9,6 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/platform_font.h"
diff --git a/ui/gfx/range/range.h b/ui/gfx/range/range.h
index 6007d754..741b318 100644
--- a/ui/gfx/range/range.h
+++ b/ui/gfx/range/range.h
@@ -5,10 +5,12 @@
 #ifndef UI_GFX_RANGE_RANGE_H_
 #define UI_GFX_RANGE_RANGE_H_
 
+#include <stddef.h>
+
 #include <ostream>
 #include <string>
 
-#include "base/basictypes.h"
+#include "build/build_config.h"
 #include "ui/gfx/gfx_export.h"
 
 #if defined(OS_MACOSX)
diff --git a/ui/gfx/range/range_f.cc b/ui/gfx/range/range_f.cc
index b9dfd7a..665dc8b 100644
--- a/ui/gfx/range/range_f.cc
+++ b/ui/gfx/range/range_f.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/range/range_f.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <cmath>
 #include <limits>
diff --git a/ui/gfx/range/range_f.h b/ui/gfx/range/range_f.h
index f7f9442..0e4185a 100644
--- a/ui/gfx/range/range_f.h
+++ b/ui/gfx/range/range_f.h
@@ -8,7 +8,6 @@
 #include <ostream>
 #include <string>
 
-#include "base/basictypes.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/range/range.h"
 
diff --git a/ui/gfx/range/range_mac.mm b/ui/gfx/range/range_mac.mm
index 3f78fb6..ad7ea6a 100644
--- a/ui/gfx/range/range_mac.mm
+++ b/ui/gfx/range/range_mac.mm
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/range/range.h"
 
+#include <stddef.h>
+
 #include <limits>
 
 #include "base/logging.h"
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc
index ffede9e..00c6bb0 100644
--- a/ui/gfx/render_text.cc
+++ b/ui/gfx/render_text.cc
@@ -14,6 +14,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
 #include "third_party/icu/source/common/unicode/rbbi.h"
 #include "third_party/icu/source/common/unicode/utf16.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
@@ -277,7 +278,7 @@ void SkiaTextRenderer::SetUnderlineMetrics(SkScalar thickness,
 }
 
 void SkiaTextRenderer::DrawPosText(const SkPoint* pos,
-                                   const uint16* glyphs,
+                                   const uint16_t* glyphs,
                                    size_t glyph_count) {
   const size_t byte_length = glyph_count * sizeof(glyphs[0]);
   canvas_skia_->drawPosText(&glyphs[0], byte_length, &pos[0], paint_);
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index 25780a7..522cc4d 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -5,6 +5,9 @@
 #ifndef UI_GFX_RENDER_TEXT_H_
 #define UI_GFX_RENDER_TEXT_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <cstring>
 #include <string>
@@ -13,6 +16,7 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/i18n/rtl.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "skia/ext/refptr.h"
@@ -67,7 +71,7 @@ class GFX_EXPORT SkiaTextRenderer {
   void SetUnderlineMetrics(SkScalar thickness, SkScalar position);
   void DrawSelection(const std::vector<Rect>& selection, SkColor color);
   virtual void DrawPosText(const SkPoint* pos,
-                           const uint16* glyphs,
+                           const uint16_t* glyphs,
                            size_t glyph_count);
   // Draw underline and strike-through text decorations.
   // Based on |SkCanvas::DrawTextDecorations()| and constants from:
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc
index 1cac24f..39fc88c 100644
--- a/ui/gfx/render_text_harfbuzz.cc
+++ b/ui/gfx/render_text_harfbuzz.cc
@@ -10,10 +10,12 @@
 #include "base/i18n/bidi_line_iterator.h"
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/char_iterator.h"
+#include "base/macros.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
 #include "third_party/harfbuzz-ng/src/hb.h"
 #include "third_party/icu/source/common/unicode/ubidi.h"
 #include "third_party/icu/source/common/unicode/utf16.h"
@@ -132,7 +134,7 @@ bool AsciiBreak(UChar32 first_char, UChar32 current_char) {
 size_t FindRunBreakingCharacter(const base::string16& text,
                                 size_t run_start,
                                 size_t run_break) {
-  const int32 run_length = static_cast<int32>(run_break - run_start);
+  const int32_t run_length = static_cast<int32_t>(run_break - run_start);
   base::i18n::UTF16CharIterator iter(text.c_str() + run_start, run_length);
   const UChar32 first_char = iter.get();
   // The newline character should form a single run so that the line breaker
@@ -1266,7 +1268,7 @@ void RenderTextHarfBuzz::ItemizeTextToRuns(
     run->strike = style.style(STRIKE);
     run->diagonal_strike = style.style(DIAGONAL_STRIKE);
     run->underline = style.style(UNDERLINE);
-    int32 script_item_break = 0;
+    int32_t script_item_break = 0;
     bidi_iterator.GetLogicalRun(run_break, &script_item_break, &run->level);
     CHECK_GT(static_cast<size_t>(script_item_break), run_break);
     // Odd BiDi embedding levels correspond to RTL runs.
@@ -1466,7 +1468,7 @@ bool RenderTextHarfBuzz::ShapeRunWithFont(const base::string16& text,
   // buffer holds our text, run information to be used by the shaping engine,
   // and the resulting glyph data.
   hb_buffer_t* buffer = hb_buffer_create();
-  hb_buffer_add_utf16(buffer, reinterpret_cast<const uint16*>(text.c_str()),
+  hb_buffer_add_utf16(buffer, reinterpret_cast<const uint16_t*>(text.c_str()),
                       text.length(), run->range.start(), run->range.length());
   hb_buffer_set_script(buffer, ICUScriptToHBScript(run->script));
   hb_buffer_set_direction(buffer,
@@ -1490,14 +1492,14 @@ bool RenderTextHarfBuzz::ShapeRunWithFont(const base::string16& text,
   run->glyph_count = glyph_count;
   hb_glyph_position_t* hb_positions =
       hb_buffer_get_glyph_positions(buffer, NULL);
-  run->glyphs.reset(new uint16[run->glyph_count]);
+  run->glyphs.reset(new uint16_t[run->glyph_count]);
   run->glyph_to_char.resize(run->glyph_count);
   run->positions.reset(new SkPoint[run->glyph_count]);
   run->width = 0.0f;
 
   for (size_t i = 0; i < run->glyph_count; ++i) {
-    DCHECK_LE(infos[i].codepoint, std::numeric_limits<uint16>::max());
-    run->glyphs[i] = static_cast<uint16>(infos[i].codepoint);
+    DCHECK_LE(infos[i].codepoint, std::numeric_limits<uint16_t>::max());
+    run->glyphs[i] = static_cast<uint16_t>(infos[i].codepoint);
     run->glyph_to_char[i] = infos[i].cluster;
     const SkScalar x_offset = SkFixedToScalar(hb_positions[i].x_offset);
     const SkScalar y_offset = SkFixedToScalar(hb_positions[i].y_offset);
diff --git a/ui/gfx/render_text_harfbuzz.h b/ui/gfx/render_text_harfbuzz.h
index ffcba39..e91effe 100644
--- a/ui/gfx/render_text_harfbuzz.h
+++ b/ui/gfx/render_text_harfbuzz.h
@@ -5,7 +5,11 @@
 #ifndef UI_GFX_RENDER_TEXT_HARFBUZZ_H_
 #define UI_GFX_RENDER_TEXT_HARFBUZZ_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "third_party/harfbuzz-ng/src/hb.h"
@@ -63,9 +67,9 @@ struct GFX_EXPORT TextRunHarfBuzz {
   UBiDiLevel level;
   UScriptCode script;
 
-  scoped_ptr<uint16[]> glyphs;
+  scoped_ptr<uint16_t[]> glyphs;
   scoped_ptr<SkPoint[]> positions;
-  std::vector<uint32> glyph_to_char;
+  std::vector<uint32_t> glyph_to_char;
   size_t glyph_count;
 
   Font font;
diff --git a/ui/gfx/render_text_mac.h b/ui/gfx/render_text_mac.h
index f45700f..042029a 100644
--- a/ui/gfx/render_text_mac.h
+++ b/ui/gfx/render_text_mac.h
@@ -6,12 +6,15 @@
 #define UI_GFX_RENDER_TEXT_MAC_H_
 
 #include <ApplicationServices/ApplicationServices.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/mac/scoped_cftyperef.h"
+#include "base/macros.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/render_text.h"
 
@@ -62,7 +65,7 @@ class GFX_EXPORT RenderTextMac : public RenderText {
   struct TextRun {
     CTRunRef ct_run;
     SkPoint origin;
-    std::vector<uint16> glyphs;
+    std::vector<uint16_t> glyphs;
     std::vector<SkPoint> glyph_positions;
     SkScalar width;
     Font font;
diff --git a/ui/gfx/render_text_mac.mm b/ui/gfx/render_text_mac.mm
index d9a73fa..3a6d01b 100644
--- a/ui/gfx/render_text_mac.mm
+++ b/ui/gfx/render_text_mac.mm
@@ -4,8 +4,8 @@
 
 #include "ui/gfx/render_text_mac.h"
 
-#include <ApplicationServices/ApplicationServices.h>
 #import <AppKit/AppKit.h>
+#include <ApplicationServices/ApplicationServices.h>
 #include <CoreText/CoreText.h>
 
 #include <algorithm>
@@ -15,6 +15,7 @@
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
+#include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/ports/SkTypeface_mac.h"
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 5750f19..b24c1be 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -4,15 +4,20 @@
 
 #include "ui/gfx/render_text.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/format_macros.h"
 #include "base/i18n/break_iterator.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 "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/break_list.h"
@@ -156,7 +161,7 @@ class TestSkiaTextRenderer : public internal::SkiaTextRenderer {
  private:
   // internal::SkiaTextRenderer:
   void DrawPosText(const SkPoint* pos,
-                   const uint16* glyphs,
+                   const uint16_t* glyphs,
                    size_t glyph_count) override {
     TextLog log_entry;
     log_entry.glyph_count = glyph_count;
@@ -2613,7 +2618,7 @@ TEST_F(RenderTextTest, HarfBuzz_HorizontalPositions) {
 // Test TextRunHarfBuzz's cluster finding logic.
 TEST_F(RenderTextTest, HarfBuzz_Clusters) {
   struct {
-    uint32 glyph_to_char[4];
+    uint32_t glyph_to_char[4];
     Range chars[4];
     Range glyphs[4];
     bool is_rtl;
@@ -2701,7 +2706,7 @@ TEST_F(RenderTextTest, HarfBuzz_SubglyphGraphemeCases) {
 // Test the partition of a multi-grapheme cluster into grapheme ranges.
 TEST_F(RenderTextTest, HarfBuzz_SubglyphGraphemePartition) {
   struct {
-    uint32 glyph_to_char[2];
+    uint32_t glyph_to_char[2];
     Range bounds[4];
     bool is_rtl;
   } cases[] = {
@@ -3035,8 +3040,8 @@ TEST_F(RenderTextTest, TextDoesntClip) {
 
     render_text->Draw(&canvas);
     ASSERT_LT(string_size.width() + kTestSize, kCanvasSize.width());
-    const uint32* buffer =
-        static_cast<const uint32*>(surface->peekPixels(nullptr, nullptr));
+    const uint32_t* buffer =
+        static_cast<const uint32_t*>(surface->peekPixels(nullptr, nullptr));
     ASSERT_NE(nullptr, buffer);
     TestRectangleBuffer rect_buffer(string, buffer, kCanvasSize.width(),
                                     kCanvasSize.height());
@@ -3111,8 +3116,8 @@ TEST_F(RenderTextTest, TextDoesClip) {
     render_text->set_clip_to_display_rect(true);
     render_text->Draw(&canvas);
     ASSERT_LT(string_size.width() + kTestSize, kCanvasSize.width());
-    const uint32* buffer =
-        static_cast<const uint32*>(surface->peekPixels(nullptr, nullptr));
+    const uint32_t* buffer =
+        static_cast<const uint32_t*>(surface->peekPixels(nullptr, nullptr));
     ASSERT_NE(nullptr, buffer);
     TestRectangleBuffer rect_buffer(string, buffer, kCanvasSize.width(),
                                     kCanvasSize.height());
diff --git a/ui/gfx/scoped_canvas.h b/ui/gfx/scoped_canvas.h
index 7701f7c..4a260bf 100644
--- a/ui/gfx/scoped_canvas.h
+++ b/ui/gfx/scoped_canvas.h
@@ -5,6 +5,7 @@
 #ifndef UI_GFX_SCOPED_CANVAS_H_
 #define UI_GFX_SCOPED_CANVAS_H_
 
+#include "base/macros.h"
 #include "ui/gfx/canvas.h"
 
 namespace gfx {
diff --git a/ui/gfx/scoped_cg_context_save_gstate_mac.h b/ui/gfx/scoped_cg_context_save_gstate_mac.h
index b22782d..169bf7e 100644
--- a/ui/gfx/scoped_cg_context_save_gstate_mac.h
+++ b/ui/gfx/scoped_cg_context_save_gstate_mac.h
@@ -7,6 +7,8 @@
 
 #import <QuartzCore/QuartzCore.h>
 
+#include "base/macros.h"
+
 namespace gfx {
 
 class ScopedCGContextSaveGState {
diff --git a/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h b/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h
index d305576..f099cfb 100644
--- a/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h
+++ b/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_SCOPED_NS_GRAPHICS_CONTEXT_SAVE_GSTATE_MAC_H_
 #define UI_GFX_SCOPED_NS_GRAPHICS_CONTEXT_SAVE_GSTATE_MAC_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/gfx/gfx_export.h"
 
 #if defined(__OBJC__)
diff --git a/ui/gfx/scoped_sk_region.h b/ui/gfx/scoped_sk_region.h
index 077b749..c635fec 100644
--- a/ui/gfx/scoped_sk_region.h
+++ b/ui/gfx/scoped_sk_region.h
@@ -5,6 +5,7 @@
 #ifndef UI_GFX_SCOPED_SK_REGION_H_
 #define UI_GFX_SCOPED_SK_REGION_H_
 
+#include "base/macros.h"
 #include "third_party/skia/include/core/SkRegion.h"
 
 namespace gfx {
diff --git a/ui/gfx/scoped_ui_graphics_push_context_ios.h b/ui/gfx/scoped_ui_graphics_push_context_ios.h
index 0e5455d..65bc4f3 100644
--- a/ui/gfx/scoped_ui_graphics_push_context_ios.h
+++ b/ui/gfx/scoped_ui_graphics_push_context_ios.h
@@ -7,7 +7,7 @@
 
 #import <QuartzCore/QuartzCore.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/screen.h b/ui/gfx/screen.h
index 2865274..107ee44 100644
--- a/ui/gfx/screen.h
+++ b/ui/gfx/screen.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/gfx_export.h"
diff --git a/ui/gfx/screen_android.cc b/ui/gfx/screen_android.cc
index 2459079..41099f1 100644
--- a/ui/gfx/screen_android.cc
+++ b/ui/gfx/screen_android.cc
@@ -5,6 +5,7 @@
 #include "ui/gfx/screen.h"
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/size_conversions.h"
diff --git a/ui/gfx/screen_mac.mm b/ui/gfx/screen_mac.mm
index e23feed..6fb7c6e 100644
--- a/ui/gfx/screen_mac.mm
+++ b/ui/gfx/screen_mac.mm
@@ -6,11 +6,13 @@
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
+#include <stdint.h>
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/mac/sdk_forward_declarations.h"
+#include "base/macros.h"
 #include "base/timer/timer.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/display_change_notifier.h"
@@ -19,7 +21,7 @@ namespace {
 
 // The delay to handle the display configuration changes.
 // See comments in ScreenMac::HandleDisplayReconfiguration.
-const int64 kConfigureDelayMs = 500;
+const int64_t kConfigureDelayMs = 500;
 
 gfx::Rect ConvertCoordinateSystem(NSRect ns_rect) {
   // Primary monitor is defined as the monitor with the menubar,
@@ -225,12 +227,12 @@ class ScreenMac : public gfx::Screen {
       return std::vector<gfx::Display>(1, GetPrimaryDisplay());
     }
 
-    typedef std::map<int64, NSScreen*> ScreenIdsToScreensMap;
+    typedef std::map<int64_t, NSScreen*> ScreenIdsToScreensMap;
     ScreenIdsToScreensMap screen_ids_to_screens;
     for (NSScreen* screen in [NSScreen screens]) {
       NSDictionary* screen_device_description = [screen deviceDescription];
-      int64 screen_id = [[screen_device_description
-        objectForKey:@"NSScreenNumber"] unsignedIntValue];
+      int64_t screen_id = [[screen_device_description
+          objectForKey:@"NSScreenNumber"] unsignedIntValue];
       screen_ids_to_screens[screen_id] = screen;
     }
 
diff --git a/ui/gfx/screen_type_delegate.h b/ui/gfx/screen_type_delegate.h
index 245de1b..03dad8f 100644
--- a/ui/gfx/screen_type_delegate.h
+++ b/ui/gfx/screen_type_delegate.h
@@ -5,6 +5,7 @@
 #ifndef UI_GFX_SCREEN_TYPE_DELEGATE_H_
 #define UI_GFX_SCREEN_TYPE_DELEGATE_H_
 
+#include "build/build_config.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
diff --git a/ui/gfx/screen_win.cc b/ui/gfx/screen_win.cc
index 2768ce7..3199f7a 100644
--- a/ui/gfx/screen_win.cc
+++ b/ui/gfx/screen_win.cc
@@ -5,6 +5,7 @@
 #include "ui/gfx/screen_win.h"
 
 #include <windows.h>
+#include <stdint.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -26,8 +27,8 @@ MONITORINFOEX GetMonitorInfoForMonitor(HMONITOR monitor) {
 }
 
 gfx::Display GetDisplay(const MONITORINFOEX& monitor_info) {
-  int64 id = static_cast<int64>(
-      base::Hash(base::WideToUTF8(monitor_info.szDevice)));
+  int64_t id =
+      static_cast<int64_t>(base::Hash(base::WideToUTF8(monitor_info.szDevice)));
   gfx::Rect bounds = gfx::Rect(monitor_info.rcMonitor);
   gfx::Display display(id);
   display.set_bounds(gfx::win::ScreenToDIPRect(bounds));
diff --git a/ui/gfx/screen_win.h b/ui/gfx/screen_win.h
index 2da91ed..b1488ae 100644
--- a/ui/gfx/screen_win.h
+++ b/ui/gfx/screen_win.h
@@ -7,6 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/display_change_notifier.h"
 #include "ui/gfx/gfx_export.h"
diff --git a/ui/gfx/screen_win_unittest.cc b/ui/gfx/screen_win_unittest.cc
index 7d14fe0..b1118c1 100644
--- a/ui/gfx/screen_win_unittest.cc
+++ b/ui/gfx/screen_win_unittest.cc
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include <windows.h>
+#include <stddef.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/display.h"
diff --git a/ui/gfx/scrollbar_size.cc b/ui/gfx/scrollbar_size.cc
index d58fd95..040adec 100644
--- a/ui/gfx/scrollbar_size.cc
+++ b/ui/gfx/scrollbar_size.cc
@@ -5,6 +5,7 @@
 #include "ui/gfx/scrollbar_size.h"
 
 #include "base/compiler_specific.h"
+#include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
diff --git a/ui/gfx/selection_model.h b/ui/gfx/selection_model.h
index 356416d..87a7a2d 100644
--- a/ui/gfx/selection_model.h
+++ b/ui/gfx/selection_model.h
@@ -5,6 +5,8 @@
 #ifndef UI_GFX_SELECTION_MODEL_H_
 #define UI_GFX_SELECTION_MODEL_H_
 
+#include <stddef.h>
+
 #include <string>
 
 #include "ui/gfx/gfx_export.h"
diff --git a/ui/gfx/sequential_id_generator.cc b/ui/gfx/sequential_id_generator.cc
index 4b9c8de..cdfc62c5b 100644
--- a/ui/gfx/sequential_id_generator.cc
+++ b/ui/gfx/sequential_id_generator.cc
@@ -9,13 +9,13 @@
 namespace {
 
 // Removes |key| from |first|, and |first[key]| from |second|.
-template<typename T>
-void Remove(uint32 key, T* first, T* second) {
+template <typename T>
+void Remove(uint32_t key, T* first, T* second) {
   typename T::iterator iter = first->find(key);
   if (iter == first->end())
     return;
 
-  uint32 second_key = iter->second;
+  uint32_t second_key = iter->second;
   first->erase(iter);
 
   iter = second->find(second_key);
@@ -27,15 +27,13 @@ void Remove(uint32 key, T* first, T* second) {
 
 namespace ui {
 
-SequentialIDGenerator::SequentialIDGenerator(uint32 min_id)
-    : min_id_(min_id),
-      min_available_id_(min_id) {
-}
+SequentialIDGenerator::SequentialIDGenerator(uint32_t min_id)
+    : min_id_(min_id), min_available_id_(min_id) {}
 
 SequentialIDGenerator::~SequentialIDGenerator() {
 }
 
-uint32 SequentialIDGenerator::GetGeneratedID(uint32 number) {
+uint32_t SequentialIDGenerator::GetGeneratedID(uint32_t number) {
   IDMap::iterator find = number_to_id_.find(number);
   if (find != number_to_id_.end())
     return find->second;
@@ -46,16 +44,16 @@ uint32 SequentialIDGenerator::GetGeneratedID(uint32 number) {
   return id;
 }
 
-bool SequentialIDGenerator::HasGeneratedIDFor(uint32 number) const {
+bool SequentialIDGenerator::HasGeneratedIDFor(uint32_t number) const {
   return number_to_id_.find(number) != number_to_id_.end();
 }
 
-void SequentialIDGenerator::ReleaseGeneratedID(uint32 id) {
+void SequentialIDGenerator::ReleaseGeneratedID(uint32_t id) {
   UpdateNextAvailableIDAfterRelease(id);
   Remove(id, &id_to_number_, &number_to_id_);
 }
 
-void SequentialIDGenerator::ReleaseNumber(uint32 number) {
+void SequentialIDGenerator::ReleaseNumber(uint32_t number) {
   DCHECK_GT(number_to_id_.count(number), 0U);
   UpdateNextAvailableIDAfterRelease(number_to_id_[number]);
   Remove(number, &number_to_id_, &id_to_number_);
@@ -67,8 +65,8 @@ void SequentialIDGenerator::ResetForTest() {
   min_available_id_ = min_id_;
 }
 
-uint32 SequentialIDGenerator::GetNextAvailableID() {
-  const uint32 kMaxID = 128;
+uint32_t SequentialIDGenerator::GetNextAvailableID() {
+  const uint32_t kMaxID = 128;
   while (id_to_number_.count(min_available_id_) > 0 &&
          min_available_id_ < kMaxID) {
     ++min_available_id_;
@@ -78,7 +76,7 @@ uint32 SequentialIDGenerator::GetNextAvailableID() {
   return min_available_id_;
 }
 
-void SequentialIDGenerator::UpdateNextAvailableIDAfterRelease(uint32 id) {
+void SequentialIDGenerator::UpdateNextAvailableIDAfterRelease(uint32_t id) {
   if (id < min_available_id_) {
     min_available_id_ = id;
     DCHECK_GE(min_available_id_, min_id_);
diff --git a/ui/gfx/sequential_id_generator.h b/ui/gfx/sequential_id_generator.h
index bde2f58..53c3685 100644
--- a/ui/gfx/sequential_id_generator.h
+++ b/ui/gfx/sequential_id_generator.h
@@ -5,10 +5,12 @@
 #ifndef UI_GFX_SEQUENTIAL_ID_GENERATOR_H_
 #define UI_GFX_SEQUENTIAL_ID_GENERATOR_H_
 
+#include <stdint.h>
+
 #include <map>
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace ui {
@@ -18,41 +20,41 @@ namespace ui {
 class GFX_EXPORT SequentialIDGenerator {
  public:
    // Creates a new generator with the specified lower bound for the IDs.
-  explicit SequentialIDGenerator(uint32 min_id);
+  explicit SequentialIDGenerator(uint32_t min_id);
   ~SequentialIDGenerator();
 
   // Generates a unique ID to represent |number|. The generated ID is the
   // smallest available ID greater than or equal to the |min_id| specified
   // during creation of the generator.
-  uint32 GetGeneratedID(uint32 number);
+  uint32_t GetGeneratedID(uint32_t number);
 
   // Checks to see if the generator currently has a unique ID generated for
   // |number|.
-  bool HasGeneratedIDFor(uint32 number) const;
+  bool HasGeneratedIDFor(uint32_t number) const;
 
   // Removes the generated ID |id| from the internal mapping. Since the ID is
   // no longer mapped to any number, subsequent calls to |GetGeneratedID()| can
   // use this ID.
-  void ReleaseGeneratedID(uint32 id);
+  void ReleaseGeneratedID(uint32_t id);
 
   // Removes the ID previously generated for |number| by calling
   // |GetGeneratedID()|.
-  void ReleaseNumber(uint32 number);
+  void ReleaseNumber(uint32_t number);
 
   void ResetForTest();
 
  private:
-  typedef base::hash_map<uint32, uint32> IDMap;
+  typedef base::hash_map<uint32_t, uint32_t> IDMap;
 
-  uint32 GetNextAvailableID();
+  uint32_t GetNextAvailableID();
 
-  void UpdateNextAvailableIDAfterRelease(uint32 id);
+  void UpdateNextAvailableIDAfterRelease(uint32_t id);
 
   IDMap number_to_id_;
   IDMap id_to_number_;
 
-  const uint32 min_id_;
-  uint32 min_available_id_;
+  const uint32_t min_id_;
+  uint32_t min_available_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SequentialIDGenerator);
 };
diff --git a/ui/gfx/sequential_id_generator_unittest.cc b/ui/gfx/sequential_id_generator_unittest.cc
index 7a07f90..ee0aac6 100644
--- a/ui/gfx/sequential_id_generator_unittest.cc
+++ b/ui/gfx/sequential_id_generator_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/sequential_id_generator.h"
 
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -12,7 +14,7 @@ namespace ui {
 typedef testing::Test SequentialIDGeneratorTest;
 
 TEST(SequentialIDGeneratorTest, AddRemove) {
-  const uint32 kMinID = 2;
+  const uint32_t kMinID = 2;
   SequentialIDGenerator generator(kMinID);
 
   EXPECT_EQ(2U, generator.GetGeneratedID(45));
@@ -39,7 +41,7 @@ TEST(SequentialIDGeneratorTest, AddRemove) {
 }
 
 TEST(SequentialIDGeneratorTest, RemoveMultipleNumbers) {
-  const uint32 kMinID = 4;
+  const uint32_t kMinID = 4;
   SequentialIDGenerator generator(kMinID);
 
   EXPECT_EQ(4U, generator.GetGeneratedID(45));
diff --git a/ui/gfx/shadow_value.cc b/ui/gfx/shadow_value.cc
index 7e31057..2599fdb 100644
--- a/ui/gfx/shadow_value.cc
+++ b/ui/gfx/shadow_value.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/shadow_value.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/strings/stringprintf.h"
diff --git a/ui/gfx/shadow_value_unittest.cc b/ui/gfx/shadow_value_unittest.cc
index 8caec8a..fb065b8 100644
--- a/ui/gfx/shadow_value_unittest.cc
+++ b/ui/gfx/shadow_value_unittest.cc
@@ -2,7 +2,9 @@
 // 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 <stddef.h>
+
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/vector2d.h"
diff --git a/ui/gfx/skbitmap_operations.cc b/ui/gfx/skbitmap_operations.cc
index 7d16bff..3865916 100644
--- a/ui/gfx/skbitmap_operations.cc
+++ b/ui/gfx/skbitmap_operations.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/skbitmap_operations.h"
 
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 #include <algorithm>
 
@@ -29,11 +31,11 @@ SkBitmap SkBitmapOperations::CreateInvertedBitmap(const SkBitmap& image) {
   inverted.allocN32Pixels(image.width(), image.height());
 
   for (int y = 0; y < image.height(); ++y) {
-    uint32* image_row = image.getAddr32(0, y);
-    uint32* dst_row = inverted.getAddr32(0, y);
+    uint32_t* image_row = image.getAddr32(0, y);
+    uint32_t* dst_row = inverted.getAddr32(0, y);
 
     for (int x = 0; x < image.width(); ++x) {
-      uint32 image_pixel = image_row[x];
+      uint32_t image_pixel = image_row[x];
       dst_row[x] = (image_pixel & 0xFF000000) |
                    (0x00FFFFFF - (image_pixel & 0x00FFFFFF));
     }
@@ -69,13 +71,13 @@ SkBitmap SkBitmapOperations::CreateBlendedBitmap(const SkBitmap& first,
   double first_alpha = 1 - alpha;
 
   for (int y = 0; y < first.height(); ++y) {
-    uint32* first_row = first.getAddr32(0, y);
-    uint32* second_row = second.getAddr32(0, y);
-    uint32* dst_row = blended.getAddr32(0, y);
+    uint32_t* first_row = first.getAddr32(0, y);
+    uint32_t* second_row = second.getAddr32(0, y);
+    uint32_t* dst_row = blended.getAddr32(0, y);
 
     for (int x = 0; x < first.width(); ++x) {
-      uint32 first_pixel = first_row[x];
-      uint32 second_pixel = second_row[x];
+      uint32_t first_pixel = first_row[x];
+      uint32_t second_pixel = second_row[x];
 
       int a = static_cast<int>((SkColorGetA(first_pixel) * first_alpha) +
                                (SkColorGetA(second_pixel) * alpha));
@@ -110,9 +112,9 @@ SkBitmap SkBitmapOperations::CreateMaskedBitmap(const SkBitmap& rgb,
   SkAutoLockPixels lock_masked(masked);
 
   for (int y = 0; y < masked.height(); ++y) {
-    uint32* rgb_row = rgb.getAddr32(0, y);
-    uint32* alpha_row = alpha.getAddr32(0, y);
-    uint32* dst_row = masked.getAddr32(0, y);
+    uint32_t* rgb_row = rgb.getAddr32(0, y);
+    uint32_t* alpha_row = alpha.getAddr32(0, y);
+    uint32_t* dst_row = masked.getAddr32(0, y);
 
     for (int x = 0; x < masked.width(); ++x) {
       unsigned alpha = SkGetPackedA32(alpha_row[x]);
@@ -144,12 +146,12 @@ SkBitmap SkBitmapOperations::CreateButtonBackground(SkColor color,
   SkAutoLockPixels lock_background(background);
 
   for (int y = 0; y < mask.height(); ++y) {
-    uint32* dst_row = background.getAddr32(0, y);
-    uint32* image_row = image.getAddr32(0, y % image.height());
-    uint32* mask_row = mask.getAddr32(0, y);
+    uint32_t* dst_row = background.getAddr32(0, y);
+    uint32_t* image_row = image.getAddr32(0, y % image.height());
+    uint32_t* mask_row = mask.getAddr32(0, y);
 
     for (int x = 0; x < mask.width(); ++x) {
-      uint32 image_pixel = image_row[x % image.width()];
+      uint32_t image_pixel = image_row[x % image.width()];
 
       double img_a = SkColorGetA(image_pixel);
       double img_r = SkColorGetR(image_pixel);
@@ -545,8 +547,8 @@ SkBitmap SkBitmapOperations::CreateTiledBitmap(const SkBitmap& source,
     while (y_pix < 0)
       y_pix += source.height();
 
-    uint32* source_row = source.getAddr32(0, y_pix);
-    uint32* dst_row = cropped.getAddr32(0, y);
+    uint32_t* source_row = source.getAddr32(0, y_pix);
+    uint32_t* dst_row = cropped.getAddr32(0, y);
 
     for (int x = 0; x < dst_w; ++x) {
       int x_pix = (src_x + x) % source.width();
@@ -659,8 +661,8 @@ SkBitmap SkBitmapOperations::UnPreMultiply(const SkBitmap& bitmap) {
     SkAutoLockPixels opaque_bitmap_lock(opaque_bitmap);
     for (int y = 0; y < opaque_bitmap.height(); y++) {
       for (int x = 0; x < opaque_bitmap.width(); x++) {
-        uint32 src_pixel = *bitmap.getAddr32(x, y);
-        uint32* dst_pixel = opaque_bitmap.getAddr32(x, y);
+        uint32_t src_pixel = *bitmap.getAddr32(x, y);
+        uint32_t* dst_pixel = opaque_bitmap.getAddr32(x, y);
         SkColor unmultiplied = SkUnPreMultiply::PMColorToColor(src_pixel);
         *dst_pixel = unmultiplied;
       }
@@ -681,9 +683,9 @@ SkBitmap SkBitmapOperations::CreateTransposedBitmap(const SkBitmap& image) {
   SkAutoLockPixels lock_transposed(transposed);
 
   for (int y = 0; y < image.height(); ++y) {
-    uint32* image_row = image.getAddr32(0, y);
+    uint32_t* image_row = image.getAddr32(0, y);
     for (int x = 0; x < image.width(); ++x) {
-      uint32* dst = transposed.getAddr32(y, x);
+      uint32_t* dst = transposed.getAddr32(y, x);
       *dst = image_row[x];
     }
   }
diff --git a/ui/gfx/skbitmap_operations_unittest.cc b/ui/gfx/skbitmap_operations_unittest.cc
index ea431fb..d41747b 100644
--- a/ui/gfx/skbitmap_operations_unittest.cc
+++ b/ui/gfx/skbitmap_operations_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/skbitmap_operations.h"
 
+#include <stdint.h>
+
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
diff --git a/ui/gfx/skia_util.cc b/ui/gfx/skia_util.cc
index d3a1ac8..c1e6c18 100644
--- a/ui/gfx/skia_util.cc
+++ b/ui/gfx/skia_util.cc
@@ -4,6 +4,9 @@
 
 #include "ui/gfx/skia_util.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
diff --git a/ui/gfx/skrect_conversion_unittest.cc b/ui/gfx/skrect_conversion_unittest.cc
index ef116c2..7fe0c83 100644
--- a/ui/gfx/skrect_conversion_unittest.cc
+++ b/ui/gfx/skrect_conversion_unittest.cc
@@ -2,7 +2,6 @@
 // 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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/skia_util.h"
diff --git a/ui/gfx/switches.cc b/ui/gfx/switches.cc
index 6e7147e..773ef5c 100644
--- a/ui/gfx/switches.cc
+++ b/ui/gfx/switches.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 "build/build_config.h"
 #include "ui/gfx/switches.h"
 
 namespace switches {
diff --git a/ui/gfx/sys_color_change_listener.cc b/ui/gfx/sys_color_change_listener.cc
index a6a6933..a814096 100644
--- a/ui/gfx/sys_color_change_listener.cc
+++ b/ui/gfx/sys_color_change_listener.cc
@@ -6,7 +6,6 @@
 
 #include <windows.h>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/ui/gfx/test/fontconfig_util_linux.cc b/ui/gfx/test/fontconfig_util_linux.cc
index 609a3fc..3c62bd1 100644
--- a/ui/gfx/test/fontconfig_util_linux.cc
+++ b/ui/gfx/test/fontconfig_util_linux.cc
@@ -8,6 +8,7 @@
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 
diff --git a/ui/gfx/test/fontconfig_util_linux.h b/ui/gfx/test/fontconfig_util_linux.h
index 688c780..e2a7630 100644
--- a/ui/gfx/test/fontconfig_util_linux.h
+++ b/ui/gfx/test/fontconfig_util_linux.h
@@ -5,6 +5,8 @@
 #ifndef UI_GFX_TEST_FONTCONFIG_UTIL_LINUX_H_
 #define UI_GFX_TEST_FONTCONFIG_UTIL_LINUX_H_
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/files/file_path.h"
diff --git a/ui/gfx/test/run_all_unittests.cc b/ui/gfx/test/run_all_unittests.cc
index 97572c2..239c944 100644
--- a/ui/gfx/test/run_all_unittests.cc
+++ b/ui/gfx/test/run_all_unittests.cc
@@ -8,6 +8,7 @@
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
diff --git a/ui/gfx/text_elider.cc b/ui/gfx/text_elider.cc
index cac4fa0..82baf44 100644
--- a/ui/gfx/text_elider.cc
+++ b/ui/gfx/text_elider.cc
@@ -18,11 +18,13 @@
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/char_iterator.h"
 #include "base/i18n/rtl.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/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "third_party/icu/source/common/unicode/rbbi.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "third_party/icu/source/common/unicode/umachine.h"
diff --git a/ui/gfx/text_elider.h b/ui/gfx/text_elider.h
index 4e58a9f..63f84c9 100644
--- a/ui/gfx/text_elider.h
+++ b/ui/gfx/text_elider.h
@@ -7,10 +7,12 @@
 #ifndef UI_GFX_TEXT_ELIDER_H_
 #define UI_GFX_TEXT_ELIDER_H_
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/text_constants.h"
diff --git a/ui/gfx/text_elider_unittest.cc b/ui/gfx/text_elider_unittest.cc
index 2fbe45e..ce8c2f0 100644
--- a/ui/gfx/text_elider_unittest.cc
+++ b/ui/gfx/text_elider_unittest.cc
@@ -6,13 +6,17 @@
 
 #include "ui/gfx/text_elider.h"
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/font_list.h"
diff --git a/ui/gfx/text_utils.cc b/ui/gfx/text_utils.cc
index c62b88b..9dbc32b 100644
--- a/ui/gfx/text_utils.cc
+++ b/ui/gfx/text_utils.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/text_utils.h"
 
+#include <stdint.h>
+
 #include "base/i18n/char_iterator.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
@@ -44,7 +46,7 @@ base::string16 RemoveAcceleratorChar(const base::string16& s,
 
   accelerator_removed.reserve(s.size());
   while (!chars.end()) {
-    int32 c = chars.get();
+    int32_t c = chars.get();
     int array_pos = chars.array_pos();
     chars.Advance();
 
diff --git a/ui/gfx/text_utils.h b/ui/gfx/text_utils.h
index 193baf0..7f7ef7f 100644
--- a/ui/gfx/text_utils.h
+++ b/ui/gfx/text_utils.h
@@ -5,6 +5,8 @@
 #ifndef UI_GFX_TEXT_UTILS_H_
 #define UI_GFX_TEXT_UTILS_H_
 
+#include <stddef.h>
+
 #include "base/strings/string16.h"
 #include "ui/gfx/gfx_export.h"
 
diff --git a/ui/gfx/text_utils_unittest.cc b/ui/gfx/text_utils_unittest.cc
index 557fe52..567cda9 100644
--- a/ui/gfx/text_utils_unittest.cc
+++ b/ui/gfx/text_utils_unittest.cc
@@ -4,7 +4,11 @@
 
 #include "ui/gfx/text_utils.h"
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font_list.h"
 
diff --git a/ui/gfx/transform_unittest.cc b/ui/gfx/transform_unittest.cc
index 2d881bc..7482b4b 100644
--- a/ui/gfx/transform_unittest.cc
+++ b/ui/gfx/transform_unittest.cc
@@ -7,12 +7,14 @@
 
 #include "ui/gfx/transform.h"
 
+#include <stddef.h>
+
 #include <cmath>
-#include <ostream>
 #include <limits>
+#include <ostream>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/box_f.h"
 #include "ui/gfx/geometry/point.h"
diff --git a/ui/gfx/transform_util_unittest.cc b/ui/gfx/transform_util_unittest.cc
index 76847a6..907f8a8 100644
--- a/ui/gfx/transform_util_unittest.cc
+++ b/ui/gfx/transform_util_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/transform_util.h"
 
+#include <stddef.h>
+
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point3_f.h"
diff --git a/ui/gfx/utf16_indexing.h b/ui/gfx/utf16_indexing.h
index 4c2b2c1..779109d 100644
--- a/ui/gfx/utf16_indexing.h
+++ b/ui/gfx/utf16_indexing.h
@@ -5,6 +5,8 @@
 #ifndef UI_GFX_UTF16_INDEXING_H_
 #define UI_GFX_UTF16_INDEXING_H_
 
+#include <stddef.h>
+
 #include "base/strings/string16.h"
 #include "ui/gfx/gfx_export.h"
 
diff --git a/ui/gfx/utf16_indexing_unittest.cc b/ui/gfx/utf16_indexing_unittest.cc
index f93d669..55ef3cb 100644
--- a/ui/gfx/utf16_indexing_unittest.cc
+++ b/ui/gfx/utf16_indexing_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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/utf16_indexing.h"
 
diff --git a/ui/gfx/win/direct_manipulation.cc b/ui/gfx/win/direct_manipulation.cc
index 9acd334..c35de0c 100644
--- a/ui/gfx/win/direct_manipulation.cc
+++ b/ui/gfx/win/direct_manipulation.cc
@@ -4,7 +4,6 @@
 
 #include "ui/gfx/win/direct_manipulation.h"
 
-#include "base/basictypes.h"
 #include "base/win/windows_version.h"
 
 namespace gfx {
diff --git a/ui/gfx/win/direct_manipulation.h b/ui/gfx/win/direct_manipulation.h
index a6bcc45..43423b2 100644
--- a/ui/gfx/win/direct_manipulation.h
+++ b/ui/gfx/win/direct_manipulation.h
@@ -7,6 +7,7 @@
 
 #include <directmanipulation.h>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_comptr.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/ui/gfx/win/direct_write.cc b/ui/gfx/win/direct_write.cc
index 9c8250b..603d776 100644
--- a/ui/gfx/win/direct_write.cc
+++ b/ui/gfx/win/direct_write.cc
@@ -4,7 +4,6 @@
 
 #include "ui/gfx/win/direct_write.h"
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/win/registry.h"
diff --git a/ui/gfx/win/scoped_set_map_mode.h b/ui/gfx/win/scoped_set_map_mode.h
index 910837d..253eca8 100644
--- a/ui/gfx/win/scoped_set_map_mode.h
+++ b/ui/gfx/win/scoped_set_map_mode.h
@@ -7,8 +7,8 @@
 
 #include <windows.h>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/win/singleton_hwnd.h b/ui/gfx/win/singleton_hwnd.h
index fe2e298..d92d7f0 100644
--- a/ui/gfx/win/singleton_hwnd.h
+++ b/ui/gfx/win/singleton_hwnd.h
@@ -8,6 +8,7 @@
 #include <windows.h>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/win/window_impl.h"
diff --git a/ui/gfx/win/window_impl.cc b/ui/gfx/win/window_impl.cc
index bc0cb00..bf43ba5 100644
--- a/ui/gfx/win/window_impl.cc
+++ b/ui/gfx/win/window_impl.cc
@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/debug/alias.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/lock.h"
diff --git a/ui/gfx/win/window_impl.h b/ui/gfx/win/window_impl.h
index 7beb958..799ed4c 100644
--- a/ui/gfx/win/window_impl.h
+++ b/ui/gfx/win/window_impl.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/ui/gfx/x/x11_atom_cache.h b/ui/gfx/x/x11_atom_cache.h
index 92d4db7..948ca7a 100644
--- a/ui/gfx/x/x11_atom_cache.h
+++ b/ui/gfx/x/x11_atom_cache.h
@@ -8,7 +8,7 @@
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/x/x11_types.h"
 
diff --git a/ui/gfx/x/x11_error_tracker.h b/ui/gfx/x/x11_error_tracker.h
index efcac0c..21031be 100644
--- a/ui/gfx/x/x11_error_tracker.h
+++ b/ui/gfx/x/x11_error_tracker.h
@@ -7,7 +7,7 @@
 
 #include <X11/Xlib.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace gfx {
diff --git a/ui/gfx/x/x11_switches.cc b/ui/gfx/x/x11_switches.cc
index fc2c8c1..38ec75a 100644
--- a/ui/gfx/x/x11_switches.cc
+++ b/ui/gfx/x/x11_switches.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 "build/build_config.h"
 #include "ui/gfx/x/x11_switches.h"
 
 namespace switches {
diff --git a/ui/gfx/x/x11_switches.h b/ui/gfx/x/x11_switches.h
index 28029d0..5b2e505 100644
--- a/ui/gfx/x/x11_switches.h
+++ b/ui/gfx/x/x11_switches.h
@@ -5,6 +5,7 @@
 #ifndef UI_GFX_X_X11_SWITCHES_H_
 #define UI_GFX_X_X11_SWITCHES_H_
 
+#include "build/build_config.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace switches {
diff --git a/ui/gfx/x/x11_types.cc b/ui/gfx/x/x11_types.cc
index e74129e..7540f8a 100644
--- a/ui/gfx/x/x11_types.cc
+++ b/ui/gfx/x/x11_types.cc
@@ -8,6 +8,7 @@
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
+#include "build/build_config.h"
 #include "ui/gfx/x/x11_switches.h"
 
 namespace gfx {
@@ -30,10 +31,13 @@ XDisplay* OpenNewXDisplay() {
 }
 
 void PutARGBImage(XDisplay* display,
-                  void* visual, int depth,
-                  XID pixmap, void* pixmap_gc,
-                  const uint8* data,
-                  int width, int height) {
+                  void* visual,
+                  int depth,
+                  XID pixmap,
+                  void* pixmap_gc,
+                  const uint8_t* data,
+                  int width,
+                  int height) {
   PutARGBImage(display,
                visual, depth,
                pixmap, pixmap_gc,
@@ -58,13 +62,19 @@ int BitsPerPixelForPixmapDepth(XDisplay* dpy, int depth) {
 }
 
 void PutARGBImage(XDisplay* display,
-                  void* visual, int depth,
-                  XID pixmap, void* pixmap_gc,
-                  const uint8* data,
-                  int data_width, int data_height,
-                  int src_x, int src_y,
-                  int dst_x, int dst_y,
-                  int copy_width, int copy_height) {
+                  void* visual,
+                  int depth,
+                  XID pixmap,
+                  void* pixmap_gc,
+                  const uint8_t* data,
+                  int data_width,
+                  int data_height,
+                  int src_x,
+                  int src_y,
+                  int dst_x,
+                  int dst_y,
+                  int copy_width,
+                  int copy_height) {
   // TODO(scherkus): potential performance impact... consider passing in as a
   // parameter.
   int pixmap_bpp = BitsPerPixelForPixmapDepth(display, depth);
diff --git a/ui/gfx/x/x11_types.h b/ui/gfx/x/x11_types.h
index 980ec06..2b00a21 100644
--- a/ui/gfx/x/x11_types.h
+++ b/ui/gfx/x/x11_types.h
@@ -5,7 +5,8 @@
 #ifndef UI_GFX_X_X11_UTIL_H_
 #define UI_GFX_X_X11_UTIL_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/gfx_export.h"
 
@@ -48,23 +49,32 @@ GFX_EXPORT int BitsPerPixelForPixmapDepth(XDisplay* display, int depth);
 // dimensions as |data| or larger.  |data| is also assumed to be in row order
 // with each line being exactly |width| * 4 bytes long.
 GFX_EXPORT void PutARGBImage(XDisplay* display,
-                             void* visual, int depth,
-                             XID pixmap, void* pixmap_gc,
-                             const uint8* data,
-                             int width, int height);
+                             void* visual,
+                             int depth,
+                             XID pixmap,
+                             void* pixmap_gc,
+                             const uint8_t* data,
+                             int width,
+                             int height);
 
 // Same as above only more general:
 // - |data_width| and |data_height| refer to the data image
 // - |src_x|, |src_y|, |copy_width| and |copy_height| define source region
 // - |dst_x|, |dst_y|, |copy_width| and |copy_height| define destination region
 GFX_EXPORT void PutARGBImage(XDisplay* display,
-                             void* visual, int depth,
-                             XID pixmap, void* pixmap_gc,
-                             const uint8* data,
-                             int data_width, int data_height,
-                             int src_x, int src_y,
-                             int dst_x, int dst_y,
-                             int copy_width, int copy_height);
+                             void* visual,
+                             int depth,
+                             XID pixmap,
+                             void* pixmap_gc,
+                             const uint8_t* data,
+                             int data_width,
+                             int data_height,
+                             int src_x,
+                             int src_y,
+                             int dst_x,
+                             int dst_y,
+                             int copy_width,
+                             int copy_height);
 
 }  // namespace gfx