Index: head/lib/libiconv_modules/Makefile
===================================================================
--- head/lib/libiconv_modules/Makefile	(revision 255297)
+++ head/lib/libiconv_modules/Makefile	(revision 255298)
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
-CFLAGS+=	-Dbool=_Bool
-.export CFLAGS
-
 SUBDIR=	BIG5 DECHanyu EUC EUCTW GBK2K HZ ISO2022 JOHAB MSKanji UES UTF1632 \
 	UTF7 UTF8 VIQR ZW iconv_none iconv_std mapper_646 mapper_none \
 	mapper_parallel mapper_serial mapper_std mapper_zone
 
 .include <bsd.subdir.mk>
Index: head/lib/libiconv_modules/Makefile.inc
===================================================================
--- head/lib/libiconv_modules/Makefile.inc	(revision 255297)
+++ head/lib/libiconv_modules/Makefile.inc	(revision 255298)
@@ -1,14 +1,17 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../libc/iconv
 
 SHLIB_MAJOR= 4
 WARNS?=	6
 CFLAGS+= -I${.CURDIR}/../../libc/iconv
+
+CFLAGS+=	-Dbool=_Bool
+
 .if !defined(COMPAT_32BIT)
 SHLIBDIR= /usr/lib/i18n
 .else
 SHLIBDIR= /usr/lib32/i18n
 .endif
 LIBDIR=	 ${SHLIBDIR}
 NO_PROFILE=