Pepper: Reduce includes in generated thunks.

There are some unnecessary includes in generated thunks. We should remove these
for clarity, and (hopefully) to reduce build time. A small test showed that
ppb_view_thunk.cc built 18% faster after the change, but that's well within the
noise on my local system.

BUG=334727

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245111 0039d316-1c4b-4281-b951-d872f2087c98

42 files changed, 153 insertions, 219 deletions

diff --git a/ppapi/generators/idl_thunk.py b/ppapi/generators/idl_thunk.py
index 023335c..d06defb 100755
--- a/ppapi/generators/idl_thunk.py
+++ b/ppapi/generators/idl_thunk.py
@@ -460,9 +460,7 @@ class TGen(GeneratorByFile):
     includes = ['ppapi/c/pp_errors.h',
                 'ppapi/shared_impl/tracked_callback.h',
                 'ppapi/thunk/enter.h',
-                'ppapi/thunk/ppb_instance_api.h',
-                'ppapi/thunk/resource_creation_api.h',
-                'ppapi/thunk/thunk.h']
+                'ppapi/thunk/ppapi_thunk_export.h']
     includes.append(_GetHeaderFileName(filenode))
     for api in meta.Apis():
       includes.append('%s' % api.lower())
@@ -547,10 +545,11 @@ class TGen(GeneratorByFile):
     out.Write('}  // namespace\n')
     out.Write('\n')
     for thunk_type, thunk_name in version_list:
-      thunk_decl = 'const %s* Get%s_Thunk() {\n' % (thunk_type, thunk_type)
+      thunk_decl = ('PPAPI_THUNK_EXPORT const %s* Get%s_Thunk() {\n' %
+                    (thunk_type, thunk_type))
       if len(thunk_decl) > 80:
-        thunk_decl = 'const %s*\n    Get%s_Thunk() {\n' % (thunk_type,
-                                                           thunk_type)
+        thunk_decl = ('PPAPI_THUNK_EXPORT const %s*\n    Get%s_Thunk() {\n' %
+                      (thunk_type, thunk_type))
       out.Write(thunk_decl)
       out.Write('  return &%s;\n' % thunk_name)
       out.Write('}\n')
diff --git a/ppapi/thunk/ppb_console_thunk.cc b/ppapi/thunk/ppb_console_thunk.cc
index 80b115c..65c992b 100644
--- a/ppapi/thunk/ppb_console_thunk.cc
+++ b/ppapi/thunk/ppb_console_thunk.cc
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_console.idl modified Tue Apr 16 11:25:44 2013.
+// From ppb_console.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_console.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
@@ -43,7 +41,7 @@ const PPB_Console_1_0 g_ppb_console_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_Console_1_0* GetPPB_Console_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Console_1_0* GetPPB_Console_1_0_Thunk() {
   return &g_ppb_console_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
index 231ef1d..3af6226c 100644
--- a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
+++ b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
@@ -3,15 +3,13 @@
 // found in the LICENSE file.
 
 // From private/ppb_content_decryptor_private.idl,
-//   modified Wed Jan  8 16:02:43 2014.
+//   modified Mon Jan 13 12:02:23 2014.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_content_decryptor_private.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
@@ -162,7 +160,7 @@ const PPB_ContentDecryptor_Private_0_10
 
 }  // namespace
 
-const PPB_ContentDecryptor_Private_0_10*
+PPAPI_THUNK_EXPORT const PPB_ContentDecryptor_Private_0_10*
     GetPPB_ContentDecryptor_Private_0_10_Thunk() {
   return &g_ppb_contentdecryptor_private_thunk_0_10;
 }
diff --git a/ppapi/thunk/ppb_device_ref_dev_thunk.cc b/ppapi/thunk/ppb_device_ref_dev_thunk.cc
index 9045cd8..eb87093b 100644
--- a/ppapi/thunk/ppb_device_ref_dev_thunk.cc
+++ b/ppapi/thunk/ppb_device_ref_dev_thunk.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From dev/ppb_device_ref_dev.idl modified Thu Dec 20 13:10:26 2012.
+// From dev/ppb_device_ref_dev.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/dev/ppb_device_ref_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_device_ref_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -48,7 +46,8 @@ const PPB_DeviceRef_Dev_0_1 g_ppb_deviceref_dev_thunk_0_1 = {
 
 }  // namespace
 
-const PPB_DeviceRef_Dev_0_1* GetPPB_DeviceRef_Dev_0_1_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_DeviceRef_Dev_0_1*
+    GetPPB_DeviceRef_Dev_0_1_Thunk() {
   return &g_ppb_deviceref_dev_thunk_0_1;
 }
 
diff --git a/ppapi/thunk/ppb_file_chooser_dev_thunk.cc b/ppapi/thunk/ppb_file_chooser_dev_thunk.cc
index fe1aa0d..5d8fae0 100644
--- a/ppapi/thunk/ppb_file_chooser_dev_thunk.cc
+++ b/ppapi/thunk/ppb_file_chooser_dev_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From dev/ppb_file_chooser_dev.idl modified Mon Apr  1 08:24:03 2013.
+// From dev/ppb_file_chooser_dev.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_file_chooser_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -76,11 +74,13 @@ const PPB_FileChooser_Dev_0_6 g_ppb_filechooser_dev_thunk_0_6 = {
 
 }  // namespace
 
