diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
index 78b821b3c64d..7c9807c24ded 100644
--- a/lib/atf/libatf-c/Makefile
+++ b/lib/atf/libatf-c/Makefile
@@ -1,164 +1,143 @@
 #-
 # Copyright (c) 2011 Google, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 
 .include <src.opts.mk>
 .include <bsd.init.mk>
 
-# Store the toolchain executable in ATF_BUILD_{CC,CPP,CXX} to ensure other
-# values -- like -target, -B ..., etc -- don't get leaked into the tests.
-#
-# Be sure to omit ${CCACHE_BIN} (if specified) from the variable as it gets
-# automatically appended to the variables in bsd.compiler.mk when
-# ${MK_CCACHE_BUILD} != no.
-ATF_BUILD_CC:=		${CC:N${CCACHE_BIN}:[1]}
-ATF_BUILD_CPP:=		${CPP:N${CCACHE_BIN}:[1]}
-ATF_BUILD_CXX:=		${CXX:N${CCACHE_BIN}:[1]}
-
-# Only capture defines, includes, linker flags, optimization levels, warnings
-# and preprocessor flags when building ATF_BUILD_{C,CPP,CXX}FLAGS.
-ATF_BUILD_CFLAGS:=	${CFLAGS:M-[DILOWf]*}
-ATF_BUILD_CPPFLAGS:=	${CPPFLAGS:M-[DILOWf]*}
-ATF_BUILD_CXXFLAGS:=	${CXXFLAGS:M-[DILOWf]*}
-
 PACKAGE=	tests
 LIB=		atf-c
 PRIVATELIB=	true
 SHLIB_MAJOR=	1
 
 ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
 
-CFLAGS+=	-DATF_BUILD_CC='"${ATF_BUILD_CC}"'
-CFLAGS+=	-DATF_BUILD_CFLAGS='"${ATF_BUILD_CFLAGS}"'
-CFLAGS+=	-DATF_BUILD_CPP='"${ATF_BUILD_CPP}"'
-CFLAGS+=	-DATF_BUILD_CPPFLAGS='"${ATF_BUILD_CPPFLAGS}"'
-CFLAGS+=	-DATF_BUILD_CXX='"${ATF_BUILD_CXX}"'
-CFLAGS+=	-DATF_BUILD_CXXFLAGS='"${ATF_BUILD_CXXFLAGS}"'
 CFLAGS+=	-I${ATF}
 CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I.
 
 SRCS=		build.c \
 		check.c \
 		dynstr.c \
 		env.c \
 		error.c \
 		fs.c \
 		list.c \
 		map.c \
 		process.c \
 		sanity.c \
 		text.c \
 		user.c \
 		utils.c \
 		tc.c \
 		tp.c \
 		tp_main.c
 
 INCS=		build.h \
 		check.h \
 		defs.h \
 		error.h \
 		error_fwd.h \
 		macros.h \
 		tc.h \
 		tp.h \
 		utils.h
 INCSDIR=	${INCLUDEDIR}/atf-c
 
 INCS+=		atf-c.h
 INCSDIR_atf-c.h= ${INCLUDEDIR}
 
 MAN=		atf-c.3
 MLINKS+=	atf-c.3 ATF_CHECK.3 \
 		atf-c.3 ATF_CHECK_MSG.3 \
 		atf-c.3 ATF_CHECK_EQ.3 \
 		atf-c.3 ATF_CHECK_EQ_MSG.3 \
 		atf-c.3 ATF_CHECK_MATCH.3 \
 		atf-c.3 ATF_CHECK_MATCH_MSG.3 \
 		atf-c.3 ATF_CHECK_STREQ.3 \
 		atf-c.3 ATF_CHECK_STREQ_MSG.3 \
 		atf-c.3 ATF_CHECK_ERRNO.3 \
 		atf-c.3 ATF_REQUIRE.3 \
 		atf-c.3 ATF_REQUIRE_MSG.3 \
 		atf-c.3 ATF_REQUIRE_EQ.3 \
 		atf-c.3 ATF_REQUIRE_EQ_MSG.3 \
 		atf-c.3 ATF_REQUIRE_MATCH.3 \
 		atf-c.3 ATF_REQUIRE_MATCH_MSG.3 \
 		atf-c.3 ATF_REQUIRE_STREQ.3 \
 		atf-c.3 ATF_REQUIRE_STREQ_MSG.3 \
 		atf-c.3 ATF_REQUIRE_ERRNO.3 \
 		atf-c.3 ATF_TC.3 \
 		atf-c.3 ATF_TC_BODY.3 \
 		atf-c.3 ATF_TC_BODY_NAME.3 \
 		atf-c.3 ATF_TC_CLEANUP.3 \
 		atf-c.3 ATF_TC_CLEANUP_NAME.3 \
 		atf-c.3 ATF_TC_HEAD.3 \
 		atf-c.3 ATF_TC_HEAD_NAME.3 \
 		atf-c.3 ATF_TC_NAME.3 \
 		atf-c.3 ATF_TC_WITH_CLEANUP.3 \
 		atf-c.3 ATF_TC_WITHOUT_HEAD.3 \
 		atf-c.3 ATF_TP_ADD_TC.3 \
 		atf-c.3 ATF_TP_ADD_TCS.3 \
 		atf-c.3 atf_tc_get_config_var.3 \
 		atf-c.3 atf_tc_get_config_var_wd.3 \
 		atf-c.3 atf_tc_get_config_var_as_bool.3 \
 		atf-c.3 atf_tc_get_config_var_as_bool_wd.3 \
 		atf-c.3 atf_tc_get_config_var_as_long.3 \
 		atf-c.3 atf_tc_get_config_var_as_long_wd.3 \
 		atf-c.3 atf_no_error.3 \
 		atf-c.3 atf_tc_expect_death.3 \
 		atf-c.3 atf_tc_expect_exit.3 \
 		atf-c.3 atf_tc_expect_fail.3 \
 		atf-c.3 atf_tc_expect_pass.3 \
 		atf-c.3 atf_tc_expect_signal.3 \
 		atf-c.3 atf_tc_expect_timeout.3 \
 		atf-c.3 atf_tc_fail.3 \
 		atf-c.3 atf_tc_fail_nonfatal.3 \
 		atf-c.3 atf_tc_pass.3 \
 		atf-c.3 atf_tc_skip.3 \
 		atf-c.3 atf_utils_cat_file.3 \
 		atf-c.3 atf_utils_compare_file.3 \
 		atf-c.3 atf_utils_copy_file.3 \
 		atf-c.3 atf_utils_create_file.3 \
 		atf-c.3 atf_utils_file_exists.3 \
 		atf-c.3 atf_utils_fork.3 \
 		atf-c.3 atf_utils_free_charpp.3 \
 		atf-c.3 atf_utils_grep_file.3 \
 		atf-c.3 atf_utils_grep_string.3 \
 		atf-c.3 atf_utils_readline.3 \
 		atf-c.3 atf_utils_redirect.3 \
 		atf-c.3 atf_utils_wait.3
 MLINKS+=	atf-c.3 atf-c-api.3  # Backwards compatibility.
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
+.include "Makefile.inc"
 .include "../common.mk"
 .include <bsd.lib.mk>
