Additions/*.kmk: Automatic scm cleanups. bugref:10348

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@98416 cfe28804-0f27-0410-a406-dd0f0b0b656f

44 files changed, 1010 insertions, 1010 deletions

diff --git a/src/VBox/Additions/3D/Config.kmk b/src/VBox/Additions/3D/Config.kmk
index c7a9f80b208..452c3b47730 100644
--- a/src/VBox/Additions/3D/Config.kmk
+++ b/src/VBox/Additions/3D/Config.kmk
@@ -47,10 +47,10 @@ TEMPLATE_VBoxMesa3DGuestR3Dll_INST     = $(INST_ADDITIONS)
 TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS     = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS) \
 	VBOX_WITH_MESA3D
 ifdef VBOX_WITH_VMSVGA
-TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS    += \
-	VBOX_WITH_VMSVGA
-# treat as error: warning C4013: 'close' undefined; assuming extern returning int
-TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS   = $(TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS) -we4013
+ TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS   += \
+ 	VBOX_WITH_VMSVGA
+ # treat as error: warning C4013: 'close' undefined; assuming extern returning int
+ TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS  = $(TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS) -we4013
 endif
 TEMPLATE_VBoxMesa3DGuestR3Dll_SDKS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_SDKS) \
 	$(VBOX_WINDDK_GST_W8)
@@ -86,10 +86,10 @@ TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS    += \
 	VBOX_WITH_MESA3D_SVGA_HALFZ \
 	VBOX_WITH_MESA3D_SVGA_INSTANCING
 ifdef VBOX_WITH_NOCRT_STATIC
-TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS    += \
-	IPRT_NO_CRT_FOR_3RD_PARTY \
-	RT_WITHOUT_NOCRT_WRAPPERS \
-	RT_WITHOUT_NOCRT_WRAPPER_ALIASES
+ TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS   += \
+ 	IPRT_NO_CRT_FOR_3RD_PARTY \
+ 	RT_WITHOUT_NOCRT_WRAPPERS \
+ 	RT_WITHOUT_NOCRT_WRAPPER_ALIASES
 endif
 TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS.win) \
 	_USE_MATH_DEFINES \
@@ -104,25 +104,25 @@ TEMPLATE_VBoxMesa3DGuestR3Dll_INCS     = $(TEMPLATE_NewerVccVBoxGuestR3Dll_INCS)
 	$(VBOX_PATH_MESA)/src/gallium/include \
 	$(VBOX_PATH_3D)/win/VBoxWddmUmHlp
 ifdef VBOX_WITH_NOCRT_STATIC # Only the softfloat libs are added here as mesa includes a softfloat.h and we wish for no conflicts.
-TEMPLATE_VBoxMesa3DGuestR3Dll_LIBS.x86 += $(TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86) \
-	$(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
-	$(SDK_VBoxSoftFloatGuestR3Shared_LIBS.x86)
-TEMPLATE_VBoxMesa3DGuestR3Dll_LIBS.$(KBUILD_TARGET_ARCH) += $(TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.$(KBUILD_TARGET)) \
-	$(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
-	$(SDK_VBoxSoftFloatGuestR3Shared_LIBS.$(KBUILD_TARGET_ARCH))
-TEMPLATE_VBoxMesa3DGuestR3Dll_LDFLAGS.win += $(TEMPLATE_NewerVccVBoxGuestR3Dll_LDFLAGS.win)
-# The -Oi- disable optimizations of math functions like sqrt(), that takes all
-# parameters on the stack, into calls to __CIsqrt that takes parameters in FPU
-# registers.  While we could implement the __CIxxxx functions too, they would
-# be difficult to test properly given that they're not directly callable from
-# C.  Also, there could be other aspects to these functions that we don't know
-# about, given that they aren't documented all that well.  See:
-#   https://docs.microsoft.com/en-us/cpp/preprocessor/intrinsic?view=msvc-160#intrinsic-floating-point-functions
-#   https://docs.microsoft.com/en-us/cpp/build/reference/oi-generate-intrinsic-functions?view=msvc-160
-# Unforutnately, this does mean that we will miss out on a little bit of
-# performance in 32-bit binaries.
-TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS.win.x86   += $(TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS.win.x86) -Oi-
-TEMPLATE_VBoxMesa3DGuestR3Dll_CXXFLAGS.win.x86 += $(TEMPLATE_NewerVccVBoxGuestR3Dll_CXXFLAGS.win.x86) -Oi-
+ TEMPLATE_VBoxMesa3DGuestR3Dll_LIBS.x86 += $(TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86) \
+ 	$(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
+ 	$(SDK_VBoxSoftFloatGuestR3Shared_LIBS.x86)
+ TEMPLATE_VBoxMesa3DGuestR3Dll_LIBS.$(KBUILD_TARGET_ARCH) += $(TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.$(KBUILD_TARGET)) \
+ 	$(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
+ 	$(SDK_VBoxSoftFloatGuestR3Shared_LIBS.$(KBUILD_TARGET_ARCH))
+ TEMPLATE_VBoxMesa3DGuestR3Dll_LDFLAGS.win += $(TEMPLATE_NewerVccVBoxGuestR3Dll_LDFLAGS.win)
+ # The -Oi- disable optimizations of math functions like sqrt(), that takes all
+ # parameters on the stack, into calls to __CIsqrt that takes parameters in FPU
+ # registers.  While we could implement the __CIxxxx functions too, they would
+ # be difficult to test properly given that they're not directly callable from
+ # C.  Also, there could be other aspects to these functions that we don't know
+ # about, given that they aren't documented all that well.  See:
+ #   https://docs.microsoft.com/en-us/cpp/preprocessor/intrinsic?view=msvc-160#intrinsic-floating-point-functions
+ #   https://docs.microsoft.com/en-us/cpp/build/reference/oi-generate-intrinsic-functions?view=msvc-160
+ # Unforutnately, this does mean that we will miss out on a little bit of
+ # performance in 32-bit binaries.
+ TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS.win.x86  += $(TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS.win.x86) -Oi-
+ TEMPLATE_VBoxMesa3DGuestR3Dll_CXXFLAGS.win.x86 += $(TEMPLATE_NewerVccVBoxGuestR3Dll_CXXFLAGS.win.x86) -Oi-
 endif
 
 #
@@ -133,9 +133,9 @@ TEMPLATE_VBoxMesa3DGuestR3DllMinVista_EXTENDS             = VBoxMesa3DGuestR3Dll
 TEMPLATE_VBoxMesa3DGuestR3DllMinVista_VBOX_IMPORT_CHECKER.win.x86   := vista
 TEMPLATE_VBoxMesa3DGuestR3DllMinVista_VBOX_IMPORT_CHECKER.win.amd64 := vista
 ifeq ($(KBUILD_TARGET),win)
-TEMPLATE_VBoxMesa3DGuestR3DllMinVista_LDFLAGS.win.x86     = $(filter-out -Section:.bss$(COMMA)RW!K,$(TEMPLATE_VBoxMesa3DGuestR3Dll_LDFLAGS.win.x86))
-TEMPLATE_VBoxMesa3DGuestR3DllMinVista_POST_CMDS.win.x86   = $(subst $(VBOX_PE_SET_VERSION), $(VBOX_PE_SET_VERSION) --vista,$(TEMPLATE_VBoxMesa3DGuestR3Dll_POST_CMDS.win.x86))
-TEMPLATE_VBoxMesa3DGuestR3DllMinVista_POST_CMDS.win.amd64 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) --vista $(out)$$(NLTAB)$(TEMPLATE_VBoxMesa3DGuestR3Dll_POST_CMDS.win.amd64))
-TEMPLATE_VBoxMesa3DGuestR3DllMinVista_LNK_DEPS.win.amd64  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION)) $(TEMPLATE_VBoxMesa3DGuestR3Dll_LNK_DEPS.win.amd64)
+ TEMPLATE_VBoxMesa3DGuestR3DllMinVista_LDFLAGS.win.x86    = $(filter-out -Section:.bss$(COMMA)RW!K,$(TEMPLATE_VBoxMesa3DGuestR3Dll_LDFLAGS.win.x86))
+ TEMPLATE_VBoxMesa3DGuestR3DllMinVista_POST_CMDS.win.x86  = $(subst $(VBOX_PE_SET_VERSION), $(VBOX_PE_SET_VERSION) --vista,$(TEMPLATE_VBoxMesa3DGuestR3Dll_POST_CMDS.win.x86))
+ TEMPLATE_VBoxMesa3DGuestR3DllMinVista_POST_CMDS.win.amd64 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) --vista $(out)$$(NLTAB)$(TEMPLATE_VBoxMesa3DGuestR3Dll_POST_CMDS.win.amd64))
+ TEMPLATE_VBoxMesa3DGuestR3DllMinVista_LNK_DEPS.win.amd64 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION)) $(TEMPLATE_VBoxMesa3DGuestR3Dll_LNK_DEPS.win.amd64)
 endif
 
diff --git a/src/VBox/Additions/3D/Makefile.kmk b/src/VBox/Additions/3D/Makefile.kmk
index d4ba7850112..e6df38d1043 100644
--- a/src/VBox/Additions/3D/Makefile.kmk
+++ b/src/VBox/Additions/3D/Makefile.kmk
@@ -32,7 +32,7 @@ include $(KBUILD_PATH)/subheader.kmk
 # Make sure our Config.kmk is included.
 #
 ifndef VBOX_MESA3D_CONFIG_KMK_INCLUDED
-include $(PATH_SUB_CURRENT)/Config.kmk
+ include $(PATH_SUB_CURRENT)/Config.kmk
 endif
 
 #
@@ -40,7 +40,7 @@ endif
 #
 include $(PATH_SUB_CURRENT)/mesa/Makefile.kmk
 if1of ($(KBUILD_TARGET), win)
-include $(PATH_SUB_CURRENT)/win/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/win/Makefile.kmk
 endif
 
 include $(FILE_KBUILD_SUB_FOOTER)
diff --git a/src/VBox/Additions/3D/mesa/Makefile.kmk b/src/VBox/Additions/3D/mesa/Makefile.kmk
index a1ce0958bfd..c3ac48d60c1 100644
--- a/src/VBox/Additions/3D/mesa/Makefile.kmk
+++ b/src/VBox/Additions/3D/mesa/Makefile.kmk
@@ -32,7 +32,7 @@ include $(KBUILD_PATH)/subheader.kmk
 # Make sure our Config.kmk is included.
 #
 ifndef VBOX_MESA3D_CONFIG_KMK_INCLUDED
-include $(PATH_SUB_CURRENT)/../Config.kmk
+ include $(PATH_SUB_CURRENT)/../Config.kmk
 endif
 
 PYTHON_CMD = $(VBOX_BLD_PYTHON) -B
@@ -62,77 +62,77 @@ TEMPLATE_VBoxMesa3DGuestR3Lib               = VBox Mesa 3D Guest User Mode Libra
 TEMPLATE_VBoxMesa3DGuestR3Lib_EXTENDS       = VBoxMesa3DGuestR3Dll
 TEMPLATE_VBoxMesa3DGuestR3Lib_INST          = $(INST_ADDITIONS_LIB)
 ifeq ($(KBUILD_TARGET),win)
-# Do not treat warnings as errors, because Mesa code produces too many warnings with MSC.
-TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS        = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS))
-TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS      = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CXXFLAGS))
-#  -wd4005: vcc120: '__useHeader' : macro redefinition
-#  -wd4018: signed/unsigned mismatch
-#  -wd4054: 'type cast' : from function pointer to data pointer 'void *'
-#  -wd4057: 'function' : 'int *' differs in indirection to slightly different base types from 'uint32_t *'
-#  -wd4090: 'function' : different 'const' qualifiers
-#  -wd4098: 'void' function returning a value
-#  -wd4099: 'st_src_reg' : type name first seen using 'class' now seen using 'struct'
-#  -wd4100: unreferenced formal parameter
-#  -wd4101: unreferenced local variable
-#  -wd4130: '==' : logical operation on address of string constant
-#  -wd4132: 'color' : const object should be initialized
-#  -wd4146: unary minus operator applied to unsigned type, result still unsigned
-#  -wd4152: nonstandard extension, function/data pointer conversion in expression
-#  -wd4189: 'signo' : local variable is initialized but not referenced
-#  -wd4200: nonstandard extension used : zero-sized array in struct/union
-#  -wd4204: nonstandard extension used : non-constant aggregate initializer
-#  -wd4206: nonstandard extension used : translation unit is empty
-#  -wd4211: nonstandard extension used : redefined extern to static
-#  -wd4221: nonstandard extension used : 'tokens' : cannot be initialized using address of automatic variable 'tokens'
-#  -wd4245: '=' : conversion from 'int' to 'unsigned int', signed/unsigned mismatch
-#  -wd4255: no function prototype given
-#  -wd4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used
-#  -wd4265: 'ir_variable_refcount_visitor' : class has virtual functions, but destructor is not virtual
-#  -wd4267: '=' : conversion from 'size_t' to 'unsigned int', possible loss of data
-#  -wd4266: 'void ir_visitor::visit(ir_rvalue *)' : no override available for virtual member function from base 'ir_visitor'; function is hidden
-#  -wd4287: unsigned/negative constant mismatch
-#  -wd4291: 'void *exec_node::operator new(size_t,void *)' : no matching operator delete found; memory will not be freed if initialization throws an exception
-#  -wd4305: truncation from 'double' to 'const float'
-#  -wd4306: 'type cast' : conversion from 'int' to 'void *' of greater size
-#  -wd4310: cast truncates constant value
-#  -wd4311: 'type cast' : pointer truncation from 'void *' to 'unsigned long'
-#  -wd4351: new behavior: elements of array '_mesa_glsl_parse_state::cs_input_local_size' will be default initialized
-#  -wd4355: 'this' : used in base member initializer list
-#  -wd4388: '==' : signed/unsigned mismatch
-#  -wd4389: '==' : signed/unsigned mismatch
-#  -wd4640: 'ts' : construction of local static object is not thread-safe
-#  -wd4668: '__STDC_VERSION__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
-#  -wd4700: uninitialized local variable 'tmp' used
-#  -wd4701: potentially uninitialized local variable 'query' used
-#  -wd4702: unreachable code
-#  -wd4703: vcc120: potentially uninitialized local pointer variable 'gen_func' used
-#  -wd4756: overflow in constant arithmetic
-#  -wd4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-#  -wd4805: '|=' : unsafe mix of type 'GLboolean' and type 'bool' in operation
-#  -wd4918: 'y' : invalid character in pragma optimization list
-VBOX_MESA3D_VCC_DISABLED_WARNINGS          := \
-	-wd4005 -wd4018 -wd4054 -wd4057 -wd4090 -wd4098 -wd4099 -wd4100 -wd4101 -wd4130 -wd4132 -wd4146 \
-	-wd4152 -wd4189 -wd4200 -wd4204 -wd4206 -wd4211 -wd4221 -wd4245 -wd4255 -wd4258 -wd4265 -wd4267 -wd4266 \
-	-wd4287 -wd4291 -wd4305 -wd4306 -wd4310 -wd4311 -wd4351 -wd4355 -wd4388 -wd4389 -wd4640 -wd4668 -wd4700 \
-	-wd4701 -wd4702 -wd4703 -wd4756 -wd4800 -wd4805 -wd4918
-# -wd4458: declaration of 'array' hides class member
-# -wd4477: 'fprintf' : format string '%u' requires an argument of type 'unsigned int', but variadic argument 1 has type 'LONGLONG'
-# -wd4774: 'printf' : format string expected in argument 1 is not a string literal
-# -wd4456: declaration of 'pos_dst' hides previous local declaration
-# -wd4777: '_snprintf' : format string '%u' requires an argument of type 'unsigned int', but variadic argument 1 has type 'const DWORD'
-# -wd4459: declaration of 'stw_dev' hides global declaration
-# -wd4457: declaration of 'usage' hides function parameter
-VBOX_MESA3D_VCC_DISABLED_WARNINGS          += \
-	-wd4458 -wd4477 -wd4774 -wd4456 -wd4777 -wd4459 -wd4457
-# -wd4254: '=': conversion from 'unsigned int':'3' to 'unsigned int':'2', possible loss of data
-# -wd5039: pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception
-# -wd5204: class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly
-# -wd5219: implicit conversion from 'int' to 'float', possible loss of data
-VBOX_MESA3D_VCC_DISABLED_WARNINGS          += \
-	-wd4254 -wd5039 -wd5204 -wd5219
-
-TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS.win   += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
-TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS.win += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
+ # Do not treat warnings as errors, because Mesa code produces too many warnings with MSC.
+ TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS       = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS))
+ TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS     = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CXXFLAGS))
+ #  -wd4005: vcc120: '__useHeader' : macro redefinition
+ #  -wd4018: signed/unsigned mismatch
+ #  -wd4054: 'type cast' : from function pointer to data pointer 'void *'
+ #  -wd4057: 'function' : 'int *' differs in indirection to slightly different base types from 'uint32_t *'
+ #  -wd4090: 'function' : different 'const' qualifiers
+ #  -wd4098: 'void' function returning a value
+ #  -wd4099: 'st_src_reg' : type name first seen using 'class' now seen using 'struct'
+ #  -wd4100: unreferenced formal parameter
+ #  -wd4101: unreferenced local variable
+ #  -wd4130: '==' : logical operation on address of string constant
+ #  -wd4132: 'color' : const object should be initialized
+ #  -wd4146: unary minus operator applied to unsigned type, result still unsigned
+ #  -wd4152: nonstandard extension, function/data pointer conversion in expression
+ #  -wd4189: 'signo' : local variable is initialized but not referenced
+ #  -wd4200: nonstandard extension used : zero-sized array in struct/union
+ #  -wd4204: nonstandard extension used : non-constant aggregate initializer
+ #  -wd4206: nonstandard extension used : translation unit is empty
+ #  -wd4211: nonstandard extension used : redefined extern to static
+ #  -wd4221: nonstandard extension used : 'tokens' : cannot be initialized using address of automatic variable 'tokens'
+ #  -wd4245: '=' : conversion from 'int' to 'unsigned int', signed/unsigned mismatch
+ #  -wd4255: no function prototype given
+ #  -wd4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used
+ #  -wd4265: 'ir_variable_refcount_visitor' : class has virtual functions, but destructor is not virtual
+ #  -wd4267: '=' : conversion from 'size_t' to 'unsigned int', possible loss of data
+ #  -wd4266: 'void ir_visitor::visit(ir_rvalue *)' : no override available for virtual member function from base 'ir_visitor'; function is hidden
+ #  -wd4287: unsigned/negative constant mismatch
+ #  -wd4291: 'void *exec_node::operator new(size_t,void *)' : no matching operator delete found; memory will not be freed if initialization throws an exception
+ #  -wd4305: truncation from 'double' to 'const float'
+ #  -wd4306: 'type cast' : conversion from 'int' to 'void *' of greater size
+ #  -wd4310: cast truncates constant value
+ #  -wd4311: 'type cast' : pointer truncation from 'void *' to 'unsigned long'
+ #  -wd4351: new behavior: elements of array '_mesa_glsl_parse_state::cs_input_local_size' will be default initialized
+ #  -wd4355: 'this' : used in base member initializer list
+ #  -wd4388: '==' : signed/unsigned mismatch
+ #  -wd4389: '==' : signed/unsigned mismatch
+ #  -wd4640: 'ts' : construction of local static object is not thread-safe
+ #  -wd4668: '__STDC_VERSION__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
+ #  -wd4700: uninitialized local variable 'tmp' used
+ #  -wd4701: potentially uninitialized local variable 'query' used
+ #  -wd4702: unreachable code
+ #  -wd4703: vcc120: potentially uninitialized local pointer variable 'gen_func' used
+ #  -wd4756: overflow in constant arithmetic
+ #  -wd4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
+ #  -wd4805: '|=' : unsafe mix of type 'GLboolean' and type 'bool' in operation
+ #  -wd4918: 'y' : invalid character in pragma optimization list
+ VBOX_MESA3D_VCC_DISABLED_WARNINGS         := \
+ 	-wd4005 -wd4018 -wd4054 -wd4057 -wd4090 -wd4098 -wd4099 -wd4100 -wd4101 -wd4130 -wd4132 -wd4146 \
+ 	-wd4152 -wd4189 -wd4200 -wd4204 -wd4206 -wd4211 -wd4221 -wd4245 -wd4255 -wd4258 -wd4265 -wd4267 -wd4266 \
+ 	-wd4287 -wd4291 -wd4305 -wd4306 -wd4310 -wd4311 -wd4351 -wd4355 -wd4388 -wd4389 -wd4640 -wd4668 -wd4700 \
+ 	-wd4701 -wd4702 -wd4703 -wd4756 -wd4800 -wd4805 -wd4918
+ # -wd4458: declaration of 'array' hides class member
+ # -wd4477: 'fprintf' : format string '%u' requires an argument of type 'unsigned int', but variadic argument 1 has type 'LONGLONG'
+ # -wd4774: 'printf' : format string expected in argument 1 is not a string literal
+ # -wd4456: declaration of 'pos_dst' hides previous local declaration
+ # -wd4777: '_snprintf' : format string '%u' requires an argument of type 'unsigned int', but variadic argument 1 has type 'const DWORD'
+ # -wd4459: declaration of 'stw_dev' hides global declaration
+ # -wd4457: declaration of 'usage' hides function parameter
+ VBOX_MESA3D_VCC_DISABLED_WARNINGS         += \
+ 	-wd4458 -wd4477 -wd4774 -wd4456 -wd4777 -wd4459 -wd4457
+ # -wd4254: '=': conversion from 'unsigned int':'3' to 'unsigned int':'2', possible loss of data
+ # -wd5039: pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception
+ # -wd5204: class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly
+ # -wd5219: implicit conversion from 'int' to 'float', possible loss of data
+ VBOX_MESA3D_VCC_DISABLED_WARNINGS         += \
+ 	-wd4254 -wd5039 -wd5204 -wd5219
+
+ TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS.win  += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
+ TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS.win += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
 endif
 TEMPLATE_VBoxMesa3DGuestR3Lib_INCS          = \
 	include \
@@ -149,19 +149,19 @@ TEMPLATE_VBoxMesa3DGuestR3Lib_INCS          = \
 	$(VBOX_MESA)/src/gallium/auxiliary \
 	$(VBOX_MESA)/src/gallium/state_trackers/wgl
 ifdef VBOX_WITH_NOCRT_STATIC
-TEMPLATE_VBoxMesa3DGuestR3Lib_INCS         += \
-	$(TEMPLATE_VBoxMesa3DGuestR3Dll_INCS)
+ TEMPLATE_VBoxMesa3DGuestR3Lib_INCS        += \
+ 	$(TEMPLATE_VBoxMesa3DGuestR3Dll_INCS)
 endif
 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
-TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS          = \
-	$(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \
-	PACKAGE_VERSION="$(VBOX_MESA)" \
-	PACKAGE_BUGREPORT="$(VBOX_MESA)"
+ TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS         = \
+ 	$(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \
+ 	PACKAGE_VERSION="$(VBOX_MESA)" \
+ 	PACKAGE_BUGREPORT="$(VBOX_MESA)"
 else
-TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS          = \
-	$(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \
-	PACKAGE_VERSION=\"$(VBOX_MESA)\" \
-	PACKAGE_BUGREPORT=\"$(VBOX_MESA)\"
+ TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS         = \
+ 	$(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \
+ 	PACKAGE_VERSION=\"$(VBOX_MESA)\" \
+ 	PACKAGE_BUGREPORT=\"$(VBOX_MESA)\"
 endif
 # For wgl, glapi and mesa
 TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS         += \
diff --git a/src/VBox/Additions/3D/win/VBoxICD/Makefile.kmk b/src/VBox/Additions/3D/win/VBoxICD/Makefile.kmk
index c0bd576d50b..28d45f985a2 100644
--- a/src/VBox/Additions/3D/win/VBoxICD/Makefile.kmk
+++ b/src/VBox/Additions/3D/win/VBoxICD/Makefile.kmk
@@ -37,8 +37,8 @@ VBoxICD_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
 # -wd4005: '__useHeader' : redefinition
 VBoxICD_CFLAGS  := -wd4005
 if "$(VBOX_NEWER_VCC_TOOL_STEM)" >= "VCC141"
-# -wd4255: 'PFND3DKMT_CHECKEXCLUSIVEOWNERSHIP': no function prototype given: converting '()' to '(void)'
-VBoxICD_CFLAGS  += -wd4255
+ # -wd4255: 'PFND3DKMT_CHECKEXCLUSIVEOWNERSHIP': no function prototype given: converting '()' to '(void)'
+ VBoxICD_CFLAGS += -wd4255
 endif
 
 VBoxICD_INCS     = \
@@ -68,8 +68,8 @@ $$(VBoxICD_0_OUTDIR)/pfns.c: \
 	$(QUIET)$(VBOX_BLD_PYTHON) $< $(VBOX_GL_ICD_DEF_FILE) $@
 
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
-VBoxICD_INSTTYPE       = none
-VBoxICD_DEBUG_INSTTYPE = both
+ VBoxICD_INSTTYPE      = none
+ VBoxICD_DEBUG_INSTTYPE = both
 endif
 
 #
diff --git a/src/VBox/Additions/Makefile.kmk b/src/VBox/Additions/Makefile.kmk
index d2020e2bf4d..6c8c4179d3b 100644
--- a/src/VBox/Additions/Makefile.kmk
+++ b/src/VBox/Additions/Makefile.kmk
@@ -115,28 +115,28 @@ ifeq ($(KBUILD_TARGET),win)
 	$(call MSG_GENERATE,VBoxGuest-inf,$@,$<)
 	$(call VBOX_EDIT_INF_FN,$<,$@)
 
-if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
+ if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
   VBoxGuest-inf_SOURCES += \
- 	$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat \
- 	$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat=>VBoxGuest-PreW10.cat \
- 	$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
- 	$(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
- 	$(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe
+  	$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat \
+  	$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat=>VBoxGuest-PreW10.cat \
+  	$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
+  	$(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
+  	$(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe
 
-  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys:   $$(VBoxGuest_1_TARGET) | $$(dir $$@)
+  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys: $$(VBoxGuest_1_TARGET) | $$(dir $$@)
 	$(INSTALL) -m 644 $< $(@D)
 
   $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe: $$(VBoxControl_1_TARGET) | $$(dir $$@)
 	$(INSTALL) -m 755 $< $(@D)
 
-  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe:    $$(VBoxTray_1_TARGET) | $$(dir $$@)
+  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe: $$(VBoxTray_1_TARGET) | $$(dir $$@)
 	$(INSTALL) -m 755 $< $(@D)
 
   $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat: \
- 		$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf \
- 		$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
- 		$(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
- 		$(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe
+  		$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf \
+  		$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
+  		$(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
+  		$(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe
 	$(call MSG_TOOL,Inf2Cat,VBoxGuest-inf,$@,$<)
 	$(call VBOX_MAKE_CAT_FN, $(@D),$@)
  endif # signing
@@ -162,22 +162,22 @@ include $(FILE_KBUILD_SUB_FOOTER)
 ## @todo Create .pkg files not run files. The build server shall create a combined packaged, goverend by
 # the VBOX_WITH_COMBINED_DARWIN_GUEST_PACKAGE macro.
 ifdef VBOX_WITH_ADDITIONS_ISO.darwin.x86
-VBOX_PATH_ADDITIONS.darwin.x86 = $(PATH_OUT_BASE)/darwin.x86/$(KBUILD_TYPE)/dist/additions
-GUESTADDITIONS_FILESPEC.darwin.x86 = \
-	VBoxDarwinAdditionsLegacy.pkg=$(VBOX_PATH_ADDITIONS.darwin.x86)/VBoxGuestAdditions.pkg
+ VBOX_PATH_ADDITIONS.darwin.x86 = $(PATH_OUT_BASE)/darwin.x86/$(KBUILD_TYPE)/dist/additions
+ GUESTADDITIONS_FILESPEC.darwin.x86 = \
+ 	VBoxDarwinAdditionsLegacy.pkg=$(VBOX_PATH_ADDITIONS.darwin.x86)/VBoxGuestAdditions.pkg
  ifndef VBOX_WITH_ADDITIONS_ISO.darwin.amd64
-GUESTADDITIONS_FILESPEC.darwin.x86 += \
-	VBoxDarwinAdditionsUninstall.tool=$(VBOX_PATH_ADDITIONS.darwin.x86)/VBoxDarwinAdditionsUninstall.tool
+  GUESTADDITIONS_FILESPEC.darwin.x86 += \
+  	VBoxDarwinAdditionsUninstall.tool=$(VBOX_PATH_ADDITIONS.darwin.x86)/VBoxDarwinAdditionsUninstall.tool
  endif
 endif
 
 ifdef VBOX_WITH_ADDITIONS_ISO.darwin.amd64
-VBOX_PATH_ADDITIONS.darwin.amd64 = $(PATH_OUT_BASE)/darwin.amd64/$(KBUILD_TYPE)/dist/additions
-GUESTADDITIONS_FILESPEC.darwin.amd64 = \
-	VBoxDarwinAdditions.pkg=$(VBOX_PATH_ADDITIONS.darwin.amd64)/VBoxGuestAdditions.pkg
+ VBOX_PATH_ADDITIONS.darwin.amd64 = $(PATH_OUT_BASE)/darwin.amd64/$(KBUILD_TYPE)/dist/additions
+ GUESTADDITIONS_FILESPEC.darwin.amd64 = \
+ 	VBoxDarwinAdditions.pkg=$(VBOX_PATH_ADDITIONS.darwin.amd64)/VBoxGuestAdditions.pkg
  ifndef VBOX_WITH_ADDITIONS_ISO.darwin.x86
-GUESTADDITIONS_FILESPEC.darwin.amd64 += \
-	VBoxDarwinAdditionsUninstall.tool=$(VBOX_PATH_ADDITIONS.darwin.amd64)/VBoxDarwinAdditionsUninstall.tool
+  GUESTADDITIONS_FILESPEC.darwin.amd64 += \
+  	VBoxDarwinAdditionsUninstall.tool=$(VBOX_PATH_ADDITIONS.darwin.amd64)/VBoxDarwinAdditionsUninstall.tool
  endif
 endif
 
@@ -185,79 +185,79 @@ endif
 ifdef VBOX_WITH_ADDITIONS_ISO.freebsd.amd64
  VBOX_PATH_ADDITIONS.freebsd.amd64 = $(PATH_OUT_BASE)/freebsd.amd64/$(KBUILD_TYPE)/bin/additions
  GUESTADDITIONS_FILESPEC.freebsd.amd64 = \
-	VBoxFreeBSDAdditions-amd64.tbz=$(VBOX_PATH_ADDITIONS.freebsd.amd64)/VBoxFreeBSDAdditions.tbz
+ 	VBoxFreeBSDAdditions-amd64.tbz=$(VBOX_PATH_ADDITIONS.freebsd.amd64)/VBoxFreeBSDAdditions.tbz
 endif
 ifdef VBOX_WITH_ADDITIONS_ISO.freebsd.x86
  VBOX_PATH_ADDITIONS.freebsd.x86 = $(PATH_OUT_BASE)/freebsd.x86/$(KBUILD_TYPE)/bin/additions
  GUESTADDITIONS_FILESPEC.freebsd.x86 = \
-	VBoxFreeBSDAdditions-x86.tbz=$(VBOX_PATH_ADDITIONS.freebsd.x86)/VBoxFreeBSDAdditions.tbz
+ 	VBoxFreeBSDAdditions-x86.tbz=$(VBOX_PATH_ADDITIONS.freebsd.x86)/VBoxFreeBSDAdditions.tbz
 endif
 
 # GNU/Linux
 ifdef VBOX_WITH_ADDITIONS_ISO.linux.amd64
  VBOX_PATH_ADDITIONS.linux.amd64 = $(PATH_OUT_BASE)/linux.amd64/$(KBUILD_TYPE)/bin/additions
  ifdef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE
-  VBOX_LNX_ADD_AMD64_RUN_PKG=VBoxLinuxAdditions.run
+  VBOX_LNX_ADD_AMD64_RUN_PKG = VBoxLinuxAdditions.run
  else
-  VBOX_LNX_ADD_AMD64_RUN_PKG=VBoxLinuxAdditions-amd64.run
+  VBOX_LNX_ADD_AMD64_RUN_PKG = VBoxLinuxAdditions-amd64.run
  endif
  GUESTADDITIONS_FILESPEC.linux.amd64 = \
-	$(VBOX_LNX_ADD_AMD64_RUN_PKG)=$(VBOX_PATH_ADDITIONS.linux.amd64)/VBoxLinuxAdditions.run
+ 	$(VBOX_LNX_ADD_AMD64_RUN_PKG)=$(VBOX_PATH_ADDITIONS.linux.amd64)/VBoxLinuxAdditions.run
 endif
 ifdef VBOX_WITH_ADDITIONS_ISO.linux.x86
  VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions
-## @todo 64-bit additions: rename this package, update docs (?) and tests (?). create wrapper? create gnome/kde autorun app (xplatform) ?
+ ## @todo 64-bit additions: rename this package, update docs (?) and tests (?). create wrapper? create gnome/kde autorun app (xplatform) ?
  ifdef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE
-  VBOX_LNX_ADD_X86_RUN_PKG=VBoxLinuxAdditions.run
+  VBOX_LNX_ADD_X86_RUN_PKG = VBoxLinuxAdditions.run
  else
-  VBOX_LNX_ADD_X86_RUN_PKG=VBoxLinuxAdditions-x86.run
+  VBOX_LNX_ADD_X86_RUN_PKG = VBoxLinuxAdditions-x86.run
  endif
  GUESTADDITIONS_FILESPEC.linux.x86 = \
-	$(VBOX_LNX_ADD_X86_RUN_PKG)=$(VBOX_PATH_ADDITIONS.linux.x86)/VBoxLinuxAdditions.run \
-	runasroot.sh=$(VBOX_PATH_ADDITIONS.linux.x86)/runasroot.sh \
-	autorun.sh=$(VBOX_PATH_ADDITIONS.linux.x86)/autorun.sh
+ 	$(VBOX_LNX_ADD_X86_RUN_PKG)=$(VBOX_PATH_ADDITIONS.linux.x86)/VBoxLinuxAdditions.run \
+ 	runasroot.sh=$(VBOX_PATH_ADDITIONS.linux.x86)/runasroot.sh \
+ 	autorun.sh=$(VBOX_PATH_ADDITIONS.linux.x86)/autorun.sh
 endif
 
 # IBM OS/2
 ifdef VBOX_WITH_ADDITIONS_ISO.os2.x86
  VBOX_PATH_ADDITIONS.os2.x86 = $(PATH_OUT_BASE)/os2.x86/$(KBUILD_TYPE)/bin/additions
  GUESTADDITIONS_FILESPEC.os2.x86 = \
-	OS2/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxGuest.sys \
-	OS2/VBoxSF.ifs=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxSF.ifs\
-	OS2/VBoxService.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxService.exe \
-	OS2/VBoxControl.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxControl.exe \
-	OS2/VBoxReplaceDll.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxReplaceDll.exe \
-	OS2/VBoxOs2AdditionsInstall.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxOs2AdditionsInstall.exe \
-	OS2/libc06.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc06.dll \
-	OS2/libc061.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc061.dll \
-	OS2/libc062.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc062.dll \
-	OS2/libc063.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc063.dll \
-	OS2/libc064.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc064.dll \
-	OS2/libc065.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc065.dll \
-	OS2/libc066.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc066.dll \
-	OS2/readme.txt=$(VBOX_PATH_ADDITIONS.os2.x86)/readme.txt \
-       \
-	OS2/gengradd.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/gengradd.dll \
-	OS2/VBoxMouse.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/vboxmouse.sys
+ 	OS2/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxGuest.sys \
+ 	OS2/VBoxSF.ifs=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxSF.ifs \
+ 	OS2/VBoxService.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxService.exe \
+ 	OS2/VBoxControl.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxControl.exe \
+ 	OS2/VBoxReplaceDll.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxReplaceDll.exe \
+ 	OS2/VBoxOs2AdditionsInstall.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxOs2AdditionsInstall.exe \
+ 	OS2/libc06.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc06.dll \
+ 	OS2/libc061.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc061.dll \
+ 	OS2/libc062.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc062.dll \
+ 	OS2/libc063.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc063.dll \
+ 	OS2/libc064.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc064.dll \
+ 	OS2/libc065.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc065.dll \
+ 	OS2/libc066.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/libc066.dll \
+ 	OS2/readme.txt=$(VBOX_PATH_ADDITIONS.os2.x86)/readme.txt \
+ 	\
+ 	OS2/gengradd.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/gengradd.dll \
+ 	OS2/VBoxMouse.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/vboxmouse.sys
 endif
 
 # Oracle Solaris.
 ifdef VBOX_WITH_ADDITIONS_ISO.solaris.amd64
  VBOX_PATH_ADDITIONS.solaris.amd64 = $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions
  GUESTADDITIONS_FILESPEC.solaris.amd64 = \
-	VBoxSolarisAdditions-amd64.pkg=$(VBOX_PATH_ADDITIONS.solaris.amd64)/VBoxSolarisAdditions.pkg
+ 	VBoxSolarisAdditions-amd64.pkg=$(VBOX_PATH_ADDITIONS.solaris.amd64)/VBoxSolarisAdditions.pkg
 endif
 ifdef VBOX_WITH_ADDITIONS_ISO.solaris.x86
  VBOX_PATH_ADDITIONS.solaris.x86 = $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions
  GUESTADDITIONS_FILESPEC.solaris.x86 = \
-	VBoxSolarisAdditions-x86.pkg=$(VBOX_PATH_ADDITIONS.solaris.x86)/VBoxSolarisAdditions.pkg
+ 	VBoxSolarisAdditions-x86.pkg=$(VBOX_PATH_ADDITIONS.solaris.x86)/VBoxSolarisAdditions.pkg
 endif
 ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE
  # Build combined 32bit and 64bit solaris additions, not just a single arch.
  # This assumes that the 32bit build directory contains the combined additions
  # for 32bit and 64bit solaris. This just modifies variables set above.
  GUESTADDITIONS_FILESPEC.solaris.x86 = \
-	VBoxSolarisAdditions.pkg=$(VBOX_PATH_ADDITIONS.solaris.x86)/VBoxSolarisAdditions.pkg
+ 	VBoxSolarisAdditions.pkg=$(VBOX_PATH_ADDITIONS.solaris.x86)/VBoxSolarisAdditions.pkg
  GUESTADDITIONS_FILESPEC.solaris.amd64 =
 endif
 
@@ -266,10 +266,10 @@ ifdef VBOX_WITH_ADDITIONS_ISO.win.amd64
  VBOX_PATH_ADDITIONS.win.amd64 = $(PATH_OUT_BASE)/win.amd64/$(KBUILD_TYPE)/bin/additions
  VBOX_PATH_ADDITIONS.win = $(VBOX_PATH_ADDITIONS.win.amd64)
  GUESTADDITIONS_FILESPEC.win.amd64 = \
-	VBoxWindowsAdditions-amd64.exe=$(VBOX_PATH_ADDITIONS.win.amd64)/VBoxWindowsAdditions-amd64.exe
+ 	VBoxWindowsAdditions-amd64.exe=$(VBOX_PATH_ADDITIONS.win.amd64)/VBoxWindowsAdditions-amd64.exe
  ifndef VBOX_WITH_ADDITIONS_ISO.win.x86
   GUESTADDITIONS_FILESPEC.win.amd64 += \
-	cert/VBoxCertUtil.exe=$(VBOX_PATH_ADDITIONS.win.amd64)/VBoxCertUtil.exe
+  	cert/VBoxCertUtil.exe=$(VBOX_PATH_ADDITIONS.win.amd64)/VBoxCertUtil.exe
  endif
 endif
 
@@ -277,16 +277,16 @@ ifdef VBOX_WITH_ADDITIONS_ISO.win.x86
  VBOX_PATH_ADDITIONS.win.x86 = $(PATH_OUT_BASE)/win.x86/$(KBUILD_TYPE)/bin/additions
  VBOX_PATH_ADDITIONS.win = $(VBOX_PATH_ADDITIONS.win.x86)
  GUESTADDITIONS_FILESPEC.win.x86 = \
-	VBoxWindowsAdditions-x86.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxWindowsAdditions-x86.exe \
-	VBoxWindowsAdditions.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxWindowsAdditions.exe \
-	AUTORUN.INF=$(VBOX_PATH_ADDITIONS_SRC)/WINNT/Installer/ISO/AUTORUN.INF \
-	cert/VBoxCertUtil.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxCertUtil.exe \
-	NT3x/Readme.txt=$(VBOX_PATH_ADDITIONS_SRC)/WINNT/Installer/ISO/NT3xReadme.txt \
-	NT3x/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxGuest.sys \
-	NT3x/VBoxMouseNT.sys=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxMouseNT.sys \
-	NT3x/VBoxService.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxService.exe \
-	NT3x/VBoxControl.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxControl.exe \
-	NT3x/VBoxAddInstallNt3x.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxAddInstallNt3x.exe
+ 	VBoxWindowsAdditions-x86.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxWindowsAdditions-x86.exe \
+ 	VBoxWindowsAdditions.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxWindowsAdditions.exe \
+ 	AUTORUN.INF=$(VBOX_PATH_ADDITIONS_SRC)/WINNT/Installer/ISO/AUTORUN.INF \
+ 	cert/VBoxCertUtil.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxCertUtil.exe \
+ 	NT3x/Readme.txt=$(VBOX_PATH_ADDITIONS_SRC)/WINNT/Installer/ISO/NT3xReadme.txt \
+ 	NT3x/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxGuest.sys \
+ 	NT3x/VBoxMouseNT.sys=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxMouseNT.sys \
+ 	NT3x/VBoxService.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxService.exe \
+ 	NT3x/VBoxControl.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxControl.exe \
+ 	NT3x/VBoxAddInstallNt3x.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxAddInstallNt3x.exe
 endif # win.x86
 
 if defined(VBOX_WITH_ADDITIONS_ISO.win.amd64) || defined(VBOX_WITH_ADDITIONS_ISO.win.x86)
@@ -327,7 +327,7 @@ ifdef VBOX_WITH_ADDITIONS_ISO.haiku.x86
  VBOX_PATH_ADDITIONS.haiku.x86 = $(PATH_OUT_BASE)/haiku.x86/$(KBUILD_TYPE)/bin/additions
  # or bfs?
  GUESTADDITIONS_FILESPEC.haiku.x86 = \
-	VBoxHaikuAdditions-x86.run=$(VBOX_PATH_ADDITIONS.haiku.x86)/VBoxHaikuAdditions-x86.run
+ 	VBoxHaikuAdditions-x86.run=$(VBOX_PATH_ADDITIONS.haiku.x86)/VBoxHaikuAdditions-x86.run
 endif
 
 # For the iso rule.
@@ -350,11 +350,11 @@ GUESTADDITIONS_FILESPEC_ALL = \
 # Build the Guest Additions ISO image.
 #
 ifndef VBOX_WITHOUT_ADDITIONS_ISO
-$(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso: \
-		$(filter-out %=deleteme=,$(subst =,=deleteme= , $(GUESTADDITIONS_FILESPEC_ALL))) \
-		$(VBOX_SVN_REV_KMK) \
-		$(VBOX_PATH_ADDITIONS_SRC)/Makefile.kmk \
-		| $(if-expr defined(VBOX_USE_RTISOMAKER),$(VBOX_RTISOMAKER),)
+ $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso: \
+ 		$(filter-out %=deleteme=,$(subst =,=deleteme= , $(GUESTADDITIONS_FILESPEC_ALL))) \
+ 		$(VBOX_SVN_REV_KMK) \
+ 		$(VBOX_PATH_ADDITIONS_SRC)/Makefile.kmk \
+ 		| $(if-expr defined(VBOX_USE_RTISOMAKER),$(VBOX_RTISOMAKER),)
 	$(call MSG_TOOL,RTIsoMaker,,$@)
 	$(QUIET)$(MKDIR) -p $(@D)
 	$(VBOX_RTISOMAKER) \
@@ -371,14 +371,14 @@ $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso: \
 		--name-setup=joliet \
 		--volume-id="VBox_GAs_$(VBOX_VERSION_STRING_RAW)"
 
-$(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.zip: $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso
+ $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.zip: $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso
 	$(call MSG_L1,Zipping image $@)
 	$(QUIET)$(RM) -f $@
 	$(QUIET)$(REDIRECT) -C $(VBOX_PATH_ADDITIONS_ISO) -- $(VBOX_ZIP) -9 $@ $(notdir $^)
 
-# Alias for creating the iso.
-.PHONY: additions-iso
-additions-iso: $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso
+ # Alias for creating the iso.
+ .PHONY: additions-iso
+ additions-iso: $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso
 
 endif
 
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
index 0660b4188b7..e16e15ad578 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
@@ -56,10 +56,10 @@ if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
  	$(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \
  	$(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll
 
-$(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@)
+ $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@)
 	$(INSTALL) -m 644 $< $(@D)
 
-$(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll: $$(VBoxDisp_1_TARGET) | $$(dir $$@)
+ $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll: $$(VBoxDisp_1_TARGET) | $$(dir $$@)
 	$(INSTALL) -m 644 $< $(@D)
 
  $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat: \
@@ -92,7 +92,7 @@ ifdef VBOX_WITH_WDDM
  VBOXWDDM_EDIT_INF_MESA3D_FN_ARG = $(if $(VBOX_WITH_MESA3D),-e 's/^;mesa3d  *//', -e '/^;mesa3d /d')
 
  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf: \