-const PPB_FileChooser_Dev_0_5* GetPPB_FileChooser_Dev_0_5_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_FileChooser_Dev_0_5*
+    GetPPB_FileChooser_Dev_0_5_Thunk() {
   return &g_ppb_filechooser_dev_thunk_0_5;
 }
 
-const PPB_FileChooser_Dev_0_6* GetPPB_FileChooser_Dev_0_6_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_FileChooser_Dev_0_6*
+    GetPPB_FileChooser_Dev_0_6_Thunk() {
   return &g_ppb_filechooser_dev_thunk_0_6;
 }
 
diff --git a/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc b/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc
index 552bee0..e3b790b 100644
--- a/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc
+++ b/ppapi/thunk/ppb_file_chooser_trusted_thunk.cc
@@ -3,17 +3,15 @@
 // found in the LICENSE file.
 
 // From trusted/ppb_file_chooser_trusted.idl,
-//   modified Mon Apr  1 08:24:03 2013.
+//   modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_file_chooser_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -60,11 +58,13 @@ const PPB_FileChooserTrusted_0_6 g_ppb_filechoosertrusted_thunk_0_6 = {
 
 }  // namespace
 
-const PPB_FileChooserTrusted_0_5* GetPPB_FileChooserTrusted_0_5_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted_0_5*
+    GetPPB_FileChooserTrusted_0_5_Thunk() {
   return &g_ppb_filechoosertrusted_thunk_0_5;
 }
 
-const PPB_FileChooserTrusted_0_6* GetPPB_FileChooserTrusted_0_6_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted_0_6*
+    GetPPB_FileChooserTrusted_0_6_Thunk() {
   return &g_ppb_filechoosertrusted_thunk_0_6;
 }
 
diff --git a/ppapi/thunk/ppb_file_io_thunk.cc b/ppapi/thunk/ppb_file_io_thunk.cc
index 331d190..9e5c6e8 100644
--- a/ppapi/thunk/ppb_file_io_thunk.cc
+++ b/ppapi/thunk/ppb_file_io_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_file_io.idl modified Tue Apr 16 11:25:44 2013.
+// From ppb_file_io.idl modified Thu Oct 31 12:30:06 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_file_io.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_file_io_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -169,11 +167,11 @@ const PPB_FileIO_1_1 g_ppb_fileio_thunk_1_1 = {
 
 }  // namespace
 
-const PPB_FileIO_1_0* GetPPB_FileIO_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_FileIO_1_0* GetPPB_FileIO_1_0_Thunk() {
   return &g_ppb_fileio_thunk_1_0;
 }
 
-const PPB_FileIO_1_1* GetPPB_FileIO_1_1_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_FileIO_1_1* GetPPB_FileIO_1_1_Thunk() {
   return &g_ppb_fileio_thunk_1_1;
 }
 
diff --git a/ppapi/thunk/ppb_file_system_thunk.cc b/ppapi/thunk/ppb_file_system_thunk.cc
index 8a608ac..b6dec41 100644
--- a/ppapi/thunk/ppb_file_system_thunk.cc
+++ b/ppapi/thunk/ppb_file_system_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_file_system.idl modified Thu Dec 20 13:10:26 2012.
+// From ppb_file_system.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_file_system.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_file_system_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -60,7 +58,7 @@ const PPB_FileSystem_1_0 g_ppb_filesystem_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_FileSystem_1_0* GetPPB_FileSystem_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_FileSystem_1_0* GetPPB_FileSystem_1_0_Thunk() {
   return &g_ppb_filesystem_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_find_dev_thunk.cc b/ppapi/thunk/ppb_find_dev_thunk.cc
index 79a1085..05698cb 100644
--- a/ppapi/thunk/ppb_find_dev_thunk.cc
+++ b/ppapi/thunk/ppb_find_dev_thunk.cc
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From dev/ppb_find_dev.idl modified Tue Apr 16 11:25:44 2013.
+// From dev/ppb_find_dev.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/dev/ppb_find_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
@@ -42,7 +40,7 @@ const PPB_Find_Dev_0_3 g_ppb_find_dev_thunk_0_3 = {
 
 }  // namespace
 
-const PPB_Find_Dev_0_3* GetPPB_Find_Dev_0_3_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Find_Dev_0_3* GetPPB_Find_Dev_0_3_Thunk() {
   return &g_ppb_find_dev_thunk_0_3;
 }
 
