diff --git a/quic/api/BUCK b/quic/api/BUCK
index 592a9010d..999d74afd 100644
--- a/quic/api/BUCK
+++ b/quic/api/BUCK
@@ -45,56 +45,42 @@ mvfst_cpp_library(
 mvfst_cpp_library(
     name = "transport",
     srcs = [
-        "IoBufQuicBatch.cpp",
-        "QuicPacketScheduler.cpp",
         "QuicTransportBase.cpp",
         "QuicTransportBaseLite.cpp",
-        "QuicTransportFunctions.cpp",
     ],
     headers = [
-        "IoBufQuicBatch.h",
-        "QuicPacketScheduler.h",
         "QuicSocket.h",
         "QuicSocketLite.h",
         "QuicTransportBase.h",
         "QuicTransportBaseLite.h",
-        "QuicTransportFunctions.h",
     ],
     deps = [
         ":loop_detector_callback",
+        ":quic_batch_writer",
         "//folly:chrono",
         "//folly:scope_guard",
-        "//folly/tracing:static_tracepoint",
-        "//quic/common:buf_accessor",
-        "//quic/common:socket_util",
         "//quic/common:time_util",
         "//quic/congestion_control:ecn_l4s_tracker",
         "//quic/congestion_control:pacer",
-        "//quic/happyeyeballs:happyeyeballs",
+        "//quic/flowcontrol:flow_control",
         "//quic/logging:qlogger_constants",
         "//quic/loss:loss",
-        "//quic/state:ack_frequency_functions",
-        "//quic/state:ack_handler",
         "//quic/state:pacing_functions",
         "//quic/state:simple_frame_functions",
+        "//quic/state:state_functions",
+        "//quic/state:stream_functions",
         "//quic/state/stream:stream",
     ],
     exported_deps = [
-        ":quic_batch_writer",
         ":quic_callbacks",
+        ":transport_helpers",
         "//folly:exception_wrapper",
-        "//folly:expected",
         "//folly:maybe_managed_ptr",
         "//folly:portability",
         "//folly/io:iobuf",
         "//folly/io/async:async_transport_certificate",
-        "//folly/lang:assume",
         "//quic:constants",
         "//quic:exception",
-        "//quic/client:state_and_handshake",
-        "//quic/codec:codec",
-        "//quic/codec:pktbuilder",
-        "//quic/codec:pktrebuilder",
         "//quic/codec:types",
         "//quic/common:looper",
         "//quic/common:network_data",
@@ -108,7 +94,6 @@ mvfst_cpp_library(
         "//quic/congestion_control:copa",
         "//quic/congestion_control:cubic",
         "//quic/congestion_control:newreno",
-        "//quic/flowcontrol:flow_control",
         "//quic/handshake:transport_parameters",
         "//quic/observer:socket_observer_container",
         "//quic/observer:socket_observer_types",
@@ -117,6 +102,45 @@ mvfst_cpp_library(
         "//quic/state:quic_state_machine",
         "//quic/state:quic_stream_utilities",
         "//quic/state:retransmission_policy",
+    ],
+)
+
+mvfst_cpp_library(
+    name = "transport_helpers",
+    srcs = [
+        "IoBufQuicBatch.cpp",
+        "QuicPacketScheduler.cpp",
+        "QuicTransportFunctions.cpp",
+    ],
+    headers = [
+        "IoBufQuicBatch.h",
+        "QuicPacketScheduler.h",
+        "QuicTransportFunctions.h",
+    ],
+    deps = [
+        "//folly/tracing:static_tracepoint",
+        "//quic/common:buf_accessor",
+        "//quic/common:socket_util",
+        "//quic/happyeyeballs:happyeyeballs",
+        "//quic/state:ack_frequency_functions",
+        "//quic/state:ack_handler",
+        "//quic/state:simple_frame_functions",
+    ],
+    exported_deps = [
+        ":quic_batch_writer",
+        "//folly:expected",
+        "//folly/lang:assume",
+        "//quic:constants",
+        "//quic:exception",
+        "//quic/client:state_and_handshake",
+        "//quic/codec:codec",
+        "//quic/codec:pktbuilder",
+        "//quic/codec:pktrebuilder",
+        "//quic/codec:types",
+        "//quic/common/udpsocket:quic_async_udp_socket",
+        "//quic/flowcontrol:flow_control",
+        "//quic/handshake:transport_parameters",
+        "//quic/state:quic_state_machine",
         "//quic/state:state_functions",
         "//quic/state:stats_callback",
         "//quic/state:stream_functions",
diff --git a/quic/api/QuicTransportBaseLite.cpp b/quic/api/QuicTransportBaseLite.cpp
index 27211ee9f..1b68dd119 100644
--- a/quic/api/QuicTransportBaseLite.cpp
+++ b/quic/api/QuicTransportBaseLite.cpp
@@ -247,7 +247,7 @@ bool QuicTransportBaseLite::isBidirectionalStream(StreamId stream) noexcept {
   return quic::isBidirectionalStream(stream);
 }
 
-QuicSocket::WriteResult QuicTransportBaseLite::writeChain(
+QuicSocketLite::WriteResult QuicTransportBaseLite::writeChain(
     StreamId id,
     Buf data,
     bool eof,
diff --git a/quic/api/QuicTransportFunctions.h b/quic/api/QuicTransportFunctions.h
index 3b403e7ef..d55d77115 100644
--- a/quic/api/QuicTransportFunctions.h
+++ b/quic/api/QuicTransportFunctions.h
@@ -12,7 +12,6 @@
 #include <quic/QuicException.h>
 #include <quic/api/IoBufQuicBatch.h>
 #include <quic/api/QuicPacketScheduler.h>
-#include <quic/api/QuicSocket.h>
 #include <quic/common/udpsocket/QuicAsyncUDPSocket.h>
 #include <quic/handshake/TransportParameters.h>
 #include <quic/state/StateData.h>
diff --git a/quic/somerge_defs.bzl b/quic/somerge_defs.bzl
index a6f612f6e..a45bbdebf 100644
--- a/quic/somerge_defs.bzl
+++ b/quic/somerge_defs.bzl
@@ -2,7 +2,7 @@
 
 Generated by xplat/cross_plat_devx/somerge_maps/compute_merge_maps.py
 
-@generated SignedSource<<5001a712c11a20f56aad59bc84c56359>>
+@generated SignedSource<<80ffdf62b2f4f6fb1c36eb1882d65531>>
 """
 
 # Entry Points:
@@ -33,6 +33,8 @@ QUIC_NATIVE_LIBRARY_MERGE_MAP = [
     "fbsource//xplat/quic/api:quic_callbacksAndroidAndroid",
     "fbsource//xplat/quic/api:transportAndroid",
     "fbsource//xplat/quic/api:transportAndroidAndroid",
+    "fbsource//xplat/quic/api:transport_helpersAndroid",
+    "fbsource//xplat/quic/api:transport_helpersAndroidAndroid",
     "fbsource//xplat/quic/client:cached_server_tpAndroid",
     "fbsource//xplat/quic/client:cached_server_tpAndroidAndroid",
     "fbsource//xplat/quic/client:clientAndroid",