Index: cddl/lib/libdtrace/Makefile
===================================================================
--- cddl/lib/libdtrace/Makefile
+++ cddl/lib/libdtrace/Makefile
@@ -64,7 +64,7 @@
 
 WARNS?=		1
 
-CFLAGS+=	-I${.OBJDIR} -I${.CURDIR} \
+CFLAGS+=	-I. -I${.CURDIR} \
 		-I${SRCTOP}/sys/cddl/dev/dtrace/${MACHINE_ARCH} \
 		-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/cddl/compat/opensolaris/include \
Index: gnu/lib/libreadline/readline/Makefile
===================================================================
--- gnu/lib/libreadline/readline/Makefile
+++ gnu/lib/libreadline/readline/Makefile
@@ -13,7 +13,7 @@
 INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
 		   rlstdc.h rlconf.h rltypedefs.h
 
-CFLAGS+=	-I${.OBJDIR}/..
+CFLAGS+=	-I..
 SRCDIR=	${.CURDIR}/../../../../contrib/libreadline
 
 CLEANFILES+= ${INSTALLED_HEADERS}
Index: gnu/usr.bin/binutils/Makefile.inc0
===================================================================
--- gnu/usr.bin/binutils/Makefile.inc0
+++ gnu/usr.bin/binutils/Makefile.inc0
@@ -40,7 +40,7 @@
 CFLAGS+= -I.
 CFLAGS+= -I${.CURDIR}
 CFLAGS+= -I${.CURDIR}/${GNURELTOP}/libbfd
-CFLAGS+= -I${.OBJDIR}/${GNURELTOP}/libbfd
+CFLAGS+= -I${GNURELTOP}/libbfd
 CFLAGS+= -I${SRCDIR}/include
 
 ARCHS=	${TARGET_CPUARCH}
Index: gnu/usr.bin/cc/Makefile.inc
===================================================================
--- gnu/usr.bin/cc/Makefile.inc
+++ gnu/usr.bin/cc/Makefile.inc
@@ -76,7 +76,7 @@
 .endif
 
 .if exists(${.OBJDIR}/../cc_tools)
-CFLAGS+=	-I${.OBJDIR}/../cc_tools
+CFLAGS+=	-I../cc_tools
 .endif
 CFLAGS+=	-I${.CURDIR}/../cc_tools
 # This must go after the -I for cc_tools to resolve ambiguities for hash.h
Index: gnu/usr.bin/gdb/Makefile.inc
===================================================================
--- gnu/usr.bin/gdb/Makefile.inc
+++ gnu/usr.bin/gdb/Makefile.inc
@@ -15,9 +15,9 @@
 CNTRB_GDB= ${SRCTOP}/contrib/gdb
 CNTRB_RL= ${SRCTOP}/contrib/libreadline
 
-OBJ_BU= ${OBJTOP}/gnu/usr.bin/binutils
-OBJ_GDB= ${OBJTOP}/gnu/usr.bin/gdb
-OBJ_RL= ${OBJTOP}/gnu/lib/libreadline/readline
+OBJ_BU= ${RELOBJTOP}/gnu/usr.bin/binutils
+OBJ_GDB= ${RELOBJTOP}/gnu/usr.bin/gdb
+OBJ_RL= ${RELOBJTOP}/gnu/lib/libreadline/readline
 
 # These assignments duplicate much of the functionality of
 # MACHINE_CPUARCH, but there's no easy way to export make functions...
Index: kerberos5/lib/libkafs5/Makefile
===================================================================
--- kerberos5/lib/libkafs5/Makefile
+++ kerberos5/lib/libkafs5/Makefile
@@ -26,7 +26,7 @@
 
 CFLAGS+=	-I${KRB5DIR}/lib/kafs \
 		-I${KRB5DIR}/lib/krb5 \
-		-I${.OBJDIR:H}/libkrb5 \
+		-I../libkrb5 \
 		-I${KRB5DIR}/lib/roken
 
 CLEANFILES= kafs5.3
Index: kerberos5/libexec/hprop/Makefile
===================================================================
--- kerberos5/libexec/hprop/Makefile
+++ kerberos5/libexec/hprop/Makefile
@@ -9,7 +9,7 @@
 CFLAGS+=-I${KRB5DIR}/lib/hx509
 CFLAGS+=-I${KRB5DIR}/lib/ntlm
 CFLAGS+=-I${KRB5DIR}/kdc
-CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5
+CFLAGS+=-I../../lib/libkrb5
 LIBADD=	hdb krb5 roken vers
 DPADD=	${LDAPDPADD}
 LDADD=	${LDAPLDADD}
Index: lib/clang/libclang/Makefile
===================================================================
--- lib/clang/libclang/Makefile
+++ lib/clang/libclang/Makefile
@@ -5,8 +5,8 @@
 
 LIB=		clang
 
-CFLAGS+=	-I${.OBJDIR}
-CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
+CFLAGS+=	-I.
+CFLAGS+=	-I${RELOBJTOP}/lib/clang/libllvm
 CFLAGS+=	-I${CLANG_SRCS}/lib/Driver
 
 # Ensure FREEBSD_CC_VERSION is defined for Basic/Targets.cpp
Index: lib/clang/liblldb/Makefile
===================================================================
--- lib/clang/liblldb/Makefile
+++ lib/clang/liblldb/Makefile
@@ -10,8 +10,8 @@
 CFLAGS+=	-I${LLDB_SRCS}/source/Plugins/Process/FreeBSD
 CFLAGS+=	-I${LLDB_SRCS}/source/Plugins/Process/POSIX
 CFLAGS+=	-I${LLDB_SRCS}/source/Plugins/Process/Utility
-CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
-CFLAGS+=	-I${OBJTOP}/lib/clang/libclang
+CFLAGS+=	-I${RELOBJTOP}/lib/clang/libllvm
+CFLAGS+=	-I${RELOBJTOP}/lib/clang/libclang
 CFLAGS+=	-DLLDB_DISABLE_PYTHON
 
 SRCS+=		API/SBAddress.cpp
