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

author: Sebastian Huber <sebastian.huber@embedded-brains.de> 2016-04-27 10:25:22 +0200
committer: Sebastian Huber <sebastian.huber@embedded-brains.de> 2016-05-30 16:06:41 +0200
commit: 3d1e767c8fa5863e202f9027188cf3fad214e4b3 (patch)
tree: 8e21a4db9dab8f31432aff0cb69c0f2064dac425 /freebsd
parent: Directly use <sys/time.h> provided by Newlib (diff)
download: rtems-libbsd-3d1e767c8fa5863e202f9027188cf3fad214e4b3.tar.bz2
200 files changed, 204 insertions, 204 deletions
diff --git a/freebsd/contrib/libpcap/bpf_image.c b/freebsd/contrib/libpcap/bpf_image.c
index 07018b33..7bdc6ce1 100644
--- a/freebsd/contrib/libpcap/bpf_image.c
+++ b/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>
diff --git a/freebsd/contrib/libpcap/etherent.c b/freebsd/contrib/libpcap/etherent.c
index 166eb3a4..19bac195 100644
--- a/freebsd/contrib/libpcap/etherent.c
+++ b/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>
diff --git a/freebsd/contrib/libpcap/fad-getad.c b/freebsd/contrib/libpcap/fad-getad.c
index 2a5b549a..dc478fa1 100644
--- a/freebsd/contrib/libpcap/fad-getad.c
+++ b/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>
 
diff --git a/freebsd/contrib/libpcap/gencode.c b/freebsd/contrib/libpcap/gencode.c
index 0c640acb..3d09d50a 100644
--- a/freebsd/contrib/libpcap/gencode.c
+++ b/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 */
 
diff --git a/freebsd/contrib/libpcap/nametoaddr.c b/freebsd/contrib/libpcap/nametoaddr.c
index e5653b9b..17516e7f 100644
--- a/freebsd/contrib/libpcap/nametoaddr.c
+++ b/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>
 
diff --git a/freebsd/contrib/libpcap/optimize.c b/freebsd/contrib/libpcap/optimize.c
index 14eced3c..b2ffc527 100644
--- a/freebsd/contrib/libpcap/optimize.c
+++ b/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>
diff --git a/freebsd/contrib/libpcap/pcap-bpf.c b/freebsd/contrib/libpcap/pcap-bpf.c
index 0a942601..463946b6 100644
--- a/freebsd/contrib/libpcap/pcap-bpf.c
+++ b/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
diff --git a/freebsd/contrib/libpcap/pcap-common.c b/freebsd/contrib/libpcap/pcap-common.c
index 7b683a9e..729c0006 100644
--- a/freebsd/contrib/libpcap/pcap-common.c
+++ b/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"
diff --git a/freebsd/contrib/libpcap/pcap.c b/freebsd/contrib/libpcap/pcap.c
index 11334563..e2991fb3 100644
--- a/freebsd/contrib/libpcap/pcap.c
+++ b/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 */
 
diff --git a/freebsd/contrib/libpcap/pcap/pcap.h b/freebsd/contrib/libpcap/pcap/pcap.h
index c9c61074..64c40753 100644
--- a/freebsd/contrib/libpcap/pcap/pcap.h
+++ b/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 */
 
