Remove <sys/__/types.h> inclusion from <features.h>.

libc/include/__/endian.h

@@ -26,6 +26,7 @@
 #define INCLUDE____ENDIAN_H
 
 #include <features.h>
+
 #include <__/byteswap.h>
 
 __BEGIN_DECLS

libc/include/__/stdint.h

@@ -25,8 +25,8 @@
 #ifndef INCLUDE____STDINT_H
 #define INCLUDE____STDINT_H
 
-#define _LIBC_HACK_FEATURE_NO_DECLARATIONS
 #include <features.h>
+
 #include <__/wordsize.h>
 
 __BEGIN_DECLS

libc/include/alloca.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(size_t.h)

libc/include/byteswap.h

@@ -26,6 +26,7 @@
 #define _BYTESWAP_H 1
 
 #include <features.h>
+
 #include <__/byteswap.h>
 
 __BEGIN_DECLS

libc/include/dirent.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(ino_t.h)

libc/include/fcntl.h

@@ -28,6 +28,9 @@
 #define INCLUDE_FCNTL_H
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <sortix/fcntl.h>
 #include <sortix/seek.h>
 #include <sys/stat.h>

libc/include/features.h

@@ -128,10 +128,4 @@
 /* Don't provide things from standard headers that is not implemented. */
 /*#define __SORTIX_SHOW_UNIMPLEMENTED*/
 
-#if !defined(_LIBC_HACK_FEATURE_NO_DECLARATIONS)
-#include <sys/__/types.h>
-#endif
-
-#undef _LIBC_HACK_FEATURE_NO_DECLARATIONS
-
 #endif

libc/include/grp.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(gid_t.h)

libc/include/inttypes.h

@@ -26,6 +26,9 @@
 #define INCLUDE_INTTYPES_H
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <stdint.h>
 
 #define PRId8 __PRId8

libc/include/locale.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 struct lconv

libc/include/netdb.h

@@ -26,6 +26,9 @@
 #define _NETDB_H 1
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <inttypes.h>
 
 __BEGIN_DECLS

libc/include/netinet/in.h

@@ -26,9 +26,12 @@
 #define INCLUDE_NETINET_IN_H
 
 #include <features.h>
-#include <inttypes.h>
+
+#include <sys/__/types.h>
 #include <__/endian.h>
 
+#include <inttypes.h>
+
 __BEGIN_DECLS
 
 @include(in_port_t.h)

libc/include/poll.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(time_t.h)

libc/include/pwd.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(gid_t.h)

libc/include/signal.h

@@ -26,6 +26,9 @@
 #define INCLUDE_SIGNAL_H
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <sortix/signal.h>
 
 __BEGIN_DECLS

libc/include/stdint.h

@@ -26,6 +26,7 @@
 #define _STDINT_H 1
 
 #include <features.h>
+
 #include <__/stdint.h>
 
 __BEGIN_DECLS

libc/include/stdio.h

@@ -26,6 +26,9 @@
 #define INCLUDE_STDIO_H
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <sortix/seek.h>
 #if __STRICT_ANSI__
 #define __need___va_list

libc/include/stdio_ext.h

@@ -26,6 +26,7 @@
 #define _STDIO_EXT_H 1
 
 #include <features.h>
+
 #include <stdio.h>
 
 enum

libc/include/stdlib.h

@@ -26,6 +26,9 @@
 #define _STDLIB_H 1
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <sortix/wait.h>
 
 __BEGIN_DECLS

libc/include/string.h

@@ -26,6 +26,9 @@
 #define INCLUDE_STRING_H
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <strings.h>
 
 __BEGIN_DECLS

libc/include/sys/__/types.h

@@ -26,6 +26,7 @@
 #define INCLUDE_SYS____TYPES_H
 
 #include <features.h>
+
 #include <sortix/__/types.h>
 
 #endif

libc/include/sys/display.h

@@ -26,6 +26,7 @@
 #define INCLUDE_SYS_DISPLAY_H
 
 #include <features.h>
+
 #include <stddef.h>
 #include <stdint.h>
 #include <sortix/display.h>

libc/include/sys/kernelinfo.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(size_t.h)

libc/include/sys/keycodes.h

@@ -26,6 +26,7 @@
 #define INCLUDE_SYS_KEYCODES_H
 
 #include <features.h>
+
 #include <sortix/keycodes.h>
 
 #endif

libc/include/sys/mman.h

@@ -26,6 +26,9 @@
 #define INCLUDE_SYS_MMAN_H
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <sortix/mman.h>
 
 __BEGIN_DECLS

