diff --git a/.bazelrc b/.bazelrc
index fb59989..f10e85a 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -41,4 +41,4 @@
 build:windows --extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl --extra_execution_platforms=//build_defs:x64_windows-clang-cl --host_platform=//build_defs:x64_windows-clang-cl
 
 # Use a custom registry for release dependencies
-common --registry=file://%workspace%/python/dist/registry --registry=https://bcr.bazel.build
+common --registry=file:///%workspace%/python/dist/registry --registry=https://bcr.bazel.build
diff --git a/ci/common.bazelrc b/ci/common.bazelrc
index 910bc21..e08dd82 100644
--- a/ci/common.bazelrc
+++ b/ci/common.bazelrc
@@ -85,4 +85,4 @@
 build --enable_platform_specific_config
 
 # Use a custom registry for release dependencies
-common --registry=file://%workspace%/python/dist/registry --registry=https://bcr.bazel.build
+common --registry=file:///%workspace%/python/dist/registry --registry=https://bcr.bazel.build
diff --git a/python/dist/make_python_nuget_package.sh b/python/dist/make_python_nuget_package.sh
index d44f86c..3c6b8d7 100755
--- a/python/dist/make_python_nuget_package.sh
+++ b/python/dist/make_python_nuget_package.sh
@@ -29,22 +29,33 @@
 BUILD=overlay/BUILD.bazel
 cat <<EOF >$BUILD
 cc_import(
-    name = "python_full_api",
-    hdrs = glob(["**/*.h"], allow_empty=True),
+    name = "python_full_api_lib",
     shared_library = "python${FULL_API}.dll",
     interface_library = "libs/python${FULL_API}.lib",
+)
+
+cc_library(
+    name = "python_full_api",
+    hdrs = glob(["**/*.h"], allow_empty=True),
+    strip_include_prefix = "include",
+    deps = [":python_full_api_lib"],
     visibility = ["//visibility:public"],
-    includes = ["include"],
 )
 
 cc_import(
-    name = "python_limited_api",
-    hdrs = glob(["**/*.h"], allow_empty=True),
+    name = "python_limited_api_lib",
     shared_library = "python${LIMITED_API}.dll",
     interface_library = "libs/python${LIMITED_API}.lib",
-    visibility = ["//visibility:public"],
-    includes = ["include"],
 )
+
+cc_library(
+    name = "python_limited_api",
+    hdrs = glob(["**/*.h"], allow_empty=True),
+    strip_include_prefix = "include",
+    deps = [":python_limited_api_lib"],
+    visibility = ["//visibility:public"],
+)
+
 EOF
 BUILD_SHA=$(sha256sum $BUILD | cut -d ' ' -f 1 | xxd -r -p | base64)
 
diff --git a/python/dist/registry/modules/nuget_python_i686_3.10.0/3.10.0/overlay/BUILD.bazel b/python/dist/registry/modules/nuget_python_i686_3.10.0/3.10.0/overlay/BUILD.bazel
index df67df5..86cc5c3 100644
--- a/python/dist/registry/modules/nuget_python_i686_3.10.0/3.10.0/overlay/BUILD.bazel
+++ b/python/dist/registry/modules/nuget_python_i686_3.10.0/3.10.0/overlay/BUILD.bazel
@@ -1,17 +1,28 @@
 cc_import(
-    name = "python_full_api",
-    hdrs = glob(["**/*.h"], allow_empty=True),
+    name = "python_full_api_lib",
     shared_library = "python310.dll",
     interface_library = "libs/python310.lib",
+)
+
+cc_library(
+    name = "python_full_api",
+    hdrs = glob(["**/*.h"], allow_empty=True),
+    strip_include_prefix = "include",
+    deps = [":python_full_api_lib"],
     visibility = ["//visibility:public"],
-    includes = ["include"],
 )
 
 cc_import(
-    name = "python_limited_api",
-    hdrs = glob(["**/*.h"], allow_empty=True),
+    name = "python_limited_api_lib",
     shared_library = "python3.dll",
     interface_library = "libs/python3.lib",
-    visibility = ["//visibility:public"],
-    includes = ["include"],
 )