diff --git a/lib/atf/libatf-c/Makefile.inc b/lib/atf/libatf-c/Makefile.inc
index 265f86d1ed55..f668e36b2d6a 100644
--- a/lib/atf/libatf-c/Makefile.inc
+++ b/lib/atf/libatf-c/Makefile.inc
@@ -1,3 +1,10 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
+
+CFLAGS+=	-DATF_BUILD_CC='"cc"'
+CFLAGS+=	-DATF_BUILD_CFLAGS='"-Wall"'
+CFLAGS+=	-DATF_BUILD_CPP='"cpp"'
+CFLAGS+=	-DATF_BUILD_CPPFLAGS='""'
+CFLAGS+=	-DATF_BUILD_CXX='"c++"'
+CFLAGS+=	-DATF_BUILD_CXXFLAGS='"-Wall"'
diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile
index c99b2d115967..3bcdfc8f7071 100644
--- a/lib/atf/libatf-c/tests/Makefile
+++ b/lib/atf/libatf-c/tests/Makefile
@@ -1,38 +1,39 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 PACKAGE=	tests
 
 TESTS_SUBDIRS=	detail
 
 ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
 
 CFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
 CFLAGS+=	-I${ATF}
 
 ${PACKAGE}FILES+=	macros_h_test.c
 ${PACKAGE}FILES+=	unused_test.c
 
 .for _T in	atf_c_test \
 		build_test \
 		check_test \
 		error_test \
 		macros_test \
 		tc_test \
 		tp_test \
 		utils_test
 ATF_TESTS_C+=	${_T}
 SRCS.${_T}=	${_T}.c test_helpers.c
 .endfor
 
 .for _T in	atf_c_test \
 		build_test \
 		check_test \
 		macros_test
 TEST_METADATA.${_T}+=	required_programs="cc"
 .endfor
 
+.include "Makefile.inc"
 .include <bsd.test.mk>