diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
index 51474376319..a7e7683a514 100644
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@@ -4,7 +4,7 @@
 .error bsd.incs.mk cannot be included directly.
 .endif
 
-.if ${MK_TOOLCHAIN} != "no"
+.if ${MK_INCLUDES} != "no"
 
 INCSGROUPS?=	INCS
 
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 0dbd26b347e..c696f4c811a 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -51,6 +51,7 @@ __<bsd.opts.mk>__:
 __DEFAULT_YES_OPTIONS = \
     ASSERT_DEBUG \
     DOCCOMPRESS \
+    INCLUDES \
     INSTALLLIB \
     KERBEROS \
     MAN \
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index cb493c96475..87c0f9998cd 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -306,6 +306,7 @@ MK_BINUTILS:=	no
 MK_CLANG:=	no
 MK_GCC:=	no
 MK_GDB:=	no
+MK_INCLUDES:=	no
 .endif
 
 .if ${MK_CLANG} == "no"
diff --git a/tools/build/options/WITHOUT_INCLUDES b/tools/build/options/WITHOUT_INCLUDES
new file mode 100644
index 00000000000..8ccb2078d64
--- /dev/null
+++ b/tools/build/options/WITHOUT_INCLUDES
@@ -0,0 +1,8 @@
+.\" $FreeBSD$
+Set to not install header files.
+This option used to be spelled 
+.Va NO_INCS .
+.Bf -symbolic
+The option does not work for build targets.
+.Ef
+