--- Libc/Libc-1725.40.4/include/NetBSD/utmpx.h
+++ Libc/Libc-825.24/include/NetBSD/utmpx.h
@@ -60,18 +60,22 @@
 #ifndef	_UTMPX_H_
 #define	_UTMPX_H_
 
-#include <_bounds.h>
 #include <_types.h>
 #include <sys/time.h>
 #include <sys/cdefs.h>
 #include <Availability.h>
-#include <sys/_types/_pid_t.h>
+
+#ifndef _PID_T
+#define _PID_T
+typedef __darwin_pid_t     pid_t;
+#endif
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#include <sys/_types/_uid_t.h>
+#ifndef _UID_T
+#define _UID_T
+typedef __darwin_uid_t     uid_t;
+#endif
 #endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
-
-_LIBC_SINGLE_BY_DEFAULT()
 
 #define	_PATH_UTMPX		"/var/run/utmpx"
 
@@ -149,8 +153,8 @@
 	getlastlogxbyname(const char*, struct lastlogx *)__OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
 #ifdef UNIFDEF_LEGACY_UTMP_APIS
 struct utmp;	/* forward reference */
-void	getutmp(const struct utmpx *, struct utmp *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_5, __MAC_10_9, __IPHONE_2_0, __IPHONE_7_0) __WATCHOS_PROHIBITED __TVOS_PROHIBITED;
-void	getutmpx(const struct utmp *, struct utmpx *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_5, __MAC_10_9, __IPHONE_2_0, __IPHONE_7_0) __WATCHOS_PROHIBITED __TVOS_PROHIBITED;
+void	getutmp(const struct utmpx *, struct utmp *) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
+void	getutmpx(const struct utmp *, struct utmpx *) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0);
 #endif /* UNIFDEF_LEGACY_UTMP_APIS */
 #endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */