diff --git a/xla/pjrt/gpu/BUILD b/xla/pjrt/gpu/BUILD
index c4d0de07ffd7d..8d5a80e12d929 100644
--- a/xla/pjrt/gpu/BUILD
+++ b/xla/pjrt/gpu/BUILD
@@ -749,7 +749,9 @@ cc_library(
         "//xla/pjrt:pjrt_abi_version",
         "//xla/pjrt:pjrt_common",
         "//xla/pjrt:stream_executor_pjrt_abi_version",
+        "//xla/pjrt/proto:pjrt_abi_version_proto_cc",
         "//xla/stream_executor/abi:runtime_abi_version",
+        "//xla/stream_executor/abi:runtime_abi_version_proto_cc",
         "//xla/stream_executor/abi:runtime_abi_version_resolver",
         "//xla/tsl/platform:status_macros",
         "@com_google_absl//absl/base:nullability",
@@ -765,8 +767,11 @@ xla_cc_test(
         ":se_gpu_pjrt_runtime_abi_version",
         "//xla/pjrt:pjrt_common",
         "//xla/pjrt:stream_executor_pjrt_abi_version",
+        "//xla/pjrt/proto:pjrt_abi_version_proto_cc",
         "//xla/stream_executor/abi:executable_abi_version",
+        "//xla/stream_executor/abi:executable_abi_version_proto_cc",
         "//xla/stream_executor/abi:mock_runtime_abi_version",
+        "//xla/stream_executor/abi:runtime_abi_version_proto_cc",
         "//xla/tsl/util/proto:proto_matchers",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:status_matchers",
diff --git a/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version.cc b/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version.cc
index cc0b2e24dfa5d..6b8acd6122270 100644
--- a/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version.cc
+++ b/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version.cc
@@ -21,8 +21,10 @@ limitations under the License.
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "xla/pjrt/pjrt_abi_version.h"
+#include "xla/pjrt/proto/pjrt_abi_version.pb.h"
 #include "xla/pjrt/stream_executor_pjrt_abi_version.h"
 #include "xla/stream_executor/abi/runtime_abi_version.h"
+#include "xla/stream_executor/abi/runtime_abi_version.pb.h"
 #include "xla/stream_executor/abi/runtime_abi_version_resolver.h"
 #include "xla/tsl/platform/status_macros.h"
 
diff --git a/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version.h b/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version.h
index 6bf5e78f54039..b7faa2b41c4a8 100644
--- a/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version.h
+++ b/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version.h
@@ -24,6 +24,7 @@ limitations under the License.
 #include "absl/status/statusor.h"
 #include "xla/pjrt/pjrt_abi_version.h"
 #include "xla/pjrt/pjrt_common.h"
+#include "xla/pjrt/proto/pjrt_abi_version.pb.h"
 #include "xla/stream_executor/abi/runtime_abi_version.h"
 #include "xla/stream_executor/abi/runtime_abi_version_resolver.h"
 
diff --git a/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version_test.cc b/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version_test.cc
index 7ffb904d85c7a..ebb92b0ad93a6 100644
--- a/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version_test.cc
+++ b/xla/pjrt/gpu/se_gpu_pjrt_runtime_abi_version_test.cc
@@ -23,9 +23,12 @@ limitations under the License.
 #include "absl/status/status.h"
 #include "absl/status/status_matchers.h"
 #include "xla/pjrt/pjrt_common.h"
+#include "xla/pjrt/proto/pjrt_abi_version.pb.h"
 #include "xla/pjrt/stream_executor_pjrt_abi_version.h"
 #include "xla/stream_executor/abi/executable_abi_version.h"
+#include "xla/stream_executor/abi/executable_abi_version.pb.h"
 #include "xla/stream_executor/abi/mock_runtime_abi_version.h"
+#include "xla/stream_executor/abi/runtime_abi_version.pb.h"
 #include "xla/tsl/util/proto/proto_matchers.h"
 
 namespace xla {