From ee613aa252e5ee3c899f5b51e8a75d664423ba97 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 24 Mar 2011 09:36:14 +0000
Subject: Include <sys/cdefs.h> (Eliminate rtems/bsd/sys/cdefs.h).

---
 cpukit/libcsupport/include/sys/ioccom.h            | 2 +-
 cpukit/libnetworking/arpa/inet.h                   | 2 +-
 cpukit/libnetworking/arpa/nameser.h                | 2 +-
 cpukit/libnetworking/ifaddrs.h                     | 2 +-
 cpukit/libnetworking/libc/gethostbydns.c           | 2 +-
 cpukit/libnetworking/libc/getifaddrs.c             | 2 +-
 cpukit/libnetworking/libc/if_indextoname.c         | 2 +-
 cpukit/libnetworking/libc/if_nameindex.c           | 2 +-
 cpukit/libnetworking/libc/res_stubs.c              | 2 +-
 cpukit/libnetworking/machine/in_cksum.h            | 2 +-
 cpukit/libnetworking/net/ethernet.h                | 2 +-
 cpukit/libnetworking/net/if.h                      | 2 +-
 cpukit/libnetworking/net/if_dl.h                   | 2 +-
 cpukit/libnetworking/netdb.h                       | 2 +-
 cpukit/libnetworking/netinet/ip.h                  | 2 +-
 cpukit/libnetworking/netinet/tcp.h                 | 2 +-
 cpukit/libnetworking/netinet/tcp_debug.c           | 2 +-
 cpukit/libnetworking/resolv.h                      | 2 +-
 cpukit/libnetworking/rtems/rtems_bsdnet_internal.h | 2 +-
 cpukit/libnetworking/sys/libkern.h                 | 2 +-
 cpukit/libnetworking/sys/mount.h                   | 2 +-
 cpukit/libnetworking/sys/poll.h                    | 2 +-
 cpukit/libnetworking/sys/socket.h                  | 2 +-
 cpukit/libnetworking/sys/sysctl.h                  | 2 +-
 cpukit/libnetworking/sys/syslog.h                  | 2 +-
 cpukit/libnetworking/sys/systm.h                   | 4 ++++
 cpukit/libnetworking/sys/uio.h                     | 2 +-
 cpukit/libnetworking/sys/un.h                      | 2 +-
 cpukit/librpc/include/rpc/auth.h                   | 2 +-
 cpukit/librpc/include/rpc/auth_unix.h              | 2 +-
 cpukit/librpc/include/rpc/clnt.h                   | 2 +-
 cpukit/librpc/include/rpc/clnt_soc.h               | 2 +-
 cpukit/librpc/include/rpc/pmap_clnt.h              | 2 +-
 cpukit/librpc/include/rpc/pmap_prot.h              | 2 +-
 cpukit/librpc/include/rpc/pmap_rmt.h               | 2 +-
 cpukit/librpc/include/rpc/rpc_com.h                | 2 +-
 cpukit/librpc/include/rpc/rpcent.h                 | 2 +-
 cpukit/librpc/include/rpc/svc.h                    | 2 +-
 cpukit/librpc/include/rpc/svc_soc.h                | 2 +-
 cpukit/librpc/include/rpc/xdr.h                    | 2 +-
 cpukit/librpc/include/rpcsvc/ypclnt.h              | 2 +-
 41 files changed, 44 insertions(+), 40 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/libcsupport/include/sys/ioccom.h b/cpukit/libcsupport/include/sys/ioccom.h
index 1a7fd27ef7..09b4728e49 100644
--- a/cpukit/libcsupport/include/sys/ioccom.h
+++ b/cpukit/libcsupport/include/sys/ioccom.h
@@ -88,7 +88,7 @@
 
 #ifndef _KERNEL
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #ifndef __ioctl_command_defined
 typedef u_int32_t ioctl_command_t;
diff --git a/cpukit/libnetworking/arpa/inet.h b/cpukit/libnetworking/arpa/inet.h
index a1c409dc85..d3513267cf 100644
--- a/cpukit/libnetworking/arpa/inet.h
+++ b/cpukit/libnetworking/arpa/inet.h
@@ -64,7 +64,7 @@
 
 /* External definitions for functions in inet(3). */
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <rtems/bsdnet/_types.h>
 
 /* Required for byteorder(3) functions. */
diff --git a/cpukit/libnetworking/arpa/nameser.h b/cpukit/libnetworking/arpa/nameser.h
index 0ba6c30a1e..b4d6236aff 100644
--- a/cpukit/libnetworking/arpa/nameser.h
+++ b/cpukit/libnetworking/arpa/nameser.h
@@ -63,7 +63,7 @@
 #define BIND_4_COMPAT
 
 #include <sys/types.h>
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 /*
  * revision information.  this is the release date in YYYYMMDD format.
diff --git a/cpukit/libnetworking/ifaddrs.h b/cpukit/libnetworking/ifaddrs.h
index 874591bb93..7d3aa953ec 100644
--- a/cpukit/libnetworking/ifaddrs.h
+++ b/cpukit/libnetworking/ifaddrs.h
@@ -46,7 +46,7 @@ struct ifaddrs {
 #define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
 #endif
  
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 extern int getifaddrs(struct ifaddrs **);
diff --git a/cpukit/libnetworking/libc/gethostbydns.c b/cpukit/libnetworking/libc/gethostbydns.c
index 38a0cdc6d6..532dbfd1f6 100644
--- a/cpukit/libnetworking/libc/gethostbydns.c
+++ b/cpukit/libnetworking/libc/gethostbydns.c
@@ -57,7 +57,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/cpukit/libnetworking/libc/getifaddrs.c b/cpukit/libnetworking/libc/getifaddrs.c
index 9d5a535000..b5979cd372 100644
--- a/cpukit/libnetworking/libc/getifaddrs.c
+++ b/cpukit/libnetworking/libc/getifaddrs.c
@@ -33,7 +33,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/cpukit/libnetworking/libc/if_indextoname.c b/cpukit/libnetworking/libc/if_indextoname.c
index 8b2279e75c..32a499590e 100644
--- a/cpukit/libnetworking/libc/if_indextoname.c
+++ b/cpukit/libnetworking/libc/if_indextoname.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/cpukit/libnetworking/libc/if_nameindex.c b/cpukit/libnetworking/libc/if_nameindex.c
index f4e54a6733..8c1ebb8381 100644
--- a/cpukit/libnetworking/libc/if_nameindex.c
+++ b/cpukit/libnetworking/libc/if_nameindex.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/cpukit/libnetworking/libc/res_stubs.c b/cpukit/libnetworking/libc/res_stubs.c
index 5bb415a94c..2cd9ba70c7 100644
--- a/cpukit/libnetworking/libc/res_stubs.c
+++ b/cpukit/libnetworking/libc/res_stubs.c
@@ -43,7 +43,7 @@
 #endif
 
 #include <sys/types.h>
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 __weak_reference(__inet_addr, inet_addr);
 __weak_reference(__inet_aton, inet_aton);
diff --git a/cpukit/libnetworking/machine/in_cksum.h b/cpukit/libnetworking/machine/in_cksum.h
index 5329fba869..db906a60be 100644
--- a/cpukit/libnetworking/machine/in_cksum.h
+++ b/cpukit/libnetworking/machine/in_cksum.h
@@ -39,7 +39,7 @@
 #ifndef _MACHINE_IN_CKSUM_H_
 #define	_MACHINE_IN_CKSUM_H_	1
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <netinet/ip.h> /* struct ip */
 
 /*
diff --git a/cpukit/libnetworking/net/ethernet.h b/cpukit/libnetworking/net/ethernet.h
index 3051af077a..380ee1bad0 100644
--- a/cpukit/libnetworking/net/ethernet.h
+++ b/cpukit/libnetworking/net/ethernet.h
@@ -369,7 +369,7 @@ extern	char *ether_sprintf(const u_int8_t *);
 
 #else /* _KERNEL */
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 /*
  * Ethernet address conversion/parsing routines.
diff --git a/cpukit/libnetworking/net/if.h b/cpukit/libnetworking/net/if.h
index 7a0b9f15ce..31e256fcd4 100644
--- a/cpukit/libnetworking/net/if.h
+++ b/cpukit/libnetworking/net/if.h
@@ -37,7 +37,7 @@
 #ifndef _NET_IF_H_
 #define	_NET_IF_H_
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #if defined(__rtems__)
 /*
diff --git a/cpukit/libnetworking/net/if_dl.h b/cpukit/libnetworking/net/if_dl.h
index 757f1f13f0..e739316be8 100644
--- a/cpukit/libnetworking/net/if_dl.h
+++ b/cpukit/libnetworking/net/if_dl.h
@@ -74,7 +74,7 @@ struct sockaddr_dl {
 
 #ifndef _KERNEL
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 void	link_addr(const char *, struct sockaddr_dl *);
diff --git a/cpukit/libnetworking/netdb.h b/cpukit/libnetworking/netdb.h
index 8d4c60c5b5..00f2ccdd3c 100644
--- a/cpukit/libnetworking/netdb.h
+++ b/cpukit/libnetworking/netdb.h
@@ -65,7 +65,7 @@
 #ifndef _NETDB_H_
 #define _NETDB_H_
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <rtems/bsdnet/_types.h>
 
 #ifndef _SOCKLEN_T_DECLARED
diff --git a/cpukit/libnetworking/netinet/ip.h b/cpukit/libnetworking/netinet/ip.h
index 04625b95a6..a17d0194c3 100644
--- a/cpukit/libnetworking/netinet/ip.h
+++ b/cpukit/libnetworking/netinet/ip.h
@@ -37,7 +37,7 @@
 #ifndef _NETINET_IP_H_
 #define _NETINET_IP_H_
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 /*
  * Definitions for internet protocol version 4.
diff --git a/cpukit/libnetworking/netinet/tcp.h b/cpukit/libnetworking/netinet/tcp.h
index 9bd4a1454c..96e28710c1 100644
--- a/cpukit/libnetworking/netinet/tcp.h
+++ b/cpukit/libnetworking/netinet/tcp.h
@@ -37,7 +37,7 @@
 #ifndef _NETINET_TCP_H_
 #define _NETINET_TCP_H_
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #if __BSD_VISIBLE
 
diff --git a/cpukit/libnetworking/netinet/tcp_debug.c b/cpukit/libnetworking/netinet/tcp_debug.c
index 779c5fb5c7..56198adcc0 100644
--- a/cpukit/libnetworking/netinet/tcp_debug.c
+++ b/cpukit/libnetworking/netinet/tcp_debug.c
@@ -34,7 +34,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include "opt_inet.h"
 #include "opt_tcpdebug.h"
 
diff --git a/cpukit/libnetworking/resolv.h b/cpukit/libnetworking/resolv.h
index 9e45285a6e..33b97a043f 100644
--- a/cpukit/libnetworking/resolv.h
+++ b/cpukit/libnetworking/resolv.h
@@ -59,7 +59,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <stdio.h>
 
 /*
diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
index a22a22391c..4f4ff618eb 100644
--- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
+++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
@@ -36,7 +36,7 @@ typedef u_int32_t ioctl_command_t;
 /* make sure we get the network versions of these */
 #include <machine/types.h>
 #include <machine/param.h>
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #include <sys/time.h>
 
diff --git a/cpukit/libnetworking/sys/libkern.h b/cpukit/libnetworking/sys/libkern.h
index 3c0b025714..fd09ced07f 100644
--- a/cpukit/libnetworking/sys/libkern.h
+++ b/cpukit/libnetworking/sys/libkern.h
@@ -37,7 +37,7 @@
 #ifndef _SYS_LIBKERN_H_
 #define	_SYS_LIBKERN_H_
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <sys/types.h>
 
 /* BCD conversions. */
diff --git a/cpukit/libnetworking/sys/mount.h b/cpukit/libnetworking/sys/mount.h
index fec316f2ed..c055677258 100644
--- a/cpukit/libnetworking/sys/mount.h
+++ b/cpukit/libnetworking/sys/mount.h
@@ -116,7 +116,7 @@ typedef struct fhandle	fhandle_t;
 
 #else /* !_KERNEL */
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #endif /* _KERNEL */
 
diff --git a/cpukit/libnetworking/sys/poll.h b/cpukit/libnetworking/sys/poll.h
index 8237ba303c..9ea42b9ddf 100644
--- a/cpukit/libnetworking/sys/poll.h
+++ b/cpukit/libnetworking/sys/poll.h
@@ -31,7 +31,7 @@
 #ifndef _SYS_POLL_H_
 #define	_SYS_POLL_H_
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 /*
  * This file is intended to be compatible with the traditional poll.h.
diff --git a/cpukit/libnetworking/sys/socket.h b/cpukit/libnetworking/sys/socket.h
index 0bc1dcdefa..63b14ca6fc 100644
--- a/cpukit/libnetworking/sys/socket.h
+++ b/cpukit/libnetworking/sys/socket.h
@@ -37,7 +37,7 @@
 #ifndef _SYS_SOCKET_H_
 #define	_SYS_SOCKET_H_
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <rtems/bsdnet/_types.h>
 
 /*
diff --git a/cpukit/libnetworking/sys/sysctl.h b/cpukit/libnetworking/sys/sysctl.h
index 125d33cbf7..58ac3e007b 100644
--- a/cpukit/libnetworking/sys/sysctl.h
+++ b/cpukit/libnetworking/sys/sysctl.h
@@ -630,7 +630,7 @@ int	sysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid,
 int	sysctl_wire_old_buffer(struct sysctl_req *req, size_t len);
 
 #else	/* !_KERNEL */
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 int	sysctl(int *, u_int, void *, size_t *, void *, size_t);
diff --git a/cpukit/libnetworking/sys/syslog.h b/cpukit/libnetworking/sys/syslog.h
index 8927b8a8ff..affce6887e 100644
--- a/cpukit/libnetworking/sys/syslog.h
+++ b/cpukit/libnetworking/sys/syslog.h
@@ -178,7 +178,7 @@ CODE facilitynames[] = {
 
 #else /* not _KERNEL */
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <stdarg.h>
 
 __BEGIN_DECLS
diff --git a/cpukit/libnetworking/sys/systm.h b/cpukit/libnetworking/sys/systm.h
index a66c746121..d28463ffcf 100644
--- a/cpukit/libnetworking/sys/systm.h
+++ b/cpukit/libnetworking/sys/systm.h
@@ -45,6 +45,10 @@
 #include <rtems/rtems_bsdnet_internal.h> /* for __BSD_VA_LIST__ */
 #include <machine/cpufunc.h>
 
+#if !defined(__dead2)
+#define __dead2         __attribute__((__noreturn__))
+#endif
+
 extern int securelevel;		/* system security level (see init(8)) */
 
 extern int cold;		/* nonzero if we are doing a cold boot */
diff --git a/cpukit/libnetworking/sys/uio.h b/cpukit/libnetworking/sys/uio.h
index 6b12a91260..b89e430596 100644
--- a/cpukit/libnetworking/sys/uio.h
+++ b/cpukit/libnetworking/sys/uio.h
@@ -37,7 +37,7 @@
 #ifndef _SYS_UIO_H_
 #define	_SYS_UIO_H_
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <sys/types.h>
 
 /*
diff --git a/cpukit/libnetworking/sys/un.h b/cpukit/libnetworking/sys/un.h
index cf169d3274..35425ad1eb 100644
--- a/cpukit/libnetworking/sys/un.h
+++ b/cpukit/libnetworking/sys/un.h
@@ -37,7 +37,7 @@
 #ifndef _SYS_UN_H_
 #define _SYS_UN_H_
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <rtems/bsdnet/_types.h>
 
 #ifndef _SA_FAMILY_T_DECLARED
diff --git a/cpukit/librpc/include/rpc/auth.h b/cpukit/librpc/include/rpc/auth.h
index f644532f3e..036089938c 100644
--- a/cpukit/librpc/include/rpc/auth.h
+++ b/cpukit/librpc/include/rpc/auth.h
@@ -43,7 +43,7 @@
 
 #ifndef _RPC_AUTH_H
 #define _RPC_AUTH_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <sys/socket.h>
 
 #define MAX_AUTH_BYTES	400
diff --git a/cpukit/librpc/include/rpc/auth_unix.h b/cpukit/librpc/include/rpc/auth_unix.h
index ee4467217b..e28f478f67 100644
--- a/cpukit/librpc/include/rpc/auth_unix.h
+++ b/cpukit/librpc/include/rpc/auth_unix.h
@@ -46,7 +46,7 @@
 
 #ifndef _RPC_AUTH_UNIX_H
 #define _RPC_AUTH_UNIX_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 /* The machine name is part of a credential; it may not exceed 255 bytes */
 #define MAX_MACHINE_NAME 255
diff --git a/cpukit/librpc/include/rpc/clnt.h b/cpukit/librpc/include/rpc/clnt.h
index b92abe367a..59f5c5d46e 100644
--- a/cpukit/librpc/include/rpc/clnt.h
+++ b/cpukit/librpc/include/rpc/clnt.h
@@ -64,7 +64,7 @@
 #ifndef _RPC_CLNT_H_
 #define _RPC_CLNT_H_
 #include <rpc/clnt_stat.h>
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <sys/un.h>
 
 /*
diff --git a/cpukit/librpc/include/rpc/clnt_soc.h b/cpukit/librpc/include/rpc/clnt_soc.h
index f00a0b6e60..f98c1b9b78 100644
--- a/cpukit/librpc/include/rpc/clnt_soc.h
+++ b/cpukit/librpc/include/rpc/clnt_soc.h
@@ -47,7 +47,7 @@
  * with TS-RPC.
  */
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #define UDPMSGSIZE      8800    /* rpc imposed limit on udp msg size */  
 
diff --git a/cpukit/librpc/include/rpc/pmap_clnt.h b/cpukit/librpc/include/rpc/pmap_clnt.h
index 379bb46489..c538bcf53e 100644
--- a/cpukit/librpc/include/rpc/pmap_clnt.h
+++ b/cpukit/librpc/include/rpc/pmap_clnt.h
@@ -62,7 +62,7 @@
 
 #ifndef _RPC_PMAPCLNT_H
 #define _RPC_PMAPCLNT_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 extern bool_t		pmap_set	(u_long, u_long, int, int);
diff --git a/cpukit/librpc/include/rpc/pmap_prot.h b/cpukit/librpc/include/rpc/pmap_prot.h
index 6ec7468dcc..3065dc1974 100644
--- a/cpukit/librpc/include/rpc/pmap_prot.h
+++ b/cpukit/librpc/include/rpc/pmap_prot.h
@@ -70,7 +70,7 @@
 
 #ifndef _RPC_PMAPPROT_H
 #define _RPC_PMAPPROT_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #define PMAPPORT		((u_short)111)
 #define PMAPPROG		((u_long)100000)
diff --git a/cpukit/librpc/include/rpc/pmap_rmt.h b/cpukit/librpc/include/rpc/pmap_rmt.h
index fb2727b6f9..752141494f 100644
--- a/cpukit/librpc/include/rpc/pmap_rmt.h
+++ b/cpukit/librpc/include/rpc/pmap_rmt.h
@@ -40,7 +40,7 @@
 
 #ifndef _RPC_PMAPRMT_H
 #define _RPC_PMAPRMT_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 struct rmtcallargs {
 	u_long prog, vers, proc, arglen;
diff --git a/cpukit/librpc/include/rpc/rpc_com.h b/cpukit/librpc/include/rpc/rpc_com.h
index 8434babea9..7697b9a44c 100644
--- a/cpukit/librpc/include/rpc/rpc_com.h
+++ b/cpukit/librpc/include/rpc/rpc_com.h
@@ -46,7 +46,7 @@
 #ifndef _RPC_RPCCOM_H
 #define	_RPC_RPCCOM_H
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 /* #pragma ident	"@(#)rpc_com.h	1.11	93/07/05 SMI" */
 
diff --git a/cpukit/librpc/include/rpc/rpcent.h b/cpukit/librpc/include/rpc/rpcent.h
index e9fbaf6660..1cf4161b81 100644
--- a/cpukit/librpc/include/rpc/rpcent.h
+++ b/cpukit/librpc/include/rpc/rpcent.h
@@ -42,7 +42,7 @@
 #ifndef _RPC_RPCENT_H
 #define _RPC_RPCENT_H
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 /*	#pragma ident "@(#)rpcent.h   1.13    94/04/25 SMI"	*/
 /*      @(#)rpcent.h 1.1 88/12/06 SMI   */
diff --git a/cpukit/librpc/include/rpc/svc.h b/cpukit/librpc/include/rpc/svc.h
index f7c6ebd0e5..7b2633f9f1 100644
--- a/cpukit/librpc/include/rpc/svc.h
+++ b/cpukit/librpc/include/rpc/svc.h
@@ -39,7 +39,7 @@
 
 #ifndef _RPC_SVC_H
 #define _RPC_SVC_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 /*
  * This interface must manage two items concerning remote procedure calling:
diff --git a/cpukit/librpc/include/rpc/svc_soc.h b/cpukit/librpc/include/rpc/svc_soc.h
index 0c4d987673..359d11e8ba 100644
--- a/cpukit/librpc/include/rpc/svc_soc.h
+++ b/cpukit/librpc/include/rpc/svc_soc.h
@@ -39,7 +39,7 @@
 
 #ifndef _RPC_SVC_SOC_H
 #define _RPC_SVC_SOC_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 /* #pragma ident   "@(#)svc_soc.h  1.11    94/04/25 SMI" */
 /*      svc_soc.h 1.8 89/05/01 SMI      */
diff --git a/cpukit/librpc/include/rpc/xdr.h b/cpukit/librpc/include/rpc/xdr.h
index e5c04974d4..30f2bccc0c 100644
--- a/cpukit/librpc/include/rpc/xdr.h
+++ b/cpukit/librpc/include/rpc/xdr.h
@@ -42,7 +42,7 @@
 #ifndef _RPC_XDR_H
 #define _RPC_XDR_H
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #include <rpc/types.h>
 
diff --git a/cpukit/librpc/include/rpcsvc/ypclnt.h b/cpukit/librpc/include/rpcsvc/ypclnt.h
index c429ff7ee0..6b8edfe94e 100644
--- a/cpukit/librpc/include/rpcsvc/ypclnt.h
+++ b/cpukit/librpc/include/rpcsvc/ypclnt.h
@@ -32,7 +32,7 @@
 #ifndef _RPCSVC_YPCLNT_H_
 #define _RPCSVC_YPCLNT_H_
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 
 #define YPERR_BADARGS	1		/* args to function are bad */
 #define YPERR_RPC	2		/* RPC failure */
-- 
cgit v1.2.3