libroot/locale: Consolidate some headers.

No behavioral change intended.

src/system/libroot/posix/locale/LocaleData.cpp

@@ -7,15 +7,13 @@
 #include <ctype.h>
 #include <limits.h>
 
-#include <PosixCtype.h>
-#include <PosixLocaleConv.h>
-
 #ifndef _KERNEL_MODE
 #include <langinfo.h>
-#include <PosixLanginfo.h>
-#include <PosixLCTimeInfo.h>
+#include <timelocal.h>
 #endif
 
+#include <LocaleData.h>
+
 
 /*
  * The values below initialize the structs for the "C"/"POSIX" locale

src/system/libroot/posix/locale/LocaleDataBridge.cpp

@@ -11,11 +11,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <PosixCtype.h>
-#include <PosixLanginfo.h>
-#include <PosixLCTimeInfo.h>
-#include <PosixLocaleConv.h>
-#include <ThreadLocale.h>
+#include <LocaleData.h>
 
 
 extern const unsigned short* __ctype_b;

src/system/libroot/posix/locale/ctype_l.cpp

@@ -8,7 +8,7 @@
 #include <locale.h>
 
 #include <LocaleBackend.h>
-#include <PosixCtype.h>
+#include <LocaleData.h>
 
 
 namespace BPrivate {
@@ -21,9 +21,8 @@ GetClassInfoTable(locale_t l)
 {
 	LocaleBackendData* locale = (LocaleBackendData*)l;
 
-	if (locale->databridge == NULL) {
+	if (locale->databridge == NULL)
 		return &gPosixClassInfo[128];
-	}
 	return *locale->databridge->ctypeDataBridge.addrOfClassInfoTable;
 }
 

src/system/libroot/posix/locale/localeconv.cpp

@@ -8,7 +8,7 @@
  */
 
 
-#include <PosixLocaleConv.h>
+#include <LocaleData.h>
 
 #ifndef _KERNEL_MODE
 #include <locale.h>
@@ -45,4 +45,4 @@ localeconv_l(locale_t l)
 
 	return &BPrivate::Libroot::gPosixLocaleConv;
 }
-#endif
+#endif

src/system/libroot/posix/locale/nl_langinfo.cpp

@@ -7,8 +7,7 @@
 #include <langinfo.h>
 
 #include "LocaleBackend.h"
-
-#include <PosixLanginfo.h>
+#include "LocaleData.h"
 
 
 using BPrivate::Libroot::gPosixLanginfo;