4 files changed, 10 insertions, 3 deletions
diff --git a/ui/snapshot/screenshot_grabber.cc b/ui/snapshot/screenshot_grabber.cc
index e502060..7d44930 100644
--- a/ui/snapshot/screenshot_grabber.cc
+++ b/ui/snapshot/screenshot_grabber.cc
@@ -4,6 +4,8 @@
 
 #include "ui/snapshot/screenshot_grabber.h"
 
+#include <stddef.h>
+
 #include <climits>
 #include <string>
 
diff --git a/ui/snapshot/screenshot_grabber.h b/ui/snapshot/screenshot_grabber.h
index 8461ce8..778168c 100644
--- a/ui/snapshot/screenshot_grabber.h
+++ b/ui/snapshot/screenshot_grabber.h
@@ -5,10 +5,10 @@
 #ifndef UI_SNAPSHOT_SCREENSHOT_GRABBER_H_
 #define UI_SNAPSHOT_SCREENSHOT_GRABBER_H_
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
diff --git a/ui/snapshot/snapshot_async.h b/ui/snapshot/snapshot_async.h
index 41da62b..467bdcb 100644
--- a/ui/snapshot/snapshot_async.h
+++ b/ui/snapshot/snapshot_async.h
@@ -5,6 +5,7 @@
 #ifndef UI_SNAPSHOT_SNAPSHOT_ASYNC_H_
 #define UI_SNAPSHOT_SNAPSHOT_ASYNC_H_
 
+#include "base/macros.h"
 #include "cc/output/copy_output_result.h"
 #include "ui/snapshot/snapshot.h"
 
diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc
index 2279480..d360625 100644
--- a/ui/snapshot/snapshot_aura_unittest.cc
+++ b/ui/snapshot/snapshot_aura_unittest.cc
@@ -4,7 +4,11 @@
 
 #include "ui/snapshot/snapshot.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/test/test_simple_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_helper.h"
@@ -62,8 +66,8 @@ class TestPaintingWindowDelegate : public aura::test::TestWindowDelegate {
 size_t GetFailedPixelsCountWithScaleFactor(const gfx::Image& image,
                                            int scale_factor) {
   const SkBitmap* bitmap = image.ToSkBitmap();
-  uint32* bitmap_data = reinterpret_cast<uint32*>(
-      bitmap->pixelRef()->pixels());
+  uint32_t* bitmap_data =
+      reinterpret_cast<uint32_t*>(bitmap->pixelRef()->pixels());
   size_t result = 0;
   for (int y = 0; y < bitmap->height(); y += scale_factor) {
     for (int x = 0; x < bitmap->width(); x += scale_factor) {