diff --git a/xla/service/gpu/transforms/BUILD b/xla/service/gpu/transforms/BUILD
index c7c972a73653b..d23b735d82ae1 100644
--- a/xla/service/gpu/transforms/BUILD
+++ b/xla/service/gpu/transforms/BUILD
@@ -30,6 +30,7 @@ cc_library(
         "//xla:xla_data_proto_cc",
         "//xla/hlo/ir:hlo",
         "//xla/hlo/pass:hlo_pass",
+        "//xla/hlo/transforms:algebraic_simplifier",
         "//xla/service:algebraic_simplifier",
         "//xla/service:pattern_matcher",
         "//xla/service/gpu:matmul_utils",
@@ -51,6 +52,7 @@ xla_cc_test(
     deps = [
         ":algebraic_simplifier",
         "//xla/hlo/ir:hlo",
+        "//xla/hlo/transforms:algebraic_simplifier",
         "//xla/service:algebraic_simplifier",
         "//xla/service:pattern_matcher",
         "//xla/service:pattern_matcher_gmock",
@@ -699,6 +701,7 @@ cc_library(
     hdrs = ["convert_async_collectives_to_sync.h"],
     deps = [
         "//xla/hlo/ir:hlo",
+        "//xla/hlo/transforms:convert_async_collectives_to_sync",
         "//xla/service:convert_async_collectives_to_sync",
         "//xla/service/gpu:backend_configs_cc",
         "@com_google_absl//absl/container:flat_hash_map",
@@ -1398,6 +1401,7 @@ cc_library(
         "//xla:shape_util",
         "//xla:util",
         "//xla/hlo/ir:hlo",
+        "//xla/hlo/transforms:op_expander_pass",
         "//xla/service:op_expander_pass",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings:string_view",
@@ -1479,6 +1483,7 @@ cc_library(
         "//xla/hlo/ir:hlo_instruction_utils",
         "//xla/hlo/parser:hlo_parser",
         "//xla/hlo/pass:hlo_pass",
+        "//xla/hlo/transforms:flatten_call_graph",
         "//xla/hlo/utils:hlo_query",
         "//xla/service:collective_ops_utils",
         "//xla/service:flatten_call_graph",
@@ -1955,6 +1960,7 @@ cc_library(
         "//xla:xla_data_proto_cc",
         "//xla/hlo/ir:hlo",
         "//xla/hlo/pass:hlo_pass",
+        "//xla/hlo/transforms:sub_byte_normalization",
         "//xla/service:hlo_creation_utils",
         "//xla/service:sub_byte_normalization",
         "//xla/service/gpu:gpu_fusible",
@@ -2823,6 +2829,7 @@ cc_library(
         "//xla:xla_data_proto_cc",
         "//xla/hlo/ir:hlo",
         "//xla/hlo/pass:hlo_pass",
+        "//xla/hlo/transforms:stable_sort_expander",
         "//xla/service:stable_sort_expander",
         "//xla/service/gpu:cublas_cudnn",
         "//xla/service/gpu/runtime:cub_sort_thunk",
diff --git a/xla/service/gpu/transforms/algebraic_simplifier.cc b/xla/service/gpu/transforms/algebraic_simplifier.cc
index 954017fba4ede..48250f8c3576f 100644
--- a/xla/service/gpu/transforms/algebraic_simplifier.cc
+++ b/xla/service/gpu/transforms/algebraic_simplifier.cc
@@ -21,7 +21,7 @@ limitations under the License.
 #include "xla/hlo/ir/hlo_instruction.h"
 #include "xla/hlo/ir/hlo_instructions.h"
 #include "xla/hlo/ir/hlo_opcode.h"
-#include "xla/service/algebraic_simplifier.h"
+#include "xla/hlo/transforms/simplifiers/algebraic_simplifier.h"
 #include "xla/service/gpu/fusions/triton/triton_support_legacy.h"
 #include "xla/service/gpu/matmul_utils.h"
 #include "xla/service/pattern_matcher.h"
diff --git a/xla/service/gpu/transforms/algebraic_simplifier.h b/xla/service/gpu/transforms/algebraic_simplifier.h
index 56f3aa814f759..1e12c81f758a5 100644
--- a/xla/service/gpu/transforms/algebraic_simplifier.h
+++ b/xla/service/gpu/transforms/algebraic_simplifier.h
@@ -24,6 +24,7 @@ limitations under the License.
 #include "absl/strings/string_view.h"
 #include "xla/hlo/ir/hlo_instruction.h"
 #include "xla/hlo/pass/hlo_pass_interface.h"
+#include "xla/hlo/transforms/simplifiers/algebraic_simplifier.h"
 #include "xla/service/algebraic_simplifier.h"
 #include "xla/stream_executor/device_description.h"
 #include "xla/util.h"
diff --git a/xla/service/gpu/transforms/algebraic_simplifier_test.cc b/xla/service/gpu/transforms/algebraic_simplifier_test.cc
index db74d98ac01cb..686b2e15d7a58 100644
--- a/xla/service/gpu/transforms/algebraic_simplifier_test.cc
+++ b/xla/service/gpu/transforms/algebraic_simplifier_test.cc
@@ -20,7 +20,7 @@ limitations under the License.
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "xla/hlo/ir/hlo_instruction.h"
-#include "xla/service/algebraic_simplifier.h"
+#include "xla/hlo/transforms/simplifiers/algebraic_simplifier.h"
 #include "xla/service/pattern_matcher.h"
 #include "xla/service/pattern_matcher_gmock.h"
 #include "xla/stream_executor/device_description.h"
diff --git a/xla/service/gpu/transforms/convert_async_collectives_to_sync.h b/xla/service/gpu/transforms/convert_async_collectives_to_sync.h
index 6507080a5fa49..bee8dd6303b44 100644
--- a/xla/service/gpu/transforms/convert_async_collectives_to_sync.h
+++ b/xla/service/gpu/transforms/convert_async_collectives_to_sync.h
@@ -23,6 +23,7 @@ limitations under the License.
 #include "absl/types/span.h"
 #include "xla/hlo/ir/hlo_computation.h"
 #include "xla/hlo/ir/hlo_instruction.h"
+#include "xla/hlo/transforms/collectives/convert_async_collectives_to_sync.h"
 #include "xla/service/convert_async_collectives_to_sync.h"
 
 namespace xla {
diff --git a/xla/service/gpu/transforms/dot_operand_converter.h b/xla/service/gpu/transforms/dot_operand_converter.h
index b269bed8b6a6f..7b428a44b9a95 100644
--- a/xla/service/gpu/transforms/dot_operand_converter.h
+++ b/xla/service/gpu/transforms/dot_operand_converter.h
@@ -21,6 +21,7 @@ limitations under the License.
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "xla/hlo/ir/hlo_instruction.h"
+#include "xla/hlo/transforms/expanders/op_expander_pass.h"
 #include "xla/service/op_expander_pass.h"
 #include "xla/util.h"
 
diff --git a/xla/service/gpu/transforms/double_buffer_loop_unrolling.cc b/xla/service/gpu/transforms/double_buffer_loop_unrolling.cc
index bd72929e47abd..7d217aac5674e 100644
--- a/xla/service/gpu/transforms/double_buffer_loop_unrolling.cc
+++ b/xla/service/gpu/transforms/double_buffer_loop_unrolling.cc
@@ -39,9 +39,9 @@ limitations under the License.
 #include "xla/hlo/ir/hlo_module.h"
 #include "xla/hlo/ir/hlo_opcode.h"
 #include "xla/hlo/parser/hlo_parser.h"
+#include "xla/hlo/transforms/simplifiers/flatten_call_graph.h"
 #include "xla/hlo/utils/hlo_query.h"
 #include "xla/service/collective_ops_utils.h"
-#include "xla/service/flatten_call_graph.h"
 #include "xla/status_macros.h"
 #include "xla/util.h"
 #include "xla/xla_data.pb.h"
diff --git a/xla/service/gpu/transforms/horizontal_loop_fusion.cc b/xla/service/gpu/transforms/horizontal_loop_fusion.cc
index dcaf656744c35..67fbb4c2970ef 100644
--- a/xla/service/gpu/transforms/horizontal_loop_fusion.cc
+++ b/xla/service/gpu/transforms/horizontal_loop_fusion.cc
@@ -37,11 +37,11 @@ limitations under the License.
 #include "xla/hlo/ir/hlo_instruction.h"
 #include "xla/hlo/ir/hlo_instructions.h"
 #include "xla/hlo/ir/hlo_opcode.h"
+#include "xla/hlo/transforms/simplifiers/sub_byte_normalization.h"
 #include "xla/layout_util.h"
 #include "xla/primitive_util.h"
 #include "xla/service/gpu/gpu_fusible.h"
 #include "xla/service/hlo_creation_utils.h"
-#include "xla/service/sub_byte_normalization.h"
 #include "xla/shape.h"
 #include "xla/shape_util.h"
 #include "xla/util.h"
diff --git a/xla/service/gpu/transforms/sort_rewriter.cc b/xla/service/gpu/transforms/sort_rewriter.cc
index eb34bbd01911c..8c47ecb1b605d 100644
--- a/xla/service/gpu/transforms/sort_rewriter.cc
+++ b/xla/service/gpu/transforms/sort_rewriter.cc
@@ -32,9 +32,9 @@ limitations under the License.
 #include "xla/hlo/ir/hlo_instructions.h"
 #include "xla/hlo/ir/hlo_module.h"
 #include "xla/hlo/ir/hlo_opcode.h"
+#include "xla/hlo/transforms/expanders/stable_sort_expander.h"
 #include "xla/service/gpu/cublas_cudnn.h"
 #include "xla/service/gpu/runtime/cub_sort_thunk.h"
-#include "xla/service/stable_sort_expander.h"
 #include "xla/shape.h"
 #include "xla/shape_util.h"
 #include "xla/util.h"