[libc] clean up duplicated includes in generated headers (llvm#124524)

Fixes: llvm#124149

Author: alexprabhat99

libc/include/locale.h.def

@@ -12,8 +12,6 @@
 #include "__llvm-libc-common.h"
 
 #include "llvm-libc-macros/locale-macros.h"
-#include "llvm-libc-types/locale_t.h"
-#include "llvm-libc-types/struct_lconv.h"
 
 %%public_api()
 

libc/include/locale.yaml

@@ -1,5 +1,8 @@
 header: locale.h
 header_template: locale.h.def
+types:
+  - type_name: locale_t
+  - type_name: struct_lconv
 functions:
   - name: localeconv
     standards:

libc/include/math.h.def

@@ -12,7 +12,6 @@
 #include "__llvm-libc-common.h"
 #include "llvm-libc-macros/float16-macros.h"
 #include "llvm-libc-macros/math-macros.h"
-#include "llvm-libc-types/float128.h"
 
 
 %%public_api()

libc/include/setjmp.h.def

@@ -10,7 +10,6 @@
 #define LLVM_LIBC_SETJMP_H
 
 #include "__llvm-libc-common.h"
-#include "llvm-libc-types/jmp_buf.h"
 
 %%public_api()
 

libc/include/stdlib.h.def

@@ -10,7 +10,6 @@
 #define LLVM_LIBC_STDLIB_H
 
 #include "__llvm-libc-common.h"
-#include "llvm-libc-types/locale_t.h"
 #include "llvm-libc-macros/stdlib-macros.h"
 
 %%public_api()

libc/include/stdlib.yaml

@@ -8,10 +8,11 @@ types:
   - type_name: __qsortrcompare_t
   - type_name: __qsortcompare_t
   - type_name: __bsearchcompare_t
-  - type_name: size_t
-  - type_name: lldiv_t
-  - type_name: ldiv_t
   - type_name: div_t
+  - type_name: ldiv_t
+  - type_name: lldiv_t
+  - type_name: locale_t
+  - type_name: size_t
 enums: []
 objects: []
 functions:

libc/include/string.h.def

@@ -11,7 +11,6 @@
 
 #include "__llvm-libc-common.h"
 
-#include "llvm-libc-types/locale_t.h"
 #include "llvm-libc-macros/null-macro.h"
 
 %%public_api()

libc/include/string.yaml

@@ -2,6 +2,7 @@ header: string.h
 header_template: string.h.def
 macros: []
 types:
+  - type_name: locale_t
   - type_name: size_t
 enums: []
 objects: []

libc/include/sys/time.h.def

@@ -11,8 +11,6 @@
 
 #include "__llvm-libc-common.h"
 
-#include "../llvm-libc-types/struct_timeval.h"
-
 #include "../llvm-libc-macros/sys-time-macros.h"
 
 %%public_api()

libc/include/sys/time.yaml

@@ -2,7 +2,8 @@ header: sys/time.h
 header_template: time.h.def
 standards: Linux
 macros: []
-types: []
+types:
+  - type_name: struct_timeval
 enums: []
 functions: []
 objects: []

libc/include/wchar.h.def

@@ -11,8 +11,6 @@
 
 #include "__llvm-libc-common.h"
 #include "llvm-libc-macros/wchar-macros.h"
-#include "llvm-libc-types/wint_t.h"
-#include "llvm-libc-types/mbstate_t.h"
 
 %%public_api()