diff --git a/codegen/test/BUCK b/codegen/test/BUCK
index 1e8cc179228..56dd9b231dc 100644
--- a/codegen/test/BUCK
+++ b/codegen/test/BUCK
@@ -1,8 +1,19 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
+oncall("executorch")
+# Any targets that should be shared between fbcode and xplat must be defined in
+# targets.bzl. This file can contain xplat-only targets.
+
+load(":targets.bzl", "define_common_targets")
+
+
+non_fbcode_target(_kind = define_common_targets,)
+
+# !!!! fbcode/executorch/codegen/test/TARGETS was merged into this file, see https://fburl.com/workplace/xl8l9yuo for more info !!!!
+
 # Any targets that should be shared between fbcode and xplat must be defined in
 # targets.bzl. This file can contain xplat-only targets.
 
 load(":targets.bzl", "define_common_targets")
 
-oncall("executorch")
 
-define_common_targets()
+fbcode_target(_kind = define_common_targets,)
diff --git a/codegen/test/TARGETS b/codegen/test/TARGETS
deleted file mode 100644
index 1e8cc179228..00000000000
--- a/codegen/test/TARGETS
+++ /dev/null
@@ -1,8 +0,0 @@
-# Any targets that should be shared between fbcode and xplat must be defined in
-# targets.bzl. This file can contain xplat-only targets.
-
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
diff --git a/codegen/tools/BUCK b/codegen/tools/BUCK
index 1e8cc179228..85546a21e03 100644
--- a/codegen/tools/BUCK
+++ b/codegen/tools/BUCK
@@ -1,8 +1,16 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
+oncall("executorch")
 # Any targets that should be shared between fbcode and xplat must be defined in
 # targets.bzl. This file can contain xplat-only targets.
 
 load(":targets.bzl", "define_common_targets")
 
-oncall("executorch")
 
-define_common_targets()
+non_fbcode_target(_kind = define_common_targets,)
+
+# !!!! fbcode/executorch/codegen/tools/TARGETS was merged into this file, see https://fburl.com/workplace/xl8l9yuo for more info !!!!
+
+load(":targets.bzl", "define_common_targets")
+
+
+fbcode_target(_kind = define_common_targets,is_fbcode = True)
diff --git a/codegen/tools/TARGETS b/codegen/tools/TARGETS
deleted file mode 100644
index e84397dc20e..00000000000
--- a/codegen/tools/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets(is_fbcode = True)