diff --git a/build/source_list.bzl b/build/source_list.bzl
index 7f41f54..62d8265 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -946,11 +946,6 @@
 io_tool_support_hdrs = [
     "common/platform/api/quiche_event_loop.h",
     "common/platform/api/quiche_udp_socket_platform_api.h",
-    "quic/core/batch_writer/quic_batch_writer_base.h",
-    "quic/core/batch_writer/quic_batch_writer_buffer.h",
-    "quic/core/batch_writer/quic_batch_writer_test.h",
-    "quic/core/batch_writer/quic_gso_batch_writer.h",
-    "quic/core/batch_writer/quic_sendmmsg_batch_writer.h",
     "quic/core/io/event_loop_connecting_client_socket.h",
     "quic/core/io/event_loop_socket_factory.h",
     "quic/core/io/quic_default_event_loop.h",
@@ -958,7 +953,6 @@
     "quic/core/io/quic_poll_event_loop.h",
     "quic/core/io/socket.h",
     "quic/core/quic_default_packet_writer.h",
-    "quic/core/quic_linux_socket_utils.h",
     "quic/core/quic_packet_reader.h",
     "quic/core/quic_syscall_wrapper.h",
     "quic/core/quic_udp_socket.h",
@@ -978,17 +972,12 @@
     "quic/tools/quic_server.h",
 ]
 io_tool_support_srcs = [
-    "quic/core/batch_writer/quic_batch_writer_base.cc",
-    "quic/core/batch_writer/quic_batch_writer_buffer.cc",
-    "quic/core/batch_writer/quic_gso_batch_writer.cc",
-    "quic/core/batch_writer/quic_sendmmsg_batch_writer.cc",
     "quic/core/io/event_loop_connecting_client_socket.cc",
     "quic/core/io/event_loop_socket_factory.cc",
     "quic/core/io/quic_default_event_loop.cc",
     "quic/core/io/quic_poll_event_loop.cc",
     "quic/core/io/socket_posix.cc",
     "quic/core/quic_default_packet_writer.cc",
-    "quic/core/quic_linux_socket_utils.cc",
     "quic/core/quic_packet_reader.cc",
     "quic/core/quic_syscall_wrapper.cc",
     "quic/core/quic_udp_socket_posix.cc",
@@ -1283,10 +1272,6 @@
 
 ]
 io_tests_srcs = [
-    "quic/core/batch_writer/quic_batch_writer_buffer_test.cc",
-    "quic/core/batch_writer/quic_batch_writer_test.cc",
-    "quic/core/batch_writer/quic_gso_batch_writer_test.cc",
-    "quic/core/batch_writer/quic_sendmmsg_batch_writer_test.cc",
     "quic/core/chlo_extractor_test.cc",
     "quic/core/http/end_to_end_test.cc",
     "quic/core/http/quic_spdy_client_session_test.cc",
@@ -1296,7 +1281,6 @@
     "quic/core/io/quic_all_event_loops_test.cc",
     "quic/core/io/quic_poll_event_loop_test.cc",
     "quic/core/io/socket_test.cc",
-    "quic/core/quic_linux_socket_utils_test.cc",
     "quic/tools/quic_default_client_test.cc",
     "quic/tools/quic_server_test.cc",
     "quic/tools/quic_simple_server_session_test.cc",
@@ -1541,3 +1525,28 @@
     "quic/bindings/quic_libevent.cc",
     "quic/bindings/quic_libevent_test.cc",
 ]
