diff --git a/build/root/Makefile.generated_files b/build/root/Makefile.generated_files
index 45287dc22fb..0b34b91b639 100644
--- a/build/root/Makefile.generated_files
+++ b/build/root/Makefile.generated_files
@@ -222,7 +222,7 @@ RUN_GEN_DEEPCOPY =                                                          \
                 --v $(KUBE_VERBOSE)                                         \
                 --logtostderr                                               \
                 -i $$(cat $(META_DIR)/$(DEEPCOPY_GEN).todo | paste -sd, -)  \
-                --bounding-dirs $(PRJ_SRC_PATH)                             \
+                --bounding-dirs $(PRJ_SRC_PATH),,"k8s.io/api"               \
                 -O $(DEEPCOPY_BASENAME)                                     \
                 "$$@";                                                      \
         fi                                                                  \
diff --git a/hack/make-rules/helpers/cache_go_dirs.sh b/hack/make-rules/helpers/cache_go_dirs.sh
index 0fafd5a609e..ab0e8b511d2 100755
--- a/hack/make-rules/helpers/cache_go_dirs.sh
+++ b/hack/make-rules/helpers/cache_go_dirs.sh
@@ -39,7 +39,7 @@ function kfind() {
     # include the "special" vendor directories which are actually part
     # of the Kubernetes source tree - generators will use these for
     # including certain core API concepts.
-    find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/apiextensions-apiserver ./vendor/k8s.io/metrics ./vendor/k8s.io/sample-apiserver \
+    find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/apiextensions-apiserver ./vendor/k8s.io/metrics ./vendor/k8s.io/sample-apiserver ./vendor/k8s.io/api \
         \(                         \
         -not \(                    \
             \(                     \
diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/pod_expansion.go b/pkg/client/clientset_generated/clientset/typed/core/v1/pod_expansion.go
index 1a358cb124a..8ccc0539316 100644
--- a/pkg/client/clientset_generated/clientset/typed/core/v1/pod_expansion.go
+++ b/pkg/client/clientset_generated/clientset/typed/core/v1/pod_expansion.go
@@ -17,9 +17,9 @@ limitations under the License.
 package v1
 
 import (
-	restclient "k8s.io/client-go/rest"
 	"k8s.io/api/core/v1"
-	policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
+	policy "k8s.io/api/policy/v1beta1"
+	restclient "k8s.io/client-go/rest"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme"
 )