diff --git a/tensorflow/compiler/mlir/tf2xla/internal/passes/input_lowering_metrics_pass.cc b/tensorflow/compiler/mlir/tf2xla/internal/passes/input_lowering_metrics_pass.cc
index bc0e25f505e11b..d6c92101bf608a 100644
--- a/tensorflow/compiler/mlir/tf2xla/internal/passes/input_lowering_metrics_pass.cc
+++ b/tensorflow/compiler/mlir/tf2xla/internal/passes/input_lowering_metrics_pass.cc
@@ -30,9 +30,7 @@ namespace internal {
 
 namespace {
 
-using llvm::DenseSet;
 using mlir::Operation;
-using mlir::TypeID;
 using mlir::WalkResult;
 
 #define GEN_PASS_DEF_INPUTLOWERINGMETRICSPASS
diff --git a/tensorflow/core/public/version.h b/tensorflow/core/public/version.h
index a202574fae39b6..73035e8d463d3e 100644
--- a/tensorflow/core/public/version.h
+++ b/tensorflow/core/public/version.h
@@ -108,7 +108,7 @@ limitations under the License.
 
 #define TF_GRAPH_DEF_VERSION_MIN_PRODUCER 0
 #define TF_GRAPH_DEF_VERSION_MIN_CONSUMER 0
-#define TF_GRAPH_DEF_VERSION 1847  // Updated: 2024/4/29
+#define TF_GRAPH_DEF_VERSION 1848  // Updated: 2024/4/30
 
 // Checkpoint compatibility versions (the versions field in SavedSliceMeta).
 //
diff --git a/tensorflow/python/compat/compat.py b/tensorflow/python/compat/compat.py
index 8cd23b7fe98372..bd190f77463601 100644
--- a/tensorflow/python/compat/compat.py
+++ b/tensorflow/python/compat/compat.py
@@ -29,7 +29,7 @@
 # This value changes every day with an automatic CL. It can be modified in code
 # via `forward_compatibility_horizon()` or with the environment variable
 # TF_FORWARD_COMPATIBILITY_DELTA_DAYS, which is added to the compatibility date.
-_FORWARD_COMPATIBILITY_HORIZON = datetime.date(2024, 4, 29)
+_FORWARD_COMPATIBILITY_HORIZON = datetime.date(2024, 4, 30)
 _FORWARD_COMPATIBILITY_DELTA_DAYS_VAR_NAME = "TF_FORWARD_COMPATIBILITY_DELTA_DAYS"
 _FORWARD_COMPATIBILITY_DATE_NUMBER = None
 
diff --git a/third_party/xla/xla/service/gpu/BUILD b/third_party/xla/xla/service/gpu/BUILD
index bbad515519f309..c19aef4db0daa5 100644
--- a/third_party/xla/xla/service/gpu/BUILD
+++ b/third_party/xla/xla/service/gpu/BUILD
@@ -4323,6 +4323,7 @@ xla_cc_test(
 cuda_library(
     name = "stream_executor_util_kernel",
     srcs = if_cuda_is_configured(["stream_executor_util_kernel.cu.cc"]),
+    deps = ["@local_config_cuda//cuda:cuda_headers"],
 )
 
 cc_library(