diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi
index 1acfc2ea7c1..e9ff87c8984 100644
--- a/runtime/bin/bin.gypi
+++ b/runtime/bin/bin.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+# Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
@@ -22,6 +22,7 @@
       ],
       'includes': [
         'builtin_sources.gypi',
+        '../platform/platform_sources.gypi',
       ],
       'sources/': [
         ['exclude', '\\.(cc|h)$'],
@@ -63,6 +64,7 @@
       ],
       'includes': [
         'builtin_sources.gypi',
+        '../platform/platform_sources.gypi',
       ],
       'sources/': [
         ['exclude', '_test\\.(cc|h)$'],
@@ -224,6 +226,7 @@
       ],
       'includes': [
         'builtin_sources.gypi',
+        '../platform/platform_sources.gypi',
         '../vm/vm_sources.gypi',
       ],
       'defines': [
diff --git a/runtime/bin/builtin.h b/runtime/bin/builtin.h
index d321f6eebf6..b145e6350d8 100644
--- a/runtime/bin/builtin.h
+++ b/runtime/bin/builtin.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -9,7 +9,6 @@
 #include <stdlib.h>
 
 #include "include/dart_api.h"
-
 #include "platform/globals.h"
 
 #ifdef DEBUG
diff --git a/runtime/bin/dartutils.cc b/runtime/bin/dartutils.cc
index 02e785fae11..845487433d7 100644
--- a/runtime/bin/dartutils.cc
+++ b/runtime/bin/dartutils.cc
@@ -1,11 +1,10 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/dartutils.h"
 
 #include "bin/file.h"
-
 #include "platform/globals.h"
 
 const char* DartUtils::kDartScheme = "dart:";
diff --git a/runtime/bin/dartutils.h b/runtime/bin/dartutils.h
index 8972c5c9515..f18d2c6c546 100644
--- a/runtime/bin/dartutils.h
+++ b/runtime/bin/dartutils.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,9 +6,7 @@
 #define BIN_DARTUTILS_H_
 
 #include "bin/builtin.h"
-
 #include "include/dart_api.h"
-
 #include "platform/globals.h"
 
 class CommandLineOptions {
diff --git a/runtime/bin/directory.h b/runtime/bin/directory.h
index b5ba45fcb14..a6ca48f4add 100644
--- a/runtime/bin/directory.h
+++ b/runtime/bin/directory.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,7 +6,6 @@
 #define BIN_DIRECTORY_H_
 
 #include "bin/builtin.h"
-
 #include "platform/globals.h"
 
 class Directory {
diff --git a/runtime/bin/fdutils.h b/runtime/bin/fdutils.h
index a8220482653..4ada94b0ffe 100644
--- a/runtime/bin/fdutils.h
+++ b/runtime/bin/fdutils.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,7 +6,6 @@
 #define BIN_FDUTILS_H_
 
 #include "bin/builtin.h"
-
 #include "platform/globals.h"
 
 class FDUtils {
diff --git a/runtime/bin/file_test.cc b/runtime/bin/file_test.cc
index f4774943ba1..787c194ac46 100644
--- a/runtime/bin/file_test.cc
+++ b/runtime/bin/file_test.cc
@@ -1,11 +1,9 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/file.h"
-
 #include "platform/globals.h"
-
 #include "vm/assert.h"
 #include "vm/unit_test.h"
 
diff --git a/runtime/bin/gen_snapshot.cc b/runtime/bin/gen_snapshot.cc
index 741541491e1..e7a872a4d23 100644
--- a/runtime/bin/gen_snapshot.cc
+++ b/runtime/bin/gen_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,7 +14,6 @@
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/file.h"
-
 #include "platform/globals.h"
 
 // Global state that indicates whether a snapshot is to be created and
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index fa40b2464ca..4003f04a516 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,7 +14,6 @@
 #include "bin/eventhandler.h"
 #include "bin/file.h"
 #include "bin/platform.h"
-
 #include "platform/globals.h"
 
 // snapshot_buffer points to a snapshot if we link in a snapshot otherwise
diff --git a/runtime/bin/process.h b/runtime/bin/process.h
index 33863d2430d..117c5c00847 100644
--- a/runtime/bin/process.h
+++ b/runtime/bin/process.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,7 +6,6 @@
 #define BIN_PROCESS_H_
 
 #include "bin/builtin.h"
-
 #include "platform/globals.h"
 
 
diff --git a/runtime/bin/process_win.cc b/runtime/bin/process_win.cc
index d9abf1ed0ca..8401ef6de62 100644
--- a/runtime/bin/process_win.cc
+++ b/runtime/bin/process_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,6 @@
 #include "bin/builtin.h"
 #include "bin/process.h"
 #include "bin/eventhandler.h"
-
 #include "platform/globals.h"
 
 static const int kReadHandle = 0;
diff --git a/runtime/bin/socket.h b/runtime/bin/socket.h
index 2270e003fe7..4a42d05034e 100644
--- a/runtime/bin/socket.h
+++ b/runtime/bin/socket.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,7 +6,6 @@
 #define BIN_SOCKET_H_
 
 #include "bin/builtin.h"
-
 #include "platform/globals.h"
 
 
diff --git a/runtime/bin/thread_pool.h b/runtime/bin/thread_pool.h
index 8dfdda611dd..24952e43ca1 100644
--- a/runtime/bin/thread_pool.h
+++ b/runtime/bin/thread_pool.h
@@ -6,7 +6,6 @@
 #define BIN_THREAD_POOL_H_
 
 #include "bin/builtin.h"
-
 #include "platform/globals.h"
 
 // Declare the OS-specific types ahead of defining the generic classes.
diff --git a/runtime/platform/platform_sources.gypi b/runtime/platform/platform_sources.gypi
new file mode 100644
index 00000000000..8f97acdb6a5
--- /dev/null
+++ b/runtime/platform/platform_sources.gypi
@@ -0,0 +1,12 @@
+# Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+# This file contains sources shared between the vm and bin components.
+{
+  'sources': [
+    'globals.h',
+    'c99_support_win.h',
+    'inttypes_support_win.h',
+  ],
+}
diff --git a/runtime/vm/vm.gypi b/runtime/vm/vm.gypi
index 8e68d199e0c..2d4ab447bda 100644
--- a/runtime/vm/vm.gypi
+++ b/runtime/vm/vm.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+# Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
@@ -19,6 +19,7 @@
       'type': 'static_library',
       'includes': [
         'vm_sources.gypi',
+        '../platform/platform_sources.gypi',
       ],
       'sources/': [
         # Exclude all _test.[cc|h] files.
diff --git a/runtime/vm/vm_sources.gypi b/runtime/vm/vm_sources.gypi
index 6de62d29863..0a47c581484 100644
--- a/runtime/vm/vm_sources.gypi
+++ b/runtime/vm/vm_sources.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+# Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
@@ -43,7 +43,6 @@
     'bootstrap.h',
     'bootstrap_natives.h',
     'bootstrap_natives.cc',
-    'c99_support_win.h',
     'class_finalizer.h',
     'class_finalizer.cc',
     'class_finalizer_test.cc',
@@ -134,7 +133,6 @@
     'ic_data.h',
     'ic_data.cc',
     'ic_data_test.cc',
-    'inttypes_support_win.h',
     'instructions.h',
     'instructions_ia32.cc',
     'instructions_ia32.h',