diff --git a/ppapi/thunk/ppb_flash_drm_thunk.cc b/ppapi/thunk/ppb_flash_drm_thunk.cc
index a7a3cba..359a014 100644
--- a/ppapi/thunk/ppb_flash_drm_thunk.cc
+++ b/ppapi/thunk/ppb_flash_drm_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From private/ppb_flash_drm.idl modified Mon Nov 11 14:49:53 2013.
+// From private/ppb_flash_drm.idl modified Tue Dec  3 15:22:00 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash_drm.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_flash_drm_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -84,11 +82,11 @@ const PPB_Flash_DRM_1_1 g_ppb_flash_drm_thunk_1_1 = {
 
 }  // namespace
 
-const PPB_Flash_DRM_1_0* GetPPB_Flash_DRM_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Flash_DRM_1_0* GetPPB_Flash_DRM_1_0_Thunk() {
   return &g_ppb_flash_drm_thunk_1_0;
 }
 
-const PPB_Flash_DRM_1_1* GetPPB_Flash_DRM_1_1_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Flash_DRM_1_1* GetPPB_Flash_DRM_1_1_Thunk() {
   return &g_ppb_flash_drm_thunk_1_1;
 }
 
diff --git a/ppapi/thunk/ppb_fullscreen_thunk.cc b/ppapi/thunk/ppb_fullscreen_thunk.cc
index 9e07356..4be20ca 100644
--- a/ppapi/thunk/ppb_fullscreen_thunk.cc
+++ b/ppapi/thunk/ppb_fullscreen_thunk.cc
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_fullscreen.idl modified Wed May  1 09:47:29 2013.
+// From ppb_fullscreen.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_fullscreen.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
@@ -49,7 +47,7 @@ const PPB_Fullscreen_1_0 g_ppb_fullscreen_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_Fullscreen_1_0* GetPPB_Fullscreen_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Fullscreen_1_0* GetPPB_Fullscreen_1_0_Thunk() {
   return &g_ppb_fullscreen_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_gamepad_thunk.cc b/ppapi/thunk/ppb_gamepad_thunk.cc
index e36af34..8e49e52 100644
--- a/ppapi/thunk/ppb_gamepad_thunk.cc
+++ b/ppapi/thunk/ppb_gamepad_thunk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_gamepad.idl modified Wed Apr 17 11:16:00 2013.
+// From ppb_gamepad.idl modified Fri Nov 15 14:40:57 2013.
 
 #include <string.h>
 
@@ -10,10 +10,8 @@
 #include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_gamepad_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -36,7 +34,7 @@ const PPB_Gamepad_1_0 g_ppb_gamepad_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_Gamepad_1_0* GetPPB_Gamepad_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Gamepad_1_0* GetPPB_Gamepad_1_0_Thunk() {
   return &g_ppb_gamepad_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_graphics_2d_dev_thunk.cc b/ppapi/thunk/ppb_graphics_2d_dev_thunk.cc
index 2882155..8e9a07c 100644
--- a/ppapi/thunk/ppb_graphics_2d_dev_thunk.cc
+++ b/ppapi/thunk/ppb_graphics_2d_dev_thunk.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From dev/ppb_graphics_2d_dev.idl modified Fri Nov  8 13:58:50 2013.
+// From dev/ppb_graphics_2d_dev.idl modified Mon Nov 25 11:02:23 2013.
 
 #include "ppapi/c/dev/ppb_graphics_2d_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_graphics_2d_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -66,11 +64,13 @@ const PPB_Graphics2D_Dev_0_2 g_ppb_graphics2d_dev_thunk_0_2 = {
 
 }  // namespace
 
-const PPB_Graphics2D_Dev_0_1* GetPPB_Graphics2D_Dev_0_1_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Graphics2D_Dev_0_1*
+    GetPPB_Graphics2D_Dev_0_1_Thunk() {
   return &g_ppb_graphics2d_dev_thunk_0_1;
 }
 
-const PPB_Graphics2D_Dev_0_2* GetPPB_Graphics2D_Dev_0_2_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Graphics2D_Dev_0_2*
+    GetPPB_Graphics2D_Dev_0_2_Thunk() {
   return &g_ppb_graphics2d_dev_thunk_0_2;
 }
 
diff --git a/ppapi/thunk/ppb_graphics_2d_thunk.cc b/ppapi/thunk/ppb_graphics_2d_thunk.cc
index 9eefee2..f4446aa 100644
--- a/ppapi/thunk/ppb_graphics_2d_thunk.cc
+++ b/ppapi/thunk/ppb_graphics_2d_thunk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_graphics_2d.idl modified Fri Apr 26 08:49:08 2013.
+// From ppb_graphics_2d.idl modified Tue Aug 20 08:13:36 2013.
 
 #include <string.h>
 
@@ -11,10 +11,8 @@
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_graphics_2d_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -127,11 +125,11 @@ const PPB_Graphics2D_1_1 g_ppb_graphics2d_thunk_1_1 = {
 
 }  // namespace
 
-const PPB_Graphics2D_1_0* GetPPB_Graphics2D_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Graphics2D_1_0* GetPPB_Graphics2D_1_0_Thunk() {
   return &g_ppb_graphics2d_thunk_1_0;
 }
 
