Switch to standard integer types in ppapi/.

BUG=138542
TBR=bbudge@chromium.org
NOPRESUBMIT=true

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

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

74 files changed, 148 insertions, 8 deletions

diff --git a/ppapi/tests/blink_test_plugin.cc b/ppapi/tests/blink_test_plugin.cc
index 91de50b..945989d 100644
--- a/ppapi/tests/blink_test_plugin.cc
+++ b/ppapi/tests/blink_test_plugin.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 <sstream>
 #include <utility>
 
diff --git a/ppapi/tests/extensions/background_keepalive/background.cc b/ppapi/tests/extensions/background_keepalive/background.cc
index f4b3b7a..27c4761 100644
--- a/ppapi/tests/extensions/background_keepalive/background.cc
+++ b/ppapi/tests/extensions/background_keepalive/background.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 <cstdio>
 #include <string>
 
diff --git a/ppapi/tests/extensions/media_galleries/test_galleries.cc b/ppapi/tests/extensions/media_galleries/test_galleries.cc
index 69b3ef9..10c4b98 100644
--- a/ppapi/tests/extensions/media_galleries/test_galleries.cc
+++ b/ppapi/tests/extensions/media_galleries/test_galleries.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 <string>
 
 #include "ppapi/c/ppb_file_io.h"
diff --git a/ppapi/tests/extensions/multicast_permissions/test_multicast_permissions.cc b/ppapi/tests/extensions/multicast_permissions/test_multicast_permissions.cc
index 6f97378..34aeade 100644
--- a/ppapi/tests/extensions/multicast_permissions/test_multicast_permissions.cc
+++ b/ppapi/tests/extensions/multicast_permissions/test_multicast_permissions.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 "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
diff --git a/ppapi/tests/extensions/no_socket_permissions/test_no_socket_permissions.cc b/ppapi/tests/extensions/no_socket_permissions/test_no_socket_permissions.cc
index 0e284ea..d0e392e 100644
--- a/ppapi/tests/extensions/no_socket_permissions/test_no_socket_permissions.cc
+++ b/ppapi/tests/extensions/no_socket_permissions/test_no_socket_permissions.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 "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
diff --git a/ppapi/tests/extensions/packaged_app/test_packaged_app.cc b/ppapi/tests/extensions/packaged_app/test_packaged_app.cc
index 5062b5a..4d17aab 100644
--- a/ppapi/tests/extensions/packaged_app/test_packaged_app.cc
+++ b/ppapi/tests/extensions/packaged_app/test_packaged_app.cc
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include <pthread.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <unistd.h>
 
 #include <sstream>
diff --git a/ppapi/tests/extensions/socket_permissions/test_socket_permissions.cc b/ppapi/tests/extensions/socket_permissions/test_socket_permissions.cc
index e01a8d6..da1b583 100644
--- a/ppapi/tests/extensions/socket_permissions/test_socket_permissions.cc
+++ b/ppapi/tests/extensions/socket_permissions/test_socket_permissions.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 "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
diff --git a/ppapi/tests/manual/delete_plugin.cc b/ppapi/tests/manual/delete_plugin.cc
index 788100b..1753cdc 100644
--- a/ppapi/tests/manual/delete_plugin.cc
+++ b/ppapi/tests/manual/delete_plugin.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 "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_input_event.h"
 #include "ppapi/c/ppb_var.h"
diff --git a/ppapi/tests/power_saver_test_plugin.cc b/ppapi/tests/power_saver_test_plugin.cc
index a3d85d9..f319649 100644
--- a/ppapi/tests/power_saver_test_plugin.cc
+++ b/ppapi/tests/power_saver_test_plugin.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 <algorithm>
 
 #include "ppapi/cpp/graphics_2d.h"
diff --git a/ppapi/tests/test_audio.cc b/ppapi/tests/test_audio.cc
index 1c1c9b5..cbd8d5c 100644
--- a/ppapi/tests/test_audio.cc
+++ b/ppapi/tests/test_audio.cc
@@ -4,13 +4,14 @@
 
 #include "ppapi/tests/test_audio.h"
 
