Switch to standard integer types in extensions/.

BUG=138542
TBR=benwells@chromium.org

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

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

113 files changed, 206 insertions, 38 deletions

diff --git a/extensions/common/api/bluetooth/bluetooth_manifest_handler.h b/extensions/common/api/bluetooth/bluetooth_manifest_handler.h
index b87fd51..16f749e 100644
--- a/extensions/common/api/bluetooth/bluetooth_manifest_handler.h
+++ b/extensions/common/api/bluetooth/bluetooth_manifest_handler.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "extensions/common/manifest_handler.h"
 
 namespace extensions {
diff --git a/extensions/common/api/declarative/declarative_manifest_data.cc b/extensions/common/api/declarative/declarative_manifest_data.cc
index 0808887b..44f23bb 100644
--- a/extensions/common/api/declarative/declarative_manifest_data.cc
+++ b/extensions/common/api/declarative/declarative_manifest_data.cc
@@ -4,6 +4,9 @@
 
 #include "extensions/common/api/declarative/declarative_manifest_data.h"
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/manifest_constants.h"
diff --git a/extensions/common/api/declarative/declarative_manifest_data.h b/extensions/common/api/declarative/declarative_manifest_data.h
index 9ba9118..d314704 100644
--- a/extensions/common/api/declarative/declarative_manifest_data.h
+++ b/extensions/common/api/declarative/declarative_manifest_data.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/strings/string16.h"
 #include "extensions/common/api/events.h"
diff --git a/extensions/common/api/declarative/declarative_manifest_handler.h b/extensions/common/api/declarative/declarative_manifest_handler.h
index f555bff..3107a3d 100644
--- a/extensions/common/api/declarative/declarative_manifest_handler.h
+++ b/extensions/common/api/declarative/declarative_manifest_handler.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "extensions/common/manifest_handler.h"
 
 namespace extensions {
diff --git a/extensions/common/api/sockets/sockets_manifest_handler.h b/extensions/common/api/sockets/sockets_manifest_handler.h
index 64686a0..03bea8d 100644
--- a/extensions/common/api/sockets/sockets_manifest_handler.h
+++ b/extensions/common/api/sockets/sockets_manifest_handler.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "extensions/common/manifest_handler.h"
 
 namespace extensions {
diff --git a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
index 66fb8c3..d0dc609 100644
--- a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
+++ b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
@@ -6,6 +6,7 @@
 #include <tuple>
 
 #include "base/json/json_reader.h"
+#include "base/macros.h"
 #include "base/pickle.h"
 #include "base/values.h"
 #include "extensions/common/api/sockets/sockets_manifest_permission.h"
diff --git a/extensions/common/cast/cast_cert_validator.cc b/extensions/common/cast/cast_cert_validator.cc
index bafbe6a..1d38853 100644
--- a/extensions/common/cast/cast_cert_validator.cc
+++ b/extensions/common/cast/cast_cert_validator.cc
@@ -8,6 +8,8 @@
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <utility>
 
 #include "base/logging.h"
diff --git a/extensions/common/cast/cast_cert_validator.h b/extensions/common/cast/cast_cert_validator.h
index 8a37fa1..af5a055 100644
--- a/extensions/common/cast/cast_cert_validator.h
+++ b/extensions/common/cast/cast_cert_validator.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 
diff --git a/extensions/common/constants.h b/extensions/common/constants.h
index 78c8f29..6ecbe2b 100644
--- a/extensions/common/constants.h
+++ b/extensions/common/constants.h
@@ -5,7 +5,6 @@
 #ifndef EXTENSIONS_COMMON_CONSTANTS_H_
 #define EXTENSIONS_COMMON_CONSTANTS_H_
 
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "ui/base/layout.h"
 
diff --git a/extensions/common/csp_validator.cc b/extensions/common/csp_validator.cc
index 8f9406f..22a1325 100644
--- a/extensions/common/csp_validator.cc
+++ b/extensions/common/csp_validator.cc
@@ -4,8 +4,11 @@
 
 #include "extensions/common/csp_validator.h"
 
+#include <stddef.h>
+
 #include <vector>
 
+#include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
diff --git a/extensions/common/csp_validator_unittest.cc b/extensions/common/csp_validator_unittest.cc
index ed80024..d988741 100644
--- a/extensions/common/csp_validator_unittest.cc
+++ b/extensions/common/csp_validator_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include "extensions/common/csp_validator.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/install_warning.h"
diff --git a/extensions/common/event_filter.h b/extensions/common/event_filter.h
index ddd0681..8f6d604 100644
--- a/extensions/common/event_filter.h
+++ b/extensions/common/event_filter.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <set>
 
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "components/url_matcher/url_matcher.h"
 #include "extensions/common/event_filtering_info.h"
diff --git a/extensions/common/event_matcher.h b/extensions/common/event_matcher.h
index 70c4b78..3bffd24 100644
--- a/extensions/common/event_matcher.h
+++ b/extensions/common/event_matcher.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_COMMON_EVENT_MATCHER_H_
 #define EXTENSIONS_COMMON_EVENT_MATCHER_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
index f51d893..3f7e43b 100644
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -4,10 +4,11 @@
 
 #include "extensions/common/extension.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "base/base64.h"
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
diff --git a/extensions/common/extension.h b/extensions/common/extension.h
index 72c4396..2363841 100644
--- a/extensions/common/extension.h
+++ b/extensions/common/extension.h
@@ -15,6 +15,7 @@
 
 #include "base/containers/hash_tables.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/extensions/common/extension_api.cc b/extensions/common/extension_api.cc
index afafa81..b30af5f 100644
--- a/extensions/common/extension_api.cc
+++ b/extensions/common/extension_api.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/extension_api.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <string>
 #include <utility>
@@ -13,6 +15,7 @@
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.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_util.h"
diff --git a/extensions/common/extension_api.h b/extensions/common/extension_api.h
index 715d820..fc3e20c 100644
--- a/extensions/common/extension_api.h
+++ b/extensions/common/extension_api.h
@@ -8,8 +8,8 @@
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
diff --git a/extensions/common/extension_builder.h b/extensions/common/extension_builder.h
index 3ceda07..4734baa 100644
--- a/extensions/common/extension_builder.h
+++ b/extensions/common/extension_builder.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "extensions/common/manifest.h"
diff --git a/extensions/common/extension_l10n_util.cc b/extensions/common/extension_l10n_util.cc
index c4ebbe9..a423ba5 100644
--- a/extensions/common/extension_l10n_util.cc
+++ b/extensions/common/extension_l10n_util.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/extension_l10n_util.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <set>
 #include <string>
diff --git a/extensions/common/extension_messages.cc b/extensions/common/extension_messages.cc
index 1fee836..15bc121 100644
--- a/extensions/common/extension_messages.cc
+++ b/extensions/common/extension_messages.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/extension_messages.h"
 
+#include <stddef.h>
+
 #include "content/public/common/common_param_traits.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
diff --git a/extensions/common/extension_messages.h b/extensions/common/extension_messages.h
index 212cd7f..ce8f251 100644
--- a/extensions/common/extension_messages.h
+++ b/extensions/common/extension_messages.h
@@ -5,6 +5,8 @@
 // IPC messages for extensions.
 // Multiply-included message file, hence no include guard.
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
@@ -517,7 +519,7 @@ IPC_MESSAGE_CONTROL2(ExtensionMsg_WakeEventPageResponse,
 // sequence_id so that we can tell which message it is responding to.
 IPC_MESSAGE_CONTROL2(ExtensionMsg_ShouldSuspend,
                      std::string /* extension_id */,
-                     uint64 /* sequence_id */)
+                     uint64_t /* sequence_id */)
 
 // If we complete a round of ShouldSuspend->ShouldSuspendAck messages without
 // the lazy background page becoming active again, we are ready to unload. This
@@ -532,7 +534,7 @@ IPC_MESSAGE_CONTROL1(ExtensionMsg_CancelSuspend,
 // Response to the renderer for ExtensionHostMsg_GetAppInstallState.
 IPC_MESSAGE_ROUTED2(ExtensionMsg_GetAppInstallStateResponse,
                     std::string /* state */,
-                    int32 /* callback_id */)
+                    int32_t /* callback_id */)
 
 // Dispatch the Port.onConnect event for message channels.
 IPC_MESSAGE_ROUTED5(ExtensionMsg_DispatchOnConnect,
@@ -699,19 +701,19 @@ IPC_MESSAGE_ROUTED2(ExtensionHostMsg_ContentScriptsExecuting,
 IPC_MESSAGE_ROUTED3(ExtensionHostMsg_RequestScriptInjectionPermission,
                     std::string /* extension id */,
                     extensions::UserScript::InjectionType /* script type */,
-                    int64 /* request id */)
+                    int64_t /* request id */)
 
 // Sent from the browser to the renderer in reply to a
 // RequestScriptInjectionPermission message, granting permission for a script
 // script to run.
 IPC_MESSAGE_ROUTED1(ExtensionMsg_PermitScriptInjection,
-                    int64 /* request id */)
+                    int64_t /* request id */)
 
 // Sent by the renderer when a web page is checking if its app is installed.
 IPC_MESSAGE_ROUTED3(ExtensionHostMsg_GetAppInstallState,
                     GURL /* requestor_url */,
-                    int32 /* return_route_id */,
-                    int32 /* callback_id */)
+                    int32_t /* return_route_id */,
+                    int32_t /* callback_id */)
 
 // Optional Ack message sent to the browser to notify that the response to a
 // function has been processed.
@@ -721,7 +723,7 @@ IPC_MESSAGE_ROUTED1(ExtensionHostMsg_ResponseAck,
 // Response to ExtensionMsg_ShouldSuspend.
 IPC_MESSAGE_CONTROL2(ExtensionHostMsg_ShouldSuspendAck,
                      std::string /* extension_id */,
-                     uint64 /* sequence_id */)
+                     uint64_t /* sequence_id */)
 
 // Response to ExtensionMsg_Suspend, after we dispatch the suspend event.
 IPC_MESSAGE_CONTROL1(ExtensionHostMsg_SuspendAck,
@@ -791,7 +793,7 @@ IPC_MESSAGE_ROUTED4(ExtensionHostMsg_DetailedConsoleMessageAdded,
                     base::string16 /* message */,
                     base::string16 /* source */,
                     extensions::StackTrace /* stack trace */,
-                    int32 /* severity level */)
+                    int32_t /* severity level */)
 
 // Sent when a query selector request is made from the automation API.
 // acc_obj_id is the accessibility tree ID of the starting element.
diff --git a/extensions/common/extension_resource.cc b/extensions/common/extension_resource.cc
index 13824c1..e1eaa3c 100644
--- a/extensions/common/extension_resource.cc
+++ b/extensions/common/extension_resource.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/extension_resource.h"
 
+#include <stddef.h>
+
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
diff --git a/extensions/common/extension_resource_unittest.cc b/extensions/common/extension_resource_unittest.cc
index c3285eb..fb974d9 100644
--- a/extensions/common/extension_resource_unittest.cc
+++ b/extensions/common/extension_resource_unittest.cc
@@ -2,11 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
+#include "build/build_config.h"
 #include "components/crx_file/id_util.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_paths.h"
diff --git a/extensions/common/extension_set.h b/extensions/common/extension_set.h
index c46163f..3bcc1f3 100644
--- a/extensions/common/extension_set.h
+++ b/extensions/common/extension_set.h
@@ -5,12 +5,15 @@
 #ifndef EXTENSIONS_COMMON_EXTENSION_SET_H_
 #define EXTENSIONS_COMMON_EXTENSION_SET_H_
 
+#include <stddef.h>
+
 #include <iterator>
 #include <map>
 #include <string>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "extensions/common/extension.h"
 #include "url/gurl.h"
diff --git a/extensions/common/extension_set_unittest.cc b/extensions/common/extension_set_unittest.cc
index 54be17f..8674cc7 100644
--- a/extensions/common/extension_set_unittest.cc
+++ b/extensions/common/extension_set_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/extensions/common/extensions_client.cc b/extensions/common/extensions_client.cc
index 89d420b..9f453ef 100644
--- a/extensions/common/extensions_client.cc
+++ b/extensions/common/extensions_client.cc
@@ -4,7 +4,6 @@
 
 #include "extensions/common/extensions_client.h"
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
diff --git a/extensions/common/feature_switch.cc b/extensions/common/feature_switch.cc
index f61781f..d8c6b98 100644
--- a/extensions/common/feature_switch.cc
+++ b/extensions/common/feature_switch.cc
@@ -8,6 +8,7 @@
 #include "base/lazy_instance.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
+#include "build/build_config.h"
 #include "extensions/common/switches.h"
 
 namespace extensions {
diff --git a/extensions/common/feature_switch.h b/extensions/common/feature_switch.h
index 8bb7a41..c170f9c 100644
--- a/extensions/common/feature_switch.h
+++ b/extensions/common/feature_switch.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace base {
 class CommandLine;
diff --git a/extensions/common/features/base_feature_provider.cc b/extensions/common/features/base_feature_provider.cc
index 3b60e47..4f31527 100644
--- a/extensions/common/features/base_feature_provider.cc
+++ b/extensions/common/features/base_feature_provider.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/features/base_feature_provider.h"
 
+#include <stddef.h>
+
 #include <stack>
 #include <utility>
 
diff --git a/extensions/common/features/complex_feature.h b/extensions/common/features/complex_feature.h
index 663b1e77..a1a0f67 100644
--- a/extensions/common/features/complex_feature.h
+++ b/extensions/common/features/complex_feature.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/features/feature.h"
diff --git a/extensions/common/features/feature.cc b/extensions/common/features/feature.cc
index 21aa289..dc28d6d 100644
--- a/extensions/common/features/feature.cc
+++ b/extensions/common/features/feature.cc
@@ -10,6 +10,7 @@
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 
diff --git a/extensions/common/features/feature_provider.cc b/extensions/common/features/feature_provider.cc
index 79ecf73..7f93ba9 100644
--- a/extensions/common/features/feature_provider.cc
+++ b/extensions/common/features/feature_provider.cc
@@ -6,7 +6,6 @@
 
 #include <map>
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
diff --git a/extensions/common/features/feature_util.h b/extensions/common/features/feature_util.h
index b8d04fe..f8d6006 100644
--- a/extensions/common/features/feature_util.h
+++ b/extensions/common/features/feature_util.h
@@ -7,6 +7,7 @@
 
 #include "base/debug/alias.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 
 // Writes |message| to the stack so that it shows up in the minidump, then
diff --git a/extensions/common/features/json_feature_provider_source.h b/extensions/common/features/json_feature_provider_source.h
index 7e41cca..11a4fef 100644
--- a/extensions/common/features/json_feature_provider_source.h
+++ b/extensions/common/features/json_feature_provider_source.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/values.h"
 
 namespace extensions {
diff --git a/extensions/common/features/simple_feature.h b/extensions/common/features/simple_feature.h
index f69e658..4ff2c73 100644
--- a/extensions/common/features/simple_feature.h
+++ b/extensions/common/features/simple_feature.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_COMMON_FEATURES_SIMPLE_FEATURE_H_
 #define EXTENSIONS_COMMON_FEATURES_SIMPLE_FEATURE_H_
 
+#include <stddef.h>
+
 #include <set>
 #include <string>
 #include <vector>
@@ -12,6 +14,7 @@
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "extensions/common/extension.h"
diff --git a/extensions/common/features/simple_feature_filter.h b/extensions/common/features/simple_feature_filter.h
index c325250..4f8a8c2 100644
--- a/extensions/common/features/simple_feature_filter.h
+++ b/extensions/common/features/simple_feature_filter.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/manifest.h"
 
diff --git a/extensions/common/features/simple_feature_unittest.cc b/extensions/common/features/simple_feature_unittest.cc
index 528c565..afe8d7c 100644
--- a/extensions/common/features/simple_feature_unittest.cc
+++ b/extensions/common/features/simple_feature_unittest.cc
@@ -4,9 +4,12 @@
 
 #include "extensions/common/features/simple_feature.h"
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "extensions/common/manifest.h"
diff --git a/extensions/common/file_util.cc b/extensions/common/file_util.cc
index a42bdae..3ddf6d0 100644
--- a/extensions/common/file_util.cc
+++ b/extensions/common/file_util.cc
@@ -4,6 +4,9 @@
 
 #include "extensions/common/file_util.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
@@ -16,6 +19,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ -260,7 +264,7 @@ scoped_ptr<base::DictionaryValue> LoadManifest(
 }
 
 bool ValidateFilePath(const base::FilePath& path) {
-  int64 size = 0;
+  int64_t size = 0;
   return base::PathExists(path) && base::GetFileSize(path, &size) && size != 0;
 }
 
diff --git a/extensions/common/file_util_unittest.cc b/extensions/common/file_util_unittest.cc
index 5148737..afbcf3c 100644
--- a/extensions/common/file_util_unittest.cc
+++ b/extensions/common/file_util_unittest.cc
@@ -4,15 +4,18 @@
 
 #include "extensions/common/file_util.h"
 
+#include <stddef.h>
+
 #include <utility>
 
-#include "base/basictypes.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_string_value_serializer.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_paths.h"
diff --git a/extensions/common/image_util.cc b/extensions/common/image_util.cc
index d2d6079..efad19b 100644
--- a/extensions/common/image_util.cc
+++ b/extensions/common/image_util.cc
@@ -4,6 +4,7 @@
 
 #include "extensions/common/image_util.h"
 
+#include <stddef.h>
 #include <stdint.h>
 #include <vector>
 
diff --git a/extensions/common/manifest.cc b/extensions/common/manifest.cc
index cf39887..112628f 100644
--- a/extensions/common/manifest.cc
+++ b/extensions/common/manifest.cc
@@ -6,7 +6,6 @@
 
 #include <utility>
 
-#include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
diff --git a/extensions/common/manifest.h b/extensions/common/manifest.h
index 51f9938..4ae38d3 100644
--- a/extensions/common/manifest.h
+++ b/extensions/common/manifest.h
@@ -9,6 +9,7 @@
 #include <set>
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/values.h"
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc
index c4e3cd9..c618930 100644
--- a/extensions/common/manifest_constants.cc
+++ b/extensions/common/manifest_constants.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 "extensions/common/manifest_constants.h"
 
 namespace extensions {
diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h
index cf928bd..9aec423 100644
--- a/extensions/common/manifest_constants.h
+++ b/extensions/common/manifest_constants.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_COMMON_MANIFEST_CONSTANTS_H_
 #define EXTENSIONS_COMMON_MANIFEST_CONSTANTS_H_
 
+#include "build/build_config.h"
+
 namespace extensions {
 
 // Keys used in JSON representation of extensions.
diff --git a/extensions/common/manifest_handler.cc b/extensions/common/manifest_handler.cc
index 78df1cd..815146e 100644
--- a/extensions/common/manifest_handler.cc
+++ b/extensions/common/manifest_handler.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/manifest_handler.h"
 
+#include <stddef.h>
+
 #include <map>
 
 #include "base/logging.h"
diff --git a/extensions/common/manifest_handler_helpers.cc b/extensions/common/manifest_handler_helpers.cc
index f04d0f8..36af224d 100644
--- a/extensions/common/manifest_handler_helpers.cc
+++ b/extensions/common/manifest_handler_helpers.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/manifest_handler_helpers.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/extensions/common/manifest_handler_unittest.cc b/extensions/common/manifest_handler_unittest.cc
index a014dae..3e01d49 100644
--- a/extensions/common/manifest_handler_unittest.cc
+++ b/extensions/common/manifest_handler_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
diff --git a/extensions/common/manifest_handlers/app_isolation_info.cc b/extensions/common/manifest_handlers/app_isolation_info.cc
index 0c4a738..16bd375 100644
--- a/extensions/common/manifest_handlers/app_isolation_info.cc
+++ b/extensions/common/manifest_handlers/app_isolation_info.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/manifest_handlers/app_isolation_info.h"
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/extensions/common/manifest_handlers/app_isolation_info.h b/extensions/common/manifest_handlers/app_isolation_info.h
index bb50b1e..dcbb475 100644
--- a/extensions/common/manifest_handlers/app_isolation_info.h
+++ b/extensions/common/manifest_handlers/app_isolation_info.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handler.h"
diff --git a/extensions/common/manifest_handlers/background_info.cc b/extensions/common/manifest_handlers/background_info.cc
index 37da001..7263aae 100644
--- a/extensions/common/manifest_handlers/background_info.cc
+++ b/extensions/common/manifest_handlers/background_info.cc
@@ -4,9 +4,12 @@
 
 #include "extensions/common/manifest_handlers/background_info.h"
 
+#include <stddef.h>
+
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/extensions/common/manifest_handlers/background_info.h b/extensions/common/manifest_handlers/background_info.h
index 87c2f12..66ed985 100644
--- a/extensions/common/manifest_handlers/background_info.h
+++ b/extensions/common/manifest_handlers/background_info.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/values.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
diff --git a/extensions/common/manifest_handlers/content_capabilities_handler.h b/extensions/common/manifest_handlers/content_capabilities_handler.h
index ef1bd11..17c7dd1 100644
--- a/extensions/common/manifest_handlers/content_capabilities_handler.h
+++ b/extensions/common/manifest_handlers/content_capabilities_handler.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
 #include "extensions/common/permissions/permission_set.h"
diff --git a/extensions/common/manifest_handlers/csp_info.h b/extensions/common/manifest_handlers/csp_info.h
index e1a8537..a9b78d4 100644
--- a/extensions/common/manifest_handlers/csp_info.h
+++ b/extensions/common/manifest_handlers/csp_info.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
 
diff --git a/extensions/common/manifest_handlers/default_locale_handler.h b/extensions/common/manifest_handlers/default_locale_handler.h
index ee5ff4c..7ca4457 100644
--- a/extensions/common/manifest_handlers/default_locale_handler.h
+++ b/extensions/common/manifest_handlers/default_locale_handler.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
 
diff --git a/extensions/common/manifest_handlers/externally_connectable.cc b/extensions/common/manifest_handlers/externally_connectable.cc
index db0748c..31f96e72 100644
--- a/extensions/common/manifest_handlers/externally_connectable.cc
+++ b/extensions/common/manifest_handlers/externally_connectable.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/manifest_handlers/externally_connectable.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/stl_util.h"
diff --git a/extensions/common/manifest_handlers/externally_connectable.h b/extensions/common/manifest_handlers/externally_connectable.h
index 67756d5..ab3b2b5 100644
--- a/extensions/common/manifest_handlers/externally_connectable.h
+++ b/extensions/common/manifest_handlers/externally_connectable.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/install_warning.h"
diff --git a/extensions/common/manifest_handlers/externally_connectable_unittest.cc b/extensions/common/manifest_handlers/externally_connectable_unittest.cc
index 1096fa6..2519588 100644
--- a/extensions/common/manifest_handlers/externally_connectable_unittest.cc
+++ b/extensions/common/manifest_handlers/externally_connectable_unittest.cc
@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include <algorithm>
 
+#include "base/macros.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/externally_connectable.h"
diff --git a/extensions/common/manifest_handlers/file_handler_info.cc b/extensions/common/manifest_handlers/file_handler_info.cc
index 2ed0ce6..9b0989a 100644
--- a/extensions/common/manifest_handlers/file_handler_info.cc
+++ b/extensions/common/manifest_handlers/file_handler_info.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/manifest_handlers/file_handler_info.h"
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
diff --git a/extensions/common/manifest_handlers/file_handler_info.h b/extensions/common/manifest_handlers/file_handler_info.h
index 02012fe..ac458e1 100644
--- a/extensions/common/manifest_handlers/file_handler_info.h
+++ b/extensions/common/manifest_handlers/file_handler_info.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
 
diff --git a/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc b/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc
index 5934dc0..d55c148 100644
--- a/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc
+++ b/extensions/common/manifest_handlers/file_handler_manifest_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 "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/file_handler_info.h"
 #include "extensions/common/manifest_test.h"
diff --git a/extensions/common/manifest_handlers/incognito_info.h b/extensions/common/manifest_handlers/incognito_info.h
index c217a23..35df2dd 100644
--- a/extensions/common/manifest_handlers/incognito_info.h
+++ b/extensions/common/manifest_handlers/incognito_info.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_COMMON_MANIFEST_HANDLERS_INCOGNITO_INFO_H_
 #define EXTENSIONS_COMMON_MANIFEST_HANDLERS_INCOGNITO_INFO_H_
 
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
diff --git a/extensions/common/manifest_handlers/kiosk_mode_info.h b/extensions/common/manifest_handlers/kiosk_mode_info.h
index 9de03a3..d23df60 100644
--- a/extensions/common/manifest_handlers/kiosk_mode_info.h
+++ b/extensions/common/manifest_handlers/kiosk_mode_info.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handler.h"
diff --git a/extensions/common/manifest_handlers/launcher_page_info.h b/extensions/common/manifest_handlers/launcher_page_info.h
index 96fe1b4..7337658 100644
--- a/extensions/common/manifest_handlers/launcher_page_info.h
+++ b/extensions/common/manifest_handlers/launcher_page_info.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
diff --git a/extensions/common/manifest_handlers/mime_types_handler.cc b/extensions/common/manifest_handlers/mime_types_handler.cc
index 61e1342..3c90b609 100644
--- a/extensions/common/manifest_handlers/mime_types_handler.cc
+++ b/extensions/common/manifest_handlers/mime_types_handler.cc
@@ -4,7 +4,10 @@
 
 #include "extensions/common/manifest_handlers/mime_types_handler.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
diff --git a/extensions/common/manifest_handlers/mime_types_handler.h b/extensions/common/manifest_handlers/mime_types_handler.h
index 30f46a4..1041a8d 100644
--- a/extensions/common/manifest_handlers/mime_types_handler.h
+++ b/extensions/common/manifest_handlers/mime_types_handler.h
@@ -9,7 +9,6 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
 
diff --git a/extensions/common/manifest_handlers/nacl_modules_handler.cc b/extensions/common/manifest_handlers/nacl_modules_handler.cc
index 4fd7a97..27df6cf 100644
--- a/extensions/common/manifest_handlers/nacl_modules_handler.cc
+++ b/extensions/common/manifest_handlers/nacl_modules_handler.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/manifest_handlers/nacl_modules_handler.h"
 
+#include <stddef.h>
+
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/extensions/common/manifest_handlers/oauth2_manifest_handler.cc b/extensions/common/manifest_handlers/oauth2_manifest_handler.cc
index 1d32ecb..73a1320 100644
--- a/extensions/common/manifest_handlers/oauth2_manifest_handler.cc
+++ b/extensions/common/manifest_handlers/oauth2_manifest_handler.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/manifest_handlers/oauth2_manifest_handler.h"
 
+#include <stddef.h>
+
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/extensions/common/manifest_handlers/oauth2_manifest_handler.h b/extensions/common/manifest_handlers/oauth2_manifest_handler.h
index 36aff05..20276e7 100644
--- a/extensions/common/manifest_handlers/oauth2_manifest_handler.h
+++ b/extensions/common/manifest_handlers/oauth2_manifest_handler.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
 
diff --git a/extensions/common/manifest_handlers/offline_enabled_info.h b/extensions/common/manifest_handlers/offline_enabled_info.h
index e1ba4072..99b9383 100644
--- a/extensions/common/manifest_handlers/offline_enabled_info.h
+++ b/extensions/common/manifest_handlers/offline_enabled_info.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handler.h"
diff --git a/extensions/common/manifest_handlers/options_page_info.cc b/extensions/common/manifest_handlers/options_page_info.cc
index cb8948e..c46a9c1 100644
--- a/extensions/common/manifest_handlers/options_page_info.cc
+++ b/extensions/common/manifest_handlers/options_page_info.cc
@@ -5,6 +5,7 @@
 #include "extensions/common/manifest_handlers/options_page_info.h"
 
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/api/extensions_manifest_types.h"
diff --git a/extensions/common/manifest_handlers/options_page_info.h b/extensions/common/manifest_handlers/options_page_info.h
index b448f6f..fcde3e2 100644
--- a/extensions/common/manifest_handlers/options_page_info.h
+++ b/extensions/common/manifest_handlers/options_page_info.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/values.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
diff --git a/extensions/common/manifest_handlers/requirements_info.h b/extensions/common/manifest_handlers/requirements_info.h
index ebcb39f..9c87bca8 100644
--- a/extensions/common/manifest_handlers/requirements_info.h
+++ b/extensions/common/manifest_handlers/requirements_info.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
diff --git a/extensions/common/manifest_handlers/sandboxed_page_info.cc b/extensions/common/manifest_handlers/sandboxed_page_info.cc
index 0fc6589..bc44851 100644
--- a/extensions/common/manifest_handlers/sandboxed_page_info.cc
+++ b/extensions/common/manifest_handlers/sandboxed_page_info.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/manifest_handlers/sandboxed_page_info.h"
 
+#include <stddef.h>
+
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/extensions/common/manifest_handlers/shared_module_info.cc b/extensions/common/manifest_handlers/shared_module_info.cc
index ecd68da..87c8e87 100644
--- a/extensions/common/manifest_handlers/shared_module_info.cc
+++ b/extensions/common/manifest_handlers/shared_module_info.cc
@@ -4,7 +4,10 @@
 
 #include "extensions/common/manifest_handlers/shared_module_info.h"
 
+#include <stddef.h>
+
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
diff --git a/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc b/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc
index ecbabbd..63ff88e 100644
--- a/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc
+++ b/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "base/version.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/shared_module_info.h"
diff --git a/extensions/common/manifest_handlers/web_accessible_resources_info.cc b/extensions/common/manifest_handlers/web_accessible_resources_info.cc
index ec188ae..2aa7b2b 100644
--- a/extensions/common/manifest_handlers/web_accessible_resources_info.cc
+++ b/extensions/common/manifest_handlers/web_accessible_resources_info.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/manifest_handlers/web_accessible_resources_info.h"
 
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/extensions/common/manifest_handlers/web_accessible_resources_info.h b/extensions/common/manifest_handlers/web_accessible_resources_info.h
index 6e6143d..9246ca1 100644
--- a/extensions/common/manifest_handlers/web_accessible_resources_info.h
+++ b/extensions/common/manifest_handlers/web_accessible_resources_info.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
 
diff --git a/extensions/common/manifest_handlers/webview_info.cc b/extensions/common/manifest_handlers/webview_info.cc
index f66df27..6775c75 100644
--- a/extensions/common/manifest_handlers/webview_info.cc
+++ b/extensions/common/manifest_handlers/webview_info.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/manifest_handlers/webview_info.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
diff --git a/extensions/common/manifest_test.h b/extensions/common/manifest_test.h
index d4b95db..32a5fa5 100644
--- a/extensions/common/manifest_test.h
+++ b/extensions/common/manifest_test.h
@@ -5,6 +5,9 @@
 #ifndef EXTENSIONS_COMMON_MANIFEST_TEST_H_
 #define EXTENSIONS_COMMON_MANIFEST_TEST_H_
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
diff --git a/extensions/common/manifest_url_handlers.h b/extensions/common/manifest_url_handlers.h
index 2ca21d4..fb1b6c7 100644
--- a/extensions/common/manifest_url_handlers.h
+++ b/extensions/common/manifest_url_handlers.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handler.h"
 
diff --git a/extensions/common/message_bundle.h b/extensions/common/message_bundle.h
index 26e9927..9c0bde7 100644
--- a/extensions/common/message_bundle.h
+++ b/extensions/common/message_bundle.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_COMMON_MESSAGE_BUNDLE_H_
 #define EXTENSIONS_COMMON_MESSAGE_BUNDLE_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <string>
 #include <vector>
diff --git a/extensions/common/message_bundle_unittest.cc b/extensions/common/message_bundle_unittest.cc
index 3f332fc..f80473b 100644
--- a/extensions/common/message_bundle_unittest.cc
+++ b/extensions/common/message_bundle_unittest.cc
@@ -4,10 +4,13 @@
 
 #include "extensions/common/message_bundle.h"
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
 #include "base/i18n/rtl.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
diff --git a/extensions/common/one_shot_event.cc b/extensions/common/one_shot_event.cc
index a5a4ddc..a61cac8 100644
--- a/extensions/common/one_shot_event.cc
+++ b/extensions/common/one_shot_event.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/one_shot_event.h"
 
+#include <stddef.h>
+
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
diff --git a/extensions/common/permissions/api_permission_set.h b/extensions/common/permissions/api_permission_set.h
index bcb371b..c913466 100644
--- a/extensions/common/permissions/api_permission_set.h
+++ b/extensions/common/permissions/api_permission_set.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_SET_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_SET_H_
 
+#include <stddef.h>
+
 #include <set>
 #include <string>
 #include <vector>
diff --git a/extensions/common/permissions/base_set_operators.h b/extensions/common/permissions/base_set_operators.h
index d18321c..2ac5357 100644
--- a/extensions/common/permissions/base_set_operators.h
+++ b/extensions/common/permissions/base_set_operators.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_COMMON_PERMISSIONS_BASE_SET_OPERATORS_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_BASE_SET_OPERATORS_H_
 
+#include <stddef.h>
+
 #include <iterator>
 #include <map>
 
diff --git a/extensions/common/permissions/extensions_api_permissions.cc b/extensions/common/permissions/extensions_api_permissions.cc
index 70a667f..9f9127c 100644
--- a/extensions/common/permissions/extensions_api_permissions.cc
+++ b/extensions/common/permissions/extensions_api_permissions.cc
@@ -4,8 +4,11 @@
 
 #include "extensions/common/permissions/extensions_api_permissions.h"
 
+#include <stddef.h>
+
 #include <vector>
 
+#include "base/macros.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/socket_permission.h"
 #include "extensions/common/permissions/usb_device_permission.h"
diff --git a/extensions/common/permissions/manifest_permission.h b/extensions/common/permissions/manifest_permission.h
index 7d21957..67c41d5 100644
--- a/extensions/common/permissions/manifest_permission.h
+++ b/extensions/common/permissions/manifest_permission.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "extensions/common/permissions/api_permission_set.h"
diff --git a/extensions/common/permissions/manifest_permission_set.cc b/extensions/common/permissions/manifest_permission_set.cc
index fd2d521..39e2ba6 100644
--- a/extensions/common/permissions/manifest_permission_set.cc
+++ b/extensions/common/permissions/manifest_permission_set.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/permissions/manifest_permission_set.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
diff --git a/extensions/common/permissions/media_galleries_permission.cc b/extensions/common/permissions/media_galleries_permission.cc
index 1b3b919..6a43268 100644
--- a/extensions/common/permissions/media_galleries_permission.cc
+++ b/extensions/common/permissions/media_galleries_permission.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/permissions/media_galleries_permission.h"
 
+#include <stddef.h>
+
 #include <set>
 #include <string>
 
diff --git a/extensions/common/permissions/media_galleries_permission.h b/extensions/common/permissions/media_galleries_permission.h
index 0276454..870a0a9 100644
--- a/extensions/common/permissions/media_galleries_permission.h
+++ b/extensions/common/permissions/media_galleries_permission.h
@@ -5,7 +5,6 @@
 #ifndef EXTENSIONS_COMMON_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_H_
 
-#include "base/basictypes.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/media_galleries_permission_data.h"
 #include "extensions/common/permissions/set_disjunction_permission.h"
diff --git a/extensions/common/permissions/media_galleries_permission_data.h b/extensions/common/permissions/media_galleries_permission_data.h
index 920a905..05ae578 100644
--- a/extensions/common/permissions/media_galleries_permission_data.h
+++ b/extensions/common/permissions/media_galleries_permission_data.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "extensions/common/permissions/api_permission.h"
 
diff --git a/extensions/common/permissions/permission_message_test_util.cc b/extensions/common/permissions/permission_message_test_util.cc
index 9b1981e..d4ff639 100644
--- a/extensions/common/permissions/permission_message_test_util.cc
+++ b/extensions/common/permissions/permission_message_test_util.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/permissions/permission_message_test_util.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <iterator>
 
diff --git a/extensions/common/permissions/permission_message_util.cc b/extensions/common/permissions/permission_message_util.cc
index 566fe85..8fa3e6d 100644
--- a/extensions/common/permissions/permission_message_util.cc
+++ b/extensions/common/permissions/permission_message_util.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/permissions/permission_message_util.h"
 
+#include <stddef.h>
+
 #include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/extensions/common/permissions/permission_set.h b/extensions/common/permissions/permission_set.h
index 4f02dbd..b03a869 100644
--- a/extensions/common/permissions/permission_set.h
+++ b/extensions/common/permissions/permission_set.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/api_permission_set.h"
diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
index 5b28d85..8fa22f4 100644
--- a/extensions/common/permissions/permissions_data.cc
+++ b/extensions/common/permissions/permissions_data.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
diff --git a/extensions/common/permissions/permissions_data.h b/extensions/common/permissions/permissions_data.h
index 650c0ef..a78a0c1 100644
--- a/extensions/common/permissions/permissions_data.h
+++ b/extensions/common/permissions/permissions_data.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
diff --git a/extensions/common/permissions/permissions_info.h b/extensions/common/permissions/permissions_info.h
index 43d61b2..d834c41 100644
--- a/extensions/common/permissions/permissions_info.h
+++ b/extensions/common/permissions/permissions_info.h
@@ -5,12 +5,15 @@
 #ifndef EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_INFO_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_INFO_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/api_permission_set.h"
 #include "extensions/common/permissions/permissions_provider.h"
diff --git a/extensions/common/permissions/set_disjunction_permission.h b/extensions/common/permissions/set_disjunction_permission.h
index 00ffad7..1e124ab 100644
--- a/extensions/common/permissions/set_disjunction_permission.h
+++ b/extensions/common/permissions/set_disjunction_permission.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_
 
+#include <stddef.h>
+
 #include <set>
 #include <string>
 
diff --git a/extensions/common/permissions/socket_permission.h b/extensions/common/permissions/socket_permission.h
index 3fb1262..01be06c 100644
--- a/extensions/common/permissions/socket_permission.h
+++ b/extensions/common/permissions/socket_permission.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "extensions/common/permissions/api_permission.h"
@@ -19,7 +21,7 @@ class SocketPermission
   struct CheckParam : APIPermission::CheckParam {
     CheckParam(content::SocketPermissionRequest::OperationType type,
                const std::string& host,
-               uint16 port)
+               uint16_t port)
         : request(type, host, port) {}
     content::SocketPermissionRequest request;
   };
diff --git a/extensions/common/permissions/socket_permission_entry.cc b/extensions/common/permissions/socket_permission_entry.cc
index 926a07b..fdb6de8 100644
--- a/extensions/common/permissions/socket_permission_entry.cc
+++ b/extensions/common/permissions/socket_permission_entry.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/permissions/socket_permission_entry.h"
 
+#include <stdint.h>
+
 #include <cstdlib>
 #include <sstream>
 #include <tuple>
@@ -25,8 +27,8 @@ using content::SocketPermissionRequest;
 const char kColon = ':';
 const char kDot = '.';
 const char kWildcard[] = "*";
-const uint16 kWildcardPortNumber = 0;
-const uint16 kInvalidPort = 65535;
+const uint16_t kWildcardPortNumber = 0;
+const uint16_t kInvalidPort = 65535;
 
 bool StartsOrEndsWithWhitespace(const std::string& str) {
   return !str.empty() && (base::IsUnicodeWhitespace(str[0]) ||
@@ -182,7 +184,7 @@ bool SocketPermissionEntry::ParseHostPattern(
   int port;
   if (!base::StringToInt(pattern_tokens[1], &port) || port < 1 || port > 65535)
     return false;
-  result.pattern_.port = static_cast<uint16>(port);
+  result.pattern_.port = static_cast<uint16_t>(port);
 
   *entry = result;
   return true;
diff --git a/extensions/common/permissions/usb_device_permission.cc b/extensions/common/permissions/usb_device_permission.cc
index ab9a936..ab279b6 100644
--- a/extensions/common/permissions/usb_device_permission.cc
+++ b/extensions/common/permissions/usb_device_permission.cc
@@ -28,7 +28,7 @@ UsbDevicePermission::~UsbDevicePermission() {}
 PermissionIDSet UsbDevicePermission::GetPermissions() const {
   PermissionIDSet ids;
 
-  std::set<uint16> unknown_product_vendors;
+  std::set<uint16_t> unknown_product_vendors;
   bool found_unknown_vendor = false;
 
   for (const UsbDevicePermissionData& data : data_set_) {
@@ -49,7 +49,7 @@ PermissionIDSet UsbDevicePermission::GetPermissions() const {
     }
   }
 
-  for (uint16 vendor_id : unknown_product_vendors) {
+  for (uint16_t vendor_id : unknown_product_vendors) {
     const char* vendor = device::UsbIds::GetVendorName(vendor_id);
     DCHECK(vendor);
     ids.insert(APIPermission::kUsbDeviceUnknownProduct,
diff --git a/extensions/common/permissions/usb_device_permission.h b/extensions/common/permissions/usb_device_permission.h
index 881d6dd..7cba580 100644
--- a/extensions/common/permissions/usb_device_permission.h
+++ b/extensions/common/permissions/usb_device_permission.h
@@ -5,7 +5,8 @@
 #ifndef EXTENSIONS_COMMON_PERMISSIONS_USB_DEVICE_PERMISSION_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_USB_DEVICE_PERMISSION_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/set_disjunction_permission.h"
 #include "extensions/common/permissions/usb_device_permission_data.h"
@@ -17,12 +18,12 @@ class UsbDevicePermission
                                     UsbDevicePermission> {
  public:
   struct CheckParam : public APIPermission::CheckParam {
-    CheckParam(uint16 vendor_id, uint16 product_id, int interface_id)
-      : vendor_id(vendor_id),
-        product_id(product_id),
-        interface_id(interface_id) {}
-    const uint16 vendor_id;
-    const uint16 product_id;
+    CheckParam(uint16_t vendor_id, uint16_t product_id, int interface_id)
+        : vendor_id(vendor_id),
+          product_id(product_id),
+          interface_id(interface_id) {}
+    const uint16_t vendor_id;
+    const uint16_t product_id;
     const int interface_id;
   };
 
diff --git a/extensions/common/permissions/usb_device_permission_data.cc b/extensions/common/permissions/usb_device_permission_data.cc
index 5d49487..3d6817b 100644
--- a/extensions/common/permissions/usb_device_permission_data.cc
+++ b/extensions/common/permissions/usb_device_permission_data.cc
@@ -9,7 +9,6 @@
 #include <tuple>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
diff --git a/extensions/common/stack_frame.h b/extensions/common/stack_frame.h
index df66180..671f564 100644
--- a/extensions/common/stack_frame.h
+++ b/extensions/common/stack_frame.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_COMMON_STACK_FRAME_H_
 #define EXTENSIONS_COMMON_STACK_FRAME_H_
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
diff --git a/extensions/common/stack_frame_unittest.cc b/extensions/common/stack_frame_unittest.cc
index ca71698..51f8867 100644
--- a/extensions/common/stack_frame_unittest.cc
+++ b/extensions/common/stack_frame_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/stack_frame.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
diff --git a/extensions/common/update_manifest.h b/extensions/common/update_manifest.h
index 7ccf3b0..d2b1be4 100644
--- a/extensions/common/update_manifest.h
+++ b/extensions/common/update_manifest.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "url/gurl.h"
 
 class UpdateManifest {
diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc
index 6a250e7..0be7aba 100644
--- a/extensions/common/url_pattern.cc
+++ b/extensions/common/url_pattern.cc
@@ -4,8 +4,11 @@
 
 #include "extensions/common/url_pattern.h"
 
+#include <stddef.h>
+
 #include <ostream>
 
+#include "base/macros.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
diff --git a/extensions/common/url_pattern_set.h b/extensions/common/url_pattern_set.h
index ce16dd3..717779c 100644
--- a/extensions/common/url_pattern_set.h
+++ b/extensions/common/url_pattern_set.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_COMMON_URL_PATTERN_SET_H_
 #define EXTENSIONS_COMMON_URL_PATTERN_SET_H_
 
+#include <stddef.h>
+
 #include <iosfwd>
 #include <set>
 
diff --git a/extensions/common/url_pattern_set_unittest.cc b/extensions/common/url_pattern_set_unittest.cc
index 3929a72..4d3af98 100644
--- a/extensions/common/url_pattern_set_unittest.cc
+++ b/extensions/common/url_pattern_set_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/url_pattern_set.h"
 
+#include <stddef.h>
+
 #include <sstream>
 
 #include "base/values.h"
diff --git a/extensions/common/url_pattern_unittest.cc b/extensions/common/url_pattern_unittest.cc
index fd8a60e..f0965ca 100644
--- a/extensions/common/url_pattern_unittest.cc
+++ b/extensions/common/url_pattern_unittest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "extensions/common/url_pattern.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/extensions/common/user_script.cc b/extensions/common/user_script.cc
index 6b64741..08adfbc 100644
--- a/extensions/common/user_script.cc
+++ b/extensions/common/user_script.cc
@@ -4,6 +4,9 @@
 
 #include "extensions/common/user_script.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/atomic_sequence_num.h"
 #include "base/command_line.h"
 #include "base/pickle.h"
@@ -13,7 +16,7 @@
 
 namespace {
 
-// This cannot be a plain int or int64 because we need to generate unique IDs
+// This cannot be a plain int or int64_t because we need to generate unique IDs
 // from multiple threads.
 base::StaticAtomicSequenceNumber g_user_script_id_generator;
 
diff --git a/extensions/common/user_script.h b/extensions/common/user_script.h
index 93ca14f..8bf16bf 100644
--- a/extensions/common/user_script.h
+++ b/extensions/common/user_script.h
@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_piece.h"
 #include "extensions/common/host_id.h"
diff --git a/extensions/common/user_script_unittest.cc b/extensions/common/user_script_unittest.cc
index 1dae0a2..5923f4c 100644
--- a/extensions/common/user_script_unittest.cc
+++ b/extensions/common/user_script_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/files/file_path.h"
 #include "base/pickle.h"
 #include "extensions/common/user_script.h"
@@ -190,7 +192,7 @@ TEST(ExtensionUserScriptTest, Pickle) {
   script1.add_exclude_url_pattern(exclude1);
   script1.add_exclude_url_pattern(exclude2);
 
-  const int64 kId = 12;
+  const int64_t kId = 12;
   script1.set_id(kId);
   const std::string kExtensionId = "foo";
   HostID id(HostID::EXTENSIONS, kExtensionId);