Directly use <sys/types.h> provided by Newlib

builder.py

@@ -184,7 +184,6 @@ def fixIncludes(data):
     data = re.sub('#include <sys/cpuset.h>',   '#include <rtems/bsd/sys/cpuset.h>', data)
     data = re.sub('#include <sys/errno.h>',    '#include <rtems/bsd/sys/errno.h>', data)
     data = re.sub('#include <sys/param.h>',    '#include <rtems/bsd/sys/param.h>', data)
-    data = re.sub('#include <sys/types.h>',    '#include <rtems/bsd/sys/types.h>', data)
     data = re.sub('#include <sys/resource.h>', '#include <rtems/bsd/sys/resource.h>', data)
     data = re.sub('#include <sys/unistd.h>',   '#include <rtems/bsd/sys/unistd.h>', data)
     data = re.sub('#include <sys/_types.h>',   '#include <rtems/bsd/sys/_types.h>', data)

freebsd/contrib/libpcap/bpf_image.c

@@ -41,7 +41,7 @@ static const char rcsid[] _U_ =
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #endif /* WIN32 */
 
 #include <stdio.h>

freebsd/contrib/libpcap/etherent.c

@@ -41,7 +41,7 @@ static const char rcsid[] _U_ =
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #endif /* WIN32 */
 
 #include <ctype.h>

freebsd/contrib/libpcap/fad-getad.c

@@ -43,7 +43,7 @@ static const char rcsid[] _U_ =
 #include "config.h"
 #endif
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 

freebsd/contrib/libpcap/gencode.c

@@ -43,7 +43,7 @@ static const char rcsid[] _U_ =
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #endif /* WIN32 */
 

freebsd/contrib/libpcap/nametoaddr.c

@@ -36,7 +36,7 @@ static const char rcsid[] _U_ =
 #endif
 
 #ifdef DECNETLIB
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <netdnet/dnetdb.h>
 #endif
 
@@ -46,7 +46,7 @@ static const char rcsid[] _U_ =
 #else /* WIN32 */
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>				/* concession to AIX */
+#include <sys/types.h>				/* concession to AIX */
 #include <sys/socket.h>
 #include <sys/time.h>
 

freebsd/contrib/libpcap/optimize.c

@@ -42,7 +42,7 @@ static const char rcsid[] _U_ =
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #endif /* WIN32 */
 
 #include <stdio.h>

freebsd/contrib/libpcap/pcap-bpf.c

@@ -70,7 +70,7 @@ static const char rcsid[] _U_ =
  */
 #define PCAP_DONT_INCLUDE_PCAP_BPF_H
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 /*
  * Prevent bpf.h from redefining the DLT_ values to their

freebsd/contrib/libpcap/pcap-common.c

@@ -38,7 +38,7 @@
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #endif /* WIN32 */
 
 #include "pcap-int.h"

freebsd/contrib/libpcap/pcap.c

@@ -55,7 +55,7 @@ static const char rcsid[] _U_ =
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/mman.h>
 #endif /* WIN32 */
 

freebsd/contrib/libpcap/pcap/pcap.h

@@ -40,10 +40,10 @@
 #if defined(WIN32)
   #include <pcap-stdinc.h>
 #elif defined(MSDOS)
-  #include <rtems/bsd/sys/types.h>
+  #include <sys/types.h>
   #include <sys/socket.h>  /* u_int, u_char etc. */
 #else /* UN*X */
-  #include <rtems/bsd/sys/types.h>
+  #include <sys/types.h>
   #include <sys/time.h>
 #endif /* WIN32/MSDOS/UN*X */
 

freebsd/contrib/libpcap/savefile.c

@@ -50,7 +50,7 @@ static const char rcsid[] _U_ =
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #endif /* WIN32 */
 
 #include <errno.h>

freebsd/contrib/libpcap/sf-pcap-ng.c

@@ -43,7 +43,7 @@ static const char rcsid[] _U_ =
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #endif /* WIN32 */
 
 #include <errno.h>

freebsd/contrib/libpcap/sf-pcap.c

@@ -50,7 +50,7 @@ static const char rcsid[] _U_ =
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #endif /* WIN32 */
 
 #include <errno.h>

freebsd/contrib/tcpdump/nameser.h

@@ -57,7 +57,7 @@
 #ifndef _NAMESER_H_
 #define	_NAMESER_H_
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 /*
  * Define constants based on rfc883

freebsd/contrib/tcpdump/netdissect.h

@@ -30,7 +30,7 @@
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #ifndef HAVE___ATTRIBUTE__
 #define __attribute__(x)

freebsd/contrib/tcpdump/print-pflog.c

@@ -33,7 +33,7 @@ static const char rcsid[] _U_ =
 #ifndef HAVE_NET_PFVAR_H
 #error "No pf headers available"
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/pfvar.h>

freebsd/contrib/tcpdump/tcpdump-stdinc.h

@@ -52,7 +52,7 @@
 #include <time.h>
 #include <io.h>
 #include <fcntl.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <net/netdb.h>  /* in wpcap's Win32/include */
 
 #ifndef NBBY