-const PPB_Graphics2D_1_1* GetPPB_Graphics2D_1_1_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Graphics2D_1_1* GetPPB_Graphics2D_1_1_Thunk() {
   return &g_ppb_graphics2d_thunk_1_1;
 }
 
diff --git a/ppapi/thunk/ppb_graphics_3d_thunk.cc b/ppapi/thunk/ppb_graphics_3d_thunk.cc
index cc00696..837e2bc 100644
--- a/ppapi/thunk/ppb_graphics_3d_thunk.cc
+++ b/ppapi/thunk/ppb_graphics_3d_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_graphics_3d.idl modified Mon Apr  1 08:24:03 2013.
+// From ppb_graphics_3d.idl modified Thu Oct 31 12:30:06 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_graphics_3d.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_graphics_3d_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -101,7 +99,7 @@ const PPB_Graphics3D_1_0 g_ppb_graphics3d_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_Graphics3D_1_0* GetPPB_Graphics3D_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Graphics3D_1_0* GetPPB_Graphics3D_1_0_Thunk() {
   return &g_ppb_graphics3d_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_host_resolver_thunk.cc b/ppapi/thunk/ppb_host_resolver_thunk.cc
index 03b8d01..bac4007 100644
--- a/ppapi/thunk/ppb_host_resolver_thunk.cc
+++ b/ppapi/thunk/ppb_host_resolver_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_host_resolver.idl modified Thu Jun 20 15:36:07 2013.
+// From ppb_host_resolver.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_host_resolver.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_host_resolver_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -83,7 +81,8 @@ const PPB_HostResolver_1_0 g_ppb_hostresolver_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_HostResolver_1_0* GetPPB_HostResolver_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_HostResolver_1_0*
+    GetPPB_HostResolver_1_0_Thunk() {
   return &g_ppb_hostresolver_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_image_data_thunk.cc b/ppapi/thunk/ppb_image_data_thunk.cc
index 51daa59..6370185 100644
--- a/ppapi/thunk/ppb_image_data_thunk.cc
+++ b/ppapi/thunk/ppb_image_data_thunk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_image_data.idl modified Thu Jun  6 18:05:40 2013.
+// From ppb_image_data.idl modified Tue Aug 20 08:13:36 2013.
 
 #include <string.h>
 
@@ -11,10 +11,8 @@
 #include "ppapi/shared_impl/ppb_image_data_shared.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -89,7 +87,7 @@ const PPB_ImageData_1_0 g_ppb_imagedata_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_ImageData_1_0* GetPPB_ImageData_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_ImageData_1_0* GetPPB_ImageData_1_0_Thunk() {
   return &g_ppb_imagedata_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_instance_private_thunk.cc b/ppapi/thunk/ppb_instance_private_thunk.cc
index 0d9c10b..545b4ec 100644
--- a/ppapi/thunk/ppb_instance_private_thunk.cc
+++ b/ppapi/thunk/ppb_instance_private_thunk.cc
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From private/ppb_instance_private.idl modified Thu Feb 28 11:58:17 2013.
+// From private/ppb_instance_private.idl modified Thu Nov 14 08:28:26 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_instance_private.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
@@ -51,7 +49,8 @@ const PPB_Instance_Private_0_1 g_ppb_instance_private_thunk_0_1 = {
 
 }  // namespace
 
-const PPB_Instance_Private_0_1* GetPPB_Instance_Private_0_1_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Instance_Private_0_1*
+    GetPPB_Instance_Private_0_1_Thunk() {
   return &g_ppb_instance_private_thunk_0_1;
 }
 
diff --git a/ppapi/thunk/ppb_instance_thunk.cc b/ppapi/thunk/ppb_instance_thunk.cc
index f55c7ee..770998f 100644
--- a/ppapi/thunk/ppb_instance_thunk.cc
+++ b/ppapi/thunk/ppb_instance_thunk.cc
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_instance.idl modified Thu Feb 28 11:58:17 2013.
+// From ppb_instance.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
@@ -40,7 +38,7 @@ const PPB_Instance_1_0 g_ppb_instance_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_Instance_1_0* GetPPB_Instance_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Instance_1_0* GetPPB_Instance_1_0_Thunk() {
   return &g_ppb_instance_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc b/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc
index cd58b24..6b32859 100644
--- a/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc
+++ b/ppapi/thunk/ppb_isolated_file_system_private_thunk.cc
@@ -3,17 +3,15 @@
 // found in the LICENSE file.
 
 // From private/ppb_isolated_file_system_private.idl,
-//   modified Fri Nov  8 02:21:15 2013.
+//   modified Mon Nov 25 11:17:07 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_isolated_file_system_private.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_isolated_file_system_private_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -42,7 +40,7 @@ const PPB_IsolatedFileSystem_Private_0_2
 
 }  // namespace
 
-const PPB_IsolatedFileSystem_Private_0_2*
+PPAPI_THUNK_EXPORT const PPB_IsolatedFileSystem_Private_0_2*
     GetPPB_IsolatedFileSystem_Private_0_2_Thunk() {
   return &g_ppb_isolatedfilesystem_private_thunk_0_2;
 }
diff --git a/ppapi/thunk/ppb_media_stream_video_track_thunk.cc b/ppapi/thunk/ppb_media_stream_video_track_thunk.cc
index 9a6b92a..08e3899 100644
--- a/ppapi/thunk/ppb_media_stream_video_track_thunk.cc
+++ b/ppapi/thunk/ppb_media_stream_video_track_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_media_stream_video_track.idl modified Wed Jan  8 14:08:11 2014.
+// From ppb_media_stream_video_track.idl modified Mon Jan 13 12:02:23 2014.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_media_stream_video_track.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_media_stream_video_track_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -89,7 +87,8 @@ const PPB_MediaStreamVideoTrack_0_1 g_ppb_mediastreamvideotrack_thunk_0_1 = {
 
 }  // namespace
 