+#include <stddef.h>
 #include <string.h>
 
-#include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/ppb_audio.h"
+#include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/cpp/module.h"
-#include "ppapi/tests/testing_instance.h"
 #include "ppapi/tests/test_utils.h"
+#include "ppapi/tests/testing_instance.h"
 
 #if defined(__native_client__)
 #include "native_client/src/untrusted/irt/irt.h"
diff --git a/ppapi/tests/test_audio.h b/ppapi/tests/test_audio.h
index 63e06f4..972aea8 100644
--- a/ppapi/tests/test_audio.h
+++ b/ppapi/tests/test_audio.h
@@ -5,6 +5,8 @@
 #ifndef PAPPI_TESTS_TEST_AUDIO_H_
 #define PAPPI_TESTS_TEST_AUDIO_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/ppb_audio.h"
diff --git a/ppapi/tests/test_audio_config.cc b/ppapi/tests/test_audio_config.cc
index 279852f..17ff356 100644
--- a/ppapi/tests/test_audio_config.cc
+++ b/ppapi/tests/test_audio_config.cc
@@ -4,6 +4,9 @@
 
 #include "ppapi/tests/test_audio_config.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/tests/testing_instance.h"
diff --git a/ppapi/tests/test_broker.cc b/ppapi/tests/test_broker.cc
index 54b4671..40ac5b5 100644
--- a/ppapi/tests/test_broker.cc
+++ b/ppapi/tests/test_broker.cc
@@ -13,14 +13,17 @@
 #include <unistd.h>
 #endif
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <cstdio>
 #include <cstring>
 #include <fstream>
 #include <limits>
 
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/c/trusted/ppp_broker.h"
 #include "ppapi/c/trusted/ppb_broker_trusted.h"
+#include "ppapi/c/trusted/ppp_broker.h"
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
 
diff --git a/ppapi/tests/test_browser_font.cc b/ppapi/tests/test_browser_font.cc
index 689b421..84fd7c1 100644
--- a/ppapi/tests/test_browser_font.cc
+++ b/ppapi/tests/test_browser_font.cc
@@ -4,12 +4,13 @@
 
 #include "ppapi/tests/test_browser_font.h"
 
+#include <stdint.h>
 #include <string.h>
 
-#include "ppapi/tests/test_utils.h"
-#include "ppapi/tests/testing_instance.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/trusted/browser_font_trusted.h"
+#include "ppapi/tests/test_utils.h"
+#include "ppapi/tests/testing_instance.h"
 
 REGISTER_TEST_CASE(BrowserFont);
 
diff --git a/ppapi/tests/test_buffer.cc b/ppapi/tests/test_buffer.cc
index d143043..13e4253 100644
--- a/ppapi/tests/test_buffer.cc
+++ b/ppapi/tests/test_buffer.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_buffer.h"
 
+#include <stdint.h>
+
 #include "ppapi/c/dev/ppb_buffer_dev.h"
 #include "ppapi/cpp/dev/buffer_dev.h"
 #include "ppapi/cpp/graphics_2d.h"
diff --git a/ppapi/tests/test_case.cc b/ppapi/tests/test_case.cc
index 307dd38..cdf7710 100644
--- a/ppapi/tests/test_case.cc
+++ b/ppapi/tests/test_case.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/tests/test_case.h"
 
+#include <stddef.h>
 #include <string.h>
 
 #include <algorithm>
diff --git a/ppapi/tests/test_case.h b/ppapi/tests/test_case.h
index 42470f5..a198953 100644
--- a/ppapi/tests/test_case.h
+++ b/ppapi/tests/test_case.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_CASE_H_
 #define PPAPI_TESTS_TEST_CASE_H_
 
+#include <stdint.h>
+
 #include <cmath>
 #include <limits>
 #include <map>
diff --git a/ppapi/tests/test_char_set.h b/ppapi/tests/test_char_set.h
index ad2c5f1..1094e49 100644
--- a/ppapi/tests/test_char_set.h
+++ b/ppapi/tests/test_char_set.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_CHAR_SET_H_
 #define PPAPI_TESTS_TEST_CHAR_SET_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/ppapi/tests/test_compositor.h b/ppapi/tests/test_compositor.h
