diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile
--- a/sys/modules/cc/Makefile
+++ b/sys/modules/cc/Makefile
@@ -8,9 +8,9 @@
 
 # Do we have the TCP_HHOOK symbol defined? If not, there is no point in
 # building these modules by default.
-# We will default to building these modules unless $OPT_INET is defined
-# and does not contain the TCP_HHOOK option.
-.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != ""
+# We will default to building these modules if $OPT_GLOBAL does contain
+# the TCP_HHOOK option.
+.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != ""
 SUBDIR+= \
 	cc_cdg \
 	cc_chd \
diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile
--- a/sys/modules/khelp/Makefile
+++ b/sys/modules/khelp/Makefile
@@ -4,9 +4,9 @@
 
 # Do we have the TCP_HHOOK symbol defined? If not, there is no point in
 # building this modules by default.
-# We will default to building this module unless $OPT_INET is defined
-# and does not contain the TCP_HHOOK option.
-.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != ""
+# We will default to building this module if $OPT_GLOBAL does contain
+# the TCP_HHOOK option.
+.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != ""
 SUBDIR+=	h_ertt
 .endif