diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45cce832..7745c132 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,7 +164,6 @@ add_library(livekit
   include/livekit/room_event_types.h
   include/livekit/room_delegate.h
   include/livekit/ffi_handle.h
-  include/livekit/ffi_client.h
   include/livekit/local_audio_track.h
   include/livekit/remote_audio_track.h
   include/livekit/participant.h
@@ -188,6 +187,7 @@ add_library(livekit
   src/data_stream.cpp
   src/ffi_handle.cpp
   src/ffi_client.cpp
+  src/ffi_client.h
   src/local_audio_track.cpp
   src/remote_audio_track.cpp
   src/room.cpp
diff --git a/include/livekit/room.h b/include/livekit/room.h
index 318baaf8..ec8b74e9 100644
--- a/include/livekit/room.h
+++ b/include/livekit/room.h
@@ -17,8 +17,8 @@
 #ifndef LIVEKIT_ROOM_H
 #define LIVEKIT_ROOM_H
 
+#include "ffi_client.h"
 #include "livekit/data_stream.h"
-#include "livekit/ffi_client.h"
 #include "livekit/ffi_handle.h"
 #include "livekit/room_event_types.h"
 #include <memory>
diff --git a/src/audio_source.cpp b/src/audio_source.cpp
index 37c79605..8d57b7f0 100644
--- a/src/audio_source.cpp
+++ b/src/audio_source.cpp
@@ -22,8 +22,8 @@
 
 #include "audio_frame.pb.h"
 #include "ffi.pb.h"
+#include "ffi_client.h"
 #include "livekit/audio_frame.h"
-#include "livekit/ffi_client.h"
 
 namespace livekit {
 
diff --git a/src/audio_stream.cpp b/src/audio_stream.cpp
index 45a36691..f6af96af 100644
--- a/src/audio_stream.cpp
+++ b/src/audio_stream.cpp
@@ -20,7 +20,7 @@
 
 #include "audio_frame.pb.h"
 #include "ffi.pb.h"
-#include "livekit/ffi_client.h"
+#include "ffi_client.h"
 #include "livekit/track.h"
 
 namespace livekit {
diff --git a/src/data_stream.cpp b/src/data_stream.cpp
index e9fa3be9..980ed725 100644
--- a/src/data_stream.cpp
+++ b/src/data_stream.cpp
@@ -5,7 +5,7 @@
 #include <random>
 #include <stdexcept>
 
-#include "livekit/ffi_client.h"
+#include "ffi_client.h"
 #include "livekit/local_participant.h"
 #include "room.pb.h"
 
diff --git a/src/ffi_client.cpp b/src/ffi_client.cpp
index ee7bba74..41304f21 100644
--- a/src/ffi_client.cpp
+++ b/src/ffi_client.cpp
@@ -19,7 +19,7 @@
 #include "build.h"
 #include "e2ee.pb.h"
 #include "ffi.pb.h"
-#include "livekit/ffi_client.h"
+#include "ffi_client.h"
 #include "livekit/ffi_handle.h"
 #include "livekit/room.h" // TODO, maybe avoid circular deps by moving RoomOptions to a room_types.h ?
 #include "livekit/rpc_error.h"
diff --git a/include/livekit/ffi_client.h b/src/ffi_client.h
similarity index 100%
rename from include/livekit/ffi_client.h
rename to src/ffi_client.h
diff --git a/src/local_audio_track.cpp b/src/local_audio_track.cpp
index 02d73b09..0481dc38 100644
--- a/src/local_audio_track.cpp
+++ b/src/local_audio_track.cpp
@@ -17,8 +17,8 @@
 #include "livekit/local_audio_track.h"
 
 #include "ffi.pb.h"
+#include "ffi_client.h"
 #include "livekit/audio_source.h"
-#include "livekit/ffi_client.h"
 #include "track.pb.h"
 #include "track_proto_converter.h"
 
diff --git a/src/local_participant.cpp b/src/local_participant.cpp
index 27b4dd33..7ec3c76d 100644
--- a/src/local_participant.cpp
+++ b/src/local_participant.cpp
@@ -16,13 +16,13 @@
 
 #include "livekit/local_participant.h"
 
-#include "livekit/ffi_client.h"
 #include "livekit/ffi_handle.h"
 #include "livekit/local_track_publication.h"
 #include "livekit/room_delegate.h"
 #include "livekit/track.h"
 
 #include "ffi.pb.h"
+#include "ffi_client.h"
 #include "participant.pb.h"
 #include "room.pb.h"
 #include "room_proto_converter.h"
diff --git a/src/local_video_track.cpp b/src/local_video_track.cpp
index 7294a997..fe514a36 100644
--- a/src/local_video_track.cpp
+++ b/src/local_video_track.cpp
@@ -17,7 +17,7 @@
 #include "livekit/local_video_track.h"
 
 #include "ffi.pb.h"
-#include "livekit/ffi_client.h"
+#include "ffi_client.h"
 #include "livekit/video_source.h"
 #include "track.pb.h"
 #include "track_proto_converter.h"
diff --git a/src/remote_audio_track.cpp b/src/remote_audio_track.cpp
index f8e4b81d..72631893 100644
--- a/src/remote_audio_track.cpp
+++ b/src/remote_audio_track.cpp
@@ -17,8 +17,8 @@
 #include "livekit/remote_audio_track.h"
 
 #include "ffi.pb.h"
+#include "ffi_client.h"
 #include "livekit/audio_source.h"
-#include "livekit/ffi_client.h"
 #include "track.pb.h"
 #include "track_proto_converter.h"
 
diff --git a/src/remote_track_publication.cpp b/src/remote_track_publication.cpp
index 6a7f8d09..3616af6d 100644
--- a/src/remote_track_publication.cpp
+++ b/src/remote_track_publication.cpp
@@ -17,7 +17,7 @@
 #include "livekit/remote_track_publication.h"
 
 #include "ffi.pb.h"
-#include "livekit/ffi_client.h"
+#include "ffi_client.h"
 #include "livekit/track.h"
 #include "track_proto_converter.h"
 
diff --git a/src/remote_video_track.cpp b/src/remote_video_track.cpp
index 3fd9ee02..871ec673 100644
--- a/src/remote_video_track.cpp
+++ b/src/remote_video_track.cpp
@@ -17,7 +17,7 @@
 #include "livekit/remote_video_track.h"
 
 #include "ffi.pb.h"
-#include "livekit/ffi_client.h"
+#include "ffi_client.h"
 #include "livekit/video_source.h"
 #include "track.pb.h"
 #include "track_proto_converter.h"
diff --git a/src/room.cpp b/src/room.cpp
index e3d93b27..538156ff 100644
--- a/src/room.cpp
+++ b/src/room.cpp
@@ -17,7 +17,6 @@
 #include "livekit/room.h"
 
 #include "livekit/audio_stream.h"
-#include "livekit/ffi_client.h"
 #include "livekit/local_participant.h"
 #include "livekit/local_track_publication.h"
 #include "livekit/remote_audio_track.h"
@@ -29,6 +28,7 @@
 #include "livekit/video_stream.h"
 
 #include "ffi.pb.h"
+#include "ffi_client.h"
 #include "room.pb.h"
 #include "room_proto_converter.h"
 #include "track.pb.h"
diff --git a/src/track.cpp b/src/track.cpp
index f8c26a69..2dd403d9 100644
--- a/src/track.cpp
+++ b/src/track.cpp
@@ -16,7 +16,7 @@
 
 #include "livekit/track.h"
 
-#include "livekit/ffi_client.h"
+#include "ffi_client.h"
 #include <future>
 #include <optional>
 
diff --git a/src/video_source.cpp b/src/video_source.cpp
index 1caddc9c..4d29e1c1 100644
--- a/src/video_source.cpp
+++ b/src/video_source.cpp
@@ -19,10 +19,9 @@
 #include <chrono>
 #include <stdexcept>
 
-#include "livekit/ffi_client.h"
-#include "livekit/video_frame.h"
-
 #include "ffi.pb.h"
+#include "ffi_client.h"
+#include "livekit/video_frame.h"
 #include "video_frame.pb.h"
 #include "video_utils.h"
 
diff --git a/src/video_stream.cpp b/src/video_stream.cpp
index cb6d4473..c7b5fc81 100644
--- a/src/video_stream.cpp
+++ b/src/video_stream.cpp
@@ -3,7 +3,7 @@
 #include <utility>
 
 #include "ffi.pb.h"
-#include "livekit/ffi_client.h"
+#include "ffi_client.h"
 #include "livekit/track.h"
 #include "video_frame.pb.h"
 #include "video_utils.h"
diff --git a/src/video_utils.cpp b/src/video_utils.cpp
index 746e4ef6..d75b7752 100644
--- a/src/video_utils.cpp
+++ b/src/video_utils.cpp
@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "ffi.pb.h"
-#include "livekit/ffi_client.h"
+#include "ffi_client.h"
 #include "livekit/ffi_handle.h"
 #include "video_frame.pb.h"