Index: /trunk/src/Makefile.kmk
===================================================================
--- /trunk/src/Makefile.kmk	(revision 64921)
+++ /trunk/src/Makefile.kmk	(revision 64922)
@@ -21,5 +21,5 @@
 include $(PATH_SUB_CURRENT)/bldprogs/Makefile.kmk
 include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
-if !defined(VBOX_ONLY_ADDITIONS)
+if !defined(VBOX_ONLY_ADDITIONS) || "$(KBUILD_TARGET)" == "win"
  include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
 endif
Index: /trunk/src/libs/Makefile.kmk
===================================================================
--- /trunk/src/libs/Makefile.kmk	(revision 64921)
+++ /trunk/src/libs/Makefile.kmk	(revision 64922)
@@ -33,5 +33,8 @@
 
 # PNG support (for screenshots).
-if !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_VALIDATIONKIT) \
+if  !defined(VBOX_ONLY_ADDITIONS) \
+ && !defined(VBOX_ONLY_DOCS) \
+ && !defined(VBOX_ONLY_SDK) \
+ && !defined(VBOX_ONLY_VALIDATIONKIT) \
  && "$(SDK_VBOX_LIBPNG_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.2.54"
  include $(PATH_SUB_CURRENT)/libpng-1.2.54/Makefile.kmk
@@ -39,5 +42,9 @@
 
 # Libcurl for inet access
-if defined(VBOX_WITH_LIBCURL) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_VALIDATIONKIT) \
+if  defined(VBOX_WITH_LIBCURL) \
+ && !defined(VBOX_ONLY_ADDITIONS) \
+ && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) \
+ && !defined(VBOX_ONLY_SDK) \
+ && !defined(VBOX_ONLY_VALIDATIONKIT) \
  && "$(SDK_VBOX_LIBCURL_INCS)" == "$(PATH_ROOT)/src/libs/curl-7.50.3/include"
  include $(PATH_SUB_CURRENT)/curl-7.50.3/Makefile.kmk
@@ -50,5 +57,5 @@
 
 # OpenSSL.
-if !defined(VBOX_ONLY_SDK) \
+if  !defined(VBOX_ONLY_SDK) \
  && (   "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
      || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
@@ -63,6 +70,8 @@
 # Main related things - XPCOM and XSLT.
 if defined(VBOX_WITH_MAIN) \
+ && !defined(VBOX_ONLY_ADDITIONS) \
  && !defined(VBOX_ONLY_EXTPACKS) \
  && !defined(VBOX_ONLY_VALIDATIONKIT)
+
  if defined(VBOX_WITH_XPCOM) && !defined(VBOX_ONLY_DOCS)
   include $(PATH_SUB_CURRENT)/xpcom18a4/Makefile.kmk