libc/include/sys/readdirents.h

@@ -26,6 +26,9 @@
 #define _SYS_READDIRENTS_H 1
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <sys/types.h>
 #include <stddef.h>
 #include <stdint.h>

libc/include/sys/resource.h

@@ -26,6 +26,9 @@
 #define INCLUDE_SYS_RESOURCE_H
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <sortix/resource.h>
 
 __BEGIN_DECLS

libc/include/sys/select.h

@@ -27,6 +27,9 @@
 #define _SYS_SELECT_H 1
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <string.h> /* TODO: HACK: for FD_ZERO */
 
 __BEGIN_DECLS

libc/include/sys/socket.h

@@ -26,6 +26,9 @@
 #define _SYS_SOCKET_H 1
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 /* TODO: #include <sys/uio.h> */
 #include <sortix/socket.h>
 

libc/include/sys/stat.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 @include(blkcnt_t.h)
 @include(blksize_t.h)

libc/include/sys/syscall.h

@@ -30,6 +30,7 @@
 #define _SYS_SYSCALL_H 1
 
 #include <features.h>
+
 #include <sortix/syscallnum.h>
 
 /* Expand a macro and convert it to string. */

libc/include/sys/termmode.h

@@ -26,6 +26,7 @@
 #define INCLUDE_SYS_TERMMODE_H
 
 #include <features.h>
+
 #include <sortix/termmode.h>
 
 __BEGIN_DECLS

libc/include/sys/time.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(time_t.h)

libc/include/sys/times.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(clock_t.h);

libc/include/sys/types.h

@@ -28,6 +28,7 @@
 #define INCLUDE_SYS_TYPES_H
 
 #include <features.h>
+
 #include <sys/__/types.h>
 
 __BEGIN_DECLS

libc/include/sys/uio.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(size_t.h)

libc/include/sys/un.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(sa_family_t.h)

libc/include/sys/wait.h

@@ -28,6 +28,9 @@
 #define _SYS_WAIT_H 1
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <sortix/wait.h>
 
 __BEGIN_DECLS

libc/include/termios.h

@@ -28,6 +28,7 @@
 #define _TERMIOS_H 1
 
 #include <features.h>
+
 #include <stddef.h>
 #include <sortix/termios.h>
 

libc/include/time.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(clock_t.h)

libc/include/timespec.h

@@ -26,6 +26,9 @@
 #define INCLUDE_TIMESPEC_H
 
 #include <features.h>
+
+#include <sys/__/types.h>
+
 #include <stdbool.h>
 
 __BEGIN_DECLS

libc/include/unistd.h

@@ -29,7 +29,10 @@
 #define _UNISTD_H 1
 
 #include <features.h>
+
+#include <sys/__/types.h>
 #include <__/stdint.h>
+
 #if defined(_SORTIX_SOURCE)
 #include <stdarg.h>
 #include <stdint.h>

libc/include/utime.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(time_t.h)

libc/include/wchar.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(size_t.h)

libc/include/wctype.h

@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+#include <sys/__/types.h>
+
 __BEGIN_DECLS
 
 @include(wint_t.h)

sortix/include/sortix/__/types.h

@@ -26,6 +26,7 @@
 #define INCLUDE_SORTIX____TYPES_H
 
 #include <features.h>
+
 #include <__/stdint.h>
 #include <__/wordsize.h>
 

sortix/include/sortix/display.h

@@ -26,6 +26,7 @@
 #define SORTIX_INCLUDE_DISPLAY_H
 
 #include <features.h>
+
 #include <stdint.h>
 
 __BEGIN_DECLS

sortix/include/sortix/fork.h

@@ -26,6 +26,7 @@
 #define SORTIX_FORK_H
 
 #include <features.h>
+
 #include <sortix/x86/fork.h>
 #include <sortix/x64/fork.h>
 

sortix/include/sortix/resource.h

@@ -26,6 +26,7 @@
 #define INCLUDE_SORTIX_RESOURCE_H
 
 #include <features.h>
+
 #include <__/stdint.h>
 
 __BEGIN_DECLS

sortix/include/sortix/stat.h

@@ -27,6 +27,7 @@
 #define INCLUDE_SORTIX_STAT_H
 
 #include <features.h>
+
 #include <sys/types.h>
 #include <sortix/timespec.h>
 

sortix/include/sortix/tmns.h

@@ -26,6 +26,7 @@
 #define INCLUDE_SORTIX_TMNS_H
 
 #include <features.h>
+
 #include <sortix/timespec.h>
 
 __BEGIN_DECLS