diff --git a/tensorflow_federated/cc/core/impl/executors/BUILD b/tensorflow_federated/cc/core/impl/executors/BUILD
index 57f1c05d7c..9c8a2be56d 100644
--- a/tensorflow_federated/cc/core/impl/executors/BUILD
+++ b/tensorflow_federated/cc/core/impl/executors/BUILD
@@ -1150,7 +1150,7 @@ cc_library(
         "@org_tensorflow//tensorflow/compiler/xla:xla_proto_cc",
         "@org_tensorflow//tensorflow/compiler/xla/client",
         "@org_tensorflow//tensorflow/compiler/xla/client:client_library",
-        "@org_tensorflow//tensorflow/compiler/xla/client:xla_computation",
+        "@org_tensorflow//tensorflow/compiler/xla/hlo/builder:xla_computation",
         "@org_tensorflow//tensorflow/compiler/xla/service",
         "@org_tensorflow//tensorflow/compiler/xla/service:hlo_proto_cc",
         "@org_tensorflow//tensorflow/compiler/xla/stream_executor",
@@ -1187,8 +1187,8 @@ tff_cc_cpu_gpu_test(
         "@org_tensorflow//tensorflow/compiler/tf2xla:common",
         "@org_tensorflow//tensorflow/compiler/xla:shape_util",
         "@org_tensorflow//tensorflow/compiler/xla:xla_data_proto_cc",
-        "@org_tensorflow//tensorflow/compiler/xla/client:xla_builder",
-        "@org_tensorflow//tensorflow/compiler/xla/client:xla_computation",
+        "@org_tensorflow//tensorflow/compiler/xla/hlo/builder:xla_builder",
+        "@org_tensorflow//tensorflow/compiler/xla/hlo/builder:xla_computation",
         "@org_tensorflow//tensorflow/compiler/xla/service:platform_util",
         "@org_tensorflow//tensorflow/compiler/xla/stream_executor",
         "@org_tensorflow//tensorflow/core:framework",
@@ -1225,8 +1225,8 @@ cc_test(
         "@org_tensorflow//tensorflow/compiler/tf2xla:common",
         "@org_tensorflow//tensorflow/compiler/xla:shape_util",
         "@org_tensorflow//tensorflow/compiler/xla:xla_data_proto_cc",
-        "@org_tensorflow//tensorflow/compiler/xla/client:xla_builder",
-        "@org_tensorflow//tensorflow/compiler/xla/client:xla_computation",
+        "@org_tensorflow//tensorflow/compiler/xla/hlo/builder:xla_builder",
+        "@org_tensorflow//tensorflow/compiler/xla/hlo/builder:xla_computation",
         "@org_tensorflow//tensorflow/compiler/xla/service:platform_util",
         "@org_tensorflow//tensorflow/compiler/xla/stream_executor",
         "@org_tensorflow//tensorflow/compiler/xla/stream_executor/cuda:cuda_platform",  # buildcleaner: keep # Linking in the host platform here ensures that the stream executor can execute on GPU.
diff --git a/tensorflow_federated/cc/core/impl/executors/xla_executor.cc b/tensorflow_federated/cc/core/impl/executors/xla_executor.cc
index 757c8e8d3b..28b5f86b77 100644
--- a/tensorflow_federated/cc/core/impl/executors/xla_executor.cc
+++ b/tensorflow_federated/cc/core/impl/executors/xla_executor.cc
@@ -35,7 +35,7 @@ limitations under the License
 #include "tensorflow/compiler/tf2xla/type_util.h"
 #include "tensorflow/compiler/xla/client/client.h"
 #include "tensorflow/compiler/xla/client/client_library.h"
-#include "tensorflow/compiler/xla/client/xla_computation.h"
+#include "tensorflow/compiler/xla/hlo/builder/xla_computation.h"
 #include "tensorflow/compiler/xla/literal.h"
 #include "tensorflow/compiler/xla/service/hlo.pb.h"
 #include "tensorflow/compiler/xla/service/service.h"
diff --git a/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc b/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc
index 7150bad17a..e693446743 100644
--- a/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc
+++ b/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc
@@ -32,8 +32,8 @@ limitations under the License
 #include "absl/status/statusor.h"
 #include "tensorflow/compiler/tf2xla/shape_util.h"
 #include "tensorflow/compiler/tf2xla/type_util.h"
-#include "tensorflow/compiler/xla/client/xla_builder.h"
-#include "tensorflow/compiler/xla/client/xla_computation.h"
+#include "tensorflow/compiler/xla/hlo/builder/xla_builder.h"
+#include "tensorflow/compiler/xla/hlo/builder/xla_computation.h"
 #include "tensorflow/compiler/xla/service/platform_util.h"
 #include "tensorflow/compiler/xla/shape.h"
 #include "tensorflow/compiler/xla/shape_util.h"