diff --git a/freebsd/contrib/libpcap/savefile.c b/freebsd/contrib/libpcap/savefile.c
index cf22f22a..f62635f1 100644
--- a/freebsd/contrib/libpcap/savefile.c
+++ b/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>
diff --git a/freebsd/contrib/libpcap/sf-pcap-ng.c b/freebsd/contrib/libpcap/sf-pcap-ng.c
index f2ee14cb..0cc595d8 100644
--- a/freebsd/contrib/libpcap/sf-pcap-ng.c
+++ b/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>
diff --git a/freebsd/contrib/libpcap/sf-pcap.c b/freebsd/contrib/libpcap/sf-pcap.c
index 6f967c58..6fda84f2 100644
--- a/freebsd/contrib/libpcap/sf-pcap.c
+++ b/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>
diff --git a/freebsd/contrib/tcpdump/nameser.h b/freebsd/contrib/tcpdump/nameser.h
index 655afb42..f441f3ea 100644
--- a/freebsd/contrib/tcpdump/nameser.h
+++ b/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
diff --git a/freebsd/contrib/tcpdump/netdissect.h b/freebsd/contrib/tcpdump/netdissect.h
index d201d8c3..be6fb119 100644
--- a/freebsd/contrib/tcpdump/netdissect.h
+++ b/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)
diff --git a/freebsd/contrib/tcpdump/print-pflog.c b/freebsd/contrib/tcpdump/print-pflog.c
index 5f67fb0e..ff913129 100644
--- a/freebsd/contrib/tcpdump/print-pflog.c
+++ b/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>
diff --git a/freebsd/contrib/tcpdump/tcpdump-stdinc.h b/freebsd/contrib/tcpdump/tcpdump-stdinc.h
index e5e26eca..b241301e 100644
--- a/freebsd/contrib/tcpdump/tcpdump-stdinc.h
+++ b/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>
diff --git a/freebsd/include/arpa/nameser.h b/freebsd/include/arpa/nameser.h
index 9d08d329..8575989d 100644
--- a/freebsd/include/arpa/nameser.h
+++ b/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>
 
 /*%
diff --git a/freebsd/include/db.h b/freebsd/include/db.h
index a19ef546..4d04db41 100644
--- a/freebsd/include/db.h
+++ b/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>
diff --git a/freebsd/include/nsswitch.h b/freebsd/include/nsswitch.h
index 771ccb6b..d1839002 100644
--- a/freebsd/include/nsswitch.h
+++ b/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
diff --git a/freebsd/include/res_update.h b/freebsd/include/res_update.h
index 7f281e5b..06f3b3a5 100644
--- a/freebsd/include/res_update.h
+++ b/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>
 
diff --git a/freebsd/include/resolv.h b/freebsd/include/resolv.h
index 9e8ad3b1..e108635c 100644
--- a/freebsd/include/resolv.h
+++ b/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>
diff --git a/freebsd/lib/libc/db/btree/bt_delete.c b/freebsd/lib/libc/db/btree/bt_delete.c
index 12b02d3f..bf666d31 100644
--- a/freebsd/lib/libc/db/btree/bt_delete.c
+++ b/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>
diff --git a/freebsd/lib/libc/db/btree/bt_get.c b/freebsd/lib/libc/db/btree/bt_get.c
index 3a8394bd..6b630c78 100644
--- a/freebsd/lib/libc/db/btree/bt_get.c
+++ b/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>
diff --git a/freebsd/lib/libc/db/btree/bt_page.c b/freebsd/lib/libc/db/btree/bt_page.c
index 6c95aa02..26004e8d 100644
--- a/freebsd/lib/libc/db/btree/bt_page.c
+++ b/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>
 
diff --git a/freebsd/lib/libc/db/btree/bt_put.c b/freebsd/lib/libc/db/btree/bt_put.c
index c82102ba..885562b3 100644
--- a/freebsd/lib/libc/db/btree/bt_put.c
+++ b/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>
diff --git a/freebsd/lib/libc/db/btree/bt_search.c b/freebsd/lib/libc/db/btree/bt_search.c
index 7a5a2f47..2e7a415e 100644
--- a/freebsd/lib/libc/db/btree/bt_search.c
+++ b/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>
 
diff --git a/freebsd/lib/libc/db/btree/bt_seq.c b/freebsd/lib/libc/db/btree/bt_seq.c
index 0bfa70a5..bfe717be 100644
--- a/freebsd/lib/libc/db/btree/bt_seq.c
+++ b/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>
diff --git a/freebsd/lib/libc/db/btree/bt_split.c b/freebsd/lib/libc/db/btree/bt_split.c
index 16efb701..5ea902dd 100644
--- a/freebsd/lib/libc/db/btree/bt_split.c
+++ b/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>
diff --git a/freebsd/lib/libc/db/db/db.c b/freebsd/lib/libc/db/db/db.c
index b6b4a5e6..ffd083c7 100644
--- a/freebsd/lib/libc/db/db/db.c
+++ b/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>
diff --git a/freebsd/lib/libc/db/recno/rec_close.c b/freebsd/lib/libc/db/recno/rec_close.c
index 210b32cf..04b17d71 100644
--- a/freebsd/lib/libc/db/recno/rec_close.c
+++ b/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>
 
diff --git a/freebsd/lib/libc/db/recno/rec_delete.c b/freebsd/lib/libc/db/recno/rec_delete.c
index 41fa5cb7..2a51308d 100644
--- a/freebsd/lib/libc/db/recno/rec_delete.c
+++ b/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>
diff --git a/freebsd/lib/libc/db/recno/rec_get.c b/freebsd/lib/libc/db/recno/rec_get.c
index a8552949..93747d79 100644
--- a/freebsd/lib/libc/db/recno/rec_get.c
+++ b/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>
diff --git a/freebsd/lib/libc/db/recno/rec_open.c b/freebsd/lib/libc/db/recno/rec_open.c
index d2cfebab..81945fea 100644
--- a/freebsd/lib/libc/db/recno/rec_open.c
+++ b/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>
 
diff --git a/freebsd/lib/libc/db/recno/rec_put.c b/freebsd/lib/libc/db/recno/rec_put.c
index 85be89cb..a667022e 100644
--- a/freebsd/lib/libc/db/recno/rec_put.c
+++ b/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>
diff --git a/freebsd/lib/libc/db/recno/rec_search.c b/freebsd/lib/libc/db/recno/rec_search.c
index ca27f1b5..130451ae 100644
--- a/freebsd/lib/libc/db/recno/rec_search.c
+++ b/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>
diff --git a/freebsd/lib/libc/db/recno/rec_seq.c b/freebsd/lib/libc/db/recno/rec_seq.c
index 29e51991..c8b4f982 100644
--- a/freebsd/lib/libc/db/recno/rec_seq.c
+++ b/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>
diff --git a/freebsd/lib/libc/gen/feature_present.c b/freebsd/lib/libc/gen/feature_present.c
index 5fbd8b29..9404a063 100644
--- a/freebsd/lib/libc/gen/feature_present.c
+++ b/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>
diff --git a/freebsd/lib/libc/include/isc/eventlib.h b/freebsd/lib/libc/include/isc/eventlib.h
index 7a5a095f..a4cfdf90 100644
--- a/freebsd/lib/libc/include/isc/eventlib.h
+++ b/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>
diff --git a/freebsd/lib/libc/include/resolv_mt.h b/freebsd/lib/libc/include/resolv_mt.h
index a12f2563..27963a12 100644
--- a/freebsd/lib/libc/include/resolv_mt.h
+++ b/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>
diff --git a/freebsd/lib/libc/include/spinlock.h b/freebsd/lib/libc/include/spinlock.h
index e55b569f..c9facc51 100644
--- a/freebsd/lib/libc/include/spinlock.h
+++ b/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.
diff --git a/freebsd/lib/libc/inet/inet_addr.c b/freebsd/lib/libc/inet/inet_addr.c
index eab1a42e..e0980f6c 100644
--- a/freebsd/lib/libc/inet/inet_addr.c
+++ b/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>
diff --git a/freebsd/lib/libc/inet/inet_cidr_ntop.c b/freebsd/lib/libc/inet/inet_cidr_ntop.c
index 2c999096..1fccb9a4 100644
--- a/freebsd/lib/libc/inet/inet_cidr_ntop.c
+++ b/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>
diff --git a/freebsd/lib/libc/inet/inet_cidr_pton.c b/freebsd/lib/libc/inet/inet_cidr_pton.c
index b6513f78..fc0672bd 100644
--- a/freebsd/lib/libc/inet/inet_cidr_pton.c
+++ b/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>
diff --git a/freebsd/lib/libc/inet/inet_net_ntop.c b/freebsd/lib/libc/inet/inet_net_ntop.c
index 998e0fc8..49e20fb8 100644
--- a/freebsd/lib/libc/inet/inet_net_ntop.c
+++ b/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>
diff --git a/freebsd/lib/libc/inet/inet_net_pton.c b/freebsd/lib/libc/inet/inet_net_pton.c
index 29f9ca03..2a8fc345 100644
--- a/freebsd/lib/libc/inet/inet_net_pton.c
+++ b/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>
diff --git a/freebsd/lib/libc/inet/inet_neta.c b/freebsd/lib/libc/inet/inet_neta.c
index 69c129d2..14b75c18 100644
--- a/freebsd/lib/libc/inet/inet_neta.c
+++ b/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>
diff --git a/freebsd/lib/libc/inet/inet_network.c b/freebsd/lib/libc/inet/inet_network.c
index ae820113..88a760c4 100644
--- a/freebsd/lib/libc/inet/inet_network.c
+++ b/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>
diff --git a/freebsd/lib/libc/inet/inet_ntoa.c b/freebsd/lib/libc/inet/inet_ntoa.c
index 1097fc72..539cf747 100644
--- a/freebsd/lib/libc/inet/inet_ntoa.c
+++ b/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>
diff --git a/freebsd/lib/libc/inet/inet_ntop.c b/freebsd/lib/libc/inet/inet_ntop.c
index 879b2504..5cd6a7e0 100644
--- a/freebsd/lib/libc/inet/inet_ntop.c
+++ b/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>
diff --git a/freebsd/lib/libc/inet/inet_pton.c b/freebsd/lib/libc/inet/inet_pton.c
index b02dd7f1..738b9b50 100644
--- a/freebsd/lib/libc/inet/inet_pton.c
+++ b/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>
diff --git a/freebsd/lib/libc/inet/nsap_addr.c b/freebsd/lib/libc/inet/nsap_addr.c
index 3bbb3962..5489f983 100644
--- a/freebsd/lib/libc/inet/nsap_addr.c
+++ b/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>
 
diff --git a/freebsd/lib/libc/isc/ev_streams.c b/freebsd/lib/libc/isc/ev_streams.c
index 83fd4a1e..92af0c87 100644
--- a/freebsd/lib/libc/isc/ev_streams.c
+++ b/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>
diff --git a/freebsd/lib/libc/isc/eventlib_p.h b/freebsd/lib/libc/isc/eventlib_p.h
index b27ab54d..678f5ee7 100644
--- a/freebsd/lib/libc/isc/eventlib_p.h
+++ b/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>
diff --git a/freebsd/lib/libc/nameser/ns_name.c b/freebsd/lib/libc/nameser/ns_name.c
index fa1a32e3..224f9512 100644
--- a/freebsd/lib/libc/nameser/ns_name.c
+++ b/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>
diff --git a/freebsd/lib/libc/nameser/ns_parse.c b/freebsd/lib/libc/nameser/ns_parse.c
index 80325e7c..6b3f68c6 100644
--- a/freebsd/lib/libc/nameser/ns_parse.c
+++ b/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>
diff --git a/freebsd/lib/libc/nameser/ns_print.c b/freebsd/lib/libc/nameser/ns_print.c
index 8f797962..99427348 100644
--- a/freebsd/lib/libc/nameser/ns_print.c
+++ b/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>
diff --git a/freebsd/lib/libc/nameser/ns_samedomain.c b/freebsd/lib/libc/nameser/ns_samedomain.c
index b10b5707..6bfe42d2 100644
--- a/freebsd/lib/libc/nameser/ns_samedomain.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/base64.c b/freebsd/lib/libc/net/base64.c
index 96838ca8..227dc68e 100644
--- a/freebsd/lib/libc/net/base64.c
+++ b/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>
 
diff --git a/freebsd/lib/libc/net/ether_addr.c b/freebsd/lib/libc/net/ether_addr.c
index 8089d1e4..d5a35de2 100644
--- a/freebsd/lib/libc/net/ether_addr.c
+++ b/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>
 
diff --git a/freebsd/lib/libc/net/getaddrinfo.c b/freebsd/lib/libc/net/getaddrinfo.c
index fbffd6b0..65e905c3 100644
--- a/freebsd/lib/libc/net/getaddrinfo.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/gethostbydns.c b/freebsd/lib/libc/net/gethostbydns.c
index d1c62590..764ec311 100644
--- a/freebsd/lib/libc/net/gethostbydns.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/getifaddrs.c b/freebsd/lib/libc/net/getifaddrs.c
index 1cc49018..17ef0198 100644
--- a/freebsd/lib/libc/net/getifaddrs.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/getnameinfo.c b/freebsd/lib/libc/net/getnameinfo.c
index 74ea9a84..3a489c48 100644
--- a/freebsd/lib/libc/net/getnameinfo.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/getnetbyht.c b/freebsd/lib/libc/net/getnetbyht.c
index 1e4d64f5..caf9c3a6 100644
--- a/freebsd/lib/libc/net/getnetbyht.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/getprotoent.c b/freebsd/lib/libc/net/getprotoent.c
index 3c584fc1..d0a7a97e 100644
--- a/freebsd/lib/libc/net/getprotoent.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/getservent.c b/freebsd/lib/libc/net/getservent.c
index eebd1c2a..aff91ed2 100644
--- a/freebsd/lib/libc/net/getservent.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/if_indextoname.c b/freebsd/lib/libc/net/if_indextoname.c
index 82f8920d..b0f10f72 100644
--- a/freebsd/lib/libc/net/if_indextoname.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/if_nameindex.c b/freebsd/lib/libc/net/if_nameindex.c
index f5a826d9..7cb14a80 100644
--- a/freebsd/lib/libc/net/if_nameindex.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/if_nametoindex.c b/freebsd/lib/libc/net/if_nametoindex.c
index 467f15e9..eff590e7 100644
--- a/freebsd/lib/libc/net/if_nametoindex.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/ip6opt.c b/freebsd/lib/libc/net/ip6opt.c
index 582757fe..a09f05d8 100644
--- a/freebsd/lib/libc/net/ip6opt.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/linkaddr.c b/freebsd/lib/libc/net/linkaddr.c
index 71b631e7..10aff86c 100644
--- a/freebsd/lib/libc/net/linkaddr.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/map_v4v6.c b/freebsd/lib/libc/net/map_v4v6.c
index 6629ff1c..e2fc9747 100644
--- a/freebsd/lib/libc/net/map_v4v6.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/recv.c b/freebsd/lib/libc/net/recv.c
index 2c78fc6f..168cb85e 100644
--- a/freebsd/lib/libc/net/recv.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/rthdr.c b/freebsd/lib/libc/net/rthdr.c
index 8436b8a1..f2a1d3d0 100644
--- a/freebsd/lib/libc/net/rthdr.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/send.c b/freebsd/lib/libc/net/send.c
index 978f7f1d..aac2e1f8 100644
--- a/freebsd/lib/libc/net/send.c
+++ b/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>
diff --git a/freebsd/lib/libc/net/vars.c b/freebsd/lib/libc/net/vars.c
index 22136cd3..42ee2054 100644
--- a/freebsd/lib/libc/net/vars.c
+++ b/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>
 
 /*
diff --git a/freebsd/lib/libc/posix1e/mac.c b/freebsd/lib/libc/posix1e/mac.c
index b5adfc77..3806130a 100644
--- a/freebsd/lib/libc/posix1e/mac.c
+++ b/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>
 
diff --git a/freebsd/lib/libc/resolv/h_errno.c b/freebsd/lib/libc/resolv/h_errno.c
index 74e98850..4902e22c 100644
--- a/freebsd/lib/libc/resolv/h_errno.c
+++ b/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>
diff --git a/freebsd/lib/libc/resolv/herror.c b/freebsd/lib/libc/resolv/herror.c
index 67ddc51e..aea3a745 100644
--- a/freebsd/lib/libc/resolv/herror.c
+++ b/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>
 
diff --git a/freebsd/lib/libc/resolv/res_comp.c b/freebsd/lib/libc/resolv/res_comp.c
index c31537e9..9b6ee369 100644
--- a/freebsd/lib/libc/resolv/res_comp.c
+++ b/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>
diff --git a/freebsd/lib/libc/resolv/res_data.c b/freebsd/lib/libc/resolv/res_data.c
index 47501f32..0ab7ed20 100644
--- a/freebsd/lib/libc/resolv/res_data.c
+++ b/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>
diff --git a/freebsd/lib/libc/resolv/res_debug.c b/freebsd/lib/libc/resolv/res_debug.c
index b8e68891..632aa666 100644
--- a/freebsd/lib/libc/resolv/res_debug.c
+++ b/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>
 
diff --git a/freebsd/lib/libc/resolv/res_init.c b/freebsd/lib/libc/resolv/res_init.c
index 7a5f07bd..75a8dff3 100644
--- a/freebsd/lib/libc/resolv/res_init.c
+++ b/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>
diff --git a/freebsd/lib/libc/resolv/res_mkquery.c b/freebsd/lib/libc/resolv/res_mkquery.c
index eb4df45d..84800095 100644
--- a/freebsd/lib/libc/resolv/res_mkquery.c
+++ b/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>
diff --git a/freebsd/lib/libc/resolv/res_mkupdate.c b/freebsd/lib/libc/resolv/res_mkupdate.c
index e486e31a..fade9356 100644
--- a/freebsd/lib/libc/resolv/res_mkupdate.c
+++ b/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>
diff --git a/freebsd/lib/libc/resolv/res_query.c b/freebsd/lib/libc/resolv/res_query.c
index 5a5acef1..9dd8f186 100644
--- a/freebsd/lib/libc/resolv/res_query.c
+++ b/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>
diff --git a/freebsd/lib/libc/resolv/res_send.c b/freebsd/lib/libc/resolv/res_send.c
index 95038f7a..c39d8df9 100644
--- a/freebsd/lib/libc/resolv/res_send.c
+++ b/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>
diff --git a/freebsd/lib/libc/resolv/res_state.c b/freebsd/lib/libc/resolv/res_state.c
index 6c752207..a89b9b5e 100644
--- a/freebsd/lib/libc/resolv/res_state.c
+++ b/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>
diff --git a/freebsd/lib/libc/stdio/local.h b/freebsd/lib/libc/stdio/local.h
index 754476e9..a9994b5f 100644
--- a/freebsd/lib/libc/stdio/local.h
+++ b/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>
diff --git a/freebsd/lib/libipsec/ipsec_dump_policy.c b/freebsd/lib/libipsec/ipsec_dump_policy.c
index a12727bc..301ed764 100644
--- a/freebsd/lib/libipsec/ipsec_dump_policy.c
+++ b/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>
 
diff --git a/freebsd/lib/libipsec/ipsec_get_policylen.c b/freebsd/lib/libipsec/ipsec_get_policylen.c
index 81db0d7b..b9d5a101 100644
--- a/freebsd/lib/libipsec/ipsec_get_policylen.c
+++ b/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>
diff --git a/freebsd/lib/libipsec/ipsec_strerror.c b/freebsd/lib/libipsec/ipsec_strerror.c
index 3b442aed..9b4bc4a6 100644
--- a/freebsd/lib/libipsec/ipsec_strerror.c
+++ b/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>
diff --git a/freebsd/lib/libipsec/pfkey.c b/freebsd/lib/libipsec/pfkey.c
index c5a61128..c8ebfbf5 100644
--- a/freebsd/lib/libipsec/pfkey.c
+++ b/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>
diff --git a/freebsd/lib/libipsec/pfkey_dump.c b/freebsd/lib/libipsec/pfkey_dump.c
index b03a6452..8c4d5213 100644
--- a/freebsd/lib/libipsec/pfkey_dump.c
+++ b/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>
diff --git a/freebsd/lib/libmemstat/memstat_all.c b/freebsd/lib/libmemstat/memstat_all.c
index 3d5a63e2..2e37b4e9 100644
--- a/freebsd/lib/libmemstat/memstat_all.c
+++ b/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"
diff --git a/freebsd/lib/libutil/expand_number.c b/freebsd/lib/libutil/expand_number.c
index 6303c2b5..893a1d77 100644
--- a/freebsd/lib/libutil/expand_number.c
+++ b/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>
diff --git a/freebsd/lib/libutil/humanize_number.c b/freebsd/lib/libutil/humanize_number.c
index 144589e4..da5c5197 100644
--- a/freebsd/lib/libutil/humanize_number.c
+++ b/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>
diff --git a/freebsd/sbin/dhclient/privsep.h b/freebsd/sbin/dhclient/privsep.h
index 1f778bba..f30284ee 100644
--- a/freebsd/sbin/dhclient/privsep.h
+++ b/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>
diff --git a/freebsd/sbin/ifconfig/af_atalk.c b/freebsd/sbin/ifconfig/af_atalk.c
index 70d0c5de..21af7fb5 100644
--- a/freebsd/sbin/ifconfig/af_atalk.c
+++ b/freebsd/sbin/ifconfig/af_atalk.c
@@ -34,7 +34,7 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/freebsd/sbin/ifconfig/af_inet.c b/freebsd/sbin/ifconfig/af_inet.c
index 3e9ac8ea..1d713eec 100644
--- a/freebsd/sbin/ifconfig/af_inet.c
+++ b/freebsd/sbin/ifconfig/af_inet.c
@@ -34,7 +34,7 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/freebsd/sbin/ifconfig/af_link.c b/freebsd/sbin/ifconfig/af_link.c
index 1a18afe2..ffd92e30 100644
--- a/freebsd/sbin/ifconfig/af_link.c
+++ b/freebsd/sbin/ifconfig/af_link.c
@@ -34,7 +34,7 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/freebsd/sbin/ifconfig/ifclone.c b/freebsd/sbin/ifconfig/ifclone.c
index 04009e39..eedb6a8c 100644
--- a/freebsd/sbin/ifconfig/ifclone.c
+++ b/freebsd/sbin/ifconfig/ifclone.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/freebsd/sbin/ifconfig/ifgroup.c b/freebsd/sbin/ifconfig/ifgroup.c
index c8dae3b9..0d4551e4 100644
--- a/freebsd/sbin/ifconfig/ifgroup.c
+++ b/freebsd/sbin/ifconfig/ifgroup.c
@@ -33,7 +33,7 @@ static const char rcsid[] =
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/freebsd/sbin/ifconfig/ifpfsync.c b/freebsd/sbin/ifconfig/ifpfsync.c
index 9a329825..ad65e659 100644
--- a/freebsd/sbin/ifconfig/ifpfsync.c
+++ b/freebsd/sbin/ifconfig/ifpfsync.c
@@ -28,7 +28,7 @@
  * $FreeBSD$
  */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
