diff --git a/examples/int8/training/vgg16/requirements.txt b/examples/int8/training/vgg16/requirements.txt
index 09276c712e..2e029ff124 100644
--- a/examples/int8/training/vgg16/requirements.txt
+++ b/examples/int8/training/vgg16/requirements.txt
@@ -1,4 +1,3 @@
-torch>=1.10.0
 tensorboard>=1.14.0
 nvidia-pyindex
 --extra-index-url https://pypi.ngc.nvidia.com
diff --git a/py/setup.py b/py/setup.py
index eb382559f8..e07e904f87 100644
--- a/py/setup.py
+++ b/py/setup.py
@@ -2,7 +2,7 @@
 import sys
 import glob
 import setuptools
-from setuptools import setup, Extension, find_packages
+from setuptools import setup, Extension, find_namespace_packages
 from setuptools.command.build_ext import build_ext
 from setuptools.command.develop import develop
 from setuptools.command.install import install
@@ -440,7 +440,7 @@ def run(self):
     },
     zip_safe=False,
     license="BSD",
-    packages=packages if FX_ONLY else find_packages(),
+    packages=packages if FX_ONLY else find_namespace_packages(),
     package_dir=package_dir if FX_ONLY else {},
     classifiers=[
         "Development Status :: 5 - Production/Stable",
diff --git a/third_party/cuda/BUILD b/third_party/cuda/BUILD
index 6f8b017777..ea2229985f 100644
--- a/third_party/cuda/BUILD
+++ b/third_party/cuda/BUILD
@@ -20,6 +20,9 @@ cc_library(
         ],
     }),
     hdrs = glob([
+        "include/**/*.h",
+        "include/**/*.hpp",
+        "include/**/*.inl",
         "include/**/*",
     ]),
     includes = ["include/"],
@@ -48,6 +51,9 @@ cc_library(
         ]),
     }),
     hdrs = glob([
+        "include/**/*.h",
+        "include/**/*.hpp",
+        "include/**/*.inl",
         "include/**/*",
     ]),
     includes = ["include/"],
@@ -65,6 +71,9 @@ cc_library(
         ]),
     }),
     hdrs = glob([
+        "include/**/*cublas*.h",
+        "include/**/*.hpp",
+        "include/**/*.inl",
         "include/**/*",
     ]),
     includes = ["include/"],