--- Libc/Libc-320/include/langinfo.h
+++ Libc/Libc-498/include/langinfo.h
@@ -29,12 +29,11 @@
 #ifndef _LANGINFO_H_
 #define	_LANGINFO_H_
 
-#include <sys/cdefs.h>
-#include <sys/types.h>
+#include <_types.h>
 
-#ifndef _NL_ITEM_DECLARED
-typedef	int	nl_item;
-#define	_NL_ITEM_DECLARED
+#ifndef _NL_ITEM
+typedef	__darwin_nl_item	nl_item;
+#define	_NL_ITEM
 #endif
 
 #define	CODESET		0	/* codeset name */
@@ -110,7 +109,7 @@
 
 #define	CRNCYSTR	56	/* currency symbol */
 
-#if !defined(_ANSI_SOURCE)
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
 #define	D_MD_ORDER	57	/* month/day order (local extension) */
 #endif
 
@@ -118,4 +117,8 @@
 char	*nl_langinfo(nl_item);
 __END_DECLS
 
+#ifdef _USE_EXTENDED_LOCALES_
+#include <xlocale/_langinfo.h>
+#endif /* _USE_EXTENDED_LOCALES_ */
+
 #endif /* !_LANGINFO_H_ */