diff --git a/chromiumcontent/chromiumcontent.gyp b/chromiumcontent/chromiumcontent.gyp
index 8ecbf60f4..253a6f4ce 100644
--- a/chromiumcontent/chromiumcontent.gyp
+++ b/chromiumcontent/chromiumcontent.gyp
@@ -8,6 +8,7 @@
         '<(DEPTH)/chrome/chrome.gyp:chromedriver',
         'extensions.gyp:extensions',
         'autofill.gyp:autofill',
+        'importer.gyp:importer',
       ],
       'conditions': [
         ['OS=="linux"', {
diff --git a/chromiumcontent/importer.gyp b/chromiumcontent/importer.gyp
new file mode 100644
index 000000000..6a40d0499
--- /dev/null
+++ b/chromiumcontent/importer.gyp
@@ -0,0 +1,17 @@
+{
+  'targets': [
+    {
+      'target_name': 'importer',
+      'type': 'none',
+      'dependencies': [
+        '<(DEPTH)/components/components.gyp:bookmarks_browser',
+        '<(DEPTH)/components/components.gyp:component_metrics_proto',
+        '<(DEPTH)/components/components.gyp:favicon_base',
+        '<(DEPTH)/components/components.gyp:google_core_browser',
+        '<(DEPTH)/components/components.gyp:history_core_browser',
+        '<(DEPTH)/components/components.gyp:search_engines',
+        '<(DEPTH)/components/components.gyp:query_parser',
+      ]
+    }
+  ]
+}
diff --git a/script/lib/brave.py b/script/lib/brave.py
index d5cd1c570..2f3389b27 100644
--- a/script/lib/brave.py
+++ b/script/lib/brave.py
@@ -3,14 +3,15 @@
 import lib.extensions
 from lib.extensions import copy_extension_locales
 import lib.autofill
+import lib.importer
 
 BINARIES = lib.extensions.BINARIES
-BINARIES['darwin'] = BINARIES['darwin'] + lib.autofill.BINARIES['darwin']
-BINARIES['linux'] = BINARIES['linux'] + lib.autofill.BINARIES['linux']
-BINARIES['win32'] = BINARIES['win32'] + lib.autofill.BINARIES['win32']
+BINARIES['darwin'] = BINARIES['darwin'] + lib.autofill.BINARIES['darwin'] + lib.importer.BINARIES['darwin']
+BINARIES['linux'] = BINARIES['linux'] + lib.autofill.BINARIES['linux'] + lib.importer.BINARIES['linux']
+BINARIES['win32'] = BINARIES['win32'] + lib.autofill.BINARIES['win32'] + lib.importer.BINARIES['win32']
 
-INCLUDE_DIRS = lib.extensions.INCLUDE_DIRS + lib.autofill.INCLUDE_DIRS
-GENERATED_INCLUDE_DIRS = lib.extensions.GENERATED_INCLUDE_DIRS + lib.autofill.GENERATED_INCLUDE_DIRS
+INCLUDE_DIRS = lib.extensions.INCLUDE_DIRS + lib.autofill.INCLUDE_DIRS + lib.importer.INCLUDE_DIRS
+GENERATED_INCLUDE_DIRS = lib.extensions.GENERATED_INCLUDE_DIRS + lib.autofill.GENERATED_INCLUDE_DIRS + lib.importer.GENERATED_INCLUDE_DIRS
 OTHER_HEADERS = lib.extensions.OTHER_HEADERS + lib.autofill.OTHER_HEADERS
 OTHER_DIRS = lib.extensions.OTHER_DIRS
 
diff --git a/script/lib/importer.py b/script/lib/importer.py
new file mode 100644
index 000000000..9cce30e3a
--- /dev/null
+++ b/script/lib/importer.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+
+import os
+
+BINARIES = {
+  'darwin': [
+    'libbookmarks_browser.a',
+    'libcomponent_metrics_proto.a',
+    'libfavicon_base.a',
+    'libgoogle_core_browser.a',
+    'libhistory_core_browser.a',
+    'libsearch_engines.a',
+    'libquery_parser.a',
+    'liburl_formatter.a',
+  ],
+  'linux': [
+    'libbookmarks_browser.a',
+    'libcomponent_metrics_proto.a',
+    'libfavicon_base.a',
+    'libgoogle_core_browser.a',
+    'libhistory_core_browser.a',
+    'libsearch_engines.a',
+    'libquery_parser.a',
+    'liburl_formatter.a',
+  ],
+  'win32': [
+    os.path.join('obj', 'components', 'bookmarks_browser.lib'),
+    os.path.join('obj', 'components', 'component_metrics_proto.lib'),
+    os.path.join('obj', 'components', 'favicon_base.lib'),
+    os.path.join('obj', 'components', 'google_core_browser.lib'),
+    os.path.join('obj', 'components', 'history_core_browser.lib'),
+    os.path.join('obj', 'components', 'search_engines.lib'),
+    os.path.join('obj', 'components', 'query_parser.lib'),
+    os.path.join('obj', 'components', 'url_formatter.lib'),
+  ],
+}
+
+INCLUDE_DIRS = [
+  'components/bookmarks/browser',
+  'components/favicon_base',
+  'components/google/core/browser',
+  'components/history',
+  'components/search_engines',
+  'components/query_parser',
+  'third_party/protobuf',
+]
+GENERATED_INCLUDE_DIRS = [
+  'components/strings',
+  'protoc_out/components/metrics',
+]
+OTHER_HEADERS = [
+]