+
+cc_library(
+    name = "python_limited_api",
+    hdrs = glob(["**/*.h"], allow_empty=True),
+    strip_include_prefix = "include",
+    deps = [":python_limited_api_lib"],
+    visibility = ["//visibility:public"],
+)
+
diff --git a/python/dist/registry/modules/nuget_python_i686_3.10.0/3.10.0/source.json b/python/dist/registry/modules/nuget_python_i686_3.10.0/3.10.0/source.json
index 0f7b7f1..1ce7a6d 100644
--- a/python/dist/registry/modules/nuget_python_i686_3.10.0/3.10.0/source.json
+++ b/python/dist/registry/modules/nuget_python_i686_3.10.0/3.10.0/source.json
@@ -4,6 +4,6 @@
   "integrity": "sha256-4RXhAuuQzhYKsO91BrdQqNfsw4W94KSW8CpUM3qLwzM=",
   "strip_prefix": "tools",
   "overlay": {
-    "BUILD.bazel": "sha256-L9akP25cpO3dqpKFMqECRM7HudlpKIylbjO9+iZEGWg="
+    "BUILD.bazel": "sha256-vmL+aI5tuXh/yKHfalcHDW6NDf9FQnPR3ZDPxkwL/GA="
   }
 }
diff --git a/python/dist/registry/modules/nuget_python_i686_3.9.0/3.9.0/overlay/BUILD.bazel b/python/dist/registry/modules/nuget_python_i686_3.9.0/3.9.0/overlay/BUILD.bazel
index 4716ecc..1018588 100644
--- a/python/dist/registry/modules/nuget_python_i686_3.9.0/3.9.0/overlay/BUILD.bazel
+++ b/python/dist/registry/modules/nuget_python_i686_3.9.0/3.9.0/overlay/BUILD.bazel
@@ -1,17 +1,28 @@
 cc_import(
-    name = "python_full_api",
-    hdrs = glob(["**/*.h"], allow_empty=True),
+    name = "python_full_api_lib",
     shared_library = "python39.dll",
     interface_library = "libs/python39.lib",
+)
+
+cc_library(
+    name = "python_full_api",
+    hdrs = glob(["**/*.h"], allow_empty=True),
+    strip_include_prefix = "include",
+    deps = [":python_full_api_lib"],
     visibility = ["//visibility:public"],
-    includes = ["include"],
 )
 
 cc_import(
-    name = "python_limited_api",
-    hdrs = glob(["**/*.h"], allow_empty=True),
+    name = "python_limited_api_lib",
     shared_library = "python3.dll",
     interface_library = "libs/python3.lib",
-    visibility = ["//visibility:public"],
-    includes = ["include"],
 )
+
+cc_library(
+    name = "python_limited_api",
+    hdrs = glob(["**/*.h"], allow_empty=True),
+    strip_include_prefix = "include",
+    deps = [":python_limited_api_lib"],
+    visibility = ["//visibility:public"],
+)
+
diff --git a/python/dist/registry/modules/nuget_python_i686_3.9.0/3.9.0/source.json b/python/dist/registry/modules/nuget_python_i686_3.9.0/3.9.0/source.json
index 6861d43..4620d96 100644
--- a/python/dist/registry/modules/nuget_python_i686_3.9.0/3.9.0/source.json
+++ b/python/dist/registry/modules/nuget_python_i686_3.9.0/3.9.0/source.json
@@ -4,6 +4,6 @@
   "integrity": "sha256-Ipq+y+SdwI/lcJ4LMecO37O4jyMzXr/CkExE+UD9WbY=",
   "strip_prefix": "tools",
   "overlay": {
-    "BUILD.bazel": "sha256-27Z7u954QBHsA2CMWXXXBbUfphvM7j90xi4WJ1xF0NY="
+    "BUILD.bazel": "sha256-Ygo2jLqQF2vGMrhdCCZmIUT0vHmEvYFQSo/jDCJWjgw="
   }
 }
diff --git a/python/dist/registry/modules/nuget_python_x86-64_3.10.0/3.10.0/overlay/BUILD.bazel b/python/dist/registry/modules/nuget_python_x86-64_3.10.0/3.10.0/overlay/BUILD.bazel
index df67df5..86cc5c3 100644
--- a/python/dist/registry/modules/nuget_python_x86-64_3.10.0/3.10.0/overlay/BUILD.bazel
+++ b/python/dist/registry/modules/nuget_python_x86-64_3.10.0/3.10.0/overlay/BUILD.bazel
@@ -1,17 +1,28 @@
 cc_import(
-    name = "python_full_api",
-    hdrs = glob(["**/*.h"], allow_empty=True),
+    name = "python_full_api_lib",
     shared_library = "python310.dll",
     interface_library = "libs/python310.lib",
+)
+
+cc_library(
+    name = "python_full_api",
+    hdrs = glob(["**/*.h"], allow_empty=True),
+    strip_include_prefix = "include",
+    deps = [":python_full_api_lib"],
     visibility = ["//visibility:public"],
-    includes = ["include"],
 )
 
 cc_import(
-    name = "python_limited_api",
-    hdrs = glob(["**/*.h"], allow_empty=True),
+    name = "python_limited_api_lib",
     shared_library = "python3.dll",
     interface_library = "libs/python3.lib",
-    visibility = ["//visibility:public"],
-    includes = ["include"],
 )