index 6287e6d..5e418a9 100644
--- a/ppapi/tests/test_compositor.h
+++ b/ppapi/tests/test_compositor.h
@@ -5,6 +5,8 @@
 #ifndef PAPPI_TESTS_TEST_COMPOSITOR_H_
 #define PAPPI_TESTS_TEST_COMPOSITOR_H_
 
+#include <stdint.h>
+
 #include <set>
 #include <string>
 
diff --git a/ppapi/tests/test_file_chooser.cc b/ppapi/tests/test_file_chooser.cc
index 1e00f04..58addc5 100644
--- a/ppapi/tests/test_file_chooser.cc
+++ b/ppapi/tests/test_file_chooser.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_file_chooser.h"
 
+#include <stddef.h>
+
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_file_io.h"
 #include "ppapi/cpp/dev/file_chooser_dev.h"
diff --git a/ppapi/tests/test_file_io.cc b/ppapi/tests/test_file_io.cc
index cf2d226..eaafc7f 100644
--- a/ppapi/tests/test_file_io.cc
+++ b/ppapi/tests/test_file_io.cc
@@ -6,6 +6,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/ppapi/tests/test_file_io.h b/ppapi/tests/test_file_io.h
index e01abcf..c7fc08f 100644
--- a/ppapi/tests/test_file_io.h
+++ b/ppapi/tests/test_file_io.h
@@ -5,6 +5,8 @@
 #ifndef PAPPI_TESTS_TEST_FILE_IO_H_
 #define PAPPI_TESTS_TEST_FILE_IO_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/tests/test_case.h"
diff --git a/ppapi/tests/test_file_ref.cc b/ppapi/tests/test_file_ref.cc
index 015f54c..3baef73 100644
--- a/ppapi/tests/test_file_ref.cc
+++ b/ppapi/tests/test_file_ref.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/tests/test_file_ref.h"
 
+#include <stddef.h>
 #include <stdio.h>
 
 #include <sstream>
diff --git a/ppapi/tests/test_file_ref.h b/ppapi/tests/test_file_ref.h
index ff91215..3265698 100644
--- a/ppapi/tests/test_file_ref.h
+++ b/ppapi/tests/test_file_ref.h
@@ -5,6 +5,8 @@
 #ifndef PAPPI_TESTS_TEST_FILE_REF_H_
 #define PAPPI_TESTS_TEST_FILE_REF_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/tests/test_case.h"
diff --git a/ppapi/tests/test_file_system.cc b/ppapi/tests/test_file_system.cc
index 858e2e3..b3440fa 100644
--- a/ppapi/tests/test_file_system.cc
+++ b/ppapi/tests/test_file_system.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/tests/test_file_system.h"
 
+#include <stdint.h>
 #include <string.h>
 
 #include "ppapi/c/pp_errors.h"
diff --git a/ppapi/tests/test_flash_clipboard.h b/ppapi/tests/test_flash_clipboard.h
index 824386c..a59c8e8 100644
--- a/ppapi/tests/test_flash_clipboard.h
+++ b/ppapi/tests/test_flash_clipboard.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_FLASH_CLIPBOARD_H_
 #define PPAPI_TESTS_TEST_FLASH_CLIPBOARD_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/private/ppb_flash_clipboard.h"
diff --git a/ppapi/tests/test_flash_drm.cc b/ppapi/tests/test_flash_drm.cc
index d76c640..b6bc6a7 100644
--- a/ppapi/tests/test_flash_drm.cc
+++ b/ppapi/tests/test_flash_drm.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_flash_drm.h"
 
+#include <stdint.h>
+
 #if defined(PPAPI_OS_WIN)
 #include <Windows.h>
 #endif
diff --git a/ppapi/tests/test_flash_file.h b/ppapi/tests/test_flash_file.h
index fd62dd6..ab0bde9 100644
--- a/ppapi/tests/test_flash_file.h
+++ b/ppapi/tests/test_flash_file.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_FLASH_FILE_H_
 #define PPAPI_TESTS_TEST_FLASH_FILE_H_
 
