Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 29807)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 29808)
@@ -91,5 +91,5 @@
 endif
 VirtualBox_SDKS.win = WINPSDK DXSDK
-ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(KBUILD_TARGET)),) # X11 + os2 ## @todo solaris
+if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd os2) # X11 + os2 ## @todo solaris
  VirtualBox_SDKS += LIBSDL
 endif
@@ -102,5 +102,5 @@
 VirtualBox_DEFS           =
 VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
-VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
+VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE
 ifndef VBOX_WITH_COCOA_QT
 VirtualBox_DEFS.darwin.x86= USE_HID_FOR_MODIFIERS
@@ -112,5 +112,4 @@
 VirtualBox_DEFS.solaris   = VBOX_GUI_USE_QIMAGE #VBOX_GUI_USE_SDL
 VirtualBox_DEFS.win       = VBOX_GUI_USE_QIMAGE UNICODE QT_DLL
-VirtualBox_DEFS.win.amd64 = VBOX_WITHOUT_QHTTP
 ifdef VBOX_WITH_ICHAT_THEATER
  VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
@@ -138,5 +137,5 @@
 ifdef VBOX_WITH_VIDEOHWACCEL
  VirtualBox_DEFS        += VBOX_WITH_VIDEOHWACCEL \
-            VBOX_GUI_USE_QGL
+	VBOX_GUI_USE_QGL
 else ifdef VBOX_GUI_USE_QGL
  VirtualBox_DEFS        += VBOX_GUI_USE_QGL
@@ -215,7 +214,6 @@
 
 VirtualBox_LDFLAGS.darwin = \
-	-framework IOKit -framework AppKit -framework ApplicationServices -framework Foundation -framework Carbon \
+	-framework AppKit -framework Carbon \
 	$(if $(VBOX_WITH_HARDENING),-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VirtualBox.dylib)
-VirtualBox_LDFLAGS.darwin.x86 = -framework QuickTime
 ifdef VBOX_WITH_ICHAT_THEATER
  VirtualBox_LDFLAGS.darwin += -framework InstantMessage -framework QuartzCore
@@ -229,5 +227,5 @@
 	$(PATH_SDK_DXSDK_LIB)/ddraw.lib \
 	$(PATH_SDK_DXSDK_LIB)/dxguid.lib
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
+if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
  VirtualBox_LIBS         += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
 endif
@@ -480,5 +478,5 @@
 	src/darwin/UICocoaDockIconPreview.mm
 
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
+if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
  ifndef VBOX_OSE
   VirtualBox_QT_MOCHDRS += \
@@ -541,5 +539,5 @@
 
 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
-VirtualBox_QT_MODULES += OpenGL
+ VirtualBox_QT_MODULES += OpenGL
 endif
 
@@ -743,5 +741,4 @@
 		'-DVBOX_GUI_USE_QUARTZ2D' \
 		'-DVBOX_GUI_USE_QIMAGE' \
-		'-DVBOX_WITHOUT_QHTTP' \
 		'-o' $@ $<
 endif