diff --git a/handler/BUILD.gn b/handler/BUILD.gn
index 1223110a..162e83d3 100644
--- a/handler/BUILD.gn
+++ b/handler/BUILD.gn
@@ -16,8 +16,6 @@ static_library("handler") {
   sources = [
     "crash_report_upload_thread.cc",
     "crash_report_upload_thread.h",
-    "handler_main.cc",
-    "handler_main.h",
     "minidump_to_upload_parameters.cc",
     "minidump_to_upload_parameters.h",
     "prune_crash_reports_thread.cc",
@@ -37,6 +35,18 @@ static_library("handler") {
     ]
   }
 
+  if (is_linux) {
+    sources += [
+      "linux/exception_handler_server.cc",
+      "linux/exception_handler_server.h",
+    ]
+  } else {
+    sources += [
+      "handler_main.cc",
+      "handler_main.h",
+    ]
+  }
+
   if (is_win) {
     sources += [
       "win/crash_report_exception_handler.cc",
@@ -77,6 +87,14 @@ source_set("handler_test") {
     "minidump_to_upload_parameters_test.cc",
   ]
 
+  if (is_linux) {
+    sources += [ "linux/exception_handler_server_test.cc" ]
+  }
+
+  if (is_win) {
+    sources += [ "crashpad_handler_test.cc" ]
+  }
+
   deps = [
     ":handler",
     "../client",
@@ -90,8 +108,6 @@ source_set("handler_test") {
   ]
 
   if (is_win) {
-    sources += [ "crashpad_handler_test.cc" ]
-
     data_deps = [
       ":crashpad_handler_test_extended_handler",
     ]
diff --git a/handler/handler.gyp b/handler/handler.gyp
index 6c45e1a3..8263dfde 100644
--- a/handler/handler.gyp
+++ b/handler/handler.gyp
@@ -62,13 +62,6 @@
             'handler_main.cc',
           ],
         }],
-        ['OS=="linux"', {
-          'link_settings': {
-            'libraries': [
-              '-lcap',
-            ],
-          },
-        }],
       ],
       'target_conditions': [
         ['OS=="android"', {
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 6573c362..e25f6e1e 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -71,6 +71,8 @@ static_library("test") {
       "linux/fake_ptrace_connection.h",
       "linux/get_tls.cc",
       "linux/get_tls.h",
+      "linux/scoped_pr_set_ptracer.cc",
+      "linux/scoped_pr_set_ptracer.h",
     ]
   }
 
diff --git a/util/BUILD.gn b/util/BUILD.gn
index b24feeaa..6285f00e 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -248,6 +248,9 @@ static_library("util") {
       "linux/checked_linux_address_range.h",
       "linux/direct_ptrace_connection.cc",
       "linux/direct_ptrace_connection.h",
+      "linux/exception_handler_client.cc",
+      "linux/exception_handler_client.h",
+      "linux/exception_handler_protocol.h",
       "linux/exception_information.h",
       "linux/memory_map.cc",
       "linux/memory_map.h",