diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD
index 902c8045b48..7a9c479fe22 100644
--- a/cmd/kube-apiserver/app/BUILD
+++ b/cmd/kube-apiserver/app/BUILD
@@ -21,7 +21,6 @@ go_library(
         "//pkg/apis/autoscaling:go_default_library",
         "//pkg/apis/batch:go_default_library",
         "//pkg/apis/extensions:go_default_library",
-        "//pkg/apiserver:go_default_library",
         "//pkg/apiserver/authenticator:go_default_library",
         "//pkg/capabilities:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
diff --git a/cmd/kube-apiserver/app/options/BUILD b/cmd/kube-apiserver/app/options/BUILD
index 7bbcd99449d..6ee21db5681 100644
--- a/cmd/kube-apiserver/app/options/BUILD
+++ b/cmd/kube-apiserver/app/options/BUILD
@@ -10,7 +10,10 @@ load(
 
 go_library(
     name = "go_default_library",
-    srcs = ["options.go"],
+    srcs = [
+        "options.go",
+        "validation.go",
+    ],
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
@@ -18,6 +21,7 @@ go_library(
         "//pkg/genericapiserver/options:go_default_library",
         "//pkg/kubelet/client:go_default_library",
         "//pkg/master/ports:go_default_library",
+        "//pkg/util/net:go_default_library",
         "//vendor:github.com/spf13/pflag",
     ],
 )
diff --git a/examples/apiserver/BUILD b/examples/apiserver/BUILD
index 9bbadc7012f..002164598eb 100644
--- a/examples/apiserver/BUILD
+++ b/examples/apiserver/BUILD
@@ -21,7 +21,6 @@ go_library(
         "//pkg/genericapiserver:go_default_library",
         "//pkg/genericapiserver/authorizer:go_default_library",
         "//pkg/genericapiserver/options:go_default_library",
-        "//pkg/genericapiserver/validation:go_default_library",
         "//pkg/registry/generic:go_default_library",
         "//pkg/runtime/schema:go_default_library",
         "//pkg/storage/storagebackend:go_default_library",
diff --git a/federation/cmd/federation-apiserver/app/options/BUILD b/federation/cmd/federation-apiserver/app/options/BUILD
index 12688e222ce..cfe6761af25 100644
--- a/federation/cmd/federation-apiserver/app/options/BUILD
+++ b/federation/cmd/federation-apiserver/app/options/BUILD
@@ -9,7 +9,10 @@ load(
 
 go_library(
     name = "go_default_library",
-    srcs = ["options.go"],
+    srcs = [
+        "options.go",
+        "validation.go",
+    ],
     tags = ["automanaged"],
     deps = [
         "//pkg/genericapiserver/options:go_default_library",
diff --git a/pkg/apiserver/BUILD b/pkg/apiserver/BUILD
index 133bc48f615..a0987a4c948 100644
--- a/pkg/apiserver/BUILD
+++ b/pkg/apiserver/BUILD
@@ -19,7 +19,6 @@ go_library(
         "proxy.go",
         "resthandler.go",
         "serviceerror.go",
-        "validator.go",
         "watch.go",
     ],
     tags = ["automanaged"],
@@ -36,8 +35,6 @@ go_library(
         "//pkg/conversion:go_default_library",
         "//pkg/fields:go_default_library",
         "//pkg/httplog:go_default_library",
-        "//pkg/probe:go_default_library",
-        "//pkg/probe/http:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
         "//pkg/runtime/serializer/streaming:go_default_library",
@@ -73,7 +70,6 @@ go_test(
         "negotiate_test.go",
         "proxy_test.go",
         "resthandler_test.go",
-        "validator_test.go",
         "watch_test.go",
     ],
     library = "go_default_library",
@@ -93,7 +89,6 @@ go_test(
         "//pkg/apiserver/testing:go_default_library",
         "//pkg/fields:go_default_library",
         "//pkg/labels:go_default_library",
-        "//pkg/probe:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
         "//pkg/runtime/serializer/streaming:go_default_library",
diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD
index 1f2f57b9ff2..e5cf0acf179 100644
--- a/pkg/genericapiserver/BUILD
+++ b/pkg/genericapiserver/BUILD
@@ -30,7 +30,6 @@ go_library(
         "//pkg/admission:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/api/rest:go_default_library",
-        "//pkg/api/v1:go_default_library",
         "//pkg/apimachinery:go_default_library",
         "//pkg/apimachinery/registered:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
@@ -45,14 +44,12 @@ go_library(
         "//pkg/auth/handlers:go_default_library",
         "//pkg/auth/user:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//pkg/cloudprovider:go_default_library",
         "//pkg/genericapiserver/authorizer:go_default_library",
         "//pkg/genericapiserver/filters:go_default_library",
         "//pkg/genericapiserver/mux:go_default_library",
         "//pkg/genericapiserver/openapi/common:go_default_library",
         "//pkg/genericapiserver/options:go_default_library",
         "//pkg/genericapiserver/routes:go_default_library",
-        "//pkg/genericapiserver/validation:go_default_library",
         "//pkg/healthz:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
diff --git a/pkg/genericapiserver/options/BUILD b/pkg/genericapiserver/options/BUILD
index 369dca98bda..609152fc0ba 100644
--- a/pkg/genericapiserver/options/BUILD
+++ b/pkg/genericapiserver/options/BUILD
@@ -21,11 +21,13 @@ go_library(
     deps = [
         "//pkg/admission:go_default_library",
         "//pkg/api:go_default_library",
+        "//pkg/api/v1:go_default_library",
         "//pkg/apimachinery/registered:go_default_library",
         "//pkg/apiserver/authenticator:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/authentication/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/authorization/v1beta1:go_default_library",
         "//pkg/client/unversioned/clientcmd:go_default_library",
+        "//pkg/cloudprovider:go_default_library",
         "//pkg/controller/informers:go_default_library",
         "//pkg/genericapiserver/authorizer:go_default_library",
         "//pkg/runtime/schema:go_default_library",
diff --git a/pkg/master/BUILD b/pkg/master/BUILD
index 3af06dfb377..05e3d1ca9b9 100644
--- a/pkg/master/BUILD
+++ b/pkg/master/BUILD
@@ -19,6 +19,7 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
+        "//cmd/kube-apiserver/app/options:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/api/endpoints:go_default_library",
         "//pkg/api/errors:go_default_library",
@@ -51,7 +52,6 @@ go_library(
         "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
         "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library",
         "//pkg/genericapiserver:go_default_library",
-        "//pkg/genericapiserver/options:go_default_library",
         "//pkg/healthz:go_default_library",
         "//pkg/kubelet/client:go_default_library",
         "//pkg/master/thirdparty:go_default_library",
diff --git a/pkg/registry/core/componentstatus/BUILD b/pkg/registry/core/componentstatus/BUILD
index ba9f17949ac..2e719907c94 100644
--- a/pkg/registry/core/componentstatus/BUILD
+++ b/pkg/registry/core/componentstatus/BUILD
@@ -13,27 +13,30 @@ go_library(
     srcs = [
         "doc.go",
         "rest.go",
+        "validator.go",
     ],
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
-        "//pkg/apiserver:go_default_library",
         "//pkg/probe:go_default_library",
         "//pkg/probe/http:go_default_library",
         "//pkg/runtime:go_default_library",
+        "//pkg/util/net:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
-    srcs = ["rest_test.go"],
+    srcs = [
+        "rest_test.go",
+        "validator_test.go",
+    ],
     library = "go_default_library",
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
-        "//pkg/apiserver:go_default_library",
         "//pkg/probe:go_default_library",
         "//pkg/util/diff:go_default_library",
     ],
diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD
index 87e3da39c6b..1249b30b20a 100644
--- a/pkg/registry/core/rest/BUILD
+++ b/pkg/registry/core/rest/BUILD
@@ -16,7 +16,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/rest:go_default_library",
         "//pkg/apimachinery/registered:go_default_library",
-        "//pkg/apiserver:go_default_library",
         "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library",
         "//pkg/client/restclient:go_default_library",
         "//pkg/genericapiserver:go_default_library",