diff --git a/runtime/executor/targets.bzl b/runtime/executor/targets.bzl
index c5d07448a06..6cdc5741c66 100644
--- a/runtime/executor/targets.bzl
+++ b/runtime/executor/targets.bzl
@@ -1,3 +1,4 @@
+load("@fbsource//xplat/executorch/build:build_variables.bzl", "PROGRAM_NO_PRIM_OPS_SRCS")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
 
 def _program_preprocessor_flags():
@@ -58,11 +59,7 @@ def define_common_targets():
 
         runtime.cxx_library(
             name = "program_no_prim_ops" + aten_suffix,
-            srcs = [
-                "method.cpp",
-                "method_meta.cpp",
-                "program.cpp",
-                "tensor_parser_exec_aten.cpp",
+            srcs = PROGRAM_NO_PRIM_OPS_SRCS + [
                 "tensor_parser{}.cpp".format(aten_suffix if aten_mode else "_portable"),
             ],
             headers = [
diff --git a/shim_et/xplat/executorch/build/build_variables.bzl b/shim_et/xplat/executorch/build/build_variables.bzl
index 8f89e6b5267..d35ed0846ce 100644
--- a/shim_et/xplat/executorch/build/build_variables.bzl
+++ b/shim_et/xplat/executorch/build/build_variables.bzl
@@ -32,7 +32,14 @@ EXECUTORCH_SRCS = [
     "kernels/prim_ops/register_prim_ops.cpp",
 ]
 
-EXECUTORCH_CORE_SRCS = [
+PROGRAM_NO_PRIM_OPS_SRCS = [
+    "method.cpp",
+    "method_meta.cpp",
+    "program.cpp",
+    "tensor_parser_exec_aten.cpp",
+]
+
+EXECUTORCH_CORE_SRCS = sorted([
     "runtime/backend/interface.cpp",
     "runtime/core/evalue.cpp",
     "runtime/core/exec_aten/util/tensor_shape_to_c_string.cpp",
@@ -40,10 +47,6 @@ EXECUTORCH_CORE_SRCS = [
     "runtime/core/portable_type/tensor_impl.cpp",
     "runtime/core/tag.cpp",
     "runtime/core/tensor_layout.cpp",
-    "runtime/executor/method.cpp",
-    "runtime/executor/method_meta.cpp",
-    "runtime/executor/program.cpp",
-    "runtime/executor/tensor_parser_exec_aten.cpp",
     "runtime/executor/tensor_parser_portable.cpp",
     "runtime/kernel/operator_registry.cpp",
     "runtime/platform/abort.cpp",
@@ -52,7 +55,7 @@ EXECUTORCH_CORE_SRCS = [
     "runtime/platform/profiler.cpp",
     "runtime/platform/runtime.cpp",
     "schema/extended_header.cpp",
-]
+] + ["runtime/executor/" + x for x in PROGRAM_NO_PRIM_OPS_SRCS])
 
 PORTABLE_KERNELS_SRCS = [
     "kernels/portable/cpu/op__empty_dim_order.cpp",