+linux_only_hdrs = [
+    "quic/core/batch_writer/quic_batch_writer_base.h",
+    "quic/core/batch_writer/quic_batch_writer_buffer.h",
+    "quic/core/batch_writer/quic_batch_writer_test.h",
+    "quic/core/batch_writer/quic_gso_batch_writer.h",
+    "quic/core/batch_writer/quic_sendmmsg_batch_writer.h",
+    "quic/core/quic_linux_socket_utils.h",
+]
+linux_only_srcs = [
+    "quic/core/batch_writer/quic_batch_writer_base.cc",
+    "quic/core/batch_writer/quic_batch_writer_buffer.cc",
+    "quic/core/batch_writer/quic_gso_batch_writer.cc",
+    "quic/core/batch_writer/quic_sendmmsg_batch_writer.cc",
+    "quic/core/quic_linux_socket_utils.cc",
+]
+linux_only_tests_hdrs = [
+
+]
+linux_only_tests_srcs = [
+    "quic/core/batch_writer/quic_batch_writer_buffer_test.cc",
+    "quic/core/batch_writer/quic_batch_writer_test.cc",
+    "quic/core/batch_writer/quic_gso_batch_writer_test.cc",
+    "quic/core/batch_writer/quic_sendmmsg_batch_writer_test.cc",
+    "quic/core/quic_linux_socket_utils_test.cc",
+]
diff --git a/build/source_list.gni b/build/source_list.gni
index aadf7ae..7dba73c 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -946,11 +946,6 @@
 io_tool_support_hdrs = [
     "src/quiche/common/platform/api/quiche_event_loop.h",
     "src/quiche/common/platform/api/quiche_udp_socket_platform_api.h",
-    "src/quiche/quic/core/batch_writer/quic_batch_writer_base.h",
-    "src/quiche/quic/core/batch_writer/quic_batch_writer_buffer.h",
-    "src/quiche/quic/core/batch_writer/quic_batch_writer_test.h",
-    "src/quiche/quic/core/batch_writer/quic_gso_batch_writer.h",
-    "src/quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.h",
     "src/quiche/quic/core/io/event_loop_connecting_client_socket.h",
     "src/quiche/quic/core/io/event_loop_socket_factory.h",
     "src/quiche/quic/core/io/quic_default_event_loop.h",
@@ -958,7 +953,6 @@
     "src/quiche/quic/core/io/quic_poll_event_loop.h",
     "src/quiche/quic/core/io/socket.h",
     "src/quiche/quic/core/quic_default_packet_writer.h",
-    "src/quiche/quic/core/quic_linux_socket_utils.h",
     "src/quiche/quic/core/quic_packet_reader.h",
     "src/quiche/quic/core/quic_syscall_wrapper.h",
     "src/quiche/quic/core/quic_udp_socket.h",
@@ -978,17 +972,12 @@
     "src/quiche/quic/tools/quic_server.h",
 ]
 io_tool_support_srcs = [
-    "src/quiche/quic/core/batch_writer/quic_batch_writer_base.cc",
-    "src/quiche/quic/core/batch_writer/quic_batch_writer_buffer.cc",
-    "src/quiche/quic/core/batch_writer/quic_gso_batch_writer.cc",
-    "src/quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc",
     "src/quiche/quic/core/io/event_loop_connecting_client_socket.cc",
     "src/quiche/quic/core/io/event_loop_socket_factory.cc",
     "src/quiche/quic/core/io/quic_default_event_loop.cc",
     "src/quiche/quic/core/io/quic_poll_event_loop.cc",
     "src/quiche/quic/core/io/socket_posix.cc",
     "src/quiche/quic/core/quic_default_packet_writer.cc",
-    "src/quiche/quic/core/quic_linux_socket_utils.cc",
     "src/quiche/quic/core/quic_packet_reader.cc",
     "src/quiche/quic/core/quic_syscall_wrapper.cc",
     "src/quiche/quic/core/quic_udp_socket_posix.cc",
@@ -1283,10 +1272,6 @@
 
 ]
 io_tests_srcs = [
-    "src/quiche/quic/core/batch_writer/quic_batch_writer_buffer_test.cc",
-    "src/quiche/quic/core/batch_writer/quic_batch_writer_test.cc",
-    "src/quiche/quic/core/batch_writer/quic_gso_batch_writer_test.cc",
-    "src/quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer_test.cc",
     "src/quiche/quic/core/chlo_extractor_test.cc",
     "src/quiche/quic/core/http/end_to_end_test.cc",
     "src/quiche/quic/core/http/quic_spdy_client_session_test.cc",
@@ -1296,7 +1281,6 @@
     "src/quiche/quic/core/io/quic_all_event_loops_test.cc",
     "src/quiche/quic/core/io/quic_poll_event_loop_test.cc",
     "src/quiche/quic/core/io/socket_test.cc",
-    "src/quiche/quic/core/quic_linux_socket_utils_test.cc",
     "src/quiche/quic/tools/quic_default_client_test.cc",
     "src/quiche/quic/tools/quic_server_test.cc",
     "src/quiche/quic/tools/quic_simple_server_session_test.cc",
@@ -1541,3 +1525,28 @@
     "src/quiche/quic/bindings/quic_libevent.cc",
     "src/quiche/quic/bindings/quic_libevent_test.cc",
 ]
