diff --git a/hack/make-rules/helpers/cache_go_dirs.sh b/hack/make-rules/helpers/cache_go_dirs.sh
index 282022a8474..3579e26462c 100755
--- a/hack/make-rules/helpers/cache_go_dirs.sh
+++ b/hack/make-rules/helpers/cache_go_dirs.sh
@@ -36,7 +36,11 @@ trap "rm -f '${CACHE}'" HUP INT TERM ERR
 # Example:
 #   kfind -type f -name foobar.go
 function kfind() {
-    find .                         \
+    # 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 \
+        \(                         \
         -not \(                    \
             \(                     \
                 -path ./vendor -o  \
@@ -47,6 +51,7 @@ function kfind() {
                 -path ./examples   \
             \) -prune              \
         \)                         \
+        \)                         \
         "$@"
 }
 
diff --git a/pkg/apis/meta/v1/doc.go b/pkg/apis/meta/v1/doc.go
index 52273240f0e..045c600e33d 100644
--- a/pkg/apis/meta/v1/doc.go
+++ b/pkg/apis/meta/v1/doc.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
-// +k8s:openapi-gen=true
+// +k8s:openapi-gen=false
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=meta.k8s.io
diff --git a/pkg/runtime/doc.go b/pkg/runtime/doc.go
index 83accf4f3de..e4eeec2571f 100644
--- a/pkg/runtime/doc.go
+++ b/pkg/runtime/doc.go
@@ -41,5 +41,6 @@ limitations under the License.
 //
 // As a bonus, a few common types useful from all api objects and versions
 // are provided in types.go.
+// +k8s:openapi-gen=false
 
 package runtime // import "k8s.io/kubernetes/pkg/runtime"
diff --git a/pkg/runtime/types.go b/pkg/runtime/types.go
index f972c5e697a..4e31ad0f2fe 100644
--- a/pkg/runtime/types.go
+++ b/pkg/runtime/types.go
@@ -32,7 +32,6 @@ package runtime
 //
 // +k8s:deepcopy-gen=true
 // +protobuf=true
-// +k8s:openapi-gen=true
 type TypeMeta struct {
 	// +optional
 	APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty" protobuf:"bytes,1,opt,name=apiVersion"`
@@ -88,7 +87,6 @@ const (
 //
 // +k8s:deepcopy-gen=true
 // +protobuf=true
-// +k8s:openapi-gen=true
 type RawExtension struct {
 	// Raw is the underlying serialization of this object.
 	//
@@ -107,7 +105,6 @@ type RawExtension struct {
 //
 // +k8s:deepcopy-gen=true
 // +protobuf=true
-// +k8s:openapi-gen=true
 type Unknown struct {
 	TypeMeta `json:",inline" protobuf:"bytes,1,opt,name=typeMeta"`
 	// Raw will hold the complete serialized object which couldn't be matched