diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 9145b3bb4f92..c4210c253783 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -65,7 +65,7 @@ static g_start_t g_disk_start;
 static g_ioctl_t g_disk_ioctl;
 static g_dumpconf_t g_disk_dumpconf;
 
-struct g_class g_disk_class = {
+static struct g_class g_disk_class = {
 	.name = "DISK",
 	.version = G_VERSION,
 	.init = g_disk_init,
diff --git a/sys/geom/geom_kern.c b/sys/geom/geom_kern.c
index 6e6b3014dfbd..1308799f2ab3 100644
--- a/sys/geom/geom_kern.c
+++ b/sys/geom/geom_kern.c
@@ -96,7 +96,7 @@ g_up_procbody(void)
 	}
 }
 
-struct kproc_desc g_up_kp = {
+static struct kproc_desc g_up_kp = {
 	"g_up",
 	g_up_procbody,
 	&g_up_proc,
@@ -119,7 +119,7 @@ g_down_procbody(void)
 	}
 }
 
-struct kproc_desc g_down_kp = {
+static struct kproc_desc g_down_kp = {
 	"g_down",
 	g_down_procbody,
 	&g_down_proc,
diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c
index 405521b7b198..c875897b35ed 100644
--- a/sys/geom/geom_vfs.c
+++ b/sys/geom/geom_vfs.c
@@ -54,6 +54,8 @@ static struct buf_ops __g_vfs_bufops = {
 
 struct buf_ops *g_vfs_bufops = &__g_vfs_bufops;
 
+static g_orphan_t g_vfs_orphan;
+
 static struct g_class g_vfs_class = {
 	.name =		"VFS",
 	.version =	G_VERSION,
@@ -104,7 +106,7 @@ g_vfs_strategy(struct bufobj *bo, struct buf *bp)
 	g_io_request(bip, cp);
 }
 
-void
+static void
 g_vfs_orphan(struct g_consumer *cp)
 {
 
diff --git a/sys/geom/geom_vfs.h b/sys/geom/geom_vfs.h
index 85aa2b58bbd7..806ec1ca089a 100644
--- a/sys/geom/geom_vfs.h
+++ b/sys/geom/geom_vfs.h
@@ -36,7 +36,6 @@ struct buf;
 extern struct buf_ops *g_vfs_bufops;
 
 void g_vfs_strategy(struct bufobj *bo, struct buf *bp);
-void g_vfs_orphan(struct g_consumer *cp);
 int g_vfs_open(struct vnode *vp, struct g_consumer **cpp, const char *fsname, int wr);
 void g_vfs_close(struct g_consumer *cp, struct thread *td);