diff --git a/pkg/kubelet/dockershim/BUILD b/pkg/kubelet/dockershim/BUILD
index e9674de52fa..3a77759a281 100644
--- a/pkg/kubelet/dockershim/BUILD
+++ b/pkg/kubelet/dockershim/BUILD
@@ -49,7 +49,6 @@ go_library(
         "//pkg/kubelet/dockershim/network/cni:go_default_library",
         "//pkg/kubelet/dockershim/network/hostport:go_default_library",
         "//pkg/kubelet/dockershim/network/kubenet:go_default_library",
-        "//pkg/kubelet/kuberuntime:go_default_library",
         "//pkg/kubelet/leaky:go_default_library",
         "//pkg/kubelet/legacy:go_default_library",
         "//pkg/kubelet/server/streaming:go_default_library",
diff --git a/pkg/kubelet/dockershim/doc.go b/pkg/kubelet/dockershim/doc.go
index 82f3fbe7032..2e9fda933f3 100644
--- a/pkg/kubelet/dockershim/doc.go
+++ b/pkg/kubelet/dockershim/doc.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/dockershim_nodocker.go b/pkg/kubelet/dockershim/dockershim_nodocker.go
index a6e0e2ce074..1f5720a10af 100644
--- a/pkg/kubelet/dockershim/dockershim_nodocker.go
+++ b/pkg/kubelet/dockershim/dockershim_nodocker.go
@@ -1,3 +1,19 @@
 // +build dockerless
 
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package dockershim
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index 87e06a7a035..e9563a73bf4 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -236,6 +236,9 @@ type Dependencies struct {
 	useLegacyCadvisorStats bool
 }
 
+// DockerOptions contains docker specific configuration. Importantly, since it
+// lives outside of `dockershim`, it should not depend on the `docker/docker`
+// client library.
 type DockerOptions struct {
 	DockerEndpoint            string
 	RuntimeRequestTimeout     time.Duration
diff --git a/pkg/kubelet/kubelet_dockershim_nodocker.go b/pkg/kubelet/kubelet_dockershim_nodocker.go
index b833934ed5d..63cb51fd98b 100644
--- a/pkg/kubelet/kubelet_dockershim_nodocker.go
+++ b/pkg/kubelet/kubelet_dockershim_nodocker.go
@@ -32,5 +32,5 @@ func runDockershim(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
 	remoteImageEndpoint string,
 	nonMasqueradeCIDR string) error {
 
-	return fmt.Errorf("Trying to use docker runtime, w/ Kubelet compiled w/o docker support.")
+	return fmt.Errorf("trying to use docker runtime, w/ Kubelet compiled w/o docker support")
 }