Index: /trunk/src/VBox/Installer/win/Properties.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/Properties.wxi	(revision 58598)
+++ /trunk/src/VBox/Installer/win/Properties.wxi	(revision 58599)
@@ -58,32 +58,3 @@
   <?endif ?>
 
-  <!-- Define our own public properties here in order to get those also recognized in case
-       case we're building the installer as MSM modules -->
-
-  <!-- Default property for network adapter type -->
-  <Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes"/>
-
-  <!-- Force NDIS5 on pre-Vista -->
-  <SetProperty Id="NETWORKTYPE" After="CostFinalize" Value="NDIS5"><![CDATA[(NETWORKTYPE="NDIS6") AND (VersionNT < 600)]]></SetProperty>
-
-    <!-- Whether or not a desktop shortcut should be created. -->
-    <Property Id="VBOX_INSTALLDESKTOPSHORTCUT" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOX_INSTALLDESKTOPSHORTCUT" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOX_INSTALLDESKTOPSHORTCUT="0"]]></SetProperty>
-
-    <!-- Whether or not a desktop shortcut for the Quick Launch Bar should be created -->
-    <Property Id="VBOX_INSTALLQUICKLAUNCHSHORTCUT" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOX_INSTALLQUICKLAUNCHSHORTCUT" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOX_INSTALLQUICKLAUNCHSHORTCUT="0"]]></SetProperty>
-
-    <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created -->
-    <Property Id="VBOX_REGISTERFILEEXTENSIONS" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOX_REGISTERFILEEXTENSIONS" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOX_REGISTERFILEEXTENSIONS="0"]]></SetProperty>
-
-    <!-- Whether or not VirtualBox should be started automatically right after successful installation -->
-    <Property Id="VBOX_START" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOX_START" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOX_START="0"]]></SetProperty>
-
 </Include>
Index: /trunk/src/VBox/Installer/win/PublicProperties.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/PublicProperties.wxi	(revision 58599)
+++ /trunk/src/VBox/Installer/win/PublicProperties.wxi	(revision 58599)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    VirtualBox Windows Installation Script (WiX)
+
+    Copyright (C) 2015 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+-->
+
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wix"
+         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
+
+<!-- Define our own public properties here in order to get those also recognized in case
+     case we're building the installer as MSM modules -->
+
+<!-- Default property for network adapter type -->
+<Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes"/>
+
+<!-- Force NDIS5 on pre-Vista -->
+<SetProperty Id="NETWORKTYPE" After="CostFinalize" Value="NDIS5"><![CDATA[(NETWORKTYPE="NDIS6") AND (VersionNT < 600)]]></SetProperty>
+
+  <!-- Whether or not a desktop shortcut should be created. -->
+  <Property Id="VBOX_INSTALLDESKTOPSHORTCUT" Value="1" Secure="yes"/>
+  <SetProperty Id="VBOX_INSTALLDESKTOPSHORTCUT" After="AppSearch" Sequence="both"
+               Value="{}"><![CDATA[VBOX_INSTALLDESKTOPSHORTCUT="0"]]></SetProperty>
+
+  <!-- Whether or not a desktop shortcut for the Quick Launch Bar should be created -->
+  <Property Id="VBOX_INSTALLQUICKLAUNCHSHORTCUT" Value="1" Secure="yes"/>
+  <SetProperty Id="VBOX_INSTALLQUICKLAUNCHSHORTCUT" After="AppSearch" Sequence="both"
+               Value="{}"><![CDATA[VBOX_INSTALLQUICKLAUNCHSHORTCUT="0"]]></SetProperty>
+
+  <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created -->
+  <Property Id="VBOX_REGISTERFILEEXTENSIONS" Value="1" Secure="yes"/>
+  <SetProperty Id="VBOX_REGISTERFILEEXTENSIONS" After="AppSearch" Sequence="both"
+               Value="{}"><![CDATA[VBOX_REGISTERFILEEXTENSIONS="0"]]></SetProperty>
+
+  <!-- Whether or not VirtualBox should be started automatically right after successful installation -->
+  <Property Id="VBOX_START" Value="1" Secure="yes"/>
+  <SetProperty Id="VBOX_START" After="AppSearch" Sequence="both"
+               Value="{}"><![CDATA[VBOX_START="0"]]></SetProperty>
+</Include>
Index: /trunk/src/VBox/Installer/win/VBoxMergeApp.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeApp.wxs	(revision 58598)
+++ /trunk/src/VBox/Installer/win/VBoxMergeApp.wxs	(revision 58599)
@@ -49,4 +49,6 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">
Index: /trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs	(revision 58598)
+++ /trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs	(revision 58599)
@@ -34,4 +34,6 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs	(revision 58598)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs	(revision 58599)
@@ -34,4 +34,6 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs	(revision 58598)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs	(revision 58599)
@@ -34,4 +34,6 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxs	(revision 58598)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxs	(revision 58599)
@@ -34,4 +34,6 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>                 
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs	(revision 58598)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs	(revision 58599)
@@ -34,4 +34,6 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">
Index: /trunk/src/VBox/Installer/win/VBoxMergePython.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergePython.wxs	(revision 58598)
+++ /trunk/src/VBox/Installer/win/VBoxMergePython.wxs	(revision 58599)
@@ -34,4 +34,6 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">
Index: /trunk/src/VBox/Installer/win/VBoxMergeUSB.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeUSB.wxs	(revision 58598)
+++ /trunk/src/VBox/Installer/win/VBoxMergeUSB.wxs	(revision 58599)
@@ -34,4 +34,6 @@
                  SummaryCodepage="1252"/>
 
+        <?include PublicProperties.wxi ?>
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">
Index: /trunk/src/VBox/Installer/win/VirtualBox.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58598)
+++ /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58599)
@@ -61,5 +61,5 @@
     <Property Id="ARPURLINFOABOUT">http://www.virtualbox.org</Property>
     <Property Id="ARPURLUPDATEINFO">http://www.virtualbox.org</Property>
-    
+
     <!-- Install the product for all users on the system -->
     <Property Id="ALLUSERS"><![CDATA[1]]></Property>
@@ -67,4 +67,6 @@
     <!-- Force overwriting all files and re-create shortcuts to guarantee a working environment -->
     <Property Id='REINSTALLMODE' Value='amus'/>
+
+    <?include PublicProperties.wxi ?>
 
     <!-- Make sure installation will not start on anything other but the NT family -->