diff --git a/sandboxed_api/sandbox2/BUILD.bazel b/sandboxed_api/sandbox2/BUILD.bazel
index 51d2977..b853add 100644
--- a/sandboxed_api/sandbox2/BUILD.bazel
+++ b/sandboxed_api/sandbox2/BUILD.bazel
@@ -94,7 +94,9 @@ cc_test(
     deps = [
         ":regs",
         ":sanitizer",
+        ":syscall",
         ":util",
+        "//sandboxed_api:config",
         "//sandboxed_api/sandbox2/util:bpf_helper",
         "//sandboxed_api/util:status_matchers",
         "@com_google_absl//absl/log:check",
@@ -607,7 +609,6 @@ cc_library(
         "//sandboxed_api/util:fileops",
         "//sandboxed_api/util:raw_logging",
         "//sandboxed_api/util:status",
-        "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
diff --git a/sandboxed_api/sandbox2/CMakeLists.txt b/sandboxed_api/sandbox2/CMakeLists.txt
index 6e3c08b..22b7168 100644
--- a/sandboxed_api/sandbox2/CMakeLists.txt
+++ b/sandboxed_api/sandbox2/CMakeLists.txt
@@ -558,8 +558,7 @@ target_link_libraries(sandbox2_sanitizer
           sapi::strerror
           sapi::raw_logging
           sapi::base
-  PUBLIC absl::core_headers
-         absl::flat_hash_set
+  PUBLIC absl::flat_hash_set
          absl::status
          absl::statusor
 )
@@ -796,6 +795,7 @@ if(BUILD_TESTING AND SAPI_BUILD_TESTING)
     sandbox2::bpf_helper
     sandbox2::regs
     sandbox2::sanitizer
+    sandbox2::syscall
     sandbox2::util
     sapi::test_main
   )
diff --git a/sandboxed_api/sandbox2/bpfdisassembler.h b/sandboxed_api/sandbox2/bpfdisassembler.h
index d2e09d7..a097bea 100644
--- a/sandboxed_api/sandbox2/bpfdisassembler.h
+++ b/sandboxed_api/sandbox2/bpfdisassembler.h
@@ -16,7 +16,6 @@
 #define SANDBOXED_API_SANDBOX2_BPFDISASSEMBLER_H_
 
 #include <string>
-#include <vector>
 
 #include "absl/types/span.h"
 
diff --git a/sandboxed_api/sandbox2/comms.cc b/sandboxed_api/sandbox2/comms.cc
index 5a8ff2b..f1557a2 100644
--- a/sandboxed_api/sandbox2/comms.cc
+++ b/sandboxed_api/sandbox2/comms.cc
@@ -48,6 +48,7 @@
 #include "sandboxed_api/sandbox2/util.h"
 #include "sandboxed_api/util/raw_logging.h"
 #include "sandboxed_api/util/status.h"
+#include "sandboxed_api/util/status.pb.h"
 
 namespace sandbox2 {
 
diff --git a/sandboxed_api/sandbox2/comms.h b/sandboxed_api/sandbox2/comms.h
index cb31644..184c1c0 100644
--- a/sandboxed_api/sandbox2/comms.h
+++ b/sandboxed_api/sandbox2/comms.h
@@ -40,9 +40,8 @@
 #include "absl/log/die_if_null.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
-#include "sandboxed_api/util/status.pb.h"
+#include "google/protobuf/message_lite.h"
 
 namespace proto2 {
 class Message;
diff --git a/sandboxed_api/sandbox2/mounts.cc b/sandboxed_api/sandbox2/mounts.cc
index aa44a43..097d53d 100644
--- a/sandboxed_api/sandbox2/mounts.cc
+++ b/sandboxed_api/sandbox2/mounts.cc
@@ -18,7 +18,6 @@
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include <cerrno>
diff --git a/sandboxed_api/sandbox2/namespace.cc b/sandboxed_api/sandbox2/namespace.cc
index 1de2c98..9043ee3 100644
--- a/sandboxed_api/sandbox2/namespace.cc
+++ b/sandboxed_api/sandbox2/namespace.cc
@@ -23,7 +23,6 @@
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <syscall.h>
 #include <unistd.h>
 
diff --git a/sandboxed_api/sandbox2/network_proxy/client.h b/sandboxed_api/sandbox2/network_proxy/client.h
index 78d30eb..4ead2aa 100644
--- a/sandboxed_api/sandbox2/network_proxy/client.h
+++ b/sandboxed_api/sandbox2/network_proxy/client.h
@@ -15,7 +15,6 @@
 #ifndef SANDBOXED_API_SANDBOX2_NETWORK_PROXY_CLIENT_H_
 #define SANDBOXED_API_SANDBOX2_NETWORK_PROXY_CLIENT_H_
 
-#include <netinet/in.h>
 #include <sys/socket.h>
 
 #include <cstdint>
diff --git a/sandboxed_api/sandbox2/network_proxy/filtering.h b/sandboxed_api/sandbox2/network_proxy/filtering.h
index b0c2c5e..458e48d 100644
--- a/sandboxed_api/sandbox2/network_proxy/filtering.h
+++ b/sandboxed_api/sandbox2/network_proxy/filtering.h
@@ -18,7 +18,6 @@
 #include <netinet/in.h>
 
 #include <cstdint>
-#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/sandboxed_api/sandbox2/policy.h b/sandboxed_api/sandbox2/policy.h
index c11d1df..0f0385b 100644
--- a/sandboxed_api/sandbox2/policy.h
+++ b/sandboxed_api/sandbox2/policy.h
@@ -18,7 +18,7 @@
 #ifndef SANDBOXED_API_SANDBOX2_POLICY_H_
 #define SANDBOXED_API_SANDBOX2_POLICY_H_
 
-#include <asm/types.h>
+#include <linux/bpf_common.h>
 #include <linux/filter.h>   // IWYU pragma: export
 #include <linux/seccomp.h>  // IWYU pragma: export
 
diff --git a/sandboxed_api/sandbox2/regs.h b/sandboxed_api/sandbox2/regs.h
index ca3800f..5d1e98d 100644
--- a/sandboxed_api/sandbox2/regs.h
+++ b/sandboxed_api/sandbox2/regs.h
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 
 #include <cstdint>
-#include <string>
 
 #include "absl/status/status.h"
 #include "sandboxed_api/config.h"
diff --git a/sandboxed_api/sandbox2/regs_test.cc b/sandboxed_api/sandbox2/regs_test.cc
index 87e6dd6..7bd7577 100644
--- a/sandboxed_api/sandbox2/regs_test.cc
+++ b/sandboxed_api/sandbox2/regs_test.cc
@@ -5,7 +5,6 @@
 #include <sys/prctl.h>
 #include <sys/ptrace.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <syscall.h>
 #include <unistd.h>
@@ -18,7 +17,9 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "absl/log/check.h"
+#include "sandboxed_api/config.h"
 #include "sandboxed_api/sandbox2/sanitizer.h"
+#include "sandboxed_api/sandbox2/syscall.h"
 #include "sandboxed_api/sandbox2/util.h"
 #include "sandboxed_api/sandbox2/util/bpf_helper.h"
 #include "sandboxed_api/util/status_matchers.h"
diff --git a/sandboxed_api/sandbox2/result.h b/sandboxed_api/sandbox2/result.h
index 459dc63..134a2c0 100644
--- a/sandboxed_api/sandbox2/result.h
+++ b/sandboxed_api/sandbox2/result.h
@@ -19,7 +19,6 @@
 #define SANDBOXED_API_SANDBOX2_RESULT_H_
 
 #include <sys/resource.h>
-#include <sys/types.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/sandboxed_api/sandbox2/sanitizer.h b/sandboxed_api/sandbox2/sanitizer.h
index 99d91b1..802d78b 100644
--- a/sandboxed_api/sandbox2/sanitizer.h
+++ b/sandboxed_api/sandbox2/sanitizer.h
@@ -18,7 +18,6 @@
 #ifndef SANDBOXED_API_SANDBOX2_SANITIZER_H_
 #define SANDBOXED_API_SANDBOX2_SANITIZER_H_
 
-#include "absl/base/macros.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
diff --git a/sandboxed_api/sandbox2/util.h b/sandboxed_api/sandbox2/util.h
index 72516dc..0957b99 100644
--- a/sandboxed_api/sandbox2/util.h
+++ b/sandboxed_api/sandbox2/util.h
@@ -25,7 +25,6 @@
 #include <vector>
 
 #include "absl/base/attributes.h"
-#include "absl/base/macros.h"
 #include "absl/status/statusor.h"
 
 namespace sandbox2::util {
diff --git a/sandboxed_api/sandbox2/util/minielf.h b/sandboxed_api/sandbox2/util/minielf.h
index 4245a82..d626b78 100644
--- a/sandboxed_api/sandbox2/util/minielf.h
+++ b/sandboxed_api/sandbox2/util/minielf.h
@@ -16,8 +16,6 @@
 #define SANDBOXED_API_SANDBOX2_UTIL_MINIELF_H_
 
 #include <cstdint>
-#include <cstdio>
-#include <memory>
 #include <string>
 #include <vector>