+#include <stddef.h>
+
 #include <string>
 
 #include "ppapi/tests/test_case.h"
diff --git a/ppapi/tests/test_flash_fullscreen_for_browser_ui.h b/ppapi/tests/test_flash_fullscreen_for_browser_ui.h
index de5d2e6..9bb80a4 100644
--- a/ppapi/tests/test_flash_fullscreen_for_browser_ui.h
+++ b/ppapi/tests/test_flash_fullscreen_for_browser_ui.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_FLASH_FULLSCREEN_FOR_BROWSER_UI_H_
 #define PPAPI_TESTS_TEST_FLASH_FULLSCREEN_FOR_BROWSER_UI_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/cpp/compositor.h"
diff --git a/ppapi/tests/test_fullscreen.h b/ppapi/tests/test_fullscreen.h
index bfe2e27..6324d3c 100644
--- a/ppapi/tests/test_fullscreen.h
+++ b/ppapi/tests/test_fullscreen.h
@@ -5,6 +5,8 @@
 #ifndef PAPPI_TESTS_TEST_FULLSCREEN_H_
 #define PAPPI_TESTS_TEST_FULLSCREEN_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/cpp/fullscreen.h"
diff --git a/ppapi/tests/test_graphics_3d.h b/ppapi/tests/test_graphics_3d.h
index 2914f96..ec456ae 100644
--- a/ppapi/tests/test_graphics_3d.h
+++ b/ppapi/tests/test_graphics_3d.h
@@ -5,6 +5,8 @@
 #ifndef PAPPI_TESTS_TEST_GRAPHICS_3D_H_
 #define PAPPI_TESTS_TEST_GRAPHICS_3D_H_
 
+#include <stdint.h>
+
 #include <string>
 #include "ppapi/tests/test_case.h"
 
diff --git a/ppapi/tests/test_host_resolver.cc b/ppapi/tests/test_host_resolver.cc
index 27ecae1..3bdbdc3 100644
--- a/ppapi/tests/test_host_resolver.cc
+++ b/ppapi/tests/test_host_resolver.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_host_resolver.h"
 
+#include <stddef.h>
+
 #include "ppapi/cpp/host_resolver.h"
 #include "ppapi/cpp/net_address.h"
 #include "ppapi/cpp/tcp_socket.h"
diff --git a/ppapi/tests/test_host_resolver.h b/ppapi/tests/test_host_resolver.h
index 5587c20..202371b 100644
--- a/ppapi/tests/test_host_resolver.h
+++ b/ppapi/tests/test_host_resolver.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_HOST_RESOLVER_H_
 #define PPAPI_TESTS_TEST_HOST_RESOLVER_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/ppb_host_resolver.h"
diff --git a/ppapi/tests/test_host_resolver_private.cc b/ppapi/tests/test_host_resolver_private.cc
index e13cb99..16cfd22 100644
--- a/ppapi/tests/test_host_resolver_private.cc
+++ b/ppapi/tests/test_host_resolver_private.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_host_resolver_private.h"
 
+#include <stddef.h>
+
 #include "ppapi/c/private/ppb_net_address_private.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/private/host_resolver_private.h"
diff --git a/ppapi/tests/test_host_resolver_private.h b/ppapi/tests/test_host_resolver_private.h
index 52f1f27..927f0735 100644
--- a/ppapi/tests/test_host_resolver_private.h
+++ b/ppapi/tests/test_host_resolver_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_HOST_RESOLVER_PRIVATE_H_
 #define PPAPI_TESTS_TEST_HOST_RESOLVER_PRIVATE_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/tests/test_case.h"
diff --git a/ppapi/tests/test_host_resolver_private_disallowed.h b/ppapi/tests/test_host_resolver_private_disallowed.h
index 564c858..5187b5a 100644
--- a/ppapi/tests/test_host_resolver_private_disallowed.h
+++ b/ppapi/tests/test_host_resolver_private_disallowed.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_HOST_RESOLVER_PRIVATE_DISALLOWED_H_
 #define PPAPI_TESTS_TEST_HOST_RESOLVER_PRIVATE_DISALLOWED_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/cpp/private/host_resolver_private.h"