Index: lib/clang/libllvm/Makefile
===================================================================
--- lib/clang/libllvm/Makefile
+++ lib/clang/libllvm/Makefile
@@ -6,7 +6,7 @@
 LIB=		llvm
 INTERNALLIB=
 
-CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I.
 .for arch in AArch64 ARM Mips PowerPC Sparc X86
 CFLAGS+=	-I${LLVM_SRCS}/lib/Target/${arch}
 .endfor
@@ -1293,14 +1293,14 @@
 	    -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \
 	    ${LLVM_SRCS}/lib/ToolDrivers/llvm-lib/Options.td
 TGHDRS+=	llvm-lib/Options.inc
-CFLAGS.LibDriver.cpp+=	-I${.OBJDIR}/llvm-lib
+CFLAGS.LibDriver.cpp+=	-Illvm-lib
 
 llvm-dlltool/Options.inc: ${LLVM_SRCS}/lib/ToolDrivers/llvm-dlltool/Options.td
 	${LLVM_TBLGEN} -gen-opt-parser-defs \
 	    -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \
 	    ${LLVM_SRCS}/lib/ToolDrivers/llvm-dlltool/Options.td
 TGHDRS+=	llvm-dlltool/Options.inc
-CFLAGS.DlltoolDriver.cpp+=	-I${.OBJDIR}/llvm-dlltool
+CFLAGS.DlltoolDriver.cpp+=	-Illvm-dlltool
 
 beforebuild:
 # 20170724 remove stale Options.inc file, of which there are two different
Index: lib/libarchive/Makefile
===================================================================
--- lib/libarchive/Makefile
+++ lib/libarchive/Makefile
@@ -14,7 +14,7 @@
 SHLIB_MAJOR= 7
 
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
-CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I.
 
 .if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DWITH_OPENSSL
Index: lib/libarchive/tests/Makefile
===================================================================
--- lib/libarchive/tests/Makefile
+++ lib/libarchive/tests/Makefile
@@ -12,7 +12,7 @@
 
 PROGS+=	libarchive_test
 
-CFLAGS+= -I${.CURDIR} -I${.CURDIR:H} -I${.OBJDIR}
+CFLAGS+= -I${.CURDIR} -I${.CURDIR:H} -I.
 CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive -I${_LIBARCHIVEDIR}/libarchive/test
 CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils
 CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
Index: lib/libc/net/Makefile.inc
===================================================================
--- lib/libc/net/Makefile.inc
+++ lib/libc/net/Makefile.inc
@@ -26,7 +26,7 @@
 CFLAGS+=-DINET6
 .endif
 
-CFLAGS+=-I${.OBJDIR}
+CFLAGS+=-I.
 
 # name6.c refers res_private.h
 CFLAGS+=-I${LIBC_SRCTOP}/resolv
Index: lib/libc/tests/rpc/Makefile
===================================================================
--- lib/libc/tests/rpc/Makefile
+++ lib/libc/tests/rpc/Makefile
@@ -16,7 +16,7 @@
 	${RPCGEN} ${.ALLSRC:M*.x}
 
 CLEANFILES+=	${RPCSRC:.x=.h} ${RPCSRC:.x=.c} h_testbits_xdr.c
-CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I.
 
 LIBADD+=	rpcsvc util
 
Index: lib/libmagic/Makefile
===================================================================
--- lib/libmagic/Makefile
+++ lib/libmagic/Makefile
@@ -19,7 +19,7 @@
 MAGICPATH?=	/usr/share/misc
 
 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
-CFLAGS+= -I${.CURDIR} -I${.OBJDIR} -I${CONTRDIR}/src
+CFLAGS+= -I${.CURDIR} -I. -I${CONTRDIR}/src
 
 WARNS?=		3
 
Index: lib/libngatm/Makefile
===================================================================
--- lib/libngatm/Makefile
+++ lib/libngatm/Makefile
@@ -12,7 +12,7 @@
 CTRB=	${SRCTOP}/contrib/ngatm
 LIBBASE= ${SDIR}/contrib/ngatm
 
-CFLAGS+= -I${LIBBASE} -I${.OBJDIR} -I${CTRB}/libngatm
+CFLAGS+= -I${LIBBASE} -I. -I${CTRB}/libngatm
 # CFLAGS+= -DSSCOP_DEBUG -DSSCFU_DEBUG -DUNI_DEBUG -DCCATM_DEBUG
 
 .PATH: ${LIBBASE}/netnatm ${LIBBASE}/netnatm/saal ${LIBBASE}/netnatm/misc \
Index: lib/libpcap/Makefile
===================================================================
--- lib/libpcap/Makefile
+++ lib/libpcap/Makefile
@@ -97,7 +97,7 @@
 
 YFLAGS+=-p pcap_
 LFLAGS+=-Ppcap_ --header-file=${.OBJDIR}/scanner.h --nounput
-CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -I${.OBJDIR}
+CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -I.
 CFLAGS+=-D_U_="__attribute__((unused))"
 CFLAGS+=-DHAVE_SNPRINTF -DHAVE_VSNPRINTF
 CFLAGS+=-DBUILDING_PCAP
Index: lib/libsysdecode/Makefile
===================================================================
--- lib/libsysdecode/Makefile
+++ lib/libsysdecode/Makefile
@@ -8,7 +8,7 @@
 SRCS=	errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c
 INCS=	sysdecode.h
 
-CFLAGS+= -I${.OBJDIR}
+CFLAGS+= -I.
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/libexec/rtld-elf
 
Index: lib/libunbound/Makefile
===================================================================
--- lib/libunbound/Makefile
+++ lib/libunbound/Makefile
@@ -12,7 +12,7 @@
 PRIVATELIB=
 PACKAGE=	unbound
 
-CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR}
+CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I.
 
 SRCS=	alloc.c as112.c autotrust.c cachedb.c config_file.c configlexer.l \
 	configparser.y context.c dname.c dns.c dns64.c dnstree.c \
