Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 75611)
+++ /trunk/Config.kmk	(revision 75612)
@@ -468,5 +468,5 @@
 # Only will be used at runtime when "VBoxInternal2/Audio/Debug/Enabled" (VM / global) is set.
 VBOX_WITH_AUDIO_DEBUG = 1
-ifdef VBOX_WITH_VALIDATIONKIT
+ifdef VBOX_WITH_VALIDATIONKIT ## @todo r=bird: test is too early!
  VBOX_WITH_AUDIO_VALIDATIONKIT = 1
 endif
@@ -1000,11 +1000,12 @@
 ifdef VBOX_QUICK
  # undefine variables by assigning blank.
+ VBOX_WITH_ADDITIONS=
  VBOX_WITH_VALIDATIONKIT=
  VBOX_WITH_TESTCASES=
- VBOX_WITH_MAIN=
  VBOX_WITH_VBOXSDL=
- VBOX_WITH_QTGUI=
- VBOX_WITH_DEBUGGER_GUI=
+ VBOX_WITH_HEADLESS=
+ VBOX_WITH_VRDP=
  VBOX_WITH_DOCS=
+ VBOX_WITH_WEBSERVICES=
 endif # VBOX_QUICK