Index: /trunk/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk	(revision 35380)
@@ -43,11 +43,11 @@
 
  # The icon location is configurable.
- VBoxWindowsAdditions.rc_INCS += $(PATH_VBoxWindowsAdditions)
- VBoxWindowsAdditions.rc_DEPS += $(PATH_VBoxWindowsAdditions)/VBoxWindowsAdditions-icon.rc
- VBoxWindowsAdditions.rc_CLEAN = $(PATH_VBoxWindowsAdditions)/VBoxWindowsAdditions-icon.rc
+ VBoxWindowsAdditions.rc_INCS += $(VBoxWindowsAdditions_0_OUTDIR)
+ VBoxWindowsAdditions.rc_DEPS += $(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc
+ VBoxWindowsAdditions.rc_CLEAN = $(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc
 
 
  # Icon include file.
-$$(PATH_VBoxWindowsAdditions)/VBoxWindowsAdditions-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) Makefile.kmk | $$(dir $$@)
+$$(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) Makefile.kmk | $$(dir $$@)
 	$(RM) -f $@
 	$(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'
Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk	(revision 35380)
@@ -66,10 +66,10 @@
 
 # The icon location is configurable.
-VBoxTray.rc_INCS = $(PATH_VBoxTray)
-VBoxTray.rc_DEPS = $(PATH_VBoxTray)/VBoxTray-icon.rc
-VBoxTray.rc_CLEAN = $(PATH_VBoxTray)/VBoxTray-icon.rc
+VBoxTray.rc_INCS = $(VBoxTray_0_OUTDIR)
+VBoxTray.rc_DEPS = $(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc
+VBoxTray.rc_CLEAN = $(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc
 
 # Icon include file.
-$$(PATH_VBoxTray)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) $$(VBoxTray_PATH)/Makefile.kmk | $$(dir $$@)
+$$(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) $$(VBoxTray_PATH)/Makefile.kmk | $$(dir $$@)
 	$(RM) -f $@
 	$(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'
Index: /trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk	(revision 35380)
@@ -24,5 +24,5 @@
 VBoxMouseNT_DEFS        = LOG_TO_BACKDOOR
 VBoxMouseNT_INCS        = \
-	$(PATH_VBoxMouseNT) \
+	$(VBoxMouseNT_0_OUTDIR) \
 	./include \
 	./i386
@@ -44,17 +44,17 @@
 	$(VBOX_LIB_IPRT_GUEST_R0_NT4)
 VBoxMouseNT_DEPS        = \
-	$(PATH_VBoxMouseNT)/i8042log.rc
+	$(VBoxMouseNT_0_OUTDIR)/i8042log.rc
 VBoxMouseNT_CLEAN       = \
-	$(PATH_VBoxMouseNT)/i8042log.dbg \
-	$(PATH_VBoxMouseNT)/i8042log.h \
-	$(PATH_VBoxMouseNT)/i8042log.rc \
-	$(PATH_VBoxMouseNT)/MSG00001.bin
+	$(VBoxMouseNT_0_OUTDIR)/i8042log.dbg \
+	$(VBoxMouseNT_0_OUTDIR)/i8042log.h \
+	$(VBoxMouseNT_0_OUTDIR)/i8042log.rc \
+	$(VBoxMouseNT_0_OUTDIR)/MSG00001.bin
 
-$$(PATH_VBoxMouseNT)/i8042log.rc: $(PATH_SUB_CURRENT)/i8042log.mc | $$(dir $$@)
+$$(VBoxMouseNT_0_OUTDIR)/i8042log.rc: $(PATH_SUB_CURRENT)/i8042log.mc | $$(dir $$@)
 	$(call MSG_COMPILE,VBoxMouseNT,$<,$@,RC)
 	$(QUIET)$(WIN32_MC) \
-		-r $(PATH_VBoxMouseNT)/ \
-		-x $(PATH_VBoxMouseNT)/ \
-		-h $(PATH_VBoxMouseNT)/ \
+		-r $(VBoxMouseNT_0_OUTDIR)/ \
+		-x $(VBoxMouseNT_0_OUTDIR)/ \
+		-h $(VBoxMouseNT_0_OUTDIR)/ \
 		$(subst /,\\,$<)
 endif # x86
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	(revision 35380)
@@ -54,5 +54,5 @@
 VBoxGuestR0Lib_DEFS         = VBOX_WITH_HGCM
 VBoxGuestR0Lib_INCS         = \
-	$(PATH_VBoxGuestR0Lib)
+	$(VBoxGuestR0Lib_0_OUTDIR)
 VBoxGuestR0Lib_SOURCES      = \
 	GenericRequest.cpp \
Index: /trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk	(revision 35380)
@@ -141,10 +141,10 @@
 # The icon is configurable.
 #
-VBoxService-win.rc_INCS = $(PATH_VBoxService)
-VBoxService-win.rc_DEPS = $(PATH_VBoxService)/VBoxService-win-icon.rc
-VBoxService-win.rc_CLEAN = $(PATH_VBoxService)/VBoxService-win-icon.rc
+VBoxService-win.rc_INCS = $(VBoxService_0_OUTDIR)
+VBoxService-win.rc_DEPS = $(VBoxService_0_OUTDIR)/VBoxService-win-icon.rc
+VBoxService-win.rc_CLEAN = $(VBoxService_0_OUTDIR)/VBoxService-win-icon.rc
 
 # Icon include file.
-$$(PATH_VBoxService)/VBoxService-win-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) $$(VBoxService_PATH)/Makefile.kmk | $$(dir $$@)
+$$(VBoxService_0_OUTDIR)/VBoxService-win-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) $$(VBoxService_PATH)/Makefile.kmk | $$(dir $$@)
 	$(RM) -f $@
 	$(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'
Index: /trunk/src/VBox/Additions/freebsd/drm/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/freebsd/drm/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/freebsd/drm/Makefile.kmk	(revision 35380)
@@ -47,5 +47,5 @@
 vboxvideo_drm_DEPS         += $(VBOX_SVN_REV_KMK)
 vboxvideo_drm_INCS.freebsd  = \
-	$(PATH_vboxvideo_drm) \
+	$(vboxvideo_drm_0_OUTDIR) \
 	$(PATH_INS)/gen-sys-hdrs
 vboxvideo_drm_SOURCES       = vboxvideo_drm.c
@@ -57,5 +57,5 @@
 	$(PATH_INS)/gen-sys-hdrs/bus_if.h \
 	$(PATH_INS)/gen-sys-hdrs/device_if.h \
-	$(PATH_vboxvideo_drm)/opt_drm.h
+	$(vboxvideo_drm_0_OUTDIR)/opt_drm.h
 vboxvideo_drm_CLEAN.freebsd = $(vboxvideo_drm_DEPS)
 
@@ -63,7 +63,7 @@
 # Header for DRM not included by us.
 #
-$$(PATH_vboxvideo_drm)/opt_drm.h:
-	$(QUIET)$(MKDIR) -p $(PATH_vboxvideo_drm)
-	$(QUIET)touch $(PATH_vboxvideo_drm)/opt_drm.h
+$$(vboxvideo_drm_0_OUTDIR)/opt_drm.h:
+	$(QUIET)$(MKDIR) -p $(vboxvideo_drm_0_OUTDIR)
+	$(QUIET)touch $(vboxvideo_drm_0_OUTDIR)/opt_drm.h
 
 include	$(KBUILD_PATH)/subfooter.kmk
Index: /trunk/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk	(revision 35380)
@@ -31,5 +31,5 @@
 vboxvfs_INCS          = \
         . \
-       $(PATH_vboxfs)
+       $(vboxvfs_0_OUTDIR)
 vboxvfs_SOURCES       = \
 	vboxvfs_vfsops.c \
@@ -39,25 +39,25 @@
 	$(VBOX_LIB_IPRT_GUEST_R0)
 vboxvfs_DEPS          = \
-       $$(PATH_vboxvfs)/vnode_if.h \
-       $$(PATH_vboxvfs)/vnode_if_newproto.h \
-       $$(PATH_vboxvfs)/vnode_if_typedef.h
+       $$(vboxvfs_0_OUTDIR)/vnode_if.h \
+       $$(vboxvfs_0_OUTDIR)/vnode_if_newproto.h \
+       $$(vboxvfs_0_OUTDIR)/vnode_if_typedef.h
 vboxvfs_CLEAN        += $(vboxvfs_DEPS)
 
 VBOX_AWK := /usr/bin/awk
 
-$$(PATH_vboxvfs)/vnode_if.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
+$$(vboxvfs_0_OUTDIR)/vnode_if.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
 	$(call MSG_TOOL,awk,VBoxGuest,$<,$@)
 	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -h
-	$(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if.h $(PATH_vboxvfs)/vnode_if.h
+	$(QUIET)$(MV) $(vboxvfs_0_OUTDIR)/vnode_if.h $(vboxvfs_0_OUTDIR)/vnode_if.h
 
-$$(PATH_vboxvfs)/vnode_if_newproto.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
+$$(vboxvfs_0_OUTDIR)/vnode_if_newproto.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
 	$(call MSG_TOOL,awk,VBoxGuest,$<,$@)
 	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -p
-	$(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if_newproto.h $(PATH_vboxvfs)/vnode_if_newproto.h
+	$(QUIET)$(MV) $(vboxvfs_0_OUTDIR)/vnode_if_newproto.h $(vboxvfs_0_OUTDIR)/vnode_if_newproto.h
 
-$$(PATH_vboxvfs)/vnode_if_typedef.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
+$$(vboxvfs_0_OUTDIR)/vnode_if_typedef.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
 	$(call MSG_TOOL,awk,VBoxGuest,$<,$@)
 	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -q
-	$(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if_typedef.h $(PATH_vboxvfs)/vnode_if_typedef.h
+	$(QUIET)$(MV) $(vboxvfs_0_OUTDIR)/vnode_if_typedef.h $(vboxvfs_0_OUTDIR)/vnode_if_typedef.h
 
 include	$(KBUILD_PATH)/subfooter.kmk
Index: /trunk/src/VBox/Additions/linux/drm/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/linux/drm/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/linux/drm/Makefile.kmk	(revision 35380)
@@ -39,7 +39,7 @@
 vboxvideo_drm-sh_SOURCES     = $(subst ",,$(FILES_VBOXVIDEO_DRM_BIN))
 vboxvideo_drm-sh_SOURCES    += \
-	$(PATH_vboxvideo_drm-sh)/build_in_tmp \
+	$(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp \
 	$(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
-vboxvideo_drm-sh_CLEAN      += $(PATH_vboxvideo_drm-sh)/build_in_tmp
+vboxvideo_drm-sh_CLEAN      += $(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp
 
 
@@ -72,5 +72,5 @@
 ## Scripts needed for building kernel modules
 
-$$(PATH_vboxvideo_drm-sh)/build_in_tmp: \
+$$(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp: \
 		$(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
 		$(VBOX_VERSION_STAMP) \
Index: /trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk	(revision 35380)
@@ -38,7 +38,7 @@
 vboxsf-sh_SOURCES     = $(subst ",,$(FILES_VBOXSF_BIN))
 vboxsf-sh_SOURCES    += \
-	$(PATH_vboxsf-sh)/build_in_tmp \
+	$(vboxsf-sh_0_OUTDIR)/build_in_tmp \
 	$(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
-vboxsf-sh_CLEAN      += $(PATH_vboxsf-sh)/build_in_tmp
+vboxsf-sh_CLEAN      += $(vboxsf-sh_0_OUTDIR)/build_in_tmp
 
 
@@ -90,5 +90,5 @@
 ## Scripts needed for building kernel modules
 
-$$(PATH_vboxsf-sh)/build_in_tmp: \
+$$(vboxsf-sh_0_OUTDIR)/build_in_tmp: \
 		$(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
 		$(VBOX_VERSION_STAMP) \
Index: /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 35380)
@@ -76,8 +76,8 @@
 # Actually, this is darn annoying and will *NOT* be tolerated for any new code!
 #
-VBoxClient_LIBPATH  += $(PATH_VBoxClient)
-VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
-VBoxClient_CLEAN     = $(PATH_VBoxClient)/libstdc++.a
-$$(PATH_VBoxClient)/libstdc++.a:
+VBoxClient_LIBPATH  += $(VBoxClient_0_OUTDIR)
+VBoxClient_ORDERDEPS = $(VBoxClient_0_OUTDIR)/libstdc++.a
+VBoxClient_CLEAN     = $(VBoxClient_0_OUTDIR)/libstdc++.a
+$$(VBoxClient_0_OUTDIR)/libstdc++.a:
 	$(call MSG_L1,Forcing static libstdc++)
 	$(QUIET)$(MKDIR) -p $(@D)
@@ -91,5 +91,5 @@
 # Set this in LocalConfig.kmk if you are working on the X11 clipboard service
 # to automatically run the unit test at build time.
-#       OTHERS += $(PATH_tstSeamlessX11-auto)/tstSeamlessX11-auto.run
+#       OTHERS += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run
 
    PROGRAMS += tstSeamlessX11-auto
@@ -102,6 +102,6 @@
            $(LIB_RUNTIME)
 
-   TESTING  += $(PATH_tstSeamlessX11-auto)/tstSeamlessX11-auto
-$$(PATH_tstSeamlessX11-auto)/tstSeamlessX11-auto.run: \
+   TESTING  += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto
+$$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
         $$(INSTARGET_tstSeamlessX11-auto)
 	export VBOX_LOG_DEST=nofile; $(INSTARGET_tstSeamlessX11-auto) quiet
Index: /trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	(revision 35380)
@@ -222,86 +222,86 @@
    ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
     ifndef VBOX_ONLY_SDK
-     OUR_PATH_VBOXMOUSE=$(PATH_ROOT)/src/VBox/Additions/x11/vboxmouse
-
-    ifeq ($(KBUILD_TARGET),linux)
-      TESTING  += $(PATH_vboxmouse_drv)/tstvboxmouse68.run
-      OTHERS += $(PATH_vboxmouse_drv)/tstvboxmouse68.run
-$$(PATH_vboxmouse_drv)/tstvboxmouse68.run: $$(INSTARGET_vboxmouse_drv)
+     VBOXMOUSE_SRC_PATH := $(PATH_SUB_CURRENT)
+
+     ifeq ($(KBUILD_TARGET),linux)
+      TESTING += $(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run
+      OTHERS += $(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run
+$$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run: $$(INSTARGET_vboxmouse_drv)
 	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
 	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
-	    "$(INSTARGET_vboxmouse_drv)" "$(OUR_PATH_VBOXMOUSE)/undefined_68" --static
-	$(QUIET)$(APPEND) -t "$@" "done"
-    endif
-
-     TESTING  += $(PATH_vboxmouse_drv_70)/tstvboxmouse70.run
-     OTHERS += $(PATH_vboxmouse_drv_70)/tstvboxmouse70.run
-$$(PATH_vboxmouse_drv_70)/tstvboxmouse70.run: $$(INSTARGET_vboxmouse_drv_70)
+	    "$(INSTARGET_vboxmouse_drv)" "$(VBOXMOUSE_SRC_PATH)/undefined_68" --static
+	$(QUIET)$(APPEND) -t "$@" "done"
+     endif
+
+     TESTING += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run
+     OTHERS += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run
+$$(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run: $$(INSTARGET_vboxmouse_drv_70)
 	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
 	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh  $(KBUILD_TARGET) \
-	    $(INSTARGET_vboxmouse_drv_70) $(OUR_PATH_VBOXMOUSE)/undefined_70
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxmouse_drv_71)/tstvboxmouse71.run
-     OTHERS += $(PATH_vboxmouse_drv_71)/tstvboxmouse71.run
-$$(PATH_vboxmouse_drv_71)/tstvboxmouse71.run: $$(INSTARGET_vboxmouse_drv_71)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxmouse_drv_71) $(OUR_PATH_VBOXMOUSE)/undefined_71
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxmouse_drv_13)/tstvboxmouse13.run
-     OTHERS += $(PATH_vboxmouse_drv_13)/tstvboxmouse13.run
-$$(PATH_vboxmouse_drv_13)/tstvboxmouse13.run: $$(INSTARGET_vboxmouse_drv_13)
+	    $(INSTARGET_vboxmouse_drv_70) $(VBOXMOUSE_SRC_PATH)/undefined_70
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run
+     OTHERS += $(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run
+$$(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run: $$(INSTARGET_vboxmouse_drv_71)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxmouse_drv_71) $(VBOXMOUSE_SRC_PATH)/undefined_71
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run
+     OTHERS += $(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run
+$$(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run: $$(INSTARGET_vboxmouse_drv_13)
 	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
 	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
-	    $(INSTARGET_vboxmouse_drv_13) $(OUR_PATH_VBOXMOUSE)/undefined_15
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxmouse_drv_14)/tstvboxmouse14.run
-     OTHERS += $(PATH_vboxmouse_drv_14)/tstvboxmouse14.run
-$$(PATH_vboxmouse_drv_14)/tstvboxmouse14.run: $$(INSTARGET_vboxmouse_drv_14)
+	    $(INSTARGET_vboxmouse_drv_13) $(VBOXMOUSE_SRC_PATH)/undefined_15
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run
+     OTHERS += $(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run
+$$(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run: $$(INSTARGET_vboxmouse_drv_14)
 	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
 	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
-	    $(INSTARGET_vboxmouse_drv_14) $(OUR_PATH_VBOXMOUSE)/undefined_15
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxmouse_drv_15)/tstvboxmouse15.run
-     OTHERS += $(PATH_vboxmouse_drv_15)/tstvboxmouse15.run
-$$(PATH_vboxmouse_drv_15)/tstvboxmouse15.run: $$(INSTARGET_vboxmouse_drv_15)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxmouse_drv_15) $(OUR_PATH_VBOXMOUSE)/undefined_15
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxmouse_drv_16)/tstvboxmouse16.run
-     OTHERS += $(PATH_vboxmouse_drv_16)/tstvboxmouse16.run
-$$(PATH_vboxmouse_drv_16)/tstvboxmouse16.run: $$(INSTARGET_vboxmouse_drv_16)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxmouse_drv_16) $(OUR_PATH_VBOXMOUSE)/undefined_15
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxmouse_drv_17)/tstvboxmouse17.run
-     OTHERS += $(PATH_vboxmouse_drv_17)/tstvboxmouse17.run
-$$(PATH_vboxmouse_drv_17)/tstvboxmouse17.run: $$(INSTARGET_vboxmouse_drv_17)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxmouse_drv_17) $(OUR_PATH_VBOXMOUSE)/undefined_15
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxmouse_drv_18)/tstvboxmouse18.run
-     OTHERS += $(PATH_vboxmouse_drv_18)/tstvboxmouse18.run
-$$(PATH_vboxmouse_drv_18)/tstvboxmouse18.run: $$(INSTARGET_vboxmouse_drv_18)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxmouse_drv_18) $(OUR_PATH_VBOXMOUSE)/undefined_15
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxmouse_drv_19)/tstvboxmouse19.run
-     OTHERS += $(PATH_vboxmouse_drv_19)/tstvboxmouse19.run
-$$(PATH_vboxmouse_drv_19)/tstvboxmouse19.run: $$(INSTARGET_vboxmouse_drv_19)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxmouse_drv_19) $(OUR_PATH_VBOXMOUSE)/undefined_15
+	    $(INSTARGET_vboxmouse_drv_14) $(VBOXMOUSE_SRC_PATH)/undefined_15
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run
+     OTHERS += $(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run
+$$(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run: $$(INSTARGET_vboxmouse_drv_15)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxmouse_drv_15) $(VBOXMOUSE_SRC_PATH)/undefined_15
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run
+     OTHERS += $(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run
+$$(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run: $$(INSTARGET_vboxmouse_drv_16)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxmouse_drv_16) $(VBOXMOUSE_SRC_PATH)/undefined_15
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
+     OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
+$$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(INSTARGET_vboxmouse_drv_17)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxmouse_drv_17) $(VBOXMOUSE_SRC_PATH)/undefined_15
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run
+     OTHERS += $(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run
+$$(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run: $$(INSTARGET_vboxmouse_drv_18)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxmouse_drv_18) $(VBOXMOUSE_SRC_PATH)/undefined_15
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run
+     OTHERS += $(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run
+$$(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run: $$(INSTARGET_vboxmouse_drv_19)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxmouse_drv_19) $(VBOXMOUSE_SRC_PATH)/undefined_15
 	$(QUIET)$(APPEND) -t "$@" "done"
 
@@ -313,2 +313,3 @@
 
 include	$(KBUILD_PATH)/subfooter.kmk
+
Index: /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 35380)
@@ -298,86 +298,86 @@
    ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
     ifndef VBOX_ONLY_SDK
-     OUR_PATH_VBOXVIDEO=$(PATH_ROOT)/src/VBox/Additions/x11/vboxvideo
+     VBOXVIDEO_SRC_PATH := $(PATH_SUB_CURRENT)
 
      ifeq ($(KBUILD_TARGET),linux)
-     TESTING  += $(PATH_vboxvideo_drv)/tstvboxvideo68.run
-     OTHERS += $(PATH_vboxvideo_drv)/tstvboxvideo68.run
-$$(PATH_vboxvideo_drv)/tstvboxvideo68.run: $$(INSTARGET_vboxvideo_drv)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxvideo_drv) $(OUR_PATH_VBOXVIDEO)/undefined_68 --static
+      TESTING += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run
+      OTHERS += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run
+$$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run: $$(INSTARGET_vboxvideo_drv)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxvideo_drv) $(VBOXVIDEO_SRC_PATH)/undefined_68 --static
 	$(QUIET)$(APPEND) -t "$@" "done"
      endif
 
-     TESTING  += $(PATH_vboxvideo_drv_70)/tstvboxvideo70.run
-     OTHERS += $(PATH_vboxvideo_drv_70)/tstvboxvideo70.run
-$$(PATH_vboxvideo_drv_70)/tstvboxvideo70.run: $$(INSTARGET_vboxvideo_drv_70)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxvideo_drv_70) $(OUR_PATH_VBOXVIDEO)/undefined_70
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxvideo_drv_71)/tstvboxvideo71.run
-     OTHERS += $(PATH_vboxvideo_drv_71)/tstvboxvideo71.run
-$$(PATH_vboxvideo_drv_71)/tstvboxvideo71.run: $$(INSTARGET_vboxvideo_drv_71)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxvideo_drv_71) $(OUR_PATH_VBOXVIDEO)/undefined_70
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxvideo_drv_13)/tstvboxvideo13.run
-     OTHERS += $(PATH_vboxvideo_drv_13)/tstvboxvideo13.run
-$$(PATH_vboxvideo_drv_13)/tstvboxvideo13.run: $$(INSTARGET_vboxvideo_drv_13)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxvideo_drv_13) $(OUR_PATH_VBOXVIDEO)/undefined_13
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxvideo_drv_14)/tstvboxvideo14.run
-     OTHERS += $(PATH_vboxvideo_drv_14)/tstvboxvideo14.run
-$$(PATH_vboxvideo_drv_14)/tstvboxvideo14.run: $$(INSTARGET_vboxvideo_drv_14)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxvideo_drv_14) $(OUR_PATH_VBOXVIDEO)/undefined_13
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxvideo_drv_15)/tstvboxvideo15.run
-     OTHERS += $(PATH_vboxvideo_drv_15)/tstvboxvideo15.run
-$$(PATH_vboxvideo_drv_15)/tstvboxvideo15.run: $$(INSTARGET_vboxvideo_drv_15)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxvideo_drv_15) $(OUR_PATH_VBOXVIDEO)/undefined_13
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxvideo_drv_16)/tstvboxvideo16.run
-     OTHERS += $(PATH_vboxvideo_drv_16)/tstvboxvideo16.run
-$$(PATH_vboxvideo_drv_16)/tstvboxvideo16.run: $$(INSTARGET_vboxvideo_drv_16)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxvideo_drv_16) $(OUR_PATH_VBOXVIDEO)/undefined_13
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxvideo_drv_17)/tstvboxvideo17.run
-     OTHERS += $(PATH_vboxvideo_drv_17)/tstvboxvideo17.run
-$$(PATH_vboxvideo_drv_17)/tstvboxvideo17.run: $$(INSTARGET_vboxvideo_drv_17)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxvideo_drv_17) $(OUR_PATH_VBOXVIDEO)/undefined_13
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxvideo_drv_18)/tstvboxvideo18.run
-     OTHERS += $(PATH_vboxvideo_drv_18)/tstvboxvideo18.run
-$$(PATH_vboxvideo_drv_18)/tstvboxvideo18.run: $$(INSTARGET_vboxvideo_drv_18)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxvideo_drv_18) $(OUR_PATH_VBOXVIDEO)/undefined_13
-	$(QUIET)$(APPEND) -t "$@" "done"
-
-     TESTING  += $(PATH_vboxvideo_drv_19)/tstvboxvideo19.run
-     OTHERS += $(PATH_vboxvideo_drv_19)/tstvboxvideo19.run
-$$(PATH_vboxvideo_drv_19)/tstvboxvideo19.run: $$(INSTARGET_vboxvideo_drv_19)
-	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
-	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxvideo_drv_19) $(OUR_PATH_VBOXVIDEO)/undefined_13
+     TESTING += $(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run
+     OTHERS += $(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run
+$$(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run: $$(INSTARGET_vboxvideo_drv_70)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxvideo_drv_70) $(VBOXVIDEO_SRC_PATH)/undefined_70
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run
+     OTHERS += $(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run
+$$(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run: $$(INSTARGET_vboxvideo_drv_71)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxvideo_drv_71) $(VBOXVIDEO_SRC_PATH)/undefined_70
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run
+     OTHERS += $(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run
+$$(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run: $$(INSTARGET_vboxvideo_drv_13)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxvideo_drv_13) $(VBOXVIDEO_SRC_PATH)/undefined_13
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run
+     OTHERS += $(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run
+$$(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run: $$(INSTARGET_vboxvideo_drv_14)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxvideo_drv_14) $(VBOXVIDEO_SRC_PATH)/undefined_13
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run
+     OTHERS += $(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run
+$$(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run: $$(INSTARGET_vboxvideo_drv_15)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxvideo_drv_15) $(VBOXVIDEO_SRC_PATH)/undefined_13
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run
+     OTHERS += $(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run
+$$(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run: $$(INSTARGET_vboxvideo_drv_16)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxvideo_drv_16) $(VBOXVIDEO_SRC_PATH)/undefined_13
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run
+     OTHERS += $(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run
+$$(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run: $$(INSTARGET_vboxvideo_drv_17)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxvideo_drv_17) $(VBOXVIDEO_SRC_PATH)/undefined_13
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run
+     OTHERS += $(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run
+$$(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run: $$(INSTARGET_vboxvideo_drv_18)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxvideo_drv_18) $(VBOXVIDEO_SRC_PATH)/undefined_13
+	$(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run
+     OTHERS += $(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run
+$$(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run: $$(INSTARGET_vboxvideo_drv_19)
+	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+	    $(INSTARGET_vboxvideo_drv_19) $(VBOXVIDEO_SRC_PATH)/undefined_13
 	$(QUIET)$(APPEND) -t "$@" "done"
 
Index: /trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk	(revision 35380)
@@ -38,28 +38,28 @@
 VgaBiosBin_DEFS     = IN_VBOXDD2
 VgaBiosBin_INCS     = $(VBOX_PATH_DEVICES_SRC)
-VgaBiosBin_SOURCES  = $(PATH_VgaBiosBin)/VgaBiosBin.c
+VgaBiosBin_SOURCES  = $(VgaBiosBin_0_OUTDIR)/VgaBiosBin.c
 VgaBiosBin_CLEAN    = \
-	$(PATH_VgaBiosBin)/vbetables.h \
+	$(VgaBiosBin_0_OUTDIR)/vbetables.h \
 	\
-	$(PATH_VgaBiosBin)/_vgabios_.c \
-	$(PATH_VgaBiosBin)/vgabios0.s \
-	$(PATH_VgaBiosBin)/vgabios1.s \
-	$(PATH_VgaBiosBin)/vgabios.tmp \
-	$(PATH_VgaBiosBin)/vgabios.lst \
-	$(PATH_VgaBiosBin)/vgabios.bin \
-	$(PATH_VgaBiosBin)/VgaBiosBin.c \
-	$(PATH_VgaBiosBin)/VgaDefBiosLogo.c \
+	$(VgaBiosBin_0_OUTDIR)/_vgabios_.c \
+	$(VgaBiosBin_0_OUTDIR)/vgabios0.s \
+	$(VgaBiosBin_0_OUTDIR)/vgabios1.s \
+	$(VgaBiosBin_0_OUTDIR)/vgabios.tmp \
+	$(VgaBiosBin_0_OUTDIR)/vgabios.lst \
+	$(VgaBiosBin_0_OUTDIR)/vgabios.bin \
+	$(VgaBiosBin_0_OUTDIR)/VgaBiosBin.c \
+	$(VgaBiosBin_0_OUTDIR)/VgaDefBiosLogo.c \
 	\
-	$(PATH_VgaBiosBin)/_vgabios-cirrus_.c \
-	$(PATH_VgaBiosBin)/vgabios-cirrus0.s \
-	$(PATH_VgaBiosBin)/vgabios-cirrus1.s \
-	$(PATH_VgaBiosBin)/vgabios-cirrus.tmp \
-	$(PATH_VgaBiosBin)/vgabios-cirrus.lst \
-	$(PATH_VgaBiosBin)/vgabios-cirrus.bin
+	$(VgaBiosBin_0_OUTDIR)/_vgabios-cirrus_.c \
+	$(VgaBiosBin_0_OUTDIR)/vgabios-cirrus0.s \
+	$(VgaBiosBin_0_OUTDIR)/vgabios-cirrus1.s \
+	$(VgaBiosBin_0_OUTDIR)/vgabios-cirrus.tmp \
+	$(VgaBiosBin_0_OUTDIR)/vgabios-cirrus.lst \
+	$(VgaBiosBin_0_OUTDIR)/vgabios-cirrus.bin
 
 #
 # Rule for making the bios.
 #
-$$(PATH_VgaBiosBin)/VgaBiosBin.c: $$(PATH_VgaBiosBin)/vgabios.bin $(VBOX_BIN2C)
+$$(VgaBiosBin_0_OUTDIR)/VgaBiosBin.c: $$(VgaBiosBin_0_OUTDIR)/vgabios.bin $(VBOX_BIN2C)
 	$(call MSG_TOOL,bin2c,VgaBiosBin,$<,$@)
 	$(QUIET)$(VBOX_BIN2C) -min 36 -max 36 -mask 0x0fff -ascii -export VgaBiosBinary $< $@
@@ -70,10 +70,10 @@
 
 # 1. create vbetables.h
-$$(PATH_VgaBiosBin)/vbetables.h: $(MAKEFILE_CURRENT) $$(TARGET_vbetables-gen) | $$(dir $$@)
+$$(VgaBiosBin_0_OUTDIR)/vbetables.h: $(MAKEFILE_CURRENT) $$(TARGET_vbetables-gen) | $$(dir $$@)
 	$(QUIET)$(REDIRECT) -wo $@ -- $(TARGET_vbetables-gen)
 
 # 2. precompile
 # WARNING! DEBUG is undefined here to keep the image size stable between debug and release builds.
-$$(PATH_VgaBiosBin)/_vgabios_.c: $(addprefix $(PATH_SUB_CURRENT)/,vgabios.c vgabios.h vbe.h vgatables.h vgafonts.h vbe.c clext.c) $$(PATH_VgaBiosBin)/vbetables.h $(PATH_ROOT)/include/VBox/Hardware/VBoxVideoVBE.h $(VBOX_VERSION_STAMP)
+$$(VgaBiosBin_0_OUTDIR)/_vgabios_.c: $(addprefix $(PATH_SUB_CURRENT)/,vgabios.c vgabios.h vbe.h vgatables.h vgafonts.h vbe.c clext.c) $$(VgaBiosBin_0_OUTDIR)/vbetables.h $(PATH_ROOT)/include/VBox/Hardware/VBoxVideoVBE.h $(VBOX_VERSION_STAMP)
 	$(call MSG_TOOL,cpp,VgaBiosBin,$<,$@)
 	$(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P \
@@ -86,21 +86,21 @@
 # 3. compile
 # BCC tempfile clashes, order the BCC jobs to make sure they don't interfere with one another.
-$$(PATH_VgaBiosBin)/vgabios0.s: $$(PATH_VgaBiosBin)/_vgabios_.c | $(VBOX_BCC_JOBS)
+$$(VgaBiosBin_0_OUTDIR)/vgabios0.s: $$(VgaBiosBin_0_OUTDIR)/_vgabios_.c | $(VBOX_BCC_JOBS)
 	$(call MSG_COMPILE,VgaBiosBin,$<,$@,C)
 	$(QUIET)$(VBOX_BCC) -o $@ -C-c -D__i86__ -0 -S $^
-VBOX_BCC_JOBS += $(PATH_VgaBiosBin)/vgabios0.s
+VBOX_BCC_JOBS += $(VgaBiosBin_0_OUTDIR)/vgabios0.s
 
 # 4. preprocess intermediate assembly.
-$$(PATH_VgaBiosBin)/vgabios1.s: $$(PATH_VgaBiosBin)/vgabios0.s
+$$(VgaBiosBin_0_OUTDIR)/vgabios1.s: $$(VgaBiosBin_0_OUTDIR)/vgabios0.s
 	$(call MSG_TOOL,Adjusting BCC Assembly,VgaBiosBin,$<,$@)
 	$(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^
 
 # 5. assemble
-$$(PATH_VgaBiosBin)/vgabios.tmp $$(PATH_VgaBiosBin)/vgabios.lst: $$(PATH_VgaBiosBin)/vgabios1.s
+$$(VgaBiosBin_0_OUTDIR)/vgabios.tmp $$(VgaBiosBin_0_OUTDIR)/vgabios.lst: $$(VgaBiosBin_0_OUTDIR)/vgabios1.s
 	$(call MSG_COMPILE,VgaBiosBin,$<,$@,AS)
-	$(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_VgaBiosBin)/vgabios.tmp -u- -w- -g -0 -j -O -l $(PATH_VgaBiosBin)/vgabios.lst
+	$(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(VgaBiosBin_0_OUTDIR)/vgabios.tmp -u- -w- -g -0 -j -O -l $(VgaBiosBin_0_OUTDIR)/vgabios.lst
 
 # 6. checksums
-$$(PATH_VgaBiosBin)/vgabios.bin: $$(PATH_VgaBiosBin)/vgabios.tmp $$(VBOX_BIOSSUMS)
+$$(VgaBiosBin_0_OUTDIR)/vgabios.bin: $$(VgaBiosBin_0_OUTDIR)/vgabios.tmp $$(VBOX_BIOSSUMS)
 	$(call MSG_TOOL,biossums,VgaBiosBin,$<,$@)
 	$(QUIET)$(VBOX_BIOSSUMS) $< $@
@@ -112,10 +112,10 @@
 VgaDefBiosLogo_TEMPLATE  = VBOXR3
 VgaDefBiosLogo_INCS      = $(VBOX_PATH_DEVICES_SRC)
-VgaDefBiosLogo_SOURCES   = $(PATH_VgaBiosBin)/VgaDefBiosLogo.c
+VgaDefBiosLogo_SOURCES   = $(VgaBiosBin_0_OUTDIR)/VgaDefBiosLogo.c
 
 #
 # Rule for making the bios logo.
 #
-$$(PATH_VgaBiosBin)/VgaDefBiosLogo.c: $(VBOX_BRAND_BIOS_LOGO) $(VBOX_BIN2C)
+$$(VgaBiosBin_0_OUTDIR)/VgaDefBiosLogo.c: $(VBOX_BRAND_BIOS_LOGO) $(VBOX_BIN2C)
 	$(call MSG_TOOL,bin2c,VgaBiosBin,$<,$@)
 	$(QUIET)$(VBOX_BIN2C) VgaDefBiosLogo $< $@
Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 35380)
@@ -441,6 +441,6 @@
 
  ifdef VBOX_WITH_DTRACE_R3
-  DevicesR3_DEFS        += VBOX_WITH_DTRACE
-  DevicesR3_INCS        += $(DevicesR3_0_OUTDIR)
+  DevicesR3_DEFS          += VBOX_WITH_DTRACE
+  DevicesR3_INCS          += $(DevicesR3_0_OUTDIR)
   DevicesR3_INTERMEDIATES += $(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.h
   $$(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.h: $(PATH_SUB_CURRENT)/build/VBoxDD-dtrace.d | $$(dir $$@)
@@ -449,37 +449,37 @@
 
  ifdef VBOX_WITH_DYNAMIC_DSDT
-  DevicesR3_CLEAN       += $(PATH_DevicesR3)/vboxdsl.hex
-  PC/ACPI/VBoxAcpi.cpp_DEPS = $(PATH_DevicesR3)/vboxdsl.hex
-
-  $$(PATH_DevicesR3)/vboxdsl.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
+  DevicesR3_CLEAN          += $(DevicesR3_0_OUTDIR)/vboxdsl.hex
+  PC/ACPI/VBoxAcpi.cpp_DEPS = $(DevicesR3_0_OUTDIR)/vboxdsl.hex
+
+  $$(DevicesR3_0_OUTDIR)/vboxdsl.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
 	$(call MSG_TOOL,bin2c,DevicesR3,$<,$@)
 	$(QUIET)$(VBOX_BIN2C) -export VboxDslSource $< $@
 
-  vboxdsl.hex:: $$(PATH_DevicesR3)/vboxdsl.hex
+  vboxdsl.hex:: $$(DevicesR3_0_OUTDIR)/vboxdsl.hex
 
  else  # !VBOX_WITH_DYNAMIC_DSDT
   # VBoxAcpi.cpp needs vboxaml.hex which we generate from PC/vbox.dsl
   DevicesR3_CLEAN       += \
- 	$(PATH_DevicesR3)/vboxaml.hex \
- 	$(PATH_DevicesR3)/vboxaml.aml \
- 	$(PATH_DevicesR3)/vboxssdt-standard.hex \
- 	$(PATH_DevicesR3)/vboxssdt-standard.aml \
- 	$(PATH_DevicesR3)/vboxssdt-standard.aml.tmp \
- 	$(PATH_DevicesR3)/vboxssdt-cpuhotplug.hex \
- 	$(PATH_DevicesR3)/vboxssdt-cpuhotplug.aml \
- 	$(PATH_DevicesR3)/vboxssdt-cpuhotplug.aml.tmp \
- 	$(PATH_DevicesR3)/vboxssdt-cpuhotplug.aml.pre
+ 	$(DevicesR3_0_OUTDIR)/vboxaml.hex \
+ 	$(DevicesR3_0_OUTDIR)/vboxaml.aml \
+ 	$(DevicesR3_0_OUTDIR)/vboxssdt-standard.hex \
+ 	$(DevicesR3_0_OUTDIR)/vboxssdt-standard.aml \
+ 	$(DevicesR3_0_OUTDIR)/vboxssdt-standard.aml.tmp \
+ 	$(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.hex \
+ 	$(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.aml \
+ 	$(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.aml.tmp \
+ 	$(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.aml.pre
   PC/ACPI/VBoxAcpi.cpp_DEPS = \
- 	$(PATH_DevicesR3)/vboxaml.hex \
- 	$(PATH_DevicesR3)/vboxssdt-standard.hex \
- 	$(PATH_DevicesR3)/vboxssdt-cpuhotplug.hex
-
-  $$(PATH_DevicesR3)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
+ 	$(DevicesR3_0_OUTDIR)/vboxaml.hex \
+ 	$(DevicesR3_0_OUTDIR)/vboxssdt-standard.hex \
+ 	$(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.hex
+
+  $$(DevicesR3_0_OUTDIR)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
 	$(call MSG_TOOL,iasl,DevicesR3,$<,$@)
 	$(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
 
-  vboxaml.hex:: $$(PATH_DevicesR3)/vboxaml.hex
-
-  $$(PATH_DevicesR3)/vboxssdt-standard.hex: $(PATH_SUB_CURRENT)/PC/vbox-standard.dsl | $$(dir $$@)
+  vboxaml.hex:: $$(DevicesR3_0_OUTDIR)/vboxaml.hex
+
+  $$(DevicesR3_0_OUTDIR)/vboxssdt-standard.hex: $(PATH_SUB_CURRENT)/PC/vbox-standard.dsl | $$(dir $$@)
 	$(call MSG_TOOL,iasl,DevicesR3,$<,$@)
 	$(QUIET)$(RM) -f $@ $@.tmp
@@ -491,7 +491,7 @@
 
 
-  vboxssdt-standard.hex:: $$(PATH_DevicesR3)/vboxssdt-standard.hex
-
-  $$(PATH_DevicesR3)/vboxssdt-cpuhotplug.hex: $(PATH_SUB_CURRENT)/PC/vbox-cpuhotplug.dsl | $$(dir $$@)
+  vboxssdt-standard.hex:: $$(DevicesR3_0_OUTDIR)/vboxssdt-standard.hex
+
+  $$(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.hex: $(PATH_SUB_CURRENT)/PC/vbox-cpuhotplug.dsl | $$(dir $$@)
 	$(call MSG_TOOL,iasl,DevicesR3,$<,$@)
 	$(QUIET)$(RM) -f $@ $@.tmp $@.pre
@@ -504,8 +504,8 @@
 
 
-  vboxssdt-cpuhotplug.hex:: $$(PATH_DevicesR3)/vboxssdt-cpuhotplug.hex
+  vboxssdt-cpuhotplug.hex:: $$(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.hex
 
  endif # !VBOX_WITH_DYNAMIC_DSDT
- PC/ACPI/VBoxAcpi.cpp_INCS = $(PATH_DevicesR3)
+ PC/ACPI/VBoxAcpi.cpp_INCS = $(DevicesR3_0_OUTDIR)
 
  # For finding PCIInternal.h from VBox/pci.h.
@@ -516,6 +516,6 @@
 
  # For finding and generating vbetables.h (see Graphics/BIOS/Makefile.kmk).
- Graphics/DevVGA.cpp_INCS = $(PATH_VgaBiosBin)
- Graphics/DevVGA.cpp_DEPS = $(PATH_VgaBiosBin)/vbetables.h
+ Graphics/DevVGA.cpp_INCS = $(VgaBiosBin_0_OUTDIR)
+ Graphics/DevVGA.cpp_DEPS = $(VgaBiosBin_0_OUTDIR)/vbetables.h
 
 
Index: /trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk	(revision 35380)
@@ -31,20 +31,20 @@
 PcBiosBin_DEFS      = IN_VBOXDD2
 PcBiosBin_INCS      = $(VBOX_PATH_DEVICES_SRC)
-PcBiosBin_SOURCES   = $(PATH_PcBiosBin)/PcBiosBin.c
-PcBiosBin_DEPS      = $(PATH_PcBiosBin)/pcbios-syms.h
+PcBiosBin_SOURCES   = $(PcBiosBin_0_OUTDIR)/PcBiosBin.c
+PcBiosBin_DEPS      = $(PcBiosBin_0_OUTDIR)/pcbios-syms.h
 PcBiosBin_CLEAN     = \
-	$(PATH_PcBiosBin)/_rombios_.c \
-	$(PATH_PcBiosBin)/rombios0.s \
-	$(PATH_PcBiosBin)/rombios1.s \
-	$(PATH_PcBiosBin)/pcbios.lst \
-	$(PATH_PcBiosBin)/pcbios.tmp \
-	$(PATH_PcBiosBin)/pcbios.bin \
-	$(PATH_PcBiosBin)/PcBiosBin.c \
-	$(PATH_PcBiosBin)/pcbios-syms.h
+	$(PcBiosBin_0_OUTDIR)/_rombios_.c \
+	$(PcBiosBin_0_OUTDIR)/rombios0.s \
+	$(PcBiosBin_0_OUTDIR)/rombios1.s \
+	$(PcBiosBin_0_OUTDIR)/pcbios.lst \
+	$(PcBiosBin_0_OUTDIR)/pcbios.tmp \
+	$(PcBiosBin_0_OUTDIR)/pcbios.bin \
+	$(PcBiosBin_0_OUTDIR)/PcBiosBin.c \
+	$(PcBiosBin_0_OUTDIR)/pcbios-syms.h
 
 #
 # Rule for making the bios.
 #
-$$(PATH_PcBiosBin)/PcBiosBin.c: $$(PATH_PcBiosBin)/pcbios.bin $(VBOX_BIN2C)
+$$(PcBiosBin_0_OUTDIR)/PcBiosBin.c: $$(PcBiosBin_0_OUTDIR)/pcbios.bin $(VBOX_BIN2C)
 	$(call MSG_TOOL,bin2c,PcBiosBin,$<,$@)
 	$(QUIET)$(VBOX_BIN2C) -min 64 -max 256 -mask 0xffff -ascii -export PcBiosBinary $< $@
@@ -55,5 +55,5 @@
 
 # 1. precompile rombios.c
-$$(PATH_PcBiosBin)/_rombios_.c: $(PATH_SUB_CURRENT)/rombios.c $(PATH_SUB_CURRENT)/logo.c \
+$$(PcBiosBin_0_OUTDIR)/_rombios_.c: $(PATH_SUB_CURRENT)/rombios.c $(PATH_SUB_CURRENT)/logo.c \
 		$(PATH_SUB_CURRENT)/apmbios.S $(if $(VBOX_WITH_SCSI),$(PATH_SUB_CURRENT)/scsi.c) \
 		$(PATH_SUB_CURRENT)/../DevPcBios.h $(PATH_ROOT)/include/VBox/bioslogo.h \
@@ -61,5 +61,5 @@
 	$(call MSG_TOOL,cpp,PcBiosBin,$<,$@)
 	$(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E \
-		-I$(PATH_PcBiosBin) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) \
+		-I$(PcBiosBin_0_OUTDIR) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) \
 		-DBX_SMP_PROCESSORS=1 -DVBOX -DVBOX_PC_BIOS $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) \
 		$(if $(VBOX_WITH_SCSI),-DVBOX_WITH_SCSI) \
@@ -68,26 +68,26 @@
 # 2. compile to intermediate asm file.
 # BCC tempfile clashes, order the BCC jobs to make sure they don't interfere with one another.
-$$(PATH_PcBiosBin)/rombios0.s: $$(PATH_PcBiosBin)/_rombios_.c | $(VBOX_BCC_JOBS)
+$$(PcBiosBin_0_OUTDIR)/rombios0.s: $$(PcBiosBin_0_OUTDIR)/_rombios_.c | $(VBOX_BCC_JOBS)
 	$(call MSG_COMPILE,PcBiosBin,$<,$@,C)
 	$(QUIET)$(VBOX_BCC) -o $@ -C-c -D__i86__ -0 -S $<
-VBOX_BCC_JOBS += $(PATH_PcBiosBin)/rombios0.s
+VBOX_BCC_JOBS += $(PcBiosBin_0_OUTDIR)/rombios0.s
 
 # 3. post process intermediate asm file.
-$$(PATH_PcBiosBin)/rombios1.s: $$(PATH_PcBiosBin)/rombios0.s
+$$(PcBiosBin_0_OUTDIR)/rombios1.s: $$(PcBiosBin_0_OUTDIR)/rombios0.s
 	$(call MSG_TOOL,Adjusting BCC Assembly,PcBiosBin,$<,$@)
 	$(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^
 
 # 4. assemble the intermediate asm file. (also creates a listing rombios.lst)
-$$(PATH_PcBiosBin)/pcbios.tmp + $$(PATH_PcBiosBin)/pcbios.lst: $$(PATH_PcBiosBin)/rombios1.s
+$$(PcBiosBin_0_OUTDIR)/pcbios.tmp + $$(PcBiosBin_0_OUTDIR)/pcbios.lst: $$(PcBiosBin_0_OUTDIR)/rombios1.s
 	$(call MSG_COMPILE,PcBiosBin,$<,$@,AS)
-	$(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_PcBiosBin)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_PcBiosBin)/pcbios.lst
+	$(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PcBiosBin_0_OUTDIR)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PcBiosBin_0_OUTDIR)/pcbios.lst
 
 # 5. calculate checksums for the final BIOS image.
-$$(PATH_PcBiosBin)/pcbios.bin: $$(PATH_PcBiosBin)/pcbios.tmp $$(VBOX_BIOSSUMS)
+$$(PcBiosBin_0_OUTDIR)/pcbios.bin: $$(PcBiosBin_0_OUTDIR)/pcbios.tmp $$(VBOX_BIOSSUMS)
 	$(call MSG_TOOL,biossums,PcBiosBin,$<,$@)
 	$(QUIET)$(VBOX_BIOSSUMS) $< $@
 
 # 6. create the symbol table.
-$$(PATH_PcBiosBin)/pcbios-syms.h: $$(PATH_PcBiosBin)/pcbios.lst $(MAKEFILE_CURRENT)
+$$(PcBiosBin_0_OUTDIR)/pcbios-syms.h: $$(PcBiosBin_0_OUTDIR)/pcbios.lst $(MAKEFILE_CURRENT)
 	$(call MSG_GENERATE,PcBiosBin,$<,$@)
 	$(QUIET)$(SED) \
@@ -95,5 +95,5 @@
 		-e 's/^[0-9][0-9][0-9][0-9][0-9]                       \(000[0-9A-F]*\)            [[:space:]]*\([a-zA-Z0-9_]*\):.*$$/    DEFSYM(0x\1, "\2"),/' \
 		--output $@ \
-		$(PATH_PcBiosBin)/pcbios.lst
+		$(PcBiosBin_0_OUTDIR)/pcbios.lst
 
 
Index: /trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk	(revision 35380)
@@ -115,5 +115,5 @@
 
 VBoxBFE_INCS = \
-	$(PATH_VBoxBFE) \
+	$(VBoxBFE_0_OUTDIR) \
 	$(VBOX_PATH_SDK)/include \
 	$(PATH_ROOT)/src/VBox/Frontends/VBoxBFE
@@ -158,9 +158,9 @@
 	-fno-rtti -fno-exceptions -fshort-wchar -pthread
 
-VBoxBFE_CLEAN = $(PATH_VBoxBFE)/Ico64x01.h
-VBoxBFE_SDLConsole.cpp_DEPS = $(PATH_VBoxBFE)/Ico64x01.h
+VBoxBFE_CLEAN = $(VBoxBFE_0_OUTDIR)/Ico64x01.h
+VBoxBFE_SDLConsole.cpp_DEPS = $(VBoxBFE_0_OUTDIR)/Ico64x01.h
 
 # Convert the pnm-file to a byte array.
-$$(PATH_VBoxBFE)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
+$$(VBoxBFE_0_OUTDIR)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
 	$(call MSG_TOOL,bin2c,VBoxBFE,$<,$@)
 	$(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
Index: /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk	(revision 35380)
@@ -74,5 +74,5 @@
 
 VBoxSDL_INCS = \
-	$(PATH_VBoxSDL)
+	$(VBoxSDL_0_OUTDIR)
 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
 VBoxSDL_INCS += \
@@ -99,15 +99,15 @@
 	-framework Foundation -framework AppKit
 
-VBoxSDL_CLEAN = $(PATH_VBoxSDL)/Ico64x01.h
-VBoxSDL_INTERMEDIATES = $(PATH_VBoxSDL)/Ico64x01.h
+VBoxSDL_CLEAN = $(VBoxSDL_0_OUTDIR)/Ico64x01.h
+VBoxSDL_INTERMEDIATES = $(VBoxSDL_0_OUTDIR)/Ico64x01.h
 
 
 # Convert the pnm-file to a byte array.
-$$(PATH_VBoxSDL)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxSDL/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
+$$(VBoxSDL_0_OUTDIR)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxSDL/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
 	$(call MSG_TOOL,bin2c,VBoxSDL,$<,$@)
 	$(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
 
 # Icon include file.
-$$(PATH_VBoxSDL)/VBoxSDL-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxSDL_PATH)/Makefile.kmk | $$(dir $$@)
+$$(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxSDL_PATH)/Makefile.kmk | $$(dir $$@)
 	$(RM) -f $@
 	$(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
@@ -130,6 +130,4 @@
 tstSDL_DEFS.linux = VBOX_OPENGL
 endif
-tstSDL_INCS = \
-	$(PATH_tstSDL)
 
 tstSDL_LIBS = \
Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 35380)
@@ -194,5 +194,5 @@
 VirtualBox_INCS = \
 	$(VBOX_GUI_INC_DIRS) \
-	$(PATH_VirtualBox)/include
+	$(VirtualBox_0_OUTDIR)/include
 
 # Necessary for the hdd backend enumeration
@@ -659,16 +659,16 @@
 ## @todo This needs some cleaning up perhaps...
 ## @todo kBuild: Non-existing +| targets should be tried remade or what?
-VirtualBox_BLDDIRS       += $(PATH_VirtualBox)/include
-VirtualBox_INTERMEDIATES += $(PATH_VirtualBox)/include/COMWrappers.h
+VirtualBox_BLDDIRS       += $(VirtualBox_0_OUTDIR)/include
+VirtualBox_INTERMEDIATES += $(VirtualBox_0_OUTDIR)/include/COMWrappers.h
 VirtualBox_CLEAN         += \
-	$(PATH_VirtualBox)/include/COMWrappers \
-	$(PATH_VirtualBox)/include/COMWrappers.tmp \
-	$(PATH_VirtualBox)/include/COMWrappers.h \
-	$(PATH_VirtualBox)/include/COMWrappers.cpp
-VirtualBox_SOURCES       += $(PATH_VirtualBox)/include/COMWrappers.cpp
-
-$$(PATH_VirtualBox)/include/COMWrappers \
-+| $$(PATH_VirtualBox)/include/COMWrappers.h \
-+| $$(PATH_VirtualBox)/include/COMWrappers.cpp: \
+	$(VirtualBox_0_OUTDIR)/include/COMWrappers \
+	$(VirtualBox_0_OUTDIR)/include/COMWrappers.tmp \
+	$(VirtualBox_0_OUTDIR)/include/COMWrappers.h \
+	$(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp
+VirtualBox_SOURCES       += $(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp
+
+$$(VirtualBox_0_OUTDIR)/include/COMWrappers \
++| $$(VirtualBox_0_OUTDIR)/include/COMWrappers.h \
++| $$(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp: \
 		$(VBOX_XIDL_FILE) \
 		$(VBOX_VIRTUALBOX4_SRC)/src/globals/COMWrappers.xsl \
@@ -697,5 +697,5 @@
 
 # alias for generating the COM Wrappers file.
-testwrappers:: $$(PATH_VirtualBox)/include/COMWrappers.h
+testwrappers:: $$(VirtualBox_0_OUTDIR)/include/COMWrappers.h
 
 
@@ -818,9 +818,9 @@
 # The IDI_ICON1 name is Qt specific.
 #
-src/platform/win/VirtualBox.rc_INCS  = $(PATH_VirtualBox)
-src/platform/win/VirtualBox.rc_DEPS  = $(PATH_VirtualBox)/VirtualBox-icon.rc
-src/platform/win/VirtualBox.rc_CLEAN = $(PATH_VirtualBox)/VirtualBox-icon.rc
-
-$$(PATH_VirtualBox)/VirtualBox-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@)
+src/platform/win/VirtualBox.rc_INCS  = $(VirtualBox_0_OUTDIR)
+src/platform/win/VirtualBox.rc_DEPS  = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
+src/platform/win/VirtualBox.rc_CLEAN = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
+
+$$(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@)
 	$(APPEND) -t $@ 'IDI_ICON1 ICON "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
 
@@ -847,5 +847,5 @@
 VirtualBox.app_SOURCES = \
 	src/platform/darwin/PkgInfo \
-	$(PATH_VirtualBox.app)/Info.plist \
+	$(VirtualBox_0_OUTDIR.app)/Info.plist \
 	$(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
 	$(VBOX_BRAND_GUI_VBOX_64PX_PNG)=>Resources/virtualbox.png \
@@ -855,5 +855,5 @@
 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns
 
-$$(PATH_VirtualBox.app)/Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
+$$(VirtualBox_0_OUTDIR.app)/Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
 	$(call MSG_GENERATE,VirtualBox.app,$<,$@)
 	$(QUIET)$(RM) -f $@
@@ -873,10 +873,10 @@
 VirtualBoxVM.app_SOURCES = \
 	src/platform/darwin/VM-PkgInfo=>PkgInfo \
-	$(PATH_VirtualBoxVM.app)/VM-Info.plist=>Info.plist
+	$(VirtualBoxVM.app_0_OUTDIR)/VM-Info.plist=>Info.plist
 VirtualBoxVM.app_SYMLINKS = \
 	MacOS=>../../../MacOS/ \
 	Resources=>../../../Resources/
 
-$$(PATH_VirtualBoxVM.app)/VM-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/VM-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
+$$(VirtualBoxVM.app_0_OUTDIR)/VM-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/VM-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
 	$(call MSG_GENERATE,VirtualBoxVM.app,$<,$@)
 	$(QUIET)$(RM) -f $@
@@ -902,10 +902,10 @@
 vmstarter.app_SOURCES = \
 	src/platform/darwin/vmstarter-PkgInfo=>PkgInfo \
-	$(PATH_vmstarter.app)/vmstarter-Info.plist=>Info.plist
+	$(vmstarter.app_0_OUTDIR)/vmstarter-Info.plist=>Info.plist
 vmstarter.app_SYMLINKS = \
     MacOS=>../../../MacOS \
     Resources=>../../../Resources
 
-$$(PATH_vmstarter.app)/vmstarter-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/vmstarter-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
+$$(vmstarter.app_0_OUTDIR)/vmstarter-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/vmstarter-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
 	$(call MSG_GENERATE,vmstarter.app,$<,$@)
 	$(QUIET)$(RM) -f $@
Index: /trunk/src/VBox/GuestHost/SharedClipboard/Makefile.kmk
===================================================================
--- /trunk/src/VBox/GuestHost/SharedClipboard/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/GuestHost/SharedClipboard/Makefile.kmk	(revision 35380)
@@ -24,13 +24,15 @@
   # Set these in LocalConfig.kmk if you are working on the X11 clipboard service
   # to automatically run the unit tests at build time:
-  #    OTHERS += $(PATH_tstClipboardX11)/tstClipboardX11.run
-  #    OTHERS += $(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run
+  #    OTHERS += $(tstClipboardX11_0_OUTDIR)/tstClipboardX11.run
+  #    OTHERS += $(tstClipboardX11Smoke_0_OUTDIR)/tstClipboardX11Smoke.run
   #
   PROGRAMS += tstClipboardX11 tstClipboardX11Smoke
-  TESTING  += $(PATH_tstClipboardX11)/tstClipboardX11.run $(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run
+  TESTING  += \
+  	$(tstClipboardX11_0_OUTDIR)/tstClipboardX11.run \
+  	$(tstClipboardX11Smoke_0_OUTDIR)/tstClipboardX11Smoke.run
   tstClipboardX11_TEMPLATE = VBOXR3TSTEXE
   tstClipboardX11_DEFS     = VBOX_WITH_HGCM TESTCASE
   tstClipboardX11_SOURCES  = x11-clipboard.cpp clipboard-helper.cpp
-  tstClipboardX11_CLEAN    = $(PATH_tstClipboardX11)/tstClipboardX11.run
+  tstClipboardX11_CLEAN    = $(tstClipboardX11_0_OUTDIR)/tstClipboardX11.run
 
   tstClipboardX11Smoke_TEMPLATE = VBOXR3TSTEXE
@@ -39,11 +41,11 @@
   tstClipboardX11Smoke_LIBPATH  = $(VBOX_LIBPATH_X11)
   tstClipboardX11Smoke_LIBS     = X11 Xt
-  tstClipboardX11Smoke_CLEAN    = $(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run
+  tstClipboardX11Smoke_CLEAN    = $(tstClipboardX11Smoke_0_OUTDIR)/tstClipboardX11Smoke.run
 
-$$(PATH_tstClipboardX11)/tstClipboardX11.run: $$(INSTARGET_tstClipboardX11)
+$$(tstClipboardX11_0_OUTDIR)/tstClipboardX11.run: $$(INSTARGET_tstClipboardX11)
 	export VBOX_LOG_DEST=nofile; $(INSTARGET_tstClipboardX11) quiet
 	$(QUIET)$(APPEND) -t "$@" "done"
 
-$$(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run:	$$(INSTARGET_tstClipboardX11)
+$$(tstClipboardX11Smoke_0_OUTDIR)/tstClipboardX11Smoke.run:	$$(INSTARGET_tstClipboardX11)
 	export VBOX_LOG_DEST=nofile; $(INSTARGET_tstClipboardX11Smoke) quiet
 	$(QUIET)$(APPEND) -t "$@" "done"
Index: /trunk/src/VBox/HostDrivers/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/HostDrivers/Makefile.kmk	(revision 35380)
@@ -57,14 +57,14 @@
   HostDrivers-dkms-sh_INST    = bin/src/
   HostDrivers-dkms-sh_MODE    = a+rx,u+w
-  HostDrivers-dkms-sh_SOURCES = $(PATH_HostDrivers-dkms-sh)/do_dkms
-  HostDrivers-dkms-sh_CLEAN   = $(PATH_HostDrivers-dkms-sh)/do_dkms
+  HostDrivers-dkms-sh_SOURCES = $(HostDrivers-dkms-sh_0_OUTDIR)/do_dkms
+  HostDrivers-dkms-sh_CLEAN   = $(HostDrivers-dkms-sh_0_OUTDIR)/do_dkms
 
   INSTALLS += HostDrivers-dkms-src
   HostDrivers-dkms-src_INST    = bin/src/
   HostDrivers-dkms-src_MODE    = a+r,u+w
-  HostDrivers-dkms-src_SOURCES = $(PATH_HostDrivers-dkms-src)/dkms.conf
-  HostDrivers-dkms-src_CLEAN   = $(PATH_HostDrivers-dkms-src)/dkms.conf
+  HostDrivers-dkms-src_SOURCES = $(HostDrivers-dkms-src_0_OUTDIR)/dkms.conf
+  HostDrivers-dkms-src_CLEAN   = $(HostDrivers-dkms-src_0_OUTDIR)/dkms.conf
 
-$$(PATH_HostDrivers-dkms-src)/dkms.conf: \
+$$(HostDrivers-dkms-src_0_OUTDIR)/dkms.conf: \
 		$(PATH_SUB_CURRENT)/linux/dkms.conf \
 		$(VBOX_VERSION_STAMP) \
@@ -77,5 +77,5 @@
 		--output $@ $<
 
-$$(PATH_HostDrivers-dkms-sh)/do_dkms: \
+$$(HostDrivers-dkms-sh_0_OUTDIR)/do_dkms: \
 		$(PATH_SUB_CURRENT)/linux/do_dkms \
 		$(VBOX_VERSION_STAMP) \
Index: /trunk/src/VBox/HostDrivers/Support/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/HostDrivers/Support/Makefile.kmk	(revision 35380)
@@ -141,6 +141,6 @@
 endif
 ifeq ($(VBOX_LDR_FMT),lx)
-SUPR0_SOURCES      += $$(PATH_SUPR0)/SUPR0.def
-$$(PATH_SUPR0)/SUPR0.def: $(PATH_SUB_CURRENT)/SUPR0.def | $$(dir $$@)
+SUPR0_SOURCES      += $$(SUPR0_0_OUTDIR)/SUPR0.def
+$$(SUPR0_0_OUTDIR)/SUPR0.def: $(PATH_SUB_CURRENT)/SUPR0.def | $$(dir $$@)
 	$(SED) \
 		-e 's/^[ \t][ \t]*\([gA-Z]\)/    _\1/' \
@@ -264,7 +264,7 @@
 vboxdrv-mod_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
 vboxdrv-mod_SOURCES += \
-	$(PATH_vboxdrv-mod)/Makefile
+	$(vboxdrv-mod_0_OUTDIR)/Makefile
 vboxdrv-mod_CLEAN   = \
-	$(PATH_vboxdrv-mod)/Makefile
+	$(vboxdrv-mod_0_OUTDIR)/Makefile
 
 vboxdrv-sh_INST     = bin/src/vboxdrv
@@ -272,13 +272,13 @@
 vboxdrv-sh_SOURCES  = $(subst ",,$(FILES_VBOXDRV_BIN)) #"
 vboxdrv-sh_SOURCES += \
-	$(PATH_vboxdrv-sh)/build_in_tmp \
+	$(vboxdrv-sh_0_OUTDIR)/build_in_tmp \
 	$(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
 vboxdrv-sh_CLEAN    = \
 	$(PATH_TARGET)/vboxdrv-sh-1.dep \
-	$(PATH_vboxdrv-sh)/build_in_tmp
+	$(vboxdrv-sh_0_OUTDIR)/build_in_tmp
 
 # Scripts needed for building the kernel modules
 
-$$(PATH_vboxdrv-sh)/build_in_tmp: \
+$$(vboxdrv-sh_0_OUTDIR)/build_in_tmp: \
 		$(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
 		$(VBOX_VERSION_STAMP) \
@@ -292,5 +292,5 @@
 
 includedep $(PATH_TARGET)/vboxdrv-sh-1.dep
-$$(PATH_vboxdrv-mod)/Makefile: \
+$$(vboxdrv-mod_0_OUTDIR)/Makefile: \
 		$(PATH_SUB_CURRENT)/linux/Makefile \
 		$$(if $$(eq $$(Support/linux/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
@@ -339,8 +339,8 @@
 INSTALLS += VBoxDrv.kext
 VBoxDrv.kext_INST     = $(INST_VBOXDRV)Contents/
-VBoxDrv.kext_SOURCES  =	$(PATH_VBoxDrv.kext)/Info.plist
-VBoxDrv.kext_CLEAN    =	$(PATH_VBoxDrv.kext)/Info.plist
-
-$$(PATH_VBoxDrv.kext)/Info.plist: \
+VBoxDrv.kext_SOURCES  =	$(VBoxDrv.kext_0_OUTDIR)/Info.plist
+VBoxDrv.kext_CLEAN    =	$(VBoxDrv.kext_0_OUTDIR)/Info.plist
+
+$$(VBoxDrv.kext_0_OUTDIR)/Info.plist: \
 		$(PATH_SUB_CURRENT)/darwin/Info.plist \
 		$(VBOX_VERSION_MK) | $$(dir $$@)
@@ -420,9 +420,9 @@
 vboxdrv-mod_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
 vboxdrv-mod_SOURCES += \
-	$(PATH_vboxdrv-mod)/Makefile
+	$(vboxdrv-mod_0_OUTDIR)/Makefile
 vboxdrv-mod_CLEAN   = \
-	$(PATH_vboxdrv-mod)/Makefile
-
-$$(PATH_vboxdrv-mod)/Makefile: \
+	$(vboxdrv-mod_0_OUTDIR)/Makefile
+
+$$(vboxdrv-mod_0_OUTDIR)/Makefile: \
 		$(PATH_SUB_CURRENT)/freebsd/Makefile \
 		$$(if $$(eq $$(Support/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
Index: /trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk	(revision 35380)
@@ -68,9 +68,9 @@
 VBoxNetAdp.kext_INST     = $(INST_VBOXNETADP)Contents/
 VBoxNetAdp.kext_SOURCES  = \
-	$(PATH_VBoxNetAdp.kext)/Info.plist
+	$(VBoxNetAdp.kext_0_OUTDIR)/Info.plist
 VBoxNetAdp.kext_CLEAN    = \
-	$(PATH_VBoxNetAdp.kext)/Info.plist
+	$(VBoxNetAdp.kext_0_OUTDIR)/Info.plist
 
-$$(PATH_VBoxNetAdp.kext)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
+$$(VBoxNetAdp.kext_0_OUTDIR)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
 	$(call MSG_GENERATE,VBoxNetAdp,$@,$<)
 	$(QUIET)$(RM) -f $@
@@ -103,7 +103,7 @@
  VBoxNetAdp-src_SOURCES = $(subst ",,$(VBOX_VBOXNETADP_SOURCES)) #"
  VBoxNetAdp-src_SOURCES+= \
-	$(PATH_VBoxNetAdp-src)/Makefile
+	$(VBoxNetAdp-src_0_OUTDIR)/Makefile
  VBoxNetAdp-src_CLEAN   = \
-	$(PATH_VBoxNetAdp-src)/Makefile	\
+	$(VBoxNetAdp-src_0_OUTDIR)/Makefile	\
 	$(PATH_TARGET)/VBoxNetAdp-src-1.dep
 
@@ -111,11 +111,11 @@
  VBoxNetAdp-sh_MODE    = a+rx,u+w
  VBoxNetAdp-sh_SOURCES = \
-	$(PATH_VBoxNetAdp-sh)/build_in_tmp \
+	$(VBoxNetAdp-sh_0_OUTDIR)/build_in_tmp \
 	$(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
- VBoxNetAdp-sh_CLEAN   = $(PATH_VBoxNetAdp-sh)/build_in_tmp
+ VBoxNetAdp-sh_CLEAN   = $(VBoxNetAdp-sh_0_OUTDIR)/build_in_tmp
 
 
 includedep $(PATH_TARGET)/VBoxNetAdp-src-1.dep
-$$(PATH_VBoxNetAdp-src)/Makefile: \
+$$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \
 		$(PATH_SUB_CURRENT)/linux/Makefile \
 		$$(if $$(eq $$(VBoxNetAdp/linux/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
@@ -131,5 +131,5 @@
 ## Scripts needed for building the kernel modules
 
-$$(PATH_VBoxNetAdp-sh)/build_in_tmp: \
+$$(VBoxNetAdp-sh_0_OUTDIR)/build_in_tmp: \
 		$(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
 		$(VBOX_VERSION_STAMP) \
@@ -152,9 +152,9 @@
  VBoxNetAdp-src_SOURCES = $(subst ",,$(VBOX_VBOXNETADP_SOURCES)) #"
  VBoxNetAdp-src_SOURCES+= \
-	$(PATH_VBoxNetAdp-src)/Makefile
+	$(VBoxNetAdp-src_0_OUTDIR)/Makefile
  VBoxNetAdp-src_CLEAN   = \
-	$(PATH_VBoxNetAdp-src)/Makefile	\
+	$(VBoxNetAdp-src_0_OUTDIR)/Makefile	\
 
-$$(PATH_VBoxNetAdp-src)/Makefile: \
+$$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \
 		$(PATH_SUB_CURRENT)/freebsd/Makefile \
 		$$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk	(revision 35380)
@@ -73,9 +73,9 @@
 VBoxNetFlt.kext_INST     = $(INST_VBOXNETFLT)Contents/
 VBoxNetFlt.kext_SOURCES  = \
-	$(PATH_VBoxNetFlt.kext)/Info.plist
+	$(VBoxNetFlt.kext_0_OUTDIR)/Info.plist
 VBoxNetFlt.kext_CLEAN    = \
-	$(PATH_VBoxNetFlt.kext)/Info.plist
-
-$$(PATH_VBoxNetFlt.kext)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
+	$(VBoxNetFlt.kext_0_OUTDIR)/Info.plist
+
+$$(VBoxNetFlt.kext_0_OUTDIR)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
 	$(call MSG_GENERATE,VBoxNetFlt,$@,$<)
 	$(QUIET)$(RM) -f $@
@@ -209,5 +209,5 @@
 VBoxNetFltNotify_DEFS       = _WIN32_WINNT=0x0500 WIN32 _ATL_STATIC_REGISTRY
 VBoxNetFltNotify_INCS       = \
-	$(PATH_VBoxNetFltNotify)
+	$(VBoxNetFltNotify_0_OUTDIR)
 VBoxNetFltNotify_SOURCES    = \
 	win/notifyobj/VBoxNetFltNotify.cpp \
@@ -218,9 +218,9 @@
 #VBoxNetFltNotify_INTERMEDIATES =
 VBoxNetFltNotify_DEPS       = \
-	$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn_i.c \
-	$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn_p.c \
-	$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn.h \
-	$(PATH_VBoxNetFltNotify)/dlldata.c \
-	$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn.tlb
+	$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn_i.c \
+	$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn_p.c \
+	$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn.h \
+	$(VBoxNetFltNotify_0_OUTDIR)/dlldata.c \
+	$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn.tlb
 VBoxNetFltNotify_CLEAN      = $(VBoxNetFltNotify_DEPS)
 
@@ -231,13 +231,13 @@
 	) Sorry_Cannot_Find_The_Midl_Compiler_In_The_PSDK))
 
-$$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn_i.c \
-+ $$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn_p.c \
-+ $$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn.h \
-+ $$(PATH_VBoxNetFltNotify)/dlldata.c \
-+ $$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn.tlb: \
+$$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn_i.c \
++ $$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn_p.c \
++ $$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn.h \
++ $$(VBoxNetFltNotify_0_OUTDIR)/dlldata.c \
++ $$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn.tlb: \
 		$(PATH_SUB_CURRENT)/win/notifyobj/VBoxNetFltNotifyn.idl \
 		| $$(dir $$@)
 	$(VBOXNETFLT_NOTIFY_IDL) /nologo \
-		/out $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_VBoxNetFltNotify)) \
+		/out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxNetFltNotify_0_OUTDIR)) \
 		/cpp_cmd $(subst $(EXEC_X86_WIN32),,$(call VBOX_FN_MAKE_WIN_PATH,$(TOOL_$(VBOX_VCC_TOOL)_CC))) \
 		$(addprefix /I , $(call VBOX_FN_MAKE_WIN_PATH,$(SDK_W2K3DDK_INCS))) \
@@ -363,7 +363,7 @@
  VBoxNetFlt-src_SOURCES = $(subst ",,$(VBOX_VBOXNETFLT_SOURCES)) #"
  VBoxNetFlt-src_SOURCES+= \
-	$(PATH_VBoxNetFlt-src)/Makefile
+	$(VBoxNetFlt-src_0_OUTDIR)/Makefile
  VBoxNetFlt-src_CLEAN   = \
-	$(PATH_VBoxNetFlt-src)/Makefile	\
+	$(VBoxNetFlt-src_0_OUTDIR)/Makefile	\
 	$(PATH_TARGET)/VBoxNetFlt-src-1.dep
 
@@ -371,11 +371,11 @@
  VBoxNetFlt-sh_MODE    = a+rx,u+w
  VBoxNetFlt-sh_SOURCES = \
-	$(PATH_VBoxNetFlt-sh)/build_in_tmp \
+	$(VBoxNetFlt-sh_0_OUTDIR)/build_in_tmp \
 	$(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
- VBoxNetFlt-sh_CLEAN   = $(PATH_VBoxNetFlt-sh)/build_in_tmp
+ VBoxNetFlt-sh_CLEAN   = $(VBoxNetFlt-sh_0_OUTDIR)/build_in_tmp
 
 
  includedep $(PATH_TARGET)/VBoxNetFlt-src-1.dep
- $$(PATH_VBoxNetFlt-src)/Makefile: \
+ $$(VBoxNetFlt-src_0_OUTDIR)/Makefile: \
 		$(PATH_SUB_CURRENT)/linux/Makefile \
 		$$(if $$(eq $$(VBoxNetFlt/linux/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
@@ -390,5 +390,5 @@
 
  # Script needed for building the kernel module
- $$(PATH_VBoxNetFlt-sh)/build_in_tmp: \
+ $$(VBoxNetFlt-sh_0_OUTDIR)/build_in_tmp: \
 		$(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
 		$(VBOX_VERSION_STAMP) \
@@ -417,9 +417,9 @@
  VBoxNetFlt-src_SOURCES = $(subst ",,$(VBOX_VBOXNETFLT_SOURCES)) #"
  VBoxNetFlt-src_SOURCES+= \
-	$(PATH_VBoxNetFlt-src)/Makefile
+	$(VBoxNetFlt-src_0_OUTDIR)/Makefile
  VBoxNetFlt-src_CLEAN   = \
-	$(PATH_VBoxNetFlt-src)/Makefile	\
-
- $$(PATH_VBoxNetFlt-src)/Makefile: \
+	$(VBoxNetFlt-src_0_OUTDIR)/Makefile	\
+
+ $$(VBoxNetFlt-src_0_OUTDIR)/Makefile: \
 		$(PATH_SUB_CURRENT)/freebsd/Makefile \
 		$$(if $$(eq $$(VBoxNetFlt/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
Index: /trunk/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk	(revision 35380)
@@ -38,8 +38,8 @@
 INSTALLS += VBoxUSB.kext
 VBoxUSB.kext_INST     = $(INST_VBOXUSB)Contents/
-VBoxUSB.kext_SOURCES  =	$(PATH_VBoxUSB.kext)/Info.plist
-VBoxUSB.kext_CLEAN    = $(PATH_VBoxUSB.kext)/Info.plist
+VBoxUSB.kext_SOURCES  =	$(VBoxUSB.kext_0_OUTDIR)/Info.plist
+VBoxUSB.kext_CLEAN    = $(VBoxUSB.kext_0_OUTDIR)/Info.plist
 
-$$(PATH_VBoxUSB.kext)/Info.plist: $(PATH_SUB_CURRENT)/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
+$$(VBoxUSB.kext_0_OUTDIR)/Info.plist: $(PATH_SUB_CURRENT)/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
 	$(call MSG_GENERATE,VBoxUSB,$@,$<)
 	$(QUIET)$(RM) -f $@
Index: /trunk/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk	(revision 35380)
@@ -23,9 +23,9 @@
  # Set this in LocalConfig.kmk if you are working on the guest property
  # service to automatically run the testcase at build time.
- #    OTHERS += $(PATH_tstGuestControlSvc)/tstGuestControlSvc.run
+ #    OTHERS += $(tstGuestControlSvc_0_OUTDIR)/tstGuestControlSvc.run
  #
 
  PROGRAMS += tstGuestControlSvc
- TESTING  += $(PATH_tstGuestPropSvc)/tstGuestControlSvc.run
+ TESTING  += $(tstGuestControlSvc_0_OUTDIR)/tstGuestControlSvc.run
  tstGuestControlSvc_TEMPLATE = VBOXR3TSTEXE
  # The second define here is to ensure that the testcase will run fast,
@@ -38,5 +38,5 @@
  tstGuestControlSvc_LIBS     = $(LIB_RUNTIME)
 
-$$(PATH_tstGuestControlSvc)/tstGuestControlSvc.run: $$(INSTARGET_tstGuestControlSvc)
+$$(tstGuestControlSvc_0_OUTDIR)/tstGuestControlSvc.run: $$(INSTARGET_tstGuestControlSvc)
 	export VBOX_LOG_DEST=nofile; $(INSTARGET_tstGuestControlSvc) quiet
 	$(QUIET)$(APPEND) -t "$@" "done"
Index: /trunk/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk	(revision 35380)
@@ -23,9 +23,9 @@
  # Set this in LocalConfig.kmk if you are working on the guest property
  # service to automatically run the testcase at build time.
- #    OTHERS += $(PATH_tstGuestPropSvc)/tstGuestPropSvc.run
+ #    OTHERS += $(tstGuestPropSvc_0_OUTDIR)/tstGuestPropSvc.run
  #
 
  PROGRAMS += tstGuestPropSvc
- TESTING  += $(PATH_tstGuestPropSvc)/tstGuestPropSvc.run
+ TESTING  += $(tstGuestPropSvc_0_OUTDIR)/tstGuestPropSvc.run
  tstGuestPropSvc_TEMPLATE = VBOXR3TSTEXE
  # The second define here is to ensure that the testcase will run fast,
@@ -35,5 +35,5 @@
  tstGuestPropSvc_LIBS     = $(LIB_RUNTIME)
 
-$$(PATH_tstGuestPropSvc)/tstGuestPropSvc.run: $$(INSTARGET_tstGuestPropSvc)
+$$(tstGuestPropSvc_0_OUTDIR)/tstGuestPropSvc.run: $$(INSTARGET_tstGuestPropSvc)
 	export VBOX_LOG_DEST=nofile; $(INSTARGET_tstGuestPropSvc) quiet
 	$(QUIET)$(APPEND) -t "$@" "done"
Index: /trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk	(revision 35380)
@@ -70,14 +70,14 @@
  # Set this in LocalConfig.kmk if you are working on the X11 clipboard service
  # to automatically run the unit test at build time.
- #       OTHERS += $(PATH_tstClipboardX11-2)/tstClipboardX11-2.run
+ #       OTHERS += $(tstClipboardX11-2_0_OUTDIR)/tstClipboardX11-2.run
  PROGRAMS += tstClipboardX11-2
- TESTING += $(PATH_tstClipboardX11-2)/tstClipboardX11-2.run
+ TESTING += $(tstClipboardX11-2_0_OUTDIR)/tstClipboardX11-2.run
  tstClipboardX11-2_TEMPLATE = VBOXR3TSTEXE
  tstClipboardX11-2_DEFS     = VBOX_WITH_HGCM TESTCASE
  tstClipboardX11-2_SOURCES  = x11-clipboard.cpp
  tstClipboardX11-2_LIBS     = $(LIB_RUNTIME)
- tstClipboardX11-2_CLEANS   = $(PATH_tstClipboardX11-2)/tstClipboardX11-2.run
+ tstClipboardX11-2_CLEANS   = $(tstClipboardX11-2_0_OUTDIR)/tstClipboardX11-2.run
 
-$$(PATH_tstClipboardX11-2)/tstClipboardX11-2.run: $$(INSTARGET_tstClipboardX11-2)
+$$(tstClipboardX11-2_0_OUTDIR)/tstClipboardX11-2.run: $$(INSTARGET_tstClipboardX11-2)
 	export VBOX_LOG_DEST=nofile; $(INSTARGET_tstClipboardX11-2) quiet
 	$(QUIET)$(APPEND) -t "$@" "done"
Index: /trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk	(revision 35380)
@@ -23,9 +23,9 @@
 #
 PROGRAMS += tstShflSizes
-TESTING  += $(PATH_tstShflSizes)/tstShflSizes.run
+TESTING  += $(tstShflSizes_0_OUTDIR)/tstShflSizes.run
 ifndef VBOX_ONLY_SDK
  ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
   if1of ($(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH), x86.x86 amd64.amd64 x86.amd64)
-    OTHERS += $(PATH_tstShflSizes)/tstShflSizes.run
+    OTHERS += $(tstShflSizes_0_OUTDIR)/tstShflSizes.run
   endif
  endif
@@ -34,7 +34,7 @@
 tstShflSizes_DEFS     = VBOX_WITH_HGCM
 tstShflSizes_SOURCES  = tstShflSizes.cpp
-tstShflSizes_CLEAN    = $(PATH_tstShflSizes)/tstShflSizes.run
+tstShflSizes_CLEAN    = $(tstShflSizes_0_OUTDIR)/tstShflSizes.run
 
-$$(PATH_tstShflSizes)/tstShflSizes.run: $$(INSTARGET_tstShflSizes)
+$$(tstShflSizes_0_OUTDIR)/tstShflSizes.run: $$(INSTARGET_tstShflSizes)
 	$(INSTARGET_tstShflSizes) quiet
 	$(QUIET)$(APPEND) -t "$@" "done"
Index: /trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk	(revision 35380)
@@ -57,7 +57,8 @@
 	$(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC) \
 	$(VBOX_PATH_SDK)/bindings/mscom/include \
+## @todo r=bird: This does NOT work when running make from HostService or any of its subdirectories!
 VBoxSharedCrOpenGL_INCS = \
-	$(PATH_VBoxSVC) \
-	$(PATH_VBoxCOM)
+	$(VBoxSVC_0_OUTDIR) \
+	$(VBoxCOM_0_OUTDIR)
 ifdef VBOX_WITH_XPCOM
  VBoxSharedCrOpenGL_INCS += \
@@ -148,6 +149,6 @@
 	$(VBOX_PATH_CROGL_GENFILES)/server_dispatch.h
 ifdef VBOXCR_LOGFPS
-VBoxOGLcrserverlib_DEFS += VBOXCR_LOGFPS 
-endif	
+VBoxOGLcrserverlib_DEFS += VBOXCR_LOGFPS
+endif
 
 #
Index: /trunk/src/VBox/HostServices/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostServices/testcase/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/HostServices/testcase/Makefile.kmk	(revision 35380)
@@ -24,14 +24,14 @@
   # Set this in LocalConfig.kmk if you are working on HGCM service internals
   # to automatically run the unit test at build time:
-  #    OTHERS += $(PATH_tstHGCMSvc)/tstHGCMSvc.run
+  #    OTHERS += $(tstHGCMSvc_0_OUTDIR)/tstHGCMSvc.run
   #
   PROGRAMS += tstHGCMSvc
-  TESTING  += $(PATH_tstHGCMSvc)/tstHGCMSvc.run
+  TESTING  += $(tstHGCMSvc_0_OUTDIR)/tstHGCMSvc.run
   tstHGCMSvc_TEMPLATE = VBOXR3TSTEXE
   tstHGCMSvc_DEFS     = VBOX_WITH_HGCM VBOX_TEST_HGCM_PARMS
   tstHGCMSvc_SOURCES  = tstHGCMSvc.cpp
-  tstHGCMSvc_CLEAN    = $(PATH_tstHGCMSvc)/tstHGCMSvc.run
+  tstHGCMSvc_CLEAN    = $(tstHGCMSvc_0_OUTDIR)/tstHGCMSvc.run
 
-$$(PATH_tstHGCMSvc)/tstHGCMSvc.run: $$(INSTARGET_tstHGCMSvc)
+$$(tstHGCMSvc_0_OUTDIR)/tstHGCMSvc.run: $$(INSTARGET_tstHGCMSvc)
 	export VBOX_LOG_DEST=nofile; $(INSTARGET_tstHGCMSvc) quiet
 	$(QUIET)$(APPEND) -t "$@" "done"
Index: /trunk/src/VBox/Installer/freebsd/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/freebsd/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Installer/freebsd/Makefile.kmk	(revision 35380)
@@ -60,6 +60,6 @@
 	$(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \
 	$(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
-	$(if $(VBOX_WITH_QTGUI),$(PATH_freebsd-misc)/virtualbox.desktop,)
-freebsd-misc_CLEAN = $(PATH_freebsd-misc)/virtualbox.desktop
+	$(if $(VBOX_WITH_QTGUI),$(freebsd-misc_0_OUTDIR)/virtualbox.desktop,)
+freebsd-misc_CLEAN = $(freebsd-misc_0_OUTDIR)/virtualbox.desktop
 
 $$(PATH_freebsd-misc)/virtualbox.desktop: $(PATH_SUB_CURRENT)/virtualbox.desktop $(VBOX_VERSION_STAMP) | $$(dir $$@)
Index: /trunk/src/VBox/Installer/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 35380)
@@ -77,6 +77,6 @@
 	$(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml \
 	$(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
-	$(if $(VBOX_WITH_QTGUI),$(PATH_linux-misc)/virtualbox.desktop,)
-linux-misc_CLEAN = $(PATH_linux-misc)/virtualbox.desktop
+	$(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualbox.desktop,)
+linux-misc_CLEAN = $(linux-misc_0_OUTDIR)/virtualbox.desktop
 
 $$(PATH_linux-misc)/virtualbox.desktop: $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
Index: /trunk/src/VBox/Installer/win/Resources/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/win/Resources/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Installer/win/Resources/Makefile.kmk	(revision 35380)
@@ -26,7 +26,7 @@
 
 # The icon location is configurable.
-VBoxRes.rc_INCS += $(PATH_VBoxRes)
-VBoxRes.rc_DEPS += $(PATH_VBoxRes)/VBoxRes-icons.rc
-VBoxRes.rc_CLEAN = $(PATH_VBoxRes)/VBoxRes-icons.rc
+VBoxRes.rc_INCS += $(VBoxRes_0_OUTDIR)
+VBoxRes.rc_DEPS += $(VBoxRes_0_OUTDIR)/VBoxRes-icons.rc
+VBoxRes.rc_CLEAN = $(VBoxRes_0_OUTDIR)/VBoxRes-icons.rc
 
 # The resource path.
@@ -56,5 +56,5 @@
 	$(VBOX_WINDOWS_ICON_EXT_OVF)
 
-$$(PATH_VBoxRes)/VBoxRes-icons.rc: \
+$$(VBoxRes_0_OUTDIR)/VBoxRes-icons.rc: \
 		$$(VBOX_RESOURCES_WIN) $(MAKEFILE_CURRENT) | $$(dir $$@)
 	$(RM) -f $@
Index: /trunk/src/VBox/Installer/win/Stub/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/win/Stub/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Installer/win/Stub/Makefile.kmk	(revision 35380)
@@ -42,10 +42,10 @@
 
 # The icon location is configurable.
-VBoxStub.rc_INCS += $(PATH_VBoxStub)
-VBoxStub.rc_DEPS += $(PATH_VBoxStub)/VBoxStub-icon.rc
-VBoxStub.rc_CLEAN = $(PATH_VBoxStub)/VBoxStub-icon.rc
+VBoxStub.rc_INCS += $(VBoxStub_0_OUTDIR)
+VBoxStub.rc_DEPS += $(VBoxStub_0_OUTDIR)/VBoxStub-icon.rc
+VBoxStub.rc_CLEAN = $(VBoxStub_0_OUTDIR)/VBoxStub-icon.rc
 
 # Icon include file.
-$$(PATH_VBoxStub)/VBoxStub-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $(MAKEFILE_CURRENT) | $$(dir $$@)
+$$(VBoxStub_0_OUTDIR)/VBoxStub-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $(MAKEFILE_CURRENT) | $$(dir $$@)
 	$(APPEND) -t $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
 
Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 35380)
@@ -37,5 +37,5 @@
  # used by some rules
  PATH_VBoxCOM    = $(PATH_TARGET)/VBoxCOM
- BLDDIRS        += $(PATH_VBoxCOM) $(PATH_BIN)/components
+ BLDDIRS        += $(VBoxCOM_0_OUTDIR) $(PATH_BIN)/components
  # I'm Evil! Dr. Evil.
  include $(KBUILD_PATH)/tools/VCC70.kmk
@@ -87,9 +87,9 @@
 	$(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb \
 	$(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c \
-	$(PATH_VBoxCOM)/VirtualBox.h   \
-	$(PATH_VBoxCOM)/VirtualBox_i.c \
-	$(PATH_VBoxCOM)/VirtualBox.tlb
-
- VBOX_MAIN_PREREQS += $(PATH_VBoxCOM)/VirtualBox_i.c
+	$(VBoxCOM_0_OUTDIR)/VirtualBox.h   \
+	$(VBoxCOM_0_OUTDIR)/VirtualBox_i.c \
+	$(VBoxCOM_0_OUTDIR)/VirtualBox.tlb
+
+ VBOX_MAIN_PREREQS += $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
  BLDDIRS += $(VBOX_PATH_SDK)/bindings/mscom/idl
 endif
@@ -252,9 +252,9 @@
 VBoxSVC_INCS = \
 	include \
-	$(PATH_VBoxSVC) \
+	$(VBoxSVC_0_OUTDIR) \
 	$(dir $(VBOX_XML_SCHEMADEFS_H)) \
 	.
 VBoxSVC_INCS.win = \
-	$(PATH_VBoxCOM)
+	$(VBoxCOM_0_OUTDIR)
 ifdef VBOX_WITH_USB
  VBoxSVC_INCS.os2 = \
@@ -427,12 +427,12 @@
 endif
 
-src-server/win/VBoxSVC.rc_INCS  = $(PATH_VBoxSVC)
-src-server/win/VBoxSVC.rc_DEPS  = $(PATH_VBoxSVC)/VBoxSVC.rgs $(PATH_VBoxSVC)/VBoxSVC-icon.rc
-src-server/win/VBoxSVC.rc_CLEAN = $(PATH_VBoxSVC)/VBoxSVC.rgs $(PATH_VBoxSVC)/VBoxSVC-icon.rc
-
-$$(PATH_VBoxSVC)/VBoxSVC-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$(@D))
+src-server/win/VBoxSVC.rc_INCS  = $(VBoxSVC_0_OUTDIR)
+src-server/win/VBoxSVC.rc_DEPS  = $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs $(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc
+src-server/win/VBoxSVC.rc_CLEAN = $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs $(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc
+
+$$(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$(@D))
 	$(APPEND) -t $@ '1 ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
 
-$$(PATH_VBoxSVC)/VBoxSVC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$(@D))
+$$(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$(@D))
 	$(VBOX_XSLTPROC) --stringparam Module VBoxSVC -o $@ $< $(VBOX_XIDL_FILE)
 
@@ -451,13 +451,13 @@
 VBOX_XML_CONVERTER_TEMPLATE   = $(VBOX_PATH_MAIN_SRC)/xml/SettingsConverter.xsl
 
-$$(PATH_VBoxSVC)/xml_VirtualBox_settings_xsd.h: $(VBOX_XML_SCHEMA.$(KBUILD_TARGET)) $(VBOX_BIN2C)
+$$(VBoxSVC_0_OUTDIR)/xml_VirtualBox_settings_xsd.h: $(VBOX_XML_SCHEMA.$(KBUILD_TARGET)) $(VBOX_BIN2C)
 	$(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
 	$(QUIET)$(VBOX_BIN2C) _xml_VirtualBox_settings_xsd $< $@
 
-$$(PATH_VBoxSVC)/xml_VirtualBox_settings_common_xsd.h: $(VBOX_XML_SCHEMA_COMMON) $(VBOX_BIN2C)
+$$(VBoxSVC_0_OUTDIR)/xml_VirtualBox_settings_common_xsd.h: $(VBOX_XML_SCHEMA_COMMON) $(VBOX_BIN2C)
 	$(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
 	$(QUIET)$(VBOX_BIN2C) _xml_VirtualBox_settings_common_xsd $< $@
 
-$$(PATH_VBoxSVC)/xml_SettingsConverter_xsl.h: $(VBOX_XML_CONVERTER_TEMPLATE) $(VBOX_BIN2C)
+$$(VBoxSVC_0_OUTDIR)/xml_SettingsConverter_xsl.h: $(VBOX_XML_CONVERTER_TEMPLATE) $(VBOX_BIN2C)
 	$(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
 	$(QUIET)$(VBOX_BIN2C) _xml_SettingsConverter_xsl $< $@
@@ -539,5 +539,5 @@
 VBoxSVCM_INCS           = \
 	include \
-	$(PATH_VBoxC) \
+	$(VBoxC_0_OUTDIR) \
 	.
 VBoxSVCM_INTERMEDIATES  = $(VBOX_MAIN_PREREQS)
@@ -546,9 +546,9 @@
 VBoxSVCM_LDFLAGS.darwin = \
 	-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxSVCM.dylib \
-	-exported_symbols_list $(PATH_VBoxSVCM)/VBoxSVCM.def
+	-exported_symbols_list $(VBoxSVCM_0_OUTDIR)/VBoxSVCM.def
  ifeq ($(KBUILD_TARGET),darwin)
-VBoxSVCM_ORDERDEPS     += $(PATH_VBoxSVCM)/VBoxSVCM.def
-VBoxSVCM_CLEAN         += $(PATH_VBoxSVCM)/VBoxSVCM.def
-$$(PATH_VBoxSVCM)/VBoxSVCM.def:
+VBoxSVCM_ORDERDEPS     += $(VBoxSVCM_0_OUTDIR)/VBoxSVCM.def
+VBoxSVCM_CLEAN         += $(VBoxSVCM_0_OUTDIR)/VBoxSVCM.def
+$$(VBoxSVCM_0_OUTDIR)/VBoxSVCM.def:
 	$(RM) -f $@
 	$(APPEND) $@ _NSGetModule
@@ -594,13 +594,13 @@
 VBoxC_INCS          = \
 	include \
-	$(PATH_VBoxC) \
+	$(VBoxC_0_OUTDIR) \
 	$(dir $(VBOX_XML_SCHEMADEFS_H))
 VBoxC_INCS.win      = \
-	$(PATH_VBoxCOM) \
+	$(VBoxCOM_0_OUTDIR) \
 	.
 
 VBoxC_LDFLAGS.darwin = \
 	-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxC.dylib \
-	-exported_symbols_list $(PATH_VBoxC)/VBoxC.def \
+	-exported_symbols_list $(VBoxC_0_OUTDIR)/VBoxC.def \
 	-framework IOKit
 ifdef VBOX_USE_VCC80
@@ -684,7 +684,7 @@
 
 ifeq ($(KBUILD_TARGET),darwin)
-VBoxC_ORDERDEPS += $(PATH_VBoxC)/VBoxC.def
-VBoxC_CLEAN     += $(PATH_VBoxC)/VBoxC.def
-$$(PATH_VBoxC)/VBoxC.def: $(MAKEFILE_CURRENT)
+VBoxC_ORDERDEPS += $(VBoxC_0_OUTDIR)/VBoxC.def
+VBoxC_CLEAN     += $(VBoxC_0_OUTDIR)/VBoxC.def
+$$(VBoxC_0_OUTDIR)/VBoxC.def: $(MAKEFILE_CURRENT)
 	$(RM) -f $@
 	$(APPEND) $@ _NSGetModule
@@ -697,8 +697,8 @@
 
 
-src-client/win/VBoxC.rc_DEPS = $(PATH_VBoxC)/VBoxC.rgs $(PATH_VBoxCOM)/VirtualBox.tlb
-VBoxC_CLEAN.win  += $(PATH_VBoxC)/VBoxC.rgs
-
-$$(PATH_VBoxC)/VBoxC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(PATH_VBoxC)/
+src-client/win/VBoxC.rc_DEPS = $(VBoxC_0_OUTDIR)/VBoxC.rgs $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb
+VBoxC_CLEAN.win  += $(VBoxC_0_OUTDIR)/VBoxC.rgs
+
+$$(VBoxC_0_OUTDIR)/VBoxC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
 	$(VBOX_XSLTPROC) --stringparam Module VBoxC -o $@ $< $(VBOX_XIDL_FILE)
 
@@ -725,5 +725,5 @@
  VBoxCOM_DEFS.amd64    += _WIN32_WINNT=0x0510
  VBoxCOM_SOURCES       += \
-	$(PATH_VBoxCOM)/VirtualBox_i.c
+	$(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
 else # !win
  VBoxCOM_SOURCES       += \
@@ -817,5 +817,5 @@
 testidlhdr: $(VBOX_IDL_HEADER.XPCOM)
 else
-testidl:    $(VBOX_IDL_FILE.MSCOM) $(PATH_VBoxCOM)/VirtualBox_i.c
+testidl:    $(VBOX_IDL_FILE.MSCOM) $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
 endif
 
@@ -826,12 +826,12 @@
 #
 # What needs to be done is to not depend on _i.c in the object subdir, but on all the final outputs.
-$(PATH_VBoxCOM)/VirtualBox_i.c \
+$(VBoxCOM_0_OUTDIR)/VirtualBox_i.c \
 + $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c \
-+ $(PATH_VBoxCOM)/VirtualBox.h \
++ $(VBoxCOM_0_OUTDIR)/VirtualBox.h \
 + $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h \
-+ $(PATH_VBoxCOM)/VirtualBox.tlb \
-+ $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb: $(VBOX_IDL_FILE.MSCOM) | $(call DIRDEP,$(PATH_VBoxCOM))
++ $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb \
++ $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb: $(VBOX_IDL_FILE.MSCOM) | $(call DIRDEP,$(VBoxCOM_0_OUTDIR))
 	$(VBOX_MAIN_IDL) $(IDL_DEFS) \
-		/out $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_VBoxCOM)) \
+		/out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxCOM_0_OUTDIR)) \
 		/cpp_cmd $(subst $(EXEC_X86_WIN32),,$(call VBOX_FN_MAKE_WIN_PATH,$(TOOL_$(VBOX_VCC_TOOL)_CC))) \
 		/I $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_SDK_WINPSDK_INC)) \
@@ -839,8 +839,8 @@
 		$(call VBOX_FN_MAKE_WIN_PATH,$<)
 	$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/mscom/include
-	$(CP) $(PATH_VBoxCOM)/VirtualBox.h $(VBOX_PATH_SDK)/bindings/mscom/include
+	$(CP) $(VBoxCOM_0_OUTDIR)/VirtualBox.h $(VBOX_PATH_SDK)/bindings/mscom/include
 	$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/mscom/lib
-	$(CP) $(PATH_VBoxCOM)/VirtualBox.tlb $(VBOX_PATH_SDK)/bindings/mscom/lib
-	$(CP) $(PATH_VBoxCOM)/VirtualBox_i.c $(VBOX_PATH_SDK)/bindings/mscom/lib
+	$(CP) $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb $(VBOX_PATH_SDK)/bindings/mscom/lib
+	$(CP) $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c $(VBOX_PATH_SDK)/bindings/mscom/lib
 
 #
Index: /trunk/src/VBox/VMM/Makefile.kmk
===================================================================
--- /trunk/src/VBox/VMM/Makefile.kmk	(revision 35379)
+++ /trunk/src/VBox/VMM/Makefile.kmk	(revision 35380)
@@ -255,6 +255,6 @@
  endif
  ifeq ($(VBOX_LDR_FMT32),lx)
-  VMMRCBuiltin_SOURCES = $(PATH_VMMRCBuiltin)/VMMRCBuiltin.def
-  $$(PATH_VMMRCBuiltin)/VMMRCBuiltin.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRCBuiltin.def | $$(dir $$@)
+  VMMRCBuiltin_SOURCES = $(VMMRCBuiltin_0_OUTDIR)/VMMRCBuiltin.def
+  $$(VMMRCBuiltin_0_OUTDIR)/VMMRCBuiltin.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRCBuiltin.def | $$(dir $$@)
 	$(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' -e 's/[ \t]DATA[ \t]*/ /' --output $@ $<
  endif
@@ -266,8 +266,8 @@
  LIBRARIES += VMMRCImp
  VMMRCImp_TEMPLATE = VBoxRc
- VMMRCImp_SOURCES = $(PATH_VMMRCImp)/VMMRC.def
- VMMRCImp_CLEAN   = $(PATH_VMMRCImp)/VMMRC.def
-
- $$(PATH_VMMRCImp)/VMMRC.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRC.def | $$(dir $$@)
+ VMMRCImp_SOURCES = $(VMMRCImp_0_OUTDIR)/VMMRC.def
+ VMMRCImp_CLEAN   = $(VMMRCImp_0_OUTDIR)/VMMRC.def
+
+ $$(VMMRCImp_0_OUTDIR)/VMMRC.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRC.def | $$(dir $$@)
  ifeq ($(VBOX_LDR_FMT32),lx)
 	$(SED) \
@@ -295,8 +295,8 @@
  LIBRARIES += VMMR0Imp
  VMMR0Imp_TEMPLATE = VBoxR0
- VMMR0Imp_SOURCES  = $(PATH_VMMR0Imp)/VMMR0.def
- VMMR0Imp_CLEAN    = $(PATH_VMMR0Imp)/VMMR0.def
-
- $$(PATH_VMMR0Imp)/VMMR0.def: $(PATH_SUB_CURRENT)/VMMR0/VMMR0.def | $$(dir $$@)
+ VMMR0Imp_SOURCES  = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
+ VMMR0Imp_CLEAN    = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
+
+ $$(VMMR0Imp_0_OUTDIR)/VMMR0.def: $(PATH_SUB_CURRENT)/VMMR0/VMMR0.def | $$(dir $$@)
  ifeq ($(VBOX_LDR_FMT),lx)
 	$(SED) \
@@ -411,5 +411,5 @@
  endif
  ifeq ($(VBOX_LDR_FMT32),lx)
-  VMMRC_SOURCES += $(PATH_VMMRCImp)/VMMRC.def
+  VMMRC_SOURCES += $(VMMRCImp_0_OUTDIR)/VMMRC.def
  endif
 
@@ -502,5 +502,5 @@
  endif
  ifeq ($(VBOX_LDR_FMT),lx)
-  VMMR0_SOURCES += $(PATH_VMMR0Imp)/VMMR0.def
+  VMMR0_SOURCES += $(VMMR0Imp_0_OUTDIR)/VMMR0.def
  endif
  VMMR0_SOURCES.amd64 = \
Index: /trunk/src/libs/xpcom18a4/Makefile.kmk
===================================================================
--- /trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 35379)
+++ /trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 35380)
@@ -541,5 +541,5 @@
 VBox-xpcom-nspr_INCS = \
 	nsprpub/pr/include/private \
-	$(PATH_VBox-xpcom-nspr)
+	$(VBox-xpcom-nspr_0_OUTDIR)
 
 VBox-xpcom-nspr_SOURCES  = \
@@ -690,15 +690,15 @@
 
 # generate build stamps
-nsprpub/pr/src/prvrsion.c_DEPS = $(PATH_VBox-xpcom-nspr)/_pr_bld.h
-nsprpub/lib/ds/plvrsion.c_DEPS = $(PATH_VBox-xpcom-nspr)/_pl_bld.h
+nsprpub/pr/src/prvrsion.c_DEPS = $(VBox-xpcom-nspr_0_OUTDIR)/_pr_bld.h
+nsprpub/lib/ds/plvrsion.c_DEPS = $(VBox-xpcom-nspr_0_OUTDIR)/_pl_bld.h
 VBox-xpcom-nspr_CLEAN += \
-	$(PATH_VBox-xpcom-nspr)/_pr_bld.h \
-	$(PATH_VBox-xpcom-nspr)/_pl_bld.h
-
-$$(PATH_VBox-xpcom-nspr)/_pr_bld.h: | $$(PATH_VBox-xpcom-nspr)/
+	$(VBox-xpcom-nspr_0_OUTDIR)/_pr_bld.h \
+	$(VBox-xpcom-nspr_0_OUTDIR)/_pl_bld.h
+
+$$(VBox-xpcom-nspr_0_OUTDIR)/_pr_bld.h: | $$(VBox-xpcom-nspr_0_OUTDIR)/
 	$(call MSG_GENERATE,,$@)
 	$(QUIET)$(APPEND) -t $@ '#define _BUILD_STRING "$(date +%Y-%m-%d %T)"'
 
-$$(PATH_VBox-xpcom-nspr)/_pl_bld.h: | $$(PATH_VBox-xpcom-nspr)/
+$$(VBox-xpcom-nspr_0_OUTDIR)/_pl_bld.h: | $$(VBox-xpcom-nspr_0_OUTDIR)/
 	$(call MSG_GENERATE,,$@)
 	$(QUIET)$(APPEND) -t $@ '#define _BUILD_STRING "$(date +%Y-%m-%d %T)"'
Index: /trunk/src/recompiler/Makefile.kmk
===================================================================
--- /trunk/src/recompiler/Makefile.kmk	(revision 35379)
+++ /trunk/src/recompiler/Makefile.kmk	(revision 35380)
@@ -80,5 +80,5 @@
 	tcg \
 	fpu \
-	$(PATH_VBoxRemPrimary) \
+	$(VBoxRemPrimary_0_OUTDIR) \
 	$(PATH_ROOT)/src/VBox/VMM/include \
 	.
@@ -107,5 +107,5 @@
 VBoxRemPrimary_SOURCES.debug  += \
 	Sun/testmath.c
-VBoxRemPrimary_SOURCES.win.x86 = $(PATH_VBoxREMImp)/VBoxREMWin.def
+VBoxRemPrimary_SOURCES.win.x86 = $(VBoxREMImp_0_OUTDIR)/VBoxREMWin.def
 
 VBoxRemPrimary_LIBS            = \
@@ -218,11 +218,11 @@
  endif
 VBoxREMImp_INST            = $(INST_LIB)
-VBoxREMImp_SOURCES.win     = $(PATH_VBoxREMImp)/VBoxREMWin.def
-VBoxREMImp_CLEAN.win       = $(PATH_VBoxREMImp)/VBoxREMWin.def
-VBoxREMImp_SOURCES.os2     = $(PATH_VBoxREMImp)/VBoxREMOS2.def
-VBoxREMImp_CLEAN.os2       = $(PATH_VBoxREMImp)/VBoxREMOS2.def
+VBoxREMImp_SOURCES.win     = $(VBoxREMImp_0_OUTDIR)/VBoxREMWin.def
+VBoxREMImp_CLEAN.win       = $(VBoxREMImp_0_OUTDIR)/VBoxREMWin.def
+VBoxREMImp_SOURCES.os2     = $(VBoxREMImp_0_OUTDIR)/VBoxREMOS2.def
+VBoxREMImp_CLEAN.os2       = $(VBoxREMImp_0_OUTDIR)/VBoxREMOS2.def
  ifn1of ($(KBUILD_TARGET), os2 win)
-VBoxREMImp_SOURCES         = $(PATH_VBoxREMImp)/VBoxREMImp.c
-VBoxREMImp_CLEAN           = $(PATH_VBoxREMImp)/VBoxREMImp.c
+VBoxREMImp_SOURCES         = $(VBoxREMImp_0_OUTDIR)/VBoxREMImp.c
+VBoxREMImp_CLEAN           = $(VBoxREMImp_0_OUTDIR)/VBoxREMImp.c
  endif
  ifn1of ($(KBUILD_TARGET), darwin os2 win)
@@ -236,5 +236,5 @@
 VBoxREMImp_LDFLAGS.l4      = -T$(L4_LIBDIR)/../main_rel.ld -nostdlib
 
-$$(PATH_VBoxREMImp)/VBoxREMImp.c: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.def $(VBOX_PATH_RECOMPILER_SRC)/Sun/deftoimp.sed $(MAKEFILE_CURRENT) | $$(dir $$@)
+$$(VBoxREMImp_0_OUTDIR)/VBoxREMImp.c: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.def $(VBOX_PATH_RECOMPILER_SRC)/Sun/deftoimp.sed $(MAKEFILE_CURRENT) | $$(dir $$@)
 	$(call MSG_GENERATE,,$@)
 	$(QUIET)$(APPEND) -t $@ '#ifdef VBOX_HAVE_VISIBILITY_HIDDEN'
@@ -246,5 +246,5 @@
 	$(QUIET)$(SED) -f $(VBOX_PATH_RECOMPILER_SRC)/Sun/deftoimp.sed --append $@ $<
 
-$$(PATH_VBoxREMImp)/VBoxREMOS2.def: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.def $(MAKEFILE_CURRENT) | $$(dir $$@)
+$$(VBoxREMImp_0_OUTDIR)/VBoxREMOS2.def: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.def $(MAKEFILE_CURRENT) | $$(dir $$@)
 	$(SED) \
 		-e 's/^[ \t][ \t]*REMR3/    _REMR3/' \
@@ -254,5 +254,5 @@
 		$<
 
-$$(PATH_VBoxREMImp)/VBoxREMWin.def: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.def $(MAKEFILE_CURRENT) | $$(dir $$@)
+$$(VBoxREMImp_0_OUTDIR)/VBoxREMWin.def: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.def $(MAKEFILE_CURRENT) | $$(dir $$@)
 	$(CP) -f $< $@
 