-const PPB_MediaStreamVideoTrack_0_1* GetPPB_MediaStreamVideoTrack_0_1_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_MediaStreamVideoTrack_0_1*
+    GetPPB_MediaStreamVideoTrack_0_1_Thunk() {
   return &g_ppb_mediastreamvideotrack_thunk_0_1;
 }
 
diff --git a/ppapi/thunk/ppb_messaging_thunk.cc b/ppapi/thunk/ppb_messaging_thunk.cc
index d485b3d..fb936b8 100644
--- a/ppapi/thunk/ppb_messaging_thunk.cc
+++ b/ppapi/thunk/ppb_messaging_thunk.cc
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_messaging.idl modified Tue Apr 16 11:25:44 2013.
+// From ppb_messaging.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_messaging.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
@@ -31,7 +29,7 @@ const PPB_Messaging_1_0 g_ppb_messaging_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_Messaging_1_0* GetPPB_Messaging_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Messaging_1_0* GetPPB_Messaging_1_0_Thunk() {
   return &g_ppb_messaging_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_mouse_cursor_thunk.cc b/ppapi/thunk/ppb_mouse_cursor_thunk.cc
index beb8263..8e4ec359 100644
--- a/ppapi/thunk/ppb_mouse_cursor_thunk.cc
+++ b/ppapi/thunk/ppb_mouse_cursor_thunk.cc
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_mouse_cursor.idl modified Mon Apr  1 08:24:03 2013.
+// From ppb_mouse_cursor.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_mouse_cursor.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
@@ -34,7 +32,7 @@ const PPB_MouseCursor_1_0 g_ppb_mousecursor_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_MouseCursor_1_0* GetPPB_MouseCursor_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_MouseCursor_1_0* GetPPB_MouseCursor_1_0_Thunk() {
   return &g_ppb_mousecursor_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_mouse_lock_thunk.cc b/ppapi/thunk/ppb_mouse_lock_thunk.cc
index d9bfa2d..586a229 100644
--- a/ppapi/thunk/ppb_mouse_lock_thunk.cc
+++ b/ppapi/thunk/ppb_mouse_lock_thunk.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_mouse_lock.idl modified Mon May  6 13:58:10 2013.
+// From ppb_mouse_lock.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_mouse_lock.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
@@ -42,7 +40,7 @@ const PPB_MouseLock_1_0 g_ppb_mouselock_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_MouseLock_1_0* GetPPB_MouseLock_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_MouseLock_1_0* GetPPB_MouseLock_1_0_Thunk() {
   return &g_ppb_mouselock_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_network_list_thunk.cc b/ppapi/thunk/ppb_network_list_thunk.cc
index 393a752..3610fe6 100644
--- a/ppapi/thunk/ppb_network_list_thunk.cc
+++ b/ppapi/thunk/ppb_network_list_thunk.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_network_list.idl modified Mon Sep  9 11:18:02 2013.
+// From ppb_network_list.idl modified Thu Oct 31 12:30:06 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_network_list.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_network_list_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -95,7 +93,7 @@ const PPB_NetworkList_1_0 g_ppb_networklist_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_NetworkList_1_0* GetPPB_NetworkList_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_NetworkList_1_0* GetPPB_NetworkList_1_0_Thunk() {
   return &g_ppb_networklist_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_network_monitor_thunk.cc b/ppapi/thunk/ppb_network_monitor_thunk.cc
index 089d783..5f7851d 100644
--- a/ppapi/thunk/ppb_network_monitor_thunk.cc
+++ b/ppapi/thunk/ppb_network_monitor_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_network_monitor.idl modified Thu Sep  5 12:10:00 2013.
+// From ppb_network_monitor.idl modified Thu Oct 31 12:30:06 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_network_monitor.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_network_monitor_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -52,7 +50,8 @@ const PPB_NetworkMonitor_1_0 g_ppb_networkmonitor_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_NetworkMonitor_1_0* GetPPB_NetworkMonitor_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_NetworkMonitor_1_0*
+    GetPPB_NetworkMonitor_1_0_Thunk() {
   return &g_ppb_networkmonitor_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_network_proxy_thunk.cc b/ppapi/thunk/ppb_network_proxy_thunk.cc
index 20c14ad..f041e95 100644
--- a/ppapi/thunk/ppb_network_proxy_thunk.cc
+++ b/ppapi/thunk/ppb_network_proxy_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_network_proxy.idl modified Thu Jun 20 22:03:12 2013.
+// From ppb_network_proxy.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_network_proxy.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_network_proxy_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -39,7 +37,8 @@ const PPB_NetworkProxy_1_0 g_ppb_networkproxy_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_NetworkProxy_1_0* GetPPB_NetworkProxy_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_NetworkProxy_1_0*
+    GetPPB_NetworkProxy_1_0_Thunk() {
   return &g_ppb_networkproxy_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_output_protection_private_thunk.cc b/ppapi/thunk/ppb_output_protection_private_thunk.cc
index 8708806..0813f99 100644
--- a/ppapi/thunk/ppb_output_protection_private_thunk.cc
+++ b/ppapi/thunk/ppb_output_protection_private_thunk.cc
@@ -3,17 +3,15 @@
 // found in the LICENSE file.
 
 // From private/ppb_output_protection_private.idl,
-//   modified Thu Aug 29 13:39:04 2013.
+//   modified Thu Oct 31 12:30:06 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_output_protection_private.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_output_protection_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -69,7 +67,7 @@ const PPB_OutputProtection_Private_0_1
 
 }  // namespace
 
-const PPB_OutputProtection_Private_0_1*
+PPAPI_THUNK_EXPORT const PPB_OutputProtection_Private_0_1*
     GetPPB_OutputProtection_Private_0_1_Thunk() {
   return &g_ppb_outputprotection_private_thunk_0_1;
 }
diff --git a/ppapi/thunk/ppb_platform_verification_private_thunk.cc b/ppapi/thunk/ppb_platform_verification_private_thunk.cc
index 37d842e..c24e7d4 100644
--- a/ppapi/thunk/ppb_platform_verification_private_thunk.cc
+++ b/ppapi/thunk/ppb_platform_verification_private_thunk.cc
@@ -3,17 +3,15 @@
 // found in the LICENSE file.
 
 // From private/ppb_platform_verification_private.idl,
-//   modified Fri Oct 18 15:02:09 2013.
+//   modified Thu Oct 31 12:30:06 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_platform_verification_private.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_platform_verification_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -63,7 +61,7 @@ const PPB_PlatformVerification_Private_0_2
 
 }  // namespace
 
-const PPB_PlatformVerification_Private_0_2*
+PPAPI_THUNK_EXPORT const PPB_PlatformVerification_Private_0_2*
     GetPPB_PlatformVerification_Private_0_2_Thunk() {
   return &g_ppb_platformverification_private_thunk_0_2;
 }
diff --git a/ppapi/thunk/ppb_printing_dev_thunk.cc b/ppapi/thunk/ppb_printing_dev_thunk.cc
index 117ef17..96f52f5 100644
--- a/ppapi/thunk/ppb_printing_dev_thunk.cc
+++ b/ppapi/thunk/ppb_printing_dev_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From dev/ppb_printing_dev.idl modified Fri Apr 19 10:45:09 2013.
+// From dev/ppb_printing_dev.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/dev/ppb_printing_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_printing_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -46,7 +44,8 @@ const PPB_Printing_Dev_0_7 g_ppb_printing_dev_thunk_0_7 = {
 
 }  // namespace
 
-const PPB_Printing_Dev_0_7* GetPPB_Printing_Dev_0_7_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Printing_Dev_0_7*
+    GetPPB_Printing_Dev_0_7_Thunk() {
   return &g_ppb_printing_dev_thunk_0_7;
 }
 
diff --git a/ppapi/thunk/ppb_truetype_font_dev_thunk.cc b/ppapi/thunk/ppb_truetype_font_dev_thunk.cc
index afed58e..fec6011 100644
--- a/ppapi/thunk/ppb_truetype_font_dev_thunk.cc
+++ b/ppapi/thunk/ppb_truetype_font_dev_thunk.cc
@@ -2,18 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From dev/ppb_truetype_font_dev.idl modified Wed Apr 17 15:38:46 2013.
+// From dev/ppb_truetype_font_dev.idl modified Thu Oct 31 12:30:06 2013.
 
 #include "ppapi/c/dev/ppb_truetype_font_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_truetype_font_api.h"
 #include "ppapi/thunk/ppb_truetype_font_singleton_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -113,7 +111,8 @@ const PPB_TrueTypeFont_Dev_0_1 g_ppb_truetypefont_dev_thunk_0_1 = {
 
 }  // namespace
 
-const PPB_TrueTypeFont_Dev_0_1* GetPPB_TrueTypeFont_Dev_0_1_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_TrueTypeFont_Dev_0_1*
+    GetPPB_TrueTypeFont_Dev_0_1_Thunk() {
   return &g_ppb_truetypefont_dev_thunk_0_1;
 }
 
diff --git a/ppapi/thunk/ppb_udp_socket_thunk.cc b/ppapi/thunk/ppb_udp_socket_thunk.cc
index 8343d2f..212ff93 100644
--- a/ppapi/thunk/ppb_udp_socket_thunk.cc
+++ b/ppapi/thunk/ppb_udp_socket_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_udp_socket.idl modified Thu Jun 20 14:03:55 2013.
+// From ppb_udp_socket.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_udp_socket.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_udp_socket_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -115,7 +113,7 @@ const PPB_UDPSocket_1_0 g_ppb_udpsocket_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_UDPSocket_1_0* GetPPB_UDPSocket_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_UDPSocket_1_0* GetPPB_UDPSocket_1_0_Thunk() {
   return &g_ppb_udpsocket_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_url_loader_thunk.cc b/ppapi/thunk/ppb_url_loader_thunk.cc
index 7df78b9..2259429 100644
--- a/ppapi/thunk/ppb_url_loader_thunk.cc
+++ b/ppapi/thunk/ppb_url_loader_thunk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_url_loader.idl modified Wed Apr 17 11:16:00 2013.
+// From ppb_url_loader.idl modified Tue Aug 20 08:13:36 2013.
 
 #include <string.h>
 
@@ -11,10 +11,8 @@
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_url_loader_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -135,7 +133,7 @@ const PPB_URLLoader_1_0 g_ppb_urlloader_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_URLLoader_1_0* GetPPB_URLLoader_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_URLLoader_1_0* GetPPB_URLLoader_1_0_Thunk() {
   return &g_ppb_urlloader_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_url_loader_trusted_thunk.cc b/ppapi/thunk/ppb_url_loader_trusted_thunk.cc
index 3082f36..d0c71e1 100644
--- a/ppapi/thunk/ppb_url_loader_trusted_thunk.cc
+++ b/ppapi/thunk/ppb_url_loader_trusted_thunk.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From trusted/ppb_url_loader_trusted.idl modified Wed Apr 17 11:16:00 2013.
+// From trusted/ppb_url_loader_trusted.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_url_loader_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -42,7 +40,8 @@ const PPB_URLLoaderTrusted_0_3 g_ppb_urlloadertrusted_thunk_0_3 = {
 
 }  // namespace
 
-const PPB_URLLoaderTrusted_0_3* GetPPB_URLLoaderTrusted_0_3_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted_0_3*
+    GetPPB_URLLoaderTrusted_0_3_Thunk() {
   return &g_ppb_urlloadertrusted_thunk_0_3;
 }
 
diff --git a/ppapi/thunk/ppb_url_request_info_thunk.cc b/ppapi/thunk/ppb_url_request_info_thunk.cc
index c6a7397..7fa058c 100644
--- a/ppapi/thunk/ppb_url_request_info_thunk.cc
+++ b/ppapi/thunk/ppb_url_request_info_thunk.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_url_request_info.idl modified Mon Apr  1 08:24:03 2013.
+// From ppb_url_request_info.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_url_request_info.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_url_request_info_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -75,7 +73,8 @@ const PPB_URLRequestInfo_1_0 g_ppb_urlrequestinfo_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_URLRequestInfo_1_0* GetPPB_URLRequestInfo_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_URLRequestInfo_1_0*
+    GetPPB_URLRequestInfo_1_0_Thunk() {
   return &g_ppb_urlrequestinfo_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_url_response_info_thunk.cc b/ppapi/thunk/ppb_url_response_info_thunk.cc
index fe6ef08..48bc04e 100644
--- a/ppapi/thunk/ppb_url_response_info_thunk.cc
+++ b/ppapi/thunk/ppb_url_response_info_thunk.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_url_response_info.idl modified Thu Apr 25 13:21:08 2013.
+// From ppb_url_response_info.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_url_response_info.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_url_response_info_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -49,7 +47,8 @@ const PPB_URLResponseInfo_1_0 g_ppb_urlresponseinfo_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_URLResponseInfo_1_0* GetPPB_URLResponseInfo_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_URLResponseInfo_1_0*
+    GetPPB_URLResponseInfo_1_0_Thunk() {
   return &g_ppb_urlresponseinfo_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_video_frame_thunk.cc b/ppapi/thunk/ppb_video_frame_thunk.cc
index 82457fd..762e260 100644
--- a/ppapi/thunk/ppb_video_frame_thunk.cc
+++ b/ppapi/thunk/ppb_video_frame_thunk.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_video_frame.idl modified Wed Jan  8 13:30:05 2014.
+// From ppb_video_frame.idl modified Mon Jan 13 12:02:23 2014.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_video_frame.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_video_frame_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -84,7 +82,7 @@ const PPB_VideoFrame_0_1 g_ppb_videoframe_thunk_0_1 = {
 
 }  // namespace
 
-const PPB_VideoFrame_0_1* GetPPB_VideoFrame_0_1_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_VideoFrame_0_1* GetPPB_VideoFrame_0_1_Thunk() {
   return &g_ppb_videoframe_thunk_0_1;
 }
 
diff --git a/ppapi/thunk/ppb_view_dev_thunk.cc b/ppapi/thunk/ppb_view_dev_thunk.cc
index d3a6374..7ec98f9 100644
--- a/ppapi/thunk/ppb_view_dev_thunk.cc
+++ b/ppapi/thunk/ppb_view_dev_thunk.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From dev/ppb_view_dev.idl modified Thu Mar 28 11:12:59 2013.
+// From dev/ppb_view_dev.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/dev/ppb_view_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_view_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -41,7 +39,7 @@ const PPB_View_Dev_0_1 g_ppb_view_dev_thunk_0_1 = {
 
 }  // namespace
 
-const PPB_View_Dev_0_1* GetPPB_View_Dev_0_1_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_View_Dev_0_1* GetPPB_View_Dev_0_1_Thunk() {
   return &g_ppb_view_dev_thunk_0_1;
 }
 
diff --git a/ppapi/thunk/ppb_view_thunk.cc b/ppapi/thunk/ppb_view_thunk.cc
index 3014099..25171b2 100644
--- a/ppapi/thunk/ppb_view_thunk.cc
+++ b/ppapi/thunk/ppb_view_thunk.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_view.idl modified Wed Apr 10 14:15:15 2013.
+// From ppb_view.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_view.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_view_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -102,11 +100,11 @@ const PPB_View_1_1 g_ppb_view_thunk_1_1 = {
 
 }  // namespace
 