Index: lib/ncurses/config.mk
===================================================================
--- lib/ncurses/config.mk
+++ lib/ncurses/config.mk
@@ -15,7 +15,7 @@
 
 CFLAGS+=	-I.
 .if exists(${.OBJDIR:H}/ncurses${LIB_SUFFIX})
-CFLAGS+=	-I${.OBJDIR:H}/ncurses${LIB_SUFFIX}
+CFLAGS+=	-I../ncurses${LIB_SUFFIX}
 .endif
 CFLAGS+=	-I${.CURDIR:H}/ncurses${LIB_SUFFIX}
 
Index: secure/lib/libcrypto/Makefile
===================================================================
--- secure/lib/libcrypto/Makefile
+++ secure/lib/libcrypto/Makefile
@@ -400,7 +400,7 @@
 
 CSTD=	gnu89
 
-CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I.
 CFLAGS+=	-I${LCRYPTO_SRC}/crypto
 CFLAGS+=	-I${LCRYPTO_SRC}/crypto/asn1
 CFLAGS+=	-I${LCRYPTO_SRC}/crypto/evp
Index: share/mk/bsd.dep.mk
===================================================================
--- share/mk/bsd.dep.mk
+++ share/mk/bsd.dep.mk
@@ -146,7 +146,7 @@
 
 # DTrace probe definitions
 .if ${SRCS:M*.d}
-CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I.
 .endif
 .for _DSRC in ${SRCS:M*.d:N*/*}
 .for _D in ${_DSRC:R}
Index: share/mk/bsd.libnames.mk
===================================================================
--- share/mk/bsd.libnames.mk
+++ share/mk/bsd.libnames.mk
@@ -192,7 +192,7 @@
 
 # Derive LIB*SRCDIR from LIB*DIR
 .for lib in ${_LIBRARIES}
-LIB${lib:tu}SRCDIR?=	${SRCTOP}/${LIB${lib:tu}DIR:S,^${OBJTOP}/,,}
+LIB${lib:tu}SRCDIR?=	${SRCTOP}/${LIB${lib:tu}DIR:S,^${RELOBJTOP}/,,}
 .endfor
 .else
 
Index: share/mk/local.dirdeps.mk
===================================================================
--- share/mk/local.dirdeps.mk
+++ share/mk/local.dirdeps.mk
@@ -31,7 +31,7 @@
 # allowed to be built though since they are never installed.
 _need_host_libs=
 .for lib in ${_INTERNALLIBS}
-_need_host_libs+= ${LIB${lib:tu}DIR:S,^${OBJTOP}/,,}
+_need_host_libs+= ${LIB${lib:tu}DIR:S,^${RELOBJTOP}/,,}
 .endfor
 
 N_host_libs:= ${cd ${SRCTOP} && echo lib/lib*:L:sh:${_need_host_libs:${M_ListToSkip}}:${M_ListToSkip}}
@@ -180,7 +180,7 @@
 # This only works for DPADD with full OBJ/SRC paths, which is mostly just
 # _INTERNALLIBS.
 _DP_DIRDEPS= \
-	${_DPADD:O:u:M${OBJTOP}*:H:N.:tA:C,${OBJTOP}[^/]*/,,:N.:O:u} \
+	${_DPADD:O:u:C,^${RELOBJTOP}/,${OBJTOP}/,:M${OBJTOP}*:H:N.:tA:C,${OBJTOP}[^/]*/,,:N.:O:u} \
 	${_DPADD:O:u:M${OBJROOT}*:N${OBJTOP}*:N${STAGE_ROOT}/*:H:S,${OBJROOT},,:C,^([^/]+)/(.*),\2.\1,:S,${HOST_TARGET}$,host,:N.*:O:u}
 # Resolve the paths to RELDIRs
 .if !empty(_DP_DIRDEPS)
@@ -191,7 +191,7 @@
 .if !empty(_ALL_LIBADD)
 # Also handle LIBADD for non-internal libraries.
 .for _lib in ${_ALL_LIBADD:O:u}
-_lib${_lib}reldir= ${LIB${_lib:tu}DIR:C,${OBJTOP}/,,}
+_lib${_lib}reldir= ${LIB${_lib:tu}DIR:C,${RELOBJTOP}/,,}
 .if defined(LIB${_lib:tu}DIR) && ${DIRDEPS:M${_lib${_lib}reldir}} == "" && \
     exists(${SRCTOP}/${_lib${_lib}reldir})
 DIRDEPS+= ${_lib${_lib}reldir}
Index: share/mk/src.libnames.mk
===================================================================
--- share/mk/src.libnames.mk
+++ share/mk/src.libnames.mk
@@ -403,158 +403,158 @@
 .endfor
 
 # INTERNALLIB definitions.
-LIBELFTCDIR=	${OBJTOP}/lib/libelftc
+LIBELFTCDIR=	${RELOBJTOP}/lib/libelftc
 LIBELFTC?=	${LIBELFTCDIR}/libelftc.a
 
-LIBPEDIR=	${OBJTOP}/lib/libpe
+LIBPEDIR=	${RELOBJTOP}/lib/libpe
 LIBPE?=		${LIBPEDIR}/libpe.a
 
-LIBREADLINEDIR=	${OBJTOP}/gnu/lib/libreadline/readline
+LIBREADLINEDIR=	${RELOBJTOP}/gnu/lib/libreadline/readline
 LIBREADLINE?=	${LIBREADLINEDIR}/libreadline.a
 
-LIBOPENBSDDIR=	${OBJTOP}/lib/libopenbsd
+LIBOPENBSDDIR=	${RELOBJTOP}/lib/libopenbsd
 LIBOPENBSD?=	${LIBOPENBSDDIR}/libopenbsd.a
 
-LIBSMDIR=	${OBJTOP}/lib/libsm
+LIBSMDIR=	${RELOBJTOP}/lib/libsm
 LIBSM?=		${LIBSMDIR}/libsm.a
 
-LIBSMDBDIR=	${OBJTOP}/lib/libsmdb
+LIBSMDBDIR=	${RELOBJTOP}/lib/libsmdb
 LIBSMDB?=	${LIBSMDBDIR}/libsmdb.a
 
-LIBSMUTILDIR=	${OBJTOP}/lib/libsmutil
+LIBSMUTILDIR=	${RELOBJTOP}/lib/libsmutil
 LIBSMUTIL?=	${LIBSMUTILDIR}/libsmutil.a
 
-LIBNETBSDDIR?=	${OBJTOP}/lib/libnetbsd
+LIBNETBSDDIR?=	${RELOBJTOP}/lib/libnetbsd
 LIBNETBSD?=	${LIBNETBSDDIR}/libnetbsd.a
 
-LIBVERSDIR?=	${OBJTOP}/kerberos5/lib/libvers
+LIBVERSDIR?=	${RELOBJTOP}/kerberos5/lib/libvers
 LIBVERS?=	${LIBVERSDIR}/libvers.a
 
-LIBSLDIR=	${OBJTOP}/kerberos5/lib/libsl
+LIBSLDIR=	${RELOBJTOP}/kerberos5/lib/libsl
 LIBSL?=		${LIBSLDIR}/libsl.a
 
-LIBIPFDIR=	${OBJTOP}/sbin/ipf/libipf
+LIBIPFDIR=	${RELOBJTOP}/sbin/ipf/libipf
 LIBIPF?=	${LIBIPFDIR}/libipf.a
 
-LIBTELNETDIR=	${OBJTOP}/lib/libtelnet
+LIBTELNETDIR=	${RELOBJTOP}/lib/libtelnet
 LIBTELNET?=	${LIBTELNETDIR}/libtelnet.a
 
-LIBCRONDIR=	${OBJTOP}/usr.sbin/cron/lib
+LIBCRONDIR=	${RELOBJTOP}/usr.sbin/cron/lib
 LIBCRON?=	${LIBCRONDIR}/libcron.a
 
-LIBNTPDIR=	${OBJTOP}/usr.sbin/ntp/libntp
+LIBNTPDIR=	${RELOBJTOP}/usr.sbin/ntp/libntp
 LIBNTP?=	${LIBNTPDIR}/libntp.a
 
-LIBNTPEVENTDIR=	${OBJTOP}/usr.sbin/ntp/libntpevent
+LIBNTPEVENTDIR=	${RELOBJTOP}/usr.sbin/ntp/libntpevent
 LIBNTPEVENT?=	${LIBNTPEVENTDIR}/libntpevent.a
 
-LIBOPTSDIR=	${OBJTOP}/usr.sbin/ntp/libopts
+LIBOPTSDIR=	${RELOBJTOP}/usr.sbin/ntp/libopts
 LIBOPTS?=	${LIBOPTSDIR}/libopts.a
 
-LIBPARSEDIR=	${OBJTOP}/usr.sbin/ntp/libparse
+LIBPARSEDIR=	${RELOBJTOP}/usr.sbin/ntp/libparse
 LIBPARSE?=	${LIBPARSEDIR}/libparse.a
 
-LIBLPRDIR=	${OBJTOP}/usr.sbin/lpr/common_source
+LIBLPRDIR=	${RELOBJTOP}/usr.sbin/lpr/common_source
 LIBLPR?=	${LIBLPRDIR}/liblpr.a
 
-LIBFIFOLOGDIR=	${OBJTOP}/usr.sbin/fifolog/lib
+LIBFIFOLOGDIR=	${RELOBJTOP}/usr.sbin/fifolog/lib
 LIBFIFOLOG?=	${LIBFIFOLOGDIR}/libfifolog.a
 
-LIBBSNMPTOOLSDIR=	${OBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools
+LIBBSNMPTOOLSDIR=	${RELOBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools
 LIBBSNMPTOOLS?=	${LIBBSNMPTOOLSDIR}/libbsnmptools.a
 
-LIBAMUDIR=	${OBJTOP}/usr.sbin/amd/libamu
+LIBAMUDIR=	${RELOBJTOP}/usr.sbin/amd/libamu
 LIBAMU?=	${LIBAMUDIR}/libamu.a
 
-LIBPMCSTATDIR=	${OBJTOP}/lib/libpmcstat
+LIBPMCSTATDIR=	${RELOBJTOP}/lib/libpmcstat
 LIBPMCSTAT?=	${LIBPMCSTATDIR}/libpmcstat.a
 
 # Define a directory for each library.  This is useful for adding -L in when
 # not using a --sysroot or for meta mode bootstrapping when there is no
 # Makefile.depend.  These are sorted by directory.
-LIBAVLDIR=	${OBJTOP}/cddl/lib/libavl
-LIBCTFDIR=	${OBJTOP}/cddl/lib/libctf
-LIBDTRACEDIR=	${OBJTOP}/cddl/lib/libdtrace
-LIBNVPAIRDIR=	${OBJTOP}/cddl/lib/libnvpair
-LIBUMEMDIR=	${OBJTOP}/cddl/lib/libumem
-LIBUUTILDIR=	${OBJTOP}/cddl/lib/libuutil
-LIBZFSDIR=	${OBJTOP}/cddl/lib/libzfs
-LIBZFS_COREDIR=	${OBJTOP}/cddl/lib/libzfs_core
-LIBZPOOLDIR=	${OBJTOP}/cddl/lib/libzpool
-LIBCXGB4DIR=	${OBJTOP}/contrib/ofed/usr.lib/libcxgb4
-LIBIBCMDIR=	${OBJTOP}/contrib/ofed/usr.lib/libibcm
-LIBIBCOMMONDIR=	${OBJTOP}/contrib/ofed/usr.lib/libibcommon
-LIBIBMADDIR=	${OBJTOP}/contrib/ofed/usr.lib/libibmad
-LIBIBUMADDIR=	${OBJTOP}/contrib/ofed/usr.lib/libibumad
-LIBIBVERBSDIR=	${OBJTOP}/contrib/ofed/usr.lib/libibverbs
-LIBMLX4DIR=	${OBJTOP}/contrib/ofed/usr.lib/libmlx4
-LIBMTHCADIR=	${OBJTOP}/contrib/ofed/usr.lib/libmthca
-LIBOPENSMDIR=	${OBJTOP}/contrib/ofed/usr.lib/libopensm
-LIBOSMCOMPDIR=	${OBJTOP}/contrib/ofed/usr.lib/libosmcomp
-LIBOSMVENDORDIR=	${OBJTOP}/contrib/ofed/usr.lib/libosmvendor
-LIBRDMACMDIR=	${OBJTOP}/contrib/ofed/usr.lib/librdmacm
-LIBIBSDPDIR=	${OBJTOP}/contrib/ofed/usr.lib/libsdp
-LIBDIALOGDIR=	${OBJTOP}/gnu/lib/libdialog
-LIBGCOVDIR=	${OBJTOP}/gnu/lib/libgcov
-LIBGOMPDIR=	${OBJTOP}/gnu/lib/libgomp
-LIBGNUREGEXDIR=	${OBJTOP}/gnu/lib/libregex
-LIBSSPDIR=	${OBJTOP}/gnu/lib/libssp
-LIBSSP_NONSHAREDDIR=	${OBJTOP}/gnu/lib/libssp/libssp_nonshared
-LIBSUPCPLUSPLUSDIR=	${OBJTOP}/gnu/lib/libsupc++
-LIBASN1DIR=	${OBJTOP}/kerberos5/lib/libasn1
-LIBGSSAPI_KRB5DIR=	${OBJTOP}/kerberos5/lib/libgssapi_krb5
-LIBGSSAPI_NTLMDIR=	${OBJTOP}/kerberos5/lib/libgssapi_ntlm
-LIBGSSAPI_SPNEGODIR=	${OBJTOP}/kerberos5/lib/libgssapi_spnego
-LIBHDBDIR=	${OBJTOP}/kerberos5/lib/libhdb
-LIBHEIMBASEDIR=	${OBJTOP}/kerberos5/lib/libheimbase
-LIBHEIMIPCCDIR=	${OBJTOP}/kerberos5/lib/libheimipcc
-LIBHEIMIPCSDIR=	${OBJTOP}/kerberos5/lib/libheimipcs
-LIBHEIMNTLMDIR=	${OBJTOP}/kerberos5/lib/libheimntlm
-LIBHX509DIR=	${OBJTOP}/kerberos5/lib/libhx509
-LIBKADM5CLNTDIR=	${OBJTOP}/kerberos5/lib/libkadm5clnt
-LIBKADM5SRVDIR=	${OBJTOP}/kerberos5/lib/libkadm5srv
-LIBKAFS5DIR=	${OBJTOP}/kerberos5/lib/libkafs5
-LIBKDCDIR=	${OBJTOP}/kerberos5/lib/libkdc
-LIBKRB5DIR=	${OBJTOP}/kerberos5/lib/libkrb5
-LIBROKENDIR=	${OBJTOP}/kerberos5/lib/libroken
-LIBWINDDIR=	${OBJTOP}/kerberos5/lib/libwind
-LIBATF_CDIR=	${OBJTOP}/lib/atf/libatf-c
-LIBATF_CXXDIR=	${OBJTOP}/lib/atf/libatf-c++
-LIBALIASDIR=	${OBJTOP}/lib/libalias/libalias
-LIBBLACKLISTDIR=	${OBJTOP}/lib/libblacklist
-LIBBLOCKSRUNTIMEDIR=	${OBJTOP}/lib/libblocksruntime
-LIBBSNMPDIR=	${OBJTOP}/lib/libbsnmp/libbsnmp
-LIBCASPERDIR=	${OBJTOP}/lib/libcasper/libcasper
-LIBCAP_DNSDIR=	${OBJTOP}/lib/libcasper/services/cap_dns
-LIBCAP_GRPDIR=	${OBJTOP}/lib/libcasper/services/cap_grp
-LIBCAP_PWDDIR=	${OBJTOP}/lib/libcasper/services/cap_pwd
-LIBCAP_RANDOMDIR=	${OBJTOP}/lib/libcasper/services/cap_random
-LIBCAP_SYSCTLDIR=	${OBJTOP}/lib/libcasper/services/cap_sysctl
-LIBBSDXMLDIR=	${OBJTOP}/lib/libexpat
-LIBKVMDIR=	${OBJTOP}/lib/libkvm
-LIBPTHREADDIR=	${OBJTOP}/lib/libthr
-LIBMDIR=	${OBJTOP}/lib/msun
-LIBFORMDIR=	${OBJTOP}/lib/ncurses/form
-LIBFORMLIBWDIR=	${OBJTOP}/lib/ncurses/formw
-LIBMENUDIR=	${OBJTOP}/lib/ncurses/menu
-LIBMENULIBWDIR=	${OBJTOP}/lib/ncurses/menuw
-LIBNCURSESDIR=	${OBJTOP}/lib/ncurses/ncurses
-LIBNCURSESWDIR=	${OBJTOP}/lib/ncurses/ncursesw
-LIBPANELDIR=	${OBJTOP}/lib/ncurses/panel
-LIBPANELWDIR=	${OBJTOP}/lib/ncurses/panelw
-LIBCRYPTODIR=	${OBJTOP}/secure/lib/libcrypto
-LIBSSHDIR=	${OBJTOP}/secure/lib/libssh
-LIBSSLDIR=	${OBJTOP}/secure/lib/libssl
-LIBTEKENDIR=	${OBJTOP}/sys/teken/libteken
-LIBEGACYDIR=	${OBJTOP}/tools/build
-LIBLNDIR=	${OBJTOP}/usr.bin/lex/lib
+LIBAVLDIR=	${RELOBJTOP}/cddl/lib/libavl
+LIBCTFDIR=	${RELOBJTOP}/cddl/lib/libctf
+LIBDTRACEDIR=	${RELOBJTOP}/cddl/lib/libdtrace
+LIBNVPAIRDIR=	${RELOBJTOP}/cddl/lib/libnvpair
+LIBUMEMDIR=	${RELOBJTOP}/cddl/lib/libumem
+LIBUUTILDIR=	${RELOBJTOP}/cddl/lib/libuutil
+LIBZFSDIR=	${RELOBJTOP}/cddl/lib/libzfs
+LIBZFS_COREDIR=	${RELOBJTOP}/cddl/lib/libzfs_core
+LIBZPOOLDIR=	${RELOBJTOP}/cddl/lib/libzpool
+LIBCXGB4DIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libcxgb4
+LIBIBCMDIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libibcm
+LIBIBCOMMONDIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libibcommon
+LIBIBMADDIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libibmad
+LIBIBUMADDIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libibumad
+LIBIBVERBSDIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libibverbs
+LIBMLX4DIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libmlx4
+LIBMTHCADIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libmthca
+LIBOPENSMDIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libopensm
+LIBOSMCOMPDIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libosmcomp
+LIBOSMVENDORDIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libosmvendor
+LIBRDMACMDIR=	${RELOBJTOP}/contrib/ofed/usr.lib/librdmacm
+LIBIBSDPDIR=	${RELOBJTOP}/contrib/ofed/usr.lib/libsdp
+LIBDIALOGDIR=	${RELOBJTOP}/gnu/lib/libdialog
+LIBGCOVDIR=	${RELOBJTOP}/gnu/lib/libgcov
+LIBGOMPDIR=	${RELOBJTOP}/gnu/lib/libgomp
+LIBGNUREGEXDIR=	${RELOBJTOP}/gnu/lib/libregex
+LIBSSPDIR=	${RELOBJTOP}/gnu/lib/libssp
+LIBSSP_NONSHAREDDIR=	${RELOBJTOP}/gnu/lib/libssp/libssp_nonshared
+LIBSUPCPLUSPLUSDIR=	${RELOBJTOP}/gnu/lib/libsupc++
+LIBASN1DIR=	${RELOBJTOP}/kerberos5/lib/libasn1
+LIBGSSAPI_KRB5DIR=	${RELOBJTOP}/kerberos5/lib/libgssapi_krb5
+LIBGSSAPI_NTLMDIR=	${RELOBJTOP}/kerberos5/lib/libgssapi_ntlm
+LIBGSSAPI_SPNEGODIR=	${RELOBJTOP}/kerberos5/lib/libgssapi_spnego
+LIBHDBDIR=	${RELOBJTOP}/kerberos5/lib/libhdb
+LIBHEIMBASEDIR=	${RELOBJTOP}/kerberos5/lib/libheimbase
+LIBHEIMIPCCDIR=	${RELOBJTOP}/kerberos5/lib/libheimipcc
+LIBHEIMIPCSDIR=	${RELOBJTOP}/kerberos5/lib/libheimipcs
+LIBHEIMNTLMDIR=	${RELOBJTOP}/kerberos5/lib/libheimntlm
+LIBHX509DIR=	${RELOBJTOP}/kerberos5/lib/libhx509
+LIBKADM5CLNTDIR=	${RELOBJTOP}/kerberos5/lib/libkadm5clnt
+LIBKADM5SRVDIR=	${RELOBJTOP}/kerberos5/lib/libkadm5srv
+LIBKAFS5DIR=	${RELOBJTOP}/kerberos5/lib/libkafs5
+LIBKDCDIR=	${RELOBJTOP}/kerberos5/lib/libkdc
+LIBKRB5DIR=	${RELOBJTOP}/kerberos5/lib/libkrb5
+LIBROKENDIR=	${RELOBJTOP}/kerberos5/lib/libroken
+LIBWINDDIR=	${RELOBJTOP}/kerberos5/lib/libwind
+LIBATF_CDIR=	${RELOBJTOP}/lib/atf/libatf-c
+LIBATF_CXXDIR=	${RELOBJTOP}/lib/atf/libatf-c++
+LIBALIASDIR=	${RELOBJTOP}/lib/libalias/libalias
+LIBBLACKLISTDIR=	${RELOBJTOP}/lib/libblacklist
+LIBBLOCKSRUNTIMEDIR=	${RELOBJTOP}/lib/libblocksruntime
+LIBBSNMPDIR=	${RELOBJTOP}/lib/libbsnmp/libbsnmp
+LIBCASPERDIR=	${RELOBJTOP}/lib/libcasper/libcasper
+LIBCAP_DNSDIR=	${RELOBJTOP}/lib/libcasper/services/cap_dns
+LIBCAP_GRPDIR=	${RELOBJTOP}/lib/libcasper/services/cap_grp
+LIBCAP_PWDDIR=	${RELOBJTOP}/lib/libcasper/services/cap_pwd
+LIBCAP_RANDOMDIR=	${RELOBJTOP}/lib/libcasper/services/cap_random
+LIBCAP_SYSCTLDIR=	${RELOBJTOP}/lib/libcasper/services/cap_sysctl
+LIBBSDXMLDIR=	${RELOBJTOP}/lib/libexpat
+LIBKVMDIR=	${RELOBJTOP}/lib/libkvm
+LIBPTHREADDIR=	${RELOBJTOP}/lib/libthr
+LIBMDIR=	${RELOBJTOP}/lib/msun
+LIBFORMDIR=	${RELOBJTOP}/lib/ncurses/form
+LIBFORMLIBWDIR=	${RELOBJTOP}/lib/ncurses/formw
+LIBMENUDIR=	${RELOBJTOP}/lib/ncurses/menu
+LIBMENULIBWDIR=	${RELOBJTOP}/lib/ncurses/menuw
+LIBNCURSESDIR=	${RELOBJTOP}/lib/ncurses/ncurses
+LIBNCURSESWDIR=	${RELOBJTOP}/lib/ncurses/ncursesw
+LIBPANELDIR=	${RELOBJTOP}/lib/ncurses/panel
+LIBPANELWDIR=	${RELOBJTOP}/lib/ncurses/panelw
+LIBCRYPTODIR=	${RELOBJTOP}/secure/lib/libcrypto
+LIBSSHDIR=	${RELOBJTOP}/secure/lib/libssh
+LIBSSLDIR=	${RELOBJTOP}/secure/lib/libssl
+LIBTEKENDIR=	${RELOBJTOP}/sys/teken/libteken
+LIBEGACYDIR=	${RELOBJTOP}/tools/build
+LIBLNDIR=	${RELOBJTOP}/usr.bin/lex/lib
 
 LIBTERMCAPDIR=	${LIBNCURSESDIR}
 LIBTERMCAPWDIR=	${LIBNCURSESWDIR}
 
 # Default other library directories to lib/libNAME.
 .for lib in ${_LIBRARIES}
-LIB${lib:tu}DIR?=	${OBJTOP}/lib/lib${lib}
+LIB${lib:tu}DIR?=	${RELOBJTOP}/lib/lib${lib}
 .endfor
 
 # Validate that listed LIBADD are valid.
@@ -575,8 +575,8 @@
 .endif
 # Note that OBJTOP is not yet defined here but for the purpose of the check
 # it is fine as it resolves to the SRC directory.
-.if !defined(LIB${LIB:tu}DIR) || !exists(${SRCTOP}/${LIB${LIB:tu}DIR:S,^${OBJTOP}/,,})
-.error ${.CURDIR}: Missing or incorrect value for LIB${LIB:tu}DIR in ${_this:T}: ${LIB${LIB:tu}DIR:S,^${OBJTOP}/,,}
+.if !defined(LIB${LIB:tu}DIR) || !exists(${SRCTOP}/${LIB${LIB:tu}DIR:S,^${RELOBJTOP}/,,})
+.error ${.CURDIR}: Missing or incorrect value for LIB${LIB:tu}DIR in ${_this:T}: ${LIB${LIB:tu}DIR:S,^${RELOBJTOP}/,,}
 .endif
 .if ${_INTERNALLIBS:M${LIB}} != "" && !defined(LIB${LIB:tu})
 .error ${.CURDIR}: Missing value for LIB${LIB:tu} in ${_this:T}.  Likely should be: LIB${LIB:tu}?= $${LIB${LIB:tu}DIR}/lib${LIB}.a
Index: sys/boot/defs.mk
===================================================================
--- sys/boot/defs.mk
+++ sys/boot/defs.mk
@@ -17,7 +17,7 @@
 UBOOTSRC=	${BOOTSRC}/uboot
 ZFSSRC=		${BOOTSRC}/zfs
 
-BOOTOBJ=	${OBJTOP}/sys/boot
+BOOTOBJ=	${RELOBJTOP}/sys/boot
 
 # BINDIR is where we install
 BINDIR?=	/boot
Index: tests/sys/kern/acct/Makefile
===================================================================
--- tests/sys/kern/acct/Makefile
+++ tests/sys/kern/acct/Makefile
@@ -4,7 +4,7 @@
 
 ATF_TESTS_C=	acct_test
 
-CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I.
 
 CLEANFILES+=	convert.c convert.c.tmp
 
Index: tools/tools/ath/Makefile.inc
===================================================================
--- tools/tools/ath/Makefile.inc
+++ tools/tools/ath/Makefile.inc
@@ -12,4 +12,4 @@
 CFLAGS+=-I${.CURDIR}/../../../../sys/dev/ath
 CFLAGS+=-I${.CURDIR}/../../../../sys/dev/ath/ath_hal
 CFLAGS+=-I${.CURDIR}/../../../../sys/contrib/dev/ath/ath_hal
-CFLAGS+=-I${.OBJDIR}
+CFLAGS+=-I.
Index: usr.bin/bsdcat/tests/Makefile
===================================================================
--- usr.bin/bsdcat/tests/Makefile
+++ usr.bin/bsdcat/tests/Makefile
@@ -11,9 +11,9 @@
 PROGS+=		bsdcat_test
 
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
-CFLAGS+=	-I${SRCTOP}/lib/libarchive -I${.OBJDIR}
+CFLAGS+=	-I${SRCTOP}/lib/libarchive -I.
 
-CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I.
 CFLAGS+=	-I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/cat/test
 CFLAGS+=	-I${_LIBARCHIVEDIR}/libarchive
 CFLAGS+=	-I${_LIBARCHIVEDIR}/libarchive_fe -I${_LIBARCHIVEDIR}/test_utils
Index: usr.bin/clang/clang.prog.mk
===================================================================
--- usr.bin/clang/clang.prog.mk
+++ usr.bin/clang/clang.prog.mk
@@ -2,8 +2,8 @@
 
 .include "${SRCTOP}/lib/clang/clang.pre.mk"
 
-CFLAGS+=	-I${OBJTOP}/lib/clang/libclang
-CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
+CFLAGS+=	-I${RELOBJTOP}/lib/clang/libclang
+CFLAGS+=	-I${RELOBJTOP}/lib/clang/libllvm
 
 .include "${SRCTOP}/lib/clang/clang.build.mk"
 
@@ -11,8 +11,8 @@
 LIBDEPS+=	llvm
 
 .for lib in ${LIBDEPS}
-DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
-LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
+DPADD+=		${RELOBJTOP}/lib/clang/lib${lib}/lib${lib}.a
+LDADD+=		${RELOBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
 PACKAGE=	clang
Index: usr.bin/clang/lld/Makefile
===================================================================
--- usr.bin/clang/lld/Makefile
+++ usr.bin/clang/lld/Makefile
@@ -14,8 +14,8 @@
 
 CFLAGS+=	-I${LLD_SRCS}/ELF
 CFLAGS+=	-I${LLD_SRCS}/include
-CFLAGS+=	-I${.OBJDIR}
-CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
+CFLAGS+=	-I.
+CFLAGS+=	-I${RELOBJTOP}/lib/clang/libllvm
 
 SRCDIR=		tools/lld
 SRCS+=		ELF/Arch/AArch64.cpp
@@ -69,8 +69,8 @@
 LIBDEPS+=	llvm
 
 .for lib in ${LIBDEPS}
-DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
-LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
+DPADD+=		${RELOBJTOP}/lib/clang/lib${lib}/lib${lib}.a
+LDADD+=		${RELOBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
 LLVM_TBLGEN?=	llvm-tblgen
Index: usr.bin/clang/lldb/Makefile
===================================================================
--- usr.bin/clang/lldb/Makefile
+++ usr.bin/clang/lldb/Makefile
@@ -19,8 +19,8 @@
 LIBDEPS+=	llvm
 
 .for lib in ${LIBDEPS}
-DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
-LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
+DPADD+=		${RELOBJTOP}/lib/clang/lib${lib}/lib${lib}.a
+LDADD+=		${RELOBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
 LIBADD+=	edit
Index: usr.bin/clang/llvm.prog.mk
===================================================================
--- usr.bin/clang/llvm.prog.mk
+++ usr.bin/clang/llvm.prog.mk
@@ -2,7 +2,7 @@
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
-CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
+CFLAGS+=	-I${RELOBJTOP}/lib/clang/libllvm
 
 .include "${SRCTOP}/lib/clang/llvm.build.mk"
 
@@ -15,8 +15,8 @@
 .endif
 
 .for lib in ${LIBDEPS}
-DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
-LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
+DPADD+=		${RELOBJTOP}/lib/clang/lib${lib}/lib${lib}.a
+LDADD+=		${RELOBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
 PACKAGE=	clang
Index: usr.bin/cpio/tests/Makefile
===================================================================
--- usr.bin/cpio/tests/Makefile
+++ usr.bin/cpio/tests/Makefile
@@ -11,9 +11,9 @@
 PROGS+=		bsdcpio_test
 
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
-CFLAGS+=	-I${SRCTOP}/lib/libarchive -I${.OBJDIR}
+CFLAGS+=	-I${SRCTOP}/lib/libarchive -I.
 
-CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I.
 CFLAGS+=	-I${_LIBARCHIVEDIR}/cpio -I${_LIBARCHIVEDIR}/cpio/test
 CFLAGS+=	-I${_LIBARCHIVEDIR}/libarchive
 CFLAGS+=	-I${_LIBARCHIVEDIR}/libarchive_fe -I${_LIBARCHIVEDIR}/test_utils
Index: usr.bin/fortune/Makefile.inc
===================================================================
--- usr.bin/fortune/Makefile.inc
+++ usr.bin/fortune/Makefile.inc
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 FORTUNE_SRC=	${SRCTOP}/usr.bin/fortune
-FORTUNE_OBJ=	${OBJTOP}/usr.bin/fortune
+FORTUNE_OBJ=	${RELOBJTOP}/usr.bin/fortune
 
 .include "${SRCTOP}/usr.bin/Makefile.inc"
Index: usr.bin/getaddrinfo/Makefile
===================================================================
--- usr.bin/getaddrinfo/Makefile
+++ usr.bin/getaddrinfo/Makefile
@@ -11,7 +11,7 @@
 
 SYS_SOCKET_H?=	${SRCTOP}/sys/sys/socket.h
 
-CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I.
 CLEANFILES+=	tables.h
 tables.h: tables.awk ${SYS_SOCKET_H}
 	LC_ALL=C awk -f ${.ALLSRC} > ${.TARGET}
Index: usr.bin/netstat/Makefile
===================================================================
--- usr.bin/netstat/Makefile
+++ usr.bin/netstat/Makefile
@@ -28,7 +28,7 @@
 	    !/^\#/ { printf("\#define\tN%s\t%s\n", toupper($$2), i++); }' \
 	    < ${.ALLSRC} > ${.TARGET} || rm -f ${.TARGET}
 CLEANFILES+=	nl_symbols.c nl_defs.h
-CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I.
 
 WARNS?=	3
 CFLAGS+=-fno-strict-aliasing
Index: usr.bin/tar/tests/Makefile
===================================================================
--- usr.bin/tar/tests/Makefile
+++ usr.bin/tar/tests/Makefile
@@ -9,7 +9,7 @@
 BINDIR=		${TESTSDIR}
 
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
-CFLAGS+=	-I${SRCTOP}/lib/libarchive -I${.OBJDIR}
+CFLAGS+=	-I${SRCTOP}/lib/libarchive -I.
 CFLAGS+=	-I${_LIBARCHIVEDIR}/libarchive
 CFLAGS+=	-I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/tar/test
 CFLAGS+=	-I${_LIBARCHIVEDIR}/test_utils
Index: usr.sbin/amd/Makefile.inc
===================================================================
--- usr.sbin/amd/Makefile.inc
+++ usr.sbin/amd/Makefile.inc
@@ -16,7 +16,7 @@
 CFLAGS+= -I. -I${.CURDIR}
 CFLAGS+= -I${.CURDIR:H}/include
 .if exists(${.OBJDIR:H}/include)
-CFLAGS+= -I${.OBJDIR:H}/include
+CFLAGS+= -I../include
 .endif
 CFLAGS+= -I${SRCTOP}/contrib/amd/include
 CFLAGS+= -I${SRCTOP}/contrib/amd
Index: usr.sbin/amd/amd/Makefile
===================================================================
--- usr.sbin/amd/amd/Makefile
+++ usr.sbin/amd/amd/Makefile
@@ -28,7 +28,7 @@
 
 CFLAGS+= -I${SRCTOP}/contrib/amd/amd \
 	 -I${SRCTOP}/contrib/amd/include \
-	 -I${OBJTOP}/include/rpcsvc
+	 -I${RELOBJTOP}/include/rpcsvc
 
 LIBADD=	amu
 
Index: usr.sbin/amd/libamu/Makefile
===================================================================
--- usr.sbin/amd/libamu/Makefile
+++ usr.sbin/amd/libamu/Makefile
@@ -25,7 +25,7 @@
 CLEANFILES+=	nfs_prot_x.c xdr_func_%undef.c
 
 CFLAGS+= -I${SRCTOP}/contrib/amd/libamu \
-	 -I${OBJTOP}/include/rpcsvc
+	 -I${RELOBJTOP}/include/rpcsvc
 
 nfs_prot_x.c: ${NFS_PROT_X}
 	${RPCCOM} -c -C -DWANT_NFS3 ${.ALLSRC} -o ${.TARGET}