Index: head/usr.sbin/ntp/ntpdc/Makefile
===================================================================
--- head/usr.sbin/ntp/ntpdc/Makefile	(revision 352246)
+++ head/usr.sbin/ntp/ntpdc/Makefile	(revision 352247)
@@ -1,35 +1,33 @@
 # $FreeBSD$
 
 MAN=
 
 .include <src.opts.mk>
 
 .PATH: ${SRCTOP}/contrib/ntp/ntpdc
 
 PROG=	ntpdc
 SRCS= 	ntpdc.c ntpdc_ops.c ntpdc-opts.c version.c
 
 CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
 	-I${SRCTOP}/contrib/ntp/lib/isc/include \
 	-I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
 	-I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
 	-I${SRCTOP}/contrib/ntp/sntp/libopts \
 	-I${.CURDIR}/lib/libc/${MACHINE_ARCH} \
 	-I${.CURDIR:H} -I${.CURDIR}
 
 LIBADD=	edit ntp m opts pthread
-CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
-		-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit
 
 .if ${MK_OPENSSL} != "no"
 LIBADD+=	crypto
 .else
 LIBADD+=	md
 .endif
 
 CLEANFILES+= .version version.c
 
 version.c:
 	sh -e ${.CURDIR:H}/scripts/mkver ntpdc
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/ntpq/Makefile
===================================================================
--- head/usr.sbin/ntp/ntpq/Makefile	(revision 352246)
+++ head/usr.sbin/ntp/ntpq/Makefile	(revision 352247)
@@ -1,39 +1,36 @@
 # $FreeBSD$
 
 MAN=
 
 .include <src.opts.mk>
 
 .PATH: ${SRCTOP}/contrib/ntp/ntpq
 
 BINDIR=	/usr/bin
 
 PROG=	ntpq
 SRCS= 	ntpq.c ntpq-opts.c ntpq-subs.c version.c
 
 CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
 	-I${SRCTOP}/contrib/ntp/include \
 	-I${SRCTOP}/contrib/ntp/lib/isc/include \
 	-I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
 	-I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
 	-I${SRCTOP}/contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
 	-I${SRCTOP}/contrib/ntp/sntp/libopts \
 	-I${.CURDIR:H}
 
 LIBADD+=	edit ntp opts m pthread
 
 .if ${MK_OPENSSL} != "no"
 LIBADD+=	crypto
 .else
 LIBADD+=	md
 .endif
 
-CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
-		-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit
-
 CLEANFILES+= .version version.c
 
 version.c:
 	sh -e ${.CURDIR:H}/scripts/mkver ntpq
 
 .include <bsd.prog.mk>