diff --git a/freebsd/sbin/route/route.c b/freebsd/sbin/route/route.c
index 05b4f5a3..fde2162a 100644
--- a/freebsd/sbin/route/route.c
+++ b/freebsd/sbin/route/route.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/queue.h>
 
 #include <net/if.h>
diff --git a/freebsd/sys/arm/include/machine/cpufunc.h b/freebsd/sys/arm/include/machine/cpufunc.h
index 55e7ffac..8ec1574f 100644
--- a/freebsd/sys/arm/include/machine/cpufunc.h
+++ b/freebsd/sys/arm/include/machine/cpufunc.h
@@ -47,7 +47,7 @@
 #ifdef _KERNEL
 #ifndef __rtems__
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <machine/cpuconf.h>
 #include <machine/katelib.h> /* For in[bwl] and out[bwl] */
 
diff --git a/freebsd/sys/bsm/audit.h b/freebsd/sys/bsm/audit.h
index 42e1e171..d1f18a91 100644
--- a/freebsd/sys/bsm/audit.h
+++ b/freebsd/sys/bsm/audit.h
@@ -34,7 +34,7 @@
 #define	_BSM_AUDIT_H
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #define	AUDIT_RECORD_MAGIC	0x828a0f1b
 #define	MAX_AUDIT_RECORDS	20
diff --git a/freebsd/sys/cam/scsi/scsi_all.c b/freebsd/sys/cam/scsi/scsi_all.c
index 7e268bb1..7bb0425d 100644
--- a/freebsd/sys/cam/scsi/scsi_all.c
+++ b/freebsd/sys/cam/scsi/scsi_all.c
@@ -33,7 +33,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/stdint.h>
 
 #ifdef _KERNEL
diff --git a/freebsd/sys/contrib/pf/net/pfvar.h b/freebsd/sys/contrib/pf/net/pfvar.h
index 59177b5b..57f96c3c 100644
--- a/freebsd/sys/contrib/pf/net/pfvar.h
+++ b/freebsd/sys/contrib/pf/net/pfvar.h
@@ -34,7 +34,7 @@
 #define _NET_PFVAR_H_
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/tree.h>
 #ifdef __FreeBSD__
diff --git a/freebsd/sys/crypto/blowfish/bf_ecb.c b/freebsd/sys/crypto/blowfish/bf_ecb.c
index 874de5ac..07a996f6 100644
--- a/freebsd/sys/crypto/blowfish/bf_ecb.c
+++ b/freebsd/sys/crypto/blowfish/bf_ecb.c
@@ -61,7 +61,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <crypto/blowfish/blowfish.h>
 #include <crypto/blowfish/bf_locl.h>
 
diff --git a/freebsd/sys/crypto/blowfish/bf_enc.c b/freebsd/sys/crypto/blowfish/bf_enc.c
index 19f58101..48e59d85 100644
--- a/freebsd/sys/crypto/blowfish/bf_enc.c
+++ b/freebsd/sys/crypto/blowfish/bf_enc.c
@@ -64,7 +64,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <crypto/blowfish/blowfish.h>
 #include <crypto/blowfish/bf_locl.h>
 
diff --git a/freebsd/sys/crypto/blowfish/bf_skey.c b/freebsd/sys/crypto/blowfish/bf_skey.c
index 7cff4744..f793d689 100644
--- a/freebsd/sys/crypto/blowfish/bf_skey.c
+++ b/freebsd/sys/crypto/blowfish/bf_skey.c
@@ -64,7 +64,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <crypto/blowfish/blowfish.h>
diff --git a/freebsd/sys/crypto/camellia/camellia-api.c b/freebsd/sys/crypto/camellia/camellia-api.c
index f5246f5c..424184df 100644
--- a/freebsd/sys/crypto/camellia/camellia-api.c
+++ b/freebsd/sys/crypto/camellia/camellia-api.c
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #endif
diff --git a/freebsd/sys/crypto/camellia/camellia.c b/freebsd/sys/crypto/camellia/camellia.c
index 45b660ef..6be51604 100644
--- a/freebsd/sys/crypto/camellia/camellia.c
+++ b/freebsd/sys/crypto/camellia/camellia.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/endian.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
diff --git a/freebsd/sys/crypto/des/des_enc.c b/freebsd/sys/crypto/des/des_enc.c
index e45c7b43..f0ac924d 100644
--- a/freebsd/sys/crypto/des/des_enc.c
+++ b/freebsd/sys/crypto/des/des_enc.c
@@ -64,7 +64,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <crypto/des/des_locl.h>
 
 extern	const DES_LONG des_SPtrans[8][64];
