--- build/shim_headers.gypi.orig	2012-12-20 02:51:12.000000000 +0100
+++ build/shim_headers.gypi	2012-12-20 02:51:40.000000000 +0100
@@ -10,7 +10,7 @@
 
 {
   'variables': {
-    'shim_headers_path': '<(INTERMEDIATE_DIR)/shim_headers',
+    'shim_headers_path': '<(SHARED_INTERMEDIATE_DIR)/shim_headers/<(_target_name)',
   },
   'direct_dependent_settings': {
     'include_dirs+': [