Index: bin/dd/Makefile
===================================================================
RCS file: /cvsroot/src/bin/dd/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- bin/dd/Makefile	18 Mar 2015 13:23:49 -0000	1.18
+++ bin/dd/Makefile	15 Sep 2019 23:53:01 -0000
@@ -12,7 +12,7 @@
 .ifdef SMALLPROG
 CPPFLAGS+=	-DNO_CONV -DNO_MSGFMT -DNO_IOFLAG -DSMALL
 .else
-CPPFLAGS+=	-D_NETBSD_SOURCE -D_INCOMPLETE_XOPEN_C063
+CPPFLAGS+=	-D_NETBSD_SOURCE
 SRCS+=		conv_tab.c
 .ifdef CRUNCHEDPROG
 CPPFLAGS+=	-DSMALL
Index: lib/librumphijack/Makefile
===================================================================
RCS file: /cvsroot/src/lib/librumphijack/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- lib/librumphijack/Makefile	17 Feb 2019 23:33:20 -0000	1.21
+++ lib/librumphijack/Makefile	15 Sep 2019 23:53:01 -0000
@@ -11,7 +11,6 @@
 SRCS=		hijack.c hijackdlsym.c
 
 CPPFLAGS+=	-D_DIAGNOSTIC -D_REENTRANT
-CPPFLAGS.hijack.c+= -D_INCOMPLETE_XOPEN_C063
 
 WARNS?=		5
 
Index: include/limits.h
===================================================================
RCS file: /cvsroot/src/include/limits.h,v
retrieving revision 1.41
diff -u -r1.41 limits.h
--- include/limits.h	15 Sep 2019 23:41:00 -0000	1.41
+++ include/limits.h	15 Sep 2019 23:53:01 -0000
@@ -144,12 +144,6 @@
 
 #define MB_LEN_MAX		32	/* Allow ISO/IEC 2022 */
 
-/*
- * X/Open Extended API set 2 (a.k.a. C063)
- * This hides unimplemented functions from GNU configure until
- * we are done implementing them.
- */
-
 #include <machine/limits.h>
 
 #ifdef __CHAR_UNSIGNED__
Index: sys/arch/amd64/conf/GENERIC
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/conf/GENERIC,v
retrieving revision 1.535
diff -u -r1.535 GENERIC
--- sys/arch/amd64/conf/GENERIC	14 Sep 2019 06:57:51 -0000	1.535
+++ sys/arch/amd64/conf/GENERIC	15 Sep 2019 23:53:02 -0000
@@ -74,8 +74,8 @@
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
 # CPU-related options
-#options 	USER_LDT	# User-settable LDT, used by Wine
-options 	SVS		# Separate Virtual Space
+options 	USER_LDT	# User-settable LDT, used by Wine
+#options 	SVS		# Separate Virtual Space
 makeoptions	SPECTRE_V2_GCC_MITIGATION=1	# GCC Spectre variant 2
 						# migitation
 options 	SPECTRE_V2_GCC_MITIGATION
Index: sys/sys/fcntl.h
===================================================================
RCS file: /cvsroot/src/sys/sys/fcntl.h,v
retrieving revision 1.52
diff -u -r1.52 fcntl.h
--- sys/sys/fcntl.h	15 Sep 2019 20:25:48 -0000	1.52
+++ sys/sys/fcntl.h	15 Sep 2019 23:53:03 -0000
@@ -115,7 +115,7 @@
 #define	O_DIRECTORY	0x00200000	/* fail if not a directory */
 #define	O_CLOEXEC	0x00400000	/* set close on exec */
 #if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0 >= 700) || \
-    defined(_INCOMPLETE_XOPEN_C063) || defined(_NETBSD_SOURCE)
+    defined(_NETBSD_SOURCE)
 #define	O_SEARCH	0x00800000	/* skip search permission checks */
 #endif
 #if defined(_NETBSD_SOURCE)
@@ -295,7 +295,7 @@
  * Constants for X/Open Extended API set 2 (a.k.a. C063)
  */
 #if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0 >= 700) || \
-    defined(_INCOMPLETE_XOPEN_C063) || defined(_NETBSD_SOURCE)
+    defined(_NETBSD_SOURCE)
 #define	AT_FDCWD		-100	/* Use cwd for relative link target */
 #define	AT_EACCESS		0x100	/* Use euig/egid for access checks */
 #define	AT_SYMLINK_NOFOLLOW	0x200	/* Do not follow symlinks */
@@ -328,7 +328,7 @@
  * X/Open Extended API set 2 (a.k.a. C063)
  */
 #if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0 >= 700) || \
-    defined(_INCOMPLETE_XOPEN_C063) || defined(_NETBSD_SOURCE)
+    defined(_NETBSD_SOURCE)
 int	openat(int, const char *, int, ...);
 #endif
 
Index: sys/sys/stat.h
===================================================================
RCS file: /cvsroot/src/sys/sys/stat.h,v
retrieving revision 1.68
diff -u -r1.68 stat.h
--- sys/sys/stat.h	17 Oct 2013 18:01:11 -0000	1.68
+++ sys/sys/stat.h	15 Sep 2019 23:53:03 -0000
@@ -273,7 +273,7 @@
  * X/Open Extended API set 2 (a.k.a. C063)
  */
 #if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0) >= 700 || \
-    defined(_NETBSD_SOURCE) || defined(_INCOMPLETE_XOPEN_C063)
+    defined(_NETBSD_SOURCE)
 int     fchmodat(int, const char *, mode_t, int);
 int     fstatat(int, const char *, struct stat *, int);
 int     mkdirat(int, const char *, mode_t);