diff --git a/freebsd/sys/crypto/rc4/rc4.c b/freebsd/sys/crypto/rc4/rc4.c
index 46f5bc37..db89e781 100644
--- a/freebsd/sys/crypto/rc4/rc4.c
+++ b/freebsd/sys/crypto/rc4/rc4.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <rtems/bsd/sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <crypto/rc4/rc4.h>
 
 static __inline void
diff --git a/freebsd/sys/crypto/rijndael/rijndael-alg-fst.c b/freebsd/sys/crypto/rijndael/rijndael-alg-fst.c
index 3db35498..aeea25f8 100644
--- a/freebsd/sys/crypto/rijndael/rijndael-alg-fst.c
+++ b/freebsd/sys/crypto/rijndael/rijndael-alg-fst.c
@@ -30,7 +30,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/cdefs.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #else
diff --git a/freebsd/sys/crypto/rijndael/rijndael-api.c b/freebsd/sys/crypto/rijndael/rijndael-api.c
index e99c58b7..cd7f2e8e 100644
--- a/freebsd/sys/crypto/rijndael/rijndael-api.c
+++ b/freebsd/sys/crypto/rijndael/rijndael-api.c
@@ -31,7 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #endif
diff --git a/freebsd/sys/crypto/sha1.c b/freebsd/sys/crypto/sha1.c
index 0fc2de3f..2c3a4c15 100644
--- a/freebsd/sys/crypto/sha1.c
+++ b/freebsd/sys/crypto/sha1.c
@@ -39,7 +39,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/time.h>
 #include <sys/systm.h>
diff --git a/freebsd/sys/crypto/sha2/sha2.c b/freebsd/sys/crypto/sha2/sha2.c
index 8a482f54..92e1232f 100644
--- a/freebsd/sys/crypto/sha2/sha2.c
+++ b/freebsd/sys/crypto/sha2/sha2.c
@@ -39,7 +39,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/time.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
diff --git a/freebsd/sys/dev/e1000/e1000_osdep.h b/freebsd/sys/dev/e1000/e1000_osdep.h
index b331bdc1..b58a85b4 100644
--- a/freebsd/sys/dev/e1000/e1000_osdep.h
+++ b/freebsd/sys/dev/e1000/e1000_osdep.h
@@ -36,7 +36,7 @@
 #ifndef _FREEBSD_OS_H_
 #define _FREEBSD_OS_H_
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/systm.h>
 #include <rtems/bsd/sys/lock.h>
diff --git a/freebsd/sys/dev/ofw/openfirm.h b/freebsd/sys/dev/ofw/openfirm.h
index 18b2694c..feac8401 100644
--- a/freebsd/sys/dev/ofw/openfirm.h
+++ b/freebsd/sys/dev/ofw/openfirm.h
@@ -60,7 +60,7 @@
 #ifndef _DEV_OPENFIRM_H_
 #define _DEV_OPENFIRM_H_
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 /*
  * Prototypes for Open Firmware Interface Routines
diff --git a/freebsd/sys/dev/pci/pci_user.c b/freebsd/sys/dev/pci/pci_user.c
index dc22106c..01eacf30 100644
--- a/freebsd/sys/dev/pci/pci_user.c
+++ b/freebsd/sys/dev/pci/pci_user.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/freebsd/sys/dev/usb/controller/dwc_otg.c b/freebsd/sys/dev/usb/controller/dwc_otg.c
index 7d55c800..028047a3 100644
--- a/freebsd/sys/dev/usb/controller/dwc_otg.c
+++ b/freebsd/sys/dev/usb/controller/dwc_otg.c
@@ -52,7 +52,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/controller/ehci.c b/freebsd/sys/dev/usb/controller/ehci.c
index 85f41f15..7da7e27d 100644
--- a/freebsd/sys/dev/usb/controller/ehci.c
+++ b/freebsd/sys/dev/usb/controller/ehci.c
@@ -53,7 +53,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/controller/ohci.c b/freebsd/sys/dev/usb/controller/ohci.c
index 0b2de8a3..91f535d5 100644
--- a/freebsd/sys/dev/usb/controller/ohci.c
+++ b/freebsd/sys/dev/usb/controller/ohci.c
@@ -42,7 +42,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/controller/usb_controller.c b/freebsd/sys/dev/usb/controller/usb_controller.c
index 8ee4ced8..45b33118 100644
--- a/freebsd/sys/dev/usb/controller/usb_controller.c
+++ b/freebsd/sys/dev/usb/controller/usb_controller.c
@@ -35,7 +35,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/quirk/usb_quirk.c b/freebsd/sys/dev/usb/quirk/usb_quirk.c
index a3d72820..c6baeffc 100644
--- a/freebsd/sys/dev/usb/quirk/usb_quirk.c
+++ b/freebsd/sys/dev/usb/quirk/usb_quirk.c
@@ -32,7 +32,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/storage/umass.c b/freebsd/sys/dev/usb/storage/umass.c
index e8009872..9c6c8532 100644
--- a/freebsd/sys/dev/usb/storage/umass.c
+++ b/freebsd/sys/dev/usb/storage/umass.c
@@ -108,7 +108,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_busdma.c b/freebsd/sys/dev/usb/usb_busdma.c
index d8946dce..52af6088 100644
--- a/freebsd/sys/dev/usb/usb_busdma.c
+++ b/freebsd/sys/dev/usb/usb_busdma.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_core.c b/freebsd/sys/dev/usb/usb_core.c
index 7bc784ef..b5e66407 100644
--- a/freebsd/sys/dev/usb/usb_core.c
+++ b/freebsd/sys/dev/usb/usb_core.c
@@ -39,7 +39,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_debug.c b/freebsd/sys/dev/usb/usb_debug.c
index 3d5ddcd4..f9e08af9 100644
--- a/freebsd/sys/dev/usb/usb_debug.c
+++ b/freebsd/sys/dev/usb/usb_debug.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_dev.c b/freebsd/sys/dev/usb/usb_dev.c
index bd2941a0..e5f98a9e 100644
--- a/freebsd/sys/dev/usb/usb_dev.c
+++ b/freebsd/sys/dev/usb/usb_dev.c
@@ -36,7 +36,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_device.c b/freebsd/sys/dev/usb/usb_device.c
index d7789d0b..614e1e92 100644
--- a/freebsd/sys/dev/usb/usb_device.c
+++ b/freebsd/sys/dev/usb/usb_device.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_dynamic.c b/freebsd/sys/dev/usb/usb_dynamic.c
index db8a523a..993344d3 100644
--- a/freebsd/sys/dev/usb/usb_dynamic.c
+++ b/freebsd/sys/dev/usb/usb_dynamic.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_error.c b/freebsd/sys/dev/usb/usb_error.c
index e27fb5eb..345d9e8e 100644
--- a/freebsd/sys/dev/usb/usb_error.c
+++ b/freebsd/sys/dev/usb/usb_error.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_generic.c b/freebsd/sys/dev/usb/usb_generic.c
index c5a03777..675a63d3 100644
--- a/freebsd/sys/dev/usb/usb_generic.c
+++ b/freebsd/sys/dev/usb/usb_generic.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_handle_request.c b/freebsd/sys/dev/usb/usb_handle_request.c
index b7464110..1720fa02 100644
--- a/freebsd/sys/dev/usb/usb_handle_request.c
+++ b/freebsd/sys/dev/usb/usb_handle_request.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_hid.c b/freebsd/sys/dev/usb/usb_hid.c
index f6591a8f..879aaeae 100644
--- a/freebsd/sys/dev/usb/usb_hid.c
+++ b/freebsd/sys/dev/usb/usb_hid.c
@@ -39,7 +39,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_hub.c b/freebsd/sys/dev/usb/usb_hub.c
index cae83779..0e2dde8c 100644
--- a/freebsd/sys/dev/usb/usb_hub.c
+++ b/freebsd/sys/dev/usb/usb_hub.c
@@ -39,7 +39,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_lookup.c b/freebsd/sys/dev/usb/usb_lookup.c
index ebbb03ee..9ffdcd2e 100644
--- a/freebsd/sys/dev/usb/usb_lookup.c
+++ b/freebsd/sys/dev/usb/usb_lookup.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_mbuf.c b/freebsd/sys/dev/usb/usb_mbuf.c
index d98b7e2e..dc78a10f 100644
--- a/freebsd/sys/dev/usb/usb_mbuf.c
+++ b/freebsd/sys/dev/usb/usb_mbuf.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_msctest.c b/freebsd/sys/dev/usb/usb_msctest.c
index 095bba04..cf29d09d 100644
--- a/freebsd/sys/dev/usb/usb_msctest.c
+++ b/freebsd/sys/dev/usb/usb_msctest.c
@@ -41,7 +41,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_parse.c b/freebsd/sys/dev/usb/usb_parse.c
index ef1ec530..196a02a5 100644
--- a/freebsd/sys/dev/usb/usb_parse.c
+++ b/freebsd/sys/dev/usb/usb_parse.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_process.c b/freebsd/sys/dev/usb/usb_process.c
index ab687e41..219a736a 100644
--- a/freebsd/sys/dev/usb/usb_process.c
+++ b/freebsd/sys/dev/usb/usb_process.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_request.c b/freebsd/sys/dev/usb/usb_request.c
index 39e03c6e..f092094b 100644
--- a/freebsd/sys/dev/usb/usb_request.c
+++ b/freebsd/sys/dev/usb/usb_request.c
@@ -35,7 +35,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_transfer.c b/freebsd/sys/dev/usb/usb_transfer.c
index 5bbc1e02..7b39601d 100644
--- a/freebsd/sys/dev/usb/usb_transfer.c
+++ b/freebsd/sys/dev/usb/usb_transfer.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/dev/usb/usb_util.c b/freebsd/sys/dev/usb/usb_util.c
index 316e9de8..a2a5cee7 100644
--- a/freebsd/sys/dev/usb/usb_util.c
+++ b/freebsd/sys/dev/usb/usb_util.c
@@ -33,7 +33,7 @@
 #include <sys/stddef.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/freebsd/sys/kern/subr_unit.c b/freebsd/sys/kern/subr_unit.c
index f4d1d435..a560eb50 100644
--- a/freebsd/sys/kern/subr_unit.c
+++ b/freebsd/sys/kern/subr_unit.c
@@ -69,7 +69,7 @@
  *	N is the number of the highest unit allocated.
  */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/bitstring.h>
 
diff --git a/freebsd/sys/libkern/arc4random.c b/freebsd/sys/libkern/arc4random.c
index f33fc82e..89c89eea 100644
--- a/freebsd/sys/libkern/arc4random.c
+++ b/freebsd/sys/libkern/arc4random.c
@@ -13,7 +13,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/kernel.h>
 #include <sys/random.h>
diff --git a/freebsd/sys/mips/include/machine/cpufunc.h b/freebsd/sys/mips/include/machine/cpufunc.h
index 7429312c..7945dd38 100644
--- a/freebsd/sys/mips/include/machine/cpufunc.h
+++ b/freebsd/sys/mips/include/machine/cpufunc.h
@@ -59,7 +59,7 @@
 #ifndef _MACHINE_CPUFUNC_H_
 #define	_MACHINE_CPUFUNC_H_
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <machine/cpuregs.h>
 
 /* 
diff --git a/freebsd/sys/net/bpf.c b/freebsd/sys/net/bpf.c
index fd9432a5..f74ac9a1 100644
--- a/freebsd/sys/net/bpf.c
+++ b/freebsd/sys/net/bpf.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <rtems/bsd/local/opt_compat.h>
 #include <rtems/bsd/local/opt_netgraph.h>
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <rtems/bsd/sys/lock.h>
 #include <sys/rwlock.h>
diff --git a/freebsd/sys/net/bpf_jitter.c b/freebsd/sys/net/bpf_jitter.c
index e3d91e85..10850b97 100644
--- a/freebsd/sys/net/bpf_jitter.c
+++ b/freebsd/sys/net/bpf_jitter.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #endif
 
 #include <net/bpf.h>
diff --git a/freebsd/sys/net/if.c b/freebsd/sys/net/if.c
index f227ed9f..2c638a37 100644
--- a/freebsd/sys/net/if.c
+++ b/freebsd/sys/net/if.c
@@ -37,7 +37,7 @@
 #include <rtems/bsd/local/opt_inet.h>
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/sbuf.h>
diff --git a/freebsd/sys/net/if_clone.c b/freebsd/sys/net/if_clone.c
index d0701845..0b752139 100644
--- a/freebsd/sys/net/if_clone.c
+++ b/freebsd/sys/net/if_clone.c
@@ -39,7 +39,7 @@
 #include <sys/mutex.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <net/if.h>
diff --git a/freebsd/sys/net/if_epair.c b/freebsd/sys/net/if_epair.c
index 00ab65bd..755e608a 100644
--- a/freebsd/sys/net/if_epair.c
+++ b/freebsd/sys/net/if_epair.c
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <net/bpf.h>
 #include <net/ethernet.h>
diff --git a/freebsd/sys/net/if_faith.c b/freebsd/sys/net/if_faith.c
index a1db9fe0..cf4a7fba 100644
--- a/freebsd/sys/net/if_faith.c
+++ b/freebsd/sys/net/if_faith.c
@@ -54,7 +54,7 @@
 #include <sys/sockio.h>
 #include <sys/time.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/malloc.h>
 
 #include <net/if.h>
diff --git a/freebsd/sys/netinet/ip_carp.c b/freebsd/sys/netinet/ip_carp.c
index b7b712b0..330023b1 100644
--- a/freebsd/sys/netinet/ip_carp.c
+++ b/freebsd/sys/netinet/ip_carp.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <rtems/bsd/local/opt_inet.h>
 #include <rtems/bsd/local/opt_inet6.h>
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/freebsd/sys/netinet/ip_id.c b/freebsd/sys/netinet/ip_id.c
index 99f829ec..a76c7b78 100644
--- a/freebsd/sys/netinet/ip_id.c
+++ b/freebsd/sys/netinet/ip_id.c
@@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$");
  * enabled.
  */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/malloc.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/time.h>
diff --git a/freebsd/sys/netinet/libalias/alias.c b/freebsd/sys/netinet/libalias/alias.c
index 09db9153..9e975122 100644
--- a/freebsd/sys/netinet/libalias/alias.c
+++ b/freebsd/sys/netinet/libalias/alias.c
@@ -119,7 +119,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/sysctl.h>
 #else
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
diff --git a/freebsd/sys/netinet/libalias/alias_cuseeme.c b/freebsd/sys/netinet/libalias/alias_cuseeme.c
index 1db9a138..1bdb7c4a 100644
--- a/freebsd/sys/netinet/libalias/alias_cuseeme.c
+++ b/freebsd/sys/netinet/libalias/alias_cuseeme.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #else
 #include <errno.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <stdio.h>
 #endif
 
diff --git a/freebsd/sys/netinet/libalias/alias_dummy.c b/freebsd/sys/netinet/libalias/alias_dummy.c
index ac89d8d7..eacfac86 100644
--- a/freebsd/sys/netinet/libalias/alias_dummy.c
+++ b/freebsd/sys/netinet/libalias/alias_dummy.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #else
 #include <errno.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <stdio.h>
 #endif
 
diff --git a/freebsd/sys/netinet/libalias/alias_ftp.c b/freebsd/sys/netinet/libalias/alias_ftp.c
index fbc9c564..ccf15275 100644
--- a/freebsd/sys/netinet/libalias/alias_ftp.c
+++ b/freebsd/sys/netinet/libalias/alias_ftp.c
@@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$");
 #else
 #include <ctype.h>
 #include <errno.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
 #endif
diff --git a/freebsd/sys/netinet/libalias/alias_irc.c b/freebsd/sys/netinet/libalias/alias_irc.c
index 240c0f61..880d897e 100644
--- a/freebsd/sys/netinet/libalias/alias_irc.c
+++ b/freebsd/sys/netinet/libalias/alias_irc.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 #else
 #include <ctype.h>
 #include <errno.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/freebsd/sys/netinet/libalias/alias_local.h b/freebsd/sys/netinet/libalias/alias_local.h
index db58bca0..a7b3fe19 100644
--- a/freebsd/sys/netinet/libalias/alias_local.h
+++ b/freebsd/sys/netinet/libalias/alias_local.h
@@ -46,7 +46,7 @@
 #ifndef _ALIAS_LOCAL_H_
 #define	_ALIAS_LOCAL_H_
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/sysctl.h>
 
 #ifdef _KERNEL
diff --git a/freebsd/sys/netinet/libalias/alias_mod.c b/freebsd/sys/netinet/libalias/alias_mod.c
index 09fa3624..0e0bd56a 100644
--- a/freebsd/sys/netinet/libalias/alias_mod.c
+++ b/freebsd/sys/netinet/libalias/alias_mod.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #else
 #include <stdio.h>
 #include <string.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <errno.h>
 #endif
 
diff --git a/freebsd/sys/netinet/libalias/alias_nbt.c b/freebsd/sys/netinet/libalias/alias_nbt.c
index 8cbf2582..5a917872 100644
--- a/freebsd/sys/netinet/libalias/alias_nbt.c
+++ b/freebsd/sys/netinet/libalias/alias_nbt.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #else
 #include <errno.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <stdio.h>
 #include <strings.h>
 #endif
diff --git a/freebsd/sys/netinet/libalias/alias_pptp.c b/freebsd/sys/netinet/libalias/alias_pptp.c
index 60d2999e..e8205db0 100644
--- a/freebsd/sys/netinet/libalias/alias_pptp.c
+++ b/freebsd/sys/netinet/libalias/alias_pptp.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 #else
 #include <errno.h>
 #include <limits.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <stdio.h>
 #endif
 
diff --git a/freebsd/sys/netinet/libalias/alias_proxy.c b/freebsd/sys/netinet/libalias/alias_proxy.c
index e2234333..e45abad4 100644
--- a/freebsd/sys/netinet/libalias/alias_proxy.c
+++ b/freebsd/sys/netinet/libalias/alias_proxy.c
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/libkern.h>
 #include <sys/limits.h>
 #else
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/freebsd/sys/netinet/libalias/alias_sctp.h b/freebsd/sys/netinet/libalias/alias_sctp.h
index ffb0b32f..840917ad 100644
--- a/freebsd/sys/netinet/libalias/alias_sctp.h
+++ b/freebsd/sys/netinet/libalias/alias_sctp.h
@@ -60,10 +60,10 @@
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
 #endif // #ifdef	_KERNEL 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/time.h>
 
 #include <netinet/in_systm.h>
diff --git a/freebsd/sys/netinet/libalias/alias_smedia.c b/freebsd/sys/netinet/libalias/alias_smedia.c
index 6c6c6aab..47ae2748 100644
--- a/freebsd/sys/netinet/libalias/alias_smedia.c
+++ b/freebsd/sys/netinet/libalias/alias_smedia.c
@@ -107,7 +107,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #else
 #include <errno.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
 #endif
diff --git a/freebsd/sys/netinet/libalias/alias_util.c b/freebsd/sys/netinet/libalias/alias_util.c
index fd9465b9..6455fb43 100644
--- a/freebsd/sys/netinet/libalias/alias_util.c
+++ b/freebsd/sys/netinet/libalias/alias_util.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <rtems/bsd/sys/param.h>
 #include <sys/proc.h>
 #else
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <stdio.h>
 #endif
 
diff --git a/freebsd/sys/netinet/pim.h b/freebsd/sys/netinet/pim.h
index 2b52a447..7878f797 100644
--- a/freebsd/sys/netinet/pim.h
+++ b/freebsd/sys/netinet/pim.h
@@ -42,7 +42,7 @@
  * Modified by Pavlin Radoslavov, USC/ISI, May 1998, October 2000.
  */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #ifndef _PIM_VT
 #ifndef BYTE_ORDER
diff --git a/freebsd/sys/netinet/sctp.h b/freebsd/sys/netinet/sctp.h
index d0b90d34..4c5c03dc 100644
--- a/freebsd/sys/netinet/sctp.h
+++ b/freebsd/sys/netinet/sctp.h
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #define _NETINET_SCTP_H_
 
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 
 #define SCTP_PACKED __attribute__((packed))
diff --git a/freebsd/sys/netinet/sctp_uio.h b/freebsd/sys/netinet/sctp_uio.h
index df9c2d2d..968fc980 100644
--- a/freebsd/sys/netinet/sctp_uio.h
+++ b/freebsd/sys/netinet/sctp_uio.h
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #if ! defined(_KERNEL)
 #include <stdint.h>
 #endif
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
diff --git a/freebsd/sys/netinet/tcp.h b/freebsd/sys/netinet/tcp.h
index 5925b4da..fb2f8108 100644
--- a/freebsd/sys/netinet/tcp.h
+++ b/freebsd/sys/netinet/tcp.h
@@ -34,7 +34,7 @@
 #define _NETINET_TCP_H_
 
 #include <sys/cdefs.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #if __BSD_VISIBLE
 
diff --git a/freebsd/sys/netinet/tcp_offload.c b/freebsd/sys/netinet/tcp_offload.c
index cd41edab..1a90f408 100644
--- a/freebsd/sys/netinet/tcp_offload.c
+++ b/freebsd/sys/netinet/tcp_offload.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/param.h>
 #include <sys/systm.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/freebsd/sys/netinet6/ip6_id.c b/freebsd/sys/netinet6/ip6_id.c
index 33744d2e..e277def6 100644
--- a/freebsd/sys/netinet6/ip6_id.c
+++ b/freebsd/sys/netinet6/ip6_id.c
@@ -91,7 +91,7 @@ __FBSDID("$FreeBSD$");
  * This avoids reuse issues caused by reseeding.
  */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
diff --git a/freebsd/sys/netipsec/ipsec.c b/freebsd/sys/netipsec/ipsec.c
index e5002d85..c1eed678 100644
--- a/freebsd/sys/netipsec/ipsec.c
+++ b/freebsd/sys/netipsec/ipsec.c
@@ -79,7 +79,7 @@
 #include <netinet/icmp6.h>
 #endif
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <netipsec/ipsec.h>
 #ifdef INET6
 #include <netipsec/ipsec6.h>
diff --git a/freebsd/sys/netipsec/key.c b/freebsd/sys/netipsec/key.c
index 50a90af8..6619c6db 100644
--- a/freebsd/sys/netipsec/key.c
+++ b/freebsd/sys/netipsec/key.c
@@ -40,7 +40,7 @@
 #include <rtems/bsd/local/opt_inet6.h>
 #include <rtems/bsd/local/opt_ipsec.h>
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/freebsd/sys/netipsec/key_debug.c b/freebsd/sys/netipsec/key_debug.c
index 3094f3fa..0b54ffab 100644
--- a/freebsd/sys/netipsec/key_debug.c
+++ b/freebsd/sys/netipsec/key_debug.c
@@ -38,7 +38,7 @@
 #include <rtems/bsd/local/opt_ipsec.h>
 #endif
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
diff --git a/freebsd/sys/netipsec/keysock.c b/freebsd/sys/netipsec/keysock.c
index 8af9512b..29e23bf3 100644
--- a/freebsd/sys/netipsec/keysock.c
+++ b/freebsd/sys/netipsec/keysock.c
@@ -36,7 +36,7 @@
 
 /* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/domain.h>
 #include <rtems/bsd/sys/errno.h>
diff --git a/freebsd/sys/netipsec/xform.h b/freebsd/sys/netipsec/xform.h
index 77b93af3..e389cab3 100644
--- a/freebsd/sys/netipsec/xform.h
+++ b/freebsd/sys/netipsec/xform.h
@@ -41,7 +41,7 @@
 #ifndef _NETIPSEC_XFORM_H_
 #define _NETIPSEC_XFORM_H_
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <opencrypto/xform.h>
 
diff --git a/freebsd/sys/opencrypto/cast.c b/freebsd/sys/opencrypto/cast.c
index 62aa04ca..2f3e1cf8 100644
--- a/freebsd/sys/opencrypto/cast.c
+++ b/freebsd/sys/opencrypto/cast.c
@@ -11,7 +11,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <opencrypto/cast.h>
 #include <opencrypto/castsb.h>
 
diff --git a/freebsd/sys/opencrypto/deflate.c b/freebsd/sys/opencrypto/deflate.c
index f29dfb42..26a3d3c5 100644
--- a/freebsd/sys/opencrypto/deflate.c
+++ b/freebsd/sys/opencrypto/deflate.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/local/opt_kdtrace.h>
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/malloc.h>
 #include <rtems/bsd/sys/param.h>
diff --git a/freebsd/sys/powerpc/include/machine/cpufunc.h b/freebsd/sys/powerpc/include/machine/cpufunc.h
index 425fd1ca..4c2c7b43 100644
--- a/freebsd/sys/powerpc/include/machine/cpufunc.h
+++ b/freebsd/sys/powerpc/include/machine/cpufunc.h
@@ -41,7 +41,7 @@ powerpc_mb(void)
 
 #ifdef _KERNEL
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <machine/psl.h>
 #include <machine/spr.h>
diff --git a/freebsd/sys/rpc/types.h b/freebsd/sys/rpc/types.h
index 5dbaae8f..dd51a8af 100644
--- a/freebsd/sys/rpc/types.h
+++ b/freebsd/sys/rpc/types.h
@@ -38,7 +38,7 @@
 #ifndef _RPC_TYPES_H
 #define _RPC_TYPES_H
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/_null.h>
 
 typedef int32_t bool_t;
diff --git a/freebsd/sys/security/mac/mac_framework.h b/freebsd/sys/security/mac/mac_framework.h
index e5e27063..92aedea4 100644
--- a/freebsd/sys/security/mac/mac_framework.h
+++ b/freebsd/sys/security/mac/mac_framework.h
@@ -90,7 +90,7 @@ struct vnode;
 struct vop_setlabel_args;
 
 #include <sys/acl.h>			/* XXX acl_type_t */
-#include <rtems/bsd/sys/types.h>			/* accmode_t */
+#include <sys/types.h>			/* accmode_t */
 
 /*
  * Entry points to the TrustedBSD MAC Framework from the remainder of the
diff --git a/freebsd/sys/sys/aio.h b/freebsd/sys/sys/aio.h
index 03f6b34e..02e34a85 100644
--- a/freebsd/sys/sys/aio.h
+++ b/freebsd/sys/sys/aio.h
@@ -19,7 +19,7 @@
 #ifndef _SYS_AIO_H_
 #define	_SYS_AIO_H_
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/signal.h>
 
 /*
diff --git a/freebsd/sys/sys/capability.h b/freebsd/sys/sys/capability.h
index e9106b6e..81446a28 100644
--- a/freebsd/sys/sys/capability.h
+++ b/freebsd/sys/sys/capability.h
@@ -36,7 +36,7 @@
 #define	_SYS_CAPABILITY_H_
 
 #include <sys/cdefs.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 #include <sys/file.h>
 
diff --git a/freebsd/sys/sys/file.h b/freebsd/sys/sys/file.h
index cf813275..4ac69413 100644
--- a/freebsd/sys/sys/file.h
+++ b/freebsd/sys/sys/file.h
@@ -34,7 +34,7 @@
 #define	_SYS_FILE_H_
 
 #ifndef _KERNEL
-#include <rtems/bsd/sys/types.h> /* XXX */
+#include <sys/types.h> /* XXX */
 #include <sys/fcntl.h>
 #include <rtems/bsd/sys/unistd.h>
 #else
diff --git a/freebsd/sys/sys/hash.h b/freebsd/sys/sys/hash.h
index fcbe6b69..6ad89c5e 100644
--- a/freebsd/sys/sys/hash.h
+++ b/freebsd/sys/sys/hash.h
@@ -28,7 +28,7 @@
 
 #ifndef _SYS_HASH_H_
 #define	_SYS_HASH_H_
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 /* Convenience */
 #ifndef	HASHINIT
diff --git a/freebsd/sys/sys/libkern.h b/freebsd/sys/sys/libkern.h
index 9700e09b..eebbcb62 100644
--- a/freebsd/sys/sys/libkern.h
+++ b/freebsd/sys/sys/libkern.h
@@ -34,7 +34,7 @@
 #define	_SYS_LIBKERN_H_
 
 #include <sys/cdefs.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #endif
diff --git a/freebsd/sys/sys/racct.h b/freebsd/sys/sys/racct.h
index 91df15db..3b34891a 100644
--- a/freebsd/sys/sys/racct.h
+++ b/freebsd/sys/sys/racct.h
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 
 struct proc;
 struct rctl_rule_link;
diff --git a/freebsd/sys/vm/uma_core.c b/freebsd/sys/vm/uma_core.c
index 7badb362..6bf47a1e 100644
--- a/freebsd/sys/vm/uma_core.c
+++ b/freebsd/sys/vm/uma_core.c
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <rtems/bsd/sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/ktr.h>
diff --git a/freebsd/sys/vm/uma_dbg.c b/freebsd/sys/vm/uma_dbg.c
index 90c204e3..1506674f 100644
--- a/freebsd/sys/vm/uma_dbg.c
+++ b/freebsd/sys/vm/uma_dbg.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <rtems/bsd/sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <rtems/bsd/sys/lock.h>
 #include <sys/mutex.h>
diff --git a/freebsd/usr.bin/netstat/bpf.c b/freebsd/usr.bin/netstat/bpf.c
index 824319cb..97f2fd81 100644
--- a/freebsd/usr.bin/netstat/bpf.c
+++ b/freebsd/usr.bin/netstat/bpf.c
@@ -29,7 +29,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/freebsd/usr.bin/netstat/if.c b/freebsd/usr.bin/netstat/if.c
index cc5ecaa1..cb9cfbb9 100644
--- a/freebsd/usr.bin/netstat/if.c
+++ b/freebsd/usr.bin/netstat/if.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/freebsd/usr.bin/netstat/sctp.c b/freebsd/usr.bin/netstat/sctp.c
index 8f87fd5a..4f27b2ca 100644
--- a/freebsd/usr.bin/netstat/sctp.c
+++ b/freebsd/usr.bin/netstat/sctp.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/types.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
author	Sebastian Huber <sebastian.huber@embedded-brains.de>	2016-04-27 10:25:22 +0200
committer	Sebastian Huber <sebastian.huber@embedded-brains.de>	2016-05-30 16:06:41 +0200
commit	3d1e767c8fa5863e202f9027188cf3fad214e4b3 (patch)
tree	8e21a4db9dab8f31432aff0cb69c0f2064dac425 /freebsd
parent	Directly use <sys/time.h> provided by Newlib (diff)
download	rtems-libbsd-3d1e767c8fa5863e202f9027188cf3fad214e4b3.tar.bz2