diff --git a/fastpair/BUILD b/fastpair/BUILD
index 8f1c42aa..fb5c746b 100644
--- a/fastpair/BUILD
+++ b/fastpair/BUILD
@@ -112,6 +112,7 @@ cc_library(
         "//internal/platform:base",
         "//internal/platform:types",
         "//internal/platform/flags:platform_flags",
+        "//internal/platform/implementation:types",
         "//internal/preferences",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/status",
diff --git a/fastpair/fast_pair_service.h b/fastpair/fast_pair_service.h
index ee5e4520..10c95cf0 100644
--- a/fastpair/fast_pair_service.h
+++ b/fastpair/fast_pair_service.h
@@ -27,10 +27,10 @@
 #include "fastpair/server_access/fast_pair_client.h"
 #include "fastpair/server_access/fast_pair_http_notifier.h"
 #include "fastpair/repository/fast_pair_repository.h"
-#include "internal/account/account_manager.h"
 #include "internal/auth/authentication_manager.h"
 #include "internal/network/http_client.h"
 #include "internal/platform/device_info.h"
+#include "internal/platform/implementation/account_manager.h"
 #include "internal/platform/single_thread_executor.h"
 #include "internal/platform/task_runner.h"
 #include "internal/preferences/preferences_manager.h"
diff --git a/fastpair/pairing/BUILD b/fastpair/pairing/BUILD
index ab0fe961..e643d7c4 100644
--- a/fastpair/pairing/BUILD
+++ b/fastpair/pairing/BUILD
@@ -33,9 +33,9 @@ cc_library(
         "//fastpair/handshake",
         "//fastpair/internal/mediums",
         "//fastpair/pairing/fastpair:pairing",
-        "//internal/account",
         "//internal/base",
         "//internal/platform:types",
+        "//internal/platform/implementation:types",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/functional:bind_front",
         "@com_google_absl//absl/synchronization",
diff --git a/fastpair/pairing/fastpair/BUILD b/fastpair/pairing/fastpair/BUILD
index b584b20d..999f839e 100644
--- a/fastpair/pairing/fastpair/BUILD
+++ b/fastpair/pairing/fastpair/BUILD
@@ -34,9 +34,9 @@ cc_library(
         "//fastpair/handshake",
         "//fastpair/internal/mediums",
         "//fastpair/repository",
-        "//internal/account",
         "//internal/platform:comm",
         "//internal/platform:types",
+        "//internal/platform/implementation:types",
         "@com_google_absl//absl/functional:any_invocable",
         "@com_google_absl//absl/time",
     ],
diff --git a/fastpair/pairing/fastpair/fast_pair_pairer_impl.h b/fastpair/pairing/fastpair/fast_pair_pairer_impl.h
index 9024e636..dd7d87c9 100644
--- a/fastpair/pairing/fastpair/fast_pair_pairer_impl.h
+++ b/fastpair/pairing/fastpair/fast_pair_pairer_impl.h
@@ -26,8 +26,8 @@
 #include "fastpair/handshake/fast_pair_handshake.h"
 #include "fastpair/internal/mediums/mediums.h"
 #include "fastpair/pairing/fastpair/fast_pair_pairer.h"
-#include "internal/account/account_manager.h"
 #include "internal/platform/bluetooth_classic.h"
+#include "internal/platform/implementation/account_manager.h"
 #include "internal/platform/single_thread_executor.h"
 #include "internal/platform/timer_impl.h"
 
diff --git a/fastpair/pairing/pairer_broker_impl.h b/fastpair/pairing/pairer_broker_impl.h
index 0c88d975..3fc28106 100644
--- a/fastpair/pairing/pairer_broker_impl.h
+++ b/fastpair/pairing/pairer_broker_impl.h
@@ -24,8 +24,8 @@
 #include "fastpair/internal/mediums/mediums.h"
 #include "fastpair/pairing/fastpair/fast_pair_pairer.h"
 #include "fastpair/pairing/pairer_broker.h"
-#include "internal/account/account_manager.h"
 #include "internal/base/observer_list.h"
+#include "internal/platform/implementation/account_manager.h"
 #include "internal/platform/single_thread_executor.h"
 #include "internal/platform/timer_impl.h"
 
diff --git a/fastpair/retroactive/BUILD b/fastpair/retroactive/BUILD
index 63315b12..257aa853 100644
--- a/fastpair/retroactive/BUILD
+++ b/fastpair/retroactive/BUILD
@@ -38,10 +38,10 @@ cc_library(
         "//fastpair/pairing",
         "//fastpair/repository",
         "//fastpair/repository:device_repository",
-        "//internal/account",
         "//internal/base",
         "//internal/platform:comm",
         "//internal/platform:types",
+        "//internal/platform/implementation:types",
         "//third_party/magic_enum",
         "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/status",
diff --git a/fastpair/retroactive/retroactive_pairing_detector_impl.cc b/fastpair/retroactive/retroactive_pairing_detector_impl.cc
index 40b4c579..5bcffb73 100644
--- a/fastpair/retroactive/retroactive_pairing_detector_impl.cc
+++ b/fastpair/retroactive/retroactive_pairing_detector_impl.cc
@@ -22,7 +22,7 @@
 
 #include "fastpair/internal/mediums/mediums.h"
 #include "fastpair/repository/fast_pair_repository.h"
-#include "internal/account/account_manager.h"
+#include "internal/platform/implementation/account_manager.h"
 
 namespace nearby {
 namespace fastpair {
diff --git a/fastpair/retroactive/retroactive_pairing_detector_impl.h b/fastpair/retroactive/retroactive_pairing_detector_impl.h
index 7c876f86..796fb347 100644
--- a/fastpair/retroactive/retroactive_pairing_detector_impl.h
+++ b/fastpair/retroactive/retroactive_pairing_detector_impl.h
@@ -19,9 +19,9 @@
 #include "fastpair/internal/mediums/mediums.h"
 #include "fastpair/repository/fast_pair_device_repository.h"
 #include "fastpair/retroactive/retroactive_pairing_detector.h"
-#include "internal/account/account_manager.h"
 #include "internal/base/observer_list.h"
 #include "internal/platform/bluetooth_classic.h"
+#include "internal/platform/implementation/account_manager.h"
 #include "internal/platform/single_thread_executor.h"
 
 namespace nearby {
diff --git a/fastpair/server_access/BUILD b/fastpair/server_access/BUILD
index 939df87f..8c22188a 100644
--- a/fastpair/server_access/BUILD
+++ b/fastpair/server_access/BUILD
@@ -32,7 +32,6 @@ cc_library(
         "//fastpair/common",
         "//fastpair/proto:fastpair_cc_proto",
         "//fastpair/proto:proto_to_json",
-        "//internal/account",
         "//internal/auth:credential",
         "//internal/auth:types",
         "//internal/base",
diff --git a/fastpair/server_access/fast_pair_client_impl.cc b/fastpair/server_access/fast_pair_client_impl.cc
index 21590686..515c65f1 100644
--- a/fastpair/server_access/fast_pair_client_impl.cc
+++ b/fastpair/server_access/fast_pair_client_impl.cc
@@ -27,7 +27,6 @@
 #include "absl/synchronization/notification.h"
 #include "fastpair/common/fast_pair_switches.h"
 #include "fastpair/server_access/fast_pair_http_notifier.h"
-#include "internal/account/account_manager.h"
 #include "internal/auth/auth_status_util.h"
 #include "internal/auth/authentication_manager.h"
 #include "internal/network/http_client.h"
@@ -35,6 +34,7 @@
 #include "internal/network/http_response.h"
 #include "internal/network/url.h"
 #include "internal/platform/device_info.h"
+#include "internal/platform/implementation/account_manager.h"
 #include "internal/platform/implementation/device_info.h"
 #include "internal/platform/logging.h"
 
diff --git a/fastpair/server_access/fast_pair_client_impl.h b/fastpair/server_access/fast_pair_client_impl.h
index d86e8276..f24a965d 100644
--- a/fastpair/server_access/fast_pair_client_impl.h
+++ b/fastpair/server_access/fast_pair_client_impl.h
@@ -24,11 +24,11 @@
 #include "absl/strings/string_view.h"
 #include "fastpair/server_access/fast_pair_client.h"
 #include "fastpair/server_access/fast_pair_http_notifier.h"
-#include "internal/account/account_manager.h"
 #include "internal/auth/authentication_manager.h"
 #include "internal/network/http_client.h"
 #include "internal/network/url.h"
 #include "internal/platform/device_info.h"
+#include "internal/platform/implementation/account_manager.h"
 
 namespace nearby {
 namespace fastpair {
diff --git a/internal/platform/implementation/windows/webrtc.h b/internal/platform/implementation/windows/webrtc.h
index 50f0b32f..ae9c76cf 100644
--- a/internal/platform/implementation/windows/webrtc.h
+++ b/internal/platform/implementation/windows/webrtc.h
@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include "internal/account/account_manager.h"
+#include "internal/platform/implementation/account_manager.h"
 #include "internal/platform/implementation/webrtc.h"
 
 namespace nearby {