@@ -118,7 +118,7 @@ typedef char* caddr_t;
 #include <sys/bitypes.h>
 #endif
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>			/* concession to AIX */
+#include <sys/types.h>			/* concession to AIX */
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

freebsd/include/arpa/nameser.h

@@ -57,7 +57,7 @@
 #define BIND_4_COMPAT
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/cdefs.h>
 
 /*%

freebsd/include/db.h

@@ -33,7 +33,7 @@
 #ifndef _DB_H_
 #define	_DB_H_
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/cdefs.h>
 
 #include <limits.h>

freebsd/include/nsswitch.h

@@ -33,7 +33,7 @@
 #ifndef _NSSWITCH_H
 #define _NSSWITCH_H	1
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <stdarg.h>
 
 #define NSS_MODULE_INTERFACE_VERSION 1

freebsd/include/res_update.h

@@ -25,7 +25,7 @@
 
 /*! \file */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
 

freebsd/include/resolv.h

@@ -54,7 +54,7 @@
 #define	_RESOLV_H_
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/socket.h>
 #include <stdio.h>

freebsd/lib/libc/db/btree/bt_delete.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_delete.c	8.13 (Berkeley) 7/28/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <errno.h>
 #include <stdio.h>

freebsd/lib/libc/db/btree/bt_get.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_get.c	8.6 (Berkeley) 7/20/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <errno.h>
 #include <stddef.h>

freebsd/lib/libc/db/btree/bt_page.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)bt_page.c	8.3 (Berkeley) 7/14/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <stdio.h>
 

freebsd/lib/libc/db/btree/bt_put.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_put.c	8.8 (Berkeley) 7/26/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <errno.h>
 #include <stdio.h>

freebsd/lib/libc/db/btree/bt_search.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_search.c	8.8 (Berkeley) 7/31/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <stdio.h>
 

freebsd/lib/libc/db/btree/bt_seq.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_seq.c	8.7 (Berkeley) 7/20/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <errno.h>
 #include <stddef.h>

freebsd/lib/libc/db/btree/bt_split.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_split.c	8.10 (Berkeley) 1/9/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 
 #include <limits.h>

freebsd/lib/libc/db/db/db.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)db.c	8.4 (Berkeley) 2/21/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <errno.h>
 #include <fcntl.h>

freebsd/lib/libc/db/recno/rec_close.c

@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)rec_close.c	8.6 (Berkeley) 8/18/94";
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/mman.h>
 

freebsd/lib/libc/db/recno/rec_delete.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)rec_delete.c	8.7 (Berkeley) 7/14/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <errno.h>
 #include <stdio.h>

freebsd/lib/libc/db/recno/rec_get.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rec_get.c	8.9 (Berkeley) 8/18/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <errno.h>
 #include <stddef.h>

freebsd/lib/libc/db/recno/rec_open.c

@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)rec_open.c	8.10 (Berkeley) 9/1/94";
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 

freebsd/lib/libc/db/recno/rec_put.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rec_put.c	8.7 (Berkeley) 8/18/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <errno.h>
 #include <stdio.h>

freebsd/lib/libc/db/recno/rec_search.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rec_search.c	8.4 (Berkeley) 7/14/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <errno.h>
 #include <stdio.h>

freebsd/lib/libc/db/recno/rec_seq.c

@@ -36,7 +36,7 @@ static char sccsid[] __unused = "@(#)rec_seq.c	8.3 (Berkeley) 7/14/94";
 #endif /* not lint */
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <errno.h>
 #include <limits.h>

freebsd/lib/libc/gen/feature_present.c

@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/sysctl.h>
 #include <stdio.h>
 #include <stdlib.h>

freebsd/lib/libc/include/isc/eventlib.h

@@ -24,7 +24,7 @@
 #ifndef _EVENTLIB_H
 #define _EVENTLIB_H
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/time.h>
 #include <stdio.h>

freebsd/lib/libc/include/resolv_mt.h

@@ -1,7 +1,7 @@
 #ifndef _RESOLV_MT_H
 #define _RESOLV_MT_H
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>

freebsd/lib/libc/include/spinlock.h

@@ -35,7 +35,7 @@
 #ifndef _SPINLOCK_H_
 #define _SPINLOCK_H_
 #include <sys/cdefs.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 /*
  * Lock structure with room for debugging information.

freebsd/lib/libc/inet/inet_addr.c

@@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/inet/inet_cidr_ntop.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>

freebsd/lib/libc/inet/inet_cidr_pton.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>

freebsd/lib/libc/inet/inet_net_ntop.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/inet/inet_net_pton.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>

freebsd/lib/libc/inet/inet_neta.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/inet/inet_network.c

@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <ctype.h>

freebsd/lib/libc/inet/inet_ntoa.c

@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/inet/inet_ntop.c

@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
 #include "port_before.h"
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/inet/inet_pton.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/inet/nsap_addr.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 

freebsd/lib/libc/isc/ev_streams.c

@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
 #include "fd_setsize.h"
 #endif
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/uio.h>
 
 #include <errno.h>