diff --git a/ppapi/tests/test_image_data.cc b/ppapi/tests/test_image_data.cc
index 856eaa3..2bba061 100644
--- a/ppapi/tests/test_image_data.cc
+++ b/ppapi/tests/test_image_data.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_image_data.h"
 
+#include <stdint.h>
+
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/instance.h"
diff --git a/ppapi/tests/test_ime_input_event.h b/ppapi/tests/test_ime_input_event.h
index db92935..2228015 100644
--- a/ppapi/tests/test_ime_input_event.h
+++ b/ppapi/tests/test_ime_input_event.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_IME_INPUT_EVENT_H_
 #define PPAPI_TESTS_TEST_IME_INPUT_EVENT_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/ppapi/tests/test_input_event.h b/ppapi/tests/test_input_event.h
index 88e7388..bc05fd0 100644
--- a/ppapi/tests/test_input_event.h
+++ b/ppapi/tests/test_input_event.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_INPUT_EVENT_H_
 #define PPAPI_TESTS_TEST_INPUT_EVENT_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/ppapi/tests/test_media_stream_audio_track.cc b/ppapi/tests/test_media_stream_audio_track.cc
index 6509f2a..3833aaa 100644
--- a/ppapi/tests/test_media_stream_audio_track.cc
+++ b/ppapi/tests/test_media_stream_audio_track.cc
@@ -9,6 +9,7 @@
 // For MSVC.
 #define _USE_MATH_DEFINES
 #include <math.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
diff --git a/ppapi/tests/test_media_stream_audio_track.h b/ppapi/tests/test_media_stream_audio_track.h
index 1dcb3f3..291c865 100644
--- a/ppapi/tests/test_media_stream_audio_track.h
+++ b/ppapi/tests/test_media_stream_audio_track.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_MEDIA_STREAM_AUDIO_TRACK_H_
 #define PPAPI_TESTS_TEST_MEDIA_STREAM_AUDIO_TRACK_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/cpp/media_stream_audio_track.h"
diff --git a/ppapi/tests/test_media_stream_video_track.cc b/ppapi/tests/test_media_stream_video_track.cc
index b4f0186..91813a8 100644
--- a/ppapi/tests/test_media_stream_video_track.cc
+++ b/ppapi/tests/test_media_stream_video_track.cc
@@ -6,6 +6,9 @@
 
 #include "ppapi/tests/test_media_stream_video_track.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "ppapi/c/private/ppb_testing_private.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/instance.h"
diff --git a/ppapi/tests/test_memory.cc b/ppapi/tests/test_memory.cc
index d4db7c2..612ab4e 100644
--- a/ppapi/tests/test_memory.cc
+++ b/ppapi/tests/test_memory.cc
@@ -4,6 +4,9 @@
 
 #include "ppapi/tests/test_memory.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "ppapi/c/dev/ppb_memory_dev.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
diff --git a/ppapi/tests/test_message_handler.cc b/ppapi/tests/test_message_handler.cc
index bfb3be3..6fa1c13 100644
--- a/ppapi/tests/test_message_handler.cc
+++ b/ppapi/tests/test_message_handler.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_message_handler.h"
 
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 #include <algorithm>
 #include <map>
diff --git a/ppapi/tests/test_nacl_irt_stack_alignment.cc b/ppapi/tests/test_nacl_irt_stack_alignment.cc
index 5b379c4..11b9173 100644
--- a/ppapi/tests/test_nacl_irt_stack_alignment.cc
+++ b/ppapi/tests/test_nacl_irt_stack_alignment.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_nacl_irt_stack_alignment.h"
 
+#include <stddef.h>
+
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/cpp/instance.h"
diff --git a/ppapi/tests/test_net_address.cc b/ppapi/tests/test_net_address.cc
index f719ba5..ba0f28f 100644
--- a/ppapi/tests/test_net_address.cc
+++ b/ppapi/tests/test_net_address.cc
@@ -4,6 +4,9 @@
 
 #include "ppapi/tests/test_net_address.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <cstring>
 
 #include "ppapi/cpp/net_address.h"
