Index: sys/sys/exec_elf.h
===================================================================
RCS file: /cvsroot/src/sys/sys/exec_elf.h,v
retrieving revision 1.87
diff -u -r1.87 exec_elf.h
--- sys/sys/exec_elf.h	30 Aug 2006 11:35:21 -0000	1.87
+++ sys/sys/exec_elf.h	21 Nov 2006 22:20:27 -0000
@@ -61,7 +61,11 @@
 #define	ELFDEFNNAME(x)	CONCAT(ELF,CONCAT(ELFSIZE,CONCAT(_,x)))
 #endif
 
+#if HAVE_NBTOOL_CONFIG_H
+#include <nbinclude/machine/elf_machdep.h>
+#else
 #include <machine/elf_machdep.h>
+#endif
 
 typedef	uint8_t  	Elf_Byte;
 
Index: tools/Makefile
===================================================================
RCS file: /cvsroot/src/tools/Makefile,v
retrieving revision 1.109
diff -u -r1.109 Makefile
--- tools/Makefile	17 Nov 2006 21:54:55 -0000	1.109
+++ tools/Makefile	21 Nov 2006 22:20:27 -0000
@@ -25,7 +25,7 @@
 .if !defined(NOSUBDIR)					# {
 
 SUBDIR=	host-mkdep .WAIT compat .WAIT \
-	binstall .WAIT paxctl .WAIT mktemp .WAIT \
+	binstall .WAIT mktemp .WAIT \
 		cap_mkdb crunchgen ctags genassym gencat hexdump \
 		${LINT_BITS} \
 		lorder m4 makewhatis mkdep mtree rpcgen sed tsort uudecode \
@@ -38,6 +38,7 @@
 		makefs menuc mkcsmapper mkesdb mklocale mknod msgc \
 		pax .WAIT \
 		disklabel .WAIT \
+		paxctl .WAIT \
 		fdisk .WAIT \
 		installboot .WAIT \
 		pwd_mkdb stat sunlabel zic
Index: tools/Makefile.disklabel
===================================================================
RCS file: /cvsroot/src/tools/Makefile.disklabel,v
retrieving revision 1.6
diff -u -r1.6 Makefile.disklabel
--- tools/Makefile.disklabel	14 Feb 2006 04:59:33 -0000	1.6
+++ tools/Makefile.disklabel	21 Nov 2006 22:20:27 -0000
@@ -7,7 +7,8 @@
 _SUBDIR!=	cd ${_ARCHDIR} && ${MAKE} -V SUBDIR
 
 _UFS_INCS!=	cd ${_UFSDIR} && find ffs ufs -name '*.h'
-_ARCH_INCS!=	cd ${_ARCHDIR} && find . -name disklabel.h
+_ARCH_INCS!=	cd ${_ARCHDIR} && find . -name disklabel.h -or \
+		    -name elf_machdep.h
 
 _ARCH_INCS+=	ews4800mips/include/pdinfo.h ews4800mips/include/vtoc.h
 
Index: tools/paxctl/Makefile
===================================================================
RCS file: /cvsroot/src/tools/paxctl/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- tools/paxctl/Makefile	10 Nov 2006 16:50:10 -0000	1.1
+++ tools/paxctl/Makefile	21 Nov 2006 22:20:27 -0000
@@ -3,4 +3,5 @@
 HOSTPROGNAME=	${_TOOL_PREFIX}paxctl
 HOST_SRCDIR=	usr.bin/paxctl
 
+.include "${.CURDIR}/../Makefile.disklabel"
 .include "${.CURDIR}/../Makefile.host"
Index: usr.bin/paxctl/paxctl.c
===================================================================
RCS file: /cvsroot/src/usr.bin/paxctl/paxctl.c,v
retrieving revision 1.8
diff -u -r1.8 paxctl.c
--- usr.bin/paxctl/paxctl.c	20 Nov 2006 16:51:44 -0000	1.8
+++ usr.bin/paxctl/paxctl.c	21 Nov 2006 22:20:27 -0000
@@ -41,7 +41,11 @@
 #endif /* not lint */
 
 #include <sys/types.h>
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include "../../sys/sys/exec_elf.h"
+#else
 #include <elf.h>
+#endif
 #include <stdio.h>
 #include <err.h>
 #include <fcntl.h>