9 files changed, 12 insertions, 8 deletions
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