Index: /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk	(revision 66071)
+++ /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk	(revision 66072)
@@ -20,5 +20,5 @@
 
 
-if1of ($(KBUILD_TARGET), darwin freebsd haiku $(if $(defined VBOX_WITH_ADDITION_DRIVERS),linux,) netbsd os2 solaris win)
+if1of ($(KBUILD_TARGET), darwin freebsd haiku netbsd os2 solaris win)
  #
  # VBoxGuest - The Guest Additions Driver.
@@ -28,5 +28,4 @@
  VBoxGuest_NAME.freebsd  = vboxguest
  VBoxGuest_NAME.haiku    = vboxguest
- VBoxGuest_NAME.linux    = vboxguest
  VBoxGuest_NAME.netbsd   = vboxguest
  VBoxGuest_NAME.solaris  = vboxguest
@@ -37,5 +36,4 @@
  endif
  VBoxGuest_DEFS.haiku    = VBOX_SVN_REV=$(VBOX_SVN_REV) _KERNEL_MODE=1
- VBoxGuest_DEFS.linux    = KBUILD_MODNAME=KBUILD_STR\(vboxguest\) KBUILD_BASENAME=KBUILD_STR\(vboxguest\) DEBUG_HASH=2 DEBUG_HASH2=3 EXPORT_SYMTAB
  VBoxGuest_DEFS.solaris  = VBOX_SVN_REV=$(VBOX_SVN_REV)
  VBoxGuest_DEFS.win      = VBOX_GUESTDRV_WITH_RELEASE_LOGGER
@@ -53,5 +51,4 @@
 	$(if $(VBOX_WITH_DPC_LATENCY_CHECKER),VBOX_WITH_DPC_LATENCY_CHECKER,)
  VBoxGuest_DEPS.solaris += $(VBOX_SVN_REV_KMK)
- VBoxGuest_DEPS.linux   += $(VBOX_SVN_REV_HEADER)
  VBoxGuest_DEPS.haiku   += $(VBOX_SVN_REV_HEADER)
  VBoxGuest_DEPS.freebsd += $(VBOX_SVN_REV_HEADER)
@@ -62,5 +59,4 @@
  VBoxGuest_INCS.freebsd  = $(VBoxGuest_0_OUTDIR) $(PATH_STAGE)/gen-sys-hdrs
  VBoxGuest_INCS.netbsd   = $(VBoxGuest_0_OUTDIR)
- VBoxGuest_INCS.linux    = ../../../Runtime/r0drv/linux
  ifeq ($(KBUILD_HOST),solaris)
   VBoxGuest_LDFLAGS.solaris         += -N misc/ctf
Index: /trunk/src/VBox/HostDrivers/Support/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/Makefile.kmk	(revision 66071)
+++ /trunk/src/VBox/HostDrivers/Support/Makefile.kmk	(revision 66072)
@@ -544,5 +544,5 @@
 # New VBoxDrv target. TODO: Convert all the above to use this!
 #
-if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
+if1of ($(KBUILD_TARGET), darwin freebsd solaris win)
  ifdef VBOX_WITH_VBOXDRV
   SYSMODS += VBoxDrv
@@ -550,5 +550,4 @@
  VBoxDrv_TEMPLATE         = VBOXR0DRV
  VBoxDrv_NAME.freebsd     = vboxdrv
- VBoxDrv_NAME.linux       = vboxdrv
  VBoxDrv_NAME.solaris     = vboxdrv
  ifdef VBOX_SIGNING_MODE
@@ -576,9 +575,4 @@
   VBoxDrv_DEFS.darwin    += VBOX_WITH_RAW_MODE
  endif
- VBoxDrv_DEFS.linux      := \
-	KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) MODULE CONFIG_VBOXDRV_AS_MISC
- ifdef VBOX_LINUX_VERSION_2_4
-  VBoxDrv_DEFS.linux     += EXPORT_SYMTAB
- endif
  ifdef VBOX_WITH_NETFLT
   VBoxDrv_DEFS.solaris   += VBOX_WITH_NETFLT
@@ -602,8 +596,6 @@
  VBoxDrv_INCS             = . $(VBoxDrv_0_OUTDIR)
  VBoxDrv_INCS.darwin      = ./darwin
- VBoxDrv_INCS.linux       = $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
 
  VBoxDrv_LIBS             = $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