+
+cc_library(
+    name = "python_limited_api",
+    hdrs = glob(["**/*.h"], allow_empty=True),
+    strip_include_prefix = "include",
+    deps = [":python_limited_api_lib"],
+    visibility = ["//visibility:public"],
+)
+
diff --git a/python/dist/registry/modules/nuget_python_x86-64_3.10.0/3.10.0/source.json b/python/dist/registry/modules/nuget_python_x86-64_3.10.0/3.10.0/source.json
index fffc9a5..0be2c6f 100644
--- a/python/dist/registry/modules/nuget_python_x86-64_3.10.0/3.10.0/source.json
+++ b/python/dist/registry/modules/nuget_python_x86-64_3.10.0/3.10.0/source.json
@@ -4,6 +4,6 @@
   "integrity": "sha256-RHTIPCViXZPncukm+V9M05igq7tSeTYl+jDzmvPSzAA=",
   "strip_prefix": "tools",
   "overlay": {
-    "BUILD.bazel": "sha256-L9akP25cpO3dqpKFMqECRM7HudlpKIylbjO9+iZEGWg="
+    "BUILD.bazel": "sha256-vmL+aI5tuXh/yKHfalcHDW6NDf9FQnPR3ZDPxkwL/GA="
   }
 }
diff --git a/python/dist/registry/modules/nuget_python_x86-64_3.9.0/3.9.0/overlay/BUILD.bazel b/python/dist/registry/modules/nuget_python_x86-64_3.9.0/3.9.0/overlay/BUILD.bazel
index 4716ecc..1018588 100644
--- a/python/dist/registry/modules/nuget_python_x86-64_3.9.0/3.9.0/overlay/BUILD.bazel
+++ b/python/dist/registry/modules/nuget_python_x86-64_3.9.0/3.9.0/overlay/BUILD.bazel
@@ -1,17 +1,28 @@
 cc_import(
-    name = "python_full_api",
-    hdrs = glob(["**/*.h"], allow_empty=True),
+    name = "python_full_api_lib",
     shared_library = "python39.dll",
     interface_library = "libs/python39.lib",
+)
+
+cc_library(
+    name = "python_full_api",
+    hdrs = glob(["**/*.h"], allow_empty=True),
+    strip_include_prefix = "include",
+    deps = [":python_full_api_lib"],
     visibility = ["//visibility:public"],
-    includes = ["include"],
 )
 
 cc_import(
-    name = "python_limited_api",
-    hdrs = glob(["**/*.h"], allow_empty=True),
+    name = "python_limited_api_lib",
     shared_library = "python3.dll",
     interface_library = "libs/python3.lib",
-    visibility = ["//visibility:public"],
-    includes = ["include"],
 )
+
+cc_library(
+    name = "python_limited_api",
+    hdrs = glob(["**/*.h"], allow_empty=True),
+    strip_include_prefix = "include",
+    deps = [":python_limited_api_lib"],
+    visibility = ["//visibility:public"],
+)
+
diff --git a/python/dist/registry/modules/nuget_python_x86-64_3.9.0/3.9.0/source.json b/python/dist/registry/modules/nuget_python_x86-64_3.9.0/3.9.0/source.json
index 583012e..64554c5 100644
--- a/python/dist/registry/modules/nuget_python_x86-64_3.9.0/3.9.0/source.json
+++ b/python/dist/registry/modules/nuget_python_x86-64_3.9.0/3.9.0/source.json
@@ -4,6 +4,6 @@
   "integrity": "sha256-avWKcz59+/zdUNVXiBNDk9b/56uCcO/79yS9t4ZViDI=",
   "strip_prefix": "tools",
   "overlay": {
-    "BUILD.bazel": "sha256-27Z7u954QBHsA2CMWXXXBbUfphvM7j90xi4WJ1xF0NY="
+    "BUILD.bazel": "sha256-Ygo2jLqQF2vGMrhdCCZmIUT0vHmEvYFQSo/jDCJWjgw="
   }
 }