Index: Mk/Uses/bdb.mk
===================================================================
--- Mk/Uses/bdb.mk
+++ Mk/Uses/bdb.mk
@@ -65,8 +65,6 @@
 BDB_DEFAULT:=${WITH_BDB_VER}
 .endif
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 _BDB_DEFAULT_save:=${BDB_DEFAULT}
 
 _DB_PORTS=		48 5 6
Index: Mk/Uses/firebird.mk
===================================================================
--- Mk/Uses/firebird.mk
+++ Mk/Uses/firebird.mk
@@ -7,7 +7,6 @@
 
 .if !defined(_INCLUDE_USES_FIREBIRD_MK)
 _INCLUDE_USES_FIREBIRD_MK=	yes
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 
 .if !empty(firebird_ARGS)
 FIREBIRD_VER=	${firebird_ARGS}
Index: Mk/Uses/fortran.mk
===================================================================
--- Mk/Uses/fortran.mk
+++ Mk/Uses/fortran.mk
@@ -16,7 +16,6 @@
 .endif
 
 .if ${fortran_ARGS} == gcc
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 _GCC_VER=	${GCC_DEFAULT:S/.//}
 .if ${GCC_DEFAULT} == ${LANG_GCC_IS}
 BUILD_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc
Index: Mk/Uses/ghostscript.mk
===================================================================
--- Mk/Uses/ghostscript.mk
+++ Mk/Uses/ghostscript.mk
@@ -38,9 +38,6 @@
 IGNORE?=	Unknown ghostscript argument ${_GS_ARGS}
 .endif
 
-# Determine version number of Ghostscript to use
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 .if ${GHOSTSCRIPT_DEFAULT:N[789]:Nagpl}
 IGNORE?=	Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION}
 .endif
Index: Mk/Uses/lua.mk
===================================================================
--- Mk/Uses/lua.mk
+++ Mk/Uses/lua.mk
@@ -14,7 +14,6 @@
 # Mk/bsd.default-versions.mk in sync.
 _LUA_VALID_VERSIONS=	53 52 51
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 _LUA_DEFAULT_VERSION=	${LUA_DEFAULT:S/.//}
 .if ! ${_LUA_VALID_VERSIONS:M${_LUA_DEFAULT_VERSION}}
 IGNORE=	Invalid lua version ${LUA_DEFAULT}
Index: Mk/Uses/mysql.mk
===================================================================
--- Mk/Uses/mysql.mk
+++ Mk/Uses/mysql.mk
@@ -26,8 +26,6 @@
 .if !defined(_INCLUDE_USES_MYSQL_MK)
 _INCLUDE_USES_MYSQL_MK=	yes
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 .if !empty(mysql_ARGS)
 .undef _WANT_MYSQL_VER
 .undef _WANT_MYSQL_SERVER
Index: Mk/Uses/perl5.mk
===================================================================
--- Mk/Uses/perl5.mk
+++ Mk/Uses/perl5.mk
@@ -51,7 +51,6 @@
 # end of remove
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 .if ${PERL5_DEFAULT} == 5.18
 .include "${PORTSDIR}/lang/perl5.18/version.mk"
 .elif ${PERL5_DEFAULT} == 5.20
Index: Mk/Uses/pgsql.mk
===================================================================
--- Mk/Uses/pgsql.mk
+++ Mk/Uses/pgsql.mk
@@ -43,8 +43,6 @@
 PGSQL$v_LIBVER?=	${PGSQL_LIBVER}
 .endfor
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 .for v in ${PGSQL_DEFAULT}
 .  if ! ${VALID_PGSQL_VER:M$v}
 IGNORE=		Invalid PGSQL default version ${PGSQL_DEFAULT}; valid versions are ${VALID_PGSQL_VER}
Index: Mk/Uses/php.mk
===================================================================
--- Mk/Uses/php.mk
+++ Mk/Uses/php.mk
@@ -38,8 +38,6 @@
 
 _INCLUDE_USES_PHP_MK=	yes
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 .  if defined(DEFAULT_PHP_VER)
 WARNING+=	"DEFAULT_PHP_VER is defined, consider using DEFAULT_VERSIONS=php=${DEFAULT_PHP_VER} instead"
 .  endif
Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -260,9 +260,6 @@
 _PYTHON_TEST_DEP=	yes
 .endif
 
-# Determine version number of Python to use
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 .if defined(PYTHON_DEFAULT_VERSION)
 WARNING+=	"PYTHON_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//} instead"
 .endif
Index: Mk/Uses/ssl.mk
===================================================================
--- Mk/Uses/ssl.mk
+++ Mk/Uses/ssl.mk
@@ -32,8 +32,6 @@
 IGNORE=	"USES=ssl does not take any argument."
 .endif
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 .if ${SSL_DEFAULT} == base
 OPENSSLBASE=		/usr
 OPENSSLDIR?=		/etc/ssl
Index: Mk/Uses/tcl.mk
===================================================================
--- Mk/Uses/tcl.mk
+++ Mk/Uses/tcl.mk
@@ -78,7 +78,6 @@
 # Bring in the default and check that the specified version is in the list of
 # valid versions.
 #
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 _TCLTK_DEFAULT_VERSION=	${TCLTK_DEFAULT:S/.//}
 .if ! ${_TCLTK_VALID_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
 IGNORE=	Invalid tcltk version ${TCLTK_DEFAULT}
Index: Mk/bsd.apache.mk
===================================================================
--- Mk/bsd.apache.mk
+++ Mk/bsd.apache.mk
@@ -85,8 +85,6 @@
 
 Apache_Pre_Include=		bsd.apache.mk
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 .if defined(DEFAULT_APACHE_VER)
 WARNING+=	"DEFAULT_APACHE_VER is defined, consider using DEFAULT_VERSIONS+=apache=${DEFAULT_APACHE_VER} instead"
 .endif
Index: Mk/bsd.fpc.mk
===================================================================
--- Mk/bsd.fpc.mk
+++ Mk/bsd.fpc.mk
@@ -30,8 +30,6 @@
 
 _FPCMKINCLUDED=	yes
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 .if defined(DEFAULT_FPC_VER)
 WARNING+=	"DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=fpc=${DEFAULT_FPC_VER} instead"
 .endif
Index: Mk/bsd.gcc.mk
===================================================================
--- Mk/bsd.gcc.mk
+++ Mk/bsd.gcc.mk
@@ -31,8 +31,6 @@
 
 GCC_Include_MAINTAINER=		gerald@FreeBSD.org
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 # All GCC versions supported by the ports framework.  Keep them in
 # ascending order and in sync with the table below. 
 # When adding a version, please keep the comment in
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1275,6 +1275,8 @@
 
 _PREMKINCLUDED=	yes
 
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
 .if defined(PORTVERSION)
 .if ${PORTVERSION:M*[-_,]*}x != x
 IGNORE=			PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','
Index: Mk/bsd.ruby.mk
===================================================================
--- Mk/bsd.ruby.mk
+++ Mk/bsd.ruby.mk
@@ -128,8 +128,6 @@
 # RUBY_ELISPDIR		- Installation path for emacs lisp files.
 #
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 .if defined(RUBY_DEFAULT_VER)
 WARNING+=	"RUBY_DEFAULT_VER is defined, consider using DEFAULT_VERSIONS=ruby=${RUBY_DEFAULT_VER} instead"
 .endif