--- Libc/Libc-997.90.3/include/util.h
+++ Libc/Libc-498/include/util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2000, 2007 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -64,7 +64,7 @@
 #include <stdio.h>
 #include <pwd.h>
 #include <termios.h>
-#include <Availability.h>
+#include <available.h>
 
 #define	PIDLOCK_NONBLOCK	1
 #define PIDLOCK_USEHOSTNAME	2
@@ -85,15 +85,11 @@
 #define OPENDEV_BLCK	0x04		/* Open block, not character device. */
 
 __BEGIN_DECLS
-#ifdef UNIFDEF_LEGACY_UTMP_APIS
 struct utmp; /* forward reference to /usr/include/utmp.h */
-void	login(struct utmp *)		__OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-#endif /* UNIFDEF_LEGACY_UTMP_APIS */
+void	login(struct utmp *)		__DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
 int	login_tty(int);
-#ifdef UNIFDEF_LEGACY_UTMP_APIS
-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	logout(const char *)		__DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
+void	logwtmp(const char *, const char *, const char *) __DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
 int	opendev(char *, int, int, char **);
 int	openpty(int *, int *, char *, struct termios *,
 		     struct winsize *);
@@ -106,10 +102,8 @@
 struct iovec;
 char   *ttymsg(struct iovec *, int, const char *, int);
 __END_DECLS
-#ifdef UNIFDEF_LEGACY_UTMP_APIS
 
 /* Include utmp.h last to avoid deprecation warning above */
 #include <utmp.h>
-#endif /* UNIFDEF_LEGACY_UTMP_APIS */
 
 #endif /* !_UTIL_H_ */