-const PPB_View_1_0* GetPPB_View_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_View_1_0* GetPPB_View_1_0_Thunk() {
   return &g_ppb_view_thunk_1_0;
 }
 
-const PPB_View_1_1* GetPPB_View_1_1_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_View_1_1* GetPPB_View_1_1_Thunk() {
   return &g_ppb_view_thunk_1_1;
 }
 
diff --git a/ppapi/thunk/ppb_websocket_thunk.cc b/ppapi/thunk/ppb_websocket_thunk.cc
index 1040665..fa7ed56 100644
--- a/ppapi/thunk/ppb_websocket_thunk.cc
+++ b/ppapi/thunk/ppb_websocket_thunk.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From ppb_websocket.idl modified Thu Feb 28 11:58:17 2013.
+// From ppb_websocket.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_websocket.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_websocket_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -161,7 +159,7 @@ const PPB_WebSocket_1_0 g_ppb_websocket_thunk_1_0 = {
 
 }  // namespace
 
-const PPB_WebSocket_1_0* GetPPB_WebSocket_1_0_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_WebSocket_1_0* GetPPB_WebSocket_1_0_Thunk() {
   return &g_ppb_websocket_thunk_1_0;
 }
 
diff --git a/ppapi/thunk/ppb_widget_dev_thunk.cc b/ppapi/thunk/ppb_widget_dev_thunk.cc
index 2232371..2b27d04 100644
--- a/ppapi/thunk/ppb_widget_dev_thunk.cc
+++ b/ppapi/thunk/ppb_widget_dev_thunk.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From dev/ppb_widget_dev.idl modified Tue Apr 16 11:25:44 2013.
+// From dev/ppb_widget_dev.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/dev/ppb_widget_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_widget_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -85,11 +83,11 @@ const PPB_Widget_Dev_0_4 g_ppb_widget_dev_thunk_0_4 = {
 
 }  // namespace
 
-const PPB_Widget_Dev_0_3* GetPPB_Widget_Dev_0_3_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Widget_Dev_0_3* GetPPB_Widget_Dev_0_3_Thunk() {
   return &g_ppb_widget_dev_thunk_0_3;
 }
 
-const PPB_Widget_Dev_0_4* GetPPB_Widget_Dev_0_4_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Widget_Dev_0_4* GetPPB_Widget_Dev_0_4_Thunk() {
   return &g_ppb_widget_dev_thunk_0_4;
 }
 
diff --git a/ppapi/thunk/ppb_zoom_dev_thunk.cc b/ppapi/thunk/ppb_zoom_dev_thunk.cc
index ab0c874..6ff9fac 100644
--- a/ppapi/thunk/ppb_zoom_dev_thunk.cc
+++ b/ppapi/thunk/ppb_zoom_dev_thunk.cc
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From dev/ppb_zoom_dev.idl modified Wed Apr 24 13:31:08 2013.
+// From dev/ppb_zoom_dev.idl modified Tue Aug 20 08:13:36 2013.
 
 #include "ppapi/c/dev/ppb_zoom_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
@@ -44,7 +42,7 @@ const PPB_Zoom_Dev_0_2 g_ppb_zoom_dev_thunk_0_2 = {
 
 }  // namespace
 
-const PPB_Zoom_Dev_0_2* GetPPB_Zoom_Dev_0_2_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Zoom_Dev_0_2* GetPPB_Zoom_Dev_0_2_Thunk() {
   return &g_ppb_zoom_dev_thunk_0_2;
 }