freebsd/lib/libc/isc/eventlib_p.h

@@ -27,7 +27,7 @@
 #define _EVENTLIB_P_H
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/un.h>

freebsd/lib/libc/nameser/ns_name.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <netinet/in.h>
 #include <arpa/nameser.h>

freebsd/lib/libc/nameser/ns_parse.c

@@ -27,7 +27,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <netinet/in.h>
 #include <arpa/nameser.h>

freebsd/lib/libc/nameser/ns_print.c

@@ -27,7 +27,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/nameser/ns_samedomain.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <arpa/nameser.h>
 #include <errno.h>
 #include <string.h>

freebsd/lib/libc/net/base64.c

@@ -45,7 +45,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 

freebsd/lib/libc/net/ether_addr.c

@@ -42,7 +42,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 

freebsd/lib/libc/net/getaddrinfo.c

@@ -59,7 +59,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>

freebsd/lib/libc/net/gethostbydns.c

@@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vi
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

freebsd/lib/libc/net/getifaddrs.c

@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <net/if.h>

freebsd/lib/libc/net/getnameinfo.c

@@ -49,7 +49,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_dl.h>

freebsd/lib/libc/net/getnetbyht.c

@@ -46,7 +46,7 @@ static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixi
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/net/getprotoent.c

@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
 __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <limits.h>

freebsd/lib/libc/net/getservent.c

@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
 __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <db.h>

freebsd/lib/libc/net/if_indextoname.c

@@ -30,7 +30,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if_dl.h>
 #include <net/if.h>

freebsd/lib/libc/net/if_nameindex.c

@@ -30,7 +30,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if_dl.h>
 #include <net/if.h>

freebsd/lib/libc/net/if_nametoindex.c

@@ -31,7 +31,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <net/if.h>

freebsd/lib/libc/net/ip6opt.c

@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/net/linkaddr.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if_dl.h>
 #include <string.h>

freebsd/lib/libc/net/map_v4v6.c

@@ -57,7 +57,7 @@ static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

freebsd/lib/libc/net/recv.c

@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)recv.c	8.2 (Berkeley) 2/21/94";
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <stddef.h>

freebsd/lib/libc/net/rthdr.c

@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/net/send.c

@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)send.c	8.2 (Berkeley) 2/21/94";
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <stddef.h>

freebsd/lib/libc/net/vars.c

@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 
 /*

freebsd/lib/libc/posix1e/mac.c

@@ -37,7 +37,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
 

freebsd/lib/libc/resolv/h_errno.c

@@ -27,7 +27,7 @@
  * $FreeBSD$
  */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>

freebsd/lib/libc/resolv/herror.c

@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 #include "port_before.h"
 
 #include "namespace.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/uio.h>
 

freebsd/lib/libc/resolv/res_comp.c

@@ -74,7 +74,7 @@ static const char rcsid[] = "$Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp
 __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>

freebsd/lib/libc/resolv/res_data.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>

freebsd/lib/libc/resolv/res_debug.c

@@ -100,7 +100,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 

freebsd/lib/libc/resolv/res_init.c

@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>

freebsd/lib/libc/resolv/res_mkquery.c

@@ -74,7 +74,7 @@ static const char rcsid[] = "$Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka
 __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>

freebsd/lib/libc/resolv/res_mkupdate.c

@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/resolv/res_query.c

@@ -74,7 +74,7 @@ static const char rcsid[] = "$Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka E
 __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/resolv/res_send.c

@@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include "namespace.h"
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>

freebsd/lib/libc/resolv/res_state.c

@@ -27,7 +27,7 @@
  * $FreeBSD$
  */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>

freebsd/lib/libc/stdio/local.h

@@ -38,7 +38,7 @@
  * $FreeBSD$
  */
 
-#include <rtems/bsd/sys/types.h>	/* for off_t */
+#include <sys/types.h>	/* for off_t */
 #include <pthread.h>
 #include <string.h>
 #include <wchar.h>

freebsd/lib/libipsec/ipsec_dump_policy.c

@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 

freebsd/lib/libipsec/ipsec_get_policylen.c

@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 
 #include <netipsec/ipsec.h>

freebsd/lib/libipsec/ipsec_strerror.c

@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 
 #include <string.h>

freebsd/lib/libipsec/pfkey.c

@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 #include <net/pfkeyv2.h>

freebsd/lib/libipsec/pfkey_dump.c

@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
 #include <netipsec/ipsec.h>

freebsd/lib/libmemstat/memstat_all.c

@@ -28,7 +28,7 @@
  * $FreeBSD$
  */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/queue.h>
 
 #include "memstat.h"

freebsd/lib/libutil/expand_number.c

@@ -30,7 +30,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>

freebsd/lib/libutil/humanize_number.c

@@ -35,7 +35,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <assert.h>
 #include <inttypes.h>
 #include <stdio.h>

freebsd/sbin/dhclient/privsep.h

@@ -16,7 +16,7 @@
  * OF OR IN CONNECTION WITH THE USE, ABUSE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <poll.h>
 #include <pwd.h>