4 files changed, 30 insertions, 11 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 81379ea452bb..648d0d3b297d 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -5292,11 +5292,29 @@ OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/07.lpd
 OLD_FILES+=usr/share/examples/etc/hosts.lpd
 OLD_FILES+=usr/share/examples/etc/printcap
+OLD_FILES+=usr/share/examples/printing/diablo-if-net
+OLD_FILES+=usr/share/examples/printing/hpdf
+OLD_FILES+=usr/share/examples/printing/hpif
+OLD_FILES+=usr/share/examples/printing/hpof
+OLD_FILES+=usr/share/examples/printing/hprf
+OLD_FILES+=usr/share/examples/printing/hpvf
+OLD_FILES+=usr/share/examples/printing/if-simple
+OLD_FILES+=usr/share/examples/printing/if-simpleX
+OLD_FILES+=usr/share/examples/printing/ifhp
+OLD_FILES+=usr/share/examples/printing/make-ps-header
+OLD_FILES+=usr/share/examples/printing/netprint
+OLD_FILES+=usr/share/examples/printing/psdf
+OLD_FILES+=usr/share/examples/printing/psdfX
+OLD_FILES+=usr/share/examples/printing/psif
+OLD_FILES+=usr/share/examples/printing/pstf
+OLD_FILES+=usr/share/examples/printing/pstfX
+OLD_DIRS+=usr/share/examples/printing
 OLD_FILES+=usr/share/man/man1/lp.1.gz
 OLD_FILES+=usr/share/man/man1/lpq.1.gz
 OLD_FILES+=usr/share/man/man1/lpr.1.gz
 OLD_FILES+=usr/share/man/man1/lprm.1.gz
 OLD_FILES+=usr/share/man/man1/lptest.1.gz
+OLD_FILES+=usr/share/man/man5/hosts.lpd.5.gz
 OLD_FILES+=usr/share/man/man5/printcap.5.gz
 OLD_FILES+=usr/share/man/man8/chkprintcap.8.gz
 OLD_FILES+=usr/share/man/man8/lpc.8.gz
diff --git a/tools/build/options/WITHOUT_GNU_DIFF b/tools/build/options/WITHOUT_GNU_DIFF
deleted file mode 100644
index 4ea9f6f4a363..000000000000
--- a/tools/build/options/WITHOUT_GNU_DIFF
+++ /dev/null
@@ -1,5 +0,0 @@
-Do not build GNU
-.Xr diff3 1 ;
-build BSD
-.Xr diff3 1
-instead.
diff --git a/tools/build/options/WITH_GNU_DIFF b/tools/build/options/WITH_GNU_DIFF
deleted file mode 100644
index cc7fbf25119a..000000000000
--- a/tools/build/options/WITH_GNU_DIFF
+++ /dev/null
@@ -1,4 +0,0 @@
-Build and install GNU
-.Xr diff3 1
-instead of BSD
-.Xr diff3 1 .
diff --git a/tools/build/stddef.h b/tools/build/stddef.h
index 77348dd57149..ca6d481a9d29 100644
--- a/tools/build/stddef.h
+++ b/tools/build/stddef.h
@@ -36,14 +36,24 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#pragma once
+
+/*
+ * The header guard is left out on purpose here. Both clang and gcc's
+ * stddef.h are designed to be included multiple times with different
+ * combinations of __need_* macros defined (e.g __need_size_t).
+ */
+
 #include_next <stddef.h>
 
 #ifndef _PTRADDR_T_DECLARED
 #ifdef __PTRADDR_TYPE__
 typedef	__PTRADDR_TYPE__	ptraddr_t;
 #else
-typedef	size_t			ptraddr_t;
+/*
+ * If anything other than __need_size_t is defined (see above), we won't
+ * have size_t. Use __SIZE_TYPE__ instead.
+ */
+typedef	__SIZE_TYPE__		ptraddr_t;
 #endif
 #define _PTRADDR_T_DECLARED
 #endif