diff --git a/internal/platform/credential_storage_impl_test.cc b/internal/platform/credential_storage_impl_test.cc
index 799718c5..2ad5e4dc 100644
--- a/internal/platform/credential_storage_impl_test.cc
+++ b/internal/platform/credential_storage_impl_test.cc
@@ -25,7 +25,6 @@
 #include "absl/strings/string_view.h"
 #include "internal/platform/implementation/credential_callbacks.h"
 #include "internal/proto/credential.pb.h"
-#include "internal/proto/credential.proto.h"
 
 namespace location {
 namespace nearby {
diff --git a/internal/platform/implementation/g3/credential_storage_impl.h b/internal/platform/implementation/g3/credential_storage_impl.h
index 7e4287a7..cac689a1 100644
--- a/internal/platform/implementation/g3/credential_storage_impl.h
+++ b/internal/platform/implementation/g3/credential_storage_impl.h
@@ -26,7 +26,7 @@
 #include "absl/synchronization/mutex.h"
 #include "internal/platform/implementation/credential_callbacks.h"
 #include "internal/platform/implementation/credential_storage.h"
-#include "internal/proto/credential.proto.h"
+#include "internal/proto/credential.pb.h"
 
 namespace location {
 namespace nearby {
diff --git a/presence/implementation/advertisement_decoder.cc b/presence/implementation/advertisement_decoder.cc
index 3e42d79e..ed40a333 100644
--- a/presence/implementation/advertisement_decoder.cc
+++ b/presence/implementation/advertisement_decoder.cc
@@ -26,7 +26,7 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "internal/platform/logging.h"
-#include "internal/proto/credential.proto.h"
+#include "internal/proto/credential.pb.h"
 #include "presence/data_element.h"
 #include "presence/implementation/action_factory.h"
 #include "presence/implementation/base_broadcast_request.h"
diff --git a/presence/implementation/credential_manager_impl_test.cc b/presence/implementation/credential_manager_impl_test.cc
index e625d3e2..ecdf570b 100644
--- a/presence/implementation/credential_manager_impl_test.cc
+++ b/presence/implementation/credential_manager_impl_test.cc
@@ -28,7 +28,6 @@
 #include "internal/platform/credential_storage_impl.h"
 #include "internal/platform/implementation/crypto.h"
 #include "internal/proto/credential.pb.h"
-#include "internal/proto/credential.proto.h"
 
 namespace nearby {
 namespace presence {
diff --git a/presence/presence_device_test.cc b/presence/presence_device_test.cc
index 940cbe44..a682f302 100644
--- a/presence/presence_device_test.cc
+++ b/presence/presence_device_test.cc
@@ -22,7 +22,7 @@
 #include "absl/types/variant.h"
 #include "internal/platform/bluetooth_connection_info.h"
 #include "internal/platform/logging.h"
-#include "internal/proto/device_metadata.proto.h"
+#include "internal/proto/device_metadata.pb.h"
 
 namespace nearby {
 namespace presence {