+linux_only_hdrs = [
+    "src/quiche/quic/core/batch_writer/quic_batch_writer_base.h",
+    "src/quiche/quic/core/batch_writer/quic_batch_writer_buffer.h",
+    "src/quiche/quic/core/batch_writer/quic_batch_writer_test.h",
+    "src/quiche/quic/core/batch_writer/quic_gso_batch_writer.h",
+    "src/quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.h",
+    "src/quiche/quic/core/quic_linux_socket_utils.h",
+]
+linux_only_srcs = [
+    "src/quiche/quic/core/batch_writer/quic_batch_writer_base.cc",
+    "src/quiche/quic/core/batch_writer/quic_batch_writer_buffer.cc",
+    "src/quiche/quic/core/batch_writer/quic_gso_batch_writer.cc",
+    "src/quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc",
+    "src/quiche/quic/core/quic_linux_socket_utils.cc",
+]
+linux_only_tests_hdrs = [
+
+]
+linux_only_tests_srcs = [
+    "src/quiche/quic/core/batch_writer/quic_batch_writer_buffer_test.cc",
+    "src/quiche/quic/core/batch_writer/quic_batch_writer_test.cc",
+    "src/quiche/quic/core/batch_writer/quic_gso_batch_writer_test.cc",
+    "src/quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer_test.cc",
+    "src/quiche/quic/core/quic_linux_socket_utils_test.cc",
+]
diff --git a/build/source_list.json b/build/source_list.json
index 3914bca..db01f1e 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -945,11 +945,6 @@
   "io_tool_support_hdrs": [
     "quiche/common/platform/api/quiche_event_loop.h",
     "quiche/common/platform/api/quiche_udp_socket_platform_api.h",
-    "quiche/quic/core/batch_writer/quic_batch_writer_base.h",
-    "quiche/quic/core/batch_writer/quic_batch_writer_buffer.h",
-    "quiche/quic/core/batch_writer/quic_batch_writer_test.h",
-    "quiche/quic/core/batch_writer/quic_gso_batch_writer.h",
-    "quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.h",
     "quiche/quic/core/io/event_loop_connecting_client_socket.h",
     "quiche/quic/core/io/event_loop_socket_factory.h",
     "quiche/quic/core/io/quic_default_event_loop.h",
@@ -957,7 +952,6 @@
     "quiche/quic/core/io/quic_poll_event_loop.h",
     "quiche/quic/core/io/socket.h",
     "quiche/quic/core/quic_default_packet_writer.h",
-    "quiche/quic/core/quic_linux_socket_utils.h",
     "quiche/quic/core/quic_packet_reader.h",
     "quiche/quic/core/quic_syscall_wrapper.h",
     "quiche/quic/core/quic_udp_socket.h",
@@ -977,17 +971,12 @@
     "quiche/quic/tools/quic_server.h"
   ],
   "io_tool_support_srcs": [
-    "quiche/quic/core/batch_writer/quic_batch_writer_base.cc",
-    "quiche/quic/core/batch_writer/quic_batch_writer_buffer.cc",
-    "quiche/quic/core/batch_writer/quic_gso_batch_writer.cc",
-    "quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc",
     "quiche/quic/core/io/event_loop_connecting_client_socket.cc",
     "quiche/quic/core/io/event_loop_socket_factory.cc",
     "quiche/quic/core/io/quic_default_event_loop.cc",
     "quiche/quic/core/io/quic_poll_event_loop.cc",
     "quiche/quic/core/io/socket_posix.cc",
     "quiche/quic/core/quic_default_packet_writer.cc",
-    "quiche/quic/core/quic_linux_socket_utils.cc",
     "quiche/quic/core/quic_packet_reader.cc",
     "quiche/quic/core/quic_syscall_wrapper.cc",
     "quiche/quic/core/quic_udp_socket_posix.cc",
@@ -1282,10 +1271,6 @@
 
   ],
   "io_tests_srcs": [
-    "quiche/quic/core/batch_writer/quic_batch_writer_buffer_test.cc",
-    "quiche/quic/core/batch_writer/quic_batch_writer_test.cc",
-    "quiche/quic/core/batch_writer/quic_gso_batch_writer_test.cc",
-    "quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer_test.cc",
     "quiche/quic/core/chlo_extractor_test.cc",
     "quiche/quic/core/http/end_to_end_test.cc",
     "quiche/quic/core/http/quic_spdy_client_session_test.cc",
@@ -1295,7 +1280,6 @@
     "quiche/quic/core/io/quic_all_event_loops_test.cc",
     "quiche/quic/core/io/quic_poll_event_loop_test.cc",
     "quiche/quic/core/io/socket_test.cc",
-    "quiche/quic/core/quic_linux_socket_utils_test.cc",
     "quiche/quic/tools/quic_default_client_test.cc",
     "quiche/quic/tools/quic_server_test.cc",
     "quiche/quic/tools/quic_simple_server_session_test.cc",
@@ -1539,5 +1523,30 @@
   "libevent_srcs": [
     "quiche/quic/bindings/quic_libevent.cc",
     "quiche/quic/bindings/quic_libevent_test.cc"
+  ],
+  "linux_only_hdrs": [
+    "quiche/quic/core/batch_writer/quic_batch_writer_base.h",
+    "quiche/quic/core/batch_writer/quic_batch_writer_buffer.h",
+    "quiche/quic/core/batch_writer/quic_batch_writer_test.h",
+    "quiche/quic/core/batch_writer/quic_gso_batch_writer.h",
+    "quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.h",
+    "quiche/quic/core/quic_linux_socket_utils.h"
+  ],
+  "linux_only_srcs": [
+    "quiche/quic/core/batch_writer/quic_batch_writer_base.cc",
+    "quiche/quic/core/batch_writer/quic_batch_writer_buffer.cc",
+    "quiche/quic/core/batch_writer/quic_gso_batch_writer.cc",
+    "quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc",
+    "quiche/quic/core/quic_linux_socket_utils.cc"
+  ],
+  "linux_only_tests_hdrs": [
+
+  ],
+  "linux_only_tests_srcs": [
+    "quiche/quic/core/batch_writer/quic_batch_writer_buffer_test.cc",
+    "quiche/quic/core/batch_writer/quic_batch_writer_test.cc",
+    "quiche/quic/core/batch_writer/quic_gso_batch_writer_test.cc",
+    "quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer_test.cc",
+    "quiche/quic/core/quic_linux_socket_utils_test.cc"
   ]
 }
\ No newline at end of file