--- Libc/Libc-1725.40.4/include/util.h
+++ Libc/Libc-825.26/include/util.h
@@ -58,7 +58,6 @@
 #ifndef _UTIL_H_
 #define _UTIL_H_
 
-#include <_bounds.h>
 #include <sys/cdefs.h>
 #include <sys/ttycom.h>
 #include <sys/types.h>
@@ -66,10 +65,6 @@
 #include <pwd.h>
 #include <termios.h>
 #include <Availability.h>
-
-_LIBC_SINGLE_BY_DEFAULT()
-#define __PTYNAMELEN 128
-#define _LIBC_PTYNAME_OR_NULL _LIBC_COUNT_OR_NULL(__PTYNAMELEN)
 
 #define	PIDLOCK_NONBLOCK	1
 #define PIDLOCK_USEHOSTNAME	2
@@ -99,12 +94,11 @@
 int	logout(const char *)		__OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
 #endif /* UNIFDEF_LEGACY_UTMP_APIS */
 void	logwtmp(const char *, const char *, const char *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_2_0,__IPHONE_2_0);
-int	opendev(char *, int, int, char *_LIBC_CSTR *);
-int	openpty(int *, int *, char * _LIBC_PTYNAME_OR_NULL,
-    struct termios *, struct winsize *);
-char *_LIBC_CSTR fparseln(FILE *, size_t *, size_t *, const char[3], int);
-pid_t	forkpty(int *, char * _LIBC_PTYNAME_OR_NULL,
-    struct termios *, struct winsize *);
+int	opendev(char *, int, int, char **);
+int	openpty(int *, int *, char *, struct termios *,
+		     struct winsize *);
+char   *fparseln(FILE *, size_t *, size_t *, const char[3], int);
+pid_t	forkpty(int *, char *, struct termios *, struct winsize *);
 int	pidlock(const char *, int, pid_t *, const char *);
 int	ttylock(const char *, int, pid_t *);
 int	ttyunlock(const char *);