-		$(PATH_SUB_CURRENT)/mp/wddm/VBoxWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+ 		$(PATH_SUB_CURRENT)/mp/wddm/VBoxWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
 	$(call MSG_GENERATE,VBoxWddm-inf,$@,$<)
 	$(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_DISPDX_FN_ARG) $(VBOXWDDM_EDIT_INF_MESA3D_FN_ARG))
 
@@ -111,9 +111,9 @@ ifdef VBOX_WITH_WDDM
 
   ifdef VBOX_WITH_WDDM_DX
    VBoxWddm-inf_SOURCES += \
-       $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll
+   	$(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll
    VBoxWddm-inf_SOURCES.amd64 += \
-       $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll
+   	$(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll
   endif
 
   ifdef VBOX_WITH_MESA3D
@@ -173,20 +173,20 @@ ifdef VBOX_WITH_WDDM
   endif
 
   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.cat: \
-		$(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf \
-		$(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys \
-		$(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D.dll, ) \
-		$(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll, ), ) \
-		$(if $(VBOX_WITH_WDDM_DX), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll, ) \
-		$(if $(VBOX_WITH_WDDM_DX), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll, ), ) \
-		$(if $(VBOX_WITH_MESA3D), \
-			$(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll \
-			$(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll \
-			$(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll \
-			$(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
-				$(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine-x86.dll \
-				$(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll \
-				$(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll, ), )
+  		$(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf \
+  		$(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys \
+  		$(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D.dll, ) \
+  		$(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll, ), ) \
+  		$(if $(VBOX_WITH_WDDM_DX), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll, ) \
+  		$(if $(VBOX_WITH_WDDM_DX), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll, ), ) \
+  		$(if $(VBOX_WITH_MESA3D), \
+  		$(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll \
+  		$(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll \
+  		$(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll \
+  		$(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
+  		$(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine-x86.dll \
+  		$(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll \
+  		$(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll, ), )
 	$(call MSG_TOOL,Inf2Cat,VBoxWddm-inf,$@,$<)
 	$(call VBOX_MAKE_CAT_FN, $(@D),$@)
  endif # signing
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
index 9da531c06ef..324372cc304 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
@@ -109,173 +109,173 @@ if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
 endif
 
 ifdef VBOX_WITH_WDDM
-#
-# VBoxDispD3D - Windows Guest Additions WDDM R3 Display Driver
-#
-DLLS += VBoxDispD3D
-VBoxDispD3D_TEMPLATE = VBoxGuestR3DllMinVista
-VBoxDispD3D_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
-VBoxDispD3D_DEFS     = UNICODE _UNICODE VBOX_WITH_WDDM VBOXWDDMDISP LOG_TO_BACKDOOR LOG_TO_BACKDOOR_DRV VBOX_WITH_HGCM
-ifdef DEBUG_misha
-VBoxDispD3D_DEFS    += LOG_ENABLED
-endif
-ifdef VBOXWDDM_WITH_VBVA
-VBoxDispD3D_DEFS    += VBOXWDDM_WITH_VBVA
-endif
-ifdef VBOX_WITH_VIDEOHWACCEL
- VBoxDispD3D_DEFS   += VBOX_WITH_VIDEOHWACCEL
-endif
-# Avoid "src\VBox\Additions\3D\mesa\mesa-21.3.8\include\c99_compat.h(99): warning C4668: '__STDC_VERSION__'
-# is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'"
-VBoxDispD3D_DEFS    += __STDC_VERSION__=0
-VBoxDispD3D_INCS     = \
-	../../../include \
-	.. \
-	$(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
-	$(VBOX_GRAPHICS_INCS)
-VBoxDispD3D_SOURCES  = \
-	wddm/VBoxDispD3D.cpp \
-	wddm/VBoxDispD3DIf.cpp \
-	wddm/VBoxDispDbg.cpp \
-	wddm/VBoxD3DIf.cpp \
-	wddm/VBoxDispD3D.rc \
-	wddm/VBoxDispD3D.def
-VBoxDispD3D_LIBS     = \
-	$(VBOX_LIB_IPRT_GUEST_R3) \
-	$(VBOX_LIB_VBGL_R3) \
-	Psapi.lib \
-	$(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
-	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt$(VBOX_SUFF_LIB)
+ #
+ # VBoxDispD3D - Windows Guest Additions WDDM R3 Display Driver
+ #
+ DLLS += VBoxDispD3D
+ VBoxDispD3D_TEMPLATE = VBoxGuestR3DllMinVista
+ VBoxDispD3D_SDKS    = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
+ VBoxDispD3D_DEFS    = UNICODE _UNICODE VBOX_WITH_WDDM VBOXWDDMDISP LOG_TO_BACKDOOR LOG_TO_BACKDOOR_DRV VBOX_WITH_HGCM
+ ifdef DEBUG_misha
+  VBoxDispD3D_DEFS  += LOG_ENABLED
+ endif
+ ifdef VBOXWDDM_WITH_VBVA
+  VBoxDispD3D_DEFS  += VBOXWDDM_WITH_VBVA
+ endif
+ ifdef VBOX_WITH_VIDEOHWACCEL
+  VBoxDispD3D_DEFS  += VBOX_WITH_VIDEOHWACCEL
+ endif
+ # Avoid "src\VBox\Additions\3D\mesa\mesa-21.3.8\include\c99_compat.h(99): warning C4668: '__STDC_VERSION__'
+ # is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'"
+ VBoxDispD3D_DEFS   += __STDC_VERSION__=0
+ VBoxDispD3D_INCS    = \
+ 	../../../include \
+ 	.. \
+ 	$(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
+ 	$(VBOX_GRAPHICS_INCS)
+ VBoxDispD3D_SOURCES = \
+ 	wddm/VBoxDispD3D.cpp \
+ 	wddm/VBoxDispD3DIf.cpp \
+ 	wddm/VBoxDispDbg.cpp \
+ 	wddm/VBoxD3DIf.cpp \
+ 	wddm/VBoxDispD3D.rc \
+ 	wddm/VBoxDispD3D.def
+ VBoxDispD3D_LIBS    = \
+ 	$(VBOX_LIB_IPRT_GUEST_R3) \
+ 	$(VBOX_LIB_VBGL_R3) \
+ 	Psapi.lib \
+ 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
+ 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt$(VBOX_SUFF_LIB)
 
-ifdef VBOX_WITH_VMSVGA
-VBoxDispD3D_DEFS     += VBOX_WITH_VMSVGA
-VBoxDispD3D_INCS     += \
-	$(PATH_ROOT)/src/VBox/Additions/3D/win/include \
-	$(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include
-endif
+ ifdef VBOX_WITH_VMSVGA
+  VBoxDispD3D_DEFS   += VBOX_WITH_VMSVGA
+  VBoxDispD3D_INCS   += \
+  	$(PATH_ROOT)/src/VBox/Additions/3D/win/include \
+  	$(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include
+ endif
 
-ifdef VBOX_WITH_MESA3D
-VBoxDispD3D_DEFS     += VBOX_WITH_MESA3D
-VBoxDispD3D_INCS     += \
-	$(VBOX_PATH_MESA)/src/gallium/include \
-	$(VBOX_PATH_MESA)/src \
-	$(VBOX_PATH_MESA)/include/c99 \
-	$(VBOX_PATH_MESA)/include
-VBoxDispD3D_SOURCES  += \
-	wddm/gallium/GaDxva.cpp \
-	wddm/gallium/GaDrvEnvWddm.cpp \
-	wddm/gallium/GaWddm.cpp \
-	wddm/gallium/GaDdi.cpp \
-	wddm/gallium/Present.cpp \
-	wddm/gallium/VBoxGallium.cpp \
-	wddm/gallium/VBoxGaD3DDevice9Ex.cpp \
-	wddm/gallium/VBoxD3DAdapter9.c
+ ifdef VBOX_WITH_MESA3D
+  VBoxDispD3D_DEFS   += VBOX_WITH_MESA3D
+  VBoxDispD3D_INCS   += \
+  	$(VBOX_PATH_MESA)/src/gallium/include \
+  	$(VBOX_PATH_MESA)/src \
+  	$(VBOX_PATH_MESA)/include/c99 \
+  	$(VBOX_PATH_MESA)/include
+  VBoxDispD3D_SOURCES += \
+  	wddm/gallium/GaDxva.cpp \
+  	wddm/gallium/GaDrvEnvWddm.cpp \
+  	wddm/gallium/GaWddm.cpp \
+  	wddm/gallium/GaDdi.cpp \
+  	wddm/gallium/Present.cpp \
+  	wddm/gallium/VBoxGallium.cpp \
+  	wddm/gallium/VBoxGaD3DDevice9Ex.cpp \
+  	wddm/gallium/VBoxD3DAdapter9.c
 
- ifdef VBOX_WITH_VMSVGA3D_DX
-VBoxDispD3D_DEFS     += VBOX_WITH_VMSVGA3D_DX9
- endif
+  ifdef VBOX_WITH_VMSVGA3D_DX
+   VBoxDispD3D_DEFS  += VBOX_WITH_VMSVGA3D_DX9
+  endif
 
- ifdef VBOX_WITH_MESA3D_D3DTEST
-VBoxDispD3D_DEFS     += VBOX_WITH_MESA3D_D3DTEST
-VBoxDispD3D_SOURCES  += \
-	wddm/gallium/test/d3dhlp.cpp \
-	wddm/gallium/test/d3d9render.cpp \
-	wddm/gallium/GaDrvTest.cpp
+  ifdef VBOX_WITH_MESA3D_D3DTEST
+   VBoxDispD3D_DEFS  += VBOX_WITH_MESA3D_D3DTEST
+   VBoxDispD3D_SOURCES += \
+   	wddm/gallium/test/d3dhlp.cpp \
+   	wddm/gallium/test/d3d9render.cpp \
+   	wddm/gallium/GaDrvTest.cpp
+  endif
  endif
-endif
 
-#
-# 64-bit systems needs a 32-bit version of VBoxDispD3D.
-#
-DLLS.amd64 += VBoxDispD3D-x86
-VBoxDispD3D-x86_EXTENDS = VBoxDispD3D
-VBoxDispD3D-x86_BLD_TRG_ARCH = x86
-VBoxDispD3D-x86_LIBS = \
-	$(VBOX_LIB_IPRT_GUEST_R3_X86) \
-	$(VBOX_LIB_VBGL_R3_X86) \
-	Psapi.lib \
-	$(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
-	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB)
-VBoxDispD3D-x86_DEFS = $(VBoxDispD3D_DEFS) VBOX_WDDM_WOW64
+ #
+ # 64-bit systems needs a 32-bit version of VBoxDispD3D.
+ #
+ DLLS.amd64 += VBoxDispD3D-x86
+ VBoxDispD3D-x86_EXTENDS = VBoxDispD3D
+ VBoxDispD3D-x86_BLD_TRG_ARCH = x86
+ VBoxDispD3D-x86_LIBS = \
+ 	$(VBOX_LIB_IPRT_GUEST_R3_X86) \
+ 	$(VBOX_LIB_VBGL_R3_X86) \
+ 	Psapi.lib \
+ 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
+ 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB)
+ VBoxDispD3D-x86_DEFS = $(VBoxDispD3D_DEFS) VBOX_WDDM_WOW64
 
-#
-# VGPU10 driver VBoxDX
-#
+ #
+ # VGPU10 driver VBoxDX
+ #
  ifdef VBOX_WITH_VMSVGA3D_DX
-DLLS += VBoxDX
-VBoxDX_TEMPLATE = VBoxGuestR3DllMinVista
-VBoxDX_DEFS     = UNICODE _UNICODE VBOX_WITH_VMSVGA VBOX_WITH_VMSVGA3D_DX
-VBoxDX_DEFS    += D3D_UMD_INTERFACE_VERSION=D3D_UMD_INTERFACE_VERSION_WIN8
-VBoxDX_DEFS    += DXGKDDI_INTERFACE_VERSION=DXGKDDI_INTERFACE_VERSION_WIN8
-VBoxDX_INCS     = \
-	$(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
-	$(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/common/wddm \
-	$(PATH_ROOT)/src/VBox/Additions/3D/win/include \
-	$(PATH_ROOT)/src/VBox/Additions/3D/win/VBoxWddmUmHlp \
-	$(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include \
-	$(VBOX_GRAPHICS_INCS)
-VBoxDX_SOURCES  = \
-	wddm/dx/VBoxDXDDI.cpp \
-	wddm/dx/VBoxDX.cpp \
-	wddm/dx/VBoxDXCmd.cpp \
-	wddm/dx/VBoxDX.rc \
-	wddm/dx/VBoxDX.def
-VBoxDX_LIBS     = \
-	$(VBOX_LIB_IPRT_GUEST_R3) \
-	Psapi.lib \
-	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB)
+  DLLS += VBoxDX
+  VBoxDX_TEMPLATE = VBoxGuestR3DllMinVista
+  VBoxDX_DEFS   = UNICODE _UNICODE VBOX_WITH_VMSVGA VBOX_WITH_VMSVGA3D_DX
+  VBoxDX_DEFS  += D3D_UMD_INTERFACE_VERSION=D3D_UMD_INTERFACE_VERSION_WIN8
+  VBoxDX_DEFS  += DXGKDDI_INTERFACE_VERSION=DXGKDDI_INTERFACE_VERSION_WIN8
+  VBoxDX_INCS   = \
+  	$(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
+  	$(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/common/wddm \
+  	$(PATH_ROOT)/src/VBox/Additions/3D/win/include \
+  	$(PATH_ROOT)/src/VBox/Additions/3D/win/VBoxWddmUmHlp \
+  	$(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include \
+  	$(VBOX_GRAPHICS_INCS)
+  VBoxDX_SOURCES = \
+  	wddm/dx/VBoxDXDDI.cpp \
+  	wddm/dx/VBoxDX.cpp \
+  	wddm/dx/VBoxDXCmd.cpp \
+  	wddm/dx/VBoxDX.rc \
+  	wddm/dx/VBoxDX.def
+  VBoxDX_LIBS   = \
+  	$(VBOX_LIB_IPRT_GUEST_R3) \
+  	Psapi.lib \
+  	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB)
 
-# 64-bit systems need a 32-bit version of VBoxDX
-DLLS.amd64 += VBoxDX-x86
-VBoxDX-x86_EXTENDS = VBoxDX
-VBoxDX-x86_BLD_TRG_ARCH = x86
-VBoxDX-x86_LIBS = \
-	$(VBOX_LIB_IPRT_GUEST_R3_X86) \
-	$(VBOX_LIB_VBGL_R3_X86) \
-	Psapi.lib \
-	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB)
-VBoxDX-x86_DEFS = $(VBoxDX_DEFS) VBOX_WDDM_WOW64
+  # 64-bit systems need a 32-bit version of VBoxDX
+  DLLS.amd64 += VBoxDX-x86
+  VBoxDX-x86_EXTENDS = VBoxDX
+  VBoxDX-x86_BLD_TRG_ARCH = x86
+  VBoxDX-x86_LIBS = \
+  	$(VBOX_LIB_IPRT_GUEST_R3_X86) \
+  	$(VBOX_LIB_VBGL_R3_X86) \
+  	Psapi.lib \
+  	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB)
+  VBoxDX-x86_DEFS = $(VBoxDX_DEFS) VBOX_WDDM_WOW64
  endif # VBOX_WITH_VMSVGA3D_DX
 
-include $(PATH_SUB_CURRENT)/wddm/shared/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/wddm/shared/Makefile.kmk
 
 endif #ifdef VBOX_WITH_WDDM
 
 
 ifdef VBOX_WITH_VBOXVIDEOWINDBG
-#
-# A windbg extension and a few test programs.
-#
+ #
+ # A windbg extension and a few test programs.
+ #
 
-DLLS += vbvdbg
-vbvdbg_TEMPLATE = VBoxR3StaticDll
-vbvdbg_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
-vbvdbg_DEFS     = UNICODE _UNICODE
-vbvdbg_SOURCES  = \
-	wddm/dbg/VBoxVideoWinDbg.cpp \
-	wddm/dbg/VBoxVideoWinDbg.def
+ DLLS += vbvdbg
+ vbvdbg_TEMPLATE = VBoxR3StaticDll
+ vbvdbg_SDKS    = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
+ vbvdbg_DEFS    = UNICODE _UNICODE
+ vbvdbg_SOURCES = \
+ 	wddm/dbg/VBoxVideoWinDbg.cpp \
+ 	wddm/dbg/VBoxVideoWinDbg.def
 
-PROGRAMS += tstMvWnd
-tstMvWnd_TEMPLATE = VBoxR3Static
-tstMvWnd_DEFS     = UNICODE _UNICODE
-tstMvWnd_SOURCES  = wddm/dbg/tstMvWnd.cpp
-#tstMvWnd_LIBS     = $(VBOX_LIB_IPRT_GUEST_R3) - Use guest template if this is wanted! duh!
-#tstMvWnd_LDFLAGS  = /SUBSYSTEM:windows
+ PROGRAMS += tstMvWnd
+ tstMvWnd_TEMPLATE = VBoxR3Static
+ tstMvWnd_DEFS    = UNICODE _UNICODE
+ tstMvWnd_SOURCES = wddm/dbg/tstMvWnd.cpp
+ #tstMvWnd_LIBS     = $(VBOX_LIB_IPRT_GUEST_R3) - Use guest template if this is wanted! duh!
+ #tstMvWnd_LDFLAGS  = /SUBSYSTEM:windows
 
-PROGRAMS += DumpD3DCaps9
-DumpD3DCaps9_TEMPLATE = VBoxR3Exe
-DumpD3DCaps9_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
-DumpD3DCaps9_DEFS     = UNICODE _UNICODE
-DumpD3DCaps9_SOURCES  = wddm/dbg/DumpD3DCaps9.cpp
-DumpD3DCaps9_LIBS     = d3d9.lib
+ PROGRAMS += DumpD3DCaps9
+ DumpD3DCaps9_TEMPLATE = VBoxR3Exe
+ DumpD3DCaps9_SDKS    = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
+ DumpD3DCaps9_DEFS    = UNICODE _UNICODE
+ DumpD3DCaps9_SOURCES = wddm/dbg/DumpD3DCaps9.cpp
+ DumpD3DCaps9_LIBS    = d3d9.lib
 
-PROGRAMS += D3DFeatureLevel
-D3DFeatureLevel_TEMPLATE = VBoxR3Static
-D3DFeatureLevel_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
-D3DFeatureLevel_SOURCES  = wddm/dbg/D3DFeatureLevel.cpp
-D3DFeatureLevel_LIBS     = d3d11.lib
-#D3DFeatureLevel_LIBS     = $(VBOX_LIB_IPRT_GUEST_R3) d3d11.lib - Use guest template if this is wanted! duh!
-#D3DFeatureLevel_LDFLAGS.win = /SUBSYSTEM:CONSOLE
+ PROGRAMS += D3DFeatureLevel
+ D3DFeatureLevel_TEMPLATE = VBoxR3Static
+ D3DFeatureLevel_SDKS    = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
+ D3DFeatureLevel_SOURCES = wddm/dbg/D3DFeatureLevel.cpp
+ D3DFeatureLevel_LIBS    = d3d11.lib
+ #D3DFeatureLevel_LIBS     = $(VBOX_LIB_IPRT_GUEST_R3) d3d11.lib - Use guest template if this is wanted! duh!
+ #D3DFeatureLevel_LDFLAGS.win = /SUBSYSTEM:CONSOLE
 
 endif # VBOX_WITH_VBOXVIDEOWINDBG
 
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk
index 465b0462cbc..38946f8a6bd 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk
@@ -43,10 +43,10 @@ ifdef VBOX_WITH_VIDEOHWACCEL
  VBoxVideo_DEFS        += VBOX_WITH_VIDEOHWACCEL
 endif
 VBoxVideo_INCS          = \
-        ../../../include \
-        .. \
-        . \
-        $(VBOX_GRAPHICS_INCS)
+	../../../include \
+	.. \
+	. \
+	$(VBOX_GRAPHICS_INCS)
 VBoxVideo_LDFLAGS.x86   = /Entry:DriverEntry@8
 VBoxVideo_LDFLAGS.amd64 = /Entry:DriverEntry
 VBoxVideo_SOURCES       = \
@@ -75,7 +75,7 @@ VBoxVideo_LIBS          = \
 ifeq ($(KBUILD_TARGET_ARCH),x86)
  VBoxVideo_LIBS         += \
  	$(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/exsup.lib \
-	$(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/BufferOverflowK.lib # Needed for ___security_cookie.
+ 	$(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/BufferOverflowK.lib # Needed for ___security_cookie.
 endif
 VBoxVideo_USES.win = vboximportchecker
 VBoxVideo_VBOX_IMPORT_CHECKER.win.x86 = nt4/r0
@@ -116,9 +116,9 @@ ifdef VBOX_WITH_WDDM
  VBoxWddm_SOURCES          = \
  	wddm/VBoxMPWddm.cpp \
  	wddm/VBoxMPLegacy.cpp \
-	wddm/VBoxMPVidPn.cpp \
-	wddm/VBoxMPVdma.cpp \
-	wddm/VBoxMPShgsmi.cpp \
+ 	wddm/VBoxMPVidPn.cpp \
+ 	wddm/VBoxMPVdma.cpp \
+ 	wddm/VBoxMPShgsmi.cpp \
  	wddm/VBoxMPCm.cpp \
  	wddm/VBoxMPSa.cpp \
  	wddm/VBoxMPMisc.cpp \
@@ -136,11 +136,11 @@ ifdef VBOX_WITH_WDDM
 
  ifdef VBOXWDDM_WITH_VBVA
   VBoxWddm_SOURCES        += \
-    wddm/VBoxMPVbva.cpp
+  	wddm/VBoxMPVbva.cpp
  endif
  ifdef VBOX_WITH_VIDEOHWACCEL
   VBoxWddm_SOURCES        += \
-    wddm/VBoxMPVhwa.cpp
+  	wddm/VBoxMPVhwa.cpp
  endif
 
  VBoxWddm_LIBS             = \
@@ -160,8 +160,8 @@ ifdef VBOX_WITH_WDDM
   VBoxWddm_DEFS           += __STDC_VERSION__=0    # for mesa include/c99_compat.h
   VBoxWddm_DEFS           += WIN9X_COMPAT_SPINLOCK # to avoid multiple KeInitializeSpinLock on amd64
   VBoxWddm_INCS           += \
-	$(PATH_ROOT)/src/VBox/Additions/3D/win/include \
-	$(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include
+  	$(PATH_ROOT)/src/VBox/Additions/3D/win/include \
+  	$(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include
   VBoxWddm_SOURCES        += \
   	wddm/gallium/Svga.cpp \
   	wddm/gallium/SvgaCmd.cpp \
diff --git a/src/VBox/Additions/WINNT/Installer/InstallHelper/Makefile.kmk b/src/VBox/Additions/WINNT/Installer/InstallHelper/Makefile.kmk
index a08d48292ca..1bea3b9d02c 100644
--- a/src/VBox/Additions/WINNT/Installer/InstallHelper/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Installer/InstallHelper/Makefile.kmk
@@ -39,12 +39,12 @@ include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 ## @todo kBuild: This needs the WINPSDK fix to work for cross building.
 DLLS.x86 += VBoxGuestInstallHelper
 VBoxGuestInstallHelper_TEMPLATE        := VBoxGuestR3Dll
-VBoxGuestInstallHelper_INST     	:= repackadd/resources/VBoxGuestInstallHelper/
+VBoxGuestInstallHelper_INST             := repackadd/resources/VBoxGuestInstallHelper/
 ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
  VBoxGuestInstallHelper_INSTTYPE       := stage
  VBoxGuestInstallHelper_DEBUG_INSTTYPE := both
 endif
-VBoxGuestInstallHelper_DEFS         	:= _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
+VBoxGuestInstallHelper_DEFS             := _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
 VBoxGuestInstallHelper_BLD_TRG_ARCH    := x86
 VBoxGuestInstallHelper_SOURCES         := \
 	VBoxGuestInstallHelper.cpp \
diff --git a/src/VBox/Additions/WINNT/Installer/InstallHelper/testcase/Makefile.kmk b/src/VBox/Additions/WINNT/Installer/InstallHelper/testcase/Makefile.kmk
index 5c299d82a67..a22bbe2d7a9 100644
--- a/src/VBox/Additions/WINNT/Installer/InstallHelper/testcase/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Installer/InstallHelper/testcase/Makefile.kmk
@@ -29,14 +29,14 @@ SUB_DEPTH = ../../../../..
 include $(KBUILD_PATH)/subheader.kmk
 
 ifdef VBOX_WITH_TESTCASES
-#
-# As the testcases use the DLL directly and plugins for NSIS *always* are 32-bit,
-# we also have to use a 32-bit testcase here.
-#
-PROGRAMS.x86 += tstWinAdditionsInstallHelper
-tstWinAdditionsInstallHelper_TEMPLATE = VBoxGuestR3Exe
-tstWinAdditionsInstallHelper_SOURCES  = tstWinAdditionsInstallHelper.cpp
-tstWinAdditionsInstallHelper_DEFS     = _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
+ #
+ # As the testcases use the DLL directly and plugins for NSIS *always* are 32-bit,
+ # we also have to use a 32-bit testcase here.
+ #
+ PROGRAMS.x86 += tstWinAdditionsInstallHelper
+ tstWinAdditionsInstallHelper_TEMPLATE = VBoxGuestR3Exe
+ tstWinAdditionsInstallHelper_SOURCES = tstWinAdditionsInstallHelper.cpp
+ tstWinAdditionsInstallHelper_DEFS    = _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
 
 endif # VBOX_WITH_TESTCASES
 
diff --git a/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk b/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk
index 4eff8c6d959..9905801a6fc 100644
--- a/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk
@@ -30,7 +30,7 @@ include $(KBUILD_PATH)/subheader.kmk
 
 # This has to be 32-bit.
 PROGRAMS += VBoxWindowsAdditions
-VBoxWindowsAdditions_TEMPLATE= VBoxGuestR3Exe
+VBoxWindowsAdditions_TEMPLATE = VBoxGuestR3Exe
 VBoxWindowsAdditions_BLD_TRG_ARCH = x86
 VBoxWindowsAdditions_DEFS    = _WIN32_WINNT=0x0400
 VBoxWindowsAdditions_INCS    = ../../include
@@ -38,16 +38,16 @@ VBoxWindowsAdditions_SOURCES = \
 	VBoxWindowsAdditions.cpp \
 	VBoxWindowsAdditions.rc
 ifdef VBOX_WITH_NOCRT_STATIC
-VBoxWindowsAdditions_LDFLAGS  = /SubSystem:Windows
+ VBoxWindowsAdditions_LDFLAGS = /SubSystem:Windows
 else
-VBoxWindowsAdditions_LDFLAGS  = \
-	/DISALLOWLIB:msvcrt.lib \
-	/DISALLOWLIB:msvcprt.lib \
-	/DISALLOWLIB:libcmt.lib
-VBoxWindowsAdditions_LIBS     = \
-	$(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \
-	$(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcmt.lib \
-	$(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcpmt.lib
+ VBoxWindowsAdditions_LDFLAGS = \
+ 	/DISALLOWLIB:msvcrt.lib \
+ 	/DISALLOWLIB:msvcprt.lib \
+ 	/DISALLOWLIB:libcmt.lib
+ VBoxWindowsAdditions_LIBS    = \
+ 	$(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \
+ 	$(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcmt.lib \
+ 	$(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcpmt.lib
 endif
 VBoxWindowsAdditions_VBOX_IMPORT_CHECKER.win.x86 := nt4
 
diff --git a/src/VBox/Additions/WINNT/Installer/Makefile.kmk b/src/VBox/Additions/WINNT/Installer/Makefile.kmk
index cd2623119fc..ee1e766aef4 100644
--- a/src/VBox/Additions/WINNT/Installer/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Installer/Makefile.kmk
@@ -55,7 +55,7 @@ endif
 # VBoxDrvInst - Helps with driver installation.
 #
 PROGRAMS += VBoxDrvInst
-VBoxDrvInst_TEMPLATE= VBoxGuestR3Exe
+VBoxDrvInst_TEMPLATE = VBoxGuestR3Exe
 VBoxDrvInst_DEFS    = _WIN32_WINNT=0x0400 _UNICODE UNICODE
 VBoxDrvInst_DEFS   += VBOX_SVN_REV=$(VBOX_SVN_REV)
 ifdef VBOX_WITH_WDDM
@@ -160,30 +160,30 @@ VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES := \
 	$(PATH_STAGE_BIN)/additions/VBoxGuest.sys \
 	$(PATH_STAGE_BIN)/additions/VBoxTray.exe \
 	$(PATH_STAGE_BIN)/additions/VBoxControl.exe \
-       \
+	\
 	$(PATH_STAGE_BIN)/additions/VBoxMouse.inf \
 	$(PATH_STAGE_BIN)/additions/VBoxMouse.sys \
-       \
+	\
 	$(PATH_STAGE_BIN)/additions/VBoxVideo.inf \
 	$(PATH_STAGE_BIN)/additions/VBoxVideo.sys \
 	$(PATH_STAGE_BIN)/additions/VBoxDisp.dll \
-       \
+	\
 	$(PATH_STAGE_BIN)/additions/VBoxSF.sys \
 	$(PATH_STAGE_BIN)/additions/VBoxMRXNP.dll
 
 ifeq ($(KBUILD_TARGET_ARCH),amd64) # 32-bit network provider DLLs for 32-bit apps running on a 64-bit system
-VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
-	$(PATH_STAGE_BIN)/additions/VBoxMRXNP-x86.dll
+ VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
+ 	$(PATH_STAGE_BIN)/additions/VBoxMRXNP-x86.dll
 endif
 
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
-VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
-	$(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
-	$(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \
-	$(PATH_STAGE_BIN)/additions/VBoxGuest.cat \
-	$(PATH_STAGE_BIN)/additions/VBoxGuest-PreW10.cat \
-	$(PATH_STAGE_BIN)/additions/VBoxMouse.cat \
-	$(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat
+ VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
+ 	$(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
+ 	$(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \
+ 	$(PATH_STAGE_BIN)/additions/VBoxGuest.cat \
+ 	$(PATH_STAGE_BIN)/additions/VBoxGuest-PreW10.cat \
+ 	$(PATH_STAGE_BIN)/additions/VBoxMouse.cat \
+ 	$(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat
 endif
 
 VBOX_WINDOWS_ADDITIONS_OTHER_FILES := \
@@ -192,53 +192,53 @@ VBOX_WINDOWS_ADDITIONS_OTHER_FILES := \
 	$(PATH_STAGE_BIN)/additions/RegCleanup.exe
 
 ifeq ($(KBUILD_TARGET_ARCH),x86)
-VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
-	$(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \
-	$(PATH_STAGE_BIN)/additions/VBoxSFW2K.sys
+ VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
+ 	$(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \
+ 	$(PATH_STAGE_BIN)/additions/VBoxSFW2K.sys
 endif
 
 ifdef VBOX_WITH_WDDM
-VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
-	$(PATH_STAGE_BIN)/additions/VBoxWddm.inf \
-	$(PATH_STAGE_BIN)/additions/VBoxWddm.sys \
-	$(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
+ VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
+ 	$(PATH_STAGE_BIN)/additions/VBoxWddm.inf \
+ 	$(PATH_STAGE_BIN)/additions/VBoxWddm.sys \
+ 	$(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
-	$(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll
+  VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
+  	$(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll
  endif
 
  ifdef VBOX_WITH_WDDM_DX
-VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
-	$(PATH_STAGE_BIN)/additions/VBoxDX.dll
+  VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
+  	$(PATH_STAGE_BIN)/additions/VBoxDX.dll
   ifeq ($(KBUILD_TARGET_ARCH),amd64)
-VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
-	$(PATH_STAGE_BIN)/additions/VBoxDX-x86.dll
+   VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
+   	$(PATH_STAGE_BIN)/additions/VBoxDX-x86.dll
   endif
  endif
 
  ifdef VBOX_WITH_MESA3D
-VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
-	$(PATH_STAGE_BIN)/additions/VBoxNine.dll \
-	$(PATH_STAGE_BIN)/additions/VBoxSVGA.dll \
-	$(PATH_STAGE_BIN)/additions/VBoxGL.dll
+  VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
+  	$(PATH_STAGE_BIN)/additions/VBoxNine.dll \
+  	$(PATH_STAGE_BIN)/additions/VBoxSVGA.dll \
+  	$(PATH_STAGE_BIN)/additions/VBoxGL.dll
   ifeq ($(KBUILD_TARGET_ARCH),amd64)
-VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
-	$(PATH_STAGE_BIN)/additions/VBoxNine-x86.dll \
-	$(PATH_STAGE_BIN)/additions/VBoxSVGA-x86.dll \
-	$(PATH_STAGE_BIN)/additions/VBoxGL-x86.dll
+   VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
+   	$(PATH_STAGE_BIN)/additions/VBoxNine-x86.dll \
+   	$(PATH_STAGE_BIN)/additions/VBoxSVGA-x86.dll \
+   	$(PATH_STAGE_BIN)/additions/VBoxGL-x86.dll
   endif
  endif
 
  if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
-VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
-	$(PATH_STAGE_BIN)/additions/VBoxWddm.cat \
-	$(PATH_STAGE_BIN)/additions/VBoxWddm-PreW10.cat
+  VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
+  	$(PATH_STAGE_BIN)/additions/VBoxWddm.cat \
+  	$(PATH_STAGE_BIN)/additions/VBoxWddm-PreW10.cat
  endif
 endif # VBOX_WITH_WDDM
 
 ifdef env.VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
-VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
-	$(PATH_STAGE_BIN)/additions/VBoxAudioTest.exe
+ VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
+ 	$(PATH_STAGE_BIN)/additions/VBoxAudioTest.exe
 endif
 
 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += $(addprefix $(PATH_STAGE_BIN)/additions/, \
@@ -279,8 +279,8 @@ VB_WIN_ADD_NSIS_ENV := \
 	$(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),-E 'VBOX_BRAND_$(lang)_LICENSE_RTF=$(VBOX_BRAND_$(lang)_LICENSE_RTF)') \
 	-E 'KBUILD_TYPE=$(KBUILD_TYPE)' \
 	-E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
-       $(foreach base, VBOX_GA_CERT_ROOT_SHA1 VBOX_GA_CERT_ROOT_SHA2 VBOX_GA_CERT_ROOT_SHA2_R3 \
-       ,-E '$(base)=$(firstword $($(base)) none)' -E '$(base)_TS=$(firstword $($(base)_TS) none)')
+	$(foreach base, VBOX_GA_CERT_ROOT_SHA1 VBOX_GA_CERT_ROOT_SHA2 VBOX_GA_CERT_ROOT_SHA2_R3 \
+	,-E '$(base)=$(firstword $($(base)) none)' -E '$(base)_TS=$(firstword $($(base)_TS) none)')
 
 $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \
 		$(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \
@@ -327,37 +327,37 @@ endif
 
 
 ifdef VBOX_SIGNING_MODE
-#
-# This is a hack to sign the uninstaller.
-# See http://nsis.sourceforge.net/Signing_an_Uninstaller for more details.
-#
-OTHER_CLEAN += \
-	$(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe \
-	$(PATH_TARGET)/uninst.exe
-$(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe: \
-		$(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \
-		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsCommon.nsh \
-		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsExternal.nsh \
-		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsLog.nsh \
-		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh \
-		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
-		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh \
-		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
-		$(PATH_SUB_CURRENT)/dumplog.nsh \
-		$(PATH_SUB_CURRENT)/ReplaceDLL.nsh \
-		$(PATH_SUB_CURRENT)/servicepack.nsh \
-		$(PATH_SUB_CURRENT)/strstr.nsh \
-		$(PATH_SUB_CURRENT)/winver.nsh \
-		$(PATH_SUB_CURRENT)/Languages/English.nsh \
-		$(PATH_SUB_CURRENT)/Languages/German.nsh \
-		$(PATH_SUB_CURRENT)/Languages/French.nsh \
-		$(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) \
-		$(VBOX_WINDOWS_ADDITIONS_OTHER_FILES) \
-		$(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
-		$(VBOX_NSIS_ICON_FILE) \
-		$(VBOX_VERSION_STAMP) \
-               $$(VBoxDrvInst_1_STAGE_TARGET) \
-		| $$(dir $$@)
+ #
+ # This is a hack to sign the uninstaller.
+ # See http://nsis.sourceforge.net/Signing_an_Uninstaller for more details.
+ #
+ OTHER_CLEAN += \
+ 	$(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe \
+ 	$(PATH_TARGET)/uninst.exe
+ $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe: \
+ 		$(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \
+ 		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsCommon.nsh \
+ 		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsExternal.nsh \
+ 		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsLog.nsh \
+ 		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh \
+ 		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
+ 		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh \
+ 		$(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
+ 		$(PATH_SUB_CURRENT)/dumplog.nsh \
+ 		$(PATH_SUB_CURRENT)/ReplaceDLL.nsh \
+ 		$(PATH_SUB_CURRENT)/servicepack.nsh \
+ 		$(PATH_SUB_CURRENT)/strstr.nsh \
+ 		$(PATH_SUB_CURRENT)/winver.nsh \
+ 		$(PATH_SUB_CURRENT)/Languages/English.nsh \
+ 		$(PATH_SUB_CURRENT)/Languages/German.nsh \
+ 		$(PATH_SUB_CURRENT)/Languages/French.nsh \
+ 		$(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) \
+ 		$(VBOX_WINDOWS_ADDITIONS_OTHER_FILES) \
+ 		$(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
+ 		$(VBOX_NSIS_ICON_FILE) \
+ 		$(VBOX_VERSION_STAMP) \
+ 		$$(VBoxDrvInst_1_STAGE_TARGET) \
+ 		| $$(dir $$@)
 	$(call MSG_L1,Creating $@, from $<)
 	$(QUIET)$(REDIRECT) -C $(VBOX_PATH_WIN_ADD_INS_SRC) \
 		$(VB_WIN_ADD_NSIS_ENV) \
@@ -369,7 +369,7 @@ $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe: \
 			'/DUNINSTALLER_ONLY=1' \
 			'$(subst /,\,$<)'
 
-$(PATH_TARGET)/uninst.exe: $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe | $$(dir $$@)
+ $(PATH_TARGET)/uninst.exe: $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe | $$(dir $$@)
 	$(call MSG_L1,Creating $@, from $<)
 	$(QUIET)$(RM) -f $@
 	- $<
@@ -380,22 +380,22 @@ endif # VBOX_SIGNING_MODE
 
 
 if defined(VBOX_GA_ATTESTATION_SIGNING) && defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
-#
-# This automagically attestation signs the GA drivers.
-#
-$(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME): \
-		$(PATH_OUT)/repackadd/sign-attestation.sh \
-		$(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)
+ #
+ # This automagically attestation signs the GA drivers.
+ #
+ $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME): \
+ 		$(PATH_OUT)/repackadd/sign-attestation.sh \
+ 		$(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)
 	$(RM_EXT) -f $(PATH_OUT)/repackadd/*.zip
 	cd $(PATH_OUT)/repackadd && $(SHELL) $(PATH_OUT)/repackadd/sign-attestation.sh $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)
 	$(MV_EXT) $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME).*.zip $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME)
 
-#
-# This creates a .CAB file of the driver files that should be attestation signed.
-#
-$(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME): \
-		$(PATH_OUT)/repackadd/PackDriversForSubmission.cmd \
-#		$(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) - is is unsafe, because of the 'ing ugly hack replacing most of them above during packing.
+ #
+ # This creates a .CAB file of the driver files that should be attestation signed.
+ #
+ $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME): \
+ 		$(PATH_OUT)/repackadd/PackDriversForSubmission.cmd \
+ 		# $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) - is is unsafe, because of the 'ing ugly hack replacing most of them above during packing.
 	$(RM_EXT) -f $(PATH_OUT)/repackadd/*.cab
 	$(RM_EXT) -f $(PATH_OUT)/repackadd/*.ddf
 	$(RM_EXT) -f $(PATH_OUT)/repackadd/*.inf
@@ -423,17 +423,17 @@ RePackScriptsAdd_CLEAN = \
 	$(RePackScriptsAdd_0_OUTDIR)/sign-ev.cmd
 
 ifndef VBOX_OSE
-RePackScriptsAdd_SOURCES += \
-	$(RePackScriptsAdd_0_OUTDIR)/Combined-0-Additions.cmd \
-	$(RePackScriptsAdd_0_OUTDIR)/Combined-2-SignAdditions.cmd \
-	../../../Installer/win/Scripts/sign-attestation.sh
+ RePackScriptsAdd_SOURCES += \
+ 	$(RePackScriptsAdd_0_OUTDIR)/Combined-0-Additions.cmd \
+ 	$(RePackScriptsAdd_0_OUTDIR)/Combined-2-SignAdditions.cmd \
+ 	../../../Installer/win/Scripts/sign-attestation.sh
 endif
 
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/PackDriversForSubmission.cmd,PackDriversForSubmission.cmd)
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-1-Prepare.cmd,Combined-1-Prepare.cmd)
 ifndef VBOX_OSE
-$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-0-Additions.cmd,Combined-0-Additions.cmd)
-$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-2-SignAdditions.cmd,Combined-2-SignAdditions.cmd)
+ $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-0-Additions.cmd,Combined-0-Additions.cmd)
+ $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-2-SignAdditions.cmd,Combined-2-SignAdditions.cmd)
 endif
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-3-RepackAdditions.cmd,Combined-3-RepackAdditions.cmd)
 
@@ -469,16 +469,16 @@ RePackScriptsAddResources_SOURCES = \
 	strstr.nsh \
 	VBoxGuestAdditionsCommon.nsh \
 	VBoxGuestAdditionsExternal.nsh \
-	VBoxGuestAdditionsLog.nsh\
+	VBoxGuestAdditionsLog.nsh \
 	VBoxGuestAdditionsNT4.nsh \
 	VBoxGuestAdditionsUninstall.nsh \
 	VBoxGuestAdditionsUninstallOld.nsh \
-	VBoxGuestAdditionsVista.nsh\
-	VBoxGuestAdditionsW2KXP.nsh\
+	VBoxGuestAdditionsVista.nsh \
+	VBoxGuestAdditionsW2KXP.nsh \
 	winver.nsh \
 	ISO/AUTORUN.INF \
 	ISO/NT3xReadme.txt \
-       \
+	\
 	Languages/English.nsh=>Languages/English.nsh \
 	Languages/French.nsh=>Languages/French.nsh \
 	Languages/German.nsh=>Languages/German.nsh
@@ -493,10 +493,10 @@ RePackScriptsAddResources_SOURCES = \
 #
 PROGRAMS.win.x86 += VBoxAddInstallNt3x
 ifdef VBOX_WITH_NOCRT_STATIC
-## @todo noCRT: the result is much too big. Got rid of log.cpp, but still pretty big. Work on reducing it.
-VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3Exe
+ ## @todo noCRT: the result is much too big. Got rid of log.cpp, but still pretty big. Work on reducing it.
+ VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3Exe
 else
-VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3NoCrtExe
+ VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3NoCrtExe
 endif
 VBoxAddInstallNt3x_SOURCES  := VBoxAddInstallNt3x.cpp
 VBoxAddInstallNt3x.cpp_DEPS = $(VBOX_SVN_REV_HEADER)
diff --git a/src/VBox/Additions/WINNT/Mouse/NT4/Makefile.kmk b/src/VBox/Additions/WINNT/Mouse/NT4/Makefile.kmk
index df0613eac1d..f264416a176 100644
--- a/src/VBox/Additions/WINNT/Mouse/NT4/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Mouse/NT4/Makefile.kmk
@@ -38,10 +38,10 @@ VBoxMouseNT_LDFLAGS     = -Entry:DriverEntry@8
 VBoxMouseNT_SOURCES     = \
 	VBoxPS2NT.cpp \
 	VBoxPS2NT.rc \
-       ../../../../Runtime/r0drv/nt/nt3fakes-r0drv-nt.cpp \
-       ../../../../Runtime/r0drv/nt/nt3fakesA-r0drv-nt.asm \
-       ../../../../Runtime/common/string/strcmp.asm \
-       ../../../../Runtime/common/string/strchr.asm
+	../../../../Runtime/r0drv/nt/nt3fakes-r0drv-nt.cpp \
+	../../../../Runtime/r0drv/nt/nt3fakesA-r0drv-nt.asm \
+	../../../../Runtime/common/string/strcmp.asm \
+	../../../../Runtime/common/string/strchr.asm
 VBoxMouseNT_LIBS        = \
 	$(VBOX_LIB_IPRT_GUEST_R0_NT4) \
 	$(VBOX_LIB_VBGL_R0) \
@@ -51,7 +51,7 @@ VBoxMouseNT_LIBS        = \
 	$(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/hal.lib
 ifneq ($(VBOX_VCC_CC_GUARD_CF),)
  VBoxMouseNT_LIBS.x86 += \
-  	$(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/BufferOverflowK.lib
+ 	$(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/BufferOverflowK.lib
 endif
 VBoxMouseNT_CLEAN       = \
 	$(VBoxMouseNT_0_OUTDIR)/VBoxMouseNT.pdb
diff --git a/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk b/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk
index e8f42e70b70..935debed685 100644
--- a/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk
@@ -83,9 +83,9 @@ $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf: $(PATH_SUB_CURRENT)/VBoxMouse.inf
 
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
  VBoxMouse-inf_SOURCES += \
-  	$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys \
-  	$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat \
-  	$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat=>VBoxMouse-PreW10.cat
+ 	$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys \
+ 	$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat \
+ 	$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat=>VBoxMouse-PreW10.cat
 
  $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys: $$(VBoxMouse_1_TARGET) | $$(dir $$@)
 	$(INSTALL) -m 644 -- "$<" "$(@D)"
diff --git a/src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk b/src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk
index 4ae17e24d56..6926a194b96 100644
--- a/src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk
@@ -50,7 +50,7 @@ VBoxSF_SOURCES     = \
 	info.cpp \
 	path.cpp \
 	vbsfhlp.cpp \
- 	VBoxSF.rc
+	VBoxSF.rc
 VBoxSF_SOURCES.x86 = \
 	Win2kWorkarounds.c \
 	Win2kWorkaroundsA.asm
@@ -63,11 +63,11 @@ VBoxSF_LIBS = \
 	$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/ksecdd.lib
 ifneq ($(VBOX_VCC_CC_GUARD_CF),)
  VBoxSF_LIBS += \
-	$(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.$(KBUILD_TARGET_ARCH))/ntoskrnl.lib \
+ 	$(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.$(KBUILD_TARGET_ARCH))/ntoskrnl.lib \
  	$(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.$(KBUILD_TARGET_ARCH))/BufferOverflowK.lib
 else
  VBoxSF_LIBS += \
-	$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/ntoskrnl.lib \
+ 	$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/ntoskrnl.lib \
  	$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/BufferOverflowK.lib
 endif
 VBoxSF_LIBS += \
@@ -96,17 +96,17 @@ ifeq ($(KBUILD_TARGET_ARCH),x86)
  	$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/copysup.lib \
  	$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/hal.lib \
  	$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/ksecdd.lib \
-	\
-	$(VBOX_LIB_VBGL_R0) \
-	$(VBOX_LIB_IPRT_GUEST_R0) \
+ 	\
+ 	$(VBOX_LIB_VBGL_R0) \
+ 	$(VBOX_LIB_IPRT_GUEST_R0) \
  	$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB)/int64.lib
  ifneq ($(VBOX_VCC_CC_GUARD_CF),)
   VBoxSFW2K_LIBS += \
- 	$(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.x86)/ntoskrnl.lib \
+  	$(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.x86)/ntoskrnl.lib \
   	$(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.x86)/BufferOverflowK.lib
  else
   VBoxSFW2K_LIBS += \
- 	$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/ntoskrnl.lib \
+  	$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/ntoskrnl.lib \
   	$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/BufferOverflowK.lib
  endif
  VBoxSFW2K_CLEAN = \
@@ -120,7 +120,7 @@ include $(FILE_KBUILD_SUB_FOOTER)
 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxSF_0_OUTDIR)/rdbsslib.lib)
 
 ifeq ($(KBUILD_TARGET_ARCH),x86)
-$(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)
+ $(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)
 	$(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
 	$(VBOX_EDIT_COFF_LIB) --input "$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib" --output "$@" \
 		--select "write.obj" \
@@ -129,8 +129,8 @@ $(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD
 		--select "read.obj" \
                --redefine-sym "__imp__CcFlushCache@16=_g_pfnRdFlushCache"
 
-$(call KB_FN_AUTO_CMD_DEPS,$(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib)
-$(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)
+ $(call KB_FN_AUTO_CMD_DEPS,$(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib)
+ $(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)
 	$(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
 	$(VBOX_EDIT_COFF_LIB) --input "$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib" --output "$@" \
 		--select "write.obj" \
@@ -139,7 +139,7 @@ $(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.$(KB
 		--select "read.obj" \
                --redefine-sym "__imp__CcFlushCache@16=_g_pfnRdFlushCache"
 else
-$(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)
+ $(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)
 	$(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
 	$(VBOX_EDIT_COFF_LIB) --input "$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib" --output "$@" \
 		--select "write.obj" \
diff --git a/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk b/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk
index 408cf9baa46..fab63f24919 100644
--- a/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk
@@ -33,7 +33,7 @@ VBoxGINA_TEMPLATE = VBoxGuestR3Dll
 VBoxGINA_DEFS     = UNICODE VBGL_VBOXGUEST VBOX_WITH_HGCM
 VBoxGINA_SOURCES  = \
 	VBoxGINA.cpp \
-	Helper.cpp  \
+	Helper.cpp \
 	Dialog.cpp \
 	VBoxGINA.def \
 	VBoxGINA.rc
diff --git a/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk b/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk
index 8cfed30fb36..5a9deb25f96 100644
--- a/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk
@@ -30,18 +30,18 @@ include $(KBUILD_PATH)/subheader.kmk
 
 ifdef VBOX_WITH_TESTCASES
 
-#
-# Structure size testcase.
-#
-PROGRAMS += tstHook
-
-tstHook_TEMPLATE = VBoxGuestR3Exe
-tstHook_DEFS     = VBOX_WITH_HGCM
-tstHook_SOURCES  = tstHook.cpp
-tstHook_INCS     = ../../include
-tstHook_LIBS     = $(PATH_STAGE_LIB)/VBoxHook.lib
-tstHook_VBOX_IMPORT_CHECKER.win.x86   = $(NO_SUCH_VARIABLE)
-tstHook_VBOX_IMPORT_CHECKER.win.amd64 = $(NO_SUCH_VARIABLE)
+ #
+ # Structure size testcase.
+ #
+ PROGRAMS += tstHook
+
+ tstHook_TEMPLATE = VBoxGuestR3Exe
+ tstHook_DEFS    = VBOX_WITH_HGCM
+ tstHook_SOURCES = tstHook.cpp
+ tstHook_INCS    = ../../include
+ tstHook_LIBS    = $(PATH_STAGE_LIB)/VBoxHook.lib
+ tstHook_VBOX_IMPORT_CHECKER.win.x86  = $(NO_SUCH_VARIABLE)
+ tstHook_VBOX_IMPORT_CHECKER.win.amd64 = $(NO_SUCH_VARIABLE)
 
 endif # VBOX_WITH_TESTCASES
 
diff --git a/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk b/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk
index 88daab99c80..5cbc116cb64 100644
--- a/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk
@@ -63,40 +63,40 @@ VBoxTray_VBOX_IMPORT_CHECKER.win.x86 = nt4 #nt350
 VBoxTray_VBOX_IMPORT_CHECKER.win.amd64 = xp64
 ifdef VBOX_WITH_SHARED_CLIPBOARD
  VBoxTray_DEFS     += \
-	$(if $(VBOX_WITH_SHARED_CLIPBOARD),VBOX_WITH_SHARED_CLIPBOARD,) \
-	$(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS,)
+ 	$(if $(VBOX_WITH_SHARED_CLIPBOARD),VBOX_WITH_SHARED_CLIPBOARD,) \
+ 	$(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS,)
  VBoxTray_SOURCES  += \
-	VBoxClipboard.cpp \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp
+ 	VBoxClipboard.cpp \
+ 	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp \
+ 	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp
  ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
   VBoxTray_DEFS     += VBOX_WITH_SHARED_CLIPBOARD_GUEST
   VBoxTray_SOURCES  += \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardEnumFormatEtcImpl-win.cpp \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp
+  	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp \
+  	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardEnumFormatEtcImpl-win.cpp \
+  	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp \
+  	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp \
+  	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp
  endif
 endif
 ifdef VBOX_WITH_DRAG_AND_DROP
  VBoxTray_DEFS     += \
-	VBOX_WITH_DRAG_AND_DROP \
-	$(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
+ 	VBOX_WITH_DRAG_AND_DROP \
+ 	$(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
  VBoxTray_SOURCES  += \
-	VBoxDnD.cpp \
-	VBoxDnDDataObject.cpp \
-	VBoxDnDEnumFormat.cpp \
-	VBoxDnDDropSource.cpp \
-	VBoxDnDDropTarget.cpp
+ 	VBoxDnD.cpp \
+ 	VBoxDnDDataObject.cpp \
+ 	VBoxDnDEnumFormat.cpp \
+ 	VBoxDnDDropSource.cpp \
+ 	VBoxDnDDropTarget.cpp
  VBoxTray_LIBS     += \
-	$(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
+ 	$(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
 endif
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxTray_DEFS     += _WIN32_IE=0x500 VBOX_WITH_GUEST_PROPS
  VBoxTray_SOURCES  += \
-	VBoxHostVersion.cpp \
-	VBoxLA.cpp
+ 	VBoxHostVersion.cpp \
+ 	VBoxLA.cpp
 endif
 ifdef VBOX_WITH_WDDM
  VBoxTray_DEFS    += VBOX_WITH_WDDM
diff --git a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk
index 8d9452f16c8..db7a1e3e975 100644
--- a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk
@@ -30,16 +30,16 @@ include $(KBUILD_PATH)/subheader.kmk
 
 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS)
 
-#
-# Dummy CLI testcase.
-#
-PROGRAMS += tstVBoxControl
-tstVBoxControl_TEMPLATE = VBoxR3TstExe
-tstVBoxControl_DEFS     = VBOX_CONTROL_TEST
-tstVBoxControl_SOURCES  = tstVBoxControl.cpp ../VBoxControl.cpp
-tstVBoxControl_LIBS     = $(LIB_RUNTIME)
-tstVBoxControl_DEFS    += \
-	$(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS VBOX_WITH_HGCM,)
+ #
+ # Dummy CLI testcase.
+ #
+ PROGRAMS += tstVBoxControl
+ tstVBoxControl_TEMPLATE = VBoxR3TstExe
+ tstVBoxControl_DEFS    = VBOX_CONTROL_TEST
+ tstVBoxControl_SOURCES = tstVBoxControl.cpp ../VBoxControl.cpp
+ tstVBoxControl_LIBS    = $(LIB_RUNTIME)
+ tstVBoxControl_DEFS   += \
+ 	$(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS VBOX_WITH_HGCM,)
 
 endif # VBOX_WITH_TESTCASES
 
diff --git a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
index d36521ccfaa..8365b388cd8 100644
--- a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
@@ -71,7 +71,7 @@ if defined(VBOX_WITH_ADDITION_DRIVERS) && "$(intersects $(KBUILD_TARGET), darwin
  endif
  #VBoxGuest_DEFS.win     += LOG_ENABLED LOG_TO_BACKDOOR
  VBoxGuest_DEFS.win += \
-	$(if $(VBOX_WITH_DPC_LATENCY_CHECKER),VBOX_WITH_DPC_LATENCY_CHECKER,)
+ 	$(if $(VBOX_WITH_DPC_LATENCY_CHECKER),VBOX_WITH_DPC_LATENCY_CHECKER,)
  VBoxGuest_DEPS.solaris += $(VBOX_SVN_REV_KMK)
  VBoxGuest_DEPS.haiku   += $(VBOX_SVN_REV_HEADER)
  VBoxGuest_DEPS.freebsd += $(VBOX_SVN_REV_HEADER)
@@ -127,10 +127,10 @@ if defined(VBOX_WITH_ADDITION_DRIVERS) && "$(intersects $(KBUILD_TARGET), darwin
   VBoxGuest_SOURCES.win += \
   	win/VBoxGuest.rc
   VBoxGuest_SOURCES.win.x86 += \
-       ../../../Runtime/common/string/strcmp.asm \
-       ../../../Runtime/common/string/strchr.asm \
-       ../../../Runtime/r0drv/nt/nt3fakes-r0drv-nt.cpp \
-       ../../../Runtime/r0drv/nt/nt3fakesA-r0drv-nt.asm
+  	../../../Runtime/common/string/strcmp.asm \
+  	../../../Runtime/common/string/strchr.asm \
+  	../../../Runtime/r0drv/nt/nt3fakes-r0drv-nt.cpp \
+  	../../../Runtime/r0drv/nt/nt3fakesA-r0drv-nt.asm
   VBoxGuest_LIBS        += \
   	$(VBOX_LIB_VBGL_R0BASE) \
   	$(VBOX_LIB_IPRT_GUEST_R0)
@@ -151,39 +151,39 @@ if defined(VBOX_WITH_ADDITION_DRIVERS) && "$(intersects $(KBUILD_TARGET), darwin
  else # OS/2:
   # The library order is crucial, so a bit of trickery is necessary.
   # A library is used to make sure that VBoxGuestA-os2.asm is first in the link. (temporary hack?)
-VBoxGuest_SOURCES        = \
+  VBoxGuest_SOURCES      = \
   	VBoxGuestA-os2.asm
   ifdef VBOX_USE_WATCOM_FOR_OS2
-VBoxGuest_LIBS           = \
-	$(VBoxGuestLibOs2Hack_1_TARGET) \
-	$(VBOX_LIB_VBGL_R0BASE) \
-	$(VBOX_LIB_IPRT_GUEST_R0) \
-	$(PATH_IGCC)/lib/libend.lib
+   VBoxGuest_LIBS        = \
+   	$(VBoxGuestLibOs2Hack_1_TARGET) \
+   	$(VBOX_LIB_VBGL_R0BASE) \
+   	$(VBOX_LIB_IPRT_GUEST_R0) \
+   	$(PATH_IGCC)/lib/libend.lib
   else
-VBoxGuest_SOURCES       += \
-	VBoxGuest-os2.def
-#VBoxGuest_LDFLAGS        = -s -t -v
-VBoxGuest_LIBS           = \
-	$(VBoxGuestLibOs2Hack_1_TARGET) \
-	$(VBOX_LIB_VBGL_R0BASE) \
-	$(VBOX_LIB_IPRT_GUEST_R0) \
-	$(VBOX_GCC_LIBGCC) \
-	end
+   VBoxGuest_SOURCES    += \
+   	VBoxGuest-os2.def
+   #VBoxGuest_LDFLAGS        = -s -t -v
+   VBoxGuest_LIBS        = \
+   	$(VBoxGuestLibOs2Hack_1_TARGET) \
+   	$(VBOX_LIB_VBGL_R0BASE) \
+   	$(VBOX_LIB_IPRT_GUEST_R0) \
+   	$(VBOX_GCC_LIBGCC) \
+   	end
   endif
-## When debugging init with kDrvTest:
-#VBoxGuest_NAME          = VBoxGst
+  ## When debugging init with kDrvTest:
+  #VBoxGuest_NAME          = VBoxGst
 
-# See above.
-LIBRARIES += VBoxGuestLibOs2Hack
-VBoxGuestLibOs2Hack_TEMPLATE = VBoxGuestR0DrvLib
-VBoxGuestLibOs2Hack_INSTTYPE = none
-VBoxGuestLibOs2Hack_DEFS = $(VBoxGuest_DEFS)
-VBoxGuestLibOs2Hack_INCS = \
-	. \
-	$(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk
-VBoxGuestLibOs2Hack_SOURCES = \
-	VBoxGuest-os2.cpp \
-	VBoxGuest.cpp
+  # See above.
+  LIBRARIES += VBoxGuestLibOs2Hack
+  VBoxGuestLibOs2Hack_TEMPLATE = VBoxGuestR0DrvLib
+  VBoxGuestLibOs2Hack_INSTTYPE = none
+  VBoxGuestLibOs2Hack_DEFS = $(VBoxGuest_DEFS)
+  VBoxGuestLibOs2Hack_INCS = \
+  	. \
+  	$(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk
+  VBoxGuestLibOs2Hack_SOURCES = \
+  	VBoxGuest-os2.cpp \
+  	VBoxGuest.cpp
  endif # OS/2
 
  VBoxGuest.cpp_DEFS     = VBOX_SVN_REV=$(VBOX_SVN_REV)
@@ -198,9 +198,9 @@ if defined(VBOX_WITH_ADDITION_DRIVERS) && "$(KBUILD_TARGET)" == "darwin"
  VBoxGuest.kext_CLEAN    = $(VBoxGuest.kext_0_OUTDIR)/Contents/Info.plist
  VBoxGuest.kext_BLDDIRS  = $(VBoxGuest.kext_0_OUTDIR)/Contents/
 
-$$(VBoxGuest.kext_0_OUTDIR)/Contents/Info.plist: \
-		$(PATH_SUB_CURRENT)/darwin/Info.plist \
-		$(VBOX_VERSION_MK) | $$(dir $$@)
+ $$(VBoxGuest.kext_0_OUTDIR)/Contents/Info.plist: \
+ 		$(PATH_SUB_CURRENT)/darwin/Info.plist \
+ 		$(VBOX_VERSION_MK) | $$(dir $$@)
 	$(call MSG_GENERATE,VBoxGuest,$@,$<)
 	$(QUIET)$(RM) -f $@
 	$(QUIET)$(SED) \
@@ -214,7 +214,7 @@ $$(VBoxGuest.kext_0_OUTDIR)/Contents/Info.plist: \
 		--output $@ \
 		$<
 
-$(evalcall2 VBOX_TEST_SIGN_KEXT,VBoxGuest)
+ $(evalcall2 VBOX_TEST_SIGN_KEXT,VBoxGuest)
 endif # darwin
 
 
@@ -243,7 +243,7 @@ ifeq ($(KBUILD_TARGET),linux)
  #
  # Build test for the Guest Additions kernel module (kmk check).
  #
-$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxguest-src,,save_symvers)
+ $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxguest-src,,save_symvers)
 endif # Linux
 
 ifeq ($(KBUILD_TARGET),freebsd)
diff --git a/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk
index 35a26a7d556..3949e15d67c 100644
--- a/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk
@@ -52,10 +52,10 @@ LIBRARIES += \
 	VBoxGuestR3LibShared
 ifndef VBOX_ONLY_VALIDATIONKIT
  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
- ifndef VBOX_USE_SYSTEM_XORG_HEADERS
-  LIBRARIES += \
-  	VBoxGuestR3LibXFree86
- endif
+  ifndef VBOX_USE_SYSTEM_XORG_HEADERS
+   LIBRARIES += \
+   	VBoxGuestR3LibXFree86
+  endif
  endif
  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
   LIBRARIES += \
@@ -81,7 +81,7 @@ VBoxGuestR0Lib_SOURCES      = \
 	VBoxGuestR0LibVMMDev.cpp \
 	VBoxGuestR0LibHGCM.cpp \
 	VbglR0CanUsePhysPageList.cpp \
-       \
+	\
 	VBoxGuestR0LibIdc.cpp \
 	VBoxGuestR0LibSharedFolders.c \
 	VBoxGuestR0LibCrOgl.cpp \
@@ -139,12 +139,12 @@ VBoxGuestR3Lib_SOURCES     = \
 	VBoxGuestR3LibMisc.cpp \
 	VBoxGuestR3LibStat.cpp \
 	VBoxGuestR3LibTime.cpp \
- 	VBoxGuestR3LibModule.cpp \
- 	VBoxGuestR3LibPidFile.cpp \
- 	VBoxGuestR3LibVrdp.cpp \
- 	VBoxGuestR3LibMouse.cpp \
- 	VBoxGuestR3LibSeamless.cpp \
- 	VBoxGuestR3LibVideo.cpp
+	VBoxGuestR3LibModule.cpp \
+	VBoxGuestR3LibPidFile.cpp \
+	VBoxGuestR3LibVrdp.cpp \
+	VBoxGuestR3LibMouse.cpp \
+	VBoxGuestR3LibSeamless.cpp \
+	VBoxGuestR3LibVideo.cpp
 ifneq ($(KBUILD_TARGET),win)
  VBoxGuestR3Lib_SOURCES   += \
  	VBoxGuestR3LibDaemonize.cpp
@@ -157,10 +157,10 @@ endif
 ifdef VBOX_WITH_SHARED_CLIPBOARD
  VBoxGuestR3Lib_DEFS      += VBOX_WITH_SHARED_CLIPBOARD_GUEST
  VBoxGuestR3Lib_SOURCES   += \
-	VBoxGuestR3LibClipboard.cpp
+ 	VBoxGuestR3LibClipboard.cpp
  ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
- VBoxGuestR3Lib_SOURCES   += \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardMIME.cpp
+  VBoxGuestR3Lib_SOURCES  += \
+  	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardMIME.cpp
  endif
 endif
 ifdef VBOX_WITH_SHARED_FOLDERS
@@ -173,8 +173,8 @@ ifdef VBOX_WITH_GUEST_CONTROL
 endif
 ifdef VBOX_WITH_DRAG_AND_DROP
  VBoxGuestR3Lib_DEFS      += \
-    VBOX_WITH_DRAG_AND_DROP \
-    $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
+ 	VBOX_WITH_DRAG_AND_DROP \
+ 	$(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
  VBoxGuestR3Lib_SOURCES   += \
  	VBoxGuestR3LibDragAndDrop.cpp
 endif
@@ -228,9 +228,9 @@ VBoxGuestR3LibXFree86_SOURCES  = \
 	VBoxGuestR3LibVideo.cpp \
 	VBoxGuestR3LibRuntimeXF86.cpp
 VBoxGuestR3LibXFree86_INCS     = \
-        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver \
-        $(VBOX_PATH_X11_ROOT)/XFree86-4.3 \
-        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11
+	$(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver \
+	$(VBOX_PATH_X11_ROOT)/XFree86-4.3 \
+	$(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11
 
 #
 # VBoxGuestR3LibXOrg - a reduced version of the guest library which uses
diff --git a/src/VBox/Additions/common/VBoxGuest/lib/testcase/Makefile.kmk b/src/VBox/Additions/common/VBoxGuest/lib/testcase/Makefile.kmk
index ebd49d2de5c..f13a34f3de2 100644
--- a/src/VBox/Additions/common/VBoxGuest/lib/testcase/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxGuest/lib/testcase/Makefile.kmk
@@ -38,13 +38,13 @@ SUB_DEPTH = ../../../../../../..
 include $(KBUILD_PATH)/subheader.kmk
 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_BUILD)
 
-#
-# Testcase for the physical heap.
-#
-PROGRAMS += tstVbglR0PhysHeap-1
-tstVbglR0PhysHeap-1_TEMPLATE = VBoxR3TstExe
-tstVbglR0PhysHeap-1_SOURCES  = \
-	tstVbglR0PhysHeap-1.cpp
+ #
+ # Testcase for the physical heap.
+ #
+ PROGRAMS += tstVbglR0PhysHeap-1
+ tstVbglR0PhysHeap-1_TEMPLATE = VBoxR3TstExe
+ tstVbglR0PhysHeap-1_SOURCES = \
+ 	tstVbglR0PhysHeap-1.cpp
 
 
 endif # defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_BUILD)
diff --git a/src/VBox/Additions/common/VBoxService/Makefile.kmk b/src/VBox/Additions/common/VBoxService/Makefile.kmk
index f050d8778c4..c21854aaa04 100644
--- a/src/VBox/Additions/common/VBoxService/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxService/Makefile.kmk
@@ -54,26 +54,26 @@ VBOX_WITH_VBOXSERVICE_MANAGEMENT    := 1
 
 if1of ($(KBUILD_TARGET), linux)
  # CPU hotplugging.
-VBOX_WITH_VBOXSERVICE_CPUHOTPLUG    := 1
+ VBOX_WITH_VBOXSERVICE_CPUHOTPLUG   := 1
 endif
 
 # Page Sharing (Page Fusion).
 if1of ($(KBUILD_TARGET), win)
-VBOX_WITH_VBOXSERVICE_PAGE_SHARING  := 1
+ VBOX_WITH_VBOXSERVICE_PAGE_SHARING := 1
 endif
 
 ifdef VBOX_WITH_GUEST_PROPS
-VBOX_WITH_VBOXSERVICE_VMINFO        := 1
+ VBOX_WITH_VBOXSERVICE_VMINFO       := 1
 endif
 
 # Guest Control.
 ifdef VBOX_WITH_GUEST_CONTROL
-VBOX_WITH_VBOXSERVICE_CONTROL       := 1
+ VBOX_WITH_VBOXSERVICE_CONTROL      := 1
 endif
 
 # Shared Clipboard.
 ifdef VBOX_WITH_SHARED_CLIPBOARD
-VBOX_WITH_VBOXSERVICE_CLIPBOARD     := 1
+ VBOX_WITH_VBOXSERVICE_CLIPBOARD    := 1
 endif
 
 # DRM Resize.
@@ -102,9 +102,9 @@ VBoxService_DEFS          = \
 	$(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,) \
 	$(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,)
 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
-VBoxService_DEFS         += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
+ VBoxService_DEFS        += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
 else
-VBoxService_DEFS         += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
+ VBoxService_DEFS        += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
 endif
 VBoxService_DEFS.win     += _WIN32_WINNT=0x0501
 VBoxService_DEFS.os2      = VBOX_WITH_HGCM
@@ -115,64 +115,64 @@ VBoxService_SOURCES       = \
 	VBoxServiceStats.cpp
 
 ifdef VBOX_WITH_VBOXSERVICE_TIMESYNC
-VBoxService_SOURCES      += \
-	VBoxServiceTimeSync.cpp
+ VBoxService_SOURCES     += \
+ 	VBoxServiceTimeSync.cpp
 endif
 
 ifdef VBOX_WITH_VBOXSERVICE_CLIPBOARD
  VBoxService_DEFS.os2    += VBOX_WITH_VBOXSERVICE_CLIPBOARD VBOX_WITH_SHARED_CLIPBOARD
  VBoxService_SOURCES.os2 += \
-	VBoxServiceClipboard-os2.cpp \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp
+ 	VBoxServiceClipboard-os2.cpp \
+ 	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp
 endif
 
 ifdef VBOX_WITH_VBOXSERVICE_TOOLBOX
-VBoxService_SOURCES      += \
-	VBoxServiceToolBox.cpp
+ VBoxService_SOURCES     += \
+ 	VBoxServiceToolBox.cpp
 endif
 
 ifdef VBOX_WITH_VBOXSERVICE_CONTROL
-VBoxService_SOURCES      += \
-	VBoxServiceControl.cpp  \
-	VBoxServiceControlProcess.cpp \
-	VBoxServiceControlSession.cpp
+ VBoxService_SOURCES     += \
+ 	VBoxServiceControl.cpp \
+ 	VBoxServiceControlProcess.cpp \
+ 	VBoxServiceControlSession.cpp
 endif
 
 ifdef VBOX_WITH_VBOXSERVICE_MANAGEMENT
  ifdef VBOX_WITH_MEMBALLOON
   VBoxService_SOURCES    += \
-	VBoxServiceBalloon.cpp
+  	VBoxServiceBalloon.cpp
   VBoxService_DEFS       += VBOX_WITH_MEMBALLOON
  endif
 endif
 
 if1of ($(KBUILD_TARGET), win)
-VBoxService_SOURCES      += \
+ VBoxService_SOURCES     += \
  	VBoxServicePageSharing.cpp
 endif
 
 ifdef VBOX_WITH_VBOXSERVICE_VMINFO
-VBoxService_SOURCES.win  += \
+ VBoxService_SOURCES.win += \
  	VBoxServiceVMInfo-win.cpp
-VBoxService_SOURCES      += \
-	VBoxServiceVMInfo.cpp \
-	VBoxServicePropCache.cpp
+ VBoxService_SOURCES     += \
+ 	VBoxServiceVMInfo.cpp \
+ 	VBoxServicePropCache.cpp
 endif
 
 ifdef VBOX_WITH_VBOXSERVICE_CPUHOTPLUG
-VBoxService_SOURCES      += \
-	VBoxServiceCpuHotPlug.cpp
+ VBoxService_SOURCES     += \
+ 	VBoxServiceCpuHotPlug.cpp
 endif
 
 ifdef VBOX_WITH_SHARED_FOLDERS
  if1of ($(KBUILD_TARGET), linux os2 solaris win)
-VBoxService_DEFS         += VBOX_WITH_SHARED_FOLDERS
-VBoxService_SOURCES      += \
-	VBoxServiceAutoMount.cpp
-VBoxService_SOURCES.linux += \
-	../../linux/sharedfolders/vbsfmount.c
-VBoxService_LIBS.win     += \
-	Mpr.Lib
+  VBoxService_DEFS       += VBOX_WITH_SHARED_FOLDERS
+  VBoxService_SOURCES    += \
+  	VBoxServiceAutoMount.cpp
+  VBoxService_SOURCES.linux += \
+  	../../linux/sharedfolders/vbsfmount.c
+  VBoxService_LIBS.win   += \
+  	Mpr.Lib
  endif
 endif
 
@@ -190,20 +190,20 @@ VBoxService_LIBS         += \
 	$(VBOX_LIB_IPRT_GUEST_R3)       # (The joy of unix linkers.)
 ifdef VBOX_WITH_DBUS
  if1of ($(KBUILD_TARGET), linux solaris) # FreeBSD?
-VBoxService_LIBS         += \
-	dl
+  VBoxService_LIBS       += \
+  	dl
  endif
 endif
 VBoxService_LIBS.netbsd  += crypt
 ifdef VBOX_WITH_GUEST_PROPS
-VBoxService_LIBS.win     += \
-	Secur32.lib \
-	WtsApi32.lib \
-	Psapi.lib
-VBoxService_LIBS.solaris += \
-	nsl \
-	kstat \
-	contract
+ VBoxService_LIBS.win    += \
+ 	Secur32.lib \
+ 	WtsApi32.lib \
+ 	Psapi.lib
+ VBoxService_LIBS.solaris += \
+ 	nsl \
+ 	kstat \
+ 	contract
 endif
 
 ifdef VBOX_WITH_VBOXSERVICE_VMINFO
diff --git a/src/VBox/Additions/darwin/Installer/Makefile.kmk b/src/VBox/Additions/darwin/Installer/Makefile.kmk
index a35e9010ea3..51ca5a82109 100644
--- a/src/VBox/Additions/darwin/Installer/Makefile.kmk
+++ b/src/VBox/Additions/darwin/Installer/Makefile.kmk
@@ -127,7 +127,7 @@ $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditions.pkg: \
 		$(VBOX_PATH_PACK_TMP)/Packages/VBoxGuestAdditionsKEXTs.pkg \
 		$(VBOX_PATH_PACK_TMP)/Packages/VBoxGuestAdditionsToolsAndServices.pkg \
 		$$(wildcard $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/* \
-		            $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/*.lproj/*) \
+		$(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/*.lproj/*) \
 		$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_BRAND_$(f)_VIRTUALBOX_WELCOME_RTF)) \
 		$(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Welcome.rtf \
 		$(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Conclusion.rtf \
@@ -226,11 +226,11 @@ $(VBOX_PATH_PACK_TMP)/Packages/VBoxGuestAdditionsKEXTs.pkg: \
 		$(foreach kext,$(VBOX_ADD_DI_KEXTS_UNIVERSAL), $(call VBOX_DI_FN_DEP_BOTH,$(kext).kext/Contents/MacOS/$(kext))) \
 		$(foreach kext,$(VBOX_ADD_DI_KEXTS), $(VBOX_PATH_DIST)/additions/$(kext).kext/Contents/Info.plist) \
 		$$(wildcard $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/* \
-		            $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/*.lproj/*) \
+		$(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/*.lproj/*) \
 		$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \
-			$(VBOX_BRAND_$(f)_VBOXKEXTS_DESCRIPTION_PLIST) \
-			$(VBOX_BRAND_$(f)_VBOXKEXTS_README_HTML) \
-			$(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS)) \
+		$(VBOX_BRAND_$(f)_VBOXKEXTS_DESCRIPTION_PLIST) \
+		$(VBOX_BRAND_$(f)_VBOXKEXTS_README_HTML) \
+		$(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS)) \
 		$(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/postflight \
 		$(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/PkgBuildComponent.plist \
 		$(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
@@ -310,11 +310,11 @@ endif
 # The VirtualBox Guest Additions Tools & Services.
 #
 
-VBOX_GA_PKG=VBoxGuestAdditionsToolsAndServices.pkg
-VBOX_DI_VB_GA_BINARIES=VBoxClient VBoxControl VBoxService
+VBOX_GA_PKG = VBoxGuestAdditionsToolsAndServices.pkg
+VBOX_DI_VB_GA_BINARIES = VBoxClient VBoxControl VBoxService
 $(VBOX_PATH_PACK_TMP)/Packages/$(VBOX_GA_PKG): \
-		$(foreach f, $(VBOX_DI_VB_GA_BINARIES)\
-			,$(call VBOX_DI_FN_DEP_BOTH,$(f)) ) \
+		$(foreach f, $(VBOX_DI_VB_GA_BINARIES) \
+		,$(call VBOX_DI_FN_DEP_BOTH,$(f)) ) \
 		$(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/org.virtualbox.additions.vboxclient.plist \
 		$(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/org.virtualbox.additions.vboxservice.plist \
 		$(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/VBoxServiceWrapper \
diff --git a/src/VBox/Additions/freebsd/Makefile.kmk b/src/VBox/Additions/freebsd/Makefile.kmk
index f326b8dad19..215993f2d26 100644
--- a/src/VBox/Additions/freebsd/Makefile.kmk
+++ b/src/VBox/Additions/freebsd/Makefile.kmk
@@ -29,7 +29,7 @@ SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
 
 ifneq ($(KBUILD_HOST),freebsd)
-$(error "The FreeBSD guest additions installer can only be built on FreeBSD!")
+ $(error "The FreeBSD guest additions installer can only be built on FreeBSD!")
 endif
 
 # Include sub-makefiles.
@@ -41,8 +41,8 @@ include $(PATH_SUB_CURRENT)/drm/Makefile.kmk
 #
 VBOX_FBSD_ADD_INS_OUT_DIR          := $(PATH_TARGET)/Additions/Installer/freebsd
 BLDDIRS                            += \
-		$(VBOX_FBSD_ADD_INS_OUT_DIR) \
-		$(VBOX_FBSD_ADD_INS_OUT_DIR)/module
+	$(VBOX_FBSD_ADD_INS_OUT_DIR) \
+	$(VBOX_FBSD_ADD_INS_OUT_DIR)/module
 VBOX_PATH_FREEBSD_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/Installer
 VBOX_PATH_X11_ADDITION_INSTALLER     := $(PATH_ROOT)/src/VBox/Additions/x11/Installer
 
@@ -133,11 +133,11 @@ INSTALLS += $(if $(VBOX_OSE),, fbsd_add_inst-nobin)
 fbsd_add_inst-nobin_INST = obj/Additions/Installer/freebsd
 fbsd_add_inst-nobin_MODE = a+r,u+w
 fbsd_add_inst-nobin_SOURCES = \
-		../x11/Installer/98vboxadd-xclient \
-		../x11/Installer/vboxclient.desktop \
-		../x11/Installer/vboxvideo.ids \
-		../x11/Installer/x11config.pl \
-		../x11/Installer/x11config15.pl
+	../x11/Installer/98vboxadd-xclient \
+	../x11/Installer/vboxclient.desktop \
+	../x11/Installer/vboxvideo.ids \
+	../x11/Installer/x11config.pl \
+	../x11/Installer/x11config15.pl
 
 
 INSTALLS += GuestDrivers-src
@@ -147,7 +147,7 @@ GuestDrivers-src_SOURCES = Makefile
 
 # this file needs editing before it can be included in the generic installer.
 $(VBOX_FBSD_ADD_INS_OUT_DIR)/install.sh: \
-	$(VBOX_PATH_FREEBSD_ADDITION_INSTALLER)/install.sh | $$(dir $$@)
+		$(VBOX_PATH_FREEBSD_ADDITION_INSTALLER)/install.sh | $$(dir $$@)
 	$(QUIET)$(SED) \
 	    -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \
 	    -e "s;_BUILD_;$(shell date);g" \
diff --git a/src/VBox/Additions/freebsd/drm/Makefile.kmk b/src/VBox/Additions/freebsd/drm/Makefile.kmk
index 9ee62d26b2f..119fc73c253 100644
--- a/src/VBox/Additions/freebsd/drm/Makefile.kmk
+++ b/src/VBox/Additions/freebsd/drm/Makefile.kmk
@@ -35,7 +35,7 @@ ifdef VBOX_WITH_ADDITION_DRIVERS
  SYSMODS  += vboxvideo_drm
 endif
 ifneq ($(KBUILD_HOST),freebsd)
-$(error "The FreeBSD guest additions can only be built on FreeBSD!")
+ $(error "The FreeBSD guest additions can only be built on FreeBSD!")
 endif
 
 #
diff --git a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
index 724085519eb..c1a25e59f16 100644
--- a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
+++ b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
@@ -29,7 +29,7 @@ SUB_DEPTH = ../../../../..
 include $(KBUILD_PATH)/subheader.kmk
 
 ifneq ($(KBUILD_HOST),freebsd)
-$(error "The FreeBSD guest additions can only be built on FreeBSD!")
+ $(error "The FreeBSD guest additions can only be built on FreeBSD!")
 endif
 
 #
@@ -39,8 +39,8 @@ SYSMODS.freebsd      += vboxvfs
 vboxvfs_TEMPLATE      = VBoxGuestR0Drv
 vboxvfs_DEFS          = VBOX_WITH_HGCM
 vboxvfs_INCS          = \
-        . \
-       $(vboxvfs_0_OUTDIR)
+	. \
+	$(vboxvfs_0_OUTDIR)
 vboxvfs_SOURCES       = \
 	vboxvfs_vfsops.c \
 	vboxvfs_vnops.c
@@ -48,9 +48,9 @@ vboxvfs_LIBS          = \
 	$(VBOX_LIB_VBGL_R0) \
 	$(VBOX_LIB_IPRT_GUEST_R0)
 vboxvfs_DEPS          = \
-       $$(vboxvfs_0_OUTDIR)/vnode_if.h \
-       $$(vboxvfs_0_OUTDIR)/vnode_if_newproto.h \
-       $$(vboxvfs_0_OUTDIR)/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
diff --git a/src/VBox/Additions/haiku/Makefile.kmk b/src/VBox/Additions/haiku/Makefile.kmk
index 5006b3eb079..0e5ef90749d 100644
--- a/src/VBox/Additions/haiku/Makefile.kmk
+++ b/src/VBox/Additions/haiku/Makefile.kmk
@@ -58,7 +58,7 @@ SUB_DEPTH = ../../../..
 include	$(KBUILD_PATH)/subheader.kmk
 
 ifneq ($(KBUILD_HOST),haiku)
-$(error "The Haiku guest additions installer can only be built on Haiku!")
+ $(error "The Haiku guest additions installer can only be built on Haiku!")
 endif
 
 #
diff --git a/src/VBox/Additions/haiku/SharedFolders/Makefile.kmk b/src/VBox/Additions/haiku/SharedFolders/Makefile.kmk
index e90ad919a2d..fa5de75a617 100644
--- a/src/VBox/Additions/haiku/SharedFolders/Makefile.kmk
+++ b/src/VBox/Additions/haiku/SharedFolders/Makefile.kmk
@@ -74,7 +74,7 @@ vboxsf_TEMPLATE        = VBoxGuestR0Drv
 vboxsf_DEFS            = \
 	MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \
 	KBUILD_MODNAME=KBUILD_STR\(vboxsf\) \
-        KBUILD_BASENAME=KBUILD_STR\(vboxsf\)
+	KBUILD_BASENAME=KBUILD_STR\(vboxsf\)
 vboxsf_INCS            = \
 	$(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest \
 	$(PATH_ROOT)/src/VBox/Runtime/r0drv/haiku
diff --git a/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk b/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk
index 71017e00a70..2fd349892cd 100644
--- a/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk
+++ b/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk
@@ -72,7 +72,7 @@ VBoxTray_SOURCES  = \
 	VBoxGuestDeskbarView.cpp
 
 VBoxTray_SOURCES += \
-  	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp
+	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp
 
 VBoxTray_LIBS     = \
 	be translation \
diff --git a/src/VBox/Additions/haiku/VBoxVideo/driver/Makefile.kmk b/src/VBox/Additions/haiku/VBoxVideo/driver/Makefile.kmk
index f7a7b38cb77..987475d784c 100644
--- a/src/VBox/Additions/haiku/VBoxVideo/driver/Makefile.kmk
+++ b/src/VBox/Additions/haiku/VBoxVideo/driver/Makefile.kmk
@@ -74,7 +74,7 @@ vboxvideo_TEMPLATE        = VBoxGuestR0Drv
 vboxvideo_DEFS            = \
 	MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \
 	KBUILD_MODNAME=KBUILD_STR\(VBoxVideo\) \
-        KBUILD_BASENAME=KBUILD_STR\(VBoxVideo\)
+	KBUILD_BASENAME=KBUILD_STR\(VBoxVideo\)
 vboxvideo_INCS            = \
 	$(PATH_ROOT)/src/VBox/Additions/common/VBoxGuestLib \
 	$(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest \
diff --git a/src/VBox/Additions/linux/Makefile.kmk b/src/VBox/Additions/linux/Makefile.kmk
index 988a623deda..e529e1d6d7e 100644
--- a/src/VBox/Additions/linux/Makefile.kmk
+++ b/src/VBox/Additions/linux/Makefile.kmk
@@ -99,8 +99,8 @@ ifndef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE
  VBOX_LNX_ADD_ARCHIVES := $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-$(KBUILD_TARGET_ARCH).tar.bz2
 else
  VBOX_LNX_ADD_ARCHIVES := \
-	$(VBOX_LNX_ADD_ARCHIVE.x86) \
-	$(VBOX_LNX_ADD_ARCHIVE.amd64)
+ 	$(VBOX_LNX_ADD_ARCHIVE.x86) \
+ 	$(VBOX_LNX_ADD_ARCHIVE.amd64)
 endif
 BLDDIRS     += \
 	$(VBOX_LNX_ADD_ARCH_INST_DIRS) \
@@ -128,7 +128,7 @@ VBOX_LNX_ADD_STRIP_BIN += \
 	VBoxClient
 ifdef VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
  VBOX_LNX_ADD_STRIP_BIN += \
-	VBoxAudioTest
+ 	VBoxAudioTest
 endif
 
 VBOX_LNX_ADD_STRIP_SBIN += \
@@ -179,8 +179,8 @@ VBOX_LNX_ADD_DBG_FILES := \
 	$(addprefix $(VBOX_LNX_ADD_DBG_OTHER_DIR),$(VBOX_LNX_ADD_STRIP_MOD))
 
 ifdef VBOX_WITH_LIGHTDM_GREETER_PACKING
-VBOX_LNX_ADD_INST_FILES += \
-	$(addprefix $(VBOX_LNX_ADD_INST_SBIN_DIR),vbox-greeter)
+ VBOX_LNX_ADD_INST_FILES += \
+ 	$(addprefix $(VBOX_LNX_ADD_INST_SBIN_DIR),vbox-greeter)
 endif
 
 # Cleanup of the installer directory files
@@ -217,8 +217,8 @@ $(addprefix $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_STRIP_BIN)): \
 	$(QUIET)objcopy --add-gnu-debuglink=$(subst $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_DBG_BIN_DIR),$@) $@
 
 # pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_SBIN files to the installation directory
-$(addprefix $(VBOX_LNX_ADD_INST_SBIN_DIR),\
-		$(filter-out vbox-greeter,$(VBOX_LNX_ADD_STRIP_SBIN))): \
+$(addprefix $(VBOX_LNX_ADD_INST_SBIN_DIR), \
+$(filter-out vbox-greeter,$(VBOX_LNX_ADD_STRIP_SBIN))): \
 		$(VBOX_LNX_ADD_INST_SBIN_DIR)% : $(PATH_STAGE_BIN)/additions/% \
 		$(VBOX_LNX_ADD_DBG_SBIN_DIR)% \
 		| $$(dir $$@)
@@ -264,11 +264,11 @@ else # strip to temp file because of umask.
 endif
 
 include $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest
-VBOX_LNX_ADD_INST_FILES_VBOXGUEST=$(patsubst =>%,$(PATH_STAGE_BIN)/additions/src/vboxguest/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(FILES_VBOXGUEST_NOBIN)))))
+VBOX_LNX_ADD_INST_FILES_VBOXGUEST = $(patsubst =>%,$(PATH_STAGE_BIN)/additions/src/vboxguest/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(FILES_VBOXGUEST_NOBIN)))))
 include $(PATH_ROOT)/src/VBox/Additions/linux/sharedfolders/files_vboxsf
-VBOX_LNX_ADD_INST_FILES_VBOXSF=$(patsubst =>%,$(PATH_STAGE_BIN)/additions/src/vboxsf/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(FILES_VBOXSF_NOBIN)))))
+VBOX_LNX_ADD_INST_FILES_VBOXSF = $(patsubst =>%,$(PATH_STAGE_BIN)/additions/src/vboxsf/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(FILES_VBOXSF_NOBIN)))))
 include $(PATH_ROOT)/src/VBox/Additions/linux/drm/files_vboxvideo_drv
-VBOX_LNX_ADD_INST_FILES_VBOXVIDEO=$(patsubst =>%,$(PATH_STAGE_BIN)/additions/src/vboxvideo/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_NOBIN)))))
+VBOX_LNX_ADD_INST_FILES_VBOXVIDEO = $(patsubst =>%,$(PATH_STAGE_BIN)/additions/src/vboxvideo/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_NOBIN)))))
 
 # special rule for the kernel modules
 $(VBOX_LNX_ADD_INST_KMOD_DIR_BASE): \
@@ -326,7 +326,7 @@ LnxAdd-scripts_EXEC_SOURCES  = \
 
 ifdef VBOX_WITH_LIGHTDM_GREETER_PACKING
  LnxAdd-scripts_EXEC_SOURCES += \
-	$(VBOX_REL_LNX_ADD_INST)module-autologon.sh=>installer/module-autologon
+ 	$(VBOX_REL_LNX_ADD_INST)module-autologon.sh=>installer/module-autologon
 endif
 
 
@@ -439,8 +439,8 @@ $(PATH_STAGE_BIN)/additions/VBoxLinuxAdditions.run: \
 		$(VBOX_LNX_ADD_INST_STAGE_DIR)install.sh \
 		$$(LnxAdd-scripts_2_STAGE_TARGETS) \
 		$(VBOX_VERSION_STAMP)
-    # Remove any archives left over from previous builds so that they don't
-    # end up in our installer as well.
+# Remove any archives left over from previous builds so that they don't
+# end up in our installer as well.
 	$(QUIET)$(RM) -f $(foreach file, $(wildcard $(VBOX_LNX_ADD_INST_STAGE_DIR)$(VBOX_LNX_ADD_PACKAGE_NAME)-*.tar.bz2), $(file))
 	$(QUIET)$(foreach file, $(VBOX_LNX_ADD_ARCHIVES), \
 		$(CP) -f $(file) $(VBOX_LNX_ADD_INST_STAGE_DIR)$(subst -r$(VBOX_SVN_REV),,$(notdir $(file)))$(NLTAB) )
diff --git a/src/VBox/Additions/linux/drm/Makefile.kmk b/src/VBox/Additions/linux/drm/Makefile.kmk
index 73a33e38046..fa214f67e84 100644
--- a/src/VBox/Additions/linux/drm/Makefile.kmk
+++ b/src/VBox/Additions/linux/drm/Makefile.kmk
@@ -42,9 +42,9 @@ vboxvideo-src_SOURCES      = \
 vboxvideo-src_EXEC_SOURCES = \
 	$(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_BIN))
 vboxvideo-src_INSTALLER = $(RM_EXT) -f -- "$2" && \
-    $(if $(filter %.c %.h,$2),$(SED) -f $(PATH_ROOT)/src/VBox/Additions/linux/drm/indent.sed \
-    --output "$2" "$1",$(CP_EXT) "$1" "$2") && \
-    $(CHMOD_EXT) "$(if $(mode),$(mode),0644)" "$2"
+	$(if $(filter %.c %.h,$2),$(SED) -f $(PATH_ROOT)/src/VBox/Additions/linux/drm/indent.sed \
+	--output "$2" "$1",$(CP_EXT) "$1" "$2") && \
+	$(CHMOD_EXT) "$(if $(mode),$(mode),0644)" "$2"
 
 
 
diff --git a/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk b/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk
index 9bb7bf2ecc1..77596ebbc6d 100644
--- a/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk
+++ b/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk
@@ -71,17 +71,17 @@ vbox-greeter_INCS := \
 	/usr/lib/i386-linux-gnu/glib-2.0/include \
 	/usr/lib/x86_64-linux-gnu/glib-2.0/include \
 	/usr/include/glib-2.0 \
-       $(if $(VBOX_OSE),,liblightdm-gobject-1.5.0) \
+	$(if $(VBOX_OSE),,liblightdm-gobject-1.5.0) \
 	/usr/include/lightdm-gobject-1 \
 	$(if $(VBOX_OSE),$(patsubst -I%,%,%(filter -I%,$(shell pkg-config --cflags liblightdm-gobject-1))),)
 ifndef VBOX_WITH_FLTK
  vbox-greeter_INCS   += \
-	/usr/include/glib-2.0 \
-	/usr/include/gtk-3.0 \
-	/usr/include/pango-1.0 \
-	/usr/include/cairo \
-	/usr/include/gdk-pixbuf-2.0 \
-	/usr/include/atk-1.0
+ 	/usr/include/glib-2.0 \
+ 	/usr/include/gtk-3.0 \
+ 	/usr/include/pango-1.0 \
+ 	/usr/include/cairo \
+ 	/usr/include/gdk-pixbuf-2.0 \
+ 	/usr/include/atk-1.0
 endif
 
 vbox-greeter_SOURCES  = \
diff --git a/src/VBox/Additions/os2/Config.kmk b/src/VBox/Additions/os2/Config.kmk
index cef27b18129..61211748496 100644
--- a/src/VBox/Additions/os2/Config.kmk
+++ b/src/VBox/Additions/os2/Config.kmk
@@ -51,7 +51,7 @@ TEMPLATE_VBoxOs2Vac308_TOOL    = VAC308
 TEMPLATE_VBoxOs2Vac308_ASTOOL  = ALP
 TEMPLATE_VBoxOs2Vac308_ARTOOL  = GCC3OMF
 TEMPLATE_VBoxOs2Vac308_INST    = $(INST_ADDITIONS)
-TEMPLATE_VBoxOs2Vac308_DEFS    =  RT_OS_OS2 IN_RING3 ## @todo IN_GUEST IN_GUEST_R3 IN_RT_R3
+TEMPLATE_VBoxOs2Vac308_DEFS    = RT_OS_OS2 IN_RING3  ## @todo IN_GUEST IN_GUEST_R3 IN_RT_R3
 
 TEMPLATE_VBoxOs2Vac308_CFLAGS  += /Gn+               # Do not generate default libraries in object.
 TEMPLATE_VBoxOs2Vac308_CFLAGS  += /Gr+               # Allow object code to run at ring 0.
diff --git a/src/VBox/Additions/os2/Makefile.kmk b/src/VBox/Additions/os2/Makefile.kmk
index 369e0ba4555..10de62f3ee1 100644
--- a/src/VBox/Additions/os2/Makefile.kmk
+++ b/src/VBox/Additions/os2/Makefile.kmk
@@ -38,7 +38,7 @@ endif
 #
 ifndef VBOX_OSE
  include $(PATH_SUB_CURRENT)/VBoxGradd/Makefile.kmk
-# include $(PATH_SUB_CURRENT)/VBoxGrext/Makefile.kmk
+ # include $(PATH_SUB_CURRENT)/VBoxGrext/Makefile.kmk
  include $(PATH_SUB_CURRENT)/VBoxMouse/Makefile.kmk
  include $(PATH_SUB_CURRENT)/Bin/Makefile.kmk
 endif
@@ -73,8 +73,8 @@ VBoxOs2AdditionsInstall_INCS             = \
 	$(PATH_TOOL_OPENWATCOM)/h/os2
 VBoxOs2AdditionsInstall_SOURCES          = \
 	VBoxOs2AdditionsInstall.cpp \
- 	$(VBOX_PATH_RUNTIME_SRC)/common/path/RTPathStripFilename.cpp \
- 	$(VBOX_PATH_RUNTIME_SRC)/common/path/RTPathEnsureTrailingSeparator.cpp
+	$(VBOX_PATH_RUNTIME_SRC)/common/path/RTPathStripFilename.cpp \
+	$(VBOX_PATH_RUNTIME_SRC)/common/path/RTPathEnsureTrailingSeparator.cpp
 if 1
  VBOX_PATH_RUNTIME_SRC ?= $(PATH_ROOT)/src/VBox/Runtime
  VBoxOs2AdditionsInstall_LDTOOL          = OPENWATCOM-WL
@@ -89,7 +89,7 @@ if 1
  VBoxOs2AdditionsInstall_DEFS           += IPRT_NO_CRT RT_WITH_NOCRT_ALIASES
  VBoxOs2AdditionsInstall_INCS           <= \
  	$(PATH_ROOT)/include/iprt/nocrt \
-	$(VBOX_PATH_RUNTIME_SRC)/include
+ 	$(VBOX_PATH_RUNTIME_SRC)/include
  VBoxOs2AdditionsInstall_SOURCES        += \
  	VBoxOs2AdditionsInstallA.asm \
  	$(VBOX_PATH_RUNTIME_SRC)/common/string/strcpy.cpp \
diff --git a/src/VBox/Additions/os2/VBoxSF/Makefile.kmk b/src/VBox/Additions/os2/VBoxSF/Makefile.kmk
index 1464bbe1940..c3861c7afba 100644
--- a/src/VBox/Additions/os2/VBoxSF/Makefile.kmk
+++ b/src/VBox/Additions/os2/VBoxSF/Makefile.kmk
@@ -31,9 +31,9 @@
 ifneq ($(KBUILD_HOST),os2)
  VBOX_USE_WATCOM_FOR_OS2  = 1
  KBUILD_TARGET      = os2
-  BUILD_TARGET      = os2
+ BUILD_TARGET       = os2
  KBUILD_TARGET_ARCH = x86
-  BUILD_TARGET_ARCH = x86
+ BUILD_TARGET_ARCH  = x86
 endif
 
 SUB_DEPTH = ../../../../..
@@ -64,21 +64,21 @@ TOOL_VBoxNasmDot_COMPILE_AS_OUTPUT = $(outbase).lst
 TOOL_VBoxNasmDot_COMPILE_AS_DEPEND = $(dotseg_1_TARGET)
 TOOL_VBoxNasmDot_COMPILE_AS_DEPORD =
 define TOOL_VBoxNasmDot_COMPILE_AS_CMDS
-ifdef TOOL_VBoxNasmDot_USE_KSUBMIT
+ ifdef TOOL_VBoxNasmDot_USE_KSUBMIT
 	$(QUIET)kmk_builtin_kSubmit -C $(PATH_OUT_BASE) -- $(TOOL_VBoxNasmDot_AS)\
 		$(flags) $(qaddprefix sh,-i, $(qaddsuffix ,/,$(incs))) $(qaddprefix sh,-D, $(defs))\
 		-l $(outbase).lst\
 		-o $(obj)\
                -MD "$(dep)" -MP\
 		$(abspath $(source))
-else
+ else
 	$(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE) -- $(TOOL_VBoxNasmDot_AS)\
 		$(flags) $(qaddprefix sh,-i, $(qaddsuffix ,/,$(incs))) $(qaddprefix sh,-D, $(defs))\
 		-l $(outbase).lst\
 		-o $(obj)\
                -MD "$(dep)" -MP\
 		$(abspath $(source))
-endif
+ endif
 	$(QUIET)"$(dotseg_1_TARGET)" "$(obj)"
 endef
 
@@ -96,7 +96,7 @@ dotseg_SOURCES = dotseg.cpp
 TEMPLATE_VBoxR0DrvIFS = Hack to make sure we link a library. IFS must not be physical devices, but DLLs!
 TEMPLATE_VBoxR0DrvIFS_EXTENDS = VBoxGuestR0Drv
 ifdef VBOX_USE_WATCOM_FOR_OS2
-TEMPLATE_VBoxR0DrvIFS_LDFLAGS = $(subst physdevice,dll, $(TEMPLATE_VBoxGuestR0Drv_LDFLAGS))
+ TEMPLATE_VBoxR0DrvIFS_LDFLAGS = $(subst physdevice,dll, $(TEMPLATE_VBoxGuestR0Drv_LDFLAGS))
 endif
 TEMPLATE_VBoxR0DrvIFS_SYSSUFF = .ifs
 TEMPLATE_VBoxR0DrvIFS_DLLSUFF = .ifs
@@ -113,76 +113,76 @@ VBoxSF_INCS         := \
 	. \
 	$(PATH_ROOT)/src/VBox/Runtime/include
 ifdef VBOX_USE_WATCOM_FOR_OS2
-VBoxSF_LDFLAGS      := \
-	OPTION MODNAME='VBoxSF' \
-	SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
-	    TYPE DATA PRELOAD DYNAMIC
-#	OPTION DESCRIPTION "'VirtualBox Guest Additions Shared Folder FSD for OS/2.'" - quoting issues
-# Data exports:
-VBoxSF_LDFLAGS += \
-	EXPORT 'FS_ATTRIBUTE' \
-	EXPORT 'FS_NAME' \
-	EXPORT 'FS_MPSAFEFLAGS2' \
-	EXPORT 'FS32_ATTRIBUTE'
-# 16-bit entry points.
-VBoxSF_LDFLAGS += \
-	EXPORT 'FS_ALLOCATEPAGESPACE' \
-	EXPORT 'FS_ATTACH' \
-	EXPORT 'FS_CANCELLOCKREQUEST' \
-	EXPORT 'FS_CANCELLOCKREQUESTL' \
-	EXPORT 'FS_CHDIR' \
-	EXPORT 'FS_CHGFILEPTR' \
-	EXPORT 'FS_CLOSE' \
-	EXPORT 'FS_COMMIT' \
-	EXPORT 'FS_COPY' \
-	EXPORT 'FS_DELETE' \
-	EXPORT 'FS_DOPAGEIO' \
-	EXPORT 'FS_EXIT' \
-	EXPORT 'FS_FILEATTRIBUTE' \
-	EXPORT 'FS_FILEINFO' \
-	EXPORT 'FS_FILEIO' \
-	EXPORT 'FS_FILELOCKS' \
-	EXPORT 'FS_FILELOCKSL' \
-	EXPORT 'FS_FINDCLOSE' \
-	EXPORT 'FS_FINDFIRST' \
-	EXPORT 'FS_FINDFROMNAME' \
-	EXPORT 'FS_FINDNEXT' \
-	EXPORT 'FS_FINDNOTIFYCLOSE' \
-	EXPORT 'FS_FINDNOTIFYFIRST' \
-	EXPORT 'FS_FINDNOTIFYNEXT' \
-	EXPORT 'FS_FLUSHBUF' \
-	EXPORT 'FS_FSCTL' \
-	EXPORT 'FS_FSINFO' \
-	EXPORT 'FS_INIT' \
-	EXPORT 'FS_IOCTL' \
-	EXPORT 'FS_MKDIR' \
-	EXPORT 'FS_MOUNT' \
-	EXPORT 'FS_MOVE' \
-	EXPORT 'FS_NEWSIZE' \
-	EXPORT 'FS_NEWSIZEL' \
-	EXPORT 'FS_NMPIPE' \
-	EXPORT 'FS_OPENCREATE' \
-	EXPORT 'FS_OPENPAGEFILE' \
-	EXPORT 'FS_PATHINFO' \
-	EXPORT 'FS_PROCESSNAME' \
-	EXPORT 'FS_READ' \
-	EXPORT 'FS_RMDIR' \
-	EXPORT 'FS_SETSWAP' \
-	EXPORT 'FS_SHUTDOWN' \
-	EXPORT 'FS_VERIFYUNCNAME' \
-	EXPORT 'FS_WRITE'
-# 32-bit entry points.
-VBoxSF_LDFLAGS += \
-	EXPORT 'FS32_CHGFILEPTRL' \
-	EXPORT 'FS32_READ' \
-	EXPORT 'FS32_READFILEATCACHE' \
-	EXPORT 'FS32_RETURNFILECACHE' \
-	EXPORT 'FS32_WRITE'
+ VBoxSF_LDFLAGS     := \
+ 	OPTION MODNAME='VBoxSF' \
+ 	SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
+ 	TYPE DATA PRELOAD DYNAMIC
+ #	OPTION DESCRIPTION "'VirtualBox Guest Additions Shared Folder FSD for OS/2.'" - quoting issues
+ # Data exports:
+ VBoxSF_LDFLAGS += \
+ 	EXPORT 'FS_ATTRIBUTE' \
+ 	EXPORT 'FS_NAME' \
+ 	EXPORT 'FS_MPSAFEFLAGS2' \
+ 	EXPORT 'FS32_ATTRIBUTE'
+ # 16-bit entry points.
+ VBoxSF_LDFLAGS += \
+ 	EXPORT 'FS_ALLOCATEPAGESPACE' \
+ 	EXPORT 'FS_ATTACH' \
+ 	EXPORT 'FS_CANCELLOCKREQUEST' \
+ 	EXPORT 'FS_CANCELLOCKREQUESTL' \
+ 	EXPORT 'FS_CHDIR' \
+ 	EXPORT 'FS_CHGFILEPTR' \
+ 	EXPORT 'FS_CLOSE' \
+ 	EXPORT 'FS_COMMIT' \
+ 	EXPORT 'FS_COPY' \
+ 	EXPORT 'FS_DELETE' \
+ 	EXPORT 'FS_DOPAGEIO' \
+ 	EXPORT 'FS_EXIT' \
+ 	EXPORT 'FS_FILEATTRIBUTE' \
+ 	EXPORT 'FS_FILEINFO' \
+ 	EXPORT 'FS_FILEIO' \
+ 	EXPORT 'FS_FILELOCKS' \
+ 	EXPORT 'FS_FILELOCKSL' \
+ 	EXPORT 'FS_FINDCLOSE' \
+ 	EXPORT 'FS_FINDFIRST' \
+ 	EXPORT 'FS_FINDFROMNAME' \
+ 	EXPORT 'FS_FINDNEXT' \
+ 	EXPORT 'FS_FINDNOTIFYCLOSE' \
+ 	EXPORT 'FS_FINDNOTIFYFIRST' \
+ 	EXPORT 'FS_FINDNOTIFYNEXT' \
+ 	EXPORT 'FS_FLUSHBUF' \
+ 	EXPORT 'FS_FSCTL' \
+ 	EXPORT 'FS_FSINFO' \
+ 	EXPORT 'FS_INIT' \
+ 	EXPORT 'FS_IOCTL' \
+ 	EXPORT 'FS_MKDIR' \
+ 	EXPORT 'FS_MOUNT' \
+ 	EXPORT 'FS_MOVE' \
+ 	EXPORT 'FS_NEWSIZE' \
+ 	EXPORT 'FS_NEWSIZEL' \
+ 	EXPORT 'FS_NMPIPE' \
+ 	EXPORT 'FS_OPENCREATE' \
+ 	EXPORT 'FS_OPENPAGEFILE' \
+ 	EXPORT 'FS_PATHINFO' \
+ 	EXPORT 'FS_PROCESSNAME' \
+ 	EXPORT 'FS_READ' \
+ 	EXPORT 'FS_RMDIR' \
+ 	EXPORT 'FS_SETSWAP' \
+ 	EXPORT 'FS_SHUTDOWN' \
+ 	EXPORT 'FS_VERIFYUNCNAME' \
+ 	EXPORT 'FS_WRITE'
+ # 32-bit entry points.
+ VBoxSF_LDFLAGS += \
+ 	EXPORT 'FS32_CHGFILEPTRL' \
+ 	EXPORT 'FS32_READ' \
+ 	EXPORT 'FS32_READFILEATCACHE' \
+ 	EXPORT 'FS32_RETURNFILECACHE' \
+ 	EXPORT 'FS32_WRITE'
 else
-VBoxSF_LDFLAGS      := $(addprefix -Zlinker , \
-	SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
-	    TYPE DATA PRELOAD DYNAMIC)
-#VBoxSF_LDFLAGS      += -s -t -v
+ VBoxSF_LDFLAGS     := $(addprefix -Zlinker , \
+ 	SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
+ 	TYPE DATA PRELOAD DYNAMIC)
+ #VBoxSF_LDFLAGS      += -s -t -v
 endif
 
 VBoxSF_SOURCES       = \
@@ -214,15 +214,15 @@ endif
 #
 PROGRAMS += VBoxSFUtil
 ifdef VBOX_USE_WATCOM_FOR_OS2
-VBoxSFUtil_TEMPLATE = DUMMY
-VBoxSFUtil_TOOL     = OPENWATCOM
-VBoxSFUtil_ASTOOL   = NASM
-VBoxSFUtil_ASFLAGS  = -f obj -DASM_FORMAT_OMF
-VBoxSFUtil_INCS     = $(PATH_TOOL_OPENWATCOM)/h/os2
-VBoxSFUtil_LDFLAGS  = -bcl=os2v2 #"IMPORT DosGlobalInfo doscalls.217"
-VBoxSFUtil_DEFS     = $(DEFS) IN_RING3
+ VBoxSFUtil_TEMPLATE = DUMMY
+ VBoxSFUtil_TOOL    = OPENWATCOM
+ VBoxSFUtil_ASTOOL  = NASM
+ VBoxSFUtil_ASFLAGS = -f obj -DASM_FORMAT_OMF
+ VBoxSFUtil_INCS    = $(PATH_TOOL_OPENWATCOM)/h/os2
+ VBoxSFUtil_LDFLAGS = -bcl=os2v2 #"IMPORT DosGlobalInfo doscalls.217"
+ VBoxSFUtil_DEFS    = $(DEFS) IN_RING3
 else
-VBoxSFUtil_TEMPLATE = VBoxGuestR3Exe
+ VBoxSFUtil_TEMPLATE = VBoxGuestR3Exe
 endif
 VBoxSFUtil_SOURCES  = \
 	VBoxSFUtil.cpp \
diff --git a/src/VBox/Additions/solaris/DRM/Makefile.kmk b/src/VBox/Additions/solaris/DRM/Makefile.kmk
index ff2af43326a..ee7e8bedce8 100644
--- a/src/VBox/Additions/solaris/DRM/Makefile.kmk
+++ b/src/VBox/Additions/solaris/DRM/Makefile.kmk
@@ -50,7 +50,7 @@ vboxvideo_TEMPLATE      = VBoxGuestR0Drv
 vboxvideo_DEFS          = VBOX_WITH_HGCM VBOX_SVN_REV=$(VBOX_SVN_REV)
 vboxvideo_DEPS         += $(VBOX_SVN_REV_KMK)
 if ($(VBOX_SOLARIS_11_UPDATE_VERSION) > 3)
-vboxvideo_DEFS         += VBOX_WITH_SYSTEM_QUEUE_H
+ vboxvideo_DEFS        += VBOX_WITH_SYSTEM_QUEUE_H
 endif
 vboxvideo_INCS         := \
 	include/
diff --git a/src/VBox/Additions/solaris/Makefile.kmk b/src/VBox/Additions/solaris/Makefile.kmk
index a34875f682c..9e74199a164 100644
--- a/src/VBox/Additions/solaris/Makefile.kmk
+++ b/src/VBox/Additions/solaris/Makefile.kmk
@@ -148,7 +148,7 @@ solaris-addcommon_SOURCES = \
 #
 BLDDIRS          += \
 	$(SOLARIS_ADDINST_OUT_DIR) \
-	$(addprefix $(SOLARIS_ADDINST_OUT_DIR)/,\
+	$(addprefix $(SOLARIS_ADDINST_OUT_DIR)/, \
 	opt \
 	opt/VirtualBoxAdditions \
 	opt/VirtualBoxAdditions/$(SOLARIS_ADDDIR_NAME_32) \
@@ -234,27 +234,27 @@ SOLARIS_ADD_SERVICES = \
 
 ifdef VBOX_COMPRESS
  SOLARIS_ADD_COMPRESS_FILES = \
-	$(SOLARIS_ADD_XORG_DRIVERS) \
-	VBoxService \
-	VBoxClient \
-	VBoxControl
+ 	$(SOLARIS_ADD_XORG_DRIVERS) \
+ 	VBoxService \
+ 	VBoxClient \
+ 	VBoxControl
 endif
 
 ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE
-  SOLARIS_ARCH_ADD_DEPFILES = \
-   $(addprefix $(SOLARIS_VBOXADDINST_DIR_64)/,$(SOLARIS_ADD_STRIP_BINS)) \
-	$(addprefix $(SOLARIS_VBOXADDINST_DIR_64)/,$(SOLARIS_ADD_XORG_DRIVERS)) \
-	$(addprefix $(SOLARIS_VBOXADDINST_DIR_32)/,$(SOLARIS_ADD_STRIP_BINS)) \
-	$(addprefix $(SOLARIS_ADD_DRIVERINST_DIR_64)/,$(SOLARIS_ADD_DRIVERS)) \
-	$(addprefix $(SOLARIS_ADD_DRIVERINST_DIR_32)/,$(SOLARIS_ADD_DRIVERS)) \
-	$(addprefix $(SOLARIS_ADD_DRIVERINST_DIR)/,$(SOLARIS_ADD_DRIVERS_CONF)) \
-	$(addprefix $(SOLARIS_VBOXADDINST_DIR_32)/,$(SOLARIS_ADD_XORG_DRIVERS))
+ SOLARIS_ARCH_ADD_DEPFILES  = \
+ 	$(addprefix $(SOLARIS_VBOXADDINST_DIR_64)/,$(SOLARIS_ADD_STRIP_BINS)) \
+ 	$(addprefix $(SOLARIS_VBOXADDINST_DIR_64)/,$(SOLARIS_ADD_XORG_DRIVERS)) \
+ 	$(addprefix $(SOLARIS_VBOXADDINST_DIR_32)/,$(SOLARIS_ADD_STRIP_BINS)) \
+ 	$(addprefix $(SOLARIS_ADD_DRIVERINST_DIR_64)/,$(SOLARIS_ADD_DRIVERS)) \
+ 	$(addprefix $(SOLARIS_ADD_DRIVERINST_DIR_32)/,$(SOLARIS_ADD_DRIVERS)) \
+ 	$(addprefix $(SOLARIS_ADD_DRIVERINST_DIR)/,$(SOLARIS_ADD_DRIVERS_CONF)) \
+ 	$(addprefix $(SOLARIS_VBOXADDINST_DIR_32)/,$(SOLARIS_ADD_XORG_DRIVERS))
 else
-  SOLARIS_ARCH_ADD_DEPFILES = \
-   $(addprefix $(SOLARIS_VBOXADDINST_DIR_ISA)/,$(SOLARIS_ADD_STRIP_BINS)) \
-	$(addprefix $(SOLARIS_ADD_DRIVERINST_DIR_ISA)/,$(SOLARIS_ADD_DRIVERS)) \
-	$(addprefix $(SOLARIS_ADD_DRIVERINST_DIR)/,$(SOLARIS_ADD_DRIVERS_CONF)) \
-	$(addprefix $(SOLARIS_VBOXADDINST_DIR_ISA)/,$(SOLARIS_ADD_XORG_DRIVERS))
+ SOLARIS_ARCH_ADD_DEPFILES  = \
+ 	$(addprefix $(SOLARIS_VBOXADDINST_DIR_ISA)/,$(SOLARIS_ADD_STRIP_BINS)) \
+ 	$(addprefix $(SOLARIS_ADD_DRIVERINST_DIR_ISA)/,$(SOLARIS_ADD_DRIVERS)) \
+ 	$(addprefix $(SOLARIS_ADD_DRIVERINST_DIR)/,$(SOLARIS_ADD_DRIVERS_CONF)) \
+ 	$(addprefix $(SOLARIS_VBOXADDINST_DIR_ISA)/,$(SOLARIS_ADD_XORG_DRIVERS))
 endif
 
 SOLARIS_ARCH_ADD_DEPFILES += \
diff --git a/src/VBox/Additions/solaris/Mouse/Makefile.kmk b/src/VBox/Additions/solaris/Mouse/Makefile.kmk
index 0c453c52cd8..69ce6f6fbb1 100644
--- a/src/VBox/Additions/solaris/Mouse/Makefile.kmk
+++ b/src/VBox/Additions/solaris/Mouse/Makefile.kmk
@@ -66,15 +66,15 @@ vboxmslnk_SOURCES     = vboxmslnk.c
 
 
 if 0 # Broken - unresolved externals: vbglDriver*, RTR0AssertPanicSystem.
-if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
- PROGRAMS += tstVBoxMouse-solaris
- tstVBoxMouse-solaris_TEMPLATE = VBoxR3TstExe
- tstVBoxMouse-solaris_SOURCES  = \
- 	vboxms.c \
- 	testcase/tstVBoxMouse-solaris.c
- tstVBoxMouse-solaris_DEFS     = TESTCASE
- tstVBoxMouse-solaris_LIBS     = $(LIB_RUNTIME)
-endif
+ if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
+  PROGRAMS += tstVBoxMouse-solaris
+  tstVBoxMouse-solaris_TEMPLATE = VBoxR3TstExe
+  tstVBoxMouse-solaris_SOURCES = \
+  	vboxms.c \
+  	testcase/tstVBoxMouse-solaris.c
+  tstVBoxMouse-solaris_DEFS    = TESTCASE
+  tstVBoxMouse-solaris_LIBS    = $(LIB_RUNTIME)
+ endif
 endif
 
 include	$(KBUILD_PATH)/subfooter.kmk
diff --git a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
index 11a207faf8f..ada3bb6137c 100644
--- a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
+++ b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
@@ -62,34 +62,34 @@ else
  vboxfs_SOURCES           += deps.asm
  vboxfs_deps.asm_ASFLAGS   = -f bin -g null
 endif
-if  ($(VBOX_SOLARIS_11_UPDATE_VERSION) > 1 \
- || ($(VBOX_SOLARIS_11_UPDATE_VERSION) == 1 && $(VBOX_SOLARIS_11_BUILD_VERSION) >= 10))
-vboxfs_DEFS         += VBOX_VFS_EXTENDED_POLICY
+if   ($(VBOX_SOLARIS_11_UPDATE_VERSION) > 1 \
+  || ($(VBOX_SOLARIS_11_UPDATE_VERSION) == 1 && $(VBOX_SOLARIS_11_BUILD_VERSION) >= 10))
+ vboxfs_DEFS        += VBOX_VFS_EXTENDED_POLICY
 endif
 
 
 ifndef VBOX_OSE
-#
-# vboxfs_s10 - The Shared Folder Driver for Solaris 10
-#
-SYSMODS.solaris      += vboxfs_s10
-vboxfs_s10_TEMPLATE      = VBoxGuestR0Drv
-vboxfs_s10_DEFS          = VBOX_WITH_HGCM VBOX_VFS_SOLARIS_10U6 VBOX_SVN_REV=$(VBOX_SVN_REV)
-vboxfs_s10_DEPS         += $(VBOX_SVN_REV_KMK)
-vboxfs_s10_INCS         := solaris10/
-vboxfs_s10_SOURCES       = \
-	vboxfs_vfs.c \
-	vboxfs_vnode.c \
-	vboxfs_prov.c
-vboxfs_s10_LIBS          = \
-	$(VBOX_LIB_VBGL_R0) \
-	$(VBOX_LIB_IPRT_GUEST_R0)
-ifeq ($(KBUILD_HOST),solaris)
- vboxfs_s10_LDFLAGS         += -N drv/vboxguest -N misc/ctf
-else
- vboxfs_s10_SOURCES         += deps.asm
- vboxfs_s10_deps.asm_ASFLAGS = -f bin -g null
-endif
+ #
+ # vboxfs_s10 - The Shared Folder Driver for Solaris 10
+ #
+ SYSMODS.solaris     += vboxfs_s10
+ vboxfs_s10_TEMPLATE     = VBoxGuestR0Drv
+ vboxfs_s10_DEFS         = VBOX_WITH_HGCM VBOX_VFS_SOLARIS_10U6 VBOX_SVN_REV=$(VBOX_SVN_REV)
+ vboxfs_s10_DEPS        += $(VBOX_SVN_REV_KMK)
+ vboxfs_s10_INCS        := solaris10/
+ vboxfs_s10_SOURCES      = \
+ 	vboxfs_vfs.c \
+ 	vboxfs_vnode.c \
+ 	vboxfs_prov.c
+ vboxfs_s10_LIBS         = \
+ 	$(VBOX_LIB_VBGL_R0) \
+ 	$(VBOX_LIB_IPRT_GUEST_R0)
+ ifeq ($(KBUILD_HOST),solaris)
+  vboxfs_s10_LDFLAGS        += -N drv/vboxguest -N misc/ctf
+ else
+  vboxfs_s10_SOURCES        += deps.asm
+  vboxfs_s10_deps.asm_ASFLAGS = -f bin -g null
+ endif
 endif # VBOX_OSE
 
 
diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
index 64f450b0a1c..c82e7f0d1a5 100644
--- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
+++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
@@ -30,10 +30,10 @@ include $(KBUILD_PATH)/subheader.kmk
 
 # Use header files from our tree for randr and xinerama. and don't link but rather dlopen libXrand
 # This is mostly because the GA build boxes can have a very old xrandr lib, so instead of linking we dlopen.
-VBOX_WITH_DISTRO_XRAND_XINERAMA=
+VBOX_WITH_DISTRO_XRAND_XINERAMA =
 
 # We don't yet have a seamless mode compilation flag, so define it here unconditionally.
-VBOX_WITH_SEAMLESS:=1
+VBOX_WITH_SEAMLESS := 1
 
 #
 # VBoxClient - clipboard and seamless.
@@ -72,9 +72,9 @@ else
  VBoxDRMClient_DEFS += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
 endif
 VBoxDRMClient_SOURCES = \
-    display-drm.cpp \
-    display-ipc.cpp \
-    logging.cpp
+	display-drm.cpp \
+	display-ipc.cpp \
+	logging.cpp
 
 
 VBoxClient_SOURCES.linux = \
@@ -104,7 +104,7 @@ ifdef VBOX_WITH_DRAG_AND_DROP
  ifdef VBOX_DND_WITH_XTEST
   VBoxClient_DEFS += VBOX_DND_WITH_XTEST
   VBoxClient_LIBS += \
-	Xtst
+  	Xtst
  endif
 endif
 
@@ -113,32 +113,32 @@ endif
 # how else to do that without recompiling or implementing our own memcpy.
 ifeq ($(KBUILD_TARGET),linux)
  VBoxClient_LDFLAGS.amd64 += \
-	-Wl,--wrap=memcpy
+ 	-Wl,--wrap=memcpy
 endif
 
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxClient_DEFS    += VBOX_WITH_GUEST_PROPS
  VBoxClient_SOURCES += \
-	hostversion.cpp
+ 	hostversion.cpp
  VBoxDRMClient_DEFS += VBOX_WITH_GUEST_PROPS
 endif
 
 ifdef VBOX_WITH_DRAG_AND_DROP
  VBoxClient_DEFS     += \
-	VBOX_WITH_DRAG_AND_DROP \
-	$(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
+ 	VBOX_WITH_DRAG_AND_DROP \
+ 	$(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
  VBoxClient_SOURCES  += \
-	draganddrop.cpp
+ 	draganddrop.cpp
  VBoxClient_LIBS     += \
-	$(VBOX_LIB_VBGL_R3) \
-	$(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
+ 	$(VBOX_LIB_VBGL_R3) \
+ 	$(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
 endif
 
 ifdef VBOX_WITH_SEAMLESS
  VBoxClient_DEFS    += VBOX_WITH_SEAMLESS
  VBoxClient_SOURCES += \
-	seamless.cpp \
-	seamless-x11.cpp
+ 	seamless.cpp \
+ 	seamless-x11.cpp
 endif
 
 ifdef VBOX_WITH_VMSVGA
@@ -153,34 +153,34 @@ ifdef VBOX_WITH_VMSVGA
  	display-helper-gnome3.cpp \
  	display-helper-generic.cpp
 
-### include $(PATH_SUB_CURRENT)/helpers/Makefile.kmk
+ ### include $(PATH_SUB_CURRENT)/helpers/Makefile.kmk
 endif
 
 ifdef VBOX_WITH_SHARED_CLIPBOARD
  VBoxClient_DEFS     += VBOX_WITH_SHARED_CLIPBOARD
  VBoxClient_SOURCES  += \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
-	clipboard.cpp
+ 	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
+ 	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
+ 	clipboard.cpp
  ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
   VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS VBOX_WITH_SHARED_CLIPBOARD_GUEST
   VBoxClient_SOURCES += \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
+  	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
+  	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
   ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP
    VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP
    VBoxClient_SOURCES += \
-	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp
+   	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp
   endif
   ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
    VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_FUSE
    # @todo Make this dynamic loading more generic.
    VBoxClient_SOURCES += \
-	$(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \
-	clipboard-fuse.cpp
+   	$(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \
+   	clipboard-fuse.cpp
    # @todo Ditto.
    VBoxClient_INCS    += \
-	$(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount
+   	$(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount
   endif
  endif
 endif
@@ -188,22 +188,22 @@ endif
 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
 
-# Set this in LocalConfig.kmk if you are working on the X11 clipboard service
-# to automatically run the unit test at build time.
-#       OTHERS += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run
+  # Set this in LocalConfig.kmk if you are working on the X11 clipboard service
+  # to automatically run the unit test at build time.
+  #       OTHERS += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run
 
   PROGRAMS += tstSeamlessX11-auto
   tstSeamlessX11-auto_TEMPLATE = VBoxR3TstExe
   tstSeamlessX11-auto_SOURCES = \
-          testcase/tstSeamlessX11-auto.cpp \
-          seamless-x11.cpp
+  	testcase/tstSeamlessX11-auto.cpp \
+  	seamless-x11.cpp
   tstSeamlessX11-auto_DEFS = TESTCASE
   tstSeamlessX11-auto_LIBS = \
-          $(LIB_RUNTIME)
+  	$(LIB_RUNTIME)
 
   TESTING  += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto
-$$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
-       $$(tstSeamlessX11-auto_1_STAGE_TARGET)
+  $$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
+  		$$(tstSeamlessX11-auto_1_STAGE_TARGET)
 	export VBOX_LOG_DEST=nofile; $(tstSeamlessX11-auto_1_STAGE_TARGET) quiet
 	$(QUIET)$(APPEND) -t "$@" "done"
 
@@ -215,21 +215,21 @@ $$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
   PROGRAMS += tstSeamlessX11
   tstSeamlessX11_TEMPLATE = VBoxR3TstExe
   tstSeamlessX11_SOURCES = \
-          testcase/tstSeamlessX11.cpp \
-          seamless.cpp \
-          seamless-x11.cpp
+  	testcase/tstSeamlessX11.cpp \
+  	seamless.cpp \
+  	seamless-x11.cpp
   ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    tstSeamlessX11_DEFS  += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
   else
    tstSeamlessX11_DEFS  += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
   endif
   tstSeamlessX11_LIBPATH = \
-          $(VBOX_LIBPATH_X11)
+  	$(VBOX_LIBPATH_X11)
   tstSeamlessX11_LIBS = \
-          $(LIB_RUNTIME) \
-          Xext \
-          Xmu \
-          X11
+  	$(LIB_RUNTIME) \
+  	Xext \
+  	Xmu \
+  	X11
  endif
 endif
 
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
index e9936c039c7..c12c9a3698a 100644
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -47,27 +47,27 @@ if1of ($(KBUILD_TARGET), linux)
  # unsigned long is 64bits
  vboxmouse_drv_DEFS.amd64 += _XSERVER64
  vboxmouse_drv_DEFS += \
-        _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE _DEFAULT_SOURCE \
-	_BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
-	XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
-	GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
-	XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
-	BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
-	IN_MODULE XFree86Module PNP_MOUSE IN_XF86_MODULE
+ 	_POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE _DEFAULT_SOURCE \
+ 	_BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
+ 	XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
+ 	GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
+ 	XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
+ 	BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
+ 	IN_MODULE XFree86Module PNP_MOUSE IN_XF86_MODULE
  vboxmouse_drv_INCS := \
-	$(VBOX_PATH_X11_ROOT)/XFree86-4.3 \
-	$(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11 \
-	$(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11/extensions \
-	$(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver \
-	$(PATH_SUB_CURRENT)
+ 	$(VBOX_PATH_X11_ROOT)/XFree86-4.3 \
+ 	$(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11 \
+ 	$(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11/extensions \
+ 	$(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver \
+ 	$(PATH_SUB_CURRENT)
  vboxmouse_drv_SOURCES = \
-	vboxmouse.c
+ 	vboxmouse.c
  # Any global symbols in the driver object files will be added to XFree86's
  # symbol table, which can cause problems if we e.g. define a symbol in two
  # modules.
  vboxmouse_drv_POST_CMDS = \
-	objcopy --keep-global-symbol vboxmouseModuleData $(out) $(out)-objcopy$$(NLTAB) \
-	$(MV) -f $(out)-objcopy $(out)
+ 	objcopy --keep-global-symbol vboxmouseModuleData $(out) $(out)-objcopy$$(NLTAB) \
+ 	$(MV) -f $(out)-objcopy $(out)
 endif
 
 
@@ -156,82 +156,82 @@ vboxmouse_drv_16_SOURCES = \
 	vboxmouse.c
 
 
-ifneq ($(KBUILD_TARGET), linux)
-
-#
-# vboxmouse_drv_17
-#
-DLLS += vboxmouse_drv_17
-vboxmouse_drv_17_TEMPLATE = VBoxGuestR3XOrgMod
-vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-vboxmouse_drv_17_INCS := \
-	$(vboxmouse_xorg_INCS) \
-	$(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7 \
-	$(PATH_SUB_CURRENT)
-vboxmouse_drv_17_SOURCES = \
-	vboxmouse.c
-
-
-#
-# vboxmouse_drv_18
-#
-DLLS += vboxmouse_drv_18
-vboxmouse_drv_18_TEMPLATE = VBoxGuestR3XOrgMod
-vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-vboxmouse_drv_18_INCS := \
-	$(vboxmouse_xorg_INCS) \
-	$(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0 \
-	$(PATH_SUB_CURRENT)
-vboxmouse_drv_18_SOURCES = \
-	vboxmouse.c
-
-
-#
-# vboxmouse_drv_19
-#
-DLLS += vboxmouse_drv_19
-vboxmouse_drv_19_TEMPLATE = VBoxGuestR3XOrgMod
-vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-vboxmouse_drv_19_INCS := \
-	$(vboxmouse_xorg_INCS) \
-	$(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 \
-	$(PATH_SUB_CURRENT)
-vboxmouse_drv_19_SOURCES = \
-	vboxmouse.c
-
-
-#
-# vboxmouse_drv_110
-#
-DLLS += vboxmouse_drv_110
-vboxmouse_drv_110_TEMPLATE = VBoxGuestR3XOrgMod
-vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-vboxmouse_drv_110_INCS := \
-	$(vboxmouse_xorg_INCS) \
-	$(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 \
-	$(PATH_SUB_CURRENT)
-vboxmouse_drv_110_SOURCES = \
-	vboxmouse.c
-
-DLLS += vboxmouse_drv_111
-vboxmouse_drv_111_TEMPLATE = VBoxGuestR3XOrgMod
-vboxmouse_drv_111_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-vboxmouse_drv_111_INCS := \
-	$(vboxmouse_xorg_INCS) \
-	$(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 \
-	$(PATH_SUB_CURRENT)
-vboxmouse_drv_111_SOURCES = \
-	vboxmouse.c
-
-DLLS += vboxmouse_drv_112
-vboxmouse_drv_112_TEMPLATE = VBoxGuestR3XOrgMod
-vboxmouse_drv_112_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-vboxmouse_drv_112_INCS := \
-    $(vboxmouse_xorg_INCS) \
-	$(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 \
-	$(PATH_SUB_CURRENT)
-vboxmouse_drv_112_SOURCES = \
-	vboxmouse.c
+ifneq ($(KBUILD_TARGET),linux)
+
+ #
+ # vboxmouse_drv_17
+ #
+ DLLS += vboxmouse_drv_17
+ vboxmouse_drv_17_TEMPLATE = VBoxGuestR3XOrgMod
+ vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_17_INCS := \
+ 	$(vboxmouse_xorg_INCS) \
+ 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7 \
+ 	$(PATH_SUB_CURRENT)
+ vboxmouse_drv_17_SOURCES = \
+ 	vboxmouse.c
+
+
+ #
+ # vboxmouse_drv_18
+ #
+ DLLS += vboxmouse_drv_18
+ vboxmouse_drv_18_TEMPLATE = VBoxGuestR3XOrgMod
+ vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_18_INCS := \
+ 	$(vboxmouse_xorg_INCS) \
+ 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0 \
+ 	$(PATH_SUB_CURRENT)
+ vboxmouse_drv_18_SOURCES = \
+ 	vboxmouse.c
+
+
+ #
+ # vboxmouse_drv_19
+ #
+ DLLS += vboxmouse_drv_19
+ vboxmouse_drv_19_TEMPLATE = VBoxGuestR3XOrgMod
+ vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_19_INCS := \
+ 	$(vboxmouse_xorg_INCS) \
+ 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 \
+ 	$(PATH_SUB_CURRENT)
+ vboxmouse_drv_19_SOURCES = \
+ 	vboxmouse.c
+
+
+ #
+ # vboxmouse_drv_110
+ #
+ DLLS += vboxmouse_drv_110
+ vboxmouse_drv_110_TEMPLATE = VBoxGuestR3XOrgMod
+ vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_110_INCS := \
+ 	$(vboxmouse_xorg_INCS) \
+ 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 \
+ 	$(PATH_SUB_CURRENT)
+ vboxmouse_drv_110_SOURCES = \
+ 	vboxmouse.c
+
+ DLLS += vboxmouse_drv_111
+ vboxmouse_drv_111_TEMPLATE = VBoxGuestR3XOrgMod
+ vboxmouse_drv_111_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_111_INCS := \
+ 	$(vboxmouse_xorg_INCS) \
+ 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 \
+ 	$(PATH_SUB_CURRENT)
+ vboxmouse_drv_111_SOURCES = \
+ 	vboxmouse.c
+
+ DLLS += vboxmouse_drv_112
+ vboxmouse_drv_112_TEMPLATE = VBoxGuestR3XOrgMod
+ vboxmouse_drv_112_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_112_INCS := \
+ 	$(vboxmouse_xorg_INCS) \
+ 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 \
+ 	$(PATH_SUB_CURRENT)
+ vboxmouse_drv_112_SOURCES = \
+ 	vboxmouse.c
 
 endif # neq ($(KBUILD_TARGET),linux)
 
@@ -248,7 +248,7 @@ endif
 # symbols.  Not very elegant, but it will catch problems early.
 
 ifdef VBOX_WITH_TESTCASES
-# ifndef VBOX_ONLY_ADDITIONS
+ # ifndef VBOX_ONLY_ADDITIONS
  ifndef VBOX_USE_SYSTEM_XORG_HEADERS
   ifeq ($(KBUILD_TARGET),linux)
    ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
@@ -258,16 +258,16 @@ ifdef VBOX_WITH_TESTCASES
      ifeq ($(KBUILD_TARGET),linux)
       TESTING += $(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run
       OTHERS += $(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run
-$$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run: $$(vboxmouse_drv_1_STAGE_TARGET)
+      $$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run: $$(vboxmouse_drv_1_STAGE_TARGET)
 	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
 	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
 	    "$(vboxmouse_drv_1_STAGE_TARGET)" --static "$(VBOXMOUSE_SRC_PATH)/../undefined_xfree86" "$(VBOXMOUSE_SRC_PATH)/../undefined_xfree86_modules"
 	$(QUIET)$(APPEND) -t "$@" "done"
      endif
 
-##
-# Using the extra expansion to replace $(ver) before eval, thus everything
-# else needs escaped dollars.
+     ##
+     # Using the extra expansion to replace $(ver) before eval, thus everything
+     # else needs escaped dollars.
      define def_vboxmouse_test
       TESTING += $$(vboxmouse_drv$(ver)_0_OUTDIR)/tstvboxmouse$(ver).run
       OTHERS  += $$(vboxmouse_drv$(ver)_0_OUTDIR)/tstvboxmouse$(ver).run
@@ -276,11 +276,11 @@ $$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run: $$(vboxmouse_drv_1_STAGE_TARGET)
 	$$(QUIET)$$(ASH) $$(PATH_ROOT)/src/bldprogs/checkUndefined.sh $$(KBUILD_HOST)  \
 	        $$(vboxmouse_drv$(ver)_1_STAGE_TARGET) $$(VBOXMOUSE_SRC_PATH)/../undefined_xfree86 $(VBOXMOUSE_SRC_PATH)/../undefined_xfree86_modules $$(VBOXMOUSE_SRC_PATH)/../undefined_xorg
 	$$(QUIET)$$(APPEND) -t "$$@" "done"
-    endef
+     endef
 
      $(foreach ver, _70 _71 _13 _14 _15 _16, $(eval $(def_vboxmouse_test)))
 
-     ifneq ($(KBUILD_TARGET), linux)
+     ifneq ($(KBUILD_TARGET),linux)
       $(foreach ver, _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxmouse_test)))
 
      endif # neq ($(KBUILD_TARGET),linux)
@@ -289,7 +289,7 @@ $$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run: $$(vboxmouse_drv_1_STAGE_TARGET)
    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
   endif # eq ($(KBUILD_TARGET),linux)
  endif # ! VBOX_USE_SYSTEM_XORG_HEADERS
-# endif # ! VBOX_ONLY_ADDITIONS
+ # endif # ! VBOX_ONLY_ADDITIONS
 endif # VBOX_WITH_TESTCASES
 
 include $(FILE_KBUILD_SUB_FOOTER)
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
index 162072088ae..4a9e8c384d3 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -120,10 +120,10 @@ vboxvideo_drv_SOURCES = \
 	vboxvideo.c \
 	vbva.c \
 	$(vboxvideo_drv_lib_SOURCES)
- # Any global symbols in the driver object files will be added to XFree86's
- # symbol table, which can cause problems if we e.g. define a symbol in two
- # modules.
- vboxvideo_drv_POST_CMDS = \
+# Any global symbols in the driver object files will be added to XFree86's
+# symbol table, which can cause problems if we e.g. define a symbol in two
+# modules.
+vboxvideo_drv_POST_CMDS  = \
 	objcopy --keep-global-symbol vboxvideoModuleData $(out) $(out)-objcopy$$(NLTAB) \
 	$(MV) -f $(out)-objcopy $(out)
 
@@ -220,7 +220,7 @@ vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10600000
 vboxvideo_drv_16_INCS = \
 	$(vboxvideo_xorg_INCS) \
 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.6.5 \
-vboxvideo_drv_16_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
+	vboxvideo_drv_16_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
 vboxvideo_drv_16_LIBS += $(vboxvideo_drv_70_LIBS)
 
@@ -410,13 +410,13 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
  SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
  vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod
  vboxvideo_drv_system_CFLAGS := \
-        $(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
+ 	$(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
  vboxvideo_drv_system_DEFS := $(filter-out _XORG_SERVER_H_ _DIX_CONFIG_H_, $(vboxvideo_15_DEFS))
  vboxvideo_drv_system_INCS += \
-        $(PATH_ROOT)/src/VBox/Runtime/include \
-        $(VBOX_GRAPHICS_INCS) \
-        /usr/include/xorg \
-        /usr/include/pixman-1
+ 	$(PATH_ROOT)/src/VBox/Runtime/include \
+ 	$(VBOX_GRAPHICS_INCS) \
+ 	/usr/include/xorg \
+ 	/usr/include/pixman-1
  vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_17_SOURCES)
 endif
 
@@ -425,9 +425,9 @@ endif
 # symbols.  Not very elegant, but it will catch problems early.
 
 ifdef VBOX_WITH_TESTCASES
-# ifndef VBOX_ONLY_ADDITIONS
+ # ifndef VBOX_ONLY_ADDITIONS
  ifndef VBOX_USE_SYSTEM_XORG_HEADERS
-  if1of ($(KBUILD_TARGET),linux solaris)
+  if1of ($(KBUILD_TARGET), linux solaris)
    ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
     ifndef VBOX_ONLY_SDK
      VBOXVIDEO_SRC_PATH := $(PATH_SUB_CURRENT)
@@ -435,16 +435,16 @@ ifdef VBOX_WITH_TESTCASES
      ifeq ($(KBUILD_TARGET),linux)
       TESTING += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run
       OTHERS += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run
-$$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run: $$(vboxvideo_drv_1_STAGE_TARGET)
+      $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run: $$(vboxvideo_drv_1_STAGE_TARGET)
 	$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
 	$(QUIET)$(ASH) $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
 	    $(vboxvideo_drv_1_STAGE_TARGET) --static $(VBOXVIDEO_SRC_PATH)/../undefined_xfree86 $(VBOXVIDEO_SRC_PATH)/../undefined_xfree86_modules
 	$(QUIET)$(APPEND) -t "$@" "done"
      endif
 
-##
-# Using the extra expansion to replace $(ver) before eval, thus everything
-# else needs escaped dollars.
+     ##
+     # Using the extra expansion to replace $(ver) before eval, thus everything
+     # else needs escaped dollars.
      define def_vboxvideo_test
       TESTING += $$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run
       OTHERS  += $$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run
@@ -453,15 +453,15 @@ $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run: $$(vboxvideo_drv_1_STAGE_TARGET)
 	$$(QUIET)$$(ASH) $$(PATH_ROOT)/src/bldprogs/checkUndefined.sh $$(KBUILD_HOST)  \
 	        $$(vboxvideo_drv$(ver)_1_STAGE_TARGET) $$(VBOXVIDEO_SRC_PATH)/../undefined_xfree86 $(VBOXVIDEO_SRC_PATH)/../undefined_xfree86_modules $$(VBOXVIDEO_SRC_PATH)/../undefined_xorg
 	$$(QUIET)$$(APPEND) -t "$$@" "done"
-    endef
+     endef
 
-    $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117 _118, $(eval $(def_vboxvideo_test)))
+     $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117 _118, $(eval $(def_vboxvideo_test)))
 
     endif # ! VBOX_ONLY_SDK
    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
   endif # 1of ($(KBUILD_TARGET),linux solaris)
  endif # ! VBOX_USE_SYSTEM_XORG_HEADERS
-# endif # ! VBOX_ONLY_ADDITIONS
+ # endif # ! VBOX_ONLY_ADDITIONS
 endif # VBOX_WITH_TESTCASES
 
 include $(FILE_KBUILD_SUB_FOOTER)