Switch to standard integer types in ui/events/.

BUG=138542
TBR=sky@chromium.org

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

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

168 files changed, 427 insertions, 189 deletions

diff --git a/ui/events/android/events_jni_registrar.cc b/ui/events/android/events_jni_registrar.cc
index 635a4ab..f75e5e6 100644
--- a/ui/events/android/events_jni_registrar.cc
+++ b/ui/events/android/events_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/events/android/motion_event_android.h"
 
 namespace ui {
diff --git a/ui/events/android/motion_event_android.cc b/ui/events/android/motion_event_android.cc
index 324c3e7..bc51cd3 100644
--- a/ui/events/android/motion_event_android.cc
+++ b/ui/events/android/motion_event_android.cc
@@ -93,7 +93,7 @@ int FromAndroidMetaState(int meta_state) {
   return flags;
 }
 
-base::TimeTicks FromAndroidTime(int64 time_ms) {
+base::TimeTicks FromAndroidTime(int64_t time_ms) {
   return base::TimeTicks() + base::TimeDelta::FromMilliseconds(time_ms);
 }
 
@@ -188,7 +188,7 @@ MotionEventAndroid::MotionEventAndroid(float pix_to_dip,
 MotionEventAndroid::~MotionEventAndroid() {
 }
 
-uint32 MotionEventAndroid::GetUniqueEventId() const {
+uint32_t MotionEventAndroid::GetUniqueEventId() const {
   return unique_event_id_;
 }
 
diff --git a/ui/events/android/motion_event_android.h b/ui/events/android/motion_event_android.h
index db79a14..f4b77cc 100644
--- a/ui/events/android/motion_event_android.h
+++ b/ui/events/android/motion_event_android.h
@@ -7,6 +7,8 @@
 #define UI_EVENTS_ANDROID_MOTION_EVENT_ANDROID_H_
 
 #include <jni.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
@@ -61,7 +63,7 @@ class EVENTS_EXPORT MotionEventAndroid : public MotionEvent {
   ~MotionEventAndroid() override;
 
   // ui::MotionEvent methods.
-  uint32 GetUniqueEventId() const override;
+  uint32_t GetUniqueEventId() const override;
   Action GetAction() const override;
   int GetActionIndex() const override;
   size_t GetPointerCount() const override;
@@ -129,7 +131,7 @@ class EVENTS_EXPORT MotionEventAndroid : public MotionEvent {
   } cached_pointers_[MAX_POINTERS_TO_CACHE];
 
   // A unique identifier for the Android motion event.
-  const uint32 unique_event_id_;
+  const uint32_t unique_event_id_;
 
   DISALLOW_COPY_AND_ASSIGN(MotionEventAndroid);
 };
diff --git a/ui/events/android/motion_event_android_unittest.cc b/ui/events/android/motion_event_android_unittest.cc
index 26d82e3..c8563b1 100644
--- a/ui/events/android/motion_event_android_unittest.cc
+++ b/ui/events/android/motion_event_android_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <android/input.h>
+#include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/events/android/scroller.cc b/ui/events/android/scroller.cc
index 17c457b3..1375f3f 100644
--- a/ui/events/android/scroller.cc
+++ b/ui/events/android/scroller.cc
@@ -7,6 +7,7 @@
 #include <cmath>
 
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 
 namespace ui {
 namespace {
diff --git a/ui/events/base_event_utils.cc b/ui/events/base_event_utils.cc
index 4551695..4da7221 100644
--- a/ui/events/base_event_utils.cc
+++ b/ui/events/base_event_utils.cc
@@ -7,6 +7,7 @@
 #include "base/atomic_sequence_num.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_switches.h"
 
@@ -24,10 +25,10 @@ const int kSystemKeyModifierMask = EF_ALT_DOWN;
 
 base::StaticAtomicSequenceNumber g_next_event_id;
 
-uint32 GetNextTouchEventId() {
+uint32_t GetNextTouchEventId() {
   // Set the first touch event ID to 1 because we set id to 0 for other types
   // of events.
-  uint32 id = g_next_event_id.GetNext();
+  uint32_t id = g_next_event_id.GetNext();
   if (id == 0)
     id = g_next_event_id.GetNext();
   DCHECK_NE(0U, id);
diff --git a/ui/events/base_event_utils.h b/ui/events/base_event_utils.h
index c353c61..6f07b09 100644
--- a/ui/events/base_event_utils.h
+++ b/ui/events/base_event_utils.h
@@ -5,14 +5,15 @@
 #ifndef UI_EVENTS_BASE_EVENT_UTILS_H_
 #define UI_EVENTS_BASE_EVENT_UTILS_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "ui/events/events_base_export.h"
 
 // Common functions to be used for all platforms.
 namespace ui {
 
 // Generate an unique identifier for events.
-EVENTS_BASE_EXPORT uint32 GetNextTouchEventId();
+EVENTS_BASE_EXPORT uint32_t GetNextTouchEventId();
 
 // Checks if |flags| contains system key modifiers.
 EVENTS_BASE_EXPORT bool IsSystemKeyModifier(int flags);
diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc
index 3dd3ea8..ce91f3f 100644
--- a/ui/events/blink/blink_event_util.cc
+++ b/ui/events/blink/blink_event_util.cc
@@ -7,10 +7,13 @@
 
 #include "ui/events/blink/blink_event_util.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <cmath>
 
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gesture_detection/gesture_event_data.h"
diff --git a/ui/events/blink/input_handler_proxy.cc b/ui/events/blink/input_handler_proxy.cc
index 852d60b..cd1f4ff 100644
--- a/ui/events/blink/input_handler_proxy.cc
+++ b/ui/events/blink/input_handler_proxy.cc
@@ -4,6 +4,8 @@
 
 #include "ui/events/blink/input_handler_proxy.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/auto_reset.h"
diff --git a/ui/events/blink/input_handler_proxy.h b/ui/events/blink/input_handler_proxy.h
index fdee704..79f3253 100644
--- a/ui/events/blink/input_handler_proxy.h
+++ b/ui/events/blink/input_handler_proxy.h
@@ -5,8 +5,8 @@
 #ifndef UI_EVENTS_BLINK_INPUT_HANDLER_PROXY_H_
 #define UI_EVENTS_BLINK_INPUT_HANDLER_PROXY_H_
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/input/input_handler.h"
 #include "third_party/WebKit/public/platform/WebGestureCurve.h"
diff --git a/ui/events/blink/input_handler_proxy_unittest.cc b/ui/events/blink/input_handler_proxy_unittest.cc
index 3da09e3..6b778e0 100644
--- a/ui/events/blink/input_handler_proxy_unittest.cc
+++ b/ui/events/blink/input_handler_proxy_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "ui/events/blink/input_handler_proxy.h"
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/trees/swap_promise_monitor.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/ui/events/cocoa/events_mac.mm b/ui/events/cocoa/events_mac.mm
index 804ffbd..79beaf3 100644
--- a/ui/events/cocoa/events_mac.mm
+++ b/ui/events/cocoa/events_mac.mm
@@ -5,6 +5,7 @@
 #include "ui/events/event_utils.h"
 
 #include <Cocoa/Cocoa.h>
+#include <stdint.h>
 
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
@@ -225,17 +226,17 @@ DomCode CodeFromNative(const base::NativeEvent& native_event) {
   return DomCodeFromNSEvent(native_event);
 }
 
-uint32 WindowsKeycodeFromNative(const base::NativeEvent& native_event) {
-  return static_cast<uint32>(KeyboardCodeFromNSEvent(native_event));
+uint32_t WindowsKeycodeFromNative(const base::NativeEvent& native_event) {
+  return static_cast<uint32_t>(KeyboardCodeFromNSEvent(native_event));
 }
 
-uint16 TextFromNative(const base::NativeEvent& native_event) {
+uint16_t TextFromNative(const base::NativeEvent& native_event) {
   NSString* text = @"";
   if ([native_event type] != NSFlagsChanged)
     text = [native_event characters];
 
   // These exceptions are based on web_input_event_builders_mac.mm:
-  uint32 windows_keycode = WindowsKeycodeFromNative(native_event);
+  uint32_t windows_keycode = WindowsKeycodeFromNative(native_event);
   if (windows_keycode == '\r')
     text = @"\r";
   if ([text isEqualToString:@"\x7F"])
@@ -243,18 +244,18 @@ uint16 TextFromNative(const base::NativeEvent& native_event) {
   if (windows_keycode == 9)
     text = @"\x9";
 
-  uint16 return_value;
+  uint16_t return_value;
   [text getCharacters:&return_value];
   return return_value;
 }
 
-uint16 UnmodifiedTextFromNative(const base::NativeEvent& native_event) {
+uint16_t UnmodifiedTextFromNative(const base::NativeEvent& native_event) {
   NSString* text = @"";
   if ([native_event type] != NSFlagsChanged)
     text = [native_event charactersIgnoringModifiers];
 
   // These exceptions are based on web_input_event_builders_mac.mm:
-  uint32 windows_keycode = WindowsKeycodeFromNative(native_event);
+  uint32_t windows_keycode = WindowsKeycodeFromNative(native_event);
   if (windows_keycode == '\r')
     text = @"\r";
   if ([text isEqualToString:@"\x7F"])
@@ -262,7 +263,7 @@ uint16 UnmodifiedTextFromNative(const base::NativeEvent& native_event) {
   if (windows_keycode == 9)
     text = @"\x9";
 
-  uint16 return_value;
+  uint16_t return_value;
   [text getCharacters:&return_value];
   return return_value;
 }
diff --git a/ui/events/cocoa/events_mac_unittest.mm b/ui/events/cocoa/events_mac_unittest.mm
index 76a99f3..35a7852 100644
--- a/ui/events/cocoa/events_mac_unittest.mm
+++ b/ui/events/cocoa/events_mac_unittest.mm
@@ -5,9 +5,11 @@
 #include "ui/events/event_utils.h"
 
 #import <Cocoa/Cocoa.h>
+#include <stdint.h>
 
 #include "base/mac/scoped_cftyperef.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
diff --git a/ui/events/devices/x11/device_data_manager_x11.cc b/ui/events/devices/x11/device_data_manager_x11.cc
index 9ae6bcc..e9769f5d1 100644
--- a/ui/events/devices/x11/device_data_manager_x11.cc
+++ b/ui/events/devices/x11/device_data_manager_x11.cc
@@ -4,6 +4,7 @@
 
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 
+#include <stddef.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
@@ -13,8 +14,10 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/sys_info.h"
+#include "build/build_config.h"
 #include "ui/events/devices/keyboard_device.h"
 #include "ui/events/devices/x11/device_list_cache_x11.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
diff --git a/ui/events/devices/x11/device_data_manager_x11.h b/ui/events/devices/x11/device_data_manager_x11.h
index 314946be..33986e9 100644
--- a/ui/events/devices/x11/device_data_manager_x11.h
+++ b/ui/events/devices/x11/device_data_manager_x11.h
@@ -20,8 +20,8 @@
 #include <set>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/event_types.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/events_devices_export.h"
diff --git a/ui/events/devices/x11/device_data_manager_x11_unittest.cc b/ui/events/devices/x11/device_data_manager_x11_unittest.cc
index 75a4503..a6effae 100644
--- a/ui/events/devices/x11/device_data_manager_x11_unittest.cc
+++ b/ui/events/devices/x11/device_data_manager_x11_unittest.cc
@@ -10,6 +10,7 @@
 #undef Bool
 #undef None
 
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/devices/device_hotplug_event_observer.h"
 #include "ui/events/devices/input_device.h"
diff --git a/ui/events/devices/x11/device_list_cache_x11.h b/ui/events/devices/x11/device_list_cache_x11.h
index 69dde28..e0b6050 100644
--- a/ui/events/devices/x11/device_list_cache_x11.h
+++ b/ui/events/devices/x11/device_list_cache_x11.h
@@ -10,7 +10,7 @@
 
 #include <map>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/devices/events_devices_export.h"
 #include "ui/gfx/x/x11_types.h"
diff --git a/ui/events/devices/x11/touch_factory_x11.cc b/ui/events/devices/x11/touch_factory_x11.cc
index 42d5771..054a982 100644
--- a/ui/events/devices/x11/touch_factory_x11.cc
+++ b/ui/events/devices/x11/touch_factory_x11.cc
@@ -4,13 +4,13 @@
 
 #include "ui/events/devices/x11/touch_factory_x11.h"
 
+#include <stddef.h>
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/XIproto.h>
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ -19,6 +19,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/sys_info.h"
+#include "build/build_config.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/devices/x11/device_list_cache_x11.h"
@@ -268,18 +269,18 @@ bool TouchFactory::IsMultiTouchDevice(int deviceid) const {
              : false;
 }
 
-bool TouchFactory::QuerySlotForTrackingID(uint32 tracking_id, int* slot) {
+bool TouchFactory::QuerySlotForTrackingID(uint32_t tracking_id, int* slot) {
   if (!id_generator_.HasGeneratedIDFor(tracking_id))
     return false;
   *slot = static_cast<int>(id_generator_.GetGeneratedID(tracking_id));
   return true;
 }
 
-int TouchFactory::GetSlotForTrackingID(uint32 tracking_id) {
+int TouchFactory::GetSlotForTrackingID(uint32_t tracking_id) {
   return id_generator_.GetGeneratedID(tracking_id);
 }
 
-void TouchFactory::ReleaseSlotForTrackingID(uint32 tracking_id) {
+void TouchFactory::ReleaseSlotForTrackingID(uint32_t tracking_id) {
   id_generator_.ReleaseNumber(tracking_id);
 }
 
diff --git a/ui/events/devices/x11/touch_factory_x11.h b/ui/events/devices/x11/touch_factory_x11.h
index 6a7e28a..496dcb5 100644
--- a/ui/events/devices/x11/touch_factory_x11.h
+++ b/ui/events/devices/x11/touch_factory_x11.h
@@ -5,12 +5,15 @@
 #ifndef UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_
 #define UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_
 
+#include <stdint.h>
+
 #include <bitset>
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
 
+#include "base/macros.h"
 #include "ui/events/devices/events_devices_export.h"
 #include "ui/gfx/sequential_id_generator.h"
 
@@ -67,14 +70,14 @@ class EVENTS_DEVICES_EXPORT TouchFactory {
   // Tries to find an existing slot ID mapping to tracking ID. Returns true
   // if the slot is found and it is saved in |slot|, false if no such slot
   // can be found.
-  bool QuerySlotForTrackingID(uint32 tracking_id, int* slot);
+  bool QuerySlotForTrackingID(uint32_t tracking_id, int* slot);
 
   // Tries to find an existing slot ID mapping to tracking ID. If there
   // isn't one already, allocates a new slot ID and sets up the mapping.
-  int GetSlotForTrackingID(uint32 tracking_id);
+  int GetSlotForTrackingID(uint32_t tracking_id);
 
   // Releases the slot ID mapping to tracking ID.
-  void ReleaseSlotForTrackingID(uint32 tracking_id);
+  void ReleaseSlotForTrackingID(uint32_t tracking_id);
 
   // Whether any touch device is currently present and enabled.
   bool IsTouchDevicePresent();
diff --git a/ui/events/event.cc b/ui/events/event.cc
index 122aca5..66d4278 100644
--- a/ui/events/event.cc
+++ b/ui/events/event.cc
@@ -17,6 +17,7 @@
 
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
@@ -906,7 +907,7 @@ KeyboardCode KeyEvent::GetLocatedWindowsKeyboardCode() const {
   return NonLocatedToLocatedKeyboardCode(key_code_, code_);
 }
 
-uint16 KeyEvent::GetConflatedWindowsKeyCode() const {
+uint16_t KeyEvent::GetConflatedWindowsKeyCode() const {
   if (is_char_)
     return key_.ToCharacter();
   return key_code_;
diff --git a/ui/events/event.h b/ui/events/event.h
index c878a71..4ab7751 100644
--- a/ui/events/event.h
+++ b/ui/events/event.h
@@ -5,11 +5,13 @@
 #ifndef UI_EVENTS_EVENT_H_
 #define UI_EVENTS_EVENT_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
 #include "base/event_types.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/events/event_constants.h"
@@ -579,7 +581,7 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
   // The id of the pointer this event modifies.
   int touch_id() const { return touch_id_; }
   // A unique identifier for this event.
-  uint32 unique_event_id() const { return unique_event_id_; }
+  uint32_t unique_event_id() const { return unique_event_id_; }
 
   float rotation_angle() const { return rotation_angle_; }
 
@@ -619,7 +621,7 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
   const int touch_id_;
 
   // A unique identifier for the touch event.
-  const uint32 unique_event_id_;
+  const uint32_t unique_event_id_;
 
   // Clockwise angle (in degrees) of the major axis from the X axis. Must be
   // less than 180 and non-negative.
@@ -779,7 +781,7 @@ class EVENTS_EXPORT KeyEvent : public Event {
   // For a keystroke event, returns the same value as key_code().
   // For a character event, returns the same value as GetCharacter().
   // This exists for backwards compatibility with Windows key events.
-  uint16 GetConflatedWindowsKeyCode() const;
+  uint16_t GetConflatedWindowsKeyCode() const;
 
   // Returns true for [Alt]+<num-pad digit> Unicode alt key codes used by Win.
   // TODO(msw): Additional work may be needed for analogues on other platforms.
diff --git a/ui/events/event_dispatcher.cc b/ui/events/event_dispatcher.cc
index e2262ef..8a0c18e 100644
--- a/ui/events/event_dispatcher.cc
+++ b/ui/events/event_dispatcher.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/macros.h"
 #include "ui/events/event_target.h"
 #include "ui/events/event_targeter.h"
 
diff --git a/ui/events/event_dispatcher.h b/ui/events/event_dispatcher.h
index a8c985e..f65aebd 100644
--- a/ui/events/event_dispatcher.h
+++ b/ui/events/event_dispatcher.h
@@ -6,6 +6,7 @@
 #define UI_EVENTS_EVENT_DISPATCHER_H_
 
 #include "base/auto_reset.h"
+#include "base/macros.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
diff --git a/ui/events/event_dispatcher_unittest.cc b/ui/events/event_dispatcher_unittest.cc
index ed9c1e9..7bae313 100644
--- a/ui/events/event_dispatcher_unittest.cc
+++ b/ui/events/event_dispatcher_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ui/events/event_dispatcher.h"
 
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_dispatcher.h"
diff --git a/ui/events/event_handler.h b/ui/events/event_handler.h
index 088c3f8..7e7ae9a 100644
--- a/ui/events/event_handler.h
+++ b/ui/events/event_handler.h
@@ -8,7 +8,7 @@
 #include <stack>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/events_export.h"
 
diff --git a/ui/events/event_rewriter_unittest.cc b/ui/events/event_rewriter_unittest.cc
index 61557bc..7983e72 100644
--- a/ui/events/event_rewriter_unittest.cc
+++ b/ui/events/event_rewriter_unittest.cc
@@ -9,6 +9,7 @@
 #include <set>
 #include <utility>
 
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/test/test_event_processor.h"
 
diff --git a/ui/events/event_source.h b/ui/events/event_source.h
index d369c34..bdcf467 100644
--- a/ui/events/event_source.h
+++ b/ui/events/event_source.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "ui/events/event_dispatcher.h"
 #include "ui/events/events_export.h"
 
diff --git a/ui/events/event_switches.cc b/ui/events/event_switches.cc
index dcc0014..c64c548 100644
--- a/ui/events/event_switches.cc
+++ b/ui/events/event_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/events/event_switches.h"
 
 namespace switches {
diff --git a/ui/events/event_switches.h b/ui/events/event_switches.h
index 94bf37f..9e7e6dc 100644
--- a/ui/events/event_switches.h
+++ b/ui/events/event_switches.h
@@ -6,6 +6,7 @@
 #define UI_EVENTS_EVENTS_SWITCHES_H_
 
 #include "base/compiler_specific.h"
+#include "build/build_config.h"
 #include "ui/events/events_base_export.h"
 
 namespace switches {
diff --git a/ui/events/event_target.h b/ui/events/event_target.h
index 6ad236f..e68c277 100644
--- a/ui/events/event_target.h
+++ b/ui/events/event_target.h
@@ -7,8 +7,8 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/events_export.h"
diff --git a/ui/events/event_unittest.cc b/ui/events/event_unittest.cc
index 1c03c7b..eebdb52 100644
--- a/ui/events/event_unittest.cc
+++ b/ui/events/event_unittest.cc
@@ -2,7 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
@@ -181,7 +186,7 @@ TEST(EventTest, KeyEvent) {
   static const struct {
     KeyboardCode key_code;
     int flags;
-    uint16 character;
+    uint16_t character;
   } kTestData[] = {
     { VKEY_A, 0, 'a' },
     { VKEY_A, EF_SHIFT_DOWN, 'A' },
@@ -351,7 +356,7 @@ TEST(EventTest, KeyEventCode) {
   const char kCodeForSpace[] = "Space";
   ASSERT_EQ(kDomCodeForSpace,
             ui::KeycodeConverter::CodeStringToDomCode(kCodeForSpace));
-  const uint16 kNativeCodeSpace =
+  const uint16_t kNativeCodeSpace =
       ui::KeycodeConverter::DomCodeToNativeKeycode(kDomCodeForSpace);
   ASSERT_NE(ui::KeycodeConverter::InvalidNativeKeycode(), kNativeCodeSpace);
   ASSERT_EQ(kNativeCodeSpace,
@@ -396,7 +401,7 @@ TEST(EventTest, KeyEventCode) {
   }
   {
     const char kCodeForHome[]  = "Home";
-    const uint16 kNativeCodeHome  = 0xe047;
+    const uint16_t kNativeCodeHome = 0xe047;
 
     // 'Home' is an extended key with 0xe000 bits.
     ASSERT_NE((kNativeCodeHome & 0xFF), kNativeCodeHome);
@@ -434,9 +439,9 @@ void AdvanceKeyEventTimestamp(MSG& msg) {
 
 #if defined(USE_X11) || defined(OS_WIN)
 TEST(EventTest, AutoRepeat) {
-  const uint16 kNativeCodeA =
+  const uint16_t kNativeCodeA =
       ui::KeycodeConverter::DomCodeToNativeKeycode(DomCode::KEY_A);
-  const uint16 kNativeCodeB =
+  const uint16_t kNativeCodeB =
       ui::KeycodeConverter::DomCodeToNativeKeycode(DomCode::KEY_B);
 #if defined(USE_X11)
   ScopedXI2Event native_event_a_pressed;
diff --git a/ui/events/event_utils.h b/ui/events/event_utils.h
index bb1a7d6..20f1a4f 100644
--- a/ui/events/event_utils.h
+++ b/ui/events/event_utils.h
@@ -5,16 +5,18 @@
 #ifndef UI_EVENTS_EVENT_UTILS_H_
 #define UI_EVENTS_EVENT_UTILS_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/event_types.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
+#include "build/build_config.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
+#include "ui/events/events_export.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/events/events_export.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ -161,8 +163,8 @@ EVENTS_EXPORT bool IsMouseEventFromTouch(UINT message);
 
 // Converts scan code and lParam each other.  The scan code
 // representing an extended key contains 0xE000 bits.
-EVENTS_EXPORT uint16 GetScanCodeFromLParam(LPARAM lParam);
-EVENTS_EXPORT LPARAM GetLParamFromScanCode(uint16 scan_code);
+EVENTS_EXPORT uint16_t GetScanCodeFromLParam(LPARAM lParam);
+EVENTS_EXPORT LPARAM GetLParamFromScanCode(uint16_t scan_code);
 
 #endif
 
diff --git a/ui/events/events_stub.cc b/ui/events/events_stub.cc
index 87c71a5..edd7765 100644
--- a/ui/events/events_stub.cc
+++ b/ui/events/events_stub.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
@@ -139,17 +141,17 @@ bool IsCharFromNative(const base::NativeEvent& native_event) {
   return false;
 }
 
-uint32 WindowsKeycodeFromNative(const base::NativeEvent& native_event) {
+uint32_t WindowsKeycodeFromNative(const base::NativeEvent& native_event) {
   NOTIMPLEMENTED();
   return 0;
 }
 
-uint16 TextFromNative(const base::NativeEvent& native_event) {
+uint16_t TextFromNative(const base::NativeEvent& native_event) {
   NOTIMPLEMENTED();
   return 0;
 }
 
-uint16 UnmodifiedTextFromNative(const base::NativeEvent& native_event) {
+uint16_t UnmodifiedTextFromNative(const base::NativeEvent& native_event) {
   NOTIMPLEMENTED();
   return 0;
 }
diff --git a/ui/events/gesture_detection/bitset_32.h b/ui/events/gesture_detection/bitset_32.h
index 6900e28..903f111 100644
--- a/ui/events/gesture_detection/bitset_32.h
+++ b/ui/events/gesture_detection/bitset_32.h
@@ -5,7 +5,8 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_BITSET_32_H_
 #define UI_EVENTS_GESTURE_DETECTION_BITSET_32_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/logging.h"
 
 namespace ui {
diff --git a/ui/events/gesture_detection/bitset_32_unittest.cc b/ui/events/gesture_detection/bitset_32_unittest.cc
index a684af8..2c71b5c 100644
--- a/ui/events/gesture_detection/bitset_32_unittest.cc
+++ b/ui/events/gesture_detection/bitset_32_unittest.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/gesture_detection/bitset_32.h"
 
diff --git a/ui/events/gesture_detection/filtered_gesture_provider.cc b/ui/events/gesture_detection/filtered_gesture_provider.cc
index d8faf80..e616e7b 100644
--- a/ui/events/gesture_detection/filtered_gesture_provider.cc
+++ b/ui/events/gesture_detection/filtered_gesture_provider.cc
@@ -47,7 +47,7 @@ FilteredGestureProvider::OnTouchEvent(const MotionEvent& event) {
   return result;
 }
 
-void FilteredGestureProvider::OnTouchEventAck(uint32 unique_event_id,
+void FilteredGestureProvider::OnTouchEventAck(uint32_t unique_event_id,
                                               bool event_consumed) {
   gesture_filter_.OnTouchEventAck(unique_event_id, event_consumed);
 }
diff --git a/ui/events/gesture_detection/filtered_gesture_provider.h b/ui/events/gesture_detection/filtered_gesture_provider.h
index ad71e52..d8a8dc0 100644
--- a/ui/events/gesture_detection/filtered_gesture_provider.h
+++ b/ui/events/gesture_detection/filtered_gesture_provider.h
@@ -5,8 +5,10 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_FILTERED_GESTURE_PROVIDER_H_
 #define UI_EVENTS_GESTURE_DETECTION_FILTERED_GESTURE_PROVIDER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/events/gesture_detection/gesture_event_data_packet.h"
 #include "ui/events/gesture_detection/gesture_provider.h"
 #include "ui/events/gesture_detection/touch_disposition_gesture_filter.h"
@@ -42,7 +44,7 @@ class GESTURE_DETECTION_EXPORT FilteredGestureProvider
 
   // To be called upon asynchronous and synchronous ack of an event that was
   // forwarded after a successful call to |OnTouchEvent()|.
-  void OnTouchEventAck(uint32 unique_event_id, bool event_consumed);
+  void OnTouchEventAck(uint32_t unique_event_id, bool event_consumed);
 
   // Methods delegated to |gesture_provider_|.
   void ResetDetection();
diff --git a/ui/events/gesture_detection/filtered_gesture_provider_unittest.cc b/ui/events/gesture_detection/filtered_gesture_provider_unittest.cc
index 9a9c58a..4514946 100644
--- a/ui/events/gesture_detection/filtered_gesture_provider_unittest.cc
+++ b/ui/events/gesture_detection/filtered_gesture_provider_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 "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/gesture_detection/filtered_gesture_provider.h"
diff --git a/ui/events/gesture_detection/gesture_configuration.cc b/ui/events/gesture_detection/gesture_configuration.cc
index 0894cfc..fbd46e2 100644
--- a/ui/events/gesture_detection/gesture_configuration.cc
+++ b/ui/events/gesture_detection/gesture_configuration.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/events/gesture_detection/gesture_configuration.h"
 
 namespace ui {
diff --git a/ui/events/gesture_detection/gesture_configuration.h b/ui/events/gesture_detection/gesture_configuration.h
index 3fc7cca..c9847fe 100644
--- a/ui/events/gesture_detection/gesture_configuration.h
+++ b/ui/events/gesture_detection/gesture_configuration.h
@@ -5,7 +5,7 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_CONFIGURATION_H_
 #define UI_EVENTS_GESTURE_DETECTION_GESTURE_CONFIGURATION_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
 #include "ui/events/gesture_detection/velocity_tracker.h"
 
diff --git a/ui/events/gesture_detection/gesture_configuration_android.cc b/ui/events/gesture_detection/gesture_configuration_android.cc
index b551d10..3b55b83 100644
--- a/ui/events/gesture_detection/gesture_configuration_android.cc
+++ b/ui/events/gesture_detection/gesture_configuration_android.cc
@@ -5,6 +5,7 @@
 #include "ui/events/gesture_detection/gesture_configuration.h"
 
 #include "base/android/build_info.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "ui/gfx/android/view_configuration.h"
 #include "ui/gfx/screen.h"
diff --git a/ui/events/gesture_detection/gesture_configuration_aura.cc b/ui/events/gesture_detection/gesture_configuration_aura.cc
index 1ed2976..f4f7c5e 100644
--- a/ui/events/gesture_detection/gesture_configuration_aura.cc
+++ b/ui/events/gesture_detection/gesture_configuration_aura.cc
@@ -5,6 +5,7 @@
 #include "ui/events/gesture_detection/gesture_configuration.h"
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "ui/events/event_switches.h"
 
diff --git a/ui/events/gesture_detection/gesture_configuration_default.cc b/ui/events/gesture_detection/gesture_configuration_default.cc
index b279ace..ac51394 100644
--- a/ui/events/gesture_detection/gesture_configuration_default.cc
+++ b/ui/events/gesture_detection/gesture_configuration_default.cc
@@ -4,6 +4,7 @@
 
 #include "ui/events/gesture_detection/gesture_configuration.h"
 
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "ui/gfx/screen.h"
 
diff --git a/ui/events/gesture_detection/gesture_detector.cc b/ui/events/gesture_detection/gesture_detector.cc
index 0dc4707..2996bc7 100644
--- a/ui/events/gesture_detection/gesture_detector.cc
+++ b/ui/events/gesture_detection/gesture_detector.cc
@@ -7,6 +7,8 @@
 
 #include "ui/events/gesture_detection/gesture_detector.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <cmath>
 
diff --git a/ui/events/gesture_detection/gesture_detector.h b/ui/events/gesture_detection/gesture_detector.h
index c39eabd..49def14 100644
--- a/ui/events/gesture_detection/gesture_detector.h
+++ b/ui/events/gesture_detection/gesture_detector.h
@@ -6,6 +6,7 @@
 #define UI_EVENTS_GESTURE_DETECTION_GESTURE_DETECTOR_H_
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
 #include "ui/events/gesture_detection/velocity_tracker_state.h"
diff --git a/ui/events/gesture_detection/gesture_event_data.h b/ui/events/gesture_detection/gesture_event_data.h
index 8727c6d..8f54355 100644
--- a/ui/events/gesture_detection/gesture_event_data.h
+++ b/ui/events/gesture_detection/gesture_event_data.h
@@ -5,6 +5,8 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DATA_H_
 #define UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DATA_H_
 
+#include <stddef.h>
+
 #include "base/time/time.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
diff --git a/ui/events/gesture_detection/gesture_event_data_packet.cc b/ui/events/gesture_detection/gesture_event_data_packet.cc
index 7ad7113..cf251bc 100644
--- a/ui/events/gesture_detection/gesture_event_data_packet.cc
+++ b/ui/events/gesture_detection/gesture_event_data_packet.cc
@@ -46,7 +46,7 @@ GestureEventDataPacket::GestureEventDataPacket(
     GestureSource source,
     const gfx::PointF& touch_location,
     const gfx::PointF& raw_touch_location,
-    uint32 unique_touch_event_id)
+    uint32_t unique_touch_event_id)
     : timestamp_(timestamp),
       touch_location_(touch_location),
       raw_touch_location_(raw_touch_location),
diff --git a/ui/events/gesture_detection/gesture_event_data_packet.h b/ui/events/gesture_detection/gesture_event_data_packet.h
index 8b0c63f..3116201 100644
--- a/ui/events/gesture_detection/gesture_event_data_packet.h
+++ b/ui/events/gesture_detection/gesture_event_data_packet.h
@@ -5,6 +5,9 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DATA_PACKET_H_
 #define UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DATA_PACKET_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/containers/stack_container.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
 #include "ui/events/gesture_detection/gesture_event_data.h"
@@ -58,14 +61,14 @@ class GESTURE_DETECTION_EXPORT GestureEventDataPacket {
   // head of the queue, and then we handle the ack.
   void Ack(bool event_consumed);
   AckState ack_state() { return ack_state_; }
-  uint32 unique_touch_event_id() const { return unique_touch_event_id_; }
+  uint32_t unique_touch_event_id() const { return unique_touch_event_id_; }
 
  private:
   GestureEventDataPacket(base::TimeTicks timestamp,
                          GestureSource source,
                          const gfx::PointF& touch_location,
                          const gfx::PointF& raw_touch_location,
-                         uint32 unique_touch_event_id);
+                         uint32_t unique_touch_event_id);
 
   enum { kTypicalMaxGesturesPerTouch = 5 };
   base::TimeTicks timestamp_;
@@ -74,7 +77,7 @@ class GESTURE_DETECTION_EXPORT GestureEventDataPacket {
   gfx::PointF raw_touch_location_;
   GestureSource gesture_source_;
   AckState ack_state_;
-  uint32 unique_touch_event_id_;
+  uint32_t unique_touch_event_id_;
 };
 
 }  // namespace ui
diff --git a/ui/events/gesture_detection/gesture_event_data_packet_unittest.cc b/ui/events/gesture_detection/gesture_event_data_packet_unittest.cc
index 5ea3dc2..76f6172 100644
--- a/ui/events/gesture_detection/gesture_event_data_packet_unittest.cc
+++ b/ui/events/gesture_detection/gesture_event_data_packet_unittest.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/gesture_detection/gesture_event_data_packet.h"
 #include "ui/events/test/motion_event_test_utils.h"
diff --git a/ui/events/gesture_detection/gesture_provider.cc b/ui/events/gesture_detection/gesture_provider.cc
index a2980cf..2ea2b53 100644
--- a/ui/events/gesture_detection/gesture_provider.cc
+++ b/ui/events/gesture_detection/gesture_provider.cc
@@ -4,9 +4,12 @@
 
 #include "ui/events/gesture_detection/gesture_provider.h"
 
+#include <stddef.h>
+
 #include <cmath>
 
 #include "base/auto_reset.h"
+#include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gesture_detection/gesture_event_data.h"
diff --git a/ui/events/gesture_detection/gesture_provider.h b/ui/events/gesture_detection/gesture_provider.h
index 9109e87..c738f53 100644
--- a/ui/events/gesture_detection/gesture_provider.h
+++ b/ui/events/gesture_detection/gesture_provider.h
@@ -5,7 +5,6 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_PROVIDER_H_
 #define UI_EVENTS_GESTURE_DETECTION_GESTURE_PROVIDER_H_
 
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
 #include "ui/events/gesture_detection/gesture_detector.h"
diff --git a/ui/events/gesture_detection/gesture_provider_unittest.cc b/ui/events/gesture_detection/gesture_provider_unittest.cc
index 25611a2..d20f6c7 100644
--- a/ui/events/gesture_detection/gesture_provider_unittest.cc
+++ b/ui/events/gesture_detection/gesture_provider_unittest.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
diff --git a/ui/events/gesture_detection/motion_event.h b/ui/events/gesture_detection/motion_event.h
index f06e0840..7ee834e 100644
--- a/ui/events/gesture_detection/motion_event.h
+++ b/ui/events/gesture_detection/motion_event.h
@@ -5,6 +5,9 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_MOTION_EVENT_H_
 #define UI_EVENTS_GESTURE_DETECTION_MOTION_EVENT_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
@@ -50,7 +53,7 @@ class GESTURE_DETECTION_EXPORT MotionEvent {
   virtual ~MotionEvent() {}
 
   // An unique identifier this motion event.
-  virtual uint32 GetUniqueEventId() const = 0;
+  virtual uint32_t GetUniqueEventId() const = 0;
   virtual Action GetAction() const = 0;
   // Only valid if |GetAction()| returns ACTION_POINTER_UP or
   // ACTION_POINTER_DOWN.
diff --git a/ui/events/gesture_detection/motion_event_buffer.cc b/ui/events/gesture_detection/motion_event_buffer.cc
index 28fcb23..c4d89f0 100644
--- a/ui/events/gesture_detection/motion_event_buffer.cc
+++ b/ui/events/gesture_detection/motion_event_buffer.cc
@@ -4,6 +4,8 @@
 
 #include "ui/events/gesture_detection/motion_event_buffer.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "base/trace_event/trace_event.h"
diff --git a/ui/events/gesture_detection/motion_event_buffer.h b/ui/events/gesture_detection/motion_event_buffer.h
index 7a5e597..4c72c59 100644
--- a/ui/events/gesture_detection/motion_event_buffer.h
+++ b/ui/events/gesture_detection/motion_event_buffer.h
@@ -5,6 +5,7 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_MOTION_EVENT_BUFFER_H_
 #define UI_EVENTS_GESTURE_DETECTION_MOTION_EVENT_BUFFER_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
diff --git a/ui/events/gesture_detection/motion_event_buffer_unittest.cc b/ui/events/gesture_detection/motion_event_buffer_unittest.cc
index e9ec4e7..b109f0d 100644
--- a/ui/events/gesture_detection/motion_event_buffer_unittest.cc
+++ b/ui/events/gesture_detection/motion_event_buffer_unittest.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/events/gesture_detection/motion_event_generic.cc b/ui/events/gesture_detection/motion_event_generic.cc
index 35e1e25..041bddd 100644
--- a/ui/events/gesture_detection/motion_event_generic.cc
+++ b/ui/events/gesture_detection/motion_event_generic.cc
@@ -109,7 +109,7 @@ MotionEventGeneric::MotionEventGeneric(const MotionEventGeneric& other)
 MotionEventGeneric::~MotionEventGeneric() {
 }
 
-uint32 MotionEventGeneric::GetUniqueEventId() const {
+uint32_t MotionEventGeneric::GetUniqueEventId() const {
   return unique_event_id_;
 }
 
diff --git a/ui/events/gesture_detection/motion_event_generic.h b/ui/events/gesture_detection/motion_event_generic.h
index 71dc92b..c5ea1b0 100644
--- a/ui/events/gesture_detection/motion_event_generic.h
+++ b/ui/events/gesture_detection/motion_event_generic.h
@@ -5,7 +5,9 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_UI_MOTION_EVENT_GENERIC_H_
 #define UI_EVENTS_GESTURE_DETECTION_UI_MOTION_EVENT_GENERIC_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/containers/stack_container.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
@@ -50,7 +52,7 @@ class GESTURE_DETECTION_EXPORT MotionEventGeneric : public MotionEvent {
   ~MotionEventGeneric() override;
 
   // MotionEvent implementation.
-  uint32 GetUniqueEventId() const override;
+  uint32_t GetUniqueEventId() const override;
   Action GetAction() const override;
   int GetActionIndex() const override;
   size_t GetPointerCount() const override;
@@ -95,7 +97,7 @@ class GESTURE_DETECTION_EXPORT MotionEventGeneric : public MotionEvent {
 
   void set_action(Action action) { action_ = action; }
   void set_event_time(base::TimeTicks event_time) { event_time_ = event_time; }
-  void set_unique_event_id(uint32 unique_event_id) {
+  void set_unique_event_id(uint32_t unique_event_id) {
     unique_event_id_ = unique_event_id;
   }
   void set_action_index(int action_index) { action_index_ = action_index; }
@@ -117,7 +119,7 @@ class GESTURE_DETECTION_EXPORT MotionEventGeneric : public MotionEvent {
 
   Action action_;
   base::TimeTicks event_time_;
-  uint32 unique_event_id_;
+  uint32_t unique_event_id_;
   int action_index_;
   int button_state_;
   int flags_;
diff --git a/ui/events/gesture_detection/scale_gesture_detector.h b/ui/events/gesture_detection/scale_gesture_detector.h
index 82b3cab..4371315 100644
--- a/ui/events/gesture_detection/scale_gesture_detector.h
+++ b/ui/events/gesture_detection/scale_gesture_detector.h
@@ -5,6 +5,7 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_SCALE_GESTURE_DETECTOR_H_
 #define UI_EVENTS_GESTURE_DETECTION_SCALE_GESTURE_DETECTOR_H_
 
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
 
diff --git a/ui/events/gesture_detection/snap_scroll_controller.h b/ui/events/gesture_detection/snap_scroll_controller.h
index 049bcd7..44a7f3c 100644
--- a/ui/events/gesture_detection/snap_scroll_controller.h
+++ b/ui/events/gesture_detection/snap_scroll_controller.h
@@ -5,7 +5,7 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_SNAP_SCROLL_CONTROLLER_H_
 #define UI_EVENTS_GESTURE_DETECTION_SNAP_SCROLL_CONTROLLER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/size_f.h"
diff --git a/ui/events/gesture_detection/snap_scroll_controller_unittest.cc b/ui/events/gesture_detection/snap_scroll_controller_unittest.cc
index 7a0b231..7cec507 100644
--- a/ui/events/gesture_detection/snap_scroll_controller_unittest.cc
+++ b/ui/events/gesture_detection/snap_scroll_controller_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/events/gesture_detection/snap_scroll_controller.h"
 #include "ui/events/test/motion_event_test_utils.h"
diff --git a/ui/events/gesture_detection/touch_disposition_gesture_filter.cc b/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
index cda3103..5a9e752 100644
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
@@ -4,6 +4,8 @@
 
 #include "ui/events/gesture_detection/touch_disposition_gesture_filter.h"
 
+#include <stddef.h>
+
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "ui/events/gesture_event_details.h"
@@ -180,7 +182,7 @@ TouchDispositionGestureFilter::OnGesturePacket(
   return SUCCESS;
 }
 
-void TouchDispositionGestureFilter::OnTouchEventAck(uint32 unique_event_id,
+void TouchDispositionGestureFilter::OnTouchEventAck(uint32_t unique_event_id,
                                                     bool event_consumed) {
   // Spurious asynchronous acks should not trigger a crash.
   if (IsEmpty() || (Head().empty() && sequences_.size() == 1))
diff --git a/ui/events/gesture_detection/touch_disposition_gesture_filter.h b/ui/events/gesture_detection/touch_disposition_gesture_filter.h
index 201dc02..0bea1be 100644
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter.h
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter.h
@@ -5,8 +5,11 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_TOUCH_DISPOSITION_GESTURE_FILTER_H_
 #define UI_EVENTS_GESTURE_DETECTION_TOUCH_DISPOSITION_GESTURE_FILTER_H_
 
+#include <stdint.h>
+
 #include <queue>
 
+#include "base/macros.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gesture_detection/bitset_32.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
@@ -43,7 +46,7 @@ class GESTURE_DETECTION_EXPORT TouchDispositionGestureFilter {
   PacketResult OnGesturePacket(const GestureEventDataPacket& packet);
 
   // OnTouchEventAck must be called upon receipt of every touch event ack.
-  void OnTouchEventAck(uint32 unique_event_id, bool event_consumed);
+  void OnTouchEventAck(uint32_t unique_event_id, bool event_consumed);
 
   // Whether there are any active gesture sequences still queued in the filter.
   bool IsEmpty() const;
diff --git a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
index 15dc48c..078afb7 100644
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter_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 <stdint.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/gesture_detection/touch_disposition_gesture_filter.h"
@@ -116,8 +118,8 @@ class TouchDispositionGestureFilterTest
     return queue_->OnGesturePacket(touch_packet);
   }
 
-  uint32 SendTouchGestures(const MotionEvent& touch,
-                           const GestureEventDataPacket& packet) {
+  uint32_t SendTouchGestures(const MotionEvent& touch,
+                             const GestureEventDataPacket& packet) {
     SendTouchGesturesWithResult(touch, packet);
     last_sent_touch_event_id_ = touch.GetUniqueEventId();
     return touch.GetUniqueEventId();
@@ -134,15 +136,15 @@ class TouchDispositionGestureFilterTest
     return queue_->OnGesturePacket(packet);
   }
 
-  void SendTouchEventAck(uint32 touch_event_id, bool event_consumed) {
+  void SendTouchEventAck(uint32_t touch_event_id, bool event_consumed) {
     queue_->OnTouchEventAck(touch_event_id, event_consumed);
   }
 
-  void SendTouchConsumedAck(uint32 touch_event_id) {
+  void SendTouchConsumedAck(uint32_t touch_event_id) {
     SendTouchEventAck(touch_event_id, true);
   }
 
-  void SendTouchNotConsumedAck(uint32 touch_event_id) {
+  void SendTouchNotConsumedAck(uint32_t touch_event_id) {
     SendTouchEventAck(touch_event_id, false);
   }
 
@@ -188,8 +190,8 @@ class TouchDispositionGestureFilterTest
     return touch_event_;
   }
 
-  uint32 SendPacket(const MockMotionEvent& touch_event,
-                    GestureList gesture_list) {
+  uint32_t SendPacket(const MockMotionEvent& touch_event,
+                      GestureList gesture_list) {
     GestureEventDataPacket gesture_packet;
     for (EventType type : gesture_list)
       gesture_packet.Push(CreateGesture(type));
@@ -276,14 +278,14 @@ class TouchDispositionGestureFilterTest
   gfx::Vector2dF raw_offset_;
   scoped_ptr<GestureEventData> last_sent_gesture_;
   gfx::Rect show_press_bounding_box_;
-  uint32 last_sent_touch_event_id_;
+  uint32_t last_sent_touch_event_id_;
 };
 
 TEST_F(TouchDispositionGestureFilterTest, BasicNoGestures) {
-  uint32 touch_press_event_id = PressTouchPoint().GetUniqueEventId();
+  uint32_t touch_press_event_id = PressTouchPoint().GetUniqueEventId();
   EXPECT_FALSE(GesturesSent());
 
-  uint32 touch_move_event_id = MoveTouchPoint().GetUniqueEventId();
+  uint32_t touch_move_event_id = MoveTouchPoint().GetUniqueEventId();
   EXPECT_FALSE(GesturesSent());
 
   // No gestures should be dispatched by the ack, as the queued packets
@@ -292,7 +294,7 @@ TEST_F(TouchDispositionGestureFilterTest, BasicNoGestures) {
   EXPECT_FALSE(GesturesSent());
 
   // Release the touch gesture.
-  uint32 touch_release_event_id = ReleaseTouchPoint().GetUniqueEventId();
+  uint32_t touch_release_event_id = ReleaseTouchPoint().GetUniqueEventId();
   SendTouchConsumedAck(touch_move_event_id);
   SendTouchConsumedAck(touch_release_event_id);
   EXPECT_FALSE(GesturesSent());
@@ -560,13 +562,13 @@ TEST_F(TouchDispositionGestureFilterTest, UpdateEventsDependOnBeginEvents) {
 
 TEST_F(TouchDispositionGestureFilterTest, MultipleTouchSequences) {
   // Queue two touch-to-gestures sequences.
-  uint32 touch_press_event_id1 =
+  uint32_t touch_press_event_id1 =
       SendPacket(PressTouchPoint(), Gestures(ET_GESTURE_TAP_DOWN));
-  uint32 touch_release_event_id1 =
+  uint32_t touch_release_event_id1 =
       SendPacket(ReleaseTouchPoint(), Gestures(ET_GESTURE_TAP));
-  uint32 touch_press_event_id2 =
+  uint32_t touch_press_event_id2 =
       SendPacket(PressTouchPoint(), Gestures(ET_GESTURE_SCROLL_BEGIN));
-  uint32 touch_release_event_id2 =
+  uint32_t touch_release_event_id2 =
       SendPacket(ReleaseTouchPoint(), Gestures(ET_GESTURE_SCROLL_END));
 
   // The first gesture sequence should not be allowed.
@@ -802,9 +804,9 @@ TEST_F(TouchDispositionGestureFilterTest, SpuriousAcksIgnored) {
   SendTouchConsumedAck(0);
   EXPECT_FALSE(GesturesSent());
 
-  uint32 touch_press_event_id =
+  uint32_t touch_press_event_id =
       SendPacket(PressTouchPoint(), Gestures(ET_GESTURE_SCROLL_BEGIN));
-  uint32 touch_move_event_id =
+  uint32_t touch_move_event_id =
       SendPacket(MoveTouchPoint(), Gestures(ET_GESTURE_SCROLL_UPDATE));
   SendTouchNotConsumedAck(touch_press_event_id);
   SendTouchNotConsumedAck(touch_move_event_id);
@@ -1145,7 +1147,7 @@ TEST_F(TouchDispositionGestureFilterTest, AckQueueBack) {
   // Pending touch move.
   GestureEventDataPacket packet1;
   packet1.Push(CreateGesture(ET_GESTURE_SCROLL_UPDATE, 2, 3, 0));
-  uint32 touch_event_id = SendTouchGestures(MoveTouchPoint(), packet1);
+  uint32_t touch_event_id = SendTouchGestures(MoveTouchPoint(), packet1);
   EXPECT_FALSE(GesturesSent());
 
   // Additional pending touch move.
@@ -1194,9 +1196,9 @@ TEST_F(TouchDispositionGestureFilterTest, AckQueueBack) {
 
 TEST_F(TouchDispositionGestureFilterTest, AckQueueGestureAtBack) {
   // Send gesture sequence
-  uint32 touch_press_event_id1 =
+  uint32_t touch_press_event_id1 =
       SendPacket(PressTouchPoint(), Gestures(ET_GESTURE_BEGIN));
-  uint32 touch_release_event_id1 =
+  uint32_t touch_release_event_id1 =
       SendPacket(ReleaseTouchPoint(), Gestures(ET_GESTURE_END));
 
   // Send second gesture sequence, and synchronously ack it.
@@ -1224,7 +1226,7 @@ TEST_F(TouchDispositionGestureFilterTest, AckQueueGestureAtBack) {
 TEST_F(TouchDispositionGestureFilterTest,
        SyncAcksOnlyTriggerAppropriateGestures) {
   // Queue a touch press.
-  uint32 touch_press_event_id =
+  uint32_t touch_press_event_id =
       SendPacket(PressTouchPoint(), Gestures(ET_GESTURE_BEGIN));
 
   // Send and synchronously ack two touch moves.
@@ -1235,7 +1237,7 @@ TEST_F(TouchDispositionGestureFilterTest,
   SendTouchNotConsumedAckForLastTouch();
 
   // Queue a touch release.
-  uint32 touch_release_event_id =
+  uint32_t touch_release_event_id =
       SendPacket(ReleaseTouchPoint(), Gestures(ET_GESTURE_END));
 
   EXPECT_FALSE(GesturesSent());
diff --git a/ui/events/gesture_detection/velocity_tracker.cc b/ui/events/gesture_detection/velocity_tracker.cc
index 64583fd..4094525 100644
--- a/ui/events/gesture_detection/velocity_tracker.cc
+++ b/ui/events/gesture_detection/velocity_tracker.cc
@@ -4,6 +4,8 @@
 
 #include "ui/events/gesture_detection/velocity_tracker.h"
 
+#include <stddef.h>
+
 #include <cmath>
 
 #include "base/logging.h"
diff --git a/ui/events/gesture_detection/velocity_tracker.h b/ui/events/gesture_detection/velocity_tracker.h
index 8a57150..4126558 100644
--- a/ui/events/gesture_detection/velocity_tracker.h
+++ b/ui/events/gesture_detection/velocity_tracker.h
@@ -5,7 +5,9 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_VELOCITY_TRACKER_H_
 #define UI_EVENTS_GESTURE_DETECTION_VELOCITY_TRACKER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/events/gesture_detection/bitset_32.h"
diff --git a/ui/events/gesture_detection/velocity_tracker_state.h b/ui/events/gesture_detection/velocity_tracker_state.h
index 37906f5..c519ab1 100644
--- a/ui/events/gesture_detection/velocity_tracker_state.h
+++ b/ui/events/gesture_detection/velocity_tracker_state.h
@@ -5,7 +5,9 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_VELOCITY_TRACKER_STATE_H_
 #define UI_EVENTS_GESTURE_DETECTION_VELOCITY_TRACKER_STATE_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "ui/events/gesture_detection/bitset_32.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
 #include "ui/events/gesture_detection/velocity_tracker.h"
diff --git a/ui/events/gesture_detection/velocity_tracker_unittest.cc b/ui/events/gesture_detection/velocity_tracker_unittest.cc
index 564bcd9..b8394c4a 100644
--- a/ui/events/gesture_detection/velocity_tracker_unittest.cc
+++ b/ui/events/gesture_detection/velocity_tracker_unittest.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
diff --git a/ui/events/gestures/blink/web_gesture_curve_impl.cc b/ui/events/gestures/blink/web_gesture_curve_impl.cc
index 6f82330..e0a2f38 100644
--- a/ui/events/gestures/blink/web_gesture_curve_impl.cc
+++ b/ui/events/gestures/blink/web_gesture_curve_impl.cc
@@ -8,6 +8,7 @@
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
+#include "build/build_config.h"
 #include "third_party/WebKit/public/platform/WebFloatSize.h"
 #include "third_party/WebKit/public/platform/WebGestureCurveTarget.h"
 #include "ui/events/gestures/fling_curve.h"
diff --git a/ui/events/gestures/blink/web_gesture_curve_impl.h b/ui/events/gestures/blink/web_gesture_curve_impl.h
index dac6b9a..d66e842 100644
--- a/ui/events/gestures/blink/web_gesture_curve_impl.h
+++ b/ui/events/gestures/blink/web_gesture_curve_impl.h
@@ -5,6 +5,8 @@
 #ifndef UI_EVENTS_GESTURES_BLINK_WEB_GESTURE_CURVE_IMPL_H_
 #define UI_EVENTS_GESTURES_BLINK_WEB_GESTURE_CURVE_IMPL_H_
 
+#include <stdint.h>
+
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/WebKit/public/platform/WebGestureCurve.h"
@@ -49,7 +51,7 @@ class WebGestureCurveImpl : public NON_EXPORTED_BASE(blink::WebGestureCurve) {
   gfx::Vector2dF last_offset_;
 
   ThreadType animating_thread_type_;
-  int64 ticks_since_first_animate_;
+  int64_t ticks_since_first_animate_;
   double first_animate_time_;
   double last_animate_time_;
 
diff --git a/ui/events/gestures/fling_curve.h b/ui/events/gestures/fling_curve.h
index edf0910..18a69d3 100644
--- a/ui/events/gestures/fling_curve.h
+++ b/ui/events/gestures/fling_curve.h
@@ -5,6 +5,7 @@
 #ifndef UI_EVENTS_GESTURES_FLING_CURVE_H_
 #define UI_EVENTS_GESTURES_FLING_CURVE_H_
 
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/events/events_base_export.h"
 #include "ui/events/gesture_curve.h"
diff --git a/ui/events/gestures/gesture_provider_aura.cc b/ui/events/gestures/gesture_provider_aura.cc
index 4e11a76..9bfe5fd 100644
--- a/ui/events/gestures/gesture_provider_aura.cc
+++ b/ui/events/gestures/gesture_provider_aura.cc
@@ -41,7 +41,7 @@ bool GestureProviderAura::OnTouchEvent(TouchEvent* event) {
   return true;
 }
 
-void GestureProviderAura::OnTouchEventAck(uint32 unique_event_id,
+void GestureProviderAura::OnTouchEventAck(uint32_t unique_event_id,
                                           bool event_consumed) {
   DCHECK(pending_gestures_.empty());
   DCHECK(!handling_event_);
diff --git a/ui/events/gestures/gesture_provider_aura.h b/ui/events/gestures/gesture_provider_aura.h
index f2416fb..f696eb9 100644
--- a/ui/events/gestures/gesture_provider_aura.h
+++ b/ui/events/gestures/gesture_provider_aura.h
@@ -5,7 +5,9 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_
 #define UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/events/event.h"
 #include "ui/events/events_export.h"
@@ -38,7 +40,7 @@ class EVENTS_EXPORT GestureProviderAura : public GestureProviderClient {
   }
 
   bool OnTouchEvent(TouchEvent* event);
-  void OnTouchEventAck(uint32 unique_event_id, bool event_consumed);
+  void OnTouchEventAck(uint32_t unique_event_id, bool event_consumed);
   const MotionEventAura& pointer_state() { return pointer_state_; }
   ScopedVector<GestureEvent>* GetAndResetPendingGestures();
 
diff --git a/ui/events/gestures/gesture_recognizer.h b/ui/events/gestures/gesture_recognizer.h
index b735b65..2456852 100644
--- a/ui/events/gestures/gesture_recognizer.h
+++ b/ui/events/gestures/gesture_recognizer.h
@@ -5,6 +5,8 @@
 #ifndef UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_H_
 #define UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
@@ -35,7 +37,7 @@ class EVENTS_EXPORT GestureRecognizer {
   // Returns a list of zero or more GestureEvents. The caller is responsible for
   // freeing the returned events. Acks the gesture packet in the queue which
   // matches with unique_event_id.
-  virtual Gestures* AckTouchEvent(uint32 unique_event_id,
+  virtual Gestures* AckTouchEvent(uint32_t unique_event_id,
                                   ui::EventResult result,
                                   GestureConsumer* consumer) = 0;
 
diff --git a/ui/events/gestures/gesture_recognizer_impl.cc b/ui/events/gestures/gesture_recognizer_impl.cc
index 3066612..9054af0 100644
--- a/ui/events/gestures/gesture_recognizer_impl.cc
+++ b/ui/events/gestures/gesture_recognizer_impl.cc
@@ -4,6 +4,8 @@
 
 #include "ui/events/gestures/gesture_recognizer_impl.h"
 
+#include <stddef.h>
+
 #include <limits>
 
 #include "base/command_line.h"
@@ -227,7 +229,7 @@ bool GestureRecognizerImpl::ProcessTouchEventPreDispatch(
 }
 
 GestureRecognizer::Gestures* GestureRecognizerImpl::AckTouchEvent(
-    uint32 unique_event_id,
+    uint32_t unique_event_id,
     ui::EventResult result,
     GestureConsumer* consumer) {
   GestureProviderAura* gesture_provider =
diff --git a/ui/events/gestures/gesture_recognizer_impl.h b/ui/events/gestures/gesture_recognizer_impl.h
index 8e3185a..756b354 100644
--- a/ui/events/gestures/gesture_recognizer_impl.h
+++ b/ui/events/gestures/gesture_recognizer_impl.h
@@ -5,9 +5,12 @@
 #ifndef UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
 #define UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_constants.h"
@@ -61,7 +64,7 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
   bool ProcessTouchEventPreDispatch(TouchEvent* event,
                                     GestureConsumer* consumer) override;
 
-  Gestures* AckTouchEvent(uint32 unique_event_id,
+  Gestures* AckTouchEvent(uint32_t unique_event_id,
                           ui::EventResult result,
                           GestureConsumer* consumer) override;
 
diff --git a/ui/events/gestures/gesture_recognizer_impl_mac.cc b/ui/events/gestures/gesture_recognizer_impl_mac.cc
index cf605078..f48f870 100644
--- a/ui/events/gestures/gesture_recognizer_impl_mac.cc
+++ b/ui/events/gestures/gesture_recognizer_impl_mac.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include "base/macros.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 
@@ -22,7 +24,7 @@ class GestureRecognizerImplMac : public GestureRecognizer {
     return false;
   }
 
-  Gestures* AckTouchEvent(uint32 unique_event_id,
+  Gestures* AckTouchEvent(uint32_t unique_event_id,
                           ui::EventResult result,
                           GestureConsumer* consumer) override {
     return NULL;
diff --git a/ui/events/gestures/motion_event_aura.h b/ui/events/gestures/motion_event_aura.h
index 7229b35..6cd81ec 100644
--- a/ui/events/gestures/motion_event_aura.h
+++ b/ui/events/gestures/motion_event_aura.h
@@ -5,8 +5,11 @@
 #ifndef UI_EVENTS_GESTURE_DETECTION_UI_MOTION_EVENT_H_
 #define UI_EVENTS_GESTURE_DETECTION_UI_MOTION_EVENT_H_
 
+#include <stddef.h>
+
 #include <map>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/events/event.h"
diff --git a/ui/events/ipc/latency_info_param_traits.cc b/ui/events/ipc/latency_info_param_traits.cc
index 1981bb2..27d9ab6 100644
--- a/ui/events/ipc/latency_info_param_traits.cc
+++ b/ui/events/ipc/latency_info_param_traits.cc
@@ -54,7 +54,7 @@ bool ParamTraits<ui::LatencyInfo>::Read(const Message* m,
     return false;
 
   ui::LatencyInfo::InputCoordinate input_coordinates;
-  uint32 input_coordinates_size;
+  uint32_t input_coordinates_size;
   if (!ReadParam(m, iter, &input_coordinates_size))
     return false;
   for (size_t i = 0; i < input_coordinates_size; i++) {
@@ -65,7 +65,7 @@ bool ParamTraits<ui::LatencyInfo>::Read(const Message* m,
   }
 
   double timestamp;
-  uint32 coalesced_events_size;
+  uint32_t coalesced_events_size;
   if (!ReadParam(m, iter, &coalesced_events_size))
     return false;
   for (size_t i = 0; i < coalesced_events_size; i++) {
diff --git a/ui/events/ipc/latency_info_param_traits_unittest.cc b/ui/events/ipc/latency_info_param_traits_unittest.cc
index d5dc6b8..12f6a51 100644
--- a/ui/events/ipc/latency_info_param_traits_unittest.cc
+++ b/ui/events/ipc/latency_info_param_traits_unittest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "ipc/ipc_message_macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/ipc/latency_info_param_traits.h"
@@ -77,13 +80,13 @@ TEST(LatencyInfoParamTraitsTest, InvalidData) {
   IPC::WriteParam(&msg, std::string());
   ui::LatencyInfo::LatencyMap components;
   IPC::WriteParam(&msg, components);
-  IPC::WriteParam(&msg, static_cast<uint32>(2));
+  IPC::WriteParam(&msg, static_cast<uint32_t>(2));
   IPC::WriteParam(&msg, ui::LatencyInfo::InputCoordinate());
   IPC::WriteParam(&msg, ui::LatencyInfo::InputCoordinate());
   // coalesced_events_size is 2 but only one event timestamp is written.
-  IPC::WriteParam(&msg, static_cast<uint32>(2));
+  IPC::WriteParam(&msg, static_cast<uint32_t>(2));
   IPC::WriteParam(&msg, static_cast<double>(10.0));
-  IPC::WriteParam(&msg, static_cast<int64>(1234));
+  IPC::WriteParam(&msg, static_cast<int64_t>(1234));
   IPC::WriteParam(&msg, true);
 
   base::PickleIterator iter(msg);
diff --git a/ui/events/keycodes/dom/keycode_converter.cc b/ui/events/keycodes/dom/keycode_converter.cc
index af38fdf..b1373b4 100644
--- a/ui/events/keycodes/dom/keycode_converter.cc
+++ b/ui/events/keycodes/dom/keycode_converter.cc
@@ -5,7 +5,9 @@
 #include "ui/events/keycodes/dom/keycode_converter.h"
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/utf_string_conversion_utils.h"
+#include "build/build_config.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/dom_key.h"
 
@@ -189,7 +191,8 @@ DomKey KeycodeConverter::KeyStringToDomKey(const std::string& key) {
   // the key value is that character.
   int32_t char_index = 0;
   uint32_t character;
-  if (base::ReadUnicodeCharacter(key.c_str(), static_cast<int32>(key.length()),
+  if (base::ReadUnicodeCharacter(key.c_str(),
+                                 static_cast<int32_t>(key.length()),
                                  &char_index, &character) &&
       key[++char_index] == 0) {
     return DomKey::FromCharacter(character);
diff --git a/ui/events/keycodes/dom/keycode_converter.h b/ui/events/keycodes/dom/keycode_converter.h
index 4bdc088..1834835 100644
--- a/ui/events/keycodes/dom/keycode_converter.h
+++ b/ui/events/keycodes/dom/keycode_converter.h
@@ -5,10 +5,11 @@
 #ifndef UI_EVENTS_KEYCODES_DOM4_KEYCODE_CONVERTER_H_
 #define UI_EVENTS_KEYCODES_DOM4_KEYCODE_CONVERTER_H_
 
+#include <stddef.h>
 #include <stdint.h>
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/events/keycodes/dom/dom_key.h"
 
 // For reference, the W3C UI Event spec is located at:
diff --git a/ui/events/keycodes/dom/keycode_converter_unittest.cc b/ui/events/keycodes/dom/keycode_converter_unittest.cc
index 094cfc7..68e2864 100644
--- a/ui/events/keycodes/dom/keycode_converter_unittest.cc
+++ b/ui/events/keycodes/dom/keycode_converter_unittest.cc
@@ -4,9 +4,12 @@
 
 #include "ui/events/keycodes/dom/keycode_converter.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 
-#include "base/basictypes.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/dom_key.h"
diff --git a/ui/events/keycodes/dom_us_layout_data.h b/ui/events/keycodes/dom_us_layout_data.h
index d3fe962..745d49e 100644
--- a/ui/events/keycodes/dom_us_layout_data.h
+++ b/ui/events/keycodes/dom_us_layout_data.h
@@ -5,6 +5,8 @@
 #ifndef UI_EVENTS_KEYCODES_DOM_US_LAYOUT_DATA_H_
 #define UI_EVENTS_KEYCODES_DOM_US_LAYOUT_DATA_H_
 
+#include "build/build_config.h"
+
 namespace ui {
 
 // This table maps a DomCode to a printable character, assuming US layout.
diff --git a/ui/events/keycodes/keyboard_code_conversion.cc b/ui/events/keycodes/keyboard_code_conversion.cc
index 0ac1a0c..21c8185 100644
--- a/ui/events/keycodes/keyboard_code_conversion.cc
+++ b/ui/events/keycodes/keyboard_code_conversion.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/macros.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/dom_key.h"
diff --git a/ui/events/keycodes/keyboard_code_conversion_mac.h b/ui/events/keycodes/keyboard_code_conversion_mac.h
index 7f2a272..3390eca 100644
--- a/ui/events/keycodes/keyboard_code_conversion_mac.h
+++ b/ui/events/keycodes/keyboard_code_conversion_mac.h
@@ -7,7 +7,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/basictypes.h"
 #include "ui/events/events_base_export.h"
 #include "ui/events/keycodes/dom/dom_key.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
diff --git a/ui/events/keycodes/keyboard_code_conversion_mac.mm b/ui/events/keycodes/keyboard_code_conversion_mac.mm
index 308ed03..f435f4e 100644
--- a/ui/events/keycodes/keyboard_code_conversion_mac.mm
+++ b/ui/events/keycodes/keyboard_code_conversion_mac.mm
@@ -9,6 +9,7 @@
 #import <Carbon/Carbon.h>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 
 namespace ui {
diff --git a/ui/events/keycodes/keyboard_code_conversion_unittest.cc b/ui/events/keycodes/keyboard_code_conversion_unittest.cc
index 9e63944..0ad20f5 100644
--- a/ui/events/keycodes/keyboard_code_conversion_unittest.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_unittest.cc
@@ -4,7 +4,8 @@
 
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
diff --git a/ui/events/keycodes/keyboard_code_conversion_x.cc b/ui/events/keycodes/keyboard_code_conversion_x.cc
index 2b11557..d0354531 100644
--- a/ui/events/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_x.cc
@@ -4,6 +4,8 @@
 
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #define XK_3270  // for XK_3270_BackTab
@@ -13,8 +15,8 @@
 #include <X11/extensions/XInput2.h>
 #include <X11/keysym.h>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ -58,7 +60,7 @@ namespace {
 //
 const struct MAP0 {
   KeySym ch0;
-  uint8 vk;
+  uint8_t vk;
   bool operator()(const MAP0& m1, const MAP0& m2) const {
     return m1.ch0 < m2.ch0;
   }
@@ -119,7 +121,7 @@ const struct MAP0 {
 const struct MAP1 {
   KeySym ch0;
   unsigned sc;
-  uint8 vk;
+  uint8_t vk;
   bool operator()(const MAP1& m1, const MAP1& m2) const {
     if (m1.ch0 == m2.ch0)
       return m1.sc < m2.sc;
@@ -305,7 +307,7 @@ const struct MAP2 {
   KeySym ch0;
   unsigned sc;
   KeySym ch1;
-  uint8 vk;
+  uint8_t vk;
   bool operator()(const MAP2& m1, const MAP2& m2) const {
     if (m1.ch0 == m2.ch0 && m1.sc == m2.sc)
       return m1.ch1 < m2.ch1;
@@ -350,7 +352,7 @@ const struct MAP3 {
   unsigned sc;
   KeySym ch1;
   KeySym ch2;
-  uint8 vk;
+  uint8_t vk;
   bool operator()(const MAP3& m1, const MAP3& m2) const {
     if (m1.ch0 == m2.ch0 && m1.sc == m2.sc && m1.ch1 == m2.ch1)
       return m1.ch2 < m2.ch2;
@@ -884,7 +886,7 @@ DomCode CodeFromXEvent(const XEvent* xev) {
   return ui::KeycodeConverter::NativeKeycodeToDomCode(keycode);
 }
 
-uint16 GetCharacterFromXEvent(const XEvent* xev) {
+uint16_t GetCharacterFromXEvent(const XEvent* xev) {
   XEvent xkeyevent = {0};
   const XKeyEvent* xkey = NULL;
   if (xev->type == GenericEvent) {
diff --git a/ui/events/keycodes/keyboard_code_conversion_x.h b/ui/events/keycodes/keyboard_code_conversion_x.h
index 7ead7c2..9d8cfaf 100644
--- a/ui/events/keycodes/keyboard_code_conversion_x.h
+++ b/ui/events/keycodes/keyboard_code_conversion_x.h
@@ -5,7 +5,8 @@
 #ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
 #define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/strings/string16.h"
 #include "ui/events/events_base_export.h"
 #include "ui/events/keycodes/dom/dom_key.h"
@@ -25,7 +26,7 @@ EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym);
 EVENTS_BASE_EXPORT DomCode CodeFromXEvent(const XEvent* xev);
 
 // Returns a character on a standard US PC keyboard from an XEvent.
-EVENTS_BASE_EXPORT uint16 GetCharacterFromXEvent(const XEvent* xev);
+EVENTS_BASE_EXPORT uint16_t GetCharacterFromXEvent(const XEvent* xev);
 
 // Returns DomKey and character from an XEvent.
 EVENTS_BASE_EXPORT DomKey GetDomKeyFromXEvent(const XEvent* xev);
diff --git a/ui/events/keycodes/keyboard_code_conversion_xkb.cc b/ui/events/keycodes/keyboard_code_conversion_xkb.cc
index aec3f75..a0bc96a 100644
--- a/ui/events/keycodes/keyboard_code_conversion_xkb.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_xkb.cc
@@ -4,6 +4,7 @@
 
 #include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
 
+#include "build/build_config.h"
 #include "ui/events/keycodes/dom/dom_key.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 
diff --git a/ui/events/latency_info.cc b/ui/events/latency_info.cc
index 5fdbb71..cd03d4c 100644
--- a/ui/events/latency_info.cc
+++ b/ui/events/latency_info.cc
@@ -4,12 +4,15 @@
 
 #include "ui/events/latency_info.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <string>
 #include <utility>
 
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 
 namespace {
@@ -148,7 +151,7 @@ LatencyInfo::LatencyInfo()
 LatencyInfo::~LatencyInfo() {
 }
 
-LatencyInfo::LatencyInfo(int64 trace_id, bool terminated)
+LatencyInfo::LatencyInfo(int64_t trace_id, bool terminated)
     : input_coordinates_size_(0),
       coalesced_events_size_(0),
       trace_id_(trace_id),
@@ -193,38 +196,38 @@ void LatencyInfo::AddNewLatencyFrom(const LatencyInfo& other) {
 }
 
 void LatencyInfo::AddLatencyNumber(LatencyComponentType component,
-                                   int64 id,
-                                   int64 component_sequence_number) {
+                                   int64_t id,
+                                   int64_t component_sequence_number) {
   AddLatencyNumberWithTimestampImpl(component, id, component_sequence_number,
                                     base::TimeTicks::Now(), 1, nullptr);
 }
 
 void LatencyInfo::AddLatencyNumberWithTraceName(
     LatencyComponentType component,
-    int64 id,
-    int64 component_sequence_number,
+    int64_t id,
+    int64_t component_sequence_number,
     const char* trace_name_str) {
   AddLatencyNumberWithTimestampImpl(component, id, component_sequence_number,
                                     base::TimeTicks::Now(), 1, trace_name_str);
 }
 
-void LatencyInfo::AddLatencyNumberWithTimestamp(LatencyComponentType component,
-                                                int64 id,
-                                                int64 component_sequence_number,
-                                                base::TimeTicks time,
-                                                uint32 event_count) {
+void LatencyInfo::AddLatencyNumberWithTimestamp(
+    LatencyComponentType component,
+    int64_t id,
+    int64_t component_sequence_number,
+    base::TimeTicks time,
+    uint32_t event_count) {
   AddLatencyNumberWithTimestampImpl(component, id, component_sequence_number,
                                     time, event_count, nullptr);
 }
 
 void LatencyInfo::AddLatencyNumberWithTimestampImpl(
     LatencyComponentType component,
-    int64 id,
-    int64 component_sequence_number,
+    int64_t id,
+    int64_t component_sequence_number,
     base::TimeTicks time,
-    uint32 event_count,
+    uint32_t event_count,
     const char* trace_name_str) {
-
   const unsigned char* latency_info_enabled =
       g_latency_info_enabled.Get().latency_info_enabled;
 
@@ -240,7 +243,7 @@ void LatencyInfo::AddLatencyNumberWithTimestampImpl(
       // originally created, e.g. the timestamp of its ORIGINAL/UI_COMPONENT,
       // not when we actually issue the ASYNC_BEGIN trace event.
       LatencyComponent begin_component;
-      int64 ts = 0;
+      int64_t ts = 0;
       if (FindLatency(INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT,
                       0,
                       &begin_component) ||
@@ -281,7 +284,7 @@ void LatencyInfo::AddLatencyNumberWithTimestampImpl(
   } else {
     it->second.sequence_number = std::max(component_sequence_number,
                                           it->second.sequence_number);
-    uint32 new_count = event_count + it->second.event_count;
+    uint32_t new_count = event_count + it->second.event_count;
     if (event_count > 0 && new_count != 0) {
       // Do a weighted average, so that the new event_time is the average of
       // the times of events currently in this structure with the time passed
@@ -346,7 +349,7 @@ LatencyInfo::CoordinatesAsTraceableData() {
 }
 
 bool LatencyInfo::FindLatency(LatencyComponentType type,
-                              int64 id,
+                              int64_t id,
                               LatencyComponent* output) const {
   LatencyMap::const_iterator it = latency_components_.find(
       std::make_pair(type, id));
diff --git a/ui/events/latency_info.h b/ui/events/latency_info.h
index fc7f95b..77efe5f7 100644
--- a/ui/events/latency_info.h
+++ b/ui/events/latency_info.h
@@ -5,11 +5,12 @@
 #ifndef UI_EVENTS_LATENCY_INFO_H_
 #define UI_EVENTS_LATENCY_INFO_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/small_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
@@ -102,11 +103,11 @@ class EVENTS_BASE_EXPORT LatencyInfo {
     // Nondecreasing number that can be used to determine what events happened
     // in the component at the time this struct was sent on to the next
     // component.
-    int64 sequence_number;
+    int64_t sequence_number;
     // Average time of events that happened in this component.
     base::TimeTicks event_time;
     // Count of events that happened in this component
-    uint32 event_count;
+    uint32_t event_count;
   };
 
   struct EVENTS_BASE_EXPORT InputCoordinate {
@@ -123,17 +124,17 @@ class EVENTS_BASE_EXPORT LatencyInfo {
   enum { kMaxCoalescedEventTimestamps = 2 };
   enum { kMaxInputCoordinates = 2 };
 
-  // Map a Latency Component (with a component-specific int64 id) to a
+  // Map a Latency Component (with a component-specific int64_t id) to a
   // component info.
   typedef base::SmallMap<
-      std::map<std::pair<LatencyComponentType, int64>, LatencyComponent>,
+      std::map<std::pair<LatencyComponentType, int64_t>, LatencyComponent>,
       kTypicalMaxComponentsPerLatencyInfo> LatencyMap;
 
   LatencyInfo();
   ~LatencyInfo();
 
   // For test only.
-  LatencyInfo(int64 trace_id, bool terminated);
+  LatencyInfo(int64_t trace_id, bool terminated);
 
   // Returns true if the vector |latency_info| is valid. Returns false
   // if it is not valid and log the |referring_msg|.
@@ -154,30 +155,30 @@ class EVENTS_BASE_EXPORT LatencyInfo {
   // Modifies the current sequence number for a component, and adds a new
   // sequence number with the current timestamp.
   void AddLatencyNumber(LatencyComponentType component,
-                        int64 id,
-                        int64 component_sequence_number);
+                        int64_t id,
+                        int64_t component_sequence_number);
 
   // Similar to |AddLatencyNumber|, and also appends |trace_name_str| to
   // the trace event's name.
   // This function should only be called when adding a BEGIN component.
   void AddLatencyNumberWithTraceName(LatencyComponentType component,
-                                     int64 id,
-                                     int64 component_sequence_number,
+                                     int64_t id,
+                                     int64_t component_sequence_number,
                                      const char* trace_name_str);
 
   // Modifies the current sequence number and adds a certain number of events
   // for a specific component.
   void AddLatencyNumberWithTimestamp(LatencyComponentType component,
-                                     int64 id,
-                                     int64 component_sequence_number,
+                                     int64_t id,
+                                     int64_t component_sequence_number,
                                      base::TimeTicks time,
-                                     uint32 event_count);
+                                     uint32_t event_count);
 
   // Returns true if the a component with |type| and |id| is found in
   // the latency_components and the component is stored to |output| if
   // |output| is not NULL. Returns false if no such component is found.
   bool FindLatency(LatencyComponentType type,
-                   int64 id,
+                   int64_t id,
                    LatencyComponent* output) const;
 
   void RemoveLatency(LatencyComponentType type);
@@ -186,7 +187,7 @@ class EVENTS_BASE_EXPORT LatencyInfo {
   // false otherwise.
   bool AddInputCoordinate(const InputCoordinate& input_coordinate);
 
-  uint32 input_coordinates_size() const { return input_coordinates_size_; }
+  uint32_t input_coordinates_size() const { return input_coordinates_size_; }
   const InputCoordinate* input_coordinates() const {
     return input_coordinates_;
   }
@@ -195,7 +196,7 @@ class EVENTS_BASE_EXPORT LatencyInfo {
   // false otherwise.
   bool AddCoalescedEventTimestamp(double timestamp);
 
-  uint32 coalesced_events_size() const { return coalesced_events_size_; }
+  uint32_t coalesced_events_size() const { return coalesced_events_size_; }
   const double* timestamps_of_coalesced_events() const {
     return timestamps_of_coalesced_events_;
   }
@@ -203,14 +204,14 @@ class EVENTS_BASE_EXPORT LatencyInfo {
   const LatencyMap& latency_components() const { return latency_components_; }
 
   bool terminated() const { return terminated_; }
-  int64 trace_id() const { return trace_id_; }
+  int64_t trace_id() const { return trace_id_; }
 
  private:
   void AddLatencyNumberWithTimestampImpl(LatencyComponentType component,
-                                         int64 id,
-                                         int64 component_sequence_number,
+                                         int64_t id,
+                                         int64_t component_sequence_number,
                                          base::TimeTicks time,
-                                         uint32 event_count,
+                                         uint32_t event_count,
                                          const char* trace_name_str);
 
   // Converts latencyinfo into format that can be dumped into trace buffer.
@@ -225,14 +226,14 @@ class EVENTS_BASE_EXPORT LatencyInfo {
   LatencyMap latency_components_;
 
   // These coordinates represent window coordinates of the original input event.
-  uint32 input_coordinates_size_;
+  uint32_t input_coordinates_size_;
   InputCoordinate input_coordinates_[kMaxInputCoordinates];
 
-  uint32 coalesced_events_size_;
+  uint32_t coalesced_events_size_;
   double timestamps_of_coalesced_events_[kMaxCoalescedEventTimestamps];
 
   // The unique id for matching the ASYNC_BEGIN/END trace event.
-  int64 trace_id_;
+  int64_t trace_id_;
   // Whether a terminal component has been added.
   bool terminated_;
 
diff --git a/ui/events/latency_info_unittest.cc b/ui/events/latency_info_unittest.cc
index c0d654a..a3dac96 100644
--- a/ui/events/latency_info_unittest.cc
+++ b/ui/events/latency_info_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ui/events/latency_info.h"
 
+#include <stddef.h>
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
diff --git a/ui/events/ozone/chromeos/cursor_controller.h b/ui/events/ozone/chromeos/cursor_controller.h
index a35971e..68c07b9 100644
--- a/ui/events/ozone/chromeos/cursor_controller.h
+++ b/ui/events/ozone/chromeos/cursor_controller.h
@@ -8,6 +8,7 @@
 #include <map>
 
 #include "base/event_types.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 #include "ui/events/ozone/events_ozone_export.h"
diff --git a/ui/events/ozone/chromeos/cursor_controller_unittest.cc b/ui/events/ozone/chromeos/cursor_controller_unittest.cc
index afc97d0..2d96a7a 100644
--- a/ui/events/ozone/chromeos/cursor_controller_unittest.cc
+++ b/ui/events/ozone/chromeos/cursor_controller_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/ozone/chromeos/cursor_controller.h"
 
diff --git a/ui/events/ozone/device/udev/device_manager_udev.cc b/ui/events/ozone/device/udev/device_manager_udev.cc
index f05695b..9550a25 100644
--- a/ui/events/ozone/device/udev/device_manager_udev.cc
+++ b/ui/events/ozone/device/udev/device_manager_udev.cc
@@ -4,6 +4,9 @@
 
 #include "ui/events/ozone/device/udev/device_manager_udev.h"
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/events/ozone/device/device_event.h"
diff --git a/ui/events/ozone/device/udev/device_manager_udev.h b/ui/events/ozone/device/udev/device_manager_udev.h
index 8031c80..5d2d70e 100644
--- a/ui/events/ozone/device/udev/device_manager_udev.h
+++ b/ui/events/ozone/device/udev/device_manager_udev.h
@@ -5,6 +5,7 @@
 #ifndef UI_EVENTS_OZONE_DEVICE_UDEV_DEVICE_MANAGER_UDEV_H_
 #define UI_EVENTS_OZONE_DEVICE_UDEV_DEVICE_MANAGER_UDEV_H_
 
+#include "base/macros.h"
 #include "base/message_loop/message_pump_libevent.h"
 #include "base/observer_list.h"
 #include "device/udev_linux/scoped_udev.h"
diff --git a/ui/events/ozone/evdev/event_converter_evdev.cc b/ui/events/ozone/evdev/event_converter_evdev.cc
index de24b95..e6c5fa8 100644
--- a/ui/events/ozone/evdev/event_converter_evdev.cc
+++ b/ui/events/ozone/evdev/event_converter_evdev.cc
@@ -4,6 +4,7 @@
 
 #include <errno.h>
 #include <linux/input.h>
+#include <stddef.h>
 
 #include "ui/events/ozone/evdev/event_converter_evdev.h"
 
@@ -144,7 +145,6 @@ void EventConverterEvdev::SetTouchEventLoggingEnabled(bool enabled) {
 base::TimeDelta EventConverterEvdev::TimeDeltaFromInputEvent(
     const input_event& event) {
   return base::TimeDelta::FromMicroseconds(
-      static_cast<int64>(event.time.tv_sec) * 1000000L +
-      event.time.tv_usec);
+      static_cast<int64_t>(event.time.tv_sec) * 1000000L + event.time.tv_usec);
 }
 }  // namespace ui
diff --git a/ui/events/ozone/evdev/event_converter_evdev.h b/ui/events/ozone/evdev/event_converter_evdev.h
index eb6cacd..bee893b 100644
--- a/ui/events/ozone/evdev/event_converter_evdev.h
+++ b/ui/events/ozone/evdev/event_converter_evdev.h
@@ -5,10 +5,13 @@
 #ifndef UI_EVENTS_OZONE_EVDEV_EVENT_CONVERTER_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_EVENT_CONVERTER_EVDEV_H_
 
+#include <stdint.h>
+
 #include <set>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/ozone/evdev/event_dispatch_callback.h"
diff --git a/ui/events/ozone/evdev/event_converter_evdev_impl.cc b/ui/events/ozone/evdev/event_converter_evdev_impl.cc
index 5e3f529..c9a60a6 100644
--- a/ui/events/ozone/evdev/event_converter_evdev_impl.cc
+++ b/ui/events/ozone/evdev/event_converter_evdev_impl.cc
@@ -6,6 +6,7 @@
 
 #include <errno.h>
 #include <linux/input.h>
+#include <stddef.h>
 
 #include "base/trace_event/trace_event.h"
 #include "ui/events/event.h"
diff --git a/ui/events/ozone/evdev/event_converter_evdev_impl.h b/ui/events/ozone/evdev/event_converter_evdev_impl.h
index b70d6cb..16bf95c 100644
--- a/ui/events/ozone/evdev/event_converter_evdev_impl.h
+++ b/ui/events/ozone/evdev/event_converter_evdev_impl.h
@@ -8,6 +8,7 @@
 #include <bitset>
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/message_loop/message_pump_libevent.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/event.h"
diff --git a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
index 533c3b8..e2309bd 100644
--- a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
+++ b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
diff --git a/ui/events/ozone/evdev/event_converter_test_util.cc b/ui/events/ozone/evdev/event_converter_test_util.cc
index 457503f..162d706 100644
--- a/ui/events/ozone/evdev/event_converter_test_util.cc
+++ b/ui/events/ozone/evdev/event_converter_test_util.cc
@@ -4,6 +4,8 @@
 
 #include "ui/events/ozone/evdev/event_converter_test_util.h"
 
+#include <stdint.h>
+
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
diff --git a/ui/events/ozone/evdev/event_device_info.cc b/ui/events/ozone/evdev/event_device_info.cc
index dc096b6..aa877e0 100644
--- a/ui/events/ozone/evdev/event_device_info.cc
+++ b/ui/events/ozone/evdev/event_device_info.cc
@@ -8,6 +8,7 @@
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/threading/thread_restrictions.h"
 #include "ui/events/devices/device_util_linux.h"
 
diff --git a/ui/events/ozone/evdev/event_device_info.h b/ui/events/ozone/evdev/event_device_info.h
index 0979f9d..b4ddbcd 100644
--- a/ui/events/ozone/evdev/event_device_info.h
+++ b/ui/events/ozone/evdev/event_device_info.h
@@ -7,11 +7,13 @@
 
 #include <limits.h>
 #include <linux/input.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/ozone/evdev/event_device_util.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
diff --git a/ui/events/ozone/evdev/event_device_info_unittest.cc b/ui/events/ozone/evdev/event_device_info_unittest.cc
index 7cad86b..0b7019a 100644
--- a/ui/events/ozone/evdev/event_device_info_unittest.cc
+++ b/ui/events/ozone/evdev/event_device_info_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/format_macros.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
diff --git a/ui/events/ozone/evdev/event_device_test_util.cc b/ui/events/ozone/evdev/event_device_test_util.cc
index f9feb04..d1d7d24 100644
--- a/ui/events/ozone/evdev/event_device_test_util.cc
+++ b/ui/events/ozone/evdev/event_device_test_util.cc
@@ -4,7 +4,10 @@
 
 #include "ui/events/ozone/evdev/event_device_test_util.h"
 
+#include <stdint.h>
+
 #include "base/format_macros.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
diff --git a/ui/events/ozone/evdev/event_device_test_util.h b/ui/events/ozone/evdev/event_device_test_util.h
index 6439ac9..54c1a34 100644
--- a/ui/events/ozone/evdev/event_device_test_util.h
+++ b/ui/events/ozone/evdev/event_device_test_util.h
@@ -6,6 +6,7 @@
 #define UI_EVENTS_OZONE_EVDEV_EVENT_DEVICE_TEST_UTIL_H_
 
 #include <linux/input.h>
+#include <stddef.h>
 
 namespace ui {
 
diff --git a/ui/events/ozone/evdev/event_factory_evdev.h b/ui/events/ozone/evdev/event_factory_evdev.h
index 61cac56..c4d68c6 100644
--- a/ui/events/ozone/evdev/event_factory_evdev.h
+++ b/ui/events/ozone/evdev/event_factory_evdev.h
@@ -8,6 +8,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
 #include "ui/events/ozone/device/device_event_observer.h"
diff --git a/ui/events/ozone/evdev/event_modifiers_evdev.h b/ui/events/ozone/evdev/event_modifiers_evdev.h
index e8c938d..9885156 100644
--- a/ui/events/ozone/evdev/event_modifiers_evdev.h
+++ b/ui/events/ozone/evdev/event_modifiers_evdev.h
@@ -5,7 +5,7 @@
 #ifndef UI_EVENTS_OZONE_EVDEV_EVENT_MODIFIERS_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_EVENT_MODIFIERS_EVDEV_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 
 namespace ui {
diff --git a/ui/events/ozone/evdev/event_thread_evdev.h b/ui/events/ozone/evdev/event_thread_evdev.h
index fa494fc..a7c90bb 100644
--- a/ui/events/ozone/evdev/event_thread_evdev.h
+++ b/ui/events/ozone/evdev/event_thread_evdev.h
@@ -6,6 +6,7 @@
 #define UI_EVENTS_OZONE_EVDEV_EVENT_THREAD_EVDEV_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace base {
diff --git a/ui/events/ozone/evdev/input_controller_evdev.h b/ui/events/ozone/evdev/input_controller_evdev.h
index 9ee4cf7..a590b35 100644
--- a/ui/events/ozone/evdev/input_controller_evdev.h
+++ b/ui/events/ozone/evdev/input_controller_evdev.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 #include "ui/events/ozone/evdev/input_device_settings_evdev.h"
diff --git a/ui/events/ozone/evdev/input_device_factory_evdev.cc b/ui/events/ozone/evdev/input_device_factory_evdev.cc
index 1bf9114..0ab72a7f 100644
--- a/ui/events/ozone/evdev/input_device_factory_evdev.cc
+++ b/ui/events/ozone/evdev/input_device_factory_evdev.cc
@@ -6,6 +6,7 @@
 
 #include <fcntl.h>
 #include <linux/input.h>
+#include <stddef.h>
 
 #include "base/stl_util.h"
 #include "base/thread_task_runner_handle.h"
diff --git a/ui/events/ozone/evdev/input_device_factory_evdev.h b/ui/events/ozone/evdev/input_device_factory_evdev.h
index 8f9b3a7..8e95df6 100644
--- a/ui/events/ozone/evdev/input_device_factory_evdev.h
+++ b/ui/events/ozone/evdev/input_device_factory_evdev.h
@@ -12,6 +12,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
 #include "ui/events/ozone/evdev/event_converter_evdev.h"
diff --git a/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h b/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h
index ed6c0fb..982d4d8 100644
--- a/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h
+++ b/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h
@@ -10,6 +10,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
diff --git a/ui/events/ozone/evdev/input_injector_evdev.h b/ui/events/ozone/evdev/input_injector_evdev.h
index cdb60fa..2b6d51a 100644
--- a/ui/events/ozone/evdev/input_injector_evdev.h
+++ b/ui/events/ozone/evdev/input_injector_evdev.h
@@ -5,6 +5,7 @@
 #ifndef UI_EVENTS_OZONE_EVDEV_INPUT_INJECTOR_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_INPUT_INJECTOR_EVDEV_H_
 
+#include "base/macros.h"
 #include "ui/events/ozone/evdev/event_dispatch_callback.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 #include "ui/ozone/public/system_input_injector.h"
diff --git a/ui/events/ozone/evdev/input_injector_evdev_unittest.cc b/ui/events/ozone/evdev/input_injector_evdev_unittest.cc
index 88040c2..291579d 100644
--- a/ui/events/ozone/evdev/input_injector_evdev_unittest.cc
+++ b/ui/events/ozone/evdev/input_injector_evdev_unittest.cc
@@ -5,6 +5,7 @@
 #include "ui/events/ozone/evdev/input_injector_evdev.h"
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/run_loop.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/events/ozone/evdev/keyboard_evdev.h b/ui/events/ozone/evdev/keyboard_evdev.h
index d515163..606a96b 100644
--- a/ui/events/ozone/evdev/keyboard_evdev.h
+++ b/ui/events/ozone/evdev/keyboard_evdev.h
@@ -5,9 +5,11 @@
 #ifndef UI_EVENTS_OZONE_EVDEV_KEYBOARD_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_KEYBOARD_EVDEV_H_
 
-#include <bitset>
 #include <linux/input.h>
 
+#include <bitset>
+
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "ui/events/ozone/evdev/event_device_util.h"
diff --git a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h
index 36ee172..02d0888 100644
--- a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h
+++ b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h
@@ -8,6 +8,7 @@
 #include <libevdev/libevdev.h>
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/events/ozone/evdev/event_converter_evdev.h"
 #include "ui/events/ozone/evdev/event_device_info.h"
diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_feedback.cc b/ui/events/ozone/evdev/libgestures_glue/gesture_feedback.cc
index ceedee3..f433b5a 100644
--- a/ui/events/ozone/evdev/libgestures_glue/gesture_feedback.cc
+++ b/ui/events/ozone/evdev/libgestures_glue/gesture_feedback.cc
@@ -4,6 +4,7 @@
 
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_feedback.h"
 
+#include <stddef.h>
 #include <time.h>
 
 #include "base/bind.h"
diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
index 157391d..4165c62 100644
--- a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
+++ b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
@@ -8,6 +8,7 @@
 #include <libevdev/libevdev.h>
 #include <linux/input.h>
 
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/timer/timer.h"
 #include "ui/events/event.h"
diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h
index debc05b..982b82f 100644
--- a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h
+++ b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h
@@ -5,11 +5,13 @@
 #ifndef UI_EVENTS_OZONE_EVDEV_LIBGESTURES_GLUE_GESTURE_INTERPRETER_LIBEVDEV_CROS_H_
 #define UI_EVENTS_OZONE_EVDEV_LIBGESTURES_GLUE_GESTURE_INTERPRETER_LIBEVDEV_CROS_H_
 
-#include <bitset>
 #include <gestures/gestures.h>
 #include <libevdev/libevdev.h>
 
+#include <bitset>
+
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/event_device_util.h"
diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc b/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc
index ce71222..ac50504 100644
--- a/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc
+++ b/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc
@@ -16,6 +16,7 @@
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h b/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h
index 4275008..01034e5 100644
--- a/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h
+++ b/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h
@@ -7,14 +7,16 @@
 
 #include <gestures/gestures.h>
 #include <libevdev/libevdev.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <map>
 #include <ostream>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
diff --git a/ui/events/ozone/evdev/mouse_button_map_evdev.h b/ui/events/ozone/evdev/mouse_button_map_evdev.h
index 5cc240d..4734906 100644
--- a/ui/events/ozone/evdev/mouse_button_map_evdev.h
+++ b/ui/events/ozone/evdev/mouse_button_map_evdev.h
@@ -5,9 +5,11 @@
 #ifndef UI_EVENTS_OZONE_EVDEV_MOUSE_BUTTON_MAP_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_MOUSE_BUTTON_MAP_EVDEV_H_
 
+#include <stdint.h>
+
 #include <map>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 
 namespace ui {
diff --git a/ui/events/ozone/evdev/tablet_event_converter_evdev.cc b/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
index 0486931..a8a3c237 100644
--- a/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
+++ b/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
@@ -6,6 +6,7 @@
 
 #include <errno.h>
 #include <linux/input.h>
+#include <stddef.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/trace_event/trace_event.h"
diff --git a/ui/events/ozone/evdev/tablet_event_converter_evdev.h b/ui/events/ozone/evdev/tablet_event_converter_evdev.h
index b37391b..b8c528d 100644
--- a/ui/events/ozone/evdev/tablet_event_converter_evdev.h
+++ b/ui/events/ozone/evdev/tablet_event_converter_evdev.h
@@ -6,6 +6,7 @@
 #define UI_EVENTS_OZONE_TABLET_EVENT_CONVERTER_EVDEV_H_
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/message_loop/message_pump_libevent.h"
 #include "ui/events/event.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
diff --git a/ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc b/ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc
index e043665..aaa121d 100644
--- a/ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc
+++ b/ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc
@@ -11,6 +11,7 @@
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/posix/eintr_wrapper.h"
diff --git a/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
index eecae30..4d77fae 100644
--- a/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
+++ b/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
@@ -6,6 +6,7 @@
 #define UI_EVENTS_OZONE_EVDEV_TOUCH_DEBUG_BUFFER_H_
 
 #include <linux/input.h>
+#include <stddef.h>
 
 #include <string>
 #include <vector>
diff --git a/ui/events/ozone/evdev/touch_evdev_types.h b/ui/events/ozone/evdev/touch_evdev_types.h
index 8ab1d90..88c6fcd 100644
--- a/ui/events/ozone/evdev/touch_evdev_types.h
+++ b/ui/events/ozone/evdev/touch_evdev_types.h
@@ -5,7 +5,8 @@
 #ifndef UI_EVENTS_OZONE_EVDEV_TOUCH_EVDEV_TYPES_H_
 #define UI_EVENTS_OZONE_EVDEV_TOUCH_EVDEV_TYPES_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "ui/events/event_constants.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 
diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev.h b/ui/events/ozone/evdev/touch_event_converter_evdev.h
index 416eecf..9d18beb 100644
--- a/ui/events/ozone/evdev/touch_event_converter_evdev.h
+++ b/ui/events/ozone/evdev/touch_event_converter_evdev.h
@@ -5,10 +5,14 @@
 #ifndef UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <bitset>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_pump_libevent.h"
 #include "ui/events/event_constants.h"
diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc b/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc
index fbd571e..8cdd92f 100644
--- a/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc
+++ b/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <errno.h>
 #include <linux/input.h>
+#include <stddef.h>
 #include <unistd.h>
 
 #include <vector>
@@ -11,6 +12,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/run_loop.h"
diff --git a/ui/events/ozone/evdev/touch_noise/far_apart_taps_touch_noise_filter.cc b/ui/events/ozone/evdev/touch_noise/far_apart_taps_touch_noise_filter.cc
index 6897d3fcc..f42dff3 100644
--- a/ui/events/ozone/evdev/touch_noise/far_apart_taps_touch_noise_filter.cc
+++ b/ui/events/ozone/evdev/touch_noise/far_apart_taps_touch_noise_filter.cc
@@ -4,9 +4,12 @@
 
 #include "ui/events/ozone/evdev/touch_noise/far_apart_taps_touch_noise_filter.h"
 
+#include <stddef.h>
+
 #include <cmath>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 
diff --git a/ui/events/ozone/evdev/touch_noise/single_position_touch_noise_filter.h b/ui/events/ozone/evdev/touch_noise/single_position_touch_noise_filter.h
index 05eccdf..f6ee06d 100644
--- a/ui/events/ozone/evdev/touch_noise/single_position_touch_noise_filter.h
+++ b/ui/events/ozone/evdev/touch_noise/single_position_touch_noise_filter.h
@@ -5,6 +5,8 @@
 #ifndef UI_EVENTS_OZONE_EVDEV_TOUCH_NOISE_SINGLE_POSITION_TOUCH_NOISE_FILTER_H_
 #define UI_EVENTS_OZONE_EVDEV_TOUCH_NOISE_SINGLE_POSITION_TOUCH_NOISE_FILTER_H_
 
+#include <stddef.h>
+
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/events/ozone/evdev/touch_noise/touch_noise_filter.h"
diff --git a/ui/events/ozone/evdev/touch_noise/touch_noise_finder.h b/ui/events/ozone/evdev/touch_noise/touch_noise_finder.h
index 9c2fbd1..4b14e4b 100644
--- a/ui/events/ozone/evdev/touch_noise/touch_noise_finder.h
+++ b/ui/events/ozone/evdev/touch_noise/touch_noise_finder.h
@@ -5,10 +5,12 @@
 #ifndef UI_EVENTS_OZONE_EVDEV_TOUCH_NOISE_TOUCH_NOISE_FINDER_H_
 #define UI_EVENTS_OZONE_EVDEV_TOUCH_NOISE_TOUCH_NOISE_FINDER_H_
 
+#include <stddef.h>
+
 #include <bitset>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 #include "ui/events/ozone/evdev/touch_evdev_types.h"
diff --git a/ui/events/ozone/evdev/touch_noise/touch_noise_finder_unittest.cc b/ui/events/ozone/evdev/touch_noise/touch_noise_finder_unittest.cc
index 5bbafb3..ae931d1 100644
--- a/ui/events/ozone/evdev/touch_noise/touch_noise_finder_unittest.cc
+++ b/ui/events/ozone/evdev/touch_noise/touch_noise_finder_unittest.cc
@@ -4,9 +4,12 @@
 
 #include "ui/events/ozone/evdev/touch_noise/touch_noise_finder.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/events/ozone/layout/keyboard_layout_engine_manager.h b/ui/events/ozone/layout/keyboard_layout_engine_manager.h
index dc87430..b63e2e1 100644
--- a/ui/events/ozone/layout/keyboard_layout_engine_manager.h
+++ b/ui/events/ozone/layout/keyboard_layout_engine_manager.h
@@ -5,6 +5,7 @@
 #ifndef UI_OZONE_PUBLIC_KEYBOARD_LAYOUT_ENGINE_MANAGER_H_
 #define UI_OZONE_PUBLIC_KEYBOARD_LAYOUT_ENGINE_MANAGER_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/ozone/layout/events_ozone_layout_export.h"
 
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
index 50db863..d507d44 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
@@ -4,15 +4,18 @@
 
 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
 
+#include <stddef.h>
 #include <xkbcommon/xkbcommon-names.h>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.h"
+#include "build/build_config.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/dom_key.h"
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h
index ea2d4de..c485ecd 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h
+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h
@@ -5,6 +5,7 @@
 #ifndef UI_EVENTS_OZONE_LAYOUT_XKB_XKB_KEYBOARD_LAYOUT_ENGINE_H_
 #define UI_EVENTS_OZONE_LAYOUT_XKB_XKB_KEYBOARD_LAYOUT_ENGINE_H_
 
+#include <stdint.h>
 #include <xkbcommon/xkbcommon.h>
 #include <vector>
 
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc
index 034d548..ccbd645 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc
+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/dom/dom_code.h"
diff --git a/ui/events/platform/platform_event_dispatcher.h b/ui/events/platform/platform_event_dispatcher.h
index bda035d..294bdb9 100644
--- a/ui/events/platform/platform_event_dispatcher.h
+++ b/ui/events/platform/platform_event_dispatcher.h
@@ -5,7 +5,8 @@
 #ifndef UI_EVENTS_PLATFORM_PLATFORM_EVENT_DISPATCHER_H_
 #define UI_EVENTS_PLATFORM_PLATFORM_EVENT_DISPATCHER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "ui/events/events_export.h"
 #include "ui/events/platform/platform_event_types.h"
 
diff --git a/ui/events/platform/platform_event_source.h b/ui/events/platform/platform_event_source.h
index 5cd397e..e6b569e 100644
--- a/ui/events/platform/platform_event_source.h
+++ b/ui/events/platform/platform_event_source.h
@@ -5,6 +5,8 @@
 #ifndef UI_EVENTS_PLATFORM_PLATFORM_EVENT_SOURCE_H_
 #define UI_EVENTS_PLATFORM_PLATFORM_EVENT_SOURCE_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <vector>
 
diff --git a/ui/events/platform/platform_event_source_unittest.cc b/ui/events/platform/platform_event_source_unittest.cc
index dea0269..d4c62f6 100644
--- a/ui/events/platform/platform_event_source_unittest.cc
+++ b/ui/events/platform/platform_event_source_unittest.cc
@@ -4,9 +4,13 @@
 
 #include "ui/events/platform/platform_event_source.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
diff --git a/ui/events/platform/scoped_event_dispatcher.h b/ui/events/platform/scoped_event_dispatcher.h
index a2f5294..79b519b 100644
--- a/ui/events/platform/scoped_event_dispatcher.h
+++ b/ui/events/platform/scoped_event_dispatcher.h
@@ -6,7 +6,7 @@
 #define UI_EVENTS_PLATFORM_SCOPED_EVENT_DISPATCHER_H_
 
 #include "base/auto_reset.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/events/events_export.h"
 
 namespace ui {
diff --git a/ui/events/platform/x11/x11_event_source.h b/ui/events/platform/x11/x11_event_source.h
index 7eef05f..26d6460 100644
--- a/ui/events/platform/x11/x11_event_source.h
+++ b/ui/events/platform/x11/x11_event_source.h
@@ -5,6 +5,9 @@
 #ifndef UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_H_
 #define UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/events_export.h"
 #include "ui/events/platform/platform_event_source.h"
diff --git a/ui/events/platform/x11/x11_event_source_glib.cc b/ui/events/platform/x11/x11_event_source_glib.cc
index f616cdd..2151601 100644
--- a/ui/events/platform/x11/x11_event_source_glib.cc
+++ b/ui/events/platform/x11/x11_event_source_glib.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "ui/events/platform/x11/x11_event_source.h"
 
 #include <glib.h>
diff --git a/ui/events/platform/x11/x11_event_source_libevent.cc b/ui/events/platform/x11/x11_event_source_libevent.cc
index ff01d2e..a3ff7a5 100644
--- a/ui/events/platform/x11/x11_event_source_libevent.cc
+++ b/ui/events/platform/x11/x11_event_source_libevent.cc
@@ -6,6 +6,7 @@
 
 #include <X11/Xlib.h>
 
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_libevent.h"
 
diff --git a/ui/events/platform/x11/x11_hotplug_event_handler.cc b/ui/events/platform/x11/x11_hotplug_event_handler.cc
index 7989550..309477f 100644
--- a/ui/events/platform/x11/x11_hotplug_event_handler.cc
+++ b/ui/events/platform/x11/x11_hotplug_event_handler.cc
@@ -4,6 +4,7 @@
 
 #include "ui/events/platform/x11/x11_hotplug_event_handler.h"
 
+#include <stdint.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
diff --git a/ui/events/platform/x11/x11_hotplug_event_handler.h b/ui/events/platform/x11/x11_hotplug_event_handler.h
index 16d3b03..78c11f2 100644
--- a/ui/events/platform/x11/x11_hotplug_event_handler.h
+++ b/ui/events/platform/x11/x11_hotplug_event_handler.h
@@ -5,6 +5,7 @@
 #ifndef UI_EVENTS_PLATFORM_X11_X11_HOTPLUG_EVENT_HANDLER_H_
 #define UI_EVENTS_PLATFORM_X11_X11_HOTPLUG_EVENT_HANDLER_H_
 
+#include "base/macros.h"
 #include "ui/events/devices/x11/device_list_cache_x11.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 
diff --git a/ui/events/scoped_target_handler_unittest.cc b/ui/events/scoped_target_handler_unittest.cc
index 6a6c653..5ff1a0b 100644
--- a/ui/events/scoped_target_handler_unittest.cc
+++ b/ui/events/scoped_target_handler_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_handler.h"
diff --git a/ui/events/test/cocoa_test_event_utils.h b/ui/events/test/cocoa_test_event_utils.h
index 6cba7eb..dfeceb2 100644
--- a/ui/events/test/cocoa_test_event_utils.h
+++ b/ui/events/test/cocoa_test_event_utils.h
@@ -9,7 +9,6 @@
 
 #import <objc/objc-class.h>
 
-#include "base/basictypes.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace cocoa_test_event_utils {
diff --git a/ui/events/test/cocoa_test_event_utils.mm b/ui/events/test/cocoa_test_event_utils.mm
index ffd81b2..6c7819f 100644
--- a/ui/events/test/cocoa_test_event_utils.mm
+++ b/ui/events/test/cocoa_test_event_utils.mm
@@ -4,6 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 #include <mach/mach_time.h>
+#include <stdint.h>
 
 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
 #include "ui/events/test/cocoa_test_event_utils.h"
diff --git a/ui/events/test/event_generator.cc b/ui/events/test/event_generator.cc
index ce3e378..37e0a9b 100644
--- a/ui/events/test/event_generator.cc
+++ b/ui/events/test/event_generator.cc
@@ -4,14 +4,19 @@
 
 #include "ui/events/test/event_generator.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/tick_clock.h"
+#include "build/build_config.h"
 #include "ui/events/event.h"
 #include "ui/events/event_source.h"
 #include "ui/events/event_utils.h"
@@ -44,7 +49,7 @@ class TestTickClock : public base::TickClock {
   }
 
  private:
-  int64 ticks_ = 1;
+  int64_t ticks_ = 1;
 
   DISALLOW_COPY_AND_ASSIGN(TestTickClock);
 };
@@ -578,7 +583,7 @@ void EventGenerator::DispatchKeyEvent(bool is_press,
                                       int flags) {
 #if defined(OS_WIN)
   UINT key_press = WM_KEYDOWN;
-  uint16 character = ui::DomCodeToUsLayoutCharacter(
+  uint16_t character = ui::DomCodeToUsLayoutCharacter(
       ui::UsLayoutKeyboardCodeToDomCode(key_code), flags);
   if (is_press && character) {
     MSG native_event = { NULL, WM_KEYDOWN, key_code, 0 };
diff --git a/ui/events/test/event_generator.h b/ui/events/test/event_generator.h
index 9261cc8..d587ad5 100644
--- a/ui/events/test/event_generator.h
+++ b/ui/events/test/event_generator.h
@@ -8,8 +8,8 @@
 #include <list>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/events/event_constants.h"
diff --git a/ui/events/test/events_test_utils.h b/ui/events/test/events_test_utils.h
index 833748a..60325b3 100644
--- a/ui/events/test/events_test_utils.h
+++ b/ui/events/test/events_test_utils.h
@@ -5,6 +5,7 @@
 #ifndef UI_EVENTS_TEST_EVENTS_TEST_UTILS_H_
 #define UI_EVENTS_TEST_EVENTS_TEST_UTILS_H_
 
+#include "base/macros.h"
 #include "ui/events/event.h"
 #include "ui/events/event_dispatcher.h"
 #include "ui/events/event_target.h"
diff --git a/ui/events/test/events_test_utils_x11.cc b/ui/events/test/events_test_utils_x11.cc
index e16e7fa..f6c8e04 100644
--- a/ui/events/test/events_test_utils_x11.cc
+++ b/ui/events/test/events_test_utils_x11.cc
@@ -4,12 +4,14 @@
 
 #include "ui/events/test/events_test_utils_x11.h"
 
+#include <stddef.h>
 #include <X11/extensions/XI2.h>
 #include <X11/keysym.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
diff --git a/ui/events/test/events_test_utils_x11.h b/ui/events/test/events_test_utils_x11.h
index f312c83..1a68b5b 100644
--- a/ui/events/test/events_test_utils_x11.h
+++ b/ui/events/test/events_test_utils_x11.h
@@ -5,6 +5,7 @@
 #ifndef UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
 #define UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/event_constants.h"
diff --git a/ui/events/test/motion_event_test_utils.h b/ui/events/test/motion_event_test_utils.h
index de8d6a2..68cb8cd 100644
--- a/ui/events/test/motion_event_test_utils.h
+++ b/ui/events/test/motion_event_test_utils.h
@@ -5,10 +5,11 @@
 #ifndef UI_EVENTS_TEST_MOTION_EVENT_TEST_UTILS_H_
 #define UI_EVENTS_TEST_MOTION_EVENT_TEST_UTILS_H_
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/time/time.h"
 #include "ui/events/gesture_detection/motion_event_generic.h"
 #include "ui/gfx/geometry/point_f.h"
diff --git a/ui/events/test/platform_event_waiter.h b/ui/events/test/platform_event_waiter.h
index bdab29e..a4c5380 100644
--- a/ui/events/test/platform_event_waiter.h
+++ b/ui/events/test/platform_event_waiter.h
@@ -6,6 +6,7 @@
 #define UI_EVENTS_TEST_PLATFORM_EVENT_WAITER_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "ui/events/platform/platform_event_observer.h"
 
 namespace ui {
diff --git a/ui/events/test/test_event_handler.h b/ui/events/test/test_event_handler.h
index 64759c7..dcb5baf 100644
--- a/ui/events/test/test_event_handler.h
+++ b/ui/events/test/test_event_handler.h
@@ -8,8 +8,8 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/events/event_handler.h"
 
 typedef std::vector<std::string> HandlerSequenceRecorder;
diff --git a/ui/events/test/test_event_processor.h b/ui/events/test/test_event_processor.h
index 569670e..6129756 100644
--- a/ui/events/test/test_event_processor.h
+++ b/ui/events/test/test_event_processor.h
@@ -5,6 +5,7 @@
 #ifndef UI_EVENTS_TEST_TEST_EVENT_PROCESSOR_H_
 #define UI_EVENTS_TEST_TEST_EVENT_PROCESSOR_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_processor.h"
 
diff --git a/ui/events/test/test_event_target.h b/ui/events/test/test_event_target.h
index 8b0790c..a79d742 100644
--- a/ui/events/test/test_event_target.h
+++ b/ui/events/test/test_event_target.h
@@ -5,10 +5,13 @@
 #ifndef UI_EVENTS_TEST_TEST_EVENT_TARGET_H_
 #define UI_EVENTS_TEST_TEST_EVENT_TARGET_H_
 
+#include <stddef.h>
+
 #include <set>
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/events/event_target.h"
 
diff --git a/ui/events/win/events_win.cc b/ui/events/win/events_win.cc
index f533367e..c168797 100644
--- a/ui/events/win/events_win.cc
+++ b/ui/events/win/events_win.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 <stdint.h>
 #include <windowsx.h>
 
 #include "ui/events/event_constants.h"
@@ -259,7 +260,7 @@ KeyboardCode KeyboardCodeFromNative(const base::NativeEvent& native_event) {
 }
 
 DomCode CodeFromNative(const base::NativeEvent& native_event) {
-  const uint16 scan_code = GetScanCodeFromLParam(native_event.lParam);
+  const uint16_t scan_code = GetScanCodeFromLParam(native_event.lParam);
   return CodeForWindowsScanCode(scan_code);
 }
 
@@ -385,7 +386,7 @@ bool IsMouseEventFromTouch(UINT message) {
 }
 
 // Conversion scan_code and LParam each other.
-// uint16 scan_code:
+// uint16_t scan_code:
 //     ui/events/keycodes/dom/keycode_converter_data.inc
 // 0 - 15bits: represetns the scan code.
 // 28 - 30 bits (0xE000): represents whether this is an extended key or not.
@@ -394,14 +395,14 @@ bool IsMouseEventFromTouch(UINT message) {
 //     http://msdn.microsoft.com/en-us/library/windows/desktop/ms644984.aspx
 // 16 - 23bits: represetns the scan code.
 // 24bit (0x0100): represents whether this is an extended key or not.
-uint16 GetScanCodeFromLParam(LPARAM l_param) {
-  uint16 scan_code = ((l_param >> 16) & 0x00FF);
+uint16_t GetScanCodeFromLParam(LPARAM l_param) {
+  uint16_t scan_code = ((l_param >> 16) & 0x00FF);
   if (l_param & (1 << 24))
     scan_code |= 0xE000;
   return scan_code;
 }
 
-LPARAM GetLParamFromScanCode(uint16 scan_code) {
+LPARAM GetLParamFromScanCode(uint16_t scan_code) {
   LPARAM l_param = static_cast<LPARAM>(scan_code & 0x00FF) << 16;
   if ((scan_code & 0xE000) == 0xE000)
     l_param |= (1 << 24);
diff --git a/ui/events/x/events_x.cc b/ui/events/x/events_x.cc
index cbc14b6..94a7785 100644
--- a/ui/events/x/events_x.cc
+++ b/ui/events/x/events_x.cc
@@ -4,6 +4,7 @@
 
 #include "ui/events/event_constants.h"
 
+#include <stddef.h>
 #include <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
@@ -13,7 +14,9 @@
 #include <cmath>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
+#include "build/build_config.h"
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/devices/x11/device_list_cache_x11.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
diff --git a/ui/events/x/events_x_unittest.cc b/ui/events/x/events_x_unittest.cc
index 1f782e7..c020665 100644
--- a/ui/events/x/events_x_unittest.cc
+++ b/ui/events/x/events_x_unittest.cc
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XInput2.h>
+
 #include <cstring>
 #include <set>
 #include <utility>
@@ -14,7 +17,9 @@
 #undef Bool
 #undef None
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
@@ -293,7 +298,7 @@ TEST_F(EventsXTest, TouchEventBasic) {
   EXPECT_FLOAT_EQ(GetTouchForce(scoped_xevent), 0.5f);
 }
 
-int GetTouchIdForTrackingId(uint32 tracking_id) {
+int GetTouchIdForTrackingId(uint32_t tracking_id) {
   int slot = 0;
   bool success =
       TouchFactory::GetInstance()->QuerySlotForTrackingID(tracking_id, &slot);
diff --git a/ui/events/x/keysym_to_unicode.cc b/ui/events/x/keysym_to_unicode.cc
index 4d6d84a..fc3f789 100644
--- a/ui/events/x/keysym_to_unicode.cc
+++ b/ui/events/x/keysym_to_unicode.cc
@@ -4,6 +4,8 @@
 
 #include "ui/events/x/keysym_to_unicode.h"
 
+#include <stddef.h>
+
 // Define XK_xxx before the #include of <X11/keysym.h> so that <X11/keysym.h>
 // defines all KeySyms we need.
 #define XK_MISCELLANY
diff --git a/ui/events/x/keysym_to_unicode.h b/ui/events/x/keysym_to_unicode.h
index ba530b6..b00ba9a 100644
--- a/ui/events/x/keysym_to_unicode.h
+++ b/ui/events/x/keysym_to_unicode.h
@@ -5,7 +5,7 @@
 #ifndef UI_EVENTS_X_KEYSYM_TO_UNICODE_H_
 #define UI_EVENTS_X_KEYSYM_TO_UNICODE_H_
 
-#include <cstdint>
+#include <stdint.h>
 
 namespace ui {