diff --git a/BUILD.bazel b/BUILD.bazel
index 2327db6564f1..264547225787 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -8,7 +8,7 @@ load("//:tools/build_variables.bzl", "jit_core_sources", "libtorch_core_sources"
 load("//tools/rules:cu.bzl", "cu_library")
 load("//tools/config:defs.bzl", "if_cuda")
 load("//:aten.bzl", "intern_build_aten_ops", "generate_aten", "aten_ufunc_generated_cpu_sources", "aten_ufunc_generated_cpu_kernel_sources", "aten_ufunc_generated_cuda_sources")
-load(":build.bzl", "define_targets")
+load(":build.bzl", "define_targets", "GENERATED_AUTOGRAD_PYTHON")
 
 define_targets(rules = rules)
 
@@ -129,37 +129,12 @@ libtorch_cpp_generated_sources = [
         "torch/csrc/lazy/generated/RegisterLazy.cpp",
 ]
 
-libtorch_python_generated_sources = [
-        "torch/csrc/autograd/generated/python_functions.h",
-        "torch/csrc/autograd/generated/python_functions_0.cpp",
-        "torch/csrc/autograd/generated/python_functions_1.cpp",
-        "torch/csrc/autograd/generated/python_functions_2.cpp",
-        "torch/csrc/autograd/generated/python_functions_3.cpp",
-        "torch/csrc/autograd/generated/python_functions_4.cpp",
-        "torch/csrc/autograd/generated/python_variable_methods.cpp",
-        "torch/csrc/autograd/generated/python_torch_functions_0.cpp",
-        "torch/csrc/autograd/generated/python_torch_functions_1.cpp",
-        "torch/csrc/autograd/generated/python_torch_functions_2.cpp",
-        "torch/csrc/autograd/generated/python_nn_functions.cpp",
-        "torch/csrc/autograd/generated/python_fft_functions.cpp",
-        "torch/csrc/autograd/generated/python_linalg_functions.cpp",
-        "torch/csrc/autograd/generated/python_sparse_functions.cpp",
-        "torch/csrc/autograd/generated/python_special_functions.cpp",
-        "torch/csrc/autograd/generated/python_return_types.cpp",
-]
-
 filegroup(
     name = "cpp_generated_code",
     data = [":generate-code"],
     srcs = libtorch_cpp_generated_sources,
 )
 
-filegroup(
-    name = "python_generated_code",
-    data = [":generate-code"],
-    srcs = libtorch_python_generated_sources,
-)
-
 exports_files(
     srcs = ["aten/src/ATen/cpu/tbb/extra/version_string.ver.in"],
 )
@@ -1742,7 +1717,7 @@ cc_library(
 
 cc_library(
     name = "torch_python",
-    srcs = libtorch_python_core_sources + [":python_generated_code"],
+    srcs = libtorch_python_core_sources + GENERATED_AUTOGRAD_PYTHON,
     deps = [
         ":torch",
         ":shm",
diff --git a/build.bzl b/build.bzl
index d4d3a5898f5d..7eabb07ada4e 100644
--- a/build.bzl
+++ b/build.bzl
@@ -66,12 +66,15 @@ def define_targets(rules):
 # generate-code that use these lists are moved into the shared
 # structure as well.
 
+_GENERATED_AUTOGRAD_PYTHON_H = [
+    "torch/csrc/autograd/generated/python_functions.h",
+]
+
 GENERATED_AUTOGRAD_H = [
     "torch/csrc/autograd/generated/Functions.h",
     "torch/csrc/autograd/generated/VariableType.h",
-    "torch/csrc/autograd/generated/python_functions.h",
     "torch/csrc/autograd/generated/variable_factories.h",
-]
+] + _GENERATED_AUTOGRAD_PYTHON_H
 
 GENERATED_TESTING_PY = [
     "torch/testing/_internal/generated/annotated_fn_args.py",
@@ -82,20 +85,7 @@ GENERATED_LAZY_H = [
     "torch/csrc/lazy/generated/LazyNativeFunctions.h",
 ]
 
-_GENERATED_CPP = [
-    "torch/csrc/autograd/generated/Functions.cpp",
-    "torch/csrc/autograd/generated/VariableType_0.cpp",
-    "torch/csrc/autograd/generated/VariableType_1.cpp",
-    "torch/csrc/autograd/generated/VariableType_2.cpp",
-    "torch/csrc/autograd/generated/VariableType_3.cpp",
-    "torch/csrc/autograd/generated/VariableType_4.cpp",
-    "torch/csrc/autograd/generated/TraceType_0.cpp",
-    "torch/csrc/autograd/generated/TraceType_1.cpp",
-    "torch/csrc/autograd/generated/TraceType_2.cpp",
-    "torch/csrc/autograd/generated/TraceType_3.cpp",
-    "torch/csrc/autograd/generated/TraceType_4.cpp",
-    "torch/csrc/autograd/generated/ADInplaceOrViewType_0.cpp",
-    "torch/csrc/autograd/generated/ADInplaceOrViewType_1.cpp",
+_GENERATED_AUTOGRAD_PYTHON_CPP = [
     "torch/csrc/autograd/generated/python_functions_0.cpp",
     "torch/csrc/autograd/generated/python_functions_1.cpp",
     "torch/csrc/autograd/generated/python_functions_2.cpp",
@@ -111,7 +101,25 @@ _GENERATED_CPP = [
     "torch/csrc/autograd/generated/python_torch_functions_1.cpp",
     "torch/csrc/autograd/generated/python_torch_functions_2.cpp",
     "torch/csrc/autograd/generated/python_variable_methods.cpp",
+]
+
+GENERATED_AUTOGRAD_PYTHON = _GENERATED_AUTOGRAD_PYTHON_H + _GENERATED_AUTOGRAD_PYTHON_CPP
+
+_GENERATED_CPP = [
+    "torch/csrc/autograd/generated/Functions.cpp",
+    "torch/csrc/autograd/generated/VariableType_0.cpp",
+    "torch/csrc/autograd/generated/VariableType_1.cpp",
+    "torch/csrc/autograd/generated/VariableType_2.cpp",
+    "torch/csrc/autograd/generated/VariableType_3.cpp",
+    "torch/csrc/autograd/generated/VariableType_4.cpp",
+    "torch/csrc/autograd/generated/TraceType_0.cpp",
+    "torch/csrc/autograd/generated/TraceType_1.cpp",
+    "torch/csrc/autograd/generated/TraceType_2.cpp",
+    "torch/csrc/autograd/generated/TraceType_3.cpp",
+    "torch/csrc/autograd/generated/TraceType_4.cpp",
+    "torch/csrc/autograd/generated/ADInplaceOrViewType_0.cpp",
+    "torch/csrc/autograd/generated/ADInplaceOrViewType_1.cpp",
     "torch/csrc/lazy/generated/LazyNativeFunctions.cpp",
     "torch/csrc/lazy/generated/RegisterAutogradLazy.cpp",
     "torch/csrc/lazy/generated/RegisterLazy.cpp",
-]
+] + _GENERATED_AUTOGRAD_PYTHON_CPP