- VBoxDrv_LIBS.linux.debug = $(VBoxDrv_LIBS) $(VBOX_GCC_LIBGCC)
  VBoxDrv_LIBS.win         = \
  	$(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \
@@ -622,6 +614,4 @@
  VBoxDrv_SOURCES.darwin   = \
 	darwin/SUPDrv-darwin.cpp
- VBoxDrv_SOURCES.linux    = \
-	linux/SUPDrv-linux.c
  VBoxDrv_SOURCES.solaris  = \
 	solaris/SUPDrv-solaris.c
@@ -651,8 +641,4 @@
   VBoxDrv_SOURCES        += \
  	SUPDrvTracerA.asm
- endif
- ifndef VBOX_LINUX_VERSION_2_4
-  VBoxDrv_SOURCES.linux  += \
- 	linux/SUPDrv-linux.mod.c
  endif
 
Index: /trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk	(revision 66071)
+++ /trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk	(revision 66072)
@@ -19,5 +19,5 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-if1of ($(KBUILD_TARGET), solaris darwin linux freebsd)
+if1of ($(KBUILD_TARGET), solaris darwin freebsd)
  #
  # VBoxNetAdp - Virtual Network Adapter
@@ -30,13 +30,9 @@
   VBoxNetAdp_DEBUG_INST.darwin= $(patsubst %/,%,$(INST_VBOXNETADP))
   VBoxNetAdp_NAME.solaris     = vboxnet
-  VBoxNetAdp_NAME.linux       = vboxnetadp
   VBoxNetAdp_NAME.freebsd     = vboxnetadp
   VBoxNetAdp_DEPS.solaris    += $(VBOX_SVN_REV_KMK)
   VBoxNetAdp_DEFS             = IN_RT_R0 VBOX_SVN_REV=$(VBOX_SVN_REV) IN_SUP_STATIC
-  VBoxNetAdp_DEFS.linux       = KBUILD_MODNAME=KBUILD_STR\(vboxnetadp\) KBUILD_BASENAME=KBUILD_STR\(vboxnetadp\) MODULE
   #VBoxNetAdp_LDFLAGS.darwin   = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded
   VBoxNetAdp_LDFLAGS.solaris += -N misc/gld -N drv/vboxdrv
-  VBoxNetAdp_INCS.linux   := \
-  	$(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
   VBoxNetAdp_INCS             = \
   	.
@@ -46,7 +42,4 @@
   VBoxNetAdp_SOURCES.solaris  = \
   	solaris/VBoxNetAdp-solaris.c
-  VBoxNetAdp_SOURCES.linux   = \
-  	linux/VBoxNetAdp-linux.c \
-  	VBoxNetAdp.c
   VBoxNetAdp_SOURCES.freebsd   = \
   	freebsd/VBoxNetAdp-freebsd.c \
@@ -57,5 +50,4 @@
   VBoxNetAdp_LIBS            += \
   	$(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
-  linux/VBoxNetAdp-linux.c_DEPS = $(VBOX_SVN_REV_HEADER)
  endif
 endif
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk	(revision 66071)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk	(revision 66072)
@@ -451,5 +451,5 @@
 endif #ifeq ($(KBUILD_TARGET), win)
 
-else if1of ($(KBUILD_TARGET), linux solaris freebsd) ## @todo merge this with the mixed case stuff.
+else if1of ($(KBUILD_TARGET), solaris freebsd) ## @todo merge this with the mixed case stuff.
 #
 # vboxnetflt(.ko/.o/) - The lower case driver.
@@ -461,12 +461,6 @@
   vboxnetflt_TEMPLATE      = VBOXR0DRV
   vboxnetflt_NAME.solaris  = vboxflt
-  vboxnetflt_DEFS.linux    = \
-	KBUILD_MODNAME=KBUILD_STR\(vboxnetflt\) \
-	KBUILD_BASENAME=KBUILD_STR\(vboxnetflt\) \
-	MODULE DEBUG_HASH=2 DEBUG_HASH2=3
   vboxnetflt_DEFS          = IN_RT_R0
   vboxnetflt_DEPS.solaris += $(VBOX_SVN_REV_KMK)
-  vboxnetflt_INCS.linux   := \
-  	$(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
   vboxnetflt_INCS         := \
   	$(PATH_SUB_CURRENT)
@@ -477,9 +471,7 @@
   #vboxnetflt_LIBS += \
   #	$(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
-  vboxnetflt_SOURCES.linux = linux/VBoxNetFlt-linux.c
   vboxnetflt_SOURCES.solaris = solaris/VBoxNetFlt-solaris.c
   vboxnetflt_SOURCES.freebsd = freebsd/VBoxNetFlt-freebsd.c
   vboxnetflt_SOURCES = VBoxNetFlt.c
-  linux/VBoxNetFlt-linux.c_DEPS = $(VBOX_SVN_REV_HEADER)
   solaris/VBoxNetFlt-solaris.c_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
 
Index: /trunk/src/VBox/HostDrivers/VBoxPci/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxPci/Makefile.kmk	(revision 66071)
+++ /trunk/src/VBox/HostDrivers/VBoxPci/Makefile.kmk	(revision 66072)
@@ -18,5 +18,5 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
-if1of ($(KBUILD_TARGET), linux)
+if1of ($(KBUILD_TARGET), )
 
  ifdef VBOX_WITH_VBOXDRV
@@ -30,16 +30,10 @@
   VBoxPci_NAME.linux     = vboxpci
   VBoxPci_DEFS           = IN_RT_R0 VBOX_SVN_REV=$(VBOX_SVN_REV) IN_SUP_STATIC
-  VBoxPci_DEFS.linux     = KBUILD_MODNAME=KBUILD_STR\(vboxpci\) KBUILD_BASENAME=KBUILD_STR\(vboxpci\) MODULE
-  VBoxPci_INCS.linux    := \
- 	$(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
   VBoxPci_INCS           = \
  	.
-  VBoxPci_SOURCES.linux  = \
- 	linux/VBoxPci-linux.c
   VBoxPci_SOURCES        = \
  	VBoxPci.c
   VBoxPci_LIBS          += \
  	$(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
-  linux/VBoxPci-linux.c_DEPS = $(VBOX_SVN_REV_HEADER)
  endif
 
Index: /trunk/src/VBox/Runtime/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/Makefile.kmk	(revision 66071)
+++ /trunk/src/VBox/Runtime/Makefile.kmk	(revision 66072)
@@ -1992,11 +1992,8 @@
 RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS RT_NO_EXPORT_SYMBOL NOFILEID
 RuntimeR0Drv_DEFS.win   = IN_SUP_R0 LDR_ONLY_PE
-RuntimeR0Drv_DEFS.linux = MODULE KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) IN_SUP_R0
 
 RuntimeR0Drv_INCS      := $(PATH_SUB_CURRENT) include
 RuntimeR0Drv_INCS.freebsd = \
 	$(PATH_STAGE)/gen-sys-hdrs
-RuntimeR0Drv_INCS.linux = \
-	r0drv/linux
 RuntimeR0Drv_INCS.solaris = \
 	r0drv/solaris/vbi/i86pc \