diff --git a/base/base.gypi b/base/base.gypi
new file mode 100644
index 0000000..c19b3430
--- /dev/null
+++ b/base/base.gypi
@@ -0,0 +1,597 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'target_defaults': {
+    'variables': {
+      'base_target': 0,
+    },
+    'target_conditions': [
+      # This part is shared between the targets defined below. Only files and
+      # settings relevant for building the Win64 target should be added here.
+      # All the rest should be added to the 'base' target below.
+      ['base_target==1', {
+        'sources': [
+          '../build/build_config.h',
+          'third_party/dmg_fp/dmg_fp.h',
+          'third_party/dmg_fp/dtoa.cc',
+          'third_party/dmg_fp/g_fmt.cc',
+          'third_party/icu/icu_utf.cc',
+          'third_party/icu/icu_utf.h',
+          'third_party/nspr/prtime.cc',
+          'third_party/nspr/prtime.h',
+          'atomicops_internals_x86_gcc.cc',
+          'at_exit.cc',
+          'at_exit.h',
+          'atomic_ref_count.h',
+          'atomic_sequence_num.h',
+          'atomicops.h',
+          'atomicops_internals_x86_msvc.h',
+          'base_paths.cc',
+          'base_paths.h',
+          'base_paths_mac.h',
+          'base_paths_mac.mm',
+          'base_paths_posix.cc',
+          'base_paths_win.cc',
+          'base_paths_win.h',
+          'base_switches.cc',
+          'base_switches.h',
+          'basictypes.h',
+          'bits.h',
+          'bzip2_error_handler.cc',
+          'cancellation_flag.h',
+          'cancellation_flag.cc',
+          'chrome_application_mac.h',
+          'chrome_application_mac.mm',
+          'cocoa_protocols_mac.h',
+          'command_line.cc',
+          'command_line.h',
+          'compiler_specific.h',
+          'condition_variable.h',
+          'condition_variable_posix.cc',
+          'condition_variable_win.cc',
+          'cpu.cc',
+          'cpu.h',
+          'debug_on_start.cc',
+          'debug_on_start.h',
+          'debug_util.cc',
+          'debug_util.h',
+          'debug_util_mac.cc',
+          'debug_util_posix.cc',
+          'debug_util_win.cc',
+          'event_trace_consumer_win.h',
+          'event_trace_controller_win.cc',
+          'event_trace_controller_win.h',
+          'event_trace_provider_win.cc',
+          'event_trace_provider_win.h',
+          'file_path.cc',
+          'file_path.h',
+          'file_util.cc',
+          'file_util.h',
+          'file_util_linux.cc',
+          'file_util_mac.mm',
+          'file_util_posix.cc',
+          'file_util_win.cc',
+          'file_version_info.cc',
+          'file_version_info.h',
+          'file_version_info_mac.mm',
+          'fix_wp64.h',
+          'float_util.h',
+          'foundation_utils_mac.h',
+          'global_descriptors_posix.h',
+          'global_descriptors_posix.cc',
+          'hash_tables.h',
+          'histogram.cc',
+          'histogram.h',
+          'iat_patch.cc',
+          'iat_patch.h',
+          'id_map.h',
+          'lazy_instance.cc',
+          'lazy_instance.h',
+          'leak_annotations.h',
+          'leak_tracker.h',
+          'linked_list.h',
+          'linked_ptr.h',
+          'lock.cc',
+          'lock.h',
+          'lock_impl.h',
+          'lock_impl_posix.cc',
+          'lock_impl_win.cc',
+          'logging.cc',
+          'logging_win.cc',
+          'logging.h',
+          'mac_util.h',
+          'mac_util.mm',
+          'memory_debug.cc',
+          'memory_debug.h',
+          'message_loop.cc',
+          'message_loop.h',
+          'message_pump.h',
+          'message_pump_default.cc',
+          'message_pump_default.h',
+          'message_pump_win.cc',
+          'message_pump_win.h',
+          'mime_util.h',
+          'mime_util_linux.cc',
+          'native_library.h',
+          'native_library_linux.cc',
+          'native_library_mac.mm',
+          'native_library_win.cc',
+          'non_thread_safe.cc',
+          'non_thread_safe.h',
+          'nullable_string16.h',
+          'object_watcher.cc',
+          'object_watcher.h',
+          'observer_list.h',
+          'observer_list_threadsafe.h',
+          'path_service.cc',
+          'path_service.h',
+          'pickle.cc',
+          'pickle.h',
+          'platform_file.h',
+          'platform_file_win.cc',
+          'platform_file_posix.cc',
+          'platform_thread.h',
+          'platform_thread_mac.mm',
+          'platform_thread_posix.cc',
+          'platform_thread_win.cc',
+          'port.h',
+          'profiler.cc',
+          'profiler.h',
+          'process.h',
+          'process_linux.cc',
+          'process_posix.cc',
+          'process_util.h',
+          'process_util_linux.cc',
+          'process_util_mac.mm',
+          'process_util_posix.cc',
+          'process_util_win.cc',
+          'process_win.cc',
+          'rand_util.cc',
+          'rand_util.h',
+          'rand_util_posix.cc',
+          'rand_util_win.cc',
+          'raw_scoped_refptr_mismatch_checker.h',
+          'ref_counted.cc',
+          'ref_counted.h',
+          'ref_counted_memory.h',
+          'registry.cc',
+          'registry.h',
+          'resource_util.cc',
+          'resource_util.h',
+          'safe_strerror_posix.cc',
+          'safe_strerror_posix.h',
+          'scoped_bstr_win.cc',
+          'scoped_bstr_win.h',
+          'scoped_cftyperef.h',
+          'scoped_comptr_win.h',
+          'scoped_handle.h',
+          'scoped_handle_gtk.h',
+          'scoped_handle_win.h',
+          'scoped_nsautorelease_pool.h',
+          'scoped_nsautorelease_pool.mm',
+          'scoped_nsdisable_screen_updates.h',
+          'scoped_nsobject.h',
+          'scoped_ptr.h',
+          'scoped_temp_dir.cc',
+          'scoped_temp_dir.h',
+          'scoped_variant_win.cc',
+          'scoped_variant_win.h',
+          'scoped_vector.h',
+          'sha1.cc',
+          'sha1.h',
+          'shared_memory.h',
+          'shared_memory_posix.cc',
+          'shared_memory_win.cc',
+          'simple_thread.cc',
+          'simple_thread.h',
+          'singleton.h',
+          'spin_wait.h',
+          'stack_container.h',
+          'stats_counters.h',
+          'stats_table.cc',
+          'stats_table.h',
+          'stl_util-inl.h',
+          'string_piece.cc',
+          'string_piece.h',
+          'string_tokenizer.h',
+          'string_util.cc',
+          'string_util.h',
+          'string_util_win.h',
+          'sys_info.h',
+          'sys_info_chromeos.cc',
+          'sys_info_freebsd.cc',
+          'sys_info_linux.cc',
+          'sys_info_mac.cc',
+          'sys_info_openbsd.cc',
+          'sys_info_posix.cc',
+          'sys_info_win.cc',
+          'sys_string_conversions.h',
+          'sys_string_conversions_linux.cc',
+          'sys_string_conversions_mac.mm',
+          'sys_string_conversions_win.cc',
+          'task.h',
+          'thread.cc',
+          'thread.h',
+          'thread_collision_warner.cc',
+          'thread_collision_warner.h',
+          'thread_local.h',
+          'thread_local_posix.cc',
+          'thread_local_storage.h',
+          'thread_local_storage_posix.cc',
+          'thread_local_storage_win.cc',
+          'thread_local_win.cc',
+          'time.cc',
+          'time.h',
+          'time_win.cc',
+          'timer.cc',
+          'timer.h',
+          'trace_event.cc',
+          'trace_event.h',
+          'tracked.cc',
+          'tracked.h',
+          'tracked_objects.cc',
+          'tracked_objects.h',
+          'tuple.h',
+          'utf_offset_string_conversions.cc',
+          'utf_offset_string_conversions.h',
+          'utf_string_conversion_utils.cc',
+          'utf_string_conversion_utils.h',
+          'utf_string_conversions.cc',
+          'utf_string_conversions.h',
+          'unix_domain_socket_posix.cc',
+          'waitable_event.h',
+          'waitable_event_posix.cc',
+          'waitable_event_watcher.h',
+          'waitable_event_watcher_posix.cc',
+          'waitable_event_watcher_win.cc',
+          'waitable_event_win.cc',
+          'watchdog.cc',
+          'watchdog.h',
+          'weak_ptr.h',
+          'win_util.cc',
+          'win_util.h',
+          'windows_message_list.h',
+          'wmi_util.cc',
+          'wmi_util.h',
+          'worker_pool.h',
+          'worker_pool_linux.cc',
+          'worker_pool_linux.h',
+          'worker_pool_mac.h',
+          'worker_pool_mac.mm',
+          'worker_pool_win.cc',
+        ],
+        'include_dirs': [
+          '..',
+        ],
+        # These warnings are needed for the files in third_party\dmg_fp.
+        'msvs_disabled_warnings': [
+          4244, 4554, 4018, 4102,
+        ],
+        'mac_framework_dirs': [
+          '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
+        ],
+        'conditions': [
+          [ 'OS != "linux" and OS != "freebsd"', {
+              'sources/': [
+                ['exclude', '/xdg_mime/'],
+                ['exclude', '/xdg_user_dirs/'],
+                ['exclude', '_nss\.cc$'],
+              ],
+              'sources!': [
+                'atomicops_internals_x86_gcc.cc',
+                'base_paths_posix.cc',
+                'directory_watcher_inotify.cc',
+                'linux_util.cc',
+                'message_pump_glib.cc',
+                'nss_init.cc',
+                'nss_init.h',
+                'time_posix.cc',
+              ],
+          },],
+          [ 'OS != "linux"', {
+              'sources!': [
+                # Not automatically excluded by the *linux.cc rules.
+                'setproctitle_linux.c',
+                'setproctitle_linux.h',
+              ],
+            },
+          ],
+          # For now, just test the *BSD platforms enough to exclude them.
+          # Subsequent changes will include them further.
+          [ 'OS != "freebsd"', {
+              'sources/': [ ['exclude', '_freebsd\\.cc$'] ],
+            },
+          ],
+          [ 'OS != "openbsd"', {
+              'sources/': [ ['exclude', '_openbsd\\.cc$'] ],
+            },
+          ],
+          [ 'GENERATOR == "quentin"', {
+              # Quentin builds don't have a recent enough glibc to include the
+              # inotify headers
+              'sources!': [
+                'directory_watcher_inotify.cc',
+              ],
+              'sources': [
+                'directory_watcher_stub.cc',
+              ],
+            },
+          ],
+          [ 'OS != "mac"', {
+              'sources!': [
+                'crypto/cssm_init.cc',
+                'crypto/cssm_init.h',
+              ],
+            }
+          ],
+          [ 'OS == "win"', {
+              'include_dirs': [
+                '../chrome/third_party/wtl/include',
+              ],
+              'sources!': [
+                'data_pack.cc',
+                'event_recorder_stubs.cc',
+                'file_descriptor_shuffle.cc',
+                'message_pump_libevent.cc',
+                'string16.cc',
+              ],
+          },],
+        ],
+      }],
+    ],
+  },
+  'targets': [
+    {
+      'target_name': 'base',
+      'type': '<(library)',
+      'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165',
+      'variables': {
+        'base_target': 1,
+      },
+      'dependencies': [
+        '../third_party/modp_b64/modp_b64.gyp:modp_b64',
+      ],
+      # TODO(gregoryd): direct_dependent_settings should be shared with the
+      #  64-bit target, but it doesn't work due to a bug in gyp
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '..',
+        ],
+      },
+      # Conditions that are not relevant for Win64 build
+      'conditions': [
+        [ 'OS == "linux" or OS == "freebsd"', {
+          'conditions': [
+            [ 'chromeos==1 or toolkit_views==1', {
+                'sources/': [ ['include', '_chromeos\\.cc$'] ]
+              },
+            ],
+            [ 'linux_use_tcmalloc==1', {
+                'defines': [
+                  'LINUX_USE_TCMALLOC',
+                ],
+                'direct_dependent_settings': {
+                  'defines': [
+                    'LINUX_USE_TCMALLOC',
+                  ],
+                },
+              },
+            ],
+          ],
+          'dependencies': [
+            '../build/util/build_util.gyp:lastchange',
+            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:nss',
+          ],
+          'cflags': [
+            '-Wno-write-strings',
+          ],
+          'link_settings': {
+            'libraries': [
+              # We need rt for clock_gettime().
+              '-lrt',
+            ],
+          },
+          'export_dependent_settings': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        },],
+        [ 'OS == "freebsd"', {
+            'sources!': [
+              'directory_watcher_inotify.cc',
+            ],
+            'sources': [
+              'directory_watcher_stub.cc',
+            ],
+          },
+        ],
+        [ 'OS == "mac"', {
+            'link_settings': {
+              'libraries': [
+                '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
+                '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+                '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
+                '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+                '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
+                '$(SDKROOT)/System/Library/Frameworks/Security.framework',
+              ],
+            },
+        },],
+        [ 'OS != "win"', {
+            'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
+            'sources!': [
+              'third_party/purify/pure_api.c',
+              'base_drag_source.cc',
+              'base_drop_target.cc',
+              'cpu.cc',
+              'debug_on_start.cc',
+              'event_recorder.cc',
+              'file_version_info.cc',
+              'iat_patch.cc',
+              'image_util.cc',
+              'object_watcher.cc',
+              'pe_image.cc',
+              'registry.cc',
+              'resource_util.cc',
+              'win_util.cc',
+              'wmi_util.cc',
+            ],
+          },
+        ],
+      ],
+      'sources': [
+        'crypto/cssm_init.cc',
+        'crypto/cssm_init.h',
+        'crypto/rsa_private_key.h',
+        'crypto/rsa_private_key.cc',
+        'crypto/rsa_private_key_mac.cc',
+        'crypto/rsa_private_key_nss.cc',
+        'crypto/rsa_private_key_win.cc',
+        'crypto/signature_creator.h',
+        'crypto/signature_creator_mac.cc',
+        'crypto/signature_creator_nss.cc',
+        'crypto/signature_creator_win.cc',
+        'crypto/signature_verifier.h',
+        'crypto/signature_verifier_mac.cc',
+        'crypto/signature_verifier_nss.cc',
+        'crypto/signature_verifier_win.cc',
+        'third_party/nspr/prcpucfg.h',
+        'third_party/nspr/prcpucfg_win.h',
+        'third_party/nspr/prtypes.h',
+        'third_party/nss/blapi.h',
+        'third_party/nss/blapit.h',
+        'third_party/nss/sha256.h',
+        'third_party/nss/sha512.cc',
+        'third_party/purify/pure.h',
+        'third_party/purify/pure_api.c',
+        'third_party/xdg_mime/xdgmime.c',
+        'third_party/xdg_mime/xdgmime.h',
+        'third_party/xdg_mime/xdgmimealias.c',
+        'third_party/xdg_mime/xdgmimealias.h',
+        'third_party/xdg_mime/xdgmimecache.c',
+        'third_party/xdg_mime/xdgmimecache.h',
+        'third_party/xdg_mime/xdgmimeglob.c',
+        'third_party/xdg_mime/xdgmimeglob.h',
+        'third_party/xdg_mime/xdgmimeicon.c',
+        'third_party/xdg_mime/xdgmimeicon.h',
+        'third_party/xdg_mime/xdgmimeint.c',
+        'third_party/xdg_mime/xdgmimeint.h',
+        'third_party/xdg_mime/xdgmimemagic.c',
+        'third_party/xdg_mime/xdgmimemagic.h',
+        'third_party/xdg_mime/xdgmimeparent.c',
+        'third_party/xdg_mime/xdgmimeparent.h',
+        'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
+        'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
+        'auto_reset.h',
+        'base64.cc',
+        'base64.h',
+        'base_drag_source.cc',
+        'base_drag_source.h',
+        'base_drop_target.cc',
+        'base_drop_target.h',
+        'data_pack.cc',
+        'directory_watcher.h',
+        'directory_watcher_inotify.cc',
+        'directory_watcher_mac.cc',
+        'directory_watcher_win.cc',
+        'dynamic_annotations.h',
+        'dynamic_annotations.cc',
+        'event_recorder.cc',
+        'event_recorder.h',
+        'event_recorder_stubs.cc',
+        'field_trial.cc',
+        'field_trial.h',
+        'file_descriptor_shuffle.cc',
+        'file_descriptor_shuffle.h',
+        'gfx/point.cc',
+        'gfx/point.h',
+        'gfx/rect.cc',
+        'gfx/rect.h',
+        'gfx/size.cc',
+        'gfx/size.h',
+        'hmac.h',
+        'hmac_mac.cc',
+        'hmac_nss.cc',
+        'hmac_win.cc',
+        'image_util.cc',
+        'image_util.h',
+        'json/json_reader.cc',
+        'json/json_reader.h',
+        'json/json_writer.cc',
+        'json/json_writer.h',
+        'json/string_escape.cc',
+        'json/string_escape.h',
+        'keyboard_code_conversion_gtk.cc',
+        'keyboard_code_conversion_gtk.h',
+        'keyboard_codes.h',
+        'keyboard_codes_win.h',
+        'keyboard_codes_posix.h',
+        'linux_util.cc',
+        'linux_util.h',
+        'md5.cc',
+        'md5.h',
+        'message_pump_glib.cc',
+        'message_pump_glib.h',
+        'message_pump_libevent.cc',
+        'message_pump_libevent.h',
+        'message_pump_mac.h',
+        'message_pump_mac.mm',
+        'nsimage_cache_mac.h',
+        'nsimage_cache_mac.mm',
+        'nss_init.cc',
+        'nss_init.h',
+        'pe_image.cc',
+        'pe_image.h',
+        'setproctitle_linux.c',
+        'setproctitle_linux.h',
+        'sha2.cc',
+        'sha2.h',
+        'string16.cc',
+        'string16.h',
+        'sync_socket.h',
+        'sync_socket_win.cc',
+        'sync_socket_posix.cc',
+        'time_mac.cc',
+        'time_posix.cc',
+        'values.cc',
+        'values.h',
+        'version.cc',
+        'version.h',
+      ],
+    },
+  ],
+  'conditions': [
+    [ 'OS == "win"', {
+      'targets': [
+        {
+          'target_name': 'base_nacl_win64',
+          'type': '<(library)',
+          'msvs_guid': 'CEE1F794-DC70-4FED-B7C4-4C12986672FE',
+          'variables': {
+            'base_target': 1,
+          },
+          # TODO(gregoryd): direct_dependent_settings should be shared with the
+          # 32-bit target, but it doesn't work due to a bug in gyp
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '..',
+            ],
+          },
+          'defines': [
+            '<@(nacl_win64_defines)',
+          ],
+          'sources': [
+            'i18n/icu_util_nacl_win64.cc',
+          ],
+          'configurations': {
+            'Common': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+        },
+      ],
+    }],
+  ],
+}