diff --git a/ppapi/tests/test_net_address_private.cc b/ppapi/tests/test_net_address_private.cc
index 00ba3da..82b9c37 100644
--- a/ppapi/tests/test_net_address_private.cc
+++ b/ppapi/tests/test_net_address_private.cc
@@ -4,10 +4,12 @@
 
 #include "ppapi/tests/test_net_address_private.h"
 
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 
-#include "ppapi/cpp/private/net_address_private.h"
 #include "ppapi/c/private/ppb_net_address_private.h"
+#include "ppapi/cpp/private/net_address_private.h"
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
 
diff --git a/ppapi/tests/test_net_address_private_untrusted.h b/ppapi/tests/test_net_address_private_untrusted.h
index f1f0462..2f47f94 100644
--- a/ppapi/tests/test_net_address_private_untrusted.h
+++ b/ppapi/tests/test_net_address_private_untrusted.h
@@ -5,6 +5,8 @@
 #ifndef PAPPI_TESTS_TEST_NET_ADDRESS_PRIVATE_UNTRUSTED_H_
 #define PAPPI_TESTS_TEST_NET_ADDRESS_PRIVATE_UNTRUSTED_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/cpp/private/tcp_socket_private.h"
diff --git a/ppapi/tests/test_network_monitor.cc b/ppapi/tests/test_network_monitor.cc
index dcb712c..bee986c 100644
--- a/ppapi/tests/test_network_monitor.cc
+++ b/ppapi/tests/test_network_monitor.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/tests/test_network_monitor.h"
 
+#include <stddef.h>
 #include <string.h>
 
 #include "ppapi/cpp/completion_callback.h"
diff --git a/ppapi/tests/test_output_protection_private.cc b/ppapi/tests/test_output_protection_private.cc
index 49a44ae..298d009 100644
--- a/ppapi/tests/test_output_protection_private.cc
+++ b/ppapi/tests/test_output_protection_private.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_output_protection_private.h"
 
+#include <stdint.h>
+
 #include "ppapi/tests/testing_instance.h"
 
 REGISTER_TEST_CASE(OutputProtectionPrivate);
diff --git a/ppapi/tests/test_platform_verification_private.cc b/ppapi/tests/test_platform_verification_private.cc
index 922552a..422fe9f 100644
--- a/ppapi/tests/test_platform_verification_private.cc
+++ b/ppapi/tests/test_platform_verification_private.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_platform_verification_private.h"
 
+#include <stdint.h>
+
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/private/platform_verification.h"
diff --git a/ppapi/tests/test_post_message.cc b/ppapi/tests/test_post_message.cc
index da560cf..6cc9d0b 100644
--- a/ppapi/tests/test_post_message.cc
+++ b/ppapi/tests/test_post_message.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_post_message.h"
 
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 #include <algorithm>
 #include <map>
diff --git a/ppapi/tests/test_printing.h b/ppapi/tests/test_printing.h
index ceb0983..b076157 100644
--- a/ppapi/tests/test_printing.h
+++ b/ppapi/tests/test_printing.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_PRINTING_H_
 #define PPAPI_TESTS_TEST_PRINTING_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/tests/test_case.h"
diff --git a/ppapi/tests/test_tcp_server_socket_private.h b/ppapi/tests/test_tcp_server_socket_private.h
index 1e25381..e54c788 100644
--- a/ppapi/tests/test_tcp_server_socket_private.h
+++ b/ppapi/tests/test_tcp_server_socket_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_TCP_SERVER_SOCKET_PRIVATE_H_
 #define PPAPI_TESTS_TEST_TCP_SERVER_SOCKET_PRIVATE_H_
 
+#include <stddef.h>
+
 #include <cstddef>
 #include <string>
 
diff --git a/ppapi/tests/test_tcp_socket.h b/ppapi/tests/test_tcp_socket.h
index 8f7e2f4..92fe2ae 100644
--- a/ppapi/tests/test_tcp_socket.h
+++ b/ppapi/tests/test_tcp_socket.h
@@ -5,6 +5,8 @@
 #ifndef PAPPI_TESTS_TEST_TCP_SOCKET_H_
 #define PAPPI_TESTS_TEST_TCP_SOCKET_H_
 
