diff --git a/cpp/core/internal/base_endpoint_channel.h b/cpp/core/internal/base_endpoint_channel.h
index da6fabf3..e14067ec 100644
--- a/cpp/core/internal/base_endpoint_channel.h
+++ b/cpp/core/internal/base_endpoint_channel.h
@@ -29,7 +29,7 @@
 #include "platform/public/condition_variable.h"
 #include "platform/public/mutex.h"
 #include "platform/public/system_clock.h"
-#include "analytics/analytics_recorder.h"
+#include "internal/analytics/analytics_recorder.h"
 
 namespace location {
 namespace nearby {
diff --git a/cpp/core/internal/client_proxy.h b/cpp/core/internal/client_proxy.h
index 7522b10a..335adb77 100644
--- a/cpp/core/internal/client_proxy.h
+++ b/cpp/core/internal/client_proxy.h
@@ -30,7 +30,7 @@
 #include "platform/base/prng.h"
 #include "platform/public/cancelable_alarm.h"
 #include "platform/public/mutex.h"
-#include "analytics/analytics_recorder.h"
+#include "internal/analytics/analytics_recorder.h"
 // Prefer using absl:: versions of a set and a map; they tend to be more
 // efficient: implementation is using open-addressing hash tables.
 #include "absl/container/flat_hash_map.h"
diff --git a/cpp/core/internal/endpoint_channel.h b/cpp/core/internal/endpoint_channel.h
index b474aeee..57d4657c 100644
--- a/cpp/core/internal/endpoint_channel.h
+++ b/cpp/core/internal/endpoint_channel.h
@@ -23,7 +23,7 @@
 #include "platform/base/byte_array.h"
 #include "platform/base/exception.h"
 #include "platform/public/mutex.h"
-#include "analytics/analytics_recorder.h"
+#include "internal/analytics/analytics_recorder.h"
 #include "proto/connections_enums.pb.h"
 
 namespace location {
diff --git a/internal/analytics/analytics_recorder.cc b/internal/analytics/analytics_recorder.cc
index a79d8b08..8c757b71 100644
--- a/internal/analytics/analytics_recorder.cc
+++ b/internal/analytics/analytics_recorder.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "analytics/analytics_recorder.h"
+#include "internal/analytics/analytics_recorder.h"
 
 #include <string>
 #include <utility>
diff --git a/internal/analytics/analytics_recorder.h b/internal/analytics/analytics_recorder.h
index 91c38a3c..8ce70854 100644
--- a/internal/analytics/analytics_recorder.h
+++ b/internal/analytics/analytics_recorder.h
@@ -25,7 +25,7 @@
 #include "platform/base/error_code_params.h"
 #include "platform/public/mutex.h"
 #include "platform/public/single_thread_executor.h"
-#include "analytics/connection_attempt_metadata_params.h"
+#include "internal/analytics/connection_attempt_metadata_params.h"
 #include "proto/analytics/connections_log.pb.h"
 #include "proto/connections_enums.pb.h"
 
diff --git a/internal/analytics/analytics_recorder_test.cc b/internal/analytics/analytics_recorder_test.cc
index 3239ec40..c2053eec 100644
--- a/internal/analytics/analytics_recorder_test.cc
+++ b/internal/analytics/analytics_recorder_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "analytics/analytics_recorder.h"
+#include "internal/analytics/analytics_recorder.h"
 
 #include <string>
 #include <utility>
@@ -24,7 +24,7 @@
 #include "platform/base/error_code_recorder.h"
 #include "platform/public/count_down_latch.h"
 #include "platform/public/logging.h"
-#include "analytics/connection_attempt_metadata_params.h"
+#include "internal/analytics/connection_attempt_metadata_params.h"
 #include "proto/analytics/connections_log.pb.h"
 #include "proto/connections_enums.pb.h"