diff --git a/extension/flat_tensor/targets.bzl b/extension/flat_tensor/targets.bzl
index 4ac515b7bf0..3bc36dad9d4 100644
--- a/extension/flat_tensor/targets.bzl
+++ b/extension/flat_tensor/targets.bzl
@@ -21,6 +21,6 @@ def define_common_targets():
                 "//executorch/extension/flat_tensor/serialize:generated_headers",
             ],
             visibility = [
-                "//executorch/...",
+                "@EXECUTORCH_CLIENTS",
             ],
         )
diff --git a/runtime/core/named_data_map.h b/runtime/core/named_data_map.h
index 7503f0b2979..c6b6aa4bb7b 100644
--- a/runtime/core/named_data_map.h
+++ b/runtime/core/named_data_map.h
@@ -8,12 +8,6 @@
 
 #pragma once
 
-#ifdef __GNUC__
-// Disable -Wdeprecated-declarations, as some builds use 'Werror'.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
 #include <executorch/runtime/core/freeable_buffer.h>
 #include <executorch/runtime/core/result.h>
@@ -27,7 +21,7 @@ namespace ET_RUNTIME_NAMESPACE {
  * Interface to access and retrieve data via name.
  * See executorch/extension/flat_tensor/ for an example.
  */
-class ET_EXPERIMENTAL NamedDataMap {
+class NamedDataMap {
  public:
   virtual ~NamedDataMap() = default;
   /**
@@ -81,7 +75,3 @@ class ET_EXPERIMENTAL NamedDataMap {
 
 } // namespace ET_RUNTIME_NAMESPACE
 } // namespace executorch
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
diff --git a/runtime/core/tensor_layout.h b/runtime/core/tensor_layout.h
index 42131e6506e..ce445df3bd0 100644
--- a/runtime/core/tensor_layout.h
+++ b/runtime/core/tensor_layout.h
@@ -19,7 +19,7 @@ namespace ET_RUNTIME_NAMESPACE {
 /**
  * Describes the layout of a tensor.
  */
-class ET_EXPERIMENTAL TensorLayout final {
+class TensorLayout final {
  public:
   TensorLayout() = delete;
 
diff --git a/runtime/executor/program.h b/runtime/executor/program.h
index 9670fd7c79f..768928a465c 100644
--- a/runtime/executor/program.h
+++ b/runtime/executor/program.h
@@ -8,12 +8,6 @@
 
 #pragma once
 
-#ifdef __GNUC__
-// Disable -Wdeprecated-declarations, as some builds use 'Werror'.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
 #include <cinttypes>
 #include <cstdint>
 #include <optional>
@@ -322,7 +316,3 @@ namespace executor {
 using ::executorch::ET_RUNTIME_NAMESPACE::Program;
 } // namespace executor
 } // namespace torch
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif