network: Use kernel/user space header files

Add and use <machine/rtems-bsd-kernel-space.h> and
<machine/rtems-bsd-user-space.h> similar to the libbsd to avoid command
line defines and defines scattered throught the code base.

Simplify cpukit/libnetworking/Makefile.am.

Update #3375.

58 files changed, 58 insertions, 74 deletions

diff --git a/bsps/arm/atsam/net/if_atsam.c b/bsps/arm/atsam/net/if_atsam.c
index 7e7e0e6faf..75b1f952b6 100644
--- a/bsps/arm/atsam/net/if_atsam.c
+++ b/bsps/arm/atsam/net/if_atsam.c
@@ -33,8 +33,7 @@
 #include <libchip/include/gmacd.h>
 #include <libchip/include/pio.h>
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__	1
-#define __BSD_VISIBLE				1
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <bsp/irq.h>
diff --git a/bsps/arm/csb336/net/lan91c11x.c b/bsps/arm/csb336/net/lan91c11x.c
index 37594776d1..e1c4fcc7ce 100644
--- a/bsps/arm/csb336/net/lan91c11x.c
+++ b/bsps/arm/csb336/net/lan91c11x.c
@@ -17,7 +17,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include "lan91c11x.h"
diff --git a/bsps/arm/csb336/net/network.c b/bsps/arm/csb336/net/network.c
index be3d3f7b3d..ddc671a4cd 100644
--- a/bsps/arm/csb336/net/network.c
+++ b/bsps/arm/csb336/net/network.c
@@ -9,7 +9,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <rtems/rtems_bsdnet.h>
diff --git a/bsps/arm/csb337/net/network.c b/bsps/arm/csb337/net/network.c
index af7150122d..b795cf4bce 100644
--- a/bsps/arm/csb337/net/network.c
+++ b/bsps/arm/csb337/net/network.c
@@ -10,7 +10,7 @@
  *             MicroMonitor 1.17.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <rtems/rtems_bsdnet.h>
diff --git a/bsps/arm/edb7312/net/network.c b/bsps/arm/edb7312/net/network.c
index 480808aeaa..9a832293f9 100644
--- a/bsps/arm/edb7312/net/network.c
+++ b/bsps/arm/edb7312/net/network.c
@@ -1,4 +1,4 @@
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <sys/param.h>
diff --git a/bsps/arm/gumstix/net/rtl8019.c b/bsps/arm/gumstix/net/rtl8019.c
index 995835c689..a9edd71be1 100644
--- a/bsps/arm/gumstix/net/rtl8019.c
+++ b/bsps/arm/gumstix/net/rtl8019.c
@@ -8,7 +8,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <bsp/irq.h>
diff --git a/bsps/arm/rtl22xx/net/network.c b/bsps/arm/rtl22xx/net/network.c
index b269a6ddfc..5581b8fab5 100644
--- a/bsps/arm/rtl22xx/net/network.c
+++ b/bsps/arm/rtl22xx/net/network.c
@@ -1,6 +1,6 @@
 /*Note: this file is copy from 7312 BSP, and untested yet*/
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <sys/param.h>
diff --git a/bsps/arm/shared/net/lpc-ethernet.c b/bsps/arm/shared/net/lpc-ethernet.c
index fb8f014963..ccfe1696eb 100644
--- a/bsps/arm/shared/net/lpc-ethernet.c
+++ b/bsps/arm/shared/net/lpc-ethernet.c
@@ -20,7 +20,7 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <errno.h>
 #include <inttypes.h>
diff --git a/bsps/bfin/bf537Stamp/net/ethernet.c b/bsps/bfin/bf537Stamp/net/ethernet.c
index f08ffdd63b..1594219e16 100644
--- a/bsps/bfin/bf537Stamp/net/ethernet.c
+++ b/bsps/bfin/bf537Stamp/net/ethernet.c
@@ -10,7 +10,7 @@
  *
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <rtems/rtems_bsdnet.h>
diff --git a/bsps/bfin/bf537Stamp/net/networkconfig.c b/bsps/bfin/bf537Stamp/net/networkconfig.c
index 9737530340..85655b3cd4 100644
--- a/bsps/bfin/bf537Stamp/net/networkconfig.c
+++ b/bsps/bfin/bf537Stamp/net/networkconfig.c
@@ -11,7 +11,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <rtems/rtems_bsdnet.h>
diff --git a/bsps/i386/pc386/net/3c509.c b/bsps/i386/pc386/net/3c509.c
index 3cf7ec5226..b30ad03573 100644
--- a/bsps/i386/pc386/net/3c509.c
+++ b/bsps/i386/pc386/net/3c509.c
@@ -53,7 +53,7 @@
  * eric@skatter.usask.ca
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 
diff --git a/bsps/i386/pc386/net/elink.c b/bsps/i386/pc386/net/elink.c
index ca637fb0a8..65cfdfd3ff 100644
--- a/bsps/i386/pc386/net/elink.c
+++ b/bsps/i386/pc386/net/elink.c
@@ -31,7 +31,7 @@
  * Common code for dealing with 3COM ethernet cards.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <sys/types.h>
 
diff --git a/bsps/i386/pc386/net/ne2000.c b/bsps/i386/pc386/net/ne2000.c
index 17861405a6..08d805730a 100644
--- a/bsps/i386/pc386/net/ne2000.c
+++ b/bsps/i386/pc386/net/ne2000.c
@@ -27,7 +27,7 @@
  *  that.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <libchip/wd80x3.h>
diff --git a/bsps/i386/pc386/net/wd8003.c b/bsps/i386/pc386/net/wd8003.c
index d10361bf2c..f455bcca9e 100644
--- a/bsps/i386/pc386/net/wd8003.c
+++ b/bsps/i386/pc386/net/wd8003.c
@@ -9,7 +9,7 @@
  *    eric@skatter.usask.ca
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <libchip/wd80x3.h>
diff --git a/bsps/lm32/shared/net/network.c b/bsps/lm32/shared/net/network.c
index 2bc518ef25..b53f25d5be 100644
--- a/bsps/lm32/shared/net/network.c
+++ b/bsps/lm32/shared/net/network.c
@@ -10,7 +10,7 @@
  *  Copyright (C) 2011 Sebastien Bourdeauducq
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 #define RTEMS_STATUS_CHECKS_USE_PRINTK
 
 #include <bsp.h>
