diff --git a/cpp/analytics/analytics_recorder.cc b/cpp/analytics/analytics_recorder.cc
index ae562070..9c34fa99 100644
--- a/cpp/analytics/analytics_recorder.cc
+++ b/cpp/analytics/analytics_recorder.cc
@@ -21,8 +21,8 @@
 #include "platform/public/logging.h"
 #include "platform/public/mutex_lock.h"
 #include "platform/public/system_clock.h"
-#include "proto/analytics/connections_log.proto.h"
-#include "proto/connections_enums.proto.h"
+#include "proto/analytics/connections_log.pb.h"
+#include "proto/connections_enums.pb.h"
 
 namespace location {
 namespace nearby {
diff --git a/cpp/analytics/analytics_recorder.h b/cpp/analytics/analytics_recorder.h
index b2416f54..8bd64045 100644
--- a/cpp/analytics/analytics_recorder.h
+++ b/cpp/analytics/analytics_recorder.h
@@ -25,8 +25,8 @@
 #include "platform/base/error_code_params.h"
 #include "platform/public/mutex.h"
 #include "platform/public/single_thread_executor.h"
-#include "proto/analytics/connections_log.proto.h"
-#include "proto/connections_enums.proto.h"
+#include "proto/analytics/connections_log.pb.h"
+#include "proto/connections_enums.pb.h"
 
 namespace location {
 namespace nearby {
diff --git a/cpp/analytics/analytics_recorder_test.cc b/cpp/analytics/analytics_recorder_test.cc
index 5690655e..9e76df4d 100644
--- a/cpp/analytics/analytics_recorder_test.cc
+++ b/cpp/analytics/analytics_recorder_test.cc
@@ -24,8 +24,8 @@
 #include "platform/base/error_code_recorder.h"
 #include "platform/public/count_down_latch.h"
 #include "platform/public/logging.h"
-#include "proto/analytics/connections_log.proto.h"
-#include "proto/connections_enums.proto.h"
+#include "proto/analytics/connections_log.pb.h"
+#include "proto/connections_enums.pb.h"
 
 namespace location {
 namespace nearby {
diff --git a/cpp/core/event_logger.h b/cpp/core/event_logger.h
index 80ec2ee7..3602c5a5 100644
--- a/cpp/core/event_logger.h
+++ b/cpp/core/event_logger.h
@@ -15,7 +15,7 @@
 #ifndef CORE_EVENT_LOGGER_H_
 #define CORE_EVENT_LOGGER_H_
 
-#include "proto/analytics/connections_log.proto.h"
+#include "proto/analytics/connections_log.pb.h"
 
 namespace location {
 namespace nearby {
diff --git a/cpp/core/internal/bwu_manager.cc b/cpp/core/internal/bwu_manager.cc
index 41d6d89c..101925d6 100644
--- a/cpp/core/internal/bwu_manager.cc
+++ b/cpp/core/internal/bwu_manager.cc
@@ -27,7 +27,7 @@
 #include "platform/base/byte_array.h"
 #include "platform/base/feature_flags.h"
 #include "platform/public/count_down_latch.h"
-#include "proto/connections_enums.proto.h"
+#include "proto/connections_enums.pb.h"
 
 namespace location {
 namespace nearby {
diff --git a/cpp/platform/base/error_code_params.h b/cpp/platform/base/error_code_params.h
index feb47d03..73709a77 100644
--- a/cpp/platform/base/error_code_params.h
+++ b/cpp/platform/base/error_code_params.h
@@ -15,8 +15,8 @@
 #ifndef PLATFORM_BASE_ERROR_CORE_PARAMS_H_
 #define PLATFORM_BASE_ERROR_CORE_PARAMS_H_
 
-#include "proto/connections_enums.proto.h"
-#include "proto/errorcode/error_code_enums.proto.h"
+#include "proto/connections_enums.pb.h"
+#include "proto/errorcode/error_code_enums.pb.h"
 
 namespace location {
 namespace nearby {
diff --git a/cpp/platform/base/error_code_recorder.cc b/cpp/platform/base/error_code_recorder.cc
index fad626bb..b85017f5 100644
--- a/cpp/platform/base/error_code_recorder.cc
+++ b/cpp/platform/base/error_code_recorder.cc
@@ -15,7 +15,7 @@
 #include "platform/base/error_code_recorder.h"
 
 #include "platform/base/logging.h"
-#include "proto/errorcode/error_code_enums.proto.h"
+#include "proto/errorcode/error_code_enums.pb.h"
 
 namespace location {
 namespace nearby {
diff --git a/proto/analytics/connections_log_test.cc b/proto/analytics/connections_log_test.cc
index 621d28fb..6e05f9b6 100644
--- a/proto/analytics/connections_log_test.cc
+++ b/proto/analytics/connections_log_test.cc
@@ -16,8 +16,8 @@
 #include "google/protobuf/descriptor.h"
 #include "gtest/gtest.h"
 #include "platform/public/logging.h"
-#include "proto/analytics/connections_log.proto.h"
-#include "proto/connections_enums.proto.h"
+#include "proto/analytics/connections_log.pb.h"
+#include "proto/connections_enums.pb.h"
 
 namespace location {
 namespace nearby {