+#include <stddef.h>
+
 #include <string>
 
 #include "ppapi/c/pp_stdint.h"
diff --git a/ppapi/tests/test_tcp_socket_private.cc b/ppapi/tests/test_tcp_socket_private.cc
index 0d43a76..ae7b472 100644
--- a/ppapi/tests/test_tcp_socket_private.cc
+++ b/ppapi/tests/test_tcp_socket_private.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/tests/test_tcp_socket_private.h"
 
+#include <stddef.h>
 #include <stdlib.h>
 
 #include <new>
diff --git a/ppapi/tests/test_test_internals.cc b/ppapi/tests/test_test_internals.cc
index 7f78ca4..d1097bf 100644
--- a/ppapi/tests/test_test_internals.cc
+++ b/ppapi/tests/test_test_internals.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_test_internals.h"
 
+#include <stdint.h>
+
 #include <vector>
 
 namespace {
diff --git a/ppapi/tests/test_trace_event.cc b/ppapi/tests/test_trace_event.cc
index 58f23a6..85004cc 100644
--- a/ppapi/tests/test_trace_event.cc
+++ b/ppapi/tests/test_trace_event.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_trace_event.h"
 
+#include <stdint.h>
+
 #include "ppapi/cpp/module.h"
 #include "ppapi/tests/testing_instance.h"
 
diff --git a/ppapi/tests/test_truetype_font.cc b/ppapi/tests/test_truetype_font.cc
index 2295fe0..24c081b 100644
--- a/ppapi/tests/test_truetype_font.cc
+++ b/ppapi/tests/test_truetype_font.cc
@@ -6,6 +6,8 @@
 
 #include "ppapi/tests/test_truetype_font.h"
 
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 #include <algorithm>
 #include <limits>
diff --git a/ppapi/tests/test_udp_socket.h b/ppapi/tests/test_udp_socket.h
index ee3e672..5307b39 100644
--- a/ppapi/tests/test_udp_socket.h
+++ b/ppapi/tests/test_udp_socket.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_UDP_SOCKET_H_
 #define PPAPI_TESTS_TEST_UDP_SOCKET_H_
 
+#include <stddef.h>
+
 #include <string>
 
 #include "ppapi/c/pp_stdint.h"
diff --git a/ppapi/tests/test_udp_socket_private.h b/ppapi/tests/test_udp_socket_private.h
index e4a23c9..8ba4f00 100644
--- a/ppapi/tests/test_udp_socket_private.h
+++ b/ppapi/tests/test_udp_socket_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_UDP_SOCKET_PRIVATE_H_
 #define PPAPI_TESTS_TEST_UDP_SOCKET_PRIVATE_H_
 
+#include <stddef.h>
+
 #include <string>
 
 #include "ppapi/c/pp_stdint.h"
diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc
index d3a210e..ab5c28a 100644
--- a/ppapi/tests/test_url_loader.cc
+++ b/ppapi/tests/test_url_loader.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/tests/test_url_loader.h"
 
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <string>
diff --git a/ppapi/tests/test_url_loader.h b/ppapi/tests/test_url_loader.h
index 76fd3a5..bea7401 100644
--- a/ppapi/tests/test_url_loader.h
+++ b/ppapi/tests/test_url_loader.h
@@ -5,6 +5,8 @@
 #ifndef PAPPI_TESTS_TEST_URL_LOADER_H_
 #define PAPPI_TESTS_TEST_URL_LOADER_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/private/ppb_file_io_private.h"
diff --git a/ppapi/tests/test_url_request.cc b/ppapi/tests/test_url_request.cc
index 7c9847b..891626f 100644
--- a/ppapi/tests/test_url_request.cc
+++ b/ppapi/tests/test_url_request.cc
@@ -6,6 +6,8 @@
 
 #include "ppapi/tests/test_url_request.h"
 
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 #include <string>
 
diff --git a/ppapi/tests/test_var.cc b/ppapi/tests/test_var.cc
index f7de608..08fc833 100644
--- a/ppapi/tests/test_var.cc
+++ b/ppapi/tests/test_var.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/tests/test_var.h"
 
+#include <stdint.h>
 #include <string.h>
 
 #include <limits>
diff --git a/ppapi/tests/test_var_deprecated.cc b/ppapi/tests/test_var_deprecated.cc
index d82cba1..3140457 100644
--- a/ppapi/tests/test_var_deprecated.cc
+++ b/ppapi/tests/test_var_deprecated.cc
@@ -4,12 +4,13 @@
 
 #include "ppapi/tests/test_var_deprecated.h"
 
+#include <stdint.h>
 #include <string.h>
 
 #include <limits>
 
-#include "ppapi/c/pp_var.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
+#include "ppapi/c/pp_var.h"
 #include "ppapi/cpp/dev/scriptable_object_deprecated.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
diff --git a/ppapi/tests/test_var_resource.cc b/ppapi/tests/test_var_resource.cc
index 5f185cc..c52280e 100644
--- a/ppapi/tests/test_var_resource.cc
+++ b/ppapi/tests/test_var_resource.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_var_resource.h"
 
+#include <stdint.h>
+
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/cpp/instance.h"
diff --git a/ppapi/tests/test_view.cc b/ppapi/tests/test_view.cc
index f8c20d8..bca172c 100644
--- a/ppapi/tests/test_view.cc
+++ b/ppapi/tests/test_view.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/test_view.h"
 
+#include <stddef.h>
+
 #include <sstream>
 
 #include "ppapi/c/pp_time.h"
diff --git a/ppapi/tests/test_view.h b/ppapi/tests/test_view.h
index 06da974..6d4d2d6 100644
--- a/ppapi/tests/test_view.h
+++ b/ppapi/tests/test_view.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TEST_TEST_VIEW_H_
 #define PPAPI_TEST_TEST_VIEW_H_
 
+#include <stdint.h>
+
 #include "ppapi/cpp/view.h"
 #include "ppapi/tests/test_case.h"
 
diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc
index 91046f2..98ef8bb 100644
--- a/ppapi/tests/test_websocket.cc
+++ b/ppapi/tests/test_websocket.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/tests/test_websocket.h"
 
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/ppapi/tests/test_websocket.h b/ppapi/tests/test_websocket.h
index eff0a5e..7eed525 100644
--- a/ppapi/tests/test_websocket.h
+++ b/ppapi/tests/test_websocket.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TEST_WEBSOCKET_H_
 #define PPAPI_TESTS_TEST_WEBSOCKET_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/ppapi/tests/test_x509_certificate_private.cc b/ppapi/tests/test_x509_certificate_private.cc
index fab2f21..9a456f8 100644
--- a/ppapi/tests/test_x509_certificate_private.cc
+++ b/ppapi/tests/test_x509_certificate_private.cc
@@ -4,12 +4,14 @@
 
 #include "ppapi/tests/test_x509_certificate_private.h"
 
+#include <stdint.h>
+
 #include <cmath>
 #include <limits>
 
 #include "ppapi/cpp/private/x509_certificate_private.h"
-#include "ppapi/cpp/var_array_buffer.h"
 #include "ppapi/cpp/var.h"
+#include "ppapi/cpp/var_array_buffer.h"
 #include "ppapi/tests/testing_instance.h"
 
 REGISTER_TEST_CASE(X509CertificatePrivate);
diff --git a/ppapi/tests/testing_instance.cc b/ppapi/tests/testing_instance.cc
index 71851f98..5c393d8 100644
--- a/ppapi/tests/testing_instance.cc
+++ b/ppapi/tests/testing_instance.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/tests/testing_instance.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <cstring>
 #include <iomanip>
diff --git a/ppapi/tests/testing_instance.h b/ppapi/tests/testing_instance.h
index 2b306a5..34de3f7 100644
--- a/ppapi/tests/testing_instance.h
+++ b/ppapi/tests/testing_instance.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_TESTS_TESTING_INSTANCE_H_
 #define PPAPI_TESTS_TESTING_INSTANCE_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/utility/completion_callback_factory.h"