summaryrefslogtreecommitdiffstats
path: root/freebsd/sys
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-27 10:25:22 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-30 16:06:41 +0200
commit3d1e767c8fa5863e202f9027188cf3fad214e4b3 (patch)
tree8e21a4db9dab8f31432aff0cb69c0f2064dac425 /freebsd/sys
parentDirectly use <sys/time.h> provided by Newlib (diff)
downloadrtems-libbsd-3d1e767c8fa5863e202f9027188cf3fad214e4b3.tar.bz2
Directly use <sys/types.h> provided by Newlib
Diffstat (limited to 'freebsd/sys')
-rw-r--r--freebsd/sys/arm/include/machine/cpufunc.h2
-rw-r--r--freebsd/sys/bsm/audit.h2
-rw-r--r--freebsd/sys/cam/scsi/scsi_all.c2
-rw-r--r--freebsd/sys/contrib/pf/net/pfvar.h2
-rw-r--r--freebsd/sys/crypto/blowfish/bf_ecb.c2
-rw-r--r--freebsd/sys/crypto/blowfish/bf_enc.c2
-rw-r--r--freebsd/sys/crypto/blowfish/bf_skey.c2
-rw-r--r--freebsd/sys/crypto/camellia/camellia-api.c2
-rw-r--r--freebsd/sys/crypto/camellia/camellia.c2
-rw-r--r--freebsd/sys/crypto/des/des_enc.c2
-rw-r--r--freebsd/sys/crypto/rc4/rc4.c2
-rw-r--r--freebsd/sys/crypto/rijndael/rijndael-alg-fst.c2
-rw-r--r--freebsd/sys/crypto/rijndael/rijndael-api.c2
-rw-r--r--freebsd/sys/crypto/sha1.c2
-rw-r--r--freebsd/sys/crypto/sha2/sha2.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_osdep.h2
-rw-r--r--freebsd/sys/dev/ofw/openfirm.h2
-rw-r--r--freebsd/sys/dev/pci/pci_user.c2
-rw-r--r--freebsd/sys/dev/usb/controller/dwc_otg.c2
-rw-r--r--freebsd/sys/dev/usb/controller/ehci.c2
-rw-r--r--freebsd/sys/dev/usb/controller/ohci.c2
-rw-r--r--freebsd/sys/dev/usb/controller/usb_controller.c2
-rw-r--r--freebsd/sys/dev/usb/quirk/usb_quirk.c2
-rw-r--r--freebsd/sys/dev/usb/storage/umass.c2
-rw-r--r--freebsd/sys/dev/usb/usb_busdma.c2
-rw-r--r--freebsd/sys/dev/usb/usb_core.c2
-rw-r--r--freebsd/sys/dev/usb/usb_debug.c2
-rw-r--r--freebsd/sys/dev/usb/usb_dev.c2
-rw-r--r--freebsd/sys/dev/usb/usb_device.c2
-rw-r--r--freebsd/sys/dev/usb/usb_dynamic.c2
-rw-r--r--freebsd/sys/dev/usb/usb_error.c2
-rw-r--r--freebsd/sys/dev/usb/usb_generic.c2
-rw-r--r--freebsd/sys/dev/usb/usb_handle_request.c2
-rw-r--r--freebsd/sys/dev/usb/usb_hid.c2
-rw-r--r--freebsd/sys/dev/usb/usb_hub.c2
-rw-r--r--freebsd/sys/dev/usb/usb_lookup.c2
-rw-r--r--freebsd/sys/dev/usb/usb_mbuf.c2
-rw-r--r--freebsd/sys/dev/usb/usb_msctest.c2
-rw-r--r--freebsd/sys/dev/usb/usb_parse.c2
-rw-r--r--freebsd/sys/dev/usb/usb_process.c2
-rw-r--r--freebsd/sys/dev/usb/usb_request.c2
-rw-r--r--freebsd/sys/dev/usb/usb_transfer.c2
-rw-r--r--freebsd/sys/dev/usb/usb_util.c2
-rw-r--r--freebsd/sys/kern/subr_unit.c2
-rw-r--r--freebsd/sys/libkern/arc4random.c2
-rw-r--r--freebsd/sys/mips/include/machine/cpufunc.h2
-rw-r--r--freebsd/sys/net/bpf.c2
-rw-r--r--freebsd/sys/net/bpf_jitter.c2
-rw-r--r--freebsd/sys/net/if.c2
-rw-r--r--freebsd/sys/net/if_clone.c2
-rw-r--r--freebsd/sys/net/if_epair.c2
-rw-r--r--freebsd/sys/net/if_faith.c2
-rw-r--r--freebsd/sys/netinet/ip_carp.c2
-rw-r--r--freebsd/sys/netinet/ip_id.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_cuseeme.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_dummy.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_ftp.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_irc.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_local.h2
-rw-r--r--freebsd/sys/netinet/libalias/alias_mod.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_nbt.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_pptp.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_proxy.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_sctp.h4
-rw-r--r--freebsd/sys/netinet/libalias/alias_smedia.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_util.c2
-rw-r--r--freebsd/sys/netinet/pim.h2
-rw-r--r--freebsd/sys/netinet/sctp.h2
-rw-r--r--freebsd/sys/netinet/sctp_uio.h2
-rw-r--r--freebsd/sys/netinet/tcp.h2
-rw-r--r--freebsd/sys/netinet/tcp_offload.c2
-rw-r--r--freebsd/sys/netinet6/ip6_id.c2
-rw-r--r--freebsd/sys/netipsec/ipsec.c2
-rw-r--r--freebsd/sys/netipsec/key.c2
-rw-r--r--freebsd/sys/netipsec/key_debug.c2
-rw-r--r--freebsd/sys/netipsec/keysock.c2
-rw-r--r--freebsd/sys/netipsec/xform.h2
-rw-r--r--freebsd/sys/opencrypto/cast.c2
-rw-r--r--freebsd/sys/opencrypto/deflate.c2
-rw-r--r--freebsd/sys/powerpc/include/machine/cpufunc.h2
-rw-r--r--freebsd/sys/rpc/types.h2
-rw-r--r--freebsd/sys/security/mac/mac_framework.h2
-rw-r--r--freebsd/sys/sys/aio.h2
-rw-r--r--freebsd/sys/sys/capability.h2
-rw-r--r--freebsd/sys/sys/file.h2
-rw-r--r--freebsd/sys/sys/hash.h2
-rw-r--r--freebsd/sys/sys/libkern.h2
-rw-r--r--freebsd/sys/sys/racct.h2
-rw-r--r--freebsd/sys/vm/uma_core.c2
-rw-r--r--freebsd/sys/vm/uma_dbg.c2
91 files changed, 92 insertions, 92 deletions
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>