diff --git a/bsps/lm32/shared/net/tsmac.c b/bsps/lm32/shared/net/tsmac.c
index 6779f336d4..52abc64494 100644
--- a/bsps/lm32/shared/net/tsmac.c
+++ b/bsps/lm32/shared/net/tsmac.c
@@ -12,8 +12,7 @@
  *  Micro-Research Finland Oy
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
-#define _KERNEL
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <bsp.h>
diff --git a/bsps/m68k/av5282/net/network.c b/bsps/m68k/av5282/net/network.c
index 457b43c5d6..8c37e67fd6 100644
--- a/bsps/m68k/av5282/net/network.c
+++ b/bsps/m68k/av5282/net/network.c
@@ -1,4 +1,4 @@
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>
diff --git a/bsps/m68k/csb360/net/network.c b/bsps/m68k/csb360/net/network.c
index 47e0adb44d..95769bf26a 100644
--- a/bsps/m68k/csb360/net/network.c
+++ b/bsps/m68k/csb360/net/network.c
@@ -22,7 +22,7 @@
  *  Copyright (c) 1999, National Research Council of Canada
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>
diff --git a/bsps/m68k/gen68360/net/network.c b/bsps/m68k/gen68360/net/network.c
index 0a038d3348..b0110af064 100644
--- a/bsps/m68k/gen68360/net/network.c
+++ b/bsps/m68k/gen68360/net/network.c
@@ -8,7 +8,7 @@
  * eric@skatter.usask.ca
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <rtems/m68k/m68360.h>
diff --git a/bsps/m68k/genmcf548x/net/network.c b/bsps/m68k/genmcf548x/net/network.c
index 13cb5fbdce..23bd8cba19 100644
--- a/bsps/m68k/genmcf548x/net/network.c
+++ b/bsps/m68k/genmcf548x/net/network.c
@@ -37,7 +37,7 @@
  *
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <rtems/error.h>
diff --git a/bsps/m68k/mcf5235/net/network.c b/bsps/m68k/mcf5235/net/network.c
index 6c8fa88be2..f352b664db 100644
--- a/bsps/m68k/mcf5235/net/network.c
+++ b/bsps/m68k/mcf5235/net/network.c
@@ -4,7 +4,7 @@
  * TO DO: Check network stack code -- force longword alignment of all tx mbufs?
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>
diff --git a/bsps/m68k/mcf5329/net/network.c b/bsps/m68k/mcf5329/net/network.c
index c752f8d669..21032a63ed 100644
--- a/bsps/m68k/mcf5329/net/network.c
+++ b/bsps/m68k/mcf5329/net/network.c
@@ -4,7 +4,7 @@
  * TO DO: Check network stack code -- force longword alignment of all tx mbufs?
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>
diff --git a/bsps/m68k/mvme167/net/network.c b/bsps/m68k/mvme167/net/network.c
index 06bcbfa84a..56d61dd2f0 100644
--- a/bsps/m68k/mvme167/net/network.c
+++ b/bsps/m68k/mvme167/net/network.c
@@ -1,8 +1,7 @@
 /*  network.c: An 82596 ethernet driver for rtems-bsd.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
-#define KERNEL
+#include <machine/rtems-bsd-kernel-space.h>
 
 /*
  *  Selectively define to debug the network driver. If you define any of these
diff --git a/bsps/m68k/uC5282/net/network.c b/bsps/m68k/uC5282/net/network.c
index b8afa0b968..49ce98a704 100644
--- a/bsps/m68k/uC5282/net/network.c
+++ b/bsps/m68k/uC5282/net/network.c
@@ -11,7 +11,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>
diff --git a/bsps/mips/csb350/net/network.c b/bsps/mips/csb350/net/network.c
index 15a1c320df..ba3b697cb8 100644
--- a/bsps/mips/csb350/net/network.c
+++ b/bsps/mips/csb350/net/network.c
@@ -13,7 +13,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <rtems/rtems_bsdnet.h>
diff --git a/bsps/powerpc/beatnik/net/porting/rtemscompat.h b/bsps/powerpc/beatnik/net/porting/rtemscompat.h
index 62821eb9ff..57d4ffbc11 100644
--- a/bsps/powerpc/beatnik/net/porting/rtemscompat.h
+++ b/bsps/powerpc/beatnik/net/porting/rtemscompat.h
@@ -37,7 +37,7 @@ static inline void  the_real_free(void *p)
 	return free(p);
 }
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 #include <rtems/rtems_bsdnet.h>
 #include <rtems/rtems_bsdnet_internal.h>
 #ifdef __i386__
diff --git a/bsps/powerpc/gen5200/net/network.c b/bsps/powerpc/gen5200/net/network.c
index 2e11915b26..cbc694ff7d 100644
--- a/bsps/powerpc/gen5200/net/network.c
+++ b/bsps/powerpc/gen5200/net/network.c
@@ -54,8 +54,7 @@
  *
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ 1
-#define __BSD_VISIBLE 1
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <rtems/error.h>
diff --git a/bsps/powerpc/gen83xx/net/network.c b/bsps/powerpc/gen83xx/net/network.c
index b870673cd3..04267176fb 100644
--- a/bsps/powerpc/gen83xx/net/network.c
+++ b/bsps/powerpc/gen83xx/net/network.c
@@ -18,7 +18,7 @@
 | of the network interface driver                                 |
 \*===============================================================*/
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <rtems/rtems_bsdnet.h>
diff --git a/bsps/powerpc/haleakala/net/network.c b/bsps/powerpc/haleakala/net/network.c
index f77b03648f..41481255cb 100644
--- a/bsps/powerpc/haleakala/net/network.c
+++ b/bsps/powerpc/haleakala/net/network.c
@@ -12,7 +12,7 @@
  *
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>
diff --git a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c
index fb0b7aa113..30156a0d4f 100644
--- a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c
+++ b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c
@@ -26,8 +26,7 @@
 
 #if defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU)
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ 1
-#define __BSD_VISIBLE 1
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <errno.h>
 #include <assert.h>
diff --git a/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c b/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c
index 350efdbc22..0c9cb8a842 100644
--- a/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c
+++ b/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c
@@ -47,14 +47,13 @@
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems/rtems_bsdnet.h>
 
 #include <sys/param.h>
 /*#include <sys/systm.h>
 #include <sys/kernel.h> */
-#define KERNEL
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
diff --git a/bsps/powerpc/mpc8260ads/net/network.c b/bsps/powerpc/mpc8260ads/net/network.c
index fb87fc0e64..31cf96a800 100644
--- a/bsps/powerpc/mpc8260ads/net/network.c
+++ b/bsps/powerpc/mpc8260ads/net/network.c
@@ -24,7 +24,7 @@
  * eric@skatter.usask.ca
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <bsp/irq.h>
diff --git a/bsps/powerpc/mvme3100/net/tsec.c b/bsps/powerpc/mvme3100/net/tsec.c
index 37a24099c0..23afbc0ba3 100644
--- a/bsps/powerpc/mvme3100/net/tsec.c
+++ b/bsps/powerpc/mvme3100/net/tsec.c
@@ -44,7 +44,7 @@
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <rtems/error.h>
@@ -56,13 +56,6 @@
 #include <assert.h>
 #include <bsp.h>
 
-#ifndef KERNEL
-#define KERNEL
-#endif
-#ifndef _KERNEL
-#define _KERNEL
-#endif
-
 #include <rtems/rtems_bsdnet.h>
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c b/bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c
index fa1d9471dd..ea29d766b3 100644
--- a/bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c
+++ b/bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c
@@ -19,7 +19,7 @@
  *
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #define BYTE_ORDER BIG_ENDIAN
 
diff --git a/bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c b/bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c
index dc89399b6c..11705ac04b 100644
--- a/bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c
+++ b/bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c
@@ -30,7 +30,7 @@
  *
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #define BYTE_ORDER BIG_ENDIAN
 
diff --git a/bsps/powerpc/qoriq/net/if_intercom.c b/bsps/powerpc/qoriq/net/if_intercom.c
index b692ced655..3fe7d84824 100644
--- a/bsps/powerpc/qoriq/net/if_intercom.c
+++ b/bsps/powerpc/qoriq/net/if_intercom.c
@@ -12,8 +12,7 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ 1
-#define __BSD_VISIBLE 1
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <assert.h>
 #include <errno.h>
diff --git a/bsps/powerpc/qoriq/net/network.c b/bsps/powerpc/qoriq/net/network.c
index 208b1a5434..15eeef0705 100644
--- a/bsps/powerpc/qoriq/net/network.c
+++ b/bsps/powerpc/qoriq/net/network.c
@@ -20,8 +20,7 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ 1
-#define __BSD_VISIBLE 1
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/bsps/powerpc/shared/net/tsec.c b/bsps/powerpc/shared/net/tsec.c
index ea1c29052e..3dc77b0c8e 100644
--- a/bsps/powerpc/shared/net/tsec.c
+++ b/bsps/powerpc/shared/net/tsec.c
@@ -17,7 +17,7 @@
 | this file contains the MPC83xx TSEC networking driver           |
 \*===============================================================*/
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <stdlib.h>
 #include <bsp.h>
diff --git a/bsps/powerpc/tqm8xx/net/network_fec.c b/bsps/powerpc/tqm8xx/net/network_fec.c
index a2a3016801..dec7de4f43 100644
--- a/bsps/powerpc/tqm8xx/net/network_fec.c
+++ b/bsps/powerpc/tqm8xx/net/network_fec.c
@@ -48,7 +48,7 @@
  *  Copyright (c) 1999, National Research Council of Canada
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>
diff --git a/bsps/powerpc/tqm8xx/net/network_scc.c b/bsps/powerpc/tqm8xx/net/network_scc.c
index 98acbb3e7a..e263beba40 100644
--- a/bsps/powerpc/tqm8xx/net/network_scc.c
+++ b/bsps/powerpc/tqm8xx/net/network_scc.c
@@ -45,7 +45,7 @@
  *  Copyright (c) 1999, National Research Council of Canada
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>
diff --git a/bsps/powerpc/virtex/net/xiltemac.c b/bsps/powerpc/virtex/net/xiltemac.c
index 1c3a461466..2e8b31b5f2 100644
--- a/bsps/powerpc/virtex/net/xiltemac.c
+++ b/bsps/powerpc/virtex/net/xiltemac.c
@@ -10,7 +10,7 @@
  *
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 #define PPC_HAS_CLASSIC_EXCEPTIONS FALSE
 
 #include <bsp.h>
diff --git a/bsps/shared/net/cs8900.c b/bsps/shared/net/cs8900.c
index 650a0e1fef..452a33a372 100644
--- a/bsps/shared/net/cs8900.c
+++ b/bsps/shared/net/cs8900.c
@@ -23,7 +23,7 @@
 
 */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <errno.h>
 #include <string.h>
diff --git a/bsps/shared/net/dec21140.c b/bsps/shared/net/dec21140.c
index 6fd3d5b33f..382f3d6b70 100644
--- a/bsps/shared/net/dec21140.c
+++ b/bsps/shared/net/dec21140.c
@@ -35,7 +35,7 @@
  *
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <inttypes.h>
diff --git a/bsps/shared/net/elnk.c b/bsps/shared/net/elnk.c
index 29adbe9c21..85af4b5043 100644
--- a/bsps/shared/net/elnk.c
+++ b/bsps/shared/net/elnk.c
@@ -62,7 +62,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 
diff --git a/bsps/shared/net/greth2.c b/bsps/shared/net/greth2.c
index 20be83ee48..78886f57b7 100644
--- a/bsps/shared/net/greth2.c
+++ b/bsps/shared/net/greth2.c
@@ -9,7 +9,7 @@
  * 2007-09-07, Ported GBIT support from 4.6.5
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <bsp.h>
diff --git a/bsps/shared/net/i82586.c b/bsps/shared/net/i82586.c
index c79af66e0d..8933ddf3c4 100644
--- a/bsps/shared/net/i82586.c
+++ b/bsps/shared/net/i82586.c
@@ -147,7 +147,7 @@ Mode of operation:
    the synchronization.
 */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <rtems/error.h>
diff --git a/bsps/shared/net/if_dc.c b/bsps/shared/net/if_dc.c
index e822a7c533..69e84944c0 100644
--- a/bsps/shared/net/if_dc.c
+++ b/bsps/shared/net/if_dc.c
@@ -99,7 +99,7 @@
  *  from being compiled on systems which can't support this driver.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #if defined(DRIVER_SUPPORTED)
 	#undef DRIVER_SUPPORTED
diff --git a/bsps/shared/net/if_fxp.c b/bsps/shared/net/if_fxp.c
index 2fe9a5c403..2bf99077f7 100644
--- a/bsps/shared/net/if_fxp.c
+++ b/bsps/shared/net/if_fxp.c
@@ -55,7 +55,7 @@
  *     Original RTEMS modifications.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #if defined(__i386__)
 
diff --git a/bsps/shared/net/open_eth.c b/bsps/shared/net/open_eth.c
index 88df0882cf..2335b7f2e1 100644
--- a/bsps/shared/net/open_eth.c
+++ b/bsps/shared/net/open_eth.c
@@ -19,7 +19,7 @@
  *        that used by this driver.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #if defined(__i386__) || defined(__arm__) || defined(__PPC__)
   #define OPENETH_NOT_SUPPORTED
diff --git a/bsps/shared/net/smc91111.c b/bsps/shared/net/smc91111.c
index 45c87e8245..61703c7334 100644
--- a/bsps/shared/net/smc91111.c
+++ b/bsps/shared/net/smc91111.c
@@ -1,4 +1,4 @@
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <errno.h>
diff --git a/bsps/shared/net/sonic.c b/bsps/shared/net/sonic.c
index dc97008b8d..77e3651023 100644
--- a/bsps/shared/net/sonic.c
+++ b/bsps/shared/net/sonic.c
@@ -31,7 +31,7 @@
  *  interrupt-free transmission by Jiri, 22/03/1999.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <rtems/rtems_bsdnet.h>
diff --git a/bsps/sparc/erc32/net/erc32sonic.c b/bsps/sparc/erc32/net/erc32sonic.c
index ce108bd825..af37b42598 100644
--- a/bsps/sparc/erc32/net/erc32sonic.c
+++ b/bsps/sparc/erc32/net/erc32sonic.c
@@ -20,7 +20,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <libchip/sonic.h>
diff --git a/bsps/sparc/leon2/net/leon_open_eth.c b/bsps/sparc/leon2/net/leon_open_eth.c
index 27b04cd386..326850e248 100644
--- a/bsps/sparc/leon2/net/leon_open_eth.c
+++ b/bsps/sparc/leon2/net/leon_open_eth.c
@@ -13,7 +13,7 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <libchip/open_eth.h>
diff --git a/bsps/sparc/leon2/net/leon_smc91111.c b/bsps/sparc/leon2/net/leon_smc91111.c
index 748ca35491..68c359edda 100644
--- a/bsps/sparc/leon2/net/leon_smc91111.c
+++ b/bsps/sparc/leon2/net/leon_smc91111.c
@@ -13,7 +13,7 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 
diff --git a/bsps/sparc/leon3/net/leon_greth.c b/bsps/sparc/leon3/net/leon_greth.c
index d630522a5d..7878d80f0f 100644
--- a/bsps/sparc/leon3/net/leon_greth.c
+++ b/bsps/sparc/leon3/net/leon_greth.c
@@ -9,7 +9,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <libchip/greth.h>
diff --git a/bsps/sparc/leon3/net/leon_open_eth.c b/bsps/sparc/leon3/net/leon_open_eth.c
index c59d613d75..5b9794cb89 100644
--- a/bsps/sparc/leon3/net/leon_open_eth.c
+++ b/bsps/sparc/leon3/net/leon_open_eth.c
@@ -13,7 +13,7 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <libchip/open_eth.h>
diff --git a/bsps/sparc/leon3/net/leon_smc91111.c b/bsps/sparc/leon3/net/leon_smc91111.c
index e4adac6c2b..5111f4936a 100644
--- a/bsps/sparc/leon3/net/leon_smc91111.c
+++ b/bsps/sparc/leon3/net/leon_smc91111.c
@@ -13,7 +13,7 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <libchip/smc91111exp.h>
diff --git a/bsps/sparc/shared/net/greth.c b/bsps/sparc/shared/net/greth.c
index d2824516a0..649ae9df24 100644
--- a/bsps/sparc/shared/net/greth.c
+++ b/bsps/sparc/shared/net/greth.c
@@ -12,10 +12,9 @@
  *  2007-09-07, Ported GBIT support from 4.6.5
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
-#define _KERNEL
 #define CPU_U32_FIX
 #include <bsp.h>