diff --git a/cpp/core/internal/CMakeLists.txt b/cpp/core/internal/CMakeLists.txt
index e9cc7350..752732ed 100644
--- a/cpp/core/internal/CMakeLists.txt
+++ b/cpp/core/internal/CMakeLists.txt
@@ -9,7 +9,7 @@ target_sources(core_internal
     loop_runner.cc
     loop_runner.h
     offline_frames.cc
-    offline_frames.h
+    wifi_lan_service_info.cc
   PUBLIC
     bandwidth_upgrade_handler.h
     bandwidth_upgrade_manager.h
@@ -28,6 +28,7 @@ target_sources(core_internal
     endpoint_manager.h
     internal_payload_factory.h
     medium_manager.h
+    offline_frames.h
     offline_service_controller.h
     p2p_cluster_pcp_handler.h
     p2p_point_to_point_pcp_handler.h
@@ -57,8 +58,11 @@ target_link_libraries(core_internal
 )
 
 add_executable(core_internal_test
+    base_endpoint_channel_test.cc
     bluetooth_device_name_test.cc
     ble_advertisement_test.cc
+    offline_frames_test.cc
+    wifi_lan_service_info_test.cc
 )
 
 add_test(
@@ -69,8 +73,10 @@ add_test(
 target_link_libraries(core_internal_test
   PUBLIC
     core_internal
+    gmock
     gtest
     gtest_main
+    platform_impl_default
     platform_impl_default_cond_var
     platform_impl_default_lock
     platform_port_string
diff --git a/cpp/platform/CMakeLists.txt b/cpp/platform/CMakeLists.txt
index f7a3c1d8..bac031db 100644
--- a/cpp/platform/CMakeLists.txt
+++ b/cpp/platform/CMakeLists.txt
@@ -23,9 +23,7 @@ target_link_libraries(platform_utils
     absl::strings
 )
 
-add_library(platform_types STATIC
-  ptr.cc
-)
+add_library(platform_types STATIC)
 
 target_sources(platform_types
   PUBLIC
@@ -48,6 +46,7 @@ target_link_libraries(platform_types
 add_executable(platform_test
   byte_array_test.cc
   container_of_test.cc
+  exception_test.cc
   file_impl_test.cc
   pipe_test.cc
   prng_test.cc
@@ -75,6 +74,7 @@ add_test(
 )
 
 add_subdirectory(api)
+add_subdirectory(api2)
 add_subdirectory(impl/sample)
 add_subdirectory(impl/default)
 add_subdirectory(port)
diff --git a/cpp/platform/api/CMakeLists.txt b/cpp/platform/api/CMakeLists.txt
index 35cd7d06..59343794 100644
--- a/cpp/platform/api/CMakeLists.txt
+++ b/cpp/platform/api/CMakeLists.txt
@@ -12,18 +12,22 @@ add_library(platform_api STATIC
     hash_utils.h
     input_file.h
     input_stream.h
+    listenable_future.h
     lock.h
     multi_thread_executor.h
     output_file.h
     output_stream.h
     scheduled_executor.h
+    server_sync.h
     settable_future.h
     single_thread_executor.h
     socket.h
     submittable_executor.h
     system_clock.h
     thread_utils.h
+    webrtc.h
     wifi.h
+    wifi_lan.h
 )
 
 target_link_libraries(platform_api
diff --git a/cpp/platform/api2/CMakeLists.txt b/cpp/platform/api2/CMakeLists.txt
new file mode 100644
index 00000000..64e8a7a7
--- /dev/null
+++ b/cpp/platform/api2/CMakeLists.txt
@@ -0,0 +1,41 @@
+add_library(platform_api2 STATIC)
+
+target_sources(platform_api2
+  PUBLIC
+    atomic_boolean.h
+    atomic_reference.h
+    ble.h
+    ble_v2.h
+    bluetooth_adapter.h
+    bluetooth_classic.h
+    condition_variable.h
+    count_down_latch.h
+    executor.h
+    future.h
+    hash_utils.h
+    input_file.h
+    input_stream.h
+    listenable_future.h
+    multi_thread_executor.h
+    mutex.h
+    output_file.h
+    output_stream.h
+    scheduled_executor.h
+    server_sync.h
+    settable_future.h
+    single_thread_executor.h
+    socket.h
+    submittable_executor.h
+    system_clock.h
+    thread_utils.h
+    webrtc.h
+    wifi.h
+)
+
+target_link_libraries(platform_api2
+  PUBLIC
+    absl::strings
+    absl::time
+    platform_types
+    webrtc_api_libjingle_peerconnection_api
+)
diff --git a/cpp/platform/impl/default/CMakeLists.txt b/cpp/platform/impl/default/CMakeLists.txt
index 353b2be0..222d9ae0 100644
--- a/cpp/platform/impl/default/CMakeLists.txt
+++ b/cpp/platform/impl/default/CMakeLists.txt
@@ -2,12 +2,8 @@ add_library(platform_impl_default STATIC)
 
 target_sources(platform_impl_default
   PRIVATE
-    default_condition_variable.cc
-    default_lock.cc
     default_platform.cc
   PUBLIC
-    default_condition_variable.h
-    default_lock.h
     default_platform.h
 )
 
@@ -19,6 +15,8 @@ target_include_directories(platform_impl_default
 target_link_libraries(platform_impl_default
   PUBLIC
     platform_api
+    platform_impl_default_cond_var
+    platform_impl_default_lock
     platform_types
 )