From 8fc71247da78a971cda993adcbb10be2007e205c Mon Sep 17 00:00:00 2001
From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Mon, 30 Mar 2009 22:49:25 +0000
Subject: [PATCH] [WinOF] Using the WIX preprocessor OS*\arch*\wof.wxs files
 (all 10 of them) have been distilled down to be manageable. WIX common
 install sections are now included from WinOF\WIX\common\.

git-svn-id: svn://openib.tc.cornell.edu/gen1@2067 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 trunk/WinOF/WIX/common/DAT_config.inc        |  149 ++
 trunk/WinOF/WIX/common/Docs.inc              |   57 +
 trunk/WinOF/WIX/common/IBcore.inc            |   89 +
 trunk/WinOF/WIX/common/InstallExecuteSeq.inc |   69 +
 trunk/WinOF/WIX/common/OpenSM_service.inc    |   33 +
 trunk/WinOF/WIX/common/WinOF_cfg.inc         |   11 +
 trunk/WinOF/WIX/common/checked.inc           |  176 ++
 trunk/WinOF/WIX/common/dapl_rt.inc           |  157 ++
 trunk/WinOF/WIX/common/ib_sdk.inc            |  354 ++++
 trunk/WinOF/WIX/common/ipoib.inc             |   53 +
 trunk/WinOF/WIX/common/mlnx_drivers.inc      |   86 +
 trunk/WinOF/WIX/common/requirements.inc      |   57 +
 trunk/WinOF/WIX/common/tools.inc             |   54 +
 trunk/WinOF/WIX/common/winverbs_OFED.inc     |  223 +++
 trunk/WinOF/WIX/common/winverbs_drivers.inc  |   30 +
 trunk/WinOF/WIX/win7/ia64/wof.wxs            | 1559 +----------------
 trunk/WinOF/WIX/win7/x64/wof.wxs             | 1592 +----------------
 trunk/WinOF/WIX/win7/x86/wof.wxs             | 1632 ++----------------
 trunk/WinOF/WIX/wlh/ia64/wof.wxs             | 1557 +----------------
 trunk/WinOF/WIX/wlh/x64/wof.wxs              | 1588 +----------------
 trunk/WinOF/WIX/wlh/x86/wof.wxs              | 1632 ++----------------
 trunk/WinOF/WIX/wnet/ia64/wof.wxs            | 1548 +----------------
 trunk/WinOF/WIX/wnet/x64/wof.wxs             | 1608 +----------------
 trunk/WinOF/WIX/wnet/x86/wof.wxs             | 1615 ++---------------
 trunk/WinOF/WIX/wxp/x86/wof.wxs              | 1618 ++---------------
 25 files changed, 2578 insertions(+), 14969 deletions(-)
 create mode 100644 trunk/WinOF/WIX/common/DAT_config.inc
 create mode 100644 trunk/WinOF/WIX/common/Docs.inc
 create mode 100644 trunk/WinOF/WIX/common/IBcore.inc
 create mode 100644 trunk/WinOF/WIX/common/InstallExecuteSeq.inc
 create mode 100644 trunk/WinOF/WIX/common/OpenSM_service.inc
 create mode 100644 trunk/WinOF/WIX/common/WinOF_cfg.inc
 create mode 100644 trunk/WinOF/WIX/common/checked.inc
 create mode 100644 trunk/WinOF/WIX/common/dapl_rt.inc
 create mode 100644 trunk/WinOF/WIX/common/ib_sdk.inc
 create mode 100644 trunk/WinOF/WIX/common/ipoib.inc
 create mode 100644 trunk/WinOF/WIX/common/mlnx_drivers.inc
 create mode 100644 trunk/WinOF/WIX/common/requirements.inc
 create mode 100644 trunk/WinOF/WIX/common/tools.inc
 create mode 100644 trunk/WinOF/WIX/common/winverbs_OFED.inc
 create mode 100644 trunk/WinOF/WIX/common/winverbs_drivers.inc

diff --git a/trunk/WinOF/WIX/common/DAT_config.inc b/trunk/WinOF/WIX/common/DAT_config.inc
new file mode 100644
index 00000000..a80eeff9
--- /dev/null
+++ b/trunk/WinOF/WIX/common/DAT_config.inc
@@ -0,0 +1,149 @@
+<Include>
+    <Component Id="cDatCfg"
+               Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >
+      <CreateFolder />
+      <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"
+             LongName="dat.conf" Name="dat.conf"
+             Source="..\..\dat.conf" />
+    </Component>
+
+    <Directory Id="v1_1" Name="v1-1">
+      <Component Id="cDATV1"
+                 Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">
+        <CreateFolder />
+      </Component>
+
+      <Directory Id="DDID" Name="DAT">    
+        <Component Id="cDatBldV1Hdrs"
+                  Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
+          <CreateFolder />    
+          <File Id="dat.h" Compressed="yes" DiskId="1"    
+                LongName="dat.h" Name="dat.h"    
+                Source="..\bin\DAPL\dat.h" />    
+
+          <File Id="dat_error.h" Compressed="yes" DiskId="1"    
+                LongName="dat_error.h" Name="dat.h"    
+                Source="..\bin\DAPL\dat_error.h" />    
+  
+          <File Id="dat_platform_specific.h" Compressed="yes"    
+                DiskId="1" LongName="dat_platform_specific.h"    
+                Name="dat_plat.h"    
+               Source="..\bin\DAPL\dat_platform_specific.h" />    
+  
+          <File Id="dat_redirection.h" Compressed="yes"    
+                DiskId="1" LongName="dat_redirection.h"    
+                Name="dat_redi.h"    
+                Source="..\bin\DAPL\dat_redirection.h" />    
+  
+          <File Id="dat_registry.h" Compressed="yes"    
+                DiskId="1" LongName="dat_registry.h"    
+                Name="dat_reg.h"    
+                Source="..\bin\DAPL\dat_registry.h" />    
+  
+          <File Id="dat_vendor_specific.h" Compressed="yes"    
+                DiskId="1" LongName="dat_vendor_specific.h"    
+                Name="dat_vend.h"    
+                Source="..\bin\DAPL\dat_vendor_specific.h" />    
+  
+          <File Id="udat.h" Compressed="yes" DiskId="1"    
+                LongName="udat.h" Name="udat.h"    
+                Source="..\bin\DAPL\udat.h" />    
+  
+          <File Id="udat_config.h" Compressed="yes" DiskId="1"    
+                LongName="udat_config.h" Name="udat_cfg.h"    
+                Source="..\bin\DAPL\udat_config.h" />    
+  
+          <File Id="udat_redirection.h" Compressed="yes"    
+                DiskId="1" LongName="udat_redirection.h"    
+                Name="udat_red.h"    
+                Source="..\bin\DAPL\udat_redirection.h" />    
+  
+          <File Id="udat_vendor_specific.h" Compressed="yes"    
+                DiskId="1" LongName="udat_vendor_specific.h"    
+                Name="udat_ven.h"    
+                Source="..\bin\DAPL\udat_vendor_specific.h" />    
+        </Component>
+      </Directory>
+
+      <Component Id="cDatBldV1Libs"
+                  Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    
+
+          <File Id="_dat.lib" Compressed="yes" DiskId="1"
+                LongName="dat.lib" Name="dat.lib"
+                Source="..\bin\DAPL\$(var.ARCH)\dat.lib" />
+          <File Id="_datd.lib" Compressed="yes" DiskId="1"
+                LongName="datd.lib" Name="datd.lib"
+                Source="..\bin\DAPL\$(var.ARCH)\datd.lib" />
+      </Component>
+    </Directory>
+
+    <Directory Id="v2_0" Name="v2-0">
+      <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"
+                 KeyPath="yes" SharedDllRefCount="yes">
+        <CreateFolder />
+      </Component>
+
+      <Directory Id="DDID2" Name="DAT">    
+        <Component Id="cDatBldV2Hdrs"
+                  Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    
+          <CreateFolder />    
+          <File Id="_dat.h" Compressed="yes" DiskId="1"    
+                LongName="dat.h" Name="dat.h"    
+                Source="..\bin\DAPL2\dat.h" />    
+
+          <File Id="_dat_error.h" Compressed="yes" DiskId="1"    
+                LongName="dat_error.h" Name="dat.h"    
+                Source="..\bin\DAPL2\dat_error.h" />    
+  
+          <File Id="_dat_platform_specific.h" Compressed="yes"    
+                DiskId="1" LongName="dat_platform_specific.h"    
+                Name="dat_plat.h"    
+               Source="..\bin\DAPL2\dat_platform_specific.h" />    
+  
+          <File Id="_dat_redirection.h" Compressed="yes"    
+                DiskId="1" LongName="dat_redirection.h"    
+                Name="dat_redi.h"    
+                Source="..\bin\DAPL2\dat_redirection.h" />    
+  
+          <File Id="_dat_registry.h" Compressed="yes"    
+                DiskId="1" LongName="dat_registry.h"    
+                Name="dat_reg.h"    
+                Source="..\bin\DAPL2\dat_registry.h" />    
+  
+          <File Id="_dat_vendor_specific.h" Compressed="yes"    
+                DiskId="1" LongName="dat_vendor_specific.h"    
+                Name="dat_vend.h"    
+                Source="..\bin\DAPL2\dat_vendor_specific.h" />    
+  
+          <File Id="_udat.h" Compressed="yes" DiskId="1"    
+                LongName="udat.h" Name="udat.h"    
+                Source="..\bin\DAPL2\udat.h" />    
+  
+          <File Id="_udat_config.h" Compressed="yes" DiskId="1"    
+                LongName="udat_config.h" Name="udat_cfg.h"    
+                Source="..\bin\DAPL2\udat_config.h" />    
+  
+          <File Id="_udat_redirection.h" Compressed="yes"    
+                DiskId="1" LongName="udat_redirection.h"    
+                Name="udat_red.h"    
+                Source="..\bin\DAPL2\udat_redirection.h" />    
+  
+          <File Id="_udat_vendor_specific.h" Compressed="yes"    
+                DiskId="1" LongName="udat_vendor_specific.h"    
+                Name="udat_ven.h"    
+                Source="..\bin\DAPL2\udat_vendor_specific.h" />    
+        </Component>
+      </Directory>
+
+      <Component Id="cDatBldV2Libs"
+                  Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    
+
+          <File Id="_dat2.lib" Compressed="yes" DiskId="1"
+                LongName="dat2.lib" Name="dat2.lib"
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2.lib" />
+          <File Id="_dat2d.lib" Compressed="yes" DiskId="1"
+                LongName="dat2d.lib" Name="dat2d.lib"
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2d.lib" />
+      </Component>
+    </Directory>
+</Include>
diff --git a/trunk/WinOF/WIX/common/Docs.inc b/trunk/WinOF/WIX/common/Docs.inc
new file mode 100644
index 00000000..b741ee66
--- /dev/null
+++ b/trunk/WinOF/WIX/common/Docs.inc
@@ -0,0 +1,57 @@
+<Include>
+    <Component Id="Docs"
+               Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
+
+      <File Id="OFAlogo" Compressed="yes" DiskId="1"
+              LongName="openfabrics.gif" Name="ofa.gif"
+              Source="..\..\openfabrics.gif" />
+
+      <!-- implies WIX build only from an svn structured tree.  -->
+      <File Id="manual.htm" Compressed="yes" DiskId="1"
+              Name="Manual.htm" LongName="Manual.htm"
+              Source="..\bin\Misc\Manual.htm" Vital="yes" />
+
+      <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
+              Name="Manual.htm" LongName="Manual"
+              Target="[INSTALLDIR]\Manual.htm" Show="normal"
+              WorkingDirectory="INSTALLDIR" Icon="openfabrics"
+              IconIndex="0" />
+
+      <File Id="dRelnotes" Compressed="yes" DiskId="1"
+              LongName="Release_notes.htm" Name="RELEASE_.HTM"
+              Source="..\..\Release_notes.htm" />
+
+      <Shortcut Id="RelNotes" Directory="ProgramMenuDir"
+              Name="RelNotes" LongName="Release Notes"
+              Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
+              WorkingDirectory="INSTALLDIR" Icon="openfabrics"
+              IconIndex="0" />
+
+      <File Id="command_window" Name="COMMAND.LNK"
+              LongName="Command Window.lnk" Compressed="yes" DiskId="1"
+              Source="..\..\$(var.ARCHP)\Command Window.lnk" Vital="yes" />
+
+      <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
+              Name="COMMAND.LNK" LongName="Command Window.lnk"
+              Target="[INSTALLDIR]\Command Window.lnk" Icon="openfabrics"
+              IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />
+
+<?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>
+      <Shortcut Id="UninstallProduct" Name="UnMyApp"
+          Directory="ProgramMenuDir"
+          LongName="Uninstall WinOF"
+		  Target="[System64Folder]msiexec.exe"
+          Arguments="/X [ProductCode]"
+          Description="Uninstalls Windows OpenFabrics InfiniBand" />
+<?else?>
+      <Shortcut Id="UninstallProduct" Name="UnMyApp"
+          Directory="ProgramMenuDir"
+          LongName="Uninstall WinOF"
+		  Target="[SystemFolder]msiexec.exe"
+          Arguments="/X [ProductCode]"
+          Description="Uninstalls Windows OpenFabrics InfiniBand" />
+<?endif?>
+
+      <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
+    </Component>
+</Include>
diff --git a/trunk/WinOF/WIX/common/IBcore.inc b/trunk/WinOF/WIX/common/IBcore.inc
new file mode 100644
index 00000000..fefd9a6e
--- /dev/null
+++ b/trunk/WinOF/WIX/common/IBcore.inc
@@ -0,0 +1,89 @@
+<Include>
+    <Component Id="cIBcore"
+               Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
+      <CreateFolder />
+      <File Id="dpinst.exe" Compressed="yes" DiskId="1"
+             LongName="dpinst.exe" Name="dpinst.exe"
+             Source="..\..\$(var.ARCHP)\dpinst.exe" />
+      <File Id="dpinst.xml" Compressed="yes" DiskId="1"
+             LongName="dpinst.xml" Name="dpinst.xml"
+             Source="..\..\dpinst.xml" />
+      <File Id="devman.exe" Compressed="yes" DiskId="1"
+             LongName="devman.exe" Name="devman.exe"
+             Source="..\..\$(var.ARCHP)\devman.exe" />
+      <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
+             LongName="WdfCoInstaller$(var.WDFVER).dll" Name="WCO.dll"
+             Source="..\bin\hca\$(var.ARCH)\WdfCoInstaller$(var.WDFVER).dll" />
+      <File Id="complib.dll" Compressed="yes" DiskId="1"
+             LongName="complib.dll" Name="COMPLIB.DLL"
+             Source="..\bin\HCA\$(var.ARCH)\complib.dll" />
+      <File Id="complibd.dll" Compressed="yes" DiskId="1"
+             LongName="complibd.dll" Name="COMPLIB1.DLL"
+             Source="..\bin\HCA\$(var.ARCH)\complibd.dll" />
+      <File Id="ibal.dll" Compressed="yes" DiskId="1"
+             LongName="ibal.dll" Name="IBAL.DLL"
+             Source="..\bin\HCA\$(var.ARCH)\ibal.dll" />
+      <File Id="ibald.dll" Compressed="yes" DiskId="1"
+             LongName="ibald.dll" Name="IBALD.DLL"
+             Source="..\bin\HCA\$(var.ARCH)\ibald.dll" />
+      <File Id="ibbus.sys" Compressed="yes" DiskId="1"
+             LongName="ibbus.sys" Name="IBBUS.SYS"
+             Source="..\bin\HCA\$(var.ARCH)\ibbus.sys" />
+      <File Id="ibbus.pdb" Name="ibbus.pdb" DiskId="1" Compressed="yes"
+             Source="..\bin\HCA\$(var.ARCH)\ibbus.pdb" />
+
+      <File Id="ibiou.sys" Compressed="yes" DiskId="1"
+             LongName="ibiou.sys" Name="IBIOU.SYS"
+             Source="..\bin\HCA\$(var.ARCH)\ibiou.sys" />
+      <File Id="ibiou.pdb" Compressed="yes" DiskId="1"
+             Name="ibiou.pdb"
+             Source="..\bin\HCA\$(var.ARCH)\ibiou.pdb" />
+      <File Id="ib_iou.cat" Compressed="yes" DiskId="1"
+             LongName="ib_iou.cat" Name="IB_IOU.cat"
+             Source="..\bin\HCA\$(var.ARCH)\ib_iou.cat" />
+      <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
+             LongName="ib_iou.inf" Name="IB_IOU.inf"
+             Source="..\bin\HCA\$(var.ARCH)\ib_iou.inf" />
+
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>
+          <File Id="cl32.dll" Compressed="yes" DiskId="1"
+                 LongName="cl32.dll" Name="CL32.DLL"
+                 Source="..\bin\HCA\$(var.ARCH)\cl32.dll" />
+          <File Id="cl32d.dll" Compressed="yes" DiskId="1"
+                 LongName="cl32d.dll" Name="CL32D.DLL"
+                 Source="..\bin\HCA\$(var.ARCH)\cl32d.dll" />
+          <File Id="ibal32.dll" Compressed="yes" DiskId="1"
+                 LongName="ibal32.dll" Name="IBAL32.DLL"
+                 Source="..\bin\HCA\$(var.ARCH)\ibal32.dll" />
+          <File Id="ibal32d.dll" Compressed="yes" DiskId="1"
+                 LongName="ibal32d.dll" Name="IBAL32D.DLL"
+                 Source="..\bin\HCA\$(var.ARCH)\ibal32d.dll" />
+      <?endif?>
+
+      <!--
+         Orphaned install files - remove on uninstall
+         x64 SystemFolder == SysWOW64, System64Folder == System32
+      -->
+      <RemoveFile Id='o64_ibal.dll' On='uninstall'
+             Property="SystemFolder"
+             Name="ibal.dll" LongName='ibal.dll' />
+      <RemoveFile Id='o64_complib.dll' On='uninstall'
+             Property="SystemFolder"
+             Name="complib.dll" LongName='complib.dll' />
+      <RemoveFile Id='o64_complibd.dll' On='uninstall'
+             Property="SystemFolder"
+             Name="complibd.dll" LongName='complibd.dll' />
+      <RemoveFile Id='o32_ibal.dll' On='uninstall'
+             Property="System64Folder"
+             Name="ibal.dll" LongName='ibal.dll' />
+      <RemoveFile Id='o32_ibald.dll' On='uninstall'
+             Property="System64Folder"
+             Name="ibald.dll" LongName='ibald.dll' />
+      <RemoveFile Id='o32_complib.dll' On='uninstall'
+             Property="System64Folder"
+             Name="complib.dll" LongName='complib.dll' />
+      <RemoveFile Id='o32_complibd.dll' On='uninstall'
+             Property="System64Folder"
+             Name="complibd.dll" LongName='complibd.dll' />
+    </Component>
+</Include>
diff --git a/trunk/WinOF/WIX/common/InstallExecuteSeq.inc b/trunk/WinOF/WIX/common/InstallExecuteSeq.inc
new file mode 100644
index 00000000..5e325038
--- /dev/null
+++ b/trunk/WinOF/WIX/common/InstallExecuteSeq.inc
@@ -0,0 +1,69 @@
+<Include>
+
+    <!--> File where Custom Actions are defined -->
+    <Binary Id="CA" src="..\..\CustomActions.vbs" />
+
+    <CustomAction Id="WinOF_setup" BinaryKey="CA"
+         VBScriptCall="WinOF_setup" Return="check" />
+
+    <CustomAction Id="ChkPreviousInstall" BinaryKey="CA"
+         VBScriptCall="ChkInstallAndReboot" Return="check" />
+
+    <CustomAction Id="DriverInstall" BinaryKey="CA"
+         VBScriptCall="DriverInstall" Return="check" Execute="deferred" />
+
+    <CustomAction Id="DriverUninstall" BinaryKey="CA"
+         VBScriptCall="DriverUninstall" Return="check" />
+
+    <CustomAction Id="WSDStart" BinaryKey="CA"
+         VBScriptCall="WSDEnable" Return="check" />
+
+    <CustomAction Id="ND_start" BinaryKey="CA"
+         VBScriptCall="ND_StartMeUp" Return="check" />
+
+    <CustomAction Id="HammerTime" BinaryKey="CA"
+         VBScriptCall="HammerTime" Return="check" />
+
+    <CustomAction Id="BcastRegChanged" BinaryKey="CA"
+         VBScriptCall="BcastRegChanged" Return="check" />
+
+    <CustomAction Id="InstallChanged" BinaryKey="CA"
+         VBScriptCall="InstallChanged" Return="check" />
+
+
+    <InstallExecuteSequence>
+       <!-- Always executed (Install or uninstall) -->
+       <Custom Action="WinOF_setup" After="InstallInitialize" />
+
+       <!--> Install ONLY </!-->
+       <Custom Action="ChkPreviousInstall" After='WinOF_setup'>
+               NOT Installed</Custom>
+
+       <ScheduleReboot After='ChkPreviousInstall'>
+               REBOOT="FORCE"</ScheduleReboot>
+
+       <Custom Action="DriverInstall" After='InstallServices'>
+               Not Installed AND Not NODRV </Custom>
+
+       <Custom Action="WSDStart" After="InstallFinalize">
+               Not Installed AND Not NODRV </Custom>
+
+       <Custom Action="ND_start" After="WSDStart">
+          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
+
+       <Custom Action="BcastRegChanged" After="ND_start">
+               Not Installed</Custom>
+
+       <!--> CHANGE ONLY </!-->
+       <Custom Action="InstallChanged" After="InstallFinalize">
+           Installed </Custom>
+
+       <!--> REMOVE ONLY </!-->
+       <Custom Action="DriverUninstall" After="PublishProduct">
+               REMOVE="ALL" </Custom>
+
+       <Custom Action="HammerTime" After="InstallFinalize">REMOVE="ALL"</Custom>
+
+    </InstallExecuteSequence>
+
+</Include>
diff --git a/trunk/WinOF/WIX/common/OpenSM_service.inc b/trunk/WinOF/WIX/common/OpenSM_service.inc
new file mode 100644
index 00000000..d7087ef5
--- /dev/null
+++ b/trunk/WinOF/WIX/common/OpenSM_service.inc
@@ -0,0 +1,33 @@
+<Include>
+    <Component Id='OpenSMservice'
+               Guid='90042B4F-51B5-4720-8E54-6D366253634B'
+               SharedDllRefCount='no' KeyPath='no'
+               NeverOverwrite='no'
+               Permanent='no' Transitive='no' Win64='no'
+               Location='either'>
+
+        <File Id="opensm.exe" Compressed="yes" DiskId="1"
+              LongName="opensm.exe" Name="OPENSM.EXE"
+              Source="..\bin\tools\$(var.ARCH)\release\opensm.exe"
+              Vital='yes' KeyPath='yes' Hidden='no' System='no' 
+              Checksum='no' ReadOnly='no' />
+
+        <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
+            Description='InfiniBand Subnet Configuration and Management'
+            DisplayName='InfiniBand Subnet Manager'
+            Arguments='-e --service'
+            ErrorControl='normal'
+            Start='disabled'
+            Interactive='no'
+            Type='ownProcess' />
+
+        <ServiceControl Id='osmSvcControl' Name='OpenSM'
+                        Stop='uninstall'
+                        Wait='no'
+                        Remove='uninstall' />
+    </Component>
+
+    <Component Id="OpenSM_Service_enabled"
+               Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
+    </Component>
+</Include>
diff --git a/trunk/WinOF/WIX/common/WinOF_cfg.inc b/trunk/WinOF/WIX/common/WinOF_cfg.inc
new file mode 100644
index 00000000..eff7df1a
--- /dev/null
+++ b/trunk/WinOF/WIX/common/WinOF_cfg.inc
@@ -0,0 +1,11 @@
+
+<Include>
+
+  	<?define WOFREL="v2.1 (RC0)" ?>
+
+   	<?define WOFRELNUM=2.1.0 ?>
+
+   	<?define WDFVER=01007 ?>
+
+</Include>
+
diff --git a/trunk/WinOF/WIX/common/checked.inc b/trunk/WinOF/WIX/common/checked.inc
new file mode 100644
index 00000000..50309bf0
--- /dev/null
+++ b/trunk/WinOF/WIX/common/checked.inc
@@ -0,0 +1,176 @@
+<Include>
+    <Directory Id="dir_0" Name="Checked">
+      <Directory Id="dir_1" Name="kernel">
+
+        <Component Id="cCHK_kernel"
+                   Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
+          <CreateFolder />
+
+          <File Id="chk0" DiskId="1" Compressed="yes"
+                Name="README.txt"
+                Source="..\..\README_checked.txt" />
+          <File Id="chk1" DiskId="1" Compressed="yes"
+                Name="mthca.sys"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mthca.sys" />
+          <File Id="cat1" DiskId="1" Compressed="yes"
+                Name="mthca.cat"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mthca.cat" />
+          <File Id="sym1" DiskId="1" Compressed="yes"
+                Name="mthca.pdb"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mthca.pdb" />
+
+          <File Id="chk2" DiskId="1" Compressed="yes"
+                Name="ibbus.sys"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\ibbus.sys" />
+          <File Id="sym2" DiskId="1" Compressed="yes"
+                Name="ibbus.pdb"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\ibbus.pdb" />
+
+          <File Id="chk3" DiskId="1" Compressed="yes"
+                Name="ibiou.sys"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\ibiou.sys" />
+          <File Id="cat3" DiskId="1" Compressed="yes"
+                Name="ib_iou.cat"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\ib_iou.cat" />
+          <File Id="sym3" DiskId="1" Compressed="yes"
+                Name="ibiou.pdb"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\ibiou.pdb" />
+
+          <File Id="chk4" DiskId="1" Compressed="yes"
+                Name="ipoib.sys"
+                Source="..\bin\Chk\net\$(var.ARCH)\ipoib.sys" />
+          <File Id="cat4" DiskId="1" Compressed="yes"
+                Name="ipoib.cat"
+                Source="..\bin\Chk\net\$(var.ARCH)\ipoib.cat" />
+          <File Id="sym4" DiskId="1" Compressed="yes"
+                Name="ipoib.pdb"
+                Source="..\bin\Chk\net\$(var.ARCH)\ipoib.pdb" />
+
+          <File Id="chk5" DiskId="1" Compressed="yes"
+                Name="qlgcvnic.sys"
+                Source="..\bin\Chk\net\$(var.ARCH)\qlgcvnic.sys" />
+          <File Id="cat5" DiskId="1" Compressed="yes"
+                Name="netvnic.cat"
+                Source="..\bin\Chk\net\$(var.ARCH)\netvnic.cat" />
+          <File Id="sym5" DiskId="1" Compressed="yes"
+                Name="qlgcvnic.pdb"
+                Source="..\bin\Chk\net\$(var.ARCH)\qlgcvnic.pdb" />
+
+          <File Id="chk6" DiskId="1" Compressed="yes"
+                Name="ibsrp.sys"
+                Source="..\bin\Chk\storage\$(var.ARCH)\ibsrp.sys" />
+          <File Id="cat6" DiskId="1" Compressed="yes"
+                Name="ibsrp.cat"
+                Source="..\bin\Chk\storage\$(var.ARCH)\ibsrp.cat" />
+          <File Id="sym6" DiskId="1" Compressed="yes"
+                Name="ibsrp.pdb"
+                Source="..\bin\Chk\storage\$(var.ARCH)\ibsrp.pdb" />
+          <File Id="chk7" DiskId="1" Compressed="yes"
+                Name="mlx4_bus.sys"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_bus.sys" />
+          <File Id="cat7" DiskId="1" Compressed="yes"
+                Name="mlx4_bus.cat"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_bus.cat" />
+          <File Id="sym7" DiskId="1" Compressed="yes"
+                Name="mlx4_bus.pdb"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_bus.pdb" />
+
+          <File Id="chk8" DiskId="1" Compressed="yes"
+                Name="mlx4_hca.sys"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_hca.sys" />
+          <File Id="cat8" DiskId="1" Compressed="yes"
+                Name="mlx4_hca.cat"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_hca.cat" />
+          <File Id="sym8" DiskId="1" Compressed="yes"
+                Name="mlx4_hca.pdb"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_hca.pdb" />
+          <File Id="chk9" DiskId="1" Compressed="yes"
+                Name="winverbs.sys"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\winverbs.sys" />
+          <File Id="sym9" DiskId="1" Compressed="yes"
+                Name="winverbs.pdb"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\winverbs.pdb" />
+          <File Id="dll9" DiskId="1" Compressed="yes"
+                Name="winverbs.dll"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\winverbs.dll" />
+          <File Id="dlld9" DiskId="1" Compressed="yes"
+                Name="winverbd.dll"
+                LongName="winverbsd.dll"
+                Source="..\bin\Chk\HCA\$(var.ARCH)\winverbsd.dll" />
+        </Component>
+      </Directory>
+
+      <Directory Id="dir_14" Name="user">
+        <Component Id="cCHK_user"
+                   Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
+          <CreateFolder />
+          <File Id="file83" Name="DAPL2-_1.DLL"
+            LongName="dapl2-scmd.dll"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\DAPL2\$(var.ARCH)\dapl2-scmd.dll" />
+          <File Id="file84" Name="dapl2d.dll"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\DAPL2\$(var.ARCH)\dapl2d.dll" />
+          <File Id="file85" Name="DAPL2T_1.EXE"
+            LongName="dapl2testd.exe"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\tools\$(var.ARCH)\debug\dapl2testd.exe" />
+          <File Id="file86" Name="dapld.dll"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\DAPL\$(var.ARCH)\dapld.dll" />
+          <File Id="file87" Name="DAPLTE_1.EXE"
+            LongName="dapltestd.exe"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\tools\$(var.ARCH)\debug\dapltestd.exe" />
+          <File Id="file88" Name="dat2d.dll"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\DAPL2\$(var.ARCH)\dat2d.dll" />
+          <File Id="file89" Name="datd.dll"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\DAPL\$(var.ARCH)\datd.dll" />
+          <File Id="file90" Name="dtest2d.exe"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\tools\$(var.ARCH)\debug\dtest2d.exe" />
+          <File Id="file91" Name="dtestxd.exe"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\tools\$(var.ARCH)\debug\dtestxd.exe" />
+          <File Id="file45" Name="complibd.dll"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\Chk\HCA\$(var.ARCH)\complibd.dll" />
+          <File Id="file94" Name="ibald.dll"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\Chk\HCA\$(var.ARCH)\ibald.dll" />
+
+          <?if $(var.OS) != "XP" ?>
+            <File Id="file97" Name="ibwsd.dll"
+              DiskId="1" Compressed="yes"
+              Source="..\bin\Chk\net\$(var.ARCH)\ibwsd.dll" />
+            <File Id="file105" Name="INSTAL_1.EXE"
+              LongName="installsp.exe"
+              DiskId="1" Compressed="yes"
+              Source="..\bin\Chk\net\$(var.ARCH)\installsp.exe" />
+          <?endif?>
+
+          <File Id="file69" Name="mlx4ud.dll"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4ud.dll" />
+          <File Id="file108" Name="mthcaud.dll"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\Chk\HCA\$(var.ARCH)\mthcaud.dll" />
+          <File Id="file110" Name="opensm.exe"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\tools\$(var.ARCH)\debug\opensm.exe" />
+          <File Id="file115" Name="vstat.exe"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\tools\$(var.ARCH)\debug\vstat.exe" />
+          <File Id="file116" Name="part_man.exe"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\tools\$(var.ARCH)\debug\part_man.exe" />
+          <File Id="file117" Name="vnic_cfg.exe"
+            LongName="qlgcvnic_config.exe"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\tools\$(var.ARCH)\debug\qlgcvnic_config.exe" />
+        </Component>
+      </Directory>
+    </Directory>
+</Include>
diff --git a/trunk/WinOF/WIX/common/dapl_rt.inc b/trunk/WinOF/WIX/common/dapl_rt.inc
new file mode 100644
index 00000000..e8e63d94
--- /dev/null
+++ b/trunk/WinOF/WIX/common/dapl_rt.inc
@@ -0,0 +1,157 @@
+<Include>
+      <Component Id="cDAPL1RT"
+                 Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
+
+        <?if $(var.ARCHP) = "ia64" Or $(var.ARCHP) = "x64" ?>
+            <File Id="dapl32.dll" Compressed="yes" DiskId="1"
+                   LongName="dapl32.dll" Name="DAPL32.DLL"
+                   Source="..\bin\DAPL\$(var.ARCH)\dapl32.dll" />
+            <File Id="dapl32d.dll" Compressed="yes" DiskId="1"
+                   LongName="dapl32d.dll" Name="DAPL32D.DLL"
+                   Source="..\bin\DAPL\$(var.ARCH)\dapl32d.dll" />
+            <File Id="dat32.dll" Compressed="yes" DiskId="1"
+                   LongName="dat32.dll" Name="DAT32.DLL"
+                   Source="..\bin\DAPL\$(var.ARCH)\dat32.dll" />
+            <File Id="dat32d.dll" Compressed="yes" DiskId="1"
+                   LongName="dat32d.dll" Name="DAT32D.DLL"
+                   Source="..\bin\DAPL\$(var.ARCH)\dat32d.dll" />
+        <?endif?>
+
+        <File Id="dapl.dll" Compressed="yes" DiskId="1"
+               LongName="dapl.dll" Name="DAPL.DLL"
+               Source="..\bin\DAPL\$(var.ARCH)\dapl.dll" />
+          <CopyFile Id="dupDAPL" FileId="dapl.dll"
+                  DestinationName="dapl.dll"
+                  DestinationProperty="WindowsFolder" />
+        <File Id="dapld.dll" Compressed="yes" DiskId="1"
+               LongName="dapld.dll" Name="DAPLD.DLL"
+               Source="..\bin\DAPL\$(var.ARCH)\dapld.dll" />
+        <File Id="dat.dll" Compressed="yes" DiskId="1"
+               LongName="dat.dll" Name="DAT.DLL"
+               Source="..\bin\DAPL\$(var.ARCH)\dat.dll" />
+        <CopyFile Id="dupDAT" FileId="dat.dll"
+                  DestinationName="dat.dll"
+                  DestinationProperty="WindowsFolder" />
+        <File Id="datd.dll" Compressed="yes" DiskId="1"
+               LongName="datd.dll" Name="DATD.DLL"
+               Source="..\bin\DAPL\$(var.ARCH)\datd.dll" />
+        <File Id="dat.conf" Compressed="yes" DiskId="1"
+               LongName="dat.conf" Name="dat.conf"
+               Source="..\..\dat.conf" />
+        <File Id="dapltest.exe" Compressed="yes" DiskId="1"
+               LongName="dapltest.exe" Name="dapltest.exe"
+               Source="..\bin\tools\$(var.ARCH)\release\dapltest.exe" />
+        <File Id="dapltestd.exe" Compressed="yes" DiskId="1"
+               LongName="dapltestd.exe" Name="dapltesd.exe"
+               Source="..\bin\tools\$(var.ARCH)\debug\dapltestd.exe" />
+
+        <File Id="dapl.pdb" Compressed="yes" DiskId="1"
+              LongName="dapl.pdb" Name="dapl.pdb"
+              Source="..\bin\DAPL\$(var.ARCH)\dapl.pdb" />
+        <File Id="dapld.pdb" Compressed="yes" DiskId="1"
+              LongName="dapld.pdb" Name="dapld.pdb"
+              Source="..\bin\DAPL\$(var.ARCH)\dapld.pdb" />
+        <File Id="dat.lib" Compressed="yes" DiskId="1"
+              LongName="dat.lib" Name="dat.lib"
+              Source="..\bin\DAPL\$(var.ARCH)\dat.lib" />
+        <File Id="datd.lib" Compressed="yes" DiskId="1"
+              LongName="datd.lib" Name="datd.lib"
+              Source="..\bin\DAPL\$(var.ARCH)\datd.lib" />
+        <File Id="dat.pdb" Compressed="yes" DiskId="1"
+              LongName="dat.pdb" Name="dat.pdb"
+              Source="..\bin\DAPL\$(var.ARCH)\dat.pdb" />
+        <File Id="datd.pdb" Compressed="yes" DiskId="1"
+              LongName="datd.pdb" Name="datd.pdb"
+              Source="..\bin\DAPL\$(var.ARCH)\datd.pdb" />
+        <File Id="dt_svr.bat" Compressed="yes" DiskId="1"
+              LongName="dt-svr.bat" Name="dt-svr.bat"
+              Source="..\bin\DAPL2\dt-svr.bat" />
+        <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"
+                  DestinationName="dt1-svr.bat"
+                  DestinationProperty="INSTALLDIR" />
+        <File Id="dt_cli.bat" Compressed="yes" DiskId="1"
+              LongName="dt-cli.bat" Name="dt-cli.bat"
+              Source="..\bin\DAPL2\dt-cli.bat" />
+        <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"
+                  DestinationName="dt1-cli.bat"
+                  DestinationProperty="INSTALLDIR" />
+      </Component>
+
+      <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
+
+          <?if $(var.ARCHP) = "ia64" Or $(var.ARCHP) = "x64" ?>
+              <File Id="_dapl32.dll" Compressed="yes" DiskId="1"
+                     LongName="dapl232.dll" Name="DAPL232.DLL"
+                     Source="..\bin\DAPL2\$(var.ARCH)\dapl232.dll" />
+              <File Id="_dapl32d.dll" Compressed="yes" DiskId="1"
+                     LongName="dapl232d.dll" Name="DAPL232D.DLL"
+                     Source="..\bin\DAPL2\$(var.ARCH)\dapl232d.dll" />
+              <File Id="_dat32.dll" Compressed="yes" DiskId="1"
+                     LongName="dat232.dll" Name="DAT232.DLL"
+                     Source="..\bin\DAPL2\$(var.ARCH)\dat232.dll" />
+              <File Id="_dat32d.dll" Compressed="yes" DiskId="1"
+                     LongName="dat232d.dll" Name="DAT232D.DLL"
+                     Source="..\bin\DAPL2\$(var.ARCH)\dat232d.dll" />
+          <?endif?>
+
+          <File Id="_dapl2.dll" Compressed="yes" DiskId="1"
+                 LongName="dapl2.dll" Name="DAPL2.DLL"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2.dll" />
+          <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"
+                    DestinationName="dapl2.dll"
+                    DestinationProperty="WindowsFolder" />
+          <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"
+                 LongName="dapl2d.dll" Name="DAPL2D.DLL"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2d.dll" />
+          <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"
+                 LongName="dapl2-scm.dll" Name="D2-scm.DLL"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-scm.dll" />
+          <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"
+                    DestinationName="d2-scm.dll"
+                    DestinationLongName="dapl2-scm.dll"
+                    DestinationProperty="WindowsFolder" />
+          <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"
+                 LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-scmd.dll" />
+          <File Id="_dat2.dll" Compressed="yes" DiskId="1"
+                 LongName="dat2.dll" Name="DAT2.DLL"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dat2.dll" />
+          <CopyFile Id="dupDAT2" FileId="_dat2.dll"
+                    DestinationName="dat2.dll"
+                    DestinationProperty="WindowsFolder" />
+          <File Id="_dat2d.dll" Compressed="yes" DiskId="1"
+                 LongName="dat2d.dll" Name="DAT2D.DLL"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dat2d.dll" />
+          <File Id="dapl2test.exe" Compressed="yes" DiskId="1"
+                 LongName="dapl2test.exe" Name="dapl2tes.exe"
+                 Source="..\bin\tools\$(var.ARCH)\release\dapl2test.exe" />
+          <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"
+                 LongName="dapl2testd.exe" Name="dapl2tes.exe"
+                 Source="..\bin\tools\$(var.ARCH)\debug\dapl2testd.exe" />
+          <File Id="dtest2.exe" Compressed="yes" DiskId="1"
+                 LongName="dtest2.exe" Name="dtest2.exe"
+                 Source="..\bin\tools\$(var.ARCH)\release\dtest2.exe" />
+          <File Id="dtestx.exe" Compressed="yes" DiskId="1"
+                 LongName="dtestx.exe" Name="dtestx.exe"
+                 Source="..\bin\tools\$(var.ARCH)\release\dtestx.exe" />
+
+          <File Id="dapl2.pdb" Compressed="yes" DiskId="1"
+                LongName="dapl2.pdb" Name="dapl2.pdb"
+                Source="..\bin\DAPL2\$(var.ARCH)\dapl2.pdb" />
+          <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"
+                LongName="dapl2d.pdb" Name="dapl2d.pdb"
+                Source="..\bin\DAPL2\$(var.ARCH)\dapl2d.pdb" />
+          <File Id="dat2.pdb" Compressed="yes" DiskId="1"
+                LongName="dat2.pdb" Name="dat2.pdb"
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2.pdb" />
+          <File Id="dat2d.pdb" Compressed="yes" DiskId="1"
+                LongName="dat2d.pdb" Name="dat2d.pdb"
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2d.pdb" />
+          <File Id="dat2.lib" Compressed="yes" DiskId="1"
+                LongName="dat2.lib" Name="dat2.lib"
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2.lib" />
+          <File Id="dat2d.lib" Compressed="yes" DiskId="1"
+                LongName="dat2d.lib" Name="dat2d.lib"
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2d.lib" />
+      </Component>
+</Include>
diff --git a/trunk/WinOF/WIX/common/ib_sdk.inc b/trunk/WinOF/WIX/common/ib_sdk.inc
new file mode 100644
index 00000000..ec855edb
--- /dev/null
+++ b/trunk/WinOF/WIX/common/ib_sdk.inc
@@ -0,0 +1,354 @@
+<Include>
+    <Directory Id="IB_libs" Name="lib">
+      <Component Id="cIBAL_Libs"
+                 Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
+        <CreateFolder />
+        <File Id="ibal.lib" Compressed="yes" DiskId="1"
+              LongName="ibal.lib" Name="ibal.lib"
+              Source="..\bin\HCA\$(var.ARCH)\ibal.lib" />
+        <File Id="ibal.pdb" Compressed="yes" DiskId="1"
+              LongName="ibal.pdb" Name="ibal.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\ibal.pdb" />
+        <File Id="complib.lib" Compressed="yes" DiskId="1"
+              LongName="complib.lib" Name="complib.lib"
+              Source="..\bin\HCA\$(var.ARCH)\complib.lib" />
+        <File Id="complib.pdb" Compressed="yes" DiskId="1"
+              LongName="complib.pdb" Name="complib.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\complib.pdb" />
+        <File Id="ibald.lib" Compressed="yes" DiskId="1"
+              LongName="ibald.lib" Name="ibald.lib"
+              Source="..\bin\HCA\$(var.ARCH)\ibald.lib" />
+        <File Id="ibald.pdb" Compressed="yes" DiskId="1"
+              LongName="ibald.pdb" Name="ibald.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\ibald.pdb" />
+        <File Id="complibd.lib" Compressed="yes" DiskId="1"
+              LongName="complibd.lib" Name="complibd.lib"
+              Source="..\bin\HCA\$(var.ARCH)\complibd.lib" />
+        <File Id="complibd.pdb" Compressed="yes" DiskId="1"
+              LongName="complibd.pdb" Name="complibd.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\complibd.pdb" />
+
+         <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>
+             <!-- SysWOW64\ 32-bit libs -->
+            <File Id="cl32.lib" Compressed="yes" DiskId="1"
+                  LongName="complib32.lib" Name="cl32.lib"
+                  Source="..\bin\HCA\$(var.ARCH)\cl32.lib" />
+            <File Id="cl32.pdb" Compressed="yes" DiskId="1"
+                  LongName="complib32.pdb" Name="cl32.pdb"
+                  Source="..\bin\HCA\$(var.ARCH)\cl32.pdb" />
+            <File Id="cl32d.lib" Compressed="yes" DiskId="1"
+                  LongName="complib32d.lib" Name="cl32d.lib"
+                  Source="..\bin\HCA\$(var.ARCH)\cl32d.lib" />
+            <File Id="cl32d.pdb" Compressed="yes" DiskId="1"
+                  LongName="complib32d.pdb" Name="cl32d.pdb"
+                  Source="..\bin\HCA\$(var.ARCH)\cl32d.pdb" />
+            <File Id="ibal32.lib" Compressed="yes" DiskId="1"
+                  LongName="ibal32.lib" Name="ibal32.lib"
+                  Source="..\bin\HCA\$(var.ARCH)\ibal32.lib" />
+            <File Id="ibal32.pdb" Compressed="yes" DiskId="1"
+                  LongName="ibal32.pdb" Name="ibal32.pdb"
+                  Source="..\bin\HCA\$(var.ARCH)\ibal32.pdb" />
+            <File Id="ibal32d.lib" Compressed="yes" DiskId="1"
+                  LongName="ibal32d.lib" Name="ibal32d.lib"
+                  Source="..\bin\HCA\$(var.ARCH)\ibal32d.lib" />
+            <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"
+                  LongName="ibal32d.pdb" Name="ibal32d.pdb"
+                  Source="..\bin\HCA\$(var.ARCH)\ibal32d.pdb" />
+        <?endif?>
+
+        <File Id="winverbs.lib" Compressed="yes" DiskId="1"
+              LongName="winverbs.lib" Name="winverbs.lib"
+              Source="..\bin\HCA\$(var.ARCH)\winverbs.lib" />
+        <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
+              LongName="winverbsd.lib" Name="winvrbsd.lib"
+              Source="..\bin\HCA\$(var.ARCH)\winverbsd.lib" />
+
+        <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
+              LongName="libibverbs.lib" Name="ibverbs.lib"
+              Source="..\bin\HCA\$(var.ARCH)\libibverbs.lib" />
+        <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"
+              LongName="libibverbs.pdb" Name="ibverbs.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\libibverbs.pdb" />
+        <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
+              LongName="libibverbsd.lib" Name="ibverbsd.lib"
+              Source="..\bin\HCA\$(var.ARCH)\libibverbsd.lib" />
+        <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"
+              LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\libibverbsd.pdb" />
+
+        <File Id="libibmad.lib" Compressed="yes" DiskId="1"
+              LongName="libibmad.lib" Name="ibmad.lib"
+              Source="..\bin\HCA\$(var.ARCH)\libibmad.lib" />
+        <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"
+              LongName="libibmad.pdb" Name="ibmad.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\libibmad.pdb" />
+        <File Id="libibmadd.lib" Compressed="yes" DiskId="1"
+              LongName="libibmadd.lib" Name="ibmadd.lib"
+              Source="..\bin\HCA\$(var.ARCH)\libibmadd.lib" />
+        <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"
+              LongName="libibmadd.pdb" Name="ibmadd.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\libibmadd.pdb" />
+
+        <File Id="libibumad.lib" Compressed="yes" DiskId="1"
+              LongName="libibumad.lib" Name="ibumad.lib"
+              Source="..\bin\HCA\$(var.ARCH)\libibumad.lib" />
+        <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"
+              LongName="libibumad.pdb" Name="ibumad.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\libibumad.pdb" />
+        <File Id="libibumadd.lib" Compressed="yes" DiskId="1"
+              LongName="libibumadd.lib" Name="ibumadd.lib"
+              Source="..\bin\HCA\$(var.ARCH)\libibumadd.lib" />
+        <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"
+              LongName="libibumadd.pdb" Name="ibumadd.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\libibumadd.pdb" />
+      </Component>
+    </Directory>
+
+    <Directory Id="IB_inc" Name="Inc">
+      <Component Id="cIBAL_Incs"
+                 Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">
+        <CreateFolder />
+
+        <File Id="oib_ver.h" Compressed="yes" DiskId="1"
+               LongName="oib_ver.h" Name="oib_ver.h"
+               Source="..\bin\Inc\oib_ver.h" />
+        <File Id="openib.def" Compressed="yes" DiskId="1"
+               LongName="openib.def" Name="openib.def"
+               Source="..\bin\Inc\openib.def" />
+      </Component>
+
+      <Directory Id="IB_complib" Name="complib">
+        <Component Id="cIBAL_Complib"
+                   Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">
+          <CreateFolder />
+          <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"
+                LongName="cl_async_proc.h" Name="CL_ASYN.H" 
+                Source="..\bin\Inc\complib\cl_async_proc.h" />
+          <File Id="cl_atomic.h" Compressed="yes" DiskId="1"
+                LongName="cl_atomic.h" Name="CL_ATOM.H" 
+                Source="..\bin\Inc\complib\cl_atomic.h" />
+          <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" 
+                Source="..\bin\Inc\complib\cl_atomic_osd.h" />
+          <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"
+                LongName="cl_byteswap.h" Name="CL_BYTE.H" 
+                Source="..\bin\Inc\complib\cl_byteswap.h" />
+          <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" 
+                Source="..\bin\Inc\complib\cl_byteswap_osd.h" />
+          <File Id="cl_comppool.h" Compressed="yes" DiskId="1"
+                LongName="cl_comppool.h" Name="CL_COMP.H" 
+                Source="..\bin\Inc\complib\cl_comppool.h" />
+          <File Id="cl_debug.h" Compressed="yes" DiskId="1"
+                LongName="cl_debug.h" Name="CL_DEBU.H" 
+                Source="..\bin\Inc\complib\cl_debug.h" />
+          <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_debug_osd.h" Name="CL_DEBU1.H" 
+                Source="..\bin\Inc\complib\cl_debug_osd.h" />
+          <File Id="cl_event.h" Compressed="yes" DiskId="1"
+                LongName="cl_event.h" Name="CL_EVEN.H" 
+                Source="..\bin\Inc\complib\cl_event.h" />
+          <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_event_osd.h" Name="CL_EVEN1.H" 
+                Source="..\bin\Inc\complib\cl_event_osd.h" />
+          <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"
+                LongName="cl_fleximap.h" Name="CL_FLEX.H" 
+                Source="..\bin\Inc\complib\cl_fleximap.h" />
+          <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"
+                LongName="cl_ioctl.h" Name="CL_IOCT.H" 
+                Source="..\bin\Inc\complib\cl_ioctl.h" />
+          <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" 
+                Source="..\bin\Inc\complib\cl_ioctl_osd.h" />
+          <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"
+                LongName="cl_irqlock.h" Name="CL_IRQL.H" 
+                Source="..\bin\Inc\complib\cl_irqlock.h" />
+          <File Id="cl_list.h" Compressed="yes" DiskId="1"
+                LongName="cl_list.h" Name="CL_LIST.H" 
+                Source="..\bin\Inc\complib\cl_list.h" />
+          <File Id="cl_log.h" Compressed="yes" DiskId="1"
+                LongName="cl_log.h" Name="CL_LOG.H" 
+                Source="..\bin\Inc\complib\cl_log.h" />
+          <File Id="cl_map.h" Compressed="yes" DiskId="1"
+                LongName="cl_map.h" Name="CL_MAP.H" 
+                Source="..\bin\Inc\complib\cl_map.h" />
+          <File Id="cl_math.h" Compressed="yes" DiskId="1"
+                LongName="cl_math.h" Name="CL_MATH.H" 
+                Source="..\bin\Inc\complib\cl_math.h" />
+          <File Id="cl_memory.h" Compressed="yes" DiskId="1"
+                LongName="cl_memory.h" Name="CL_MEMO.H" 
+                Source="..\bin\Inc\complib\cl_memory.h" />
+          <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_memory_osd.h" Name="CL_MEMO1.H" 
+                Source="..\bin\Inc\complib\cl_memory_osd.h" />
+          <File Id="cl_mutex.h" Compressed="yes" DiskId="1"
+                LongName="cl_mutex.h" Name="CL_MUTE.H" 
+                Source="..\bin\Inc\complib\cl_mutex.h" />
+          <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" 
+                Source="..\bin\Inc\complib\cl_mutex_osd.h" />
+          <File Id="cl_obj.h" Compressed="yes" DiskId="1"
+                LongName="cl_obj.h" Name="CL_OBJ.H" 
+                Source="..\bin\Inc\complib\cl_obj.h" />
+          <File Id="cl_packoff.h" Compressed="yes" DiskId="1"
+                LongName="cl_packoff.h" Name="CL_PACK.H" 
+                Source="..\bin\Inc\complib\cl_packoff.h" />
+          <File Id="cl_packon.h" Compressed="yes" DiskId="1"
+                LongName="cl_packon.h" Name="CL_PACK1.H" 
+                Source="..\bin\Inc\complib\cl_packon.h" />
+          <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"
+                LongName="cl_passivelock.h" Name="CL_PASS.H" 
+                Source="..\bin\Inc\complib\cl_passivelock.h" />
+          <File Id="cl_perf.h" Compressed="yes" DiskId="1"
+                LongName="cl_perf.h" Name="CL_PERF.H" 
+                Source="..\bin\Inc\complib\cl_perf.h" />
+          <File Id="cl_pool.h" Compressed="yes" DiskId="1"
+                LongName="cl_pool.h" Name="CL_POOL.H" 
+                Source="..\bin\Inc\complib\cl_pool.h" />
+          <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"
+                LongName="cl_ptr_vector.h" Name="CL_PTR_.H" 
+                Source="..\bin\Inc\complib\cl_ptr_vector.h" />
+          <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"
+                LongName="cl_qcomppool.h" Name="CL_QCOM.H" 
+                Source="..\bin\Inc\complib\cl_qcomppool.h" />
+          <File Id="cl_qlist.h" Compressed="yes" DiskId="1"
+                LongName="cl_qlist.h" Name="CL_QLIS.H" 
+                Source="..\bin\Inc\complib\cl_qlist.h" />
+          <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"
+                LongName="cl_qlockpool.h" Name="CL_QLOC.H" 
+                Source="..\bin\Inc\complib\cl_qlockpool.h" />
+          <File Id="cl_qmap.h" Compressed="yes" DiskId="1"
+                LongName="cl_qmap.h" Name="CL_QMAP.H" 
+                Source="..\bin\Inc\complib\cl_qmap.h" />
+          <File Id="cl_qpool.h" Compressed="yes" DiskId="1"
+                LongName="cl_qpool.h" Name="CL_QPOO.H" 
+                Source="..\bin\Inc\complib\cl_qpool.h" />
+          <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"
+                LongName="cl_rbmap.h" Name="CL_RBMA.H" 
+                Source="..\bin\Inc\complib\cl_rbmap.h" />
+          <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"
+                LongName="cl_reqmgr.h" Name="CL_REQM.H" 
+                Source="..\bin\Inc\complib\cl_reqmgr.h" />
+          <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"
+                LongName="cl_spinlock.h" Name="CL_SPIN.H" 
+                Source="..\bin\Inc\complib\cl_spinlock.h" />
+          <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" 
+                Source="..\bin\Inc\complib\cl_spinlock_osd.h" />
+          <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"
+                LongName="cl_syscallback.h" Name="CL_SYSC.H" 
+                Source="..\bin\Inc\complib\cl_syscallback.h" />
+          <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" 
+                Source="..\bin\Inc\complib\cl_syscallback_osd.h" />
+          <File Id="cl_thread.h" Compressed="yes" DiskId="1"
+                LongName="cl_thread.h" Name="CL_THRE.H" 
+                Source="..\bin\Inc\complib\cl_thread.h" />
+          <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_thread_osd.h" Name="CL_THRE1.H" 
+                Source="..\bin\Inc\complib\cl_thread_osd.h" />
+          <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"
+                LongName="cl_threadpool.h" Name="CL_THRE2.H" 
+                Source="..\bin\Inc\complib\cl_threadpool.h" />
+          <File Id="cl_timer.h" Compressed="yes" DiskId="1"
+                LongName="cl_timer.h" Name="CL_TIME.H" 
+                Source="..\bin\Inc\complib\cl_timer.h" />
+          <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_timer_osd.h" Name="CL_TIME1.H" 
+                Source="..\bin\Inc\complib\cl_timer_osd.h" />
+          <File Id="cl_types.h" Compressed="yes" DiskId="1"
+                LongName="cl_types.h" Name="CL_TYPE.H" 
+                Source="..\bin\Inc\complib\cl_types.h" />
+          <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_types_osd.h" Name="CL_TYPE1.H" 
+                Source="..\bin\Inc\complib\cl_types_osd.h" />
+          <File Id="cl_vector.h" Compressed="yes" DiskId="1"
+                LongName="cl_vector.h" Name="CL_VECT.H" 
+                Source="..\bin\Inc\complib\cl_vector.h" />
+          <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"
+                LongName="cl_waitobj.h" Name="CL_WAIT.H" 
+                Source="..\bin\Inc\complib\cl_waitobj.h" />
+          <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"
+                LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" 
+                Source="..\bin\Inc\complib\cl_waitobj_osd.h" />
+          <File Id="comp_lib.h" Compressed="yes" DiskId="1"
+                LongName="comp_lib.h" Name="COMP_LI.H" 
+                Source="..\bin\Inc\complib\comp_lib.h" />
+        </Component>
+      </Directory>
+
+      <Directory Id="IB_iba" Name="iba">
+        <Component Id="cIBAL_IBA"
+                   Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">
+          <CreateFolder />
+          <File Id="ib_al.h" Compressed="yes" DiskId="1"
+                LongName="ib_al.h" Name="ib_al.h"
+                Source="..\bin\Inc\iba\ib_al.h" />
+          <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"
+                LongName="ib_al_ioctl.h" Name="ib_ioctl.h"
+                Source="..\bin\Inc\iba\ib_al_ioctl.h" />
+          <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"
+                LongName="ib_at_ioctl.h" Name="ib_iocat.h"
+                Source="..\bin\Inc\iba\ib_at_ioctl.h" />
+          <File Id="ib_ci.h" Compressed="yes" DiskId="1"
+                LongName="ib_ci.h" Name="ib_ci.h"
+                Source="..\bin\Inc\iba\ib_ci.h" />
+          <File Id="ib_types.h" Compressed="yes" DiskId="1"
+                LongName="ib_types.h" Name="ib_types.h"
+                Source="..\bin\Inc\iba\ib_types.h" />
+          <File Id="ib_uvp.h" Compressed="yes" DiskId="1"
+                LongName="ib_uvp.h" Name="ib_uvp.h"
+                Source="..\bin\Inc\iba\ib_uvp.h" />
+        </Component>
+      </Directory>
+    </Directory>
+
+    <Directory Id="IB_samples" Name="Samples">
+      <Directory Id="sample_DDK" Name="DDK">
+        <Component Id="cDDK_example"
+                   Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">
+          <CreateFolder />
+              <File Id="cmtest.c" Compressed="yes" DiskId="1"
+                    LongName="cmtest.c" Name="cmtest.c"
+                    Source="..\bin\misc\cmtest.c" />
+              <File Id="cmtest.rc" Compressed="yes" DiskId="1"
+                    LongName="cmtest.rc" Name="cmtest.rc"
+                    Source="..\..\SDK_Samples\DDK\cmtest.rc" />
+              <File Id="makefile" Compressed="yes" DiskId="1"
+                    LongName="makefile" Name="makefile"
+                    Source="..\..\SDK_Samples\DDK\makefile" />
+              <File Id="SOURCES" Compressed="yes" DiskId="1"
+                    LongName="SOURCES" Name="SOURCES"
+                    Source="..\..\SDK_Samples\DDK\SOURCES" />
+              <File Id="README.txt" Compressed="yes" DiskId="1"
+                    LongName="README.txt" Name="README.txt"
+                    Source="..\..\SDK_Samples\DDK\README.txt" />
+        </Component>
+      </Directory>    <!-- End DDK -->
+
+      <Directory Id="sample_VS" Name="VS">
+        <Component Id="cVS_example"
+                   Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">
+          <CreateFolder />
+              <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"
+                    LongName="cmtest.c" Name="cmtest.c"
+                    Source="..\bin\misc\cmtest.c" />
+              <File Id="vs_cmtest.rc" Compressed="yes" DiskId="1"
+                    LongName="cmtest.rc" Name="cmtest.rc"
+                    Source="..\..\SDK_Samples\VS\cmtest.rc" />
+              <File Id="vsREADME.txt" Compressed="yes" DiskId="1"
+                    LongName="README.txt" Name="README.txt"
+                    Source="..\..\SDK_Samples\VS\README.txt" />
+              <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>
+                  <File Id="Makefile.x64" Compressed="yes" DiskId="1"
+                        LongName="Makefile.x64" Name="Makefile.x64"
+                        Source="..\..\SDK_Samples\VS\Makefile.x64" />
+              <?else?>
+                  <File Id="Makefile.x64" Compressed="yes" DiskId="1"
+                        LongName="Makefile.x64" Name="Makefile.x86"
+                        Source="..\..\SDK_Samples\VS\Makefile.x86" />
+              <?endif?>
+        </Component>
+      </Directory>   <!-- End VS -->
+    </Directory>   <!-- End Samples -->
+</Include>
diff --git a/trunk/WinOF/WIX/common/ipoib.inc b/trunk/WinOF/WIX/common/ipoib.inc
new file mode 100644
index 00000000..59d94720
--- /dev/null
+++ b/trunk/WinOF/WIX/common/ipoib.inc
@@ -0,0 +1,53 @@
+<Include>
+    <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
+      <CreateFolder />
+      <File Id="netipoib_inf" Compressed="yes" DiskId="1"
+             LongName="netipoib.inf" Name="NETIPOI.INF"
+             Source="..\bin\net\$(var.ARCH)\netipoib.inf" />
+      <File Id="ipoib_cat" Compressed="yes" DiskId="1"
+             LongName="ipoib.cat" Name="IPOI.cat"
+             Source="..\bin\net\$(var.ARCH)\ipoib.cat" />
+      <File Id="ipoib.sys" Compressed="yes" DiskId="1"
+             LongName="ipoib.sys" Name="IPOIB.SYS"
+             Source="..\bin\net\$(var.ARCH)\ipoib.sys" />
+      <File Id="ipoib.pdb" Compressed="yes" DiskId="1"
+             Name="ipoib.pdb"
+             Source="..\bin\net\$(var.ARCH)\ipoib.pdb" />
+
+      <?if $(var.OS) != "XP" ?>
+        <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
+               LongName="ibwsd.dll" Name="IBWSD.DLL"
+               Source="..\bin\net\$(var.ARCH)\ibwsd.dll" />
+      <?endif?>
+
+      <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
+             LongName="ibndprov.dll" Name="IBNDPROV.DLL"
+             Source="..\bin\net\$(var.ARCH)\ibndprov.dll" />
+      <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
+             LongName="ndinstall.exe" Name="NDINSTAL.EXE"
+             Source="..\bin\net\$(var.ARCH)\ndinstall.exe" />
+
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>
+          <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"
+                 LongName="ibwsd32.dll" Name="IBWSD32.DLL"
+                 Source="..\bin\net\$(var.ARCH)\ibwsd32.dll" />
+          <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"
+                 LongName="ibndprov32.dll" Name="IBNDPR32.DLL"
+                 Source="..\bin\net\$(var.ARCH)\ibndprov32.dll" />
+      <?endif?>
+
+      <!-- Orphaned install files - remove on uninstall -->
+      <RemoveFile Id='o32_ibwsd.dll' On='uninstall'
+             Property="System64Folder"
+             Name="ibwsd.dll" LongName='ibwsd.dll' />
+      <RemoveFile Id='o64_ibwsd.dll' On='uninstall'
+             Property="SystemFolder"
+             Name="ibwsd.dll" LongName='ibwsd.dll' />
+      <RemoveFile Id='o64_ibndprov.dll' On='uninstall'
+             Property="SystemFolder"
+             Name="ibndprov.dll" LongName='ibndprov.dll' />
+      <RemoveFile Id='o64_ndinstall.exe' On='uninstall'
+             Property="SystemFolder"
+             Name="ndinstal.exe" LongName='ndinstall.exe' />
+    </Component>
+</Include>
diff --git a/trunk/WinOF/WIX/common/mlnx_drivers.inc b/trunk/WinOF/WIX/common/mlnx_drivers.inc
new file mode 100644
index 00000000..10d811ea
--- /dev/null
+++ b/trunk/WinOF/WIX/common/mlnx_drivers.inc
@@ -0,0 +1,86 @@
+<Include>
+    <Component Id="cMthcaDriver"
+               Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">
+
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCH) = "ia64" ?>
+          <File Id="mthca32.dll" Compressed="yes" DiskId="1"
+                 LongName="mthca32.dll" Name="MTHCA32.DLL"
+                 Source="..\bin\HCA\$(var.ARCH)\mthca32.dll" />
+          <File Id="mthca32d.dll" Compressed="yes" DiskId="1"
+                 LongName="mthca32d.dll" Name="MTHCA321.DLL"
+                 Source="..\bin\HCA\$(var.ARCH)\mthca32d.dll" />
+      <?endif?>
+
+      <File Id="mthca.inf" Compressed="yes" DiskId="1"
+             LongName="mthca.inf" Name="MTHCA.INF"
+             Source="..\bin\HCA\$(var.ARCH)\mthca.inf" />
+      <File Id="mthca.cat" Compressed="yes" DiskId="1"
+             LongName="mthca.cat" Name="MTHCA.cat"
+             Source="..\bin\HCA\$(var.ARCH)\mthca.cat" />
+      <File Id="mthca.sys" Compressed="yes" DiskId="1"
+             LongName="mthca.sys" Name="MTHCA.SYS"
+             Source="..\bin\HCA\$(var.ARCH)\mthca.sys" />
+      <File Id="mthca.pdb" Compressed="yes" DiskId="1"
+             Name="mthca.pdb"
+             Source="..\bin\HCA\$(var.ARCH)\mthca.pdb" />
+      <File Id="mthcau.dll" Compressed="yes" DiskId="1"
+             LongName="mthcau.dll" Name="MTHCAU.DLL"
+             Source="..\bin\HCA\$(var.ARCH)\mthcau.dll" />
+      <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
+             LongName="mthcaud.dll" Name="MTHCAUD.DLL"
+             Source="..\bin\HCA\$(var.ARCH)\mthcaud.dll" />
+
+      <!-- Orphaned install files - remove on uninstall -->
+      <RemoveFile Id='o32_mthcau.dll' On='uninstall'
+             Property="System64Folder"
+             Name="mthcau.dll" LongName='mthcau.dll' />
+      <RemoveFile Id='o32_mthcaud.dll' On='uninstall'
+             Property="System64Folder"
+             Name="mthcaud.dll" LongName='mthcaud.dll' />
+    </Component>
+
+    <Component Id="cConnectXDriver"
+               Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
+      <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
+             LongName="mlx4_bus.inf" Name="mlx4_bus.INF"
+             Source="..\bin\hca\$(var.ARCH)\mlx4_bus.inf" />
+      <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"
+             LongName="mlx4_bus.cat" Name="mlx4_bus.cat"
+             Source="..\bin\hca\$(var.ARCH)\mlx4_bus.cat" />
+      <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
+             LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
+             Source="..\bin\hca\$(var.ARCH)\mlx4_bus.sys" />
+      <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
+             Name="mlx4_bus.pdb"
+             Source="..\bin\hca\$(var.ARCH)\mlx4_bus.pdb" />
+      <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
+             LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
+             Source="..\bin\hca\$(var.ARCH)\mlx4_hca.inf" />
+      <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"
+             LongName="mlx4_hca.cat" Name="mlx4_hca.cat"
+             Source="..\bin\hca\$(var.ARCH)\mlx4_hca.cat" />
+      <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"
+             LongName="mlx4_hca.sys" Name="mlx4_hca.sys"
+             Source="..\bin\hca\$(var.ARCH)\mlx4_hca.sys" />
+      <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"
+             Name="mlx4_hca.pdb"
+             Source="..\bin\hca\$(var.ARCH)\mlx4_hca.pdb" />
+      <File Id="mlx4u.dll" Compressed="yes" DiskId="1"
+             LongName="mlx4u.dll" Name="mlx4u.dll"
+             Source="..\bin\hca\$(var.ARCH)\mlx4u.dll" />
+      <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"
+             LongName="mlx4ud.dll" Name="mlx4ud.dll"
+             Source="..\bin\hca\$(var.ARCH)\mlx4ud.dll" />
+
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>
+          <!-- copy 32-bit binaries for 32b in x64 -->
+          <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"
+                 LongName="mlx4u32d.dll" Name="mlx4u32.dll"
+                 Source="..\bin\hca\$(var.ARCH)\mlx4u32d.dll" />
+          <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"
+                 LongName="mlx4u32.dll" Name="mlx4u32.dll"
+                 Source="..\bin\hca\$(var.ARCH)\mlx4u32.dll" />
+      <?endif?>
+
+    </Component>
+</Include>
diff --git a/trunk/WinOF/WIX/common/requirements.inc b/trunk/WinOF/WIX/common/requirements.inc
new file mode 100644
index 00000000..3b40e478
--- /dev/null
+++ b/trunk/WinOF/WIX/common/requirements.inc
@@ -0,0 +1,57 @@
+<Include>
+
+    <!--
+        System/Machine-wide install, otherwise per-user (Administrator) only.
+        All users see OpenFabrics WinOF Release Notes & Manual in Programs.
+     -->
+    <Property Id="ALLUSERS"> Value="1" </Property>
+
+    <!-- Requires files sc.exe & reg.exe -->
+    <Property Id="REG_EXISTS">
+      <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">
+        <FileSearch Id="RegFile" Name="reg.exe" />
+      </DirectorySearch>
+    </Property>
+
+    <Property Id="SC_EXISTS">
+      <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">
+        <FileSearch Id="ScFile" Name="sc.exe" />
+      </DirectorySearch>
+    </Property>
+
+    <Property Id="IPOIB_EXISTS">
+      <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">
+        <FileSearch Id="ipoibFile" Name="netipoib.inf" />
+      </DirectorySearch>
+    </Property>
+
+    <Property Id="DAT_CONF_EXISTS">
+      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">
+        <FileSearch Id="DCFile" Name="dat.conf" />
+      </DirectorySearch>
+    </Property>
+
+    <Property Id="DAT1_INSTALLED">
+      <DirectorySearch Id="Dat1DS" Path="[INSTALLDIR]" Depth="0">
+        <FileSearch Id="daplFS" Name="dapl.dll" />
+      </DirectorySearch>
+    </Property>
+
+    <Property Id="DAT2_INSTALLED">
+      <DirectorySearch Id="Dat2DS" Path="[INSTALLDIR]" Depth="0">
+        <FileSearch Id="dapl2FS" Name="dapl2.dll" />
+      </DirectorySearch>
+    </Property>
+
+    <Condition Message="[ProductName] requires system file reg.exe">
+       REG_EXISTS
+    </Condition>
+
+    <Condition Message="[ProductName] requires system file sc.exe">
+       SC_EXISTS
+    </Condition>
+
+    <Media Id="1" Cabinet="Data1.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
+    <Property Id="DiskPrompt" Value="WinOF Installation [1]" />
+
+</Include>
diff --git a/trunk/WinOF/WIX/common/tools.inc b/trunk/WinOF/WIX/common/tools.inc
new file mode 100644
index 00000000..cb1a8e07
--- /dev/null
+++ b/trunk/WinOF/WIX/common/tools.inc
@@ -0,0 +1,54 @@
+<Include>
+     <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
+      <Environment Id='UpdatePath' Name='PATH' Action='create'
+                   System='yes' Part='last' Value='[INSTALLDIR]' /> 
+
+       <File Id="qlgcvnic_config" Compressed="yes" DiskId="1" Vital="yes"
+             Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"
+             Source="..\bin\tools\$(var.ARCH)\release\qlgcvnic_config.exe" />
+       <File Id="part_man" Name="part_man.exe"
+             Compressed="yes" DiskId="1" Vital="yes"
+             Source="..\bin\tools\$(var.ARCH)\release\part_man.exe" />
+       <File Id="vstat" Name="vstat.exe"
+             Compressed="yes" DiskId="1" Vital="yes"
+             Source="..\bin\tools\$(var.ARCH)\release\vstat.exe" />
+       <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
+             DiskId="1" Name="TTCP.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\ttcp.exe" />
+       <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
+             DiskId="1" Name="CMTEST.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\cmtest.exe" />
+       <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
+             LongName="ib_limits.exe" Name="IB_LIMI.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\ib_limits.exe" />
+       <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
+             LongName="ib_read_bw.exe" Name="IB_READ.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\ib_read_bw.exe" />
+       <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
+             LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\ib_read_lat.exe" />
+       <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
+             LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\ib_send_bw.exe" />
+       <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
+             LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\ib_send_lat.exe" />
+       <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
+             LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\ib_write_bw.exe" />
+       <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
+             LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\ib_write_lat.exe" />
+       <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
+             LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\ibtrapgen.exe" />
+       <File Id="osmtest.exe" Compressed="yes" DiskId="1"
+             LongName="osmtest.exe" Name="OSMTEST.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\osmtest.exe" />
+       <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
+             LongName="PrintIP.exe" Name="PRINTIP.EXE"
+             Source="..\bin\tools\$(var.ARCH)\release\PrintIP.exe" />
+       <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"
+                Vital="yes" Source="..\bin\tools\$(var.ARCH)\release\nsc.exe" />
+     </Component>
+</Include>
diff --git a/trunk/WinOF/WIX/common/winverbs_OFED.inc b/trunk/WinOF/WIX/common/winverbs_OFED.inc
new file mode 100644
index 00000000..3fbcd1ba
--- /dev/null
+++ b/trunk/WinOF/WIX/common/winverbs_OFED.inc
@@ -0,0 +1,223 @@
+<Include>
+    <Component Id="cWinVerbsOFED"
+               Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
+
+      <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
+            LongName="libibverbs.dll" Name="ibverbs.dll"
+            Source="..\bin\HCA\$(var.ARCH)\libibverbs.dll" />
+        <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"
+               DestinationName="ibverbs.dll"
+               DestinationLongName="libibverbs.dll"
+               DestinationProperty="WindowsFolder" />
+      <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
+            LongName="libibverbs.pdb" Name="ibverbs.pdb"
+            Source="..\bin\HCA\$(var.ARCH)\libibverbs.pdb" />
+
+      <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
+            LongName="libibverbsd.dll" Name="ibverbsd.dll"
+            Source="..\bin\HCA\$(var.ARCH)\libibverbsd.dll" />
+        <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"
+               DestinationName="ibverbsd.dll"
+               DestinationLongName="libibverbsd.dll"
+               DestinationProperty="WindowsFolder" />
+      <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
+            LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
+            Source="..\bin\HCA\$(var.ARCH)\libibverbsd.pdb" />
+
+      <File Id="libibmad.dll" Compressed="yes" DiskId="1"
+            LongName="libibmad.dll" Name="ibmad.dll"
+            Source="..\bin\HCA\$(var.ARCH)\libibmad.dll" />
+        <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"
+               DestinationName="ibmad.dll"
+               DestinationLongName="libibmad.dll"
+               DestinationProperty="WindowsFolder" />
+      <File Id="libibmad.pdb" Compressed="yes" DiskId="1"
+            LongName="libibmad.pdb" Name="ibmad.pdb"
+            Source="..\bin\HCA\$(var.ARCH)\libibmad.pdb" />
+
+      <File Id="libibmadd.dll" Compressed="yes" DiskId="1"
+            LongName="libibmadd.dll" Name="ibmadd.dll"
+            Source="..\bin\HCA\$(var.ARCH)\libibmadd.dll" />
+        <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"
+               DestinationName="ibmadd.dll"
+               DestinationLongName="libibmadd.dll"
+               DestinationProperty="WindowsFolder" />
+      <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"
+            LongName="libibmadd.pdb" Name="ibmadd.pdb"
+            Source="..\bin\HCA\$(var.ARCH)\libibmadd.pdb" />
+
+      <File Id="libibumad.dll" Compressed="yes" DiskId="1"
+            LongName="libibumad.dll" Name="ibumad.dll"
+            Source="..\bin\HCA\$(var.ARCH)\libibumad.dll" />
+        <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"
+               DestinationName="ibumad.dll"
+               DestinationLongName="libibumad.dll"
+               DestinationProperty="WindowsFolder" />
+      <File Id="libibumad.pdb" Compressed="yes" DiskId="1"
+            LongName="libibumad.pdb" Name="ibumad.pdb"
+            Source="..\bin\HCA\$(var.ARCH)\libibumad.pdb" />
+
+      <File Id="libibumadd.dll" Compressed="yes" DiskId="1"
+            LongName="libibumadd.dll" Name="ibumadd.dll"
+            Source="..\bin\HCA\$(var.ARCH)\libibumadd.dll" />
+        <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"
+               DestinationName="ibumadd.dll"
+               DestinationLongName="libibumadd.dll"
+               DestinationProperty="WindowsFolder" />
+      <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"
+            LongName="libibumadd.pdb" Name="ibumadd.pdb"
+            Source="..\bin\HCA\$(var.ARCH)\libibumadd.pdb" />
+      <File Id="librdmacm.dll" Compressed="yes" DiskId="1"
+            LongName="librdmacm.dll" Name="rdmacm.dll"
+            Source="..\bin\HCA\$(var.ARCH)\librdmacm.dll" />
+        <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"
+               DestinationName="rdmacm.dll"
+               DestinationLongName="librdmacm.dll"
+               DestinationProperty="SystemFolder" />
+      <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"
+            LongName="librdmacm.pdb" Name="rdmacm.pdb"
+            Source="..\bin\HCA\$(var.ARCH)\librdmacm.pdb" />
+
+      <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"
+            LongName="librdmacmd.dll" Name="rdmacmd.dll"
+            Source="..\bin\HCA\$(var.ARCH)\librdmacmd.dll" />
+        <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"
+               DestinationName="rdmacmd.dll"
+               DestinationLongName="librdmacmd.dll"
+               DestinationProperty="SystemFolder" />
+      <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"
+            LongName="librdmacmd.pdb" Name="rdmacmd.pdb"
+            Source="..\bin\HCA\$(var.ARCH)\librdmacmd.pdb" />
+    </Component>
+
+    <Component Id="cWinVerbsUApps"
+              Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
+
+      <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_asyncwatch.exe" />
+      <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_asyncwatch.pdb" />
+      <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_devinfo.exe" Name="devinfo.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_devinfo.exe" />
+      <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_devinfo.pdb" Name="devinfo.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_devinfo.pdb" />
+      <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rc_pingpong.exe" />
+      <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rc_pingpong.pdb" />
+      <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_read_bw.exe" Name="readbw.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_read_bw.exe" />
+      <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_read_bw.pdb" Name="readbw.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_read_bw.pdb" />
+      <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_read_lat.exe" Name="readlat.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_read_lat.exe" />
+      <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_read_lat.pdb" Name="readlat.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_read_lat.pdb" />
+      <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_send_bw.exe" Name="send_bw.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_send_bw.exe" />
+      <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_send_bw.pdb" Name="send_bw.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_send_bw.pdb" />
+      <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_send_lat.exe" Name="send_lat.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_send_lat.exe" />
+      <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_send_lat.pdb" Name="send_lat.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_send_lat.pdb" />
+      <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_uc_pingpong.exe" />
+      <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_uc_pingpong.pdb" />
+      <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_ud_pingpong.exe" />
+      <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_ud_pingpong.pdb" />
+      <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_write_bw.exe" Name="write_bw.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_write_bw.exe" />
+      <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_write_bw.pdb" Name="write_bw.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_write_bw.pdb" />
+      <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_write_lat.exe" Name="writelat.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_write_lat.exe" />
+      <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_write_lat.pdb" Name="writelat.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_write_lat.pdb" />
+      <File Id="sminfo.exe" Compressed="yes" DiskId="1"
+            LongName="sminfo.exe" Name="sminfo.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\sminfo.exe" />
+      <File Id="sminfo.pdb" Compressed="yes" DiskId="1"
+            LongName="sminfo.pdb" Name="sminfo.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\sminfo.pdb" />
+      <File Id="ibstat.exe" Compressed="yes" DiskId="1"
+            LongName="ibstat.exe" Name="ibstat.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibstat.exe" />
+      <File Id="ibstat.pdb" Compressed="yes" DiskId="1"
+            LongName="ibstat.pdb" Name="ibstat.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibstat.pdb" />
+      <File Id="perfquery.exe" Compressed="yes" DiskId="1"
+            LongName="perfquery.exe" Name="perfquer.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\perfquery.exe" />
+      <File Id="perfquery.pdb" Compressed="yes" DiskId="1"
+            LongName="perfquery.pdb" Name="perfquer.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\perfquery.pdb" />
+      <File Id="ibaddr.exe" Compressed="yes" DiskId="1"
+            LongName="ibaddr.exe" Name="ibaddr.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibaddr.exe" />
+      <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"
+            LongName="ibaddr.pdb" Name="ibaddr.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibaddr.pdb" />
+      <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"
+            LongName="ibnetdiscover.exe" Name="ibnetdis.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibnetdiscover.exe" />
+      <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"
+            LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibnetdiscover.pdb" />
+      <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"
+            LongName="rdma_cmatose.exe" Name="rcmatose.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\rdma_cmatose.exe" />
+      <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"
+            LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\rdma_cmatose.pdb" />
+      <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rdma_lat.exe" />
+      <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rdma_lat.pdb" />
+      <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"
+            LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rdma_bw.exe" />
+      <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"
+            LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rdma_bw.pdb" />
+      <File Id="ibroute.exe" Compressed="yes" DiskId="1"
+            LongName="ibroute.exe" Name="ibroute.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibroute.exe" />
+      <File Id="ibroute.pdb" Compressed="yes" DiskId="1"
+            LongName="ibroute.pdb" Name="ibroute.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibroute.pdb" />
+      <File Id="ibtracert.exe" Compressed="yes" DiskId="1"
+            LongName="ibtracert.exe" Name="ibtrt.exe"
+            Source="..\bin\tools\$(var.ARCH)\release\ibtracert.exe" />
+      <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"
+            LongName="ibtracert.pdb" Name="ibtrt.pdb"
+            Source="..\bin\tools\$(var.ARCH)\release\ibtracert.pdb" />
+    </Component>
+</Include>
diff --git a/trunk/WinOF/WIX/common/winverbs_drivers.inc b/trunk/WinOF/WIX/common/winverbs_drivers.inc
new file mode 100644
index 00000000..1b147a76
--- /dev/null
+++ b/trunk/WinOF/WIX/common/winverbs_drivers.inc
@@ -0,0 +1,30 @@
+<Include>
+    <Component Id="cWinVerbsDrivers"
+               Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
+
+      <File Id="winverbs.sys" Compressed="yes" DiskId="1"
+            LongName="winverbs.sys" Name="winverbs.sys"
+            Source="..\bin\HCA\$(var.ARCH)\winverbs.sys" />
+      <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
+            LongName="winverbs.pdb" Name="winverbs.pdb"
+            Source="..\bin\HCA\$(var.ARCH)\winverbs.pdb" />
+      <File Id="winverbs.dll" Compressed="yes" DiskId="1"
+            LongName="winverbs.dll" Name="winvrbs.dll"
+            Source="..\bin\HCA\$(var.ARCH)\winverbs.dll" />
+      <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
+            LongName="winverbsd.dll" Name="winvrbsd.dll"
+            Source="..\bin\HCA\$(var.ARCH)\winverbsd.dll" />
+      <File Id="winmad.sys" Compressed="yes" DiskId="1"
+            LongName="winmad.sys" Name="winmad.sys"
+            Source="..\bin\HCA\$(var.ARCH)\winmad.sys" />
+      <File Id="winmad.pdb" Compressed="yes" DiskId="1"
+            LongName="winmad.pdb" Name="winmad.pdb"
+            Source="..\bin\HCA\$(var.ARCH)\winmad.pdb" />
+      <File Id="winmad.dll" Compressed="yes" DiskId="1"
+            LongName="winmad.dll" Name="winmad.dll"
+            Source="..\bin\HCA\$(var.ARCH)\winmad.dll" />
+      <File Id="winmadd.dll" Compressed="yes" DiskId="1"
+            LongName="winmadd.dll" Name="winmaddd.dll"
+            Source="..\bin\HCA\$(var.ARCH)\winmadd.dll" />
+    </Component>
+</Include>
diff --git a/trunk/WinOF/WIX/win7/ia64/wof.wxs b/trunk/WinOF/WIX/win7/ia64/wof.wxs
index 619fadf2..6672c8db 100644
--- a/trunk/WinOF/WIX/win7/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/win7/ia64/wof.wxs
@@ -2,23 +2,31 @@
 <!--
    WinOF (Windows OpenFabrics) for IA64/IPF Itanium on Windows 7
 -->
+
+<?define ARCH=ia64 ?>
+<?define ARCHP=ia64 ?>
+<?define OS=win7 ?>
+<?include ..\..\common\WinOF_cfg.inc ?>
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Product Name="Windows Open Fabrics InfiniBand v2.1 (RC0) ia64"
-    Version="2.1.0"
+  <Product
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"
+    Version="$(var.WOFRELNUM)"
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
-    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' 
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
     Language="1033" Codepage="1252"
     Manufacturer="Open Fabrics Alliance Windows">
 
     <Package Id="????????-????-????-????-????????????"
-     Keywords="Installer, InfiniBand" Description="WinOF Installer"
+     Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
      InstallPrivileges='elevated'
-     Comments="Windows Open Fabrics Alliance InfiniBand stack"
-     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="200"
+     Description="WinOF Installer"
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
      Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Condition Message="Administrator required to install [ProductName].">
-     Privileged
+     AdminUser
     </Condition>
 
     <Condition Message="This package can be installed on IA64 systems only">
@@ -33,59 +41,7 @@
          <![CDATA[(VersionNT=600)]]>
     </Condition>
 
-    <!--
-        System/Machine-wide install, otherwise per-user (Administrator) only.
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.
-     -->
-    <Property Id="ALLUSERS"> Value="1" </Property>
-
-    <!-- Requires files sc.exe & reg.exe -->
-    <Property Id="REG_EXISTS">
-      <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="RegFile" Name="reg.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="SC_EXISTS">
-      <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="ScFile" Name="sc.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="IPOIB_EXISTS">
-      <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">
-        <FileSearch Id="ipoibFile" Name="netipoib.inf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT_CONF_EXISTS">
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">
-        <FileSearch Id="DCFile" Name="dat.conf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT1_INSTALLED">
-      <DirectorySearch Id="Dat1File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="daplFile" Name="dapl.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT2_INSTALLED">
-      <DirectorySearch Id="Dat2File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="dapl2File" Name="dapl2.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Condition Message="[ProductName] requires system file reg.exe">
-       REG_EXISTS
-    </Condition>
-
-    <Condition Message="[ProductName] requires system file sc.exe">
-       SC_EXISTS
-    </Condition>
-
-    <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
-    <Property Id="DiskPrompt" Value="WinOF 1.1 Installation [1]" />
+    <?include ..\..\common\requirements.inc ?>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
@@ -95,833 +51,36 @@
       <Directory Id="DesktopFolder" Name="Desktop" />
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="INSTALLDIR" Name="WinOF">
-          <Component Id="Docs" Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
-
-            <File Id="OFAlogo" Compressed="yes" DiskId="1"
-                    LongName="openfabrics.gif" Name="ofa.gif"
-                    Source="..\..\openfabrics.gif" />
-
-            <!-- implies WIX build only from an svn structured tree.  -->
-            <File Id="manual.htm" Compressed="yes" DiskId="1" Name="Manual.htm"
-                    LongName="Manual.htm"
-                    Source="..\bin\Misc\Manual.htm" Vital="yes" />
-
-            <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
-                    Name="Manual.htm" LongName="Manual"
-                    Target="[INSTALLDIR]\Manual.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="dRelnotes" Compressed="yes" DiskId="1"
-                    LongName="Release_notes.htm" Name="RELEASE_.HTM"
-                    Source="..\..\Release_notes.htm" />
-
-            <Shortcut Id="RelNotes" Directory="ProgramMenuDir" Name="RelNotes"
-                    LongName="Release Notes"
-                    Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="command_window" Name="COMMAND.LNK"
-                    LongName="Command Window.lnk" Compressed="yes" DiskId="1"
-                    Source="..\..\ia64\Command Window.lnk" Vital="yes" />
-
-            <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
-                    Name="COMMAND.LNK" LongName="Command Window.lnk"
-                    Target="[INSTALLDIR]\Command Window.lnk" Icon="openfabrics"
-                    IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />
-
-            <Shortcut Id="UninstallProduct" Name="UnMyApp"
-                LongName="Uninstall WinOF"
-				Target="[System64Folder]msiexec.exe"
-                Arguments="/X [ProductCode]"
-                Directory="ProgramMenuDir"
-                Description="Uninstalls OpenFabrics InfiniBand" />
-            <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
-          </Component>
-
-          <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
-           <Environment Id='UpdatePath' Name='PATH' Action='create'
-                        System='yes' Part='last' Value='[INSTALLDIR]' /> 
-
-            <File Id="qlgcvnic_config" Compressed="yes" DiskId="1" Vital="yes"
-                  Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"
-                  Source="..\bin\tools\ia64\release\qlgcvnic_config.exe" />
-            <File Id="part_man" Name="part_man.exe"
-                  Compressed="yes" DiskId="1" Vital="yes"
-                  Source="..\bin\tools\ia64\release\part_man.exe" />
-            <File Id="vstat" Name="vstat.exe"
-                  Compressed="yes" DiskId="1" Vital="yes"
-                  Source="..\bin\tools\ia64\release\vstat.exe" />
-            <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
-                  DiskId="1" Name="TTCP.EXE"
-                  Source="..\bin\tools\ia64\release\ttcp.exe" />
-            <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
-                  DiskId="1" Name="CMTEST.EXE"
-                  Source="..\bin\tools\ia64\release\cmtest.exe" />
-            <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_limits.exe" Name="IB_LIMI.EXE"
-                  Source="..\bin\tools\ia64\release\ib_limits.exe" />
-            <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_read_bw.exe" Name="IB_READ.EXE"
-                  Source="..\bin\tools\ia64\release\ib_read_bw.exe" />
-            <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
-                  Source="..\bin\tools\ia64\release\ib_read_lat.exe" />
-            <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
-                  Source="..\bin\tools\ia64\release\ib_send_bw.exe" />
-            <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
-                  Source="..\bin\tools\ia64\release\ib_send_lat.exe" />
-            <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
-                  Source="..\bin\tools\ia64\release\ib_write_bw.exe" />
-            <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
-                  Source="..\bin\tools\ia64\release\ib_write_lat.exe" />
-            <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
-                  LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
-                  Source="..\bin\tools\ia64\release\ibtrapgen.exe" />
-            <File Id="osmtest.exe" Compressed="yes" DiskId="1"
-                  LongName="osmtest.exe" Name="OSMTEST.EXE"
-                  Source="..\bin\tools\ia64\release\osmtest.exe" />
-            <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
-                  LongName="PrintIP.exe" Name="PRINTIP.EXE"
-                  Source="..\bin\tools\ia64\release\PrintIP.exe" />
-            <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"
-                     Vital="yes" Source="..\bin\tools\ia64\release\nsc.exe" />
-          </Component>
-
-          <Component Id='OpenSMservice'
-                     Guid='90042B4F-51B5-4720-8E54-6D366253634B'
-                     SharedDllRefCount='no' KeyPath='no'
-                     NeverOverwrite='no'
-                     Permanent='no' Transitive='no' Win64='no'
-                     Location='either'>
-
-              <File Id="opensm.exe" Compressed="yes" DiskId="1"
-                    LongName="opensm.exe" Name="OPENSM.EXE"
-                    Source="..\bin\tools\ia64\release\opensm.exe"
-                    Vital='yes' KeyPath='yes' Hidden='no' System='no' 
-                    Checksum='no' ReadOnly='no' />
-
-              <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
-                  Description='InfiniBand Subnet Configuration and Management'
-                  DisplayName='InfiniBand Subnet Manager'
-                  Arguments='-e --service'
-                  ErrorControl='normal'
-                  Start='disabled'
-                  Interactive='no'
-                  Type='ownProcess' />
-
-              <ServiceControl Id='osmSvcControl' Name='OpenSM'
-                              Stop='uninstall'
-                              Wait='no'
-                              Remove='uninstall' />
-          </Component>
-
-          <Directory Id="hcaDir" Name="IBcore">
-            <Component Id="cIBcore"
-                       Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
-              <CreateFolder />
-              <File Id="dpinst.exe" Compressed="yes" DiskId="1"
-                     LongName="dpinst.exe" Name="dpinst.exe"
-                     Source="..\..\ia64\dpinst.exe" />
-              <File Id="dpinst.xml" Compressed="yes" DiskId="1"
-                     LongName="dpinst.xml" Name="dpinst.xml"
-                     Source="..\..\dpinst.xml" />
-              <File Id="devman.exe" Compressed="yes" DiskId="1"
-                     LongName="devman.exe" Name="devman.exe"
-                     Source="..\..\ia64\devman.exe" />
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01009.dll" Name="WCO.dll"
-                     Source="..\bin\hca\ia64\WdfCoInstaller01009.dll" />
-              <File Id="cl32.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32.dll" Name="CL32.DLL"
-                     Source="..\bin\HCA\ia64\cl32.dll" />
-              <File Id="cl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32d.dll" Name="CL32D.DLL"
-                     Source="..\bin\HCA\ia64\cl32d.dll" />
-              <File Id="complib.dll" Compressed="yes" DiskId="1"
-                     LongName="complib.dll" Name="COMPLIB.DLL"
-                     Source="..\bin\HCA\ia64\complib.dll" />
-              <File Id="complibd.dll" Compressed="yes" DiskId="1"
-                     LongName="complibd.dll" Name="COMPLIB1.DLL"
-                     Source="..\bin\HCA\ia64\complibd.dll" />
-              <File Id="ibal32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32.dll" Name="IBAL32.DLL"
-                     Source="..\bin\HCA\ia64\ibal32.dll" />
-              <File Id="ibal32d.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32d.dll" Name="IBAL32D.DLL"
-                     Source="..\bin\HCA\ia64\ibal32d.dll" />
-              <File Id="ibal.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal.dll" Name="IBAL.DLL"
-                     Source="..\bin\HCA\ia64\ibal.dll" />
-              <File Id="ibald.dll" Compressed="yes" DiskId="1"
-                     LongName="ibald.dll" Name="IBALD.DLL"
-                     Source="..\bin\HCA\ia64\ibald.dll" />
-              <File Id="ibbus.sys" Compressed="yes" DiskId="1"
-                     LongName="ibbus.sys" Name="IBBUS.SYS"
-                     Source="..\bin\HCA\ia64\ibbus.sys" />
-              <File Id="ibbus.pdb" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                     Source="..\bin\HCA\ia64\ibbus.pdb" />
 
-              <File Id="ibiou.sys" Compressed="yes" DiskId="1"
-                     LongName="ibiou.sys" Name="IBIOU.SYS"
-                     Source="..\bin\HCA\ia64\ibiou.sys" />
-              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"
-                     Name="ibiou.pdb" Source="..\bin\HCA\ia64\ibiou.pdb" />
-              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.cat" Name="IB_IOU.cat"
-                     Source="..\bin\HCA\ia64\ib_iou.cat" />
-              <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.inf" Name="IB_IOU.inf"
-                     Source="..\bin\HCA\ia64\ib_iou.inf" />
-            </Component>
-
-            <Component Id="cMthcaDriver"
-                       Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">
-              <File Id="mthca32.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32.dll" Name="MTHCA32.DLL"
-                     Source="..\bin\HCA\ia64\mthca32.dll" />
-              <File Id="mthca32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32d.dll" Name="MTHCA321.DLL"
-                     Source="..\bin\HCA\ia64\mthca32d.dll" />
-              <File Id="mthca.inf" Compressed="yes" DiskId="1"
-                     LongName="mthca.inf" Name="MTHCA.INF"
-                     Source="..\bin\HCA\ia64\mthca.inf" />
-              <File Id="mthca.cat" Compressed="yes" DiskId="1"
-                     LongName="mthca.cat" Name="MTHCA.cat"
-                     Source="..\bin\HCA\ia64\mthca.cat" />
-              <File Id="mthca.sys" Compressed="yes" DiskId="1"
-                     LongName="mthca.sys" Name="MTHCA.SYS"
-                     Source="..\bin\HCA\ia64\mthca.sys" />
-              <File Id="mthca.pdb" Name="mthca.pdb" DiskId="1"
-                     Compressed="yes" Source="..\bin\HCA\ia64\mthca.pdb" />
-              <File Id="mthcau.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcau.dll" Name="MTHCAU.DLL"
-                     Source="..\bin\HCA\ia64\mthcau.dll" />
-              <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcaud.dll" Name="MTHCAUD.DLL"
-                     Source="..\bin\HCA\ia64\mthcaud.dll" />
-            </Component>
-
-            <Component Id="cConnectXDriver"
-                       Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
-              <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.inf" Name="mlx4_bus.INF"
-                     Source="..\bin\hca\ia64\mlx4_bus.inf" />
-              <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.cat" Name="mlx4_bus.cat"
-                     Source="..\bin\hca\ia64\mlx4_bus.cat" />
-              <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
-                     Source="..\bin\hca\ia64\mlx4_bus.sys" />
-              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
-                     Name="mlx4_bus.pdb"
-                     Source="..\bin\hca\ia64\mlx4_bus.pdb" />
-              <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
-                     Source="..\bin\hca\ia64\mlx4_hca.inf" />
-              <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.cat" Name="mlx4_hca.cat"
-                     Source="..\bin\hca\ia64\mlx4_hca.cat" />
-              <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.sys" Name="mlx4_hca.sys"
-                     Source="..\bin\hca\ia64\mlx4_hca.sys" />
-              <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.pdb" Name="mlx4_hca.pdb"
-                     Source="..\bin\hca\ia64\mlx4_hca.pdb" />
-              <File Id="mlx4u.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u.dll" Name="mlx4u.dll"
-                     Source="..\bin\hca\ia64\mlx4u.dll" />
-              <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4ud.dll" Name="mlx4ud.dll"
-                     Source="..\bin\hca\ia64\mlx4ud.dll" />
-
-			  <!-- copy 32-bit binaries --> 
-              <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32d.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\ia64\mlx4u32d.dll" />
-              <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\ia64\mlx4u32.dll" />
-            </Component>
-
-            <Component Id="cWinVerbsDrivers"
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-
-              <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                    LongName="winverbs.sys" Name="winverbs.sys"
-                    Source="..\bin\HCA\ia64\winverbs.sys" />
-              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
-                    LongName="winverbs.pdb" Name="winverbs.pdb"
-                    Source="..\bin\HCA\ia64\winverbs.pdb" />
-              <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                    LongName="winverbs.dll" Name="winvrbs.dll"
-                    Source="..\bin\HCA\ia64\winverbs.dll" />
-              <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.dll" Name="winvrbsd.dll"
-                    Source="..\bin\HCA\ia64\winverbsd.dll" />
-              <File Id="winmad.sys" Compressed="yes" DiskId="1"
-                    LongName="winmad.sys" Name="winmad.sys"
-                    Source="..\bin\HCA\ia64\winmad.sys" />
-              <File Id="winmad.pdb" Compressed="yes" DiskId="1"
-                    LongName="winmad.pdb" Name="winmad.pdb"
-                    Source="..\bin\HCA\ia64\winmad.pdb" />
-              <File Id="winmad.dll" Compressed="yes" DiskId="1"
-                    LongName="winmad.dll" Name="winmad.dll"
-                    Source="..\bin\HCA\ia64\winmad.dll" />
-              <File Id="winmadd.dll" Compressed="yes" DiskId="1"
-                    LongName="winmadd.dll" Name="winmaddd.dll"
-                    Source="..\bin\HCA\ia64\winmadd.dll" />
-            </Component>
-          </Directory>
-
-          <Directory Id="dir_0" Name="Checked">
-            <Directory Id="dir_1" Name="kernel">
-              <Component Id="cCHK_kernel"
-                         Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
-                <CreateFolder />
-
-                <File Id="chk0" DiskId="1" Compressed="yes"
-                      Name="README.txt"
-                      Source="..\..\README_checked.txt" />
-                <File Id="chk1" DiskId="1" Compressed="yes"
-                      Name="mthca.sys"
-                      Source="..\bin\Chk\HCA\ia64\mthca.sys" />
-                <File Id="cat1" DiskId="1" Compressed="yes"
-                      Name="mthca.cat"
-                      Source="..\bin\Chk\HCA\ia64\mthca.cat" />
-                <File Id="sym1" DiskId="1" Compressed="yes"
-                      Name="mthca.pdb"
-                      Source="..\bin\Chk\HCA\ia64\mthca.pdb" />
-
-                <File Id="chk2" DiskId="1" Compressed="yes"
-                      Name="ibbus.sys"
-                      Source="..\bin\Chk\HCA\ia64\ibbus.sys" />
-                <File Id="sym2" DiskId="1" Compressed="yes"
-                      Name="ibbus.pdb"
-                      Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />
-
-                <File Id="chk3" DiskId="1" Compressed="yes"
-                      Name="ibiou.sys"
-                      Source="..\bin\Chk\HCA\ia64\ibiou.sys" />
-                <File Id="cat3" DiskId="1" Compressed="yes"
-                      Name="ib_iou.cat"
-                      Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />
-                <File Id="sym3" DiskId="1" Compressed="yes"
-                      Name="ibiou.pdb"
-                      Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />
-
-                <File Id="chk4" DiskId="1" Compressed="yes"
-                      Name="ipoib.sys"
-                      Source="..\bin\Chk\net\ia64\ipoib.sys" />
-                <File Id="cat4" DiskId="1" Compressed="yes"
-                      Name="ipoib.cat"
-                      Source="..\bin\Chk\net\ia64\ipoib.cat" />
-                <File Id="sym4" DiskId="1" Compressed="yes"
-                      Name="ipoib.pdb"
-                      Source="..\bin\Chk\net\ia64\ipoib.pdb" />
-
-                <File Id="chk5" DiskId="1" Compressed="yes"
-                      Name="qlgcvnic.sys"
-                      Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />
-                <File Id="cat5" DiskId="1" Compressed="yes"
-                      Name="netvnic.cat"
-                      Source="..\bin\Chk\net\ia64\netvnic.cat" />
-                <File Id="sym5" DiskId="1" Compressed="yes"
-                      Name="qlgcvnic.pdb"
-                      Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />
-
-                <File Id="chk6" DiskId="1" Compressed="yes"
-                      Name="ibsrp.sys"
-                      Source="..\bin\Chk\storage\ia64\ibsrp.sys" />
-                <File Id="cat6" DiskId="1" Compressed="yes"
-                      Name="ibsrp.cat"
-                      Source="..\bin\Chk\storage\ia64\ibsrp.cat" />
-                <File Id="sym6" DiskId="1" Compressed="yes"
-                      Name="ibsrp.pdb"
-                      Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />
+          <?include ..\..\common\Docs.inc ?>
+          <?include ..\..\common\Tools.inc ?>
+          <?include ..\..\common\OpenSM_service.inc ?>
 
-                <File Id="chk9" DiskId="1" Compressed="yes"
-                      Name="winverbs.sys"
-                      Source="..\bin\Chk\HCA\ia64\winverbs.sys" />
-                <File Id="sym9" DiskId="1" Compressed="yes"
-                      Name="winverbs.pdb"
-                      Source="..\bin\Chk\HCA\ia64\winverbs.pdb" />
-                <File Id="dll9" DiskId="1" Compressed="yes"
-                      Name="winverbs.dll"
-                      Source="..\bin\Chk\HCA\ia64\winverbs.dll" />
-                <File Id="dlld9" DiskId="1" Compressed="yes"
-                      Name="winverbd.dll"
-                      LongName="winverbsd.dll"
-                      Source="..\bin\Chk\HCA\ia64\winverbsd.dll" />
-              </Component>
-            </Directory>
-      
-            <Directory Id="dir_14" Name="user">
-              <Component Id="cCHK_user" 
-                         Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
-                <CreateFolder />
-                <File Id="file83" Name="DAPL2-_1.DLL"
-                  LongName="dapl2-scmd.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dapl2-scmd.dll" />
-                <File Id="file84" Name="dapl2d.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dapl2d.dll" />
-                <File Id="file85" Name="DAPL2T_1.EXE"
-                  LongName="dapl2testd.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dapl2testd.exe" />
-                <File Id="file86" Name="dapld.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dapld.dll" />
-                <File Id="file87" Name="DAPLTE_1.EXE"
-                  LongName="dapltestd.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dapltestd.exe" />
-                <File Id="file88" Name="dat2d.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dat2d.dll" />
-                <File Id="file89" Name="datd.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\datd.dll" />
-                <File Id="file90" Name="dtest2d.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dtest2d.exe" />
-                <File Id="file91" Name="dtestxd.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dtestxd.exe" />
-                <File Id="file94" Name="ibald.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\ibald.dll" />
-                <File Id="file97" Name="ibwsd.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\ibwsd.dll" />
-                <File Id="file105" Name="INSTAL_1.EXE"
-                  LongName="installsp.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\installsp.exe" />
-                <File Id="file108" Name="mthcaud.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\mthcaud.dll" />
-                <File Id="file110" Name="opensm.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\opensm.exe" />
-                <File Id="file115" Name="vstat.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\vstat.exe" />
-                <File Id="file116" Name="part_man.exe"
-                  DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\part_man.exe" />
-              </Component>
-            </Directory>
+          <Directory Id="IBcoreDir" Name="IBcore">
+            <?include ..\..\common\IBcore.inc ?>
+            <?include ..\..\common\mlnx_drivers.inc ?>
+            <?include ..\..\common\winverbs_drivers.inc ?>
           </Directory>
 
-          <Component Id="cWinVerbsOFED"
-                     Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.dll" Name="ibverbs.dll"
-                  Source="..\bin\HCA\ia64\libibverbs.dll" />
-              <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"
-                     DestinationName="ibverbs.dll"
-                     DestinationLongName="libibverbs.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                  Source="..\bin\HCA\ia64\libibverbs.pdb" />
-
-            <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                  Source="..\bin\HCA\ia64\libibverbsd.dll" />
-              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"
-                     DestinationName="ibverbsd.dll"
-                     DestinationLongName="libibverbsd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                  Source="..\bin\HCA\ia64\libibverbsd.pdb" />
-
-            <File Id="libibmad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmad.dll" Name="ibmad.dll"
-                  Source="..\bin\HCA\ia64\libibmad.dll" />
-              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"
-                     DestinationName="ibmad.dll"
-                     DestinationLongName="libibmad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmad.pdb" Name="ibmad.pdb"
-                  Source="..\bin\HCA\ia64\libibmad.pdb" />
-
-            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.dll" Name="ibmadd.dll"
-                  Source="..\bin\HCA\ia64\libibmadd.dll" />
-              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"
-                     DestinationName="ibmadd.dll"
-                     DestinationLongName="libibmadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                  Source="..\bin\HCA\ia64\libibmadd.pdb" />
-
-            <File Id="libibumad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumad.dll" Name="ibumad.dll"
-                  Source="..\bin\HCA\ia64\libibumad.dll" />
-              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"
-                     DestinationName="ibumad.dll"
-                     DestinationLongName="libibumad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumad.pdb" Name="ibumad.pdb"
-                  Source="..\bin\HCA\ia64\libibumad.pdb" />
-
-            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.dll" Name="ibumadd.dll"
-                  Source="..\bin\HCA\ia64\libibumadd.dll" />
-              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"
-                     DestinationName="ibumadd.dll"
-                     DestinationLongName="libibumadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                  Source="..\bin\HCA\ia64\libibumadd.pdb" />
-
-            <File Id="librdmacm.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.dll" Name="rdmacm.dll"
-                  Source="..\bin\HCA\ia64\librdmacm.dll" />
-              <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"
-                     DestinationName="rdmacm.dll"
-                     DestinationLongName="librdmacm.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.pdb" Name="rdmacm.pdb"
-                  Source="..\bin\HCA\ia64\librdmacm.pdb" />
-
-            <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.dll" Name="rdmacmd.dll"
-                  Source="..\bin\HCA\ia64\librdmacmd.dll" />
-              <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"
-                     DestinationName="rdmacmd.dll"
-                     DestinationLongName="librdmacmd.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.pdb" Name="rdmacmd.pdb"
-                  Source="..\bin\HCA\ia64\librdmacmd.pdb" />
-
-          </Component>
-
-          <Component Id="cWinVerbsUApps"
-                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
-
-            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.exe" />
-            <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.pdb" />
-            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.exe" Name="devinfo.exe"
-                  Source="..\bin\tools\ia64\release\ibv_devinfo.exe" />
-            <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_devinfo.pdb" />
-            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"
-                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.exe" />
-            <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.pdb" />
-            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.exe" Name="readbw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_read_bw.exe" />
-            <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_read_bw.pdb" />
-            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.exe" Name="readlat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_read_lat.exe" />
-            <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_read_lat.pdb" />
-            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.exe" Name="send_bw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_send_bw.exe" />
-            <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_send_bw.pdb" />
-            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.exe" Name="send_lat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_send_lat.exe" />
-            <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_send_lat.pdb" />
-            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"
-                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.exe" />
-            <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.pdb" />
-            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"
-                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.exe" />
-            <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.pdb" />
-            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.exe" Name="write_bw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_write_bw.exe" />
-            <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_write_bw.pdb" />
-            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.exe" Name="writelat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_write_lat.exe" />
-            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_write_lat.pdb" />
-            <File Id="sminfo.exe" Compressed="yes" DiskId="1"
-                  LongName="sminfo.exe" Name="sminfo.exe"
-                  Source="..\bin\tools\ia64\release\sminfo.exe" />
-            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="sminfo.pdb" Name="sminfo.pdb"
-                  Source="..\bin\tools\ia64\release\sminfo.pdb" />
-            <File Id="ibstat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibstat.exe" Name="ibstat.exe"
-                  Source="..\bin\tools\ia64\release\ibstat.exe" />
-            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibstat.pdb" Name="ibstat.pdb"
-                  Source="..\bin\tools\ia64\release\ibstat.pdb" />
-            <File Id="perfquery.exe" Compressed="yes" DiskId="1"
-                  LongName="perfquery.exe" Name="perfquer.exe"
-                  Source="..\bin\tools\ia64\release\perfquery.exe" />
-            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"
-                  LongName="perfquery.pdb" Name="perfquer.pdb"
-                  Source="..\bin\tools\ia64\release\perfquery.pdb" />
-            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.exe" Name="ibaddr.exe"
-                  Source="..\bin\tools\ia64\release\ibaddr.exe" />
-            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.pdb" Name="ibaddr.pdb"
-                  Source="..\bin\tools\ia64\release\ibaddr.pdb" />
-            <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.exe" Name="ibnetdis.exe"
-                  Source="..\bin\tools\ia64\release\ibnetdiscover.exe" />
-            <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"
-                  Source="..\bin\tools\ia64\release\ibnetdiscover.pdb" />
-            <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.exe" Name="rcmatose.exe"
-                  Source="..\bin\tools\ia64\release\rdma_cmatose.exe" />
-            <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"
-                  Source="..\bin\tools\ia64\release\rdma_cmatose.pdb" />
-            <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_lat.exe" />
-            <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_lat.pdb" />
-            <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_bw.exe" />
-            <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_bw.pdb" />
-            <File Id="ibroute.exe" Compressed="yes" DiskId="1"
-                  LongName="ibroute.exe" Name="ibroute.exe"
-                  Source="..\bin\tools\ia64\release\ibroute.exe" />
-            <File Id="ibroute.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibroute.pdb" Name="ibroute.pdb"
-                  Source="..\bin\tools\ia64\release\ibroute.pdb" />
-            <File Id="ibtracert.exe" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.exe" Name="ibtrt.exe"
-                  Source="..\bin\tools\ia64\release\ibtracert.exe" />
-            <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.pdb" Name="ibtrt.pdb"
-                  Source="..\bin\tools\ia64\release\ibtracert.pdb" />
-          </Component>
+          <?include ..\..\common\checked.inc ?>
+          <?include ..\..\common\winverbs_OFED.inc ?>
 
           <Directory Id="ipoibDir" Name="net">
-            <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
-              <CreateFolder />
-              <File Id="netipoib_inf" Compressed="yes" DiskId="1"
-                     LongName="netipoib.inf" Name="NETIPOI.INF"
-                     Source="..\bin\net\ia64\netipoib.inf" />
-              <File Id="ipoib_cat" Compressed="yes" DiskId="1"
-                     LongName="ipoib.cat" Name="IPOI.cat"
-                     Source="..\bin\net\ia64\ipoib.cat" />
-              <File Id="ipoib.sys" Compressed="yes" DiskId="1"
-                     LongName="ipoib.sys" Name="IPOIB.SYS"
-                     Source="..\bin\net\ia64\ipoib.sys" />
-              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"
-                     Name="ipoib.pdb"
-                     Source="..\bin\net\ia64\ipoib.pdb" />
-              <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd32.dll" Name="IBWSD32.DLL"
-                     Source="..\bin\net\ia64\ibwsd32.dll" />
-              <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd.dll" Name="IBWSD.DLL"
-                     Source="..\bin\net\ia64\ibwsd.dll" />
-              <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov.dll" Name="IBNDPROV.DLL"
-                     Source="..\bin\net\ia64\ibndprov.dll" />
-              <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"
-                     Source="..\bin\net\ia64\ibndprov32.dll" />
-              <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
-                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"
-                     Source="..\bin\net\ia64\ndinstall.exe" />
-            </Component>
+            <?include ..\..\common\ipoib.inc ?>
           </Directory>
 
           <Component Id="WinsockDirect"
                      Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
             <File Id="installsp.exe" Compressed="yes" DiskId="1"
                      LongName="installsp.exe" Name="INSTALL.EXE"
-                     Source="..\bin\net\ia64\installsp.exe" />
+                     Source="..\bin\net\$(var.ARCH)\installsp.exe" />
           </Component>
 <!-- when ND works for ia64
           <Component Id="cNetworkDirect"
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
           </Component>
 -->
-
-          <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-              <File Id="dapl32.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl32.dll" Name="DAPL32.DLL"
-                     Source="..\bin\DAPL\ia64\dapl32.dll" />
-              <File Id="dapl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl32d.dll" Name="DAPL32D.DLL"
-                     Source="..\bin\DAPL\ia64\dapl32d.dll" />
-              <File Id="dapl.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl.dll" Name="DAPL.DLL"
-                     Source="..\bin\DAPL\ia64\dapl.dll" />
-                <CopyFile Id="dupDAPL" FileId="dapl.dll"
-                        DestinationName="dapl.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="dapld.dll" Compressed="yes" DiskId="1"
-                     LongName="dapld.dll" Name="DAPLD.DLL"
-                     Source="..\bin\DAPL\ia64\dapld.dll" />
-              <File Id="dat32.dll" Compressed="yes" DiskId="1"
-                     LongName="dat32.dll" Name="DAT32.DLL"
-                     Source="..\bin\DAPL\ia64\dat32.dll" />
-              <File Id="dat32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat32d.dll" Name="DAT32D.DLL"
-                     Source="..\bin\DAPL\ia64\dat32d.dll" />
-              <File Id="dat.dll" Compressed="yes" DiskId="1"
-                     LongName="dat.dll" Name="DAT.DLL"
-                     Source="..\bin\DAPL\ia64\dat.dll" />
-              <CopyFile Id="dupDAT" FileId="dat.dll"
-                        DestinationName="dat.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="datd.dll" Compressed="yes" DiskId="1"
-                     LongName="datd.dll" Name="DATD.DLL"
-                     Source="..\bin\DAPL\ia64\datd.dll" />
-
-              <File Id="dat.conf" Compressed="yes" DiskId="1"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
-              <File Id="dapltest.exe" Compressed="yes" DiskId="1"
-                     LongName="dapltest.exe" Name="dapltest.exe"
-                     Source="..\bin\tools\ia64\release\dapltest.exe" />
-              <File Id="dapltestd.exe" Compressed="yes" DiskId="1"
-                     LongName="dapltestd.exe" Name="dapltesd.exe"
-                     Source="..\bin\tools\ia64\debug\dapltestd.exe" />
-
-              <File Id="dapl.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl.pdb" Name="dapl.pdb"
-                    Source="..\bin\DAPL\ia64\dapl.pdb" />
-              <File Id="dapld.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapld.pdb" Name="dapld.pdb"
-                    Source="..\bin\DAPL\ia64\dapld.pdb" />
-              <File Id="dat.lib" Compressed="yes" DiskId="1"
-                    LongName="dat.lib" Name="dat.lib"
-                    Source="..\bin\DAPL\ia64\dat.lib" />
-              <File Id="datd.lib" Compressed="yes" DiskId="1"
-                    LongName="datd.lib" Name="datd.lib"
-                    Source="..\bin\DAPL\ia64\datd.lib" />
-              <File Id="dat.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat.pdb" Name="dat.pdb"
-                    Source="..\bin\DAPL\ia64\dat.pdb" />
-              <File Id="datd.pdb" Compressed="yes" DiskId="1"
-                    LongName="datd.pdb" Name="datd.pdb"
-                    Source="..\bin\DAPL\ia64\datd.pdb" />
-              <File Id="dt_svr.bat" Compressed="yes" DiskId="1"
-                    LongName="dt-svr.bat" Name="dt-svr.bat"
-                    Source="..\bin\DAPL2\dt-svr.bat" />
-              <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"
-                        DestinationName="dt1-svr.bat"
-                        DestinationProperty="INSTALLDIR" />
-              <File Id="dt_cli.bat" Compressed="yes" DiskId="1"
-                    LongName="dt-cli.bat" Name="dt-cli.bat"
-                    Source="..\bin\DAPL2\dt-cli.bat" />
-              <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"
-                        DestinationName="dt1-cli.bat"
-                        DestinationProperty="INSTALLDIR" />
-          </Component>
-
-          <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
-              <File Id="_dapl32.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232.dll" Name="DAPL232.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl232.dll" />
-              <File Id="_dapl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232d.dll" Name="DAPL232D.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl232d.dll" />
-              <File Id="_dapl2.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2.dll" Name="DAPL2.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl2.dll" />
-                <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"
-                        DestinationName="dapl2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2d.dll" Name="DAPL2D.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl2d.dll" />
-              <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scm.dll" Name="D2-scm.DLL"
-                          Source="..\bin\DAPL2\ia64\dapl2-scm.dll" />
-              <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"
-                              DestinationName="d2-scm.dll"
-                              DestinationLongName="dapl2-scm.dll"
-                              DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"
-                          Source="..\bin\DAPL2\ia64\dapl2-scmd.dll" />
-              <File Id="_dat32.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232.dll" Name="DAT232.DLL"
-                     Source="..\bin\DAPL2\ia64\dat232.dll" />
-              <File Id="_dat32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232d.dll" Name="DAT232D.DLL"
-                     Source="..\bin\DAPL2\ia64\dat232d.dll" />
-              <File Id="_dat2.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2.dll" Name="DAT2.DLL"
-                     Source="..\bin\DAPL2\ia64\dat2.dll" />
-              <CopyFile Id="dupDAT2" FileId="_dat2.dll"
-                        DestinationName="dat2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dat2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2d.dll" Name="DAT2D.DLL"
-                     Source="..\bin\DAPL2\ia64\dat2d.dll" />
-              <File Id="dapl2test.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2test.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\ia64\release\dapl2test.exe" />
-              <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2testd.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\ia64\debug\dapl2testd.exe" />
-              <File Id="dtest2.exe" Compressed="yes" DiskId="1"
-                     LongName="dtest2.exe" Name="dtest2.exe"
-                     Source="..\bin\tools\ia64\release\dtest2.exe" />
-              <File Id="dtestx.exe" Compressed="yes" DiskId="1"
-                     LongName="dtestx.exe" Name="dtestx.exe"
-                     Source="..\bin\tools\ia64\release\dtestx.exe" />
-
-              <File Id="dapl2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2.pdb" Name="dapl2.pdb"
-                    Source="..\bin\DAPL2\ia64\dapl2.pdb" />
-              <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2d.pdb" Name="dapl2d.pdb"
-                    Source="..\bin\DAPL2\ia64\dapl2d.pdb" />
-              <File Id="dat2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2.pdb" Name="dat2.pdb"
-                    Source="..\bin\DAPL2\ia64\dat2.pdb" />
-              <File Id="dat2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2d.pdb" Name="dat2d.pdb"
-                    Source="..\bin\DAPL2\ia64\dat2d.pdb" />
-              <File Id="dat2.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2.lib" Name="dat2.lib"
-                    Source="..\bin\DAPL2\ia64\dat2.lib" />
-              <File Id="dat2d.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2d.lib" Name="dat2d.lib"
-                    Source="..\bin\DAPL2\ia64\dat2d.lib" />
-          </Component>
+          <?include ..\..\common\dapl_rt.inc ?>
 
           <Component Id="cQLVNIC_driver_installed"
                      Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
@@ -932,17 +91,17 @@
                        Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
               <CreateFolder />
               <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                     LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                     Source="..\bin\net\ia64\qlgcvnic.sys" />
+                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
               <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                     Name="qlgcvnic.pdb"
-                     Source="..\bin\net\ia64\qlgcvnic.pdb" />
+                    Name="qlgcvnic.pdb"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
               <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                     LongName="netvnic.inf" Name="NETVNIC.INF"
-                     Source="..\bin\net\ia64\netvnic.inf" />
+                    LongName="netvnic.inf" Name="NETVNIC.INF"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
               <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                     LongName="netvnic.cat" Name="NETVNIC.cat"
-                     Source="..\bin\net\ia64\netvnic.cat" />
+                    LongName="netvnic.cat" Name="NETVNIC.cat"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
             </Component>
           </Directory>
 
@@ -955,522 +114,39 @@
             <Component Id="cSRP_files"
                        Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
               <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_srp.inf" Name="IB_SRP.INF"
-                     Source="..\bin\storage\ia64\ib_srp.inf" />
+                    LongName="ib_srp.inf" Name="IB_SRP.INF"
+                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
               <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.cat" Name="IBSRP.CAT"
-                     Source="..\bin\storage\ia64\ibsrp.cat" />
+                    LongName="ibsrp.cat" Name="IBSRP.CAT"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
               <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.sys" Name="IBSRP.SYS"
-                     Source="..\bin\storage\ia64\ibsrp.sys" />
+                    LongName="ibsrp.sys" Name="IBSRP.SYS"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
               <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                     Name="ibsrp.pdb"
-                     Source="..\bin\storage\ia64\ibsrp.pdb" />
-             </Component>
+                    Name="ibsrp.pdb"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
+            </Component>
           </Directory>
-
-          <Component Id="OpenSM_Service_enabled"
-                     Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-          </Component>
-        </Directory>
         </Directory>
+      </Directory>
 
-      <!-- copy DAT header files -->
-
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">    
-
-          <Directory Id="dDATD" Name="DAT">
-            <Component Id="cDatCfg" Guid="54A4F997-AC33-45D8-9899-6332E40B62A8">
-              <CreateFolder />
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
-            </Component>
-
-            <Directory Id="v1_1" Name="v1-1">
-              <Component Id="cDATV1" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049"
-                         KeyPath="yes" SharedDllRefCount="yes">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID" Name="DAT">    
-                <Component Id="cDatBldV1Hdrs"
-                          Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
-                  <CreateFolder />    
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat.h" />    
-
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat_error.h" />    
-    
-                  <File Id="dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    
-    
-                  <File Id="dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL\dat_redirection.h" />    
-    
-                  <File Id="dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL\dat_registry.h" />    
-    
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    
-    
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL\udat.h" />    
-    
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL\udat_config.h" />    
-    
-                  <File Id="udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL\udat_redirection.h" />    
-    
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV1Libs"
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    
-
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"
-                        LongName="dat.lib" Name="dat.lib"
-                        Source="..\bin\DAPL\ia64\dat.lib" />
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"
-                        LongName="datd.lib" Name="datd.lib"
-                        Source="..\bin\DAPL\ia64\datd.lib" />
-              </Component>
-            </Directory>
-
-            <Directory Id="v2_0" Name="v2-0">
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"
-                         KeyPath="yes" SharedDllRefCount="yes">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID2" Name="DAT">    
-                <Component Id="cDatBldV2Hdrs"
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    
-                  <CreateFolder />    
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat.h" />    
-
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat_error.h" />    
-    
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    
-    
-                  <File Id="_dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL2\dat_redirection.h" />    
-    
-                  <File Id="_dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL2\dat_registry.h" />    
-    
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    
-    
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL2\udat.h" />    
-    
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL2\udat_config.h" />    
-    
-                  <File Id="_udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL2\udat_redirection.h" />    
-    
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV2Libs"
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    
-
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2.lib" Name="dat2.lib"
-                        Source="..\bin\DAPL2\ia64\dat2.lib" />
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2d.lib" Name="dat2d.lib"
-                        Source="..\bin\DAPL2\ia64\dat2d.lib" />
-              </Component>    
-            </Directory>    
-
-          </Directory> <!-- DAT -->   
-
-          <Directory Id="IBSDK" Name="IBSDK">
-            <Directory Id="IB_libs" Name="lib">
-              <Component Id="cIBAL_Libs"
-                         Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
-                <CreateFolder />
-                <File Id="ibal.lib" Compressed="yes" DiskId="1"
-                      LongName="ibal.lib" Name="ibal.lib"
-                      Source="..\bin\HCA\ia64\ibal.lib" />
-                <File Id="ibal.pdb" Compressed="yes" DiskId="1"
-                      LongName="ibal.pdb" Name="ibal.pdb"
-                      Source="..\bin\HCA\ia64\ibal.pdb" />
-                <File Id="complib.lib" Compressed="yes" DiskId="1"
-                      LongName="complib.lib" Name="complib.lib"
-                      Source="..\bin\HCA\ia64\complib.lib" />
-                <File Id="complib.pdb" Compressed="yes" DiskId="1"
-                      LongName="complib.pdb" Name="complib.pdb"
-                      Source="..\bin\HCA\ia64\complib.pdb" />
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"
-                    LongName="ibald.lib" Name="ibald.lib"
-                    Source="..\bin\HCA\ia64\ibald.lib" />
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibald.pdb" Name="ibald.pdb"
-                    Source="..\bin\HCA\ia64\ibald.pdb" />
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"
-                    LongName="complibd.lib" Name="complibd.lib"
-                    Source="..\bin\HCA\ia64\complibd.lib" />
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"
-                    LongName="complibd.pdb" Name="complibd.pdb"
-                    Source="..\bin\HCA\ia64\complibd.pdb" />
-
-              <!-- SysWOW64\ 32-bit libs -->
-              <File Id="cl32.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32.lib" Name="cl32.lib"
-                    Source="..\bin\HCA\ia64\cl32.lib" />
-              <File Id="cl32.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32.pdb" Name="cl32.pdb"
-                    Source="..\bin\HCA\ia64\cl32.pdb" />
-              <File Id="cl32d.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32d.lib" Name="cl32d.lib"
-                    Source="..\bin\HCA\ia64\cl32d.lib" />
-              <File Id="cl32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32d.pdb" Name="cl32d.pdb"
-                    Source="..\bin\HCA\ia64\cl32d.pdb" />
-              <File Id="ibal32.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32.lib" Name="ibal32.lib"
-                    Source="..\bin\HCA\ia64\ibal32.lib" />
-              <File Id="ibal32.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32.pdb" Name="ibal32.pdb"
-                    Source="..\bin\HCA\ia64\ibal32.pdb" />
-              <File Id="ibal32d.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.lib" Name="ibal32d.lib"
-                    Source="..\bin\HCA\ia64\ibal32d.lib" />
-              <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.pdb" Name="ibal32d.pdb"
-                    Source="..\bin\HCA\ia64\ibal32d.pdb" />
-
-              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbs.lib" Name="winverbs.lib"
-                    Source="..\bin\HCA\x86\winverbs.lib" />
-              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.lib" Name="winvrbsd.lib"
-                    Source="..\bin\HCA\x86\winverbsd.lib" />
-
-              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.lib" Name="ibverbs.lib"
-                    Source="..\bin\HCA\x86\libibverbs.lib" />
-              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                    Source="..\bin\HCA\x86\libibverbs.pdb" />
-              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                    Source="..\bin\HCA\x86\libibverbsd.lib" />
-              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                    Source="..\bin\HCA\x86\libibverbsd.pdb" />
-
-              <File Id="libibmad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmad.lib" Name="ibmad.lib"
-                    Source="..\bin\HCA\x86\libibmad.lib" />
-              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmad.pdb" Name="ibmad.pdb"
-                    Source="..\bin\HCA\x86\libibmad.pdb" />
-              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.lib" Name="ibmadd.lib"
-                    Source="..\bin\HCA\x86\libibmadd.lib" />
-              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                    Source="..\bin\HCA\x86\libibmadd.pdb" />
-
-              <File Id="libibumad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumad.lib" Name="ibumad.lib"
-                    Source="..\bin\HCA\x86\libibumad.lib" />
-              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumad.pdb" Name="ibumad.pdb"
-                    Source="..\bin\HCA\x86\libibumad.pdb" />
-              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.lib" Name="ibumadd.lib"
-                    Source="..\bin\HCA\x86\libibumadd.lib" />
-              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                    Source="..\bin\HCA\x86\libibumadd.pdb" />
-              </Component>
-            </Directory>
-
-            <Directory Id="IB_inc" Name="Inc">
-              <Component Id="cIBAL_Incs"
-                         Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">
-                <CreateFolder />
-
-                <File Id="oib_ver.h" Compressed="yes" DiskId="1"
-                       LongName="oib_ver.h" Name="oib_ver.h"
-                       Source="..\bin\Inc\oib_ver.h" />
-                <File Id="openib.def" Compressed="yes" DiskId="1"
-                       LongName="openib.def" Name="openib.def"
-                       Source="..\bin\Inc\openib.def" />
-              </Component>
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
 
-              <Directory Id="IB_complib" Name="complib">
-                <Component Id="cIBAL_Complib"
-                           Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">
-                  <CreateFolder />
-                  <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"
-                        LongName="cl_async_proc.h" Name="CL_ASYN.H" 
-                        Source="..\bin\Inc\complib\cl_async_proc.h" />
-                  <File Id="cl_atomic.h" Compressed="yes" DiskId="1"
-                        LongName="cl_atomic.h" Name="CL_ATOM.H" 
-                        Source="..\bin\Inc\complib\cl_atomic.h" />
-                  <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" 
-                        Source="..\bin\Inc\complib\cl_atomic_osd.h" />
-                  <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_byteswap.h" Name="CL_BYTE.H" 
-                        Source="..\bin\Inc\complib\cl_byteswap.h" />
-                  <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" 
-                        Source="..\bin\Inc\complib\cl_byteswap_osd.h" />
-                  <File Id="cl_comppool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_comppool.h" Name="CL_COMP.H" 
-                        Source="..\bin\Inc\complib\cl_comppool.h" />
-                  <File Id="cl_debug.h" Compressed="yes" DiskId="1"
-                        LongName="cl_debug.h" Name="CL_DEBU.H" 
-                        Source="..\bin\Inc\complib\cl_debug.h" />
-                  <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_debug_osd.h" Name="CL_DEBU1.H" 
-                        Source="..\bin\Inc\complib\cl_debug_osd.h" />
-                  <File Id="cl_event.h" Compressed="yes" DiskId="1"
-                        LongName="cl_event.h" Name="CL_EVEN.H" 
-                        Source="..\bin\Inc\complib\cl_event.h" />
-                  <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_event_osd.h" Name="CL_EVEN1.H" 
-                        Source="..\bin\Inc\complib\cl_event_osd.h" />
-                  <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_fleximap.h" Name="CL_FLEX.H" 
-                        Source="..\bin\Inc\complib\cl_fleximap.h" />
-                  <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"
-                        LongName="cl_ioctl.h" Name="CL_IOCT.H" 
-                        Source="..\bin\Inc\complib\cl_ioctl.h" />
-                  <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" 
-                        Source="..\bin\Inc\complib\cl_ioctl_osd.h" />
-                  <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"
-                        LongName="cl_irqlock.h" Name="CL_IRQL.H" 
-                        Source="..\bin\Inc\complib\cl_irqlock.h" />
-                  <File Id="cl_list.h" Compressed="yes" DiskId="1"
-                        LongName="cl_list.h" Name="CL_LIST.H" 
-                        Source="..\bin\Inc\complib\cl_list.h" />
-                  <File Id="cl_log.h" Compressed="yes" DiskId="1"
-                        LongName="cl_log.h" Name="CL_LOG.H" 
-                        Source="..\bin\Inc\complib\cl_log.h" />
-                  <File Id="cl_map.h" Compressed="yes" DiskId="1"
-                        LongName="cl_map.h" Name="CL_MAP.H" 
-                        Source="..\bin\Inc\complib\cl_map.h" />
-                  <File Id="cl_math.h" Compressed="yes" DiskId="1"
-                        LongName="cl_math.h" Name="CL_MATH.H" 
-                        Source="..\bin\Inc\complib\cl_math.h" />
-                  <File Id="cl_memory.h" Compressed="yes" DiskId="1"
-                        LongName="cl_memory.h" Name="CL_MEMO.H" 
-                        Source="..\bin\Inc\complib\cl_memory.h" />
-                  <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_memory_osd.h" Name="CL_MEMO1.H" 
-                        Source="..\bin\Inc\complib\cl_memory_osd.h" />
-                  <File Id="cl_mutex.h" Compressed="yes" DiskId="1"
-                        LongName="cl_mutex.h" Name="CL_MUTE.H" 
-                        Source="..\bin\Inc\complib\cl_mutex.h" />
-                  <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" 
-                        Source="..\bin\Inc\complib\cl_mutex_osd.h" />
-                  <File Id="cl_obj.h" Compressed="yes" DiskId="1"
-                        LongName="cl_obj.h" Name="CL_OBJ.H" 
-                        Source="..\bin\Inc\complib\cl_obj.h" />
-                  <File Id="cl_packoff.h" Compressed="yes" DiskId="1"
-                        LongName="cl_packoff.h" Name="CL_PACK.H" 
-                        Source="..\bin\Inc\complib\cl_packoff.h" />
-                  <File Id="cl_packon.h" Compressed="yes" DiskId="1"
-                        LongName="cl_packon.h" Name="CL_PACK1.H" 
-                        Source="..\bin\Inc\complib\cl_packon.h" />
-                  <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"
-                        LongName="cl_passivelock.h" Name="CL_PASS.H" 
-                        Source="..\bin\Inc\complib\cl_passivelock.h" />
-                  <File Id="cl_perf.h" Compressed="yes" DiskId="1"
-                        LongName="cl_perf.h" Name="CL_PERF.H" 
-                        Source="..\bin\Inc\complib\cl_perf.h" />
-                  <File Id="cl_pool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_pool.h" Name="CL_POOL.H" 
-                        Source="..\bin\Inc\complib\cl_pool.h" />
-                  <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"
-                        LongName="cl_ptr_vector.h" Name="CL_PTR_.H" 
-                        Source="..\bin\Inc\complib\cl_ptr_vector.h" />
-                  <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qcomppool.h" Name="CL_QCOM.H" 
-                        Source="..\bin\Inc\complib\cl_qcomppool.h" />
-                  <File Id="cl_qlist.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qlist.h" Name="CL_QLIS.H" 
-                        Source="..\bin\Inc\complib\cl_qlist.h" />
-                  <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qlockpool.h" Name="CL_QLOC.H" 
-                        Source="..\bin\Inc\complib\cl_qlockpool.h" />
-                  <File Id="cl_qmap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qmap.h" Name="CL_QMAP.H" 
-                        Source="..\bin\Inc\complib\cl_qmap.h" />
-                  <File Id="cl_qpool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qpool.h" Name="CL_QPOO.H" 
-                        Source="..\bin\Inc\complib\cl_qpool.h" />
-                  <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_rbmap.h" Name="CL_RBMA.H" 
-                        Source="..\bin\Inc\complib\cl_rbmap.h" />
-                  <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"
-                        LongName="cl_reqmgr.h" Name="CL_REQM.H" 
-                        Source="..\bin\Inc\complib\cl_reqmgr.h" />
-                  <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"
-                        LongName="cl_spinlock.h" Name="CL_SPIN.H" 
-                        Source="..\bin\Inc\complib\cl_spinlock.h" />
-                  <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" 
-                        Source="..\bin\Inc\complib\cl_spinlock_osd.h" />
-                  <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"
-                        LongName="cl_syscallback.h" Name="CL_SYSC.H" 
-                        Source="..\bin\Inc\complib\cl_syscallback.h" />
-                  <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" 
-                        Source="..\bin\Inc\complib\cl_syscallback_osd.h" />
-                  <File Id="cl_thread.h" Compressed="yes" DiskId="1"
-                        LongName="cl_thread.h" Name="CL_THRE.H" 
-                        Source="..\bin\Inc\complib\cl_thread.h" />
-                  <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_thread_osd.h" Name="CL_THRE1.H" 
-                        Source="..\bin\Inc\complib\cl_thread_osd.h" />
-                  <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_threadpool.h" Name="CL_THRE2.H" 
-                        Source="..\bin\Inc\complib\cl_threadpool.h" />
-                  <File Id="cl_timer.h" Compressed="yes" DiskId="1"
-                        LongName="cl_timer.h" Name="CL_TIME.H" 
-                        Source="..\bin\Inc\complib\cl_timer.h" />
-                  <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_timer_osd.h" Name="CL_TIME1.H" 
-                        Source="..\bin\Inc\complib\cl_timer_osd.h" />
-                  <File Id="cl_types.h" Compressed="yes" DiskId="1"
-                        LongName="cl_types.h" Name="CL_TYPE.H" 
-                        Source="..\bin\Inc\complib\cl_types.h" />
-                  <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_types_osd.h" Name="CL_TYPE1.H" 
-                        Source="..\bin\Inc\complib\cl_types_osd.h" />
-                  <File Id="cl_vector.h" Compressed="yes" DiskId="1"
-                        LongName="cl_vector.h" Name="CL_VECT.H" 
-                        Source="..\bin\Inc\complib\cl_vector.h" />
-                  <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"
-                        LongName="cl_waitobj.h" Name="CL_WAIT.H" 
-                        Source="..\bin\Inc\complib\cl_waitobj.h" />
-                  <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" 
-                        Source="..\bin\Inc\complib\cl_waitobj_osd.h" />
-                  <File Id="comp_lib.h" Compressed="yes" DiskId="1"
-                        LongName="comp_lib.h" Name="COMP_LI.H" 
-                        Source="..\bin\Inc\complib\comp_lib.h" />
-                </Component>
-              </Directory>
+      <!-- copy DAT header files to
+         %SystemDrive%\DAT\v1-1\DAT
+         %SystemDrive%\DAT\v2-0\DAT
+      -->
 
-              <Directory Id="IB_iba" Name="iba">
-                <Component Id="cIBAL_IBA"
-                           Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">
-                  <CreateFolder />
-                  <File Id="ib_al.h" Compressed="yes" DiskId="1"
-                        LongName="ib_al.h" Name="ib_al.h"
-                        Source="..\bin\Inc\iba\ib_al.h" />
-                  <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"
-                        LongName="ib_al_ioctl.h" Name="ib_ioctl.h"
-                        Source="..\bin\Inc\iba\ib_al_ioctl.h" />
-                  <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"
-                        LongName="ib_at_ioctl.h" Name="ib_iocat.h"
-                        Source="..\bin\Inc\iba\ib_at_ioctl.h" />
-                  <File Id="ib_ci.h" Compressed="yes" DiskId="1"
-                        LongName="ib_ci.h" Name="ib_ci.h"
-                        Source="..\bin\Inc\iba\ib_ci.h" />
-                  <File Id="ib_types.h" Compressed="yes" DiskId="1"
-                        LongName="ib_types.h" Name="ib_types.h"
-                        Source="..\bin\Inc\iba\ib_types.h" />
-                  <File Id="ib_uvp.h" Compressed="yes" DiskId="1"
-                        LongName="ib_uvp.h" Name="ib_uvp.h"
-                        Source="..\bin\Inc\iba\ib_uvp.h" />
-                </Component>
-              </Directory>
-            </Directory>
+        <Directory Id="dDATD" Name="DAT">
+          <?include ..\..\common\DAT_config.inc ?>
+        </Directory>
 
-            <Directory Id="IB_samples" Name="Samples">
-              <Directory Id="sample_DDK" Name="DDK">
-                <Component Id="cDDK_example"
-                           Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">
-                  <CreateFolder />
-                      <File Id="cmtest.c" Compressed="yes" DiskId="1"
-                            LongName="cmtest.c" Name="cmtest.c"
-                            Source="..\bin\Misc\cmtest.c" />
-                      <File Id="makefile" Compressed="yes" DiskId="1"
-                            LongName="makefile" Name="makefile"
-                            Source="..\..\SDK_Samples\DDK\makefile" />
-                      <File Id="SOURCES" Compressed="yes" DiskId="1"
-                            LongName="SOURCES" Name="SOURCES"
-                            Source="..\..\SDK_Samples\DDK\SOURCES" />
-                      <File Id="README.txt" Compressed="yes" DiskId="1"
-                            LongName="README.txt" Name="README.txt"
-                            Source="..\..\SDK_Samples\DDK\README.txt" />
-                </Component>
-              </Directory>    <!-- End DDK -->
-              <Directory Id="sample_VS" Name="VS">
-                <Component Id="cVS_example"
-                           Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">
-                  <CreateFolder />
-                      <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"
-                            LongName="cmtest.c" Name="cmtest.c"
-                            Source="..\bin\misc\cmtest.c" />
-                      <File Id="vscmtest.rc" Compressed="yes" DiskId="1"
-                            LongName="cmtest.rc" Name="cmtest.rc"
-                            Source="..\..\SDK_Samples\VS\cmtest.rc" />
-                      <File Id="vsREADME.txt" Compressed="yes" DiskId="1"
-                            LongName="README.txt" Name="README.txt"
-                            Source="..\..\SDK_Samples\VS\README.txt" />
-                </Component>
-              </Directory>    <!-- End VS -->
-            </Directory>    <!-- End Samples -->
-          </Directory>    <!-- End IBSDK -->
+        <Directory Id="IBSDK" Name="IBSDK">
+          <?include ..\..\common\ib_sdk.inc ?>
+        </Directory>
 
-      </Directory>   <!-- WinRoot -->   
-    </Directory> <!-- TARGETDIR --> 
+      </Directory>
+    </Directory> <!-- End TARGETDIR -->
 
 <!--
     <Property Id='ARPNOMODIFY'>1</Property>
@@ -1482,24 +158,22 @@
     <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
     <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
 
-
     <!--
-       Features - Level=1 == Typical, no WSD on XP
+       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
      -->
 
     <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"
-         Description="Mellanox Host Channel Adapter Drivers for InfiniHost"
+         Description="Mellanox InfiniBand Host Channel Adapter Drivers"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
-
-        <ComponentRef Id="cMthcaDriver" />
-        <ComponentRef Id="cConnectXDriver" />
+      <ComponentRef Id="cMthcaDriver" />
+      <ComponentRef Id="cConnectXDriver" />
     </Feature>
 
-    <Feature Id="IBcore" Title="InfiniBand Core" Level="1"
-         Description="InfiniBand: Core, Tools, Docs"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
+    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"
+        Description="InfiniBand: Core, Tools, Docs"
+        Display="expand" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">
       <ComponentRef Id="cIBcore" />
       <ComponentRef Id="cWinVerbsDrivers" />
       <ComponentRef Id="Docs" />
@@ -1510,7 +184,7 @@
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
-        Description="OFED verbs - Libraries and utilities"
+        Description="OFED verbs - Libraries + utilities"
         Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
         <ComponentRef Id="cWinVerbsOFED" />
@@ -1518,9 +192,9 @@
     </Feature>
 
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"
-         Description="Internet Protocols over InfiniBand" Display="expand"
-         ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="Internet Protocols over InfiniBand" Display="expand"
+        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
       <ComponentRef Id="IPoIB" />
     </Feature>
 
@@ -1542,21 +216,20 @@
         <Condition Level="201"> IPOIB_EXISTS </Condition> 
     </Feature>
 -->
-
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"
-         Description="Open Subnet Management started as a local Windows Service"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
-      <ComponentRef Id="OpenSM_Service_enabled" />
+        Description="Open Subnet Management started as a local Windows Service"
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
+        <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"
-         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"
+        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <Condition Level="201"> IPOIB_EXISTS </Condition>
 
       <Feature Id="fDatConf" Title="DAT-DAPL Config File"
-         Description="DAT-DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
+         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
          Display="expand" Level="1" 
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
         <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>
@@ -1605,9 +278,9 @@
     </Feature>
 
     <Feature Id="fVNIC" Title="QLogic-VNIC"
-         Description="QLogic - Virtual NIC over InfiniBand"
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="QLogic - Virtual NIC over InfiniBand"
+        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <ComponentRef Id="cQLVNIC_driver_installed" />
     </Feature>
 
@@ -1631,73 +304,11 @@
       <ComponentRef Id="cCHK_user" />
     </Feature>
 
-    <!--> File where Custom Actions are defined -->
-    <Binary Id='CA' src='..\..\CustomActions.vbs' />
-
-    <CustomAction Id='WinOF_setup' BinaryKey='CA'
-         VBScriptCall='WinOF_setup' Return='check' />
-
-    <CustomAction Id='ChkPreviousInstall' BinaryKey='CA'
-         VBScriptCall='ChkInstallAndReboot' Return='check' />
-
-    <CustomAction Id='DriverInstall' BinaryKey='CA'
-         VBScriptCall='DriverInstall' Return='check' Execute='deferred' />
-
-    <CustomAction Id='DriverUninstall' BinaryKey='CA'
-         VBScriptCall='DriverUninstall' Return='check' />
-
-    <CustomAction Id='WSDStart' BinaryKey='CA'
-         VBScriptCall='WSDEnable' Return='check' />
-
-    <CustomAction Id="ND_start" BinaryKey="CA"
-         VBScriptCall="ND_StartMeUp" Return="check" />
-
-    <CustomAction Id='HammerTime' BinaryKey='CA'
-         VBScriptCall='HammerTime' Return='check' />
-
-    <CustomAction Id="BcastRegChanged" BinaryKey="CA"
-         VBScriptCall="BcastRegChanged" Return="check" />
-
-    <CustomAction Id="InstallChanged" BinaryKey="CA"
-         VBScriptCall="InstallChanged" Return="check" />
-
-    <InstallExecuteSequence>
-       <!--> Always executed (Install or uninstall </!-->
-       <Custom Action="WinOF_setup" After='InstallInitialize' />
-
-       <!--> Install ONLY </!-->
-       <Custom Action="ChkPreviousInstall" After='WinOF_setup'>
-               NOT Installed</Custom>
-
-       <ScheduleReboot After='ChkPreviousInstall'>
-               REBOOT="FORCE"</ScheduleReboot>
-
-       <Custom Action="DriverInstall" After='InstallServices'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="WSDStart" After='InstallFinalize'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="ND_start" After="WSDStart">
-          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="BcastRegChanged" After="ND_start">
-               Not Installed</Custom>
-
-       <!--> CHANGE ONLY </!-->
-       <Custom Action="InstallChanged" After="InstallFinalize">
-           Installed </Custom>
-
-       <!--> REMOVE ONLY </!-->
-       <Custom Action="DriverUninstall" After='PublishProduct'>
-               REMOVE="ALL" </Custom>
-       <Custom Action="HammerTime" After='InstallFinalize'>REMOVE="ALL"</Custom>
-    </InstallExecuteSequence>
-
+    <?include ..\..\common\InstallExecuteSeq.inc ?>
 
     <UIRef Id="WixUI_FeatureTree" />
-    <UIRef Id="WixUI_ErrorProgressText" />
-    <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
     <UI />
   </Product>
 </Wix>
diff --git a/trunk/WinOF/WIX/win7/x64/wof.wxs b/trunk/WinOF/WIX/win7/x64/wof.wxs
index 84d4b0a3..bcea0fb1 100644
--- a/trunk/WinOF/WIX/win7/x64/wof.wxs
+++ b/trunk/WinOF/WIX/win7/x64/wof.wxs
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-   WinOF (Windows OpenFabrics) for x64 Windows Server 2008 or Vista
+   WinOF (Windows OpenFabrics) for x64 Windows 7
 -->
+
+<?define ARCH=amd64 ?>
+<?define ARCHP=x64 ?>
+<?define OS=win7 ?>
+<?include ..\..\common\WinOF_cfg.inc ?>
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Product Name="Windows Open Fabrics InfiniBand v2.1.0 (RC0) x64"
-    Version="2.1.0"
+  <Product
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"
+    Version="$(var.WOFRELNUM)"
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
-    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' 
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
     Language="1033" Codepage="1252"
     Manufacturer="Open Fabrics Alliance Windows">
 
@@ -14,8 +21,8 @@
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
      InstallPrivileges='elevated'
      Description="WinOF Installer"
-     Comments="Windows Open Fabrics Alliance InfiniBand stack"
-     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="200"
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
      Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Condition Message="Administrator required to install [ProductName].">
@@ -34,59 +41,7 @@
          <![CDATA[(VersionNT=600)]]>
     </Condition>
 
-    <!--
-        System/Machine-wide install, otherwise per-user (Administrator) only.
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.
-     -->
-    <Property Id="ALLUSERS"> Value="1" </Property>
-
-    <!-- Requires files sc.exe & reg.exe -->
-    <Property Id="REG_EXISTS">
-      <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="RegFile" Name="reg.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="SC_EXISTS">
-      <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="ScFile" Name="sc.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="IPOIB_EXISTS">
-      <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">
-        <FileSearch Id="ipoibFile" Name="netipoib.inf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT_CONF_EXISTS">
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">
-        <FileSearch Id="DCFile" Name="dat.conf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT1_INSTALLED">
-      <DirectorySearch Id="Dat1DS" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="daplFS" Name="dapl.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT2_INSTALLED">
-      <DirectorySearch Id="Dat2DS" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="dapl2FS" Name="dapl2.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Condition Message="[ProductName] requires system file reg.exe">
-       REG_EXISTS
-    </Condition>
-
-    <Condition Message="[ProductName] requires system file sc.exe">
-       SC_EXISTS
-    </Condition>
-
-    <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
-    <Property Id="DiskPrompt" Value="WinOF 1.0 Installation [1]" />
+    <?include ..\..\common\requirements.inc ?>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
@@ -96,891 +51,36 @@
       <Directory Id="DesktopFolder" Name="Desktop" />
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="INSTALLDIR" Name="WinOF">
-          <Component Id="Docs" Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
-
-            <File Id="OFAlogo" Compressed="yes" DiskId="1"
-                    LongName="openfabrics.gif" Name="ofa.gif"
-                    Source="..\..\openfabrics.gif" />
-
-            <!-- implies WIX build only from an svn structured tree.  -->
-            <File Id="manual.htm" Compressed="yes" DiskId="1" Name="Manual.htm"
-                    LongName="Manual.htm"
-                    Source="..\bin\Misc\Manual.htm" Vital="yes" />
 
-            <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
-                    Name="Manual.htm" LongName="Manual"
-                    Target="[INSTALLDIR]\Manual.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="dRelnotes" Compressed="yes" DiskId="1"
-                    LongName="Release_notes.htm" Name="RELEASE_.HTM"
-                    Source="..\..\Release_notes.htm" />
-
-            <Shortcut Id="RelNotes" Directory="ProgramMenuDir"
-                    Name="RelNotes" LongName="Release Notes"
-                    Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="command_window" Name="COMMAND.LNK"
-                    LongName="Command Window.lnk" Compressed="yes" DiskId="1"
-                    Source="..\..\x64\Command Window.lnk" Vital="yes" />
-
-            <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
-                    Name="COMMAND.LNK" LongName="Command Window.lnk"
-                    Target="[INSTALLDIR]\Command Window.lnk" Icon="openfabrics"
-                    IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />
-
-            <Shortcut Id="UninstallProduct" Name="UnMyApp"
-                Directory="ProgramMenuDir"
-                LongName="Uninstall WinOF"
-				Target="[System64Folder]msiexec.exe"
-                Arguments="/X [ProductCode]"
-                Description="Uninstalls OpenFabrics InfiniBand" />
-            <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
-          </Component>
-
-          <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
-            <Environment Id='UpdatePath' Name='PATH' Action='create'
-                         System='yes' Part='last' Value='[INSTALLDIR]' /> 
-
-            <File Id="qlgcvnic_config" Compressed="yes" DiskId="1" Vital="yes"
-                    Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"
-                    Source="..\bin\tools\amd64\release\qlgcvnic_config.exe" />
-            <File Id="part_man" Name="part_man.exe"
-                    Compressed="yes" DiskId="1" Vital="yes"
-                    Source="..\bin\tools\amd64\release\part_man.exe" />
-            <File Id="vstat" Name="vstat.exe"
-                    Compressed="yes" DiskId="1" Vital="yes"
-                    Source="..\bin\tools\amd64\release\vstat.exe" />
-            <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
-                    DiskId="1" Name="TTCP.EXE"
-                    Source="..\bin\tools\amd64\release\ttcp.exe" />
-            <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
-                    DiskId="1" Name="CMTEST.EXE"
-                    Source="..\bin\tools\amd64\release\cmtest.exe" />
-            <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_limits.exe" Name="IB_LIMI.EXE"
-                     Source="..\bin\tools\amd64\release\ib_limits.exe" />
-            <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_read_bw.exe" Name="IB_READ.EXE"
-                     Source="..\bin\tools\amd64\release\ib_read_bw.exe" />
-            <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
-                     Source="..\bin\tools\amd64\release\ib_read_lat.exe" />
-            <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
-                     Source="..\bin\tools\amd64\release\ib_send_bw.exe" />
-            <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
-                     Source="..\bin\tools\amd64\release\ib_send_lat.exe" />
-            <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
-                     Source="..\bin\tools\amd64\release\ib_write_bw.exe" />
-            <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
-                     Source="..\bin\tools\amd64\release\ib_write_lat.exe" />
-            <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
-                     LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
-                     Source="..\bin\tools\amd64\release\ibtrapgen.exe" />
-            <File Id="osmtest.exe" Compressed="yes" DiskId="1"
-                     LongName="osmtest.exe" Name="OSMTEST.EXE"
-                     Source="..\bin\tools\amd64\release\osmtest.exe" />
-            <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
-                     LongName="PrintIP.exe" Name="PRINTIP.EXE"
-                     Source="..\bin\tools\amd64\release\PrintIP.exe" />
-            <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"
-                     Vital="yes" Source="..\bin\tools\amd64\release\nsc.exe" />
-          </Component>
-
-          <Component Id='OpenSMservice'
-                     Guid='90042B4F-51B5-4720-8E54-6D366253634B'
-                     SharedDllRefCount='no' KeyPath='no'
-                     NeverOverwrite='no'
-                     Permanent='no' Transitive='no' Win64='no'
-                     Location='either'>
-
-              <File Id="opensm.exe" Compressed="yes" DiskId="1"
-                    LongName="opensm.exe" Name="OPENSM.EXE"
-                    Source="..\bin\tools\amd64\release\opensm.exe"
-                    Vital='yes' KeyPath='yes' Hidden='no' System='no' 
-                    Checksum='no' ReadOnly='no' />
-
-              <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
-                  Description='InfiniBand Subnet Configuration and Management'
-                  DisplayName='InfiniBand Subnet Manager'
-                  Arguments='-e --service'
-                  ErrorControl='normal'
-                  Start='disabled'
-                  Interactive='no'
-                  Type='ownProcess' />
-
-              <ServiceControl Id='osmSvcControl' Name='OpenSM'
-                              Stop='uninstall'
-                              Wait='no'
-                              Remove='uninstall' />
-          </Component>
+          <?include ..\..\common\Docs.inc ?>
+          <?include ..\..\common\Tools.inc ?>
+          <?include ..\..\common\OpenSM_service.inc ?>
 
           <Directory Id="IBcoreDir" Name="IBcore">
-            <Component Id="cIBcore"
-                       Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
-              <CreateFolder />
-              <File Id="dpinst.exe" Compressed="yes" DiskId="1"
-                     LongName="dpinst.exe" Name="dpinst.exe"
-                     Source="..\..\x64\dpinst.exe" />
-              <File Id="dpinst.xml" Compressed="yes" DiskId="1"
-                     LongName="dpinst.xml" Name="dpinst.xml"
-                     Source="..\..\dpinst.xml" />
-              <File Id="devman.exe" Compressed="yes" DiskId="1"
-                     LongName="devman.exe" Name="devman.exe"
-                     Source="..\..\x64\devman.exe" />
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01009.dll" Name="WCO.dll"
-                     Source="..\bin\hca\amd64\WdfCoInstaller01009.dll" />
-              <File Id="cl32.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32.dll" Name="CL32.DLL"
-                     Source="..\bin\HCA\amd64\cl32.dll" />
-              <File Id="cl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32d.dll" Name="CL32D.DLL"
-                     Source="..\bin\HCA\amd64\cl32d.dll" />
-              <File Id="complib.dll" Compressed="yes" DiskId="1"
-                     LongName="complib.dll" Name="COMPLIB.DLL"
-                     Source="..\bin\HCA\amd64\complib.dll" />
-              <File Id="complibd.dll" Compressed="yes" DiskId="1"
-                     LongName="complibd.dll" Name="COMPLIB1.DLL"
-                     Source="..\bin\HCA\amd64\complibd.dll" />
-              <File Id="ibal32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32.dll" Name="IBAL32.DLL"
-                     Source="..\bin\HCA\amd64\ibal32.dll" />
-              <File Id="ibal32d.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32d.dll" Name="IBAL32D.DLL"
-                     Source="..\bin\HCA\amd64\ibal32d.dll" />
-              <File Id="ibal.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal.dll" Name="IBAL.DLL"
-                     Source="..\bin\HCA\amd64\ibal.dll" />
-              <File Id="ibald.dll" Compressed="yes" DiskId="1"
-                     LongName="ibald.dll" Name="IBALD.DLL"
-                     Source="..\bin\HCA\amd64\ibald.dll" />
-              <File Id="ibbus.sys" Compressed="yes" DiskId="1"
-                     LongName="ibbus.sys" Name="IBBUS.SYS"
-                     Source="..\bin\HCA\amd64\ibbus.sys" />
-              <File Id="ibbus.pdb" Compressed="yes" DiskId="1"
-                     Name="ibbus.pdb" Source="..\bin\HCA\amd64\ibbus.pdb" />
-              <File Id="ibiou.sys" Compressed="yes" DiskId="1"
-                     LongName="ibiou.sys" Name="IBIOU.SYS"
-                     Source="..\bin\HCA\amd64\ibiou.sys" />
-              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"
-                     Name="ibiou.pdb"
-                     Source="..\bin\HCA\amd64\ibiou.pdb" />
-              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.cat" Name="IB_IOU.cat"
-                     Source="..\bin\HCA\amd64\ib_iou.cat" />
-              <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.inf" Name="IB_IOU.inf"
-                     Source="..\bin\HCA\amd64\ib_iou.inf" />
-              <!--
-                 Orphaned install files - remove on uninstall
-                 Here SystemFolder == SysWOW64, System64Folder == System32
-              -->
-              <RemoveFile Id='o64_ibal.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="ibal.dll" LongName='ibal.dll' />
-              <RemoveFile Id='o64_complib.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="complib.dll" LongName='complib.dll' />
-            </Component>
-
-            <Component Id="cMthcaDriver"
-                       Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">
-              <File Id="mthca32.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32.dll" Name="MTHCA32.DLL"
-                     Source="..\bin\HCA\amd64\mthca32.dll" />
-              <File Id="mthca32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32d.dll" Name="MTHCA321.DLL"
-                     Source="..\bin\HCA\amd64\mthca32d.dll" />
-              <File Id="mthca.inf" Compressed="yes" DiskId="1"
-                     LongName="mthca.inf" Name="MTHCA.INF"
-                     Source="..\bin\HCA\amd64\mthca.inf" />
-              <File Id="mthca.cat" Compressed="yes" DiskId="1"
-                     LongName="mthca.cat" Name="MTHCA.cat"
-                     Source="..\bin\HCA\amd64\mthca.cat" />
-              <File Id="mthca.sys" Compressed="yes" DiskId="1"
-                     LongName="mthca.sys" Name="MTHCA.SYS"
-                     Source="..\bin\HCA\amd64\mthca.sys" />
-              <File Id="mthca.pdb" Compressed="yes" DiskId="1"
-                     Name="mthca.pdb"
-                     Source="..\bin\HCA\amd64\mthca.pdb" />
-              <File Id="mthcau.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcau.dll" Name="MTHCAU.DLL"
-                     Source="..\bin\HCA\amd64\mthcau.dll" />
-              <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcaud.dll" Name="MTHCAUD.DLL"
-                     Source="..\bin\HCA\amd64\mthcaud.dll" />
-            </Component>
-
-            <Component Id="cConnectXDriver"
-                       Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
-              <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.inf" Name="mlx4_bus.INF"
-                     Source="..\bin\hca\amd64\mlx4_bus.inf" />
-              <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.cat" Name="mlx4_bus.cat"
-                     Source="..\bin\hca\amd64\mlx4_bus.cat" />
-              <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
-                     Source="..\bin\hca\amd64\mlx4_bus.sys" />
-              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
-                     Name="mlx4_bus.pdb"
-                     Source="..\bin\hca\amd64\mlx4_bus.pdb" />
-              <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
-                     Source="..\bin\hca\amd64\mlx4_hca.inf" />
-              <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.cat" Name="mlx4_hca.cat"
-                     Source="..\bin\hca\amd64\mlx4_hca.cat" />
-              <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.sys" Name="mlx4_hca.sys"
-                     Source="..\bin\hca\amd64\mlx4_hca.sys" />
-              <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"
-                     Name="mlx4_hca.pdb"
-                     Source="..\bin\hca\amd64\mlx4_hca.pdb" />
-              <File Id="mlx4u.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u.dll" Name="mlx4u.dll"
-                     Source="..\bin\hca\amd64\mlx4u.dll" />
-              <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4ud.dll" Name="mlx4ud.dll"
-                     Source="..\bin\hca\amd64\mlx4ud.dll" />
-
-              <!-- copy 32-bit binaries for 32b in x64 -->
-              <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32d.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\amd64\mlx4u32d.dll" />
-              <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\amd64\mlx4u32.dll" />
-            </Component>
-
-            <Component Id="cWinVerbsDrivers"
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-
-              <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                    LongName="winverbs.sys" Name="winverbs.sys"
-                    Source="..\bin\HCA\amd64\winverbs.sys" />
-              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
-                    LongName="winverbs.pdb" Name="winverbs.pdb"
-                    Source="..\bin\HCA\amd64\winverbs.pdb" />
-              <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                    LongName="winverbs.dll" Name="winvrbs.dll"
-                    Source="..\bin\HCA\amd64\winverbs.dll" />
-              <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.dll" Name="winvrbsd.dll"
-                    Source="..\bin\HCA\amd64\winverbsd.dll" />
-              <File Id="winmad.sys" Compressed="yes" DiskId="1"
-                    LongName="winmad.sys" Name="winmad.sys"
-                    Source="..\bin\HCA\amd64\winmad.sys" />
-              <File Id="winmad.pdb" Compressed="yes" DiskId="1"
-                    LongName="winmad.pdb" Name="winmad.pdb"
-                    Source="..\bin\HCA\amd64\winmad.pdb" />
-              <File Id="winmad.dll" Compressed="yes" DiskId="1"
-                    LongName="winmad.dll" Name="winmad.dll"
-                    Source="..\bin\HCA\amd64\winmad.dll" />
-              <File Id="winmadd.dll" Compressed="yes" DiskId="1"
-                    LongName="winmadd.dll" Name="winmaddd.dll"
-                    Source="..\bin\HCA\amd64\winmadd.dll" />
-            </Component>
-
-          </Directory>
-
-          <Directory Id="dir_0" Name="Checked">
-            <Directory Id="dir_1" Name="kernel">
-                <Component Id="cCHK_kernel"
-                           Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
-                  <CreateFolder />
-
-                  <File Id="chk0" DiskId="1" Compressed="yes"
-                        Name="README.txt"
-                        Source="..\..\README_checked.txt" />
-                  <File Id="chk1" DiskId="1" Compressed="yes"
-                        Name="mthca.sys"
-                        Source="..\bin\Chk\HCA\amd64\mthca.sys" />
-                  <File Id="cat1" DiskId="1" Compressed="yes"
-                        Name="mthca.cat"
-                        Source="..\bin\Chk\HCA\amd64\mthca.cat" />
-                  <File Id="sym1" DiskId="1" Compressed="yes"
-                        Name="mthca.pdb"
-                        Source="..\bin\Chk\HCA\amd64\mthca.pdb" />
-
-                  <File Id="chk2" DiskId="1" Compressed="yes"
-                        Name="ibbus.sys"
-                        Source="..\bin\Chk\HCA\amd64\ibbus.sys" />
-                  <File Id="sym2" DiskId="1" Compressed="yes"
-                        Name="ibbus.pdb"
-                        Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />
-
-                  <File Id="chk3" DiskId="1" Compressed="yes"
-                        Name="ibiou.sys"
-                        Source="..\bin\Chk\HCA\amd64\ibiou.sys" />
-                  <File Id="cat3" DiskId="1" Compressed="yes"
-                        Name="ib_iou.cat"
-                        Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />
-                  <File Id="sym3" DiskId="1" Compressed="yes"
-                        Name="ibiou.pdb"
-                        Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />
-
-                  <File Id="chk4" DiskId="1" Compressed="yes"
-                        Name="ipoib.sys"
-                        Source="..\bin\Chk\net\amd64\ipoib.sys" />
-                  <File Id="cat4" DiskId="1" Compressed="yes"
-                        Name="ipoib.cat"
-                        Source="..\bin\Chk\net\amd64\ipoib.cat" />
-                  <File Id="sym4" DiskId="1" Compressed="yes"
-                        Name="ipoib.pdb"
-                        Source="..\bin\Chk\net\amd64\ipoib.pdb" />
-
-                  <File Id="chk5" DiskId="1" Compressed="yes"
-                        Name="qlgcvnic.sys"
-                        Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />
-                  <File Id="cat5" DiskId="1" Compressed="yes"
-                        Name="netvnic.cat"
-                        Source="..\bin\Chk\net\amd64\netvnic.cat" />
-                  <File Id="sym5" DiskId="1" Compressed="yes"
-                        Name="qlgcvnic.pdb"
-                        Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />
-
-                  <File Id="chk6" DiskId="1" Compressed="yes"
-                        Name="ibsrp.sys"
-                        Source="..\bin\Chk\storage\amd64\ibsrp.sys" />
-                  <File Id="cat6" DiskId="1" Compressed="yes"
-                        Name="ibsrp.cat"
-                        Source="..\bin\Chk\storage\amd64\ibsrp.cat" />
-                  <File Id="sym6" DiskId="1" Compressed="yes"
-                        Name="ibsrp.pdb"
-                        Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />
-
-                  <File Id="chk7" DiskId="1" Compressed="yes"
-                        Name="mlx4_bus.sys"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />
-                  <File Id="cat7" DiskId="1" Compressed="yes"
-                        Name="mlx4_bus.cat"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />
-                  <File Id="sym7" DiskId="1" Compressed="yes"
-                        Name="mlx4_bus.pdb"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />
-
-                  <File Id="chk8" DiskId="1" Compressed="yes"
-                        Name="mlx4_hca.sys"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />
-                  <File Id="cat8" DiskId="1" Compressed="yes"
-                        Name="mlx4_hca.cat"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />
-                  <File Id="sym8" DiskId="1" Compressed="yes"
-                        Name="mlx4_hca.pdb"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />
-
-                  <File Id="chk9" DiskId="1" Compressed="yes"
-                        Name="winverbs.sys"
-                        Source="..\bin\Chk\HCA\amd64\winverbs.sys" />
-                  <File Id="sym9" DiskId="1" Compressed="yes"
-                        Name="winverbs.pdb"
-                        Source="..\bin\Chk\HCA\amd64\winverbs.pdb" />
-                  <File Id="dll9" DiskId="1" Compressed="yes"
-                        Name="winverbs.dll"
-                        Source="..\bin\Chk\HCA\amd64\winverbs.dll" />
-                  <File Id="dlld9" DiskId="1" Compressed="yes"
-                        Name="winverbd.dll"
-                        LongName="winverbsd.dll"
-                        Source="..\bin\Chk\HCA\amd64\winverbsd.dll" />
-                </Component>
-            </Directory>
-      
-            <Directory Id="dir_14" Name="user">
-                <Component Id="cCHK_user"
-                               Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
-                  <CreateFolder />
-                  <File Id="file45" Name="complibd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\complibd.dll" />
-                  <File Id="file46" Name="DAPL2-_1.DLL"
-                    LongName="dapl2-scmd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dapl2-scmd.dll" />
-                  <File Id="file47" Name="dapl2d.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dapl2d.dll" />
-                  <File Id="file48" Name="DAPL2T_1.EXE"
-                    LongName="dapl2testd.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dapl2testd.exe" />
-                  <File Id="file49" Name="dapld.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dapld.dll" />
-                  <File Id="file50" Name="DAPLTE_1.EXE"
-                    LongName="dapltestd.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dapltestd.exe" />
-                  <File Id="file51" Name="dat2d.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dat2d.dll" />
-                  <File Id="file52" Name="datd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\datd.dll" />
-                  <File Id="file53" Name="dtest2d.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dtest2d.exe" />
-                  <File Id="file54" Name="dtestxd.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dtestxd.exe" />
-                  <File Id="file57" Name="ibald.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\ibald.dll" />
-                  <File Id="file60" Name="ibwsd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\ibwsd.dll" />
-                  <File Id="file68" Name="INSTAL_1.EXE"
-                    LongName="installsp.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\installsp.exe" />
-                  <File Id="file69" Name="mlx4ud.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\mlx4ud.dll" />
-                  <File Id="file72" Name="mthcaud.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\mthcaud.dll" />
-                  <File Id="file73" Name="opensm.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\opensm.exe" />
-                  <File Id="file174" Name="vstat.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\vstat.exe" />
-                  <File Id="file175" Name="part_man.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\part_man.exe" />
-                </Component>
-            </Directory>
+            <?include ..\..\common\IBcore.inc ?>
+            <?include ..\..\common\mlnx_drivers.inc ?>
+            <?include ..\..\common\winverbs_drivers.inc ?>
           </Directory>
-     
-          <Component Id="cWinVerbsOFED"
-                     Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.dll" Name="ibverbs.dll"
-                  Source="..\bin\HCA\amd64\libibverbs.dll" />
-              <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"
-                     DestinationName="ibverbs.dll"
-                     DestinationLongName="libibverbs.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                  Source="..\bin\HCA\amd64\libibverbs.pdb" />
-
-            <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                  Source="..\bin\HCA\amd64\libibverbsd.dll" />
-              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"
-                     DestinationName="ibverbsd.dll"
-                     DestinationLongName="libibverbsd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                  Source="..\bin\HCA\amd64\libibverbsd.pdb" />
-
-            <File Id="libibmad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmad.dll" Name="ibmad.dll"
-                  Source="..\bin\HCA\amd64\libibmad.dll" />
-              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"
-                     DestinationName="ibmad.dll"
-                     DestinationLongName="libibmad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmad.pdb" Name="ibmad.pdb"
-                  Source="..\bin\HCA\amd64\libibmad.pdb" />
-
-            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.dll" Name="ibmadd.dll"
-                  Source="..\bin\HCA\amd64\libibmadd.dll" />
-              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"
-                     DestinationName="ibmadd.dll"
-                     DestinationLongName="libibmadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                  Source="..\bin\HCA\amd64\libibmadd.pdb" />
-
-            <File Id="libibumad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumad.dll" Name="ibumad.dll"
-                  Source="..\bin\HCA\amd64\libibumad.dll" />
-              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"
-                     DestinationName="ibumad.dll"
-                     DestinationLongName="libibumad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumad.pdb" Name="ibumad.pdb"
-                  Source="..\bin\HCA\amd64\libibumad.pdb" />
-
-            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.dll" Name="ibumadd.dll"
-                  Source="..\bin\HCA\amd64\libibumadd.dll" />
-              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"
-                     DestinationName="ibumadd.dll"
-                     DestinationLongName="libibumadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                  Source="..\bin\HCA\amd64\libibumadd.pdb" />
-
-            <File Id="librdmacm.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.dll" Name="rdmacm.dll"
-                  Source="..\bin\HCA\amd64\librdmacm.dll" />
-              <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"
-                     DestinationName="rdmacm.dll"
-                     DestinationLongName="librdmacm.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.pdb" Name="rdmacm.pdb"
-                  Source="..\bin\HCA\amd64\librdmacm.pdb" />
 
-            <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.dll" Name="rdmacmd.dll"
-                  Source="..\bin\HCA\amd64\librdmacmd.dll" />
-              <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"
-                     DestinationName="rdmacmd.dll"
-                     DestinationLongName="librdmacmd.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.pdb" Name="rdmacmd.pdb"
-                  Source="..\bin\HCA\amd64\librdmacmd.pdb" />
-
-          </Component>
-
-          <Component Id="cWinVerbsUApps"
-                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
-
-            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.exe" />
-            <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.pdb" />
-            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.exe" Name="devinfo.exe"
-                  Source="..\bin\tools\amd64\release\ibv_devinfo.exe" />
-            <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_devinfo.pdb" />
-            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"
-                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.exe" />
-            <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.pdb" />
-            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.exe" Name="readbw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_read_bw.exe" />
-            <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_read_bw.pdb" />
-            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.exe" Name="readlat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_read_lat.exe" />
-            <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_read_lat.pdb" />
-            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.exe" Name="send_bw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_send_bw.exe" />
-            <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_send_bw.pdb" />
-            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.exe" Name="send_lat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_send_lat.exe" />
-            <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_send_lat.pdb" />
-            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"
-                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.exe" />
-            <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.pdb" />
-            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"
-                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.exe" />
-            <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.pdb" />
-            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.exe" Name="write_bw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_write_bw.exe" />
-            <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_write_bw.pdb" />
-            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.exe" Name="writelat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_write_lat.exe" />
-            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_write_lat.pdb" />
-            <File Id="sminfo.exe" Compressed="yes" DiskId="1"
-                  LongName="sminfo.exe" Name="sminfo.exe"
-                  Source="..\bin\tools\amd64\release\sminfo.exe" />
-            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="sminfo.pdb" Name="sminfo.pdb"
-                  Source="..\bin\tools\amd64\release\sminfo.pdb" />
-            <File Id="ibstat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibstat.exe" Name="ibstat.exe"
-                  Source="..\bin\tools\amd64\release\ibstat.exe" />
-            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibstat.pdb" Name="ibstat.pdb"
-                  Source="..\bin\tools\amd64\release\ibstat.pdb" />
-            <File Id="perfquery.exe" Compressed="yes" DiskId="1"
-                  LongName="perfquery.exe" Name="perfquer.exe"
-                  Source="..\bin\tools\amd64\release\perfquery.exe" />
-            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"
-                  LongName="perfquery.pdb" Name="perfquer.pdb"
-                  Source="..\bin\tools\amd64\release\perfquery.pdb" />
-            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.exe" Name="ibaddr.exe"
-                  Source="..\bin\tools\amd64\release\ibaddr.exe" />
-            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.pdb" Name="ibaddr.pdb"
-                  Source="..\bin\tools\amd64\release\ibaddr.pdb" />
-            <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.exe" Name="ibnetdis.exe"
-                  Source="..\bin\tools\amd64\release\ibnetdiscover.exe" />
-            <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"
-                  Source="..\bin\tools\amd64\release\ibnetdiscover.pdb" />
-            <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.exe" Name="rcmatose.exe"
-                  Source="..\bin\tools\amd64\release\rdma_cmatose.exe" />
-            <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"
-                  Source="..\bin\tools\amd64\release\rdma_cmatose.pdb" />
-            <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_lat.exe" />
-            <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_lat.pdb" />
-            <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_bw.exe" />
-            <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_bw.pdb" />
-            <File Id="ibroute.exe" Compressed="yes" DiskId="1"
-                  LongName="ibroute.exe" Name="ibroute.exe"
-                  Source="..\bin\tools\amd64\release\ibroute.exe" />
-            <File Id="ibroute.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibroute.pdb" Name="ibroute.pdb"
-                  Source="..\bin\tools\amd64\release\ibroute.pdb" />
-            <File Id="ibtracert.exe" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.exe" Name="ibtrt.exe"
-                  Source="..\bin\tools\amd64\release\ibtracert.exe" />
-            <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.pdb" Name="ibtrt.pdb"
-                  Source="..\bin\tools\amd64\release\ibtracert.pdb" />
-          </Component>
+          <?include ..\..\common\checked.inc ?>
+          <?include ..\..\common\winverbs_OFED.inc ?>
 
           <Directory Id="ipoibDir" Name="net">
-            <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
-              <CreateFolder />
-              <File Id="netipoib_inf" Compressed="yes" DiskId="1"
-                     LongName="netipoib.inf" Name="NETIPOI.INF"
-                     Source="..\bin\net\amd64\netipoib.inf" />
-              <File Id="ipoib_cat" Compressed="yes" DiskId="1"
-                     LongName="ipoib.cat" Name="IPOI.cat"
-                     Source="..\bin\net\amd64\ipoib.cat" />
-              <File Id="ipoib.sys" Compressed="yes" DiskId="1"
-                     LongName="ipoib.sys" Name="IPOIB.SYS"
-                     Source="..\bin\net\amd64\ipoib.sys" />
-              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"
-                     Name="ipoib.pdb"
-                     Source="..\bin\net\amd64\ipoib.pdb" />
-              <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd32.dll" Name="IBWSD32.DLL"
-                     Source="..\bin\net\amd64\ibwsd32.dll" />
-              <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd.dll" Name="IBWSD.DLL"
-                     Source="..\bin\net\amd64\ibwsd.dll" />
-              <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov.dll" Name="IBNDPROV.DLL"
-                     Source="..\bin\net\amd64\ibndprov.dll" />
-              <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"
-                     Source="..\bin\net\amd64\ibndprov32.dll" />
-              <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
-                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"
-                     Source="..\bin\net\amd64\ndinstall.exe" />
-              <!-- Orphaned install files - remove on uninstall -->
-              <RemoveFile Id='o32_ibwsd.dll' On='uninstall'
-                     Property="System64Folder"
-                     Name="ibwsd.dll" LongName='ibwsd.dll' />
-              <RemoveFile Id='o64_ibwsd.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="ibwsd.dll" LongName='ibwsd.dll' />
-            </Component>
+            <?include ..\..\common\ipoib.inc ?>
           </Directory>
 
           <Component Id="WinsockDirect"
                      Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
             <File Id="installsp.exe" Compressed="yes" DiskId="1"
                      LongName="installsp.exe" Name="INSTALL.EXE"
-                     Source="..\bin\net\amd64\installsp.exe" />
+                     Source="..\bin\net\$(var.ARCH)\installsp.exe" />
           </Component>
 
           <Component Id="cNetworkDirect"
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
           </Component>
 
-          <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-            <File Id="dapl32.dll" Compressed="yes" DiskId="1"
-                   LongName="dapl32.dll" Name="DAPL32.DLL"
-                   Source="..\bin\DAPL\amd64\dapl32.dll" />
-            <File Id="dapl32d.dll" Compressed="yes" DiskId="1"
-                   LongName="dapl32d.dll" Name="DAPL32D.DLL"
-                   Source="..\bin\DAPL\amd64\dapl32d.dll" />
-            <File Id="dapl.dll" Compressed="yes" DiskId="1"
-                   LongName="dapl.dll" Name="DAPL.DLL"
-                   Source="..\bin\DAPL\amd64\dapl.dll" />
-              <CopyFile Id="dupDAPL" FileId="dapl.dll"
-                      DestinationName="dapl.dll"
-                      DestinationProperty="WindowsFolder" />
-            <File Id="dapld.dll" Compressed="yes" DiskId="1"
-                   LongName="dapld.dll" Name="DAPLD.DLL"
-                   Source="..\bin\DAPL\amd64\dapld.dll" />
-            <File Id="dat32.dll" Compressed="yes" DiskId="1"
-                   LongName="dat32.dll" Name="DAT32.DLL"
-                   Source="..\bin\DAPL\amd64\dat32.dll" />
-            <File Id="dat32d.dll" Compressed="yes" DiskId="1"
-                   LongName="dat32d.dll" Name="DAT32D.DLL"
-                   Source="..\bin\DAPL\amd64\dat32d.dll" />
-            <File Id="dat.dll" Compressed="yes" DiskId="1"
-                   LongName="dat.dll" Name="DAT.DLL"
-                   Source="..\bin\DAPL\amd64\dat.dll" />
-            <CopyFile Id="dupDAT" FileId="dat.dll"
-                      DestinationName="dat.dll"
-                      DestinationProperty="WindowsFolder" />
-            <File Id="datd.dll" Compressed="yes" DiskId="1"
-                   LongName="datd.dll" Name="DATD.DLL"
-                   Source="..\bin\DAPL\amd64\datd.dll" />
-            <File Id="dat.conf" Compressed="yes" DiskId="1"
-                   LongName="dat.conf" Name="dat.conf"
-                   Source="..\..\dat.conf" />
-            <File Id="dapltest.exe" Compressed="yes" DiskId="1"
-                   LongName="dapltest.exe" Name="dapltest.exe"
-                   Source="..\bin\tools\amd64\release\dapltest.exe" />
-            <File Id="dapltestd.exe" Compressed="yes" DiskId="1"
-                   LongName="dapltestd.exe" Name="dapltesd.exe"
-                   Source="..\bin\tools\amd64\debug\dapltestd.exe" />
-
-            <File Id="dapl.pdb" Compressed="yes" DiskId="1"
-                  LongName="dapl.pdb" Name="dapl.pdb"
-                  Source="..\bin\DAPL\amd64\dapl.pdb" />
-            <File Id="dapld.pdb" Compressed="yes" DiskId="1"
-                  LongName="dapld.pdb" Name="dapld.pdb"
-                  Source="..\bin\DAPL\amd64\dapld.pdb" />
-            <File Id="dat.lib" Compressed="yes" DiskId="1"
-                  LongName="dat.lib" Name="dat.lib"
-                  Source="..\bin\DAPL\amd64\dat.lib" />
-            <File Id="datd.lib" Compressed="yes" DiskId="1"
-                  LongName="datd.lib" Name="datd.lib"
-                  Source="..\bin\DAPL\amd64\datd.lib" />
-            <File Id="dat.pdb" Compressed="yes" DiskId="1"
-                  LongName="dat.pdb" Name="dat.pdb"
-                  Source="..\bin\DAPL\amd64\dat.pdb" />
-            <File Id="datd.pdb" Compressed="yes" DiskId="1"
-                  LongName="datd.pdb" Name="datd.pdb"
-                  Source="..\bin\DAPL\amd64\datd.pdb" />
-            <File Id="dt_svr.bat" Compressed="yes" DiskId="1"
-                  LongName="dt-svr.bat" Name="dt-svr.bat"
-                  Source="..\bin\DAPL2\dt-svr.bat" />
-            <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"
-                      DestinationName="dt1-svr.bat"
-                      DestinationProperty="INSTALLDIR" />
-            <File Id="dt_cli.bat" Compressed="yes" DiskId="1"
-                  LongName="dt-cli.bat" Name="dt-cli.bat"
-                  Source="..\bin\DAPL2\dt-cli.bat" />
-            <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"
-                      DestinationName="dt1-cli.bat"
-                      DestinationProperty="INSTALLDIR" />
-          </Component>
-
-          <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
-              <File Id="_dapl32.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232.dll" Name="DAPL232.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl232.dll" />
-              <File Id="_dapl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232d.dll" Name="DAPL232D.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl232d.dll" />
-              <File Id="_dapl2.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2.dll" Name="DAPL2.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2.dll" />
-              <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"
-                        DestinationName="dapl2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2d.dll" Name="DAPL2D.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2d.dll" />
-              <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2-scm.dll" Name="D2-scm.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2-scm.dll" />
-              <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"
-                        DestinationName="d2-scm.dll"
-                        DestinationLongName="dapl2-scm.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2-scmd.dll" />
-              <File Id="_dat32.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232.dll" Name="DAT232.DLL"
-                     Source="..\bin\DAPL2\amd64\dat232.dll" />
-              <File Id="_dat32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232d.dll" Name="DAT232D.DLL"
-                     Source="..\bin\DAPL2\amd64\dat232d.dll" />
-              <File Id="_dat2.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2.dll" Name="DAT2.DLL"
-                     Source="..\bin\DAPL2\amd64\dat2.dll" />
-              <CopyFile Id="dupDAT2" FileId="_dat2.dll"
-                        DestinationName="dat2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dat2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2d.dll" Name="DAT2D.DLL"
-                     Source="..\bin\DAPL2\amd64\dat2d.dll" />
-              <File Id="dapl2test.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2test.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\amd64\release\dapl2test.exe" />
-              <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2testd.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\amd64\debug\dapl2testd.exe" />
-              <File Id="dtest2.exe" Compressed="yes" DiskId="1"
-                     LongName="dtest2.exe" Name="dtest2.exe"
-                     Source="..\bin\tools\amd64\release\dtest2.exe" />
-              <File Id="dtestx.exe" Compressed="yes" DiskId="1"
-                     LongName="dtestx.exe" Name="dtestx.exe"
-                     Source="..\bin\tools\amd64\release\dtestx.exe" />
-
-              <File Id="dapl2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2.pdb" Name="dapl2.pdb"
-                    Source="..\bin\DAPL2\amd64\dapl2.pdb" />
-              <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2d.pdb" Name="dapl2d.pdb"
-                    Source="..\bin\DAPL2\amd64\dapl2d.pdb" />
-              <File Id="dat2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2.pdb" Name="dat2.pdb"
-                    Source="..\bin\DAPL2\amd64\dat2.pdb" />
-              <File Id="dat2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2d.pdb" Name="dat2d.pdb"
-                    Source="..\bin\DAPL2\amd64\dat2d.pdb" />
-              <File Id="dat2.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2.lib" Name="dat2.lib"
-                    Source="..\bin\DAPL2\amd64\dat2.lib" />
-              <File Id="dat2d.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2d.lib" Name="dat2d.lib"
-                    Source="..\bin\DAPL2\amd64\dat2d.lib" />
-          </Component>
+          <?include ..\..\common\dapl_rt.inc ?>
 
           <Component Id="cQLVNIC_driver_installed"
                      Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
@@ -991,17 +91,17 @@
                        Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
               <CreateFolder />
               <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                     LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                     Source="..\bin\net\amd64\qlgcvnic.sys" />
+                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
               <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                     Name="qlgcvnic.pdb"
-                     Source="..\bin\net\amd64\qlgcvnic.pdb" />
+                    Name="qlgcvnic.pdb"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
               <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                     LongName="netvnic.inf" Name="NETVNIC.INF"
-                     Source="..\bin\net\amd64\netvnic.inf" />
+                    LongName="netvnic.inf" Name="NETVNIC.INF"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
               <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                     LongName="netvnic.cat" Name="NETVNIC.cat"
-                     Source="..\bin\net\amd64\netvnic.cat" />
+                    LongName="netvnic.cat" Name="NETVNIC.cat"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
             </Component>
           </Directory>
 
@@ -1009,31 +109,28 @@
                      Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
           </Component>
 
+          <!-- RDMA SCSI over IB (aka SRP) -->
           <Directory Id="srpDir" Name="SRP">
             <Component Id="cSRP_files"
                        Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
               <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_srp.inf" Name="IB_SRP.INF"
-                     Source="..\bin\storage\amd64\ib_srp.inf" />
+                    LongName="ib_srp.inf" Name="IB_SRP.INF"
+                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
               <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.cat" Name="IBSRP.CAT"
-                     Source="..\bin\storage\amd64\ibsrp.cat" />
+                    LongName="ibsrp.cat" Name="IBSRP.CAT"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
               <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.sys" Name="IBSRP.SYS"
-                     Source="..\bin\storage\amd64\ibsrp.sys" />
+                    LongName="ibsrp.sys" Name="IBSRP.SYS"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
               <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                     Name="ibsrp.pdb"
-                     Source="..\bin\storage\amd64\ibsrp.pdb" />
+                    Name="ibsrp.pdb"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
             </Component>
           </Directory>
-
-          <Component Id="OpenSM_Service_enabled"
-                     Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-          </Component>
         </Directory>
       </Directory>
 
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot"> 
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
 
       <!-- copy DAT header files to
          %SystemDrive%\DAT\v1-1\DAT
@@ -1041,504 +138,15 @@
       -->
 
         <Directory Id="dDATD" Name="DAT">
-            <Component Id="cDatCfg"
-                       Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >
-              <CreateFolder />
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
-            </Component>
-
-            <Directory Id="v1_1" Name="v1-1">
-              <Component Id="cDATV1"
-                         Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">
-                <CreateFolder />
-              </Component>    
-              <Directory Id="DDID" Name="DAT">    
-                <Component Id="cDatBldV1Hdrs"
-                          Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
-                  <CreateFolder />    
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat.h" />    
-
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat_error.h" />    
-    
-                  <File Id="dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    
-    
-                  <File Id="dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL\dat_redirection.h" />    
-    
-                  <File Id="dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL\dat_registry.h" />    
-    
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    
-    
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL\udat.h" />    
-    
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL\udat_config.h" />    
-    
-                  <File Id="udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL\udat_redirection.h" />    
-    
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    
-                </Component>    
-              </Directory>    
-
-              <Component Id="cDatBldV1Libs"
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    
-
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"
-                        LongName="dat.lib" Name="dat.lib"
-                        Source="..\bin\DAPL\amd64\dat.lib" />
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"
-                        LongName="datd.lib" Name="datd.lib"
-                        Source="..\bin\DAPL\amd64\datd.lib" />
-              </Component>
-            </Directory>    
-
-            <Directory Id="v2_0" Name="v2-0">
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"
-                         KeyPath="yes" SharedDllRefCount="yes">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID2" Name="DAT">    
-                <Component Id="cDatBldV2Hdrs"
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    
-                  <CreateFolder />    
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat.h" />    
-
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat_error.h" />    
-    
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    
-    
-                  <File Id="_dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL2\dat_redirection.h" />    
-    
-                  <File Id="_dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL2\dat_registry.h" />    
-    
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    
-    
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL2\udat.h" />    
-    
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL2\udat_config.h" />    
-    
-                  <File Id="_udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL2\udat_redirection.h" />    
-    
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    
-
-                </Component>    
-              </Directory>    
-
-              <Component Id="cDatBldV2Libs"
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    
-
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2.lib" Name="dat2.lib"
-                        Source="..\bin\DAPL2\amd64\dat2.lib" />
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2d.lib" Name="dat2d.lib"
-                        Source="..\bin\DAPL2\amd64\dat2d.lib" />
-              </Component>    
-            </Directory>    
-
-        </Directory>    
+          <?include ..\..\common\DAT_config.inc ?>
+        </Directory>
 
         <Directory Id="IBSDK" Name="IBSDK">
-          <Directory Id="IB_libs" Name="lib">
-            <Component Id="cIBAL_Libs"
-                       Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
-              <CreateFolder />
-              <File Id="ibal.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal.lib" Name="ibal.lib"
-                    Source="..\bin\HCA\amd64\ibal.lib" />
-              <File Id="ibal.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal.pdb" Name="ibal.pdb"
-                    Source="..\bin\HCA\amd64\ibal.pdb" />
-              <File Id="complib.lib" Compressed="yes" DiskId="1"
-                    LongName="complib.lib" Name="complib.lib"
-                    Source="..\bin\HCA\amd64\complib.lib" />
-              <File Id="complib.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib.pdb" Name="complib.pdb"
-                    Source="..\bin\HCA\amd64\complib.pdb" />
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"
-                    LongName="ibald.lib" Name="ibald.lib"
-                    Source="..\bin\HCA\amd64\ibald.lib" />
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibald.pdb" Name="ibald.pdb"
-                    Source="..\bin\HCA\amd64\ibald.pdb" />
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"
-                    LongName="complibd.lib" Name="complibd.lib"
-                    Source="..\bin\HCA\amd64\complibd.lib" />
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"
-                    LongName="complibd.pdb" Name="complibd.pdb"
-                    Source="..\bin\HCA\amd64\complibd.pdb" />
-
-               <!-- SysWOW64\ 32-bit libs -->
-              <File Id="cl32.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32.lib" Name="cl32.lib"
-                    Source="..\bin\HCA\amd64\cl32.lib" />
-              <File Id="cl32.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32.pdb" Name="cl32.pdb"
-                    Source="..\bin\HCA\amd64\cl32.pdb" />
-              <File Id="cl32d.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32d.lib" Name="cl32d.lib"
-                    Source="..\bin\HCA\amd64\cl32d.lib" />
-              <File Id="cl32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32d.pdb" Name="cl32d.pdb"
-                    Source="..\bin\HCA\amd64\cl32d.pdb" />
-              <File Id="ibal32.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32.lib" Name="ibal32.lib"
-                    Source="..\bin\HCA\amd64\ibal32.lib" />
-              <File Id="ibal32.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32.pdb" Name="ibal32.pdb"
-                    Source="..\bin\HCA\amd64\ibal32.pdb" />
-              <File Id="ibal32d.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.lib" Name="ibal32d.lib"
-                    Source="..\bin\HCA\amd64\ibal32d.lib" />
-              <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.pdb" Name="ibal32d.pdb"
-                    Source="..\bin\HCA\amd64\ibal32d.pdb" />
-
-              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbs.lib" Name="winverbs.lib"
-                    Source="..\bin\HCA\amd64\winverbs.lib" />
-              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.lib" Name="winvrbsd.lib"
-                    Source="..\bin\HCA\amd64\winverbsd.lib" />
-
-              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.lib" Name="ibverbs.lib"
-                    Source="..\bin\HCA\amd64\libibverbs.lib" />
-              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                    Source="..\bin\HCA\amd64\libibverbs.pdb" />
-              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                    Source="..\bin\HCA\amd64\libibverbsd.lib" />
-              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                    Source="..\bin\HCA\amd64\libibverbsd.pdb" />
-
-              <File Id="libibmad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmad.lib" Name="ibmad.lib"
-                    Source="..\bin\HCA\amd64\libibmad.lib" />
-              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmad.pdb" Name="ibmad.pdb"
-                    Source="..\bin\HCA\amd64\libibmad.pdb" />
-              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.lib" Name="ibmadd.lib"
-                    Source="..\bin\HCA\amd64\libibmadd.lib" />
-              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                    Source="..\bin\HCA\amd64\libibmadd.pdb" />
-
-              <File Id="libibumad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumad.lib" Name="ibumad.lib"
-                    Source="..\bin\HCA\amd64\libibumad.lib" />
-              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumad.pdb" Name="ibumad.pdb"
-                    Source="..\bin\HCA\amd64\libibumad.pdb" />
-              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.lib" Name="ibumadd.lib"
-                    Source="..\bin\HCA\amd64\libibumadd.lib" />
-              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                    Source="..\bin\HCA\amd64\libibumadd.pdb" />
-            </Component>
-          </Directory>
-
-          <Directory Id="IB_inc" Name="Inc">
-            <Component Id="cIBAL_Incs"
-                       Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">
-              <CreateFolder />
-
-              <File Id="oib_ver.h" Compressed="yes" DiskId="1"
-                     LongName="oib_ver.h" Name="oib_ver.h"
-                     Source="..\bin\Inc\oib_ver.h" />
-              <File Id="openib.def" Compressed="yes" DiskId="1"
-                     LongName="openib.def" Name="openib.def"
-                     Source="..\bin\Inc\openib.def" />
-            </Component>
-
-            <Directory Id="IB_complib" Name="complib">
-              <Component Id="cIBAL_Complib"
-                         Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">
-                <CreateFolder />
-                <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"
-                      LongName="cl_async_proc.h" Name="CL_ASYN.H" 
-                      Source="..\bin\Inc\complib\cl_async_proc.h" />
-                <File Id="cl_atomic.h" Compressed="yes" DiskId="1"
-                      LongName="cl_atomic.h" Name="CL_ATOM.H" 
-                      Source="..\bin\Inc\complib\cl_atomic.h" />
-                <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" 
-                      Source="..\bin\Inc\complib\cl_atomic_osd.h" />
-                <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_byteswap.h" Name="CL_BYTE.H" 
-                      Source="..\bin\Inc\complib\cl_byteswap.h" />
-                <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" 
-                      Source="..\bin\Inc\complib\cl_byteswap_osd.h" />
-                <File Id="cl_comppool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_comppool.h" Name="CL_COMP.H" 
-                      Source="..\bin\Inc\complib\cl_comppool.h" />
-                <File Id="cl_debug.h" Compressed="yes" DiskId="1"
-                      LongName="cl_debug.h" Name="CL_DEBU.H" 
-                      Source="..\bin\Inc\complib\cl_debug.h" />
-                <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_debug_osd.h" Name="CL_DEBU1.H" 
-                      Source="..\bin\Inc\complib\cl_debug_osd.h" />
-                <File Id="cl_event.h" Compressed="yes" DiskId="1"
-                      LongName="cl_event.h" Name="CL_EVEN.H" 
-                      Source="..\bin\Inc\complib\cl_event.h" />
-                <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_event_osd.h" Name="CL_EVEN1.H" 
-                      Source="..\bin\Inc\complib\cl_event_osd.h" />
-                <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_fleximap.h" Name="CL_FLEX.H" 
-                      Source="..\bin\Inc\complib\cl_fleximap.h" />
-                <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"
-                      LongName="cl_ioctl.h" Name="CL_IOCT.H" 
-                      Source="..\bin\Inc\complib\cl_ioctl.h" />
-                <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" 
-                      Source="..\bin\Inc\complib\cl_ioctl_osd.h" />
-                <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"
-                      LongName="cl_irqlock.h" Name="CL_IRQL.H" 
-                      Source="..\bin\Inc\complib\cl_irqlock.h" />
-                <File Id="cl_list.h" Compressed="yes" DiskId="1"
-                      LongName="cl_list.h" Name="CL_LIST.H" 
-                      Source="..\bin\Inc\complib\cl_list.h" />
-                <File Id="cl_log.h" Compressed="yes" DiskId="1"
-                      LongName="cl_log.h" Name="CL_LOG.H" 
-                      Source="..\bin\Inc\complib\cl_log.h" />
-                <File Id="cl_map.h" Compressed="yes" DiskId="1"
-                      LongName="cl_map.h" Name="CL_MAP.H" 
-                      Source="..\bin\Inc\complib\cl_map.h" />
-                <File Id="cl_math.h" Compressed="yes" DiskId="1"
-                      LongName="cl_math.h" Name="CL_MATH.H" 
-                      Source="..\bin\Inc\complib\cl_math.h" />
-                <File Id="cl_memory.h" Compressed="yes" DiskId="1"
-                      LongName="cl_memory.h" Name="CL_MEMO.H" 
-                      Source="..\bin\Inc\complib\cl_memory.h" />
-                <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_memory_osd.h" Name="CL_MEMO1.H" 
-                      Source="..\bin\Inc\complib\cl_memory_osd.h" />
-                <File Id="cl_mutex.h" Compressed="yes" DiskId="1"
-                      LongName="cl_mutex.h" Name="CL_MUTE.H" 
-                      Source="..\bin\Inc\complib\cl_mutex.h" />
-                <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" 
-                      Source="..\bin\Inc\complib\cl_mutex_osd.h" />
-                <File Id="cl_obj.h" Compressed="yes" DiskId="1"
-                      LongName="cl_obj.h" Name="CL_OBJ.H" 
-                      Source="..\bin\Inc\complib\cl_obj.h" />
-                <File Id="cl_packoff.h" Compressed="yes" DiskId="1"
-                      LongName="cl_packoff.h" Name="CL_PACK.H" 
-                      Source="..\bin\Inc\complib\cl_packoff.h" />
-                <File Id="cl_packon.h" Compressed="yes" DiskId="1"
-                      LongName="cl_packon.h" Name="CL_PACK1.H" 
-                      Source="..\bin\Inc\complib\cl_packon.h" />
-                <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"
-                      LongName="cl_passivelock.h" Name="CL_PASS.H" 
-                      Source="..\bin\Inc\complib\cl_passivelock.h" />
-                <File Id="cl_perf.h" Compressed="yes" DiskId="1"
-                      LongName="cl_perf.h" Name="CL_PERF.H" 
-                      Source="..\bin\Inc\complib\cl_perf.h" />
-                <File Id="cl_pool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_pool.h" Name="CL_POOL.H" 
-                      Source="..\bin\Inc\complib\cl_pool.h" />
-                <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"
-                      LongName="cl_ptr_vector.h" Name="CL_PTR_.H" 
-                      Source="..\bin\Inc\complib\cl_ptr_vector.h" />
-                <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qcomppool.h" Name="CL_QCOM.H" 
-                      Source="..\bin\Inc\complib\cl_qcomppool.h" />
-                <File Id="cl_qlist.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qlist.h" Name="CL_QLIS.H" 
-                      Source="..\bin\Inc\complib\cl_qlist.h" />
-                <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qlockpool.h" Name="CL_QLOC.H" 
-                      Source="..\bin\Inc\complib\cl_qlockpool.h" />
-                <File Id="cl_qmap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qmap.h" Name="CL_QMAP.H" 
-                      Source="..\bin\Inc\complib\cl_qmap.h" />
-                <File Id="cl_qpool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qpool.h" Name="CL_QPOO.H" 
-                      Source="..\bin\Inc\complib\cl_qpool.h" />
-                <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_rbmap.h" Name="CL_RBMA.H" 
-                      Source="..\bin\Inc\complib\cl_rbmap.h" />
-                <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"
-                      LongName="cl_reqmgr.h" Name="CL_REQM.H" 
-                      Source="..\bin\Inc\complib\cl_reqmgr.h" />
-                <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"
-                      LongName="cl_spinlock.h" Name="CL_SPIN.H" 
-                      Source="..\bin\Inc\complib\cl_spinlock.h" />
-                <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" 
-                      Source="..\bin\Inc\complib\cl_spinlock_osd.h" />
-                <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"
-                      LongName="cl_syscallback.h" Name="CL_SYSC.H" 
-                      Source="..\bin\Inc\complib\cl_syscallback.h" />
-                <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" 
-                      Source="..\bin\Inc\complib\cl_syscallback_osd.h" />
-                <File Id="cl_thread.h" Compressed="yes" DiskId="1"
-                      LongName="cl_thread.h" Name="CL_THRE.H" 
-                      Source="..\bin\Inc\complib\cl_thread.h" />
-                <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_thread_osd.h" Name="CL_THRE1.H" 
-                      Source="..\bin\Inc\complib\cl_thread_osd.h" />
-                <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_threadpool.h" Name="CL_THRE2.H" 
-                      Source="..\bin\Inc\complib\cl_threadpool.h" />
-                <File Id="cl_timer.h" Compressed="yes" DiskId="1"
-                      LongName="cl_timer.h" Name="CL_TIME.H" 
-                      Source="..\bin\Inc\complib\cl_timer.h" />
-                <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_timer_osd.h" Name="CL_TIME1.H" 
-                      Source="..\bin\Inc\complib\cl_timer_osd.h" />
-                <File Id="cl_types.h" Compressed="yes" DiskId="1"
-                      LongName="cl_types.h" Name="CL_TYPE.H" 
-                      Source="..\bin\Inc\complib\cl_types.h" />
-                <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_types_osd.h" Name="CL_TYPE1.H" 
-                      Source="..\bin\Inc\complib\cl_types_osd.h" />
-                <File Id="cl_vector.h" Compressed="yes" DiskId="1"
-                      LongName="cl_vector.h" Name="CL_VECT.H" 
-                      Source="..\bin\Inc\complib\cl_vector.h" />
-                <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"
-                      LongName="cl_waitobj.h" Name="CL_WAIT.H" 
-                      Source="..\bin\Inc\complib\cl_waitobj.h" />
-                <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" 
-                      Source="..\bin\Inc\complib\cl_waitobj_osd.h" />
-                <File Id="comp_lib.h" Compressed="yes" DiskId="1"
-                      LongName="comp_lib.h" Name="COMP_LI.H" 
-                      Source="..\bin\Inc\complib\comp_lib.h" />
-              </Component>
-            </Directory>
-
-            <Directory Id="IB_iba" Name="iba">
-              <Component Id="cIBAL_IBA"
-                         Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">
-                <CreateFolder />
-                <File Id="ib_al.h" Compressed="yes" DiskId="1"
-                      LongName="ib_al.h" Name="ib_al.h"
-                      Source="..\bin\Inc\iba\ib_al.h" />
-                <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"
-                      LongName="ib_al_ioctl.h" Name="ib_ioctl.h"
-                      Source="..\bin\Inc\iba\ib_al_ioctl.h" />
-                <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"
-                      LongName="ib_at_ioctl.h" Name="ib_iocat.h"
-                      Source="..\bin\Inc\iba\ib_at_ioctl.h" />
-                <File Id="ib_ci.h" Compressed="yes" DiskId="1"
-                      LongName="ib_ci.h" Name="ib_ci.h"
-                      Source="..\bin\Inc\iba\ib_ci.h" />
-                <File Id="ib_types.h" Compressed="yes" DiskId="1"
-                      LongName="ib_types.h" Name="ib_types.h"
-                      Source="..\bin\Inc\iba\ib_types.h" />
-                <File Id="ib_uvp.h" Compressed="yes" DiskId="1"
-                      LongName="ib_uvp.h" Name="ib_uvp.h"
-                      Source="..\bin\Inc\iba\ib_uvp.h" />
-              </Component>
-            </Directory>
-          </Directory>
-
-          <Directory Id="IB_samples" Name="Samples">
-            <Directory Id="sample_DDK" Name="DDK">
-              <Component Id="cDDK_example"
-                         Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">
-                <CreateFolder />
-                    <File Id="cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\misc\cmtest.c" />
-                    <File Id="cmtest.rc" Compressed="yes" DiskId="1"
-                          LongName="cmtest.rc" Name="cmtest.rc"
-                          Source="..\..\SDK_Samples\DDK\cmtest.rc" />
-                    <File Id="makefile" Compressed="yes" DiskId="1"
-                          LongName="makefile" Name="makefile"
-                          Source="..\..\SDK_Samples\DDK\makefile" />
-                    <File Id="SOURCES" Compressed="yes" DiskId="1"
-                          LongName="SOURCES" Name="SOURCES"
-                          Source="..\..\SDK_Samples\DDK\SOURCES" />
-                    <File Id="README.txt" Compressed="yes" DiskId="1"
-                          LongName="README.txt" Name="README.txt"
-                          Source="..\..\SDK_Samples\DDK\README.txt" />
-              </Component>
-            </Directory>    <!-- End DDK -->
+          <?include ..\..\common\ib_sdk.inc ?>
+        </Directory>
 
-            <Directory Id="sample_VS" Name="VS">
-              <Component Id="cVS_example"
-                         Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">
-                <CreateFolder />
-                    <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\misc\cmtest.c" />
-                    <File Id="vs_cmtest.rc" Compressed="yes" DiskId="1"
-                          LongName="cmtest.rc" Name="cmtest.rc"
-                          Source="..\..\SDK_Samples\VS\cmtest.rc" />
-                    <File Id="vsREADME.txt" Compressed="yes" DiskId="1"
-                          LongName="README.txt" Name="README.txt"
-                          Source="..\..\SDK_Samples\VS\README.txt" />
-                    <File Id="Makefile.x64" Compressed="yes" DiskId="1"
-                          LongName="Makefile.x64" Name="Makefile.x64"
-                          Source="..\..\SDK_Samples\VS\Makefile.x64" />
-              </Component>
-            </Directory>   <!-- End VS -->
-          </Directory>   <!-- End Samples -->
-        </Directory>  <!-- End IBSDK -->
-      </Directory>  <!-- End WinRoot -->
-    </Directory>  <!-- End TARGETDIR -->
+      </Directory>
+    </Directory> <!-- End TARGETDIR -->
 
 <!--
     <Property Id='ARPNOMODIFY'>1</Property>
@@ -1551,11 +159,11 @@
     <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
 
     <!--
-       Features - Level=1 == Typical, no WSD on XP
+       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
      -->
 
     <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"
-         Description="Mellanox Host Channel Adapter Drivers for ConnectX and InfiniHost"
+         Description="Mellanox InfiniBand Host Channel Adapter Drivers"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
       <ComponentRef Id="cMthcaDriver" />
@@ -1563,9 +171,9 @@
     </Feature>
 
     <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"
-         Description="InfiniBand: Core, Tools, Docs"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
+        Description="InfiniBand: Core, Tools, Docs"
+        Display="expand" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">
       <ComponentRef Id="cIBcore" />
       <ComponentRef Id="cWinVerbsDrivers" />
       <ComponentRef Id="Docs" />
@@ -1584,9 +192,9 @@
     </Feature>
 
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"
-         Description="Internet Protocols over InfiniBand" Display="expand"
-         ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="Internet Protocols over InfiniBand" Display="expand"
+        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
       <ComponentRef Id="IPoIB" />
     </Feature>
 
@@ -1608,22 +216,22 @@
     </Feature>
 
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"
-         Description="Open Subnet Management started as a local Windows Service"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
-      <ComponentRef Id="OpenSM_Service_enabled" />
+        Description="Open Subnet Management started as a local Windows Service"
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
+        <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
     <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"
-         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <Condition Level="201"> IPOIB_EXISTS </Condition>
 
       <Feature Id="fDatConf" Title="DAT-DAPL Config File"
-         Description="DAT-DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
+         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
          Display="expand" Level="1" 
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
-        <Condition Level="0"> Not Installed AND DAT_CONF_EXISTS </Condition>
+        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>
         <ComponentRef Id="cDatCfg" />
       </Feature>
 
@@ -1669,9 +277,9 @@
     </Feature>
 
     <Feature Id="fVNIC" Title="QLogic-VNIC"
-         Description="QLogic - Virtual NIC over InfiniBand"
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="QLogic - Virtual NIC over InfiniBand"
+        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <ComponentRef Id="cQLVNIC_driver_installed" />
     </Feature>
 
@@ -1695,69 +303,7 @@
       <ComponentRef Id="cCHK_user" />
     </Feature>
 
-    <!--> File where Custom Actions are defined -->
-    <Binary Id='CA' src='..\..\CustomActions.vbs' />
-
-    <CustomAction Id='WinOF_setup' BinaryKey='CA'
-         VBScriptCall='WinOF_setup' Return='check' />
-
-    <CustomAction Id='ChkPreviousInstall' BinaryKey='CA'
-         VBScriptCall='ChkInstallAndReboot' Return='check' />
-
-    <CustomAction Id='DriverInstall' BinaryKey='CA'
-         VBScriptCall='DriverInstall' Return='check' Execute='deferred' />
-
-    <CustomAction Id='DriverUninstall' BinaryKey='CA'
-         VBScriptCall='DriverUninstall' Return='check' />
-
-    <CustomAction Id='WSDStart' BinaryKey='CA'
-         VBScriptCall='WSDEnable' Return='check' />
-
-    <CustomAction Id="ND_start" BinaryKey="CA"
-         VBScriptCall="ND_StartMeUp" Return="check" />
-
-    <CustomAction Id='HammerTime' BinaryKey='CA'
-         VBScriptCall='HammerTime' Return='check' />
-
-    <CustomAction Id="BcastRegChanged" BinaryKey="CA"
-         VBScriptCall="BcastRegChanged" Return="check" />
-
-    <CustomAction Id="InstallChanged" BinaryKey="CA"
-         VBScriptCall="InstallChanged" Return="check" />
-
-    <InstallExecuteSequence>
-       <!--> Always executed (Install or uninstall </!-->
-       <Custom Action="WinOF_setup" After='InstallInitialize' />
-
-       <!--> Install ONLY </!-->
-       <Custom Action="ChkPreviousInstall" After='WinOF_setup'>
-               NOT Installed</Custom>
-
-       <ScheduleReboot After='ChkPreviousInstall'>
-               REBOOT="FORCE"</ScheduleReboot>
-
-       <Custom Action="DriverInstall" After='InstallServices'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="WSDStart" After='InstallFinalize'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="ND_start" After="WSDStart">
-          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="BcastRegChanged" After="ND_start">
-           Not Installed</Custom>
-
-       <!--> CHANGE ONLY </!-->
-       <Custom Action="InstallChanged" After="InstallFinalize">
-           Installed </Custom>
-
-       <!--> REMOVE ONLY </!-->
-       <Custom Action="DriverUninstall" After='PublishProduct'>
-               REMOVE="ALL" </Custom>
-       <Custom Action="HammerTime" After='InstallFinalize'>REMOVE="ALL"</Custom>
-    </InstallExecuteSequence>
-
+    <?include ..\..\common\InstallExecuteSeq.inc ?>
 
     <UIRef Id="WixUI_FeatureTree" />
       <UIRef Id="WixUI_ErrorProgressText" />
diff --git a/trunk/WinOF/WIX/win7/x86/wof.wxs b/trunk/WinOF/WIX/win7/x86/wof.wxs
index 091ade78..176041d3 100644
--- a/trunk/WinOF/WIX/win7/x86/wof.wxs
+++ b/trunk/WinOF/WIX/win7/x86/wof.wxs
@@ -2,22 +2,28 @@
 <!--
    WinOF (Windows OpenFabrics InfiniBand) for x86 Windows Server 2008 or Vista
 -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 
-  <Product Name="Windows OpenFabrics InfiniBand v2.1.0 (RC0) x86"
-   Version="2.1.0"
-   Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
-   UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
-   Language="1033" Codepage="1252"
-   Manufacturer="Open Fabrics Alliance Windows">
+<?define ARCH=x86 ?>
+<?define ARCHP=x86 ?>
+<?define OS=win7 ?>
+<?include ..\..\common\WinOF_cfg.inc ?>
 
-   <Package Id="????????-????-????-????-????????????"
-    Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
-    InstallPrivileges='elevated'
-    Description="WinOF Installer"
-    Comments="Open Fabrics Alliance Windows InfiniBand stack"
-    Manufacturer="OpenFabrics Alliance Windows" InstallerVersion="200"
-    Languages="1033" Compressed="yes" SummaryCodepage="1252" />
+<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+  <Product
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"
+    Version="$(var.WOFRELNUM)"
+    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
+    Language="1033" Codepage="1252"
+    Manufacturer="Open Fabrics Alliance Windows">
+
+    <Package Id="????????-????-????-????-????????????"
+     Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
+     InstallPrivileges='elevated'
+     Description="WinOF Installer"
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
+     Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Condition Message="Administrator required to install [ProductName].">
      Privileged
@@ -29,1429 +35,117 @@
     <Condition Message="[ProductName] requires Windows Server 2008 or Vista to install.">
      <![CDATA[(VersionNT=600)]]></Condition>
 
-    <!--
-        System/Machine-wide install, otherwise per-user (Administrator) only.
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.
-     -->
-    <Property Id="ALLUSERS"> Value="1" </Property>
-
-    <!-- Requires files sc.exe & reg.exe -->
-
-    <Property Id="REG_EXISTS">
-        <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">
-            <FileSearch Id="RegFile" Name="reg.exe" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="SC_EXISTS">
-        <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">
-            <FileSearch Id="ScFile" Name="sc.exe" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="IPOIB_EXISTS">
-        <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">
-            <FileSearch Id="ipoibFile" Name="netipoib.inf" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT_CONF_EXISTS">
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">
-        <FileSearch Id="DCFile" Name="dat.conf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT1_INSTALLED">
-      <DirectorySearch Id="Dat1File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="daplFile" Name="dapl.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT2_INSTALLED">
-      <DirectorySearch Id="Dat2File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="dapl2File" Name="dapl2.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Condition Message="[ProductName] requires system file reg.exe">
-       REG_EXISTS
-    </Condition>
-    <Condition Message="[ProductName] requires system file sc.exe">
-       SC_EXISTS
-    </Condition>
-    <Media Id="1" Cabinet="Data1.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
-    <Property Id="DiskPrompt" Value="WinOF 1.1 Installation [1]" />
+    <?include ..\..\common\requirements.inc ?>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-        <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
-            <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"
-                       Name="WinOF" />
-        </Directory>
-        <Directory Id="DesktopFolder" Name="Desktop" />
-        <Directory Id="ProgramFilesFolder" Name="PFiles">
-            <Directory Id="INSTALLDIR" Name="WinOF">
-                <Component Id="Docs"
-                           Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
-                    <File Id="OFAlogo" Compressed="yes" DiskId="1"
-                          LongName="openfabrics.gif" Name="ofa.gif"
-                          Source="..\..\openfabrics.gif" />
-
-                   <!-- implies WIX build only from an svn structured tree.  -->
-                    <File Id="manual.htm" Compressed="yes" DiskId="1"
-                          Name="Manual.htm" LongName="Manual.htm" Vital="yes"
-                          Source="..\bin\Misc\Manual.htm" /> 
-
-                    <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
-                          Name="Manual.htm" LongName="Manual"
-                          Target="[INSTALLDIR]\Manual.htm" Show="normal"
-                          WorkingDirectory="INSTALLDIR"
-                          Icon="openfabrics" IconIndex="0" />
-
-                    <File Id="dRelnotes" Compressed="yes" DiskId="1"
-                          LongName="Release_notes.htm" Name="RELEASE_.HTM"
-                          Source="..\..\Release_notes.htm" />
-                    <Shortcut Id="RelNotes" Directory="ProgramMenuDir"
-                          Name="RelNotes" LongName="Release Notes"
-                          Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
-                          WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                          IconIndex="0" />
-                    <File Id="command_window" Name="COMMAND.LNK"
-                          LongName="Command Window.lnk" Compressed="yes"
-                          DiskId="1" Source="..\..\x86\Command Window.lnk"
-                          Vital="yes" />
-                    <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
-                          Name="COMMAND.LNK" LongName="Command Window.lnk"
-                          Target="[INSTALLDIR]\Command Window.lnk"
-                          Icon="openfabrics" IconIndex="0" Show="normal"
-                          WorkingDirectory="INSTALLDIR" />
-                    <Shortcut Id="UninstallProduct" Name="UnMyApp"
-                          LongName="Uninstall WinOF"
-                          Target="[SystemFolder]msiexec.exe"
-                          Arguments="/X [ProductCode]"
-                          Directory="ProgramMenuDir"
-                          Description="Uninstall Windows OpenFabrics InfinBand stack" />
-                    <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
-                </Component>
-
-                <Component Id="Tools"
-                           Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
-                    <Environment Id='UpdatePath' Name='PATH' Action='create'
-                           System='yes' Part='last' Value='[INSTALLDIR]' />
-
-                    <File Id="qlgcvnic_config"
-                          Compressed="yes" DiskId="1" Vital="yes"
-                          Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"
-                        Source="..\bin\tools\x86\release\qlgcvnic_config.exe" />
-                    <File Id="part_man" Name="part_man.exe"
-                          Compressed="yes" DiskId="1" Vital="yes"
-                          Source="..\bin\tools\x86\release\part_man.exe" />
-                    <File Id="vstat" Name="vstat.exe"
-                          Compressed="yes" Vital="yes" DiskId="1"
-                          Source="..\bin\tools\x86\release\vstat.exe" />
-                    <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
-                          DiskId="1" Name="TTCP.EXE"
-                          Source="..\bin\tools\x86\release\ttcp.exe" />
-                    <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
-                          DiskId="1" Name="CMTEST.EXE"
-                          Source="..\bin\tools\x86\release\cmtest.exe" />
-                    <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_limits.exe" Name="IB_LIMI.EXE"
-                          Source="..\bin\tools\x86\release\ib_limits.exe" />
-                    <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_read_bw.exe" Name="IB_READ.EXE"
-                          Source="..\bin\tools\x86\release\ib_read_bw.exe" />
-                    <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
-                          Source="..\bin\tools\x86\release\ib_read_lat.exe" />
-                    <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
-                          Source="..\bin\tools\x86\release\ib_send_bw.exe" />
-                    <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
-                          Source="..\bin\tools\x86\release\ib_send_lat.exe" />
-                    <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
-                          Source="..\bin\tools\x86\release\ib_write_bw.exe" />
-                    <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
-                          Source="..\bin\tools\x86\release\ib_write_lat.exe" />
-                    <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
-                          LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
-                          Source="..\bin\tools\x86\release\ibtrapgen.exe" />
-                    <File Id="osmtest.exe" Compressed="yes" DiskId="1"
-                          LongName="osmtest.exe" Name="OSMTEST.EXE"
-                          Source="..\bin\tools\x86\release\osmtest.exe" />
-                    <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
-                          LongName="PrintIP.exe" Name="PRINTIP.EXE"
-                          Source="..\bin\tools\x86\release\PrintIP.exe" />
-                    <File Id="nsc" Name="nsc.exe" Vital="yes"
-                          Compressed="yes" DiskId="1"
-                          Source="..\bin\tools\x86\release\nsc.exe" />
-                </Component>
-
-                <Component Id='OpenSMservice'
-                           Guid='90042B4F-51B5-4720-8E54-6D366253634B'
-                           SharedDllRefCount='no' KeyPath='no'
-                           NeverOverwrite='no'
-                           Permanent='no' Transitive='no' Win64='no'
-                           Location='either'>
-
-                  <File Id="opensm.exe" Compressed="yes" DiskId="1"
-                        LongName="opensm.exe" Name="OPENSM.EXE"
-                        Source="..\bin\tools\x86\release\opensm.exe"
-                        Vital='yes' KeyPath='yes' Hidden='no' System='no' 
-                        Checksum='no' ReadOnly='no' />
-
-                  <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
-                    Description='InfiniBand Subnet Configuration and Management'
-                      DisplayName='InfiniBand Subnet Manager'
-                      Arguments='-e --service'
-                      ErrorControl='normal'
-                      Start='disabled'
-                      Interactive='no'
-                      Type='ownProcess' />
-
-                  <ServiceControl Id='osmSvcControl' Name='OpenSM'
-                                  Stop='uninstall'
-                                  Wait='no'
-                                  Remove='uninstall' />
-                </Component>
-
-                <Directory Id="IBcoreDir" Name="IBcore">
-                    <Component Id="cIBcore"
-                               Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
-                        <CreateFolder />
-                        <File Id="dpinst.exe" Compressed="yes" DiskId="1"
-                              LongName="dpinst.exe" Name="dpinst.exe"
-                              Source="..\..\x86\dpinst.exe" />
-                        <File Id="dpinst.xml" Compressed="yes" DiskId="1"
-                               LongName="dpinst.xml" Name="dpinst.xml"
-                               Source="..\..\dpinst.xml" />
-                        <File Id="devman.exe" Compressed="yes" DiskId="1"
-                              LongName="devman.exe" Name="devman.exe"
-                              Source="..\..\x86\devman.exe" />
-                        <File Id="WdfCoinstaller" Compressed="yes" DiskId="1"
-                              LongName="WdfCoInstaller01009.dll" Name="WCO.dll"
-                              Source="..\bin\HCA\x86\WdfCoInstaller01009.dll" />
-                        <File Id="complib.dll" Compressed="yes" DiskId="1"
-                              LongName="complib.dll" Name="COMPLIB.DLL"
-                              Source="..\bin\HCA\x86\complib.dll" />
-                        <File Id="complibd.dll" Compressed="yes" DiskId="1"
-                              LongName="complibd.dll" Name="COMPLIBD.DLL"
-                              Source="..\bin\HCA\x86\complibd.dll" />
-                        <File Id="ibal.dll" Compressed="yes" DiskId="1"
-                              LongName="ibal.dll" Name="IBAL.DLL"
-                              Source="..\bin\HCA\x86\ibal.dll" />
-                        <File Id="ibald.dll" Compressed="yes" DiskId="1"
-                              LongName="ibald.dll" Name="IBALD.DLL"
-                              Source="..\bin\HCA\x86\ibald.dll" />
-                        <File Id="ibbus.sys" Compressed="yes" DiskId="1"
-                              LongName="ibbus.sys" Name="IBBUS.SYS"
-                              Source="..\bin\HCA\x86\ibbus.sys" />
-                        <File Id="ibbus.pdb" Compressed="yes" DiskId="1"
-                              Name="ibbus.pdb"
-                              Source="..\bin\HCA\x86\ibbus.pdb" />
-                        <File Id="ibiou.sys" Compressed="yes" DiskId="1"
-                              LongName="ibiou.sys" Name="IBIOU.SYS"
-                              Source="..\bin\HCA\x86\ibiou.sys" />
-                        <File Id="ibiou.pdb" Compressed="yes" DiskId="1"
-                              Name="ibiou.pdb"
-                              Source="..\bin\HCA\x86\ibiou.pdb" />
-                        <File Id="ib_iou.cat" Compressed="yes" DiskId="1"
-                              LongName="ib_iou.cat" Name="IB_iou.cat"
-                              Source="..\bin\HCA\x86\ib_iou.cat" />
-                        <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
-                              LongName="ib_iou.inf" Name="ib_iou.inf"
-                              Source="..\bin\HCA\x86\ib_iou.inf" />
-                        <!--
-                           Orphaned install files - remove on uninstall
-                        -->
-                        <RemoveFile Id='o64_ibal.dll' On='uninstall'
-                               Property="SystemFolder"
-                               Name="ibal.dll" LongName='ibal.dll' />
-                        <RemoveFile Id='o64_complib.dll' On='uninstall'
-                               Property="SystemFolder"
-                               Name="complib.dll" LongName='complib.dll' />
-                    </Component>
-
-                    <Component Id="cMthcaDriver"
-                               Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">
-                        <File Id="mthca.inf" Compressed="yes" DiskId="1"
-                              LongName="mthca.inf" Name="MTHCA.INF"
-                              Source="..\bin\HCA\x86\mthca.inf" />
-                        <File Id="mthca.cat" Compressed="yes" DiskId="1"
-                              LongName="mthca.cat" Name="MTHCA.cat"
-                              Source="..\bin\HCA\x86\mthca.cat" />
-                        <File Id="mthca.sys" Compressed="yes" DiskId="1"
-                              LongName="mthca.sys" Name="MTHCA.SYS"
-                              Source="..\bin\HCA\x86\mthca.sys" />
-                        <File Id="mthca.pdb" Compressed="yes" DiskId="1"
-                              Name="mthca.pdb"
-                              Source="..\bin\HCA\x86\mthca.pdb" />
-                        <File Id="mthcau.dll" Compressed="yes" DiskId="1"
-                              LongName="mthcau.dll" Name="MTHCAU.DLL"
-                              Source="..\bin\HCA\x86\mthcau.dll" />
-                        <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
-                              LongName="mthcaud.dll" Name="MTHCAUD.DLL"
-                              Source="..\bin\HCA\x86\mthcaud.dll" />
-                        <!-- Orphaned install files - remove on uninstall -->
-                        <RemoveFile Id='o32_mthcau.dll' On='uninstall'
-                               Property="SystemFolder"
-                               Name="mthcau.dll" LongName='mthcau.dll' />
-                    </Component>
-
-                    <Component Id="cConnectXDriver"
-                               Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
-                        <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.inf" Name="mlx4_bus.INF"
-                              Source="..\bin\hca\x86\mlx4_bus.inf" />
-                        <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.cat" Name="mlx4_bus.cat"
-                              Source="..\bin\hca\x86\mlx4_bus.cat" />
-                        <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
-                              Source="..\bin\hca\x86\mlx4_bus.sys" />
-                        <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
-                              Name="mlx4_bus.pdb"
-                              Source="..\bin\hca\x86\mlx4_bus.pdb" />
-                        <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
-                              Source="..\bin\hca\x86\mlx4_hca.inf" />
-                        <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.cat" Name="mlx4_hca.cat"
-                              Source="..\bin\hca\x86\mlx4_hca.cat" />
-                        <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.sys" Name="mlx4_hca.sys"
-                              Source="..\bin\hca\x86\mlx4_hca.sys" />
-                        <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"
-                              Name="mlx4_hca.pdb"
-                              Source="..\bin\hca\x86\mlx4_hca.pdb" />
-                        <File Id="mlx4u.dll" Compressed="yes" DiskId="1"
-                              LongName="mlx4u.dll" Name="mlx4u.dll"
-                              Source="..\bin\hca\x86\mlx4u.dll" />
-                        <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"
-                              LongName="mlx4ud.dll" Name="mlx4ud.dll"
-                              Source="..\bin\hca\x86\mlx4ud.dll" />
-                    </Component>
-
-                    <Component Id="cWinVerbsDrivers"
-                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-
-                        <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                              LongName="winverbs.sys" Name="winverbs.sys"
-                              Source="..\bin\HCA\x86\winverbs.sys" />
-                        <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
-                              LongName="winverbs.pdb" Name="winverbs.pdb"
-                              Source="..\bin\HCA\x86\winverbs.pdb" />
-                        <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                              LongName="winverbs.dll" Name="winvrbs.dll"
-                              Source="..\bin\HCA\x86\winverbs.dll" />
-                        <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                              LongName="winverbsd.dll" Name="winvrbsd.dll"
-                              Source="..\bin\HCA\x86\winverbsd.dll" />
-                        <File Id="winmad.sys" Compressed="yes" DiskId="1"
-                              LongName="winmad.sys" Name="winmad.sys"
-                              Source="..\bin\HCA\x86\winmad.sys" />
-                        <File Id="winmad.pdb" Compressed="yes" DiskId="1"
-                              LongName="winmad.pdb" Name="winmad.pdb"
-                              Source="..\bin\HCA\x86\winmad.pdb" />
-                        <File Id="winmad.dll" Compressed="yes" DiskId="1"
-                              LongName="winmad.dll" Name="winmad.dll"
-                              Source="..\bin\HCA\x86\winmad.dll" />
-                        <File Id="winmadd.dll" Compressed="yes" DiskId="1"
-                              LongName="winmadd.dll" Name="winmaddd.dll"
-                              Source="..\bin\HCA\x86\winmadd.dll" />
-                    </Component>
-                </Directory>
-
-                <Directory Id="dir_0" Name="Checked">
-                  <Directory Id="dir_1" Name="kernel">
-                    <Component Id="cCHK_kernel"
-                               Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
-                      <CreateFolder />
-     
-                      <File Id="chk0" DiskId="1" Compressed="yes"
-                            Name="README.txt"
-                            Source="..\..\README_checked.txt" />
-                      <File Id="chk1" DiskId="1" Compressed="yes"
-                            Name="mthca.sys"
-                            Source="..\bin\Chk\HCA\x86\mthca.sys" />
-                      <File Id="cat1" DiskId="1" Compressed="yes"
-                            Name="mthca.cat"
-                            Source="..\bin\Chk\HCA\x86\mthca.cat" />
-                      <File Id="sym1" DiskId="1" Compressed="yes"
-                            Name="mthca.pdb"
-                            Source="..\bin\Chk\HCA\x86\mthca.pdb" />
-     
-                      <File Id="chk2" DiskId="1" Compressed="yes"
-                            Name="ibbus.sys"
-                            Source="..\bin\Chk\HCA\x86\ibbus.sys" />
-                      <File Id="sym2" DiskId="1" Compressed="yes"
-                            Name="ibbus.pdb"
-                            Source="..\bin\Chk\HCA\x86\ibbus.pdb" />
-     
-                      <File Id="chk3" DiskId="1" Compressed="yes"
-                            Name="ibiou.sys"
-                            Source="..\bin\Chk\HCA\x86\ibiou.sys" />
-                      <File Id="cat3" DiskId="1" Compressed="yes"
-                            Name="ib_iou.cat"
-                            Source="..\bin\Chk\HCA\x86\ib_iou.cat" />
-                      <File Id="sym3" DiskId="1" Compressed="yes"
-                            Name="ibiou.pdb"
-                            Source="..\bin\Chk\HCA\x86\ibiou.pdb" />
-     
-                      <File Id="chk4" DiskId="1" Compressed="yes"
-                            Name="ipoib.sys"
-                          Source="..\bin\Chk\net\x86\ipoib.sys" />
-                      <File Id="cat4" DiskId="1" Compressed="yes"
-                            Name="ipoib.cat"
-                            Source="..\bin\Chk\net\x86\ipoib.cat" />
-                      <File Id="sym4" DiskId="1" Compressed="yes"
-                            Name="ipoib.pdb"
-                            Source="..\bin\Chk\net\x86\ipoib.pdb" />
-     
-                      <File Id="chk5" DiskId="1" Compressed="yes"
-                            Name="qlgcvnic.sys"
-                            Source="..\bin\Chk\net\x86\qlgcvnic.sys" />
-                      <File Id="cat5" DiskId="1" Compressed="yes"
-                            Name="netvnic.cat"
-                            Source="..\bin\Chk\net\x86\netvnic.cat" />
-                      <File Id="sym5" DiskId="1" Compressed="yes"
-                            Name="qlgcvnic.pdb"
-                            Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />
-     
-                      <File Id="chk6" DiskId="1" Compressed="yes"
-                            Name="ibsrp.sys"
-                            Source="..\bin\Chk\storage\x86\ibsrp.sys" />
-                      <File Id="cat6" DiskId="1" Compressed="yes"
-                            Name="ibsrp.cat"
-                            Source="..\bin\Chk\storage\x86\ibsrp.cat" />
-                      <File Id="sym6" DiskId="1" Compressed="yes"
-                            Name="ibsrp.pdb"
-                            Source="..\bin\Chk\storage\x86\ibsrp.pdb" />
-     
-                      <File Id="chk7" DiskId="1" Compressed="yes"
-                            Name="mlx4_bus.sys"
-                            Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />
-                       <File Id="cat7" DiskId="1" Compressed="yes"
-                            Name="mlx4_bus.cat"
-                            Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />
-                      <File Id="sym7" DiskId="1" Compressed="yes"
-                            Name="mlx4_bus.pdb"
-                            Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />
-     
-                      <File Id="chk8" DiskId="1" Compressed="yes"
-                            Name="mlx4_hca.sys"
-                            Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />
-                      <File Id="cat8" DiskId="1" Compressed="yes"
-                            Name="mlx4_hca.cat"
-                             Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />
-                      <File Id="sym8" DiskId="1" Compressed="yes"
-                            Name="mlx4_hca.pdb"
-                            Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />
-
-                      <File Id="chk9" DiskId="1" Compressed="yes"
-                            Name="winverbs.sys"
-                            Source="..\bin\Chk\HCA\x86\winverbs.sys" />
-                      <File Id="sym9" DiskId="1" Compressed="yes"
-                            Name="winverbs.pdb"
-                            Source="..\bin\Chk\HCA\x86\winverbs.pdb" />
-                      <File Id="dll9" DiskId="1" Compressed="yes"
-                            Name="winverbs.dll"
-                            Source="..\bin\Chk\HCA\x86\winverbs.dll" />
-                      <File Id="dlld9" DiskId="1" Compressed="yes"
-                            Name="winverbd.dll"
-                            LongName="winverbsd.dll"
-                            Source="..\bin\Chk\HCA\x86\winverbsd.dll" />
-                    </Component>
-                  </Directory>
-            
-                  <Directory Id="dir_14" Name="user">
-                    <Component Id="cCHK_user"
-                               Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
-                      <CreateFolder />
-                      <File Id="file118" Name="complibd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\complibd.dll" />
-                      <File Id="file119" Name="DAPL2-_1.DLL"
-                        LongName="dapl2-scmd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\dapl2-scmd.dll" />
-                      <File Id="file120" Name="dapl2d.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\dapl2d.dll" />
-                      <File Id="file121" Name="DAPL2T_1.EXE"
-                        LongName="dapl2testd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\dapl2testd.exe" />
-                      <File Id="file122" Name="dapld.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\dapld.dll" />
-                      <File Id="file123" Name="DAPLTE_1.EXE"
-                        LongName="dapltestd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\dapltestd.exe" />
-                      <File Id="file124" Name="dat2d.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\dat2d.dll" />
-                      <File Id="file125" Name="datd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\datd.dll" />
-                      <File Id="file126" Name="dtest2d.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\dtest2d.exe" />
-                      <File Id="file127" Name="dtestxd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\dtestxd.exe" />
-                      <File Id="file130" Name="ibald.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\ibald.dll" />
-                      <File Id="file133" Name="ibwsd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\ibwsd.dll" />
-                      <File Id="file141" Name="INSTAL_1.EXE"
-                        LongName="installsp.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\installsp.exe" />
-                      <File Id="file144" Name="mthcaud.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\mthcaud.dll" />
-                      <File Id="file146" Name="opensm.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\opensm.exe" />
-                      <File Id="file151" Name="vstat.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\vstat.exe" />
-                      <File Id="file152" Name="part_man.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_win7_x86\i386\part_man.exe" />
-                    </Component>
-                  </Directory>
-                </Directory>
-
-                <Component Id="cWinVerbsOFED"
-                           Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-                  <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                        LongName="libibverbs.dll" Name="ibverbs.dll"
-                        Source="..\bin\HCA\x86\libibverbs.dll" />
-                    <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"
-                           DestinationName="ibverbs.dll"
-                           DestinationLongName="libibverbs.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                        Source="..\bin\HCA\x86\libibverbs.pdb" />
-      
-                  <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                        Source="..\bin\HCA\x86\libibverbsd.dll" />
-                    <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"
-                           DestinationName="ibverbsd.dll"
-                           DestinationLongName="libibverbsd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                        Source="..\bin\HCA\x86\libibverbsd.pdb" />
-      
-                  <File Id="libibmad.dll" Compressed="yes" DiskId="1"
-                        LongName="libibmad.dll" Name="ibmad.dll"
-                        Source="..\bin\HCA\x86\libibmad.dll" />
-                    <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"
-                           DestinationName="ibmad.dll"
-                           DestinationLongName="libibmad.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibmad.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibmad.pdb" Name="ibmad.pdb"
-                        Source="..\bin\HCA\x86\libibmad.pdb" />
-      
-                  <File Id="libibmadd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibmadd.dll" Name="ibmadd.dll"
-                        Source="..\bin\HCA\x86\libibmadd.dll" />
-                    <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"
-                           DestinationName="ibmadd.dll"
-                           DestinationLongName="libibmadd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                        Source="..\bin\HCA\x86\libibmadd.pdb" />
-      
-                  <File Id="libibumad.dll" Compressed="yes" DiskId="1"
-                        LongName="libibumad.dll" Name="ibumad.dll"
-                        Source="..\bin\HCA\x86\libibumad.dll" />
-                    <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"
-                           DestinationName="ibumad.dll"
-                           DestinationLongName="libibumad.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibumad.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibumad.pdb" Name="ibumad.pdb"
-                        Source="..\bin\HCA\x86\libibumad.pdb" />
-      
-                  <File Id="libibumadd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibumadd.dll" Name="ibumadd.dll"
-                        Source="..\bin\HCA\x86\libibumadd.dll" />
-                    <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"
-                           DestinationName="ibumadd.dll"
-                           DestinationLongName="libibumadd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                        Source="..\bin\HCA\x86\libibumadd.pdb" />
-
-                  <File Id="librdmacm.dll" Compressed="yes" DiskId="1"
-                        LongName="librdmacm.dll" Name="rdmacm.dll"
-                        Source="..\bin\HCA\x86\librdmacm.dll" />
-                    <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"
-                           DestinationName="rdmacm.dll"
-                           DestinationLongName="librdmacm.dll"
-                           DestinationProperty="SystemFolder" />
-                  <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"
-                        LongName="librdmacm.pdb" Name="rdmacm.pdb"
-                        Source="..\bin\HCA\x86\librdmacm.pdb" />
-
-                  <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"
-                        LongName="librdmacmd.dll" Name="rdmacmd.dll"
-                        Source="..\bin\HCA\x86\librdmacmd.dll" />
-                    <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"
-                           DestinationName="rdmacmd.dll"
-                           DestinationLongName="librdmacmd.dll"
-                           DestinationProperty="SystemFolder" />
-                  <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"
-                        LongName="librdmacmd.pdb" Name="rdmacmd.pdb"
-                        Source="..\bin\HCA\x86\librdmacmd.pdb" />
-
-                </Component>
-
-                <Component Id="cWinVerbsUApps"
-                          Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
-
-                  <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"
-                        Source="..\bin\tools\x86\release\ibv_asyncwatch.exe" />
-                  <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_asyncwatch.pdb" />
-                  <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_devinfo.exe" Name="devinfo.exe"
-                        Source="..\bin\tools\x86\release\ibv_devinfo.exe" />
-                  <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_devinfo.pdb" Name="devinfo.pdb"
-                        Source="..\bin\tools\x86\release\ibv_devinfo.pdb" />
-                  <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"
-                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.exe" />
-                  <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.pdb" />
-                  <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_bw.exe" Name="readbw.exe"
-                        Source="..\bin\tools\x86\release\ibv_read_bw.exe" />
-                  <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_bw.pdb" Name="readbw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_read_bw.pdb" />
-                  <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_lat.exe" Name="readlat.exe"
-                        Source="..\bin\tools\x86\release\ibv_read_lat.exe" />
-                  <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_lat.pdb" Name="readlat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_read_lat.pdb" />
-                  <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_bw.exe" Name="send_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_send_bw.exe" />
-                  <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_bw.pdb" Name="send_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_send_bw.pdb" />
-                  <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_lat.exe" Name="send_lat.exe"
-                        Source="..\bin\tools\x86\release\ibv_send_lat.exe" />
-                  <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_lat.pdb" Name="send_lat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_send_lat.pdb" />
-                  <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"
-                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.exe" />
-                  <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"
-                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.pdb" />
-                  <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"
-                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.exe" />
-                  <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"
-                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.pdb" />
-                  <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_bw.exe" Name="write_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_write_bw.exe" />
-                  <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_bw.pdb" Name="write_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_write_bw.pdb" />
-                  <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_lat.exe" Name="writelat.exe"
-                        Source="..\bin\tools\x86\release\ibv_write_lat.exe" />
-                  <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_lat.pdb" Name="writelat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_write_lat.pdb" />
-                  <File Id="sminfo.exe" Compressed="yes" DiskId="1"
-                        LongName="sminfo.exe" Name="sminfo.exe"
-                        Source="..\bin\tools\x86\release\sminfo.exe" />
-                  <File Id="sminfo.pdb" Compressed="yes" DiskId="1"
-                        LongName="sminfo.pdb" Name="sminfo.pdb"
-                        Source="..\bin\tools\x86\release\sminfo.pdb" />
-                  <File Id="ibstat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibstat.exe" Name="ibstat.exe"
-                        Source="..\bin\tools\x86\release\ibstat.exe" />
-                  <File Id="ibstat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibstat.pdb" Name="ibstat.pdb"
-                        Source="..\bin\tools\x86\release\ibstat.pdb" />
-                  <File Id="perfquery.exe" Compressed="yes" DiskId="1"
-                        LongName="perfquery.exe" Name="perfquer.exe"
-                        Source="..\bin\tools\x86\release\perfquery.exe" />
-                  <File Id="perfquery.pdb" Compressed="yes" DiskId="1"
-                        LongName="perfquery.pdb" Name="perfquer.pdb"
-                        Source="..\bin\tools\x86\release\perfquery.pdb" />
-                  <File Id="ibaddr.exe" Compressed="yes" DiskId="1"
-                        LongName="ibaddr.exe" Name="ibaddr.exe"
-                        Source="..\bin\tools\x86\release\ibaddr.exe" />
-                  <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibaddr.pdb" Name="ibaddr.pdb"
-                        Source="..\bin\tools\x86\release\ibaddr.pdb" />
-                  <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"
-                        LongName="ibnetdiscover.exe" Name="ibnetdis.exe"
-                        Source="..\bin\tools\x86\release\ibnetdiscover.exe" />
-                  <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"
-                        Source="..\bin\tools\x86\release\ibnetdiscover.pdb" />
-                  <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"
-                        LongName="rdma_cmatose.exe" Name="rcmatose.exe"
-                        Source="..\bin\tools\x86\release\rdma_cmatose.exe" />
-                  <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"
-                        LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"
-                        Source="..\bin\tools\x86\release\rdma_cmatose.pdb" />
-                  <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"
-                        Source="..\bin\tools\x86\release\ibv_rdma_lat.exe" />
-                  <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rdma_lat.pdb" />
-                  <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_rdma_bw.exe" />
-                  <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rdma_bw.pdb" />
-                  <File Id="ibroute.exe" Compressed="yes" DiskId="1"
-                        LongName="ibroute.exe" Name="ibroute.exe"
-                        Source="..\bin\tools\x86\release\ibroute.exe" />
-                  <File Id="ibroute.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibroute.pdb" Name="ibroute.pdb"
-                        Source="..\bin\tools\x86\release\ibroute.pdb" />
-                  <File Id="ibtracert.exe" Compressed="yes" DiskId="1"
-                        LongName="ibtracert.exe" Name="ibtrt.exe"
-                        Source="..\bin\tools\x86\release\ibtracert.exe" />
-                  <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibtracert.pdb" Name="ibtrt.pdb"
-                        Source="..\bin\tools\x86\release\ibtracert.pdb" />
-                </Component>
-
-                <Directory Id="ipoibDir" Name="net">
-                    <Component Id="IPoIB"
-                               Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
-                        <CreateFolder />
-                        <File Id="netipoib_inf" Compressed="yes" DiskId="1"
-                              LongName="netipoib.inf" Name="NETIPOI.INF"
-                              Source="..\bin\net\x86\netipoib.inf" />
-                        <File Id="ipoib_cat" Compressed="yes" DiskId="1"
-                              LongName="ipoib.cat" Name="IPOI.cat"
-                              Source="..\bin\net\x86\ipoib.cat" />
-                        <File Id="ipoib.sys" Compressed="yes" DiskId="1"
-                              LongName="ipoib.sys" Name="IPOIB.SYS"
-                              Source="..\bin\net\x86\ipoib.sys" />
-                        <File Id="ipoib.pdb" Compressed="yes" DiskId="1"
-                              Name="ipoib.pdb"
-                              Source="..\bin\net\x86\ipoib.pdb" />
-                        <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
-                              LongName="ibwsd.dll" Name="IBWSD.DLL"
-                              Source="..\bin\net\x86\ibwsd.dll" />
-                        <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
-                              LongName="ibndprov.dll" Name="IBNDPROV.DLL"
-                              Source="..\bin\net\x86\ibndprov.dll" />
-                        <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
-                              LongName="ndinstall.exe" Name="NDINSTAL.EXE"
-                              Source="..\bin\net\x86\ndinstall.exe" />
-                        <!-- Orphaned install files - remove on uninstall -->
-                        <RemoveFile Id='o32_ibwsd.dll' On='uninstall'
-                               Property="SystemFolder"
-                               Name="ibwsd.dll" LongName='ibwsd.dll' />
-                    </Component>
-                </Directory>
-
-                <Component Id="WinsockDirect"
-                           Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
-                    <File Id="installsp.exe" Compressed="yes" DiskId="1"
-                              LongName="installsp.exe" Name="INSTALL.EXE"
-                              Source="..\bin\net\x86\installsp.exe" />
-                </Component>
-
-                <Component Id="cNetworkDirect"
-                           Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
-                </Component>
-
-                <Component Id="cDAPL1RT"
-                           Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-
-                    <File Id="dapl.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl.dll" Name="DAPL.DLL"
-                          Source="..\bin\DAPL\x86\dapl.dll" />
-                    <CopyFile Id="dupDAPL" FileId="dapl.dll"
-                          DestinationName="dapl.dll"
-                          DestinationProperty="WindowsFolder" />
-                    <File Id="dapld.dll" Compressed="yes" DiskId="1"
-                          LongName="dapld.dll" Name="DAPLD.DLL"
-                          Source="..\bin\DAPL\x86\dapld.dll" />
-                    <File Id="dat.dll" Compressed="yes" DiskId="1"
-                          LongName="dat.dll" Name="DAT.DLL"
-                          Source="..\bin\DAPL\x86\dat.dll" />
-                    <CopyFile Id="dupDAT" FileId="dat.dll"
-                          DestinationName="dat.dll"
-                          DestinationProperty="WindowsFolder" />
-                    <File Id="datd.dll" Compressed="yes" DiskId="1"
-                          LongName="datd.dll" Name="DATD.DLL"
-                          Source="..\bin\DAPL\x86\datd.dll" />
-
-                    <File Id="dat.conf" Compressed="yes" DiskId="1"
-                          LongName="dat.conf" Name="dat.conf"
-                          Source="..\..\dat.conf" />
-                    <File Id="dapltest.exe" Compressed="yes" DiskId="1"
-                          LongName="dapltest.exe" Name="dapltest.exe"
-                          Source="..\bin\tools\x86\release\dapltest.exe" />
-                    <File Id="dapltestd.exe" Compressed="yes" DiskId="1"
-                          LongName="dapltestd.exe" Name="dapltesd.exe"
-                          Source="..\bin\tools\x86\debug\dapltestd.exe" />
-
-                    <File Id="dat.lib" Compressed="yes" DiskId="1"
-                          LongName="dat.lib" Name="dat.lib"
-                          Source="..\bin\DAPL\x86\dat.lib" />
-                    <File Id="datd.lib" Compressed="yes" DiskId="1"
-                          LongName="datd.lib" Name="datd.lib"
-                          Source="..\bin\DAPL\x86\datd.lib" />
-                    <File Id="dat.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat.pdb" Name="dat.pdb"
-                          Source="..\bin\DAPL\x86\dat.pdb" />
-                    <File Id="datd.pdb" Compressed="yes" DiskId="1"
-                          LongName="datd.pdb" Name="datd.pdb"
-                          Source="..\bin\DAPL\x86\datd.pdb" />
-                    <File Id="dapl.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl.pdb" Name="dapl.pdb"
-                          Source="..\bin\DAPL\x86\dapl.pdb" />
-                    <File Id="dapld.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapld.pdb" Name="dapld.pdb"
-                          Source="..\bin\DAPL\x86\dapld.pdb" />
-
-                    <File Id="dt_svr.bat" Compressed="yes" DiskId="1"
-                          LongName="dt-svr.bat" Name="dt-svr.bat"
-                          Source="..\bin\DAPL2\dt-svr.bat" />
-                    <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"
-                          DestinationName="dt1-svr.bat"
-                          DestinationProperty="INSTALLDIR" />
-                    <File Id="dt_cli.bat" Compressed="yes" DiskId="1"
-                          LongName="dt-cli.bat" Name="dt-cli.bat"
-                          Source="..\bin\DAPL2\dt-cli.bat" />
-                    <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"
-                          DestinationName="dt1-cli.bat"
-                          DestinationProperty="INSTALLDIR" />
-                </Component>
-
-                <Component Id="cDAPL2RT"
-                           Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
-
-                    <File Id="_dapl2.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2.dll" Name="DAPL2.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2.dll" />
-                      <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"
-                              DestinationName="dapl2.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2d.dll" Name="DAPL2D.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2d.dll" />
-
-                    <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scm.dll" Name="D2-scm.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2-scm.dll" />
-                      <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"
-                              DestinationName="d2-scm.dll"
-                              DestinationLongName="dapl2-scm.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2-scmd.dll" />
-
-                    <File Id="_dat2.dll" Compressed="yes" DiskId="1"
-                          LongName="dat2.dll" Name="DAT2.DLL"
-                          Source="..\bin\DAPL2\x86\dat2.dll" />
-                    <CopyFile Id="dupDAT2" FileId="_dat2.dll"
-                              DestinationName="dat2.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dat2d.dll" Compressed="yes" DiskId="1"
-                          LongName="dat2d.dll" Name="DAT2D.DLL"
-                          Source="..\bin\DAPL2\x86\dat2d.dll" />
-                    <File Id="dapl2test.exe" Compressed="yes" DiskId="1"
-                          LongName="dapl2test.exe" Name="dapl2tes.exe"
-                          Source="..\bin\tools\x86\release\dapl2test.exe" />
-                    <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"
-                          LongName="dapl2testd.exe" Name="dapl2tes.exe"
-                          Source="..\bin\tools\x86\debug\dapl2testd.exe" />
-                    <File Id="dtest2.exe" Compressed="yes" DiskId="1"
-                           LongName="dtest2.exe" Name="dtest2.exe"
-                           Source="..\bin\tools\x86\release\dtest2.exe" />
-                    <File Id="dtestx.exe" Compressed="yes" DiskId="1"
-                           LongName="dtestx.exe" Name="dtestx.exe"
-                           Source="..\bin\tools\x86\release\dtestx.exe" />
-
-                    <File Id="dapl2.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl2.pdb" Name="dapl2.pdb"
-                          Source="..\bin\DAPL2\x86\dapl2.pdb" />
-                    <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl2d.pdb" Name="dapl2d.pdb"
-                          Source="..\bin\DAPL2\x86\dapl2d.pdb" />
-                    <File Id="dat2.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat2.pdb" Name="dat2.pdb"
-                          Source="..\bin\DAPL2\x86\dat2.pdb" />
-                    <File Id="dat2d.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat2d.pdb" Name="dat2d.pdb"
-                          Source="..\bin\DAPL2\x86\dat2d.pdb" />
-                    <File Id="dat2.lib" Compressed="yes" DiskId="1"
-                          LongName="dat2.lib" Name="dat2.lib"
-                          Source="..\bin\DAPL2\x86\dat2.lib" />
-                    <File Id="dat2d.lib" Compressed="yes" DiskId="1"
-                          LongName="dat2d.lib" Name="dat2d.lib"
-                          Source="..\bin\DAPL2\x86\dat2d.lib" />
-                </Component>
+      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
+        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"
+                   Name="WinOF" />
+      </Directory>
+      <Directory Id="DesktopFolder" Name="Desktop" />
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="INSTALLDIR" Name="WinOF">
+
+          <?include ..\..\common\Docs.inc ?>
+          <?include ..\..\common\Tools.inc ?>
+          <?include ..\..\common\OpenSM_service.inc ?>
+
+          <Directory Id="IBcoreDir" Name="IBcore">
+            <?include ..\..\common\IBcore.inc ?>
+            <?include ..\..\common\mlnx_drivers.inc ?>
+            <?include ..\..\common\winverbs_drivers.inc ?>
+          </Directory>
 
-                <Component Id="cQLVNIC_driver_installed"
-                           Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-                </Component>
+          <?include ..\..\common\checked.inc ?>
+          <?include ..\..\common\winverbs_OFED.inc ?>
 
-                <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-                    <Component Id="cQLVNIC_files"
-                               Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-                        <CreateFolder />
-                        <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                              LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                              Source="..\bin\net\x86\qlgcvnic.sys" />
-                        <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                              Name="qlgcvnic.pdb"
-                              Source="..\bin\net\x86\qlgcvnic.pdb" />
-                        <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                              LongName="netvnic.inf" Name="NETVNIC.INF"
-                              Source="..\bin\net\x86\netvnic.inf" />
-                        <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                              LongName="netvnic.cat" Name="NETVNIC.cat"
-                              Source="..\bin\net\x86\netvnic.cat" />
-                    </Component>
-                </Directory>
+          <Directory Id="ipoibDir" Name="net">
+            <?include ..\..\common\ipoib.inc ?>
+          </Directory>
 
-                <Component Id="cSRP_driver_installed"
-                           Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-                </Component>
+          <Component Id="WinsockDirect"
+                     Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
+            <File Id="installsp.exe" Compressed="yes" DiskId="1"
+                     LongName="installsp.exe" Name="INSTALL.EXE"
+                     Source="..\bin\net\$(var.ARCH)\installsp.exe" />
+          </Component>
 
-                <Directory Id="srpDir" Name="SRP">
-                    <Component Id="cSRP_files"
-                               Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-                        <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                              LongName="ib_srp.inf" Name="IB_SRP.INF"
-                              Source="..\bin\storage\x86\ib_srp.inf" />
-                        <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                              LongName="ibsrp.cat" Name="IBSRP.CAT"
-                              Source="..\bin\storage\x86\ibsrp.cat" />
-                        <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                              LongName="ibsrp.sys" Name="IBSRP.SYS"
-                              Source="..\bin\storage\x86\ibsrp.sys" />
-                        <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                              Name="ibsrp.pdb"
-                              Source="..\bin\storage\x86\ibsrp.pdb" />
-                    </Component>
-                </Directory>
+          <Component Id="cNetworkDirect"
+                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
+          </Component>
 
-                <Component Id="OpenSM_Service_enabled"
-                           Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-                </Component>
-            </Directory>
-          </Directory>
+          <?include ..\..\common\dapl_rt.inc ?>
 
-      <!-- copy DAT header files to
-             %SystemDrive%\DAT\v1-1\DAT
-             %SystemDrive%\DAT\v2-0\DAT
-       -->
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
+          <Component Id="cQLVNIC_driver_installed"
+                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
+          </Component>
 
-         <Directory Id="dDATD" Name="DAT">
-            <Component Id="cDatCfg" Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >
+          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
+            <Component Id="cQLVNIC_files"
+                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
               <CreateFolder />
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
+              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
+                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
+              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
+                    Name="qlgcvnic.pdb"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
+              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
+                    LongName="netvnic.inf" Name="NETVNIC.INF"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
+              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
+                    LongName="netvnic.cat" Name="NETVNIC.cat"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
             </Component>
+          </Directory>
 
-            <Directory Id="v1_1" Name="v1-1">
-              <Component Id="cDATV1" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">
-                <CreateFolder />
-              </Component>
-              <Directory Id="DDID" Name="DAT">    
-                <Component Id="cDatBldV1Hdrs"
-                           Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
-                  <CreateFolder />    
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat.h" />    
-
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat_error.h" />    
-         
-                  <File Id="dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    
-         
-                  <File Id="dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL\dat_redirection.h" />    
-         
-                  <File Id="dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL\dat_registry.h" />    
-         
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    
-         
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL\udat.h" />    
-         
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL\udat_config.h" />    
-         
-                  <File Id="udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL\udat_redirection.h" />    
-         
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV1Libs"
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"
-                        LongName="dat.lib" Name="dat.lib"
-                        Source="..\bin\DAPL\x86\dat.lib" />
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"
-                        LongName="datd.lib" Name="datd.lib"
-                        Source="..\bin\DAPL\x86\datd.lib" />
-              </Component>
-            </Directory>
-
-            <Directory Id="v2_0" Name="v2-0">
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID2" Name="DAT">    
-                <Component Id="cDatBldV2Hdrs"
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    
-                  <CreateFolder />    
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat.h" />    
-
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat_error.h" />    
-         
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    
-         
-                  <File Id="_dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL2\dat_redirection.h" />    
-         
-                  <File Id="_dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL2\dat_registry.h" />    
-         
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    
-         
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL2\udat.h" />    
-         
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL2\udat_config.h" />    
-         
-                  <File Id="_udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL2\udat_redirection.h" />    
-         
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV2Libs"
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    
-
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2.lib" Name="dat2.lib"
-                        Source="..\bin\DAPL2\x86\dat2.lib" />
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2d.lib" Name="dat2d.lib"
-                        Source="..\bin\DAPL2\x86\dat2d.lib" />
-              </Component>    
-            </Directory>
-         </Directory>  <!-- End DAT -->
-
-         <!-- setup IBSDK file structure -->
-         <Directory Id="IBSDK" Name="IBSDK">
-           <Directory Id="IB_libs" Name="lib">
-             <Component Id="cIBAL_Libs"
-                        Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
-               <CreateFolder />
-               <File Id="ibal.lib" Compressed="yes" DiskId="1"
-                     LongName="ibal.lib" Name="ibal.lib"
-                     Source="..\bin\HCA\x86\ibal.lib" />
-               <File Id="ibal.pdb" Compressed="yes" DiskId="1"
-                     LongName="ibal.pdb" Name="ibal.pdb"
-                     Source="..\bin\HCA\x86\ibal.pdb" />
-               <File Id="complib.lib" Compressed="yes" DiskId="1"
-                     LongName="complib.lib" Name="complib.lib"
-                     Source="..\bin\HCA\x86\complib.lib" />
-               <File Id="complib.pdb" Compressed="yes" DiskId="1"
-                     LongName="complib.pdb" Name="complib.pdb"
-                     Source="..\bin\HCA\x86\complib.pdb" />
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"
-                    LongName="ibald.lib" Name="ibald.lib"
-                    Source="..\bin\HCA\x86\ibald.lib" />
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibald.pdb" Name="ibald.pdb"
-                    Source="..\bin\HCA\x86\ibald.pdb" />
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"
-                    LongName="complibd.lib" Name="complibd.lib"
-                    Source="..\bin\HCA\x86\complibd.lib" />
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"
-                    LongName="complibd.pdb" Name="complibd.pdb"
-                    Source="..\bin\HCA\x86\complibd.pdb" />
-
-              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbs.lib" Name="winverbs.lib"
-                    Source="..\bin\HCA\x86\winverbs.lib" />
-              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.lib" Name="winvrbsd.lib"
-                    Source="..\bin\HCA\x86\winverbsd.lib" />
-
-              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.lib" Name="ibverbs.lib"
-                    Source="..\bin\HCA\x86\libibverbs.lib" />
-              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                    Source="..\bin\HCA\x86\libibverbs.pdb" />
-              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                    Source="..\bin\HCA\x86\libibverbsd.lib" />
-              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                    Source="..\bin\HCA\x86\libibverbsd.pdb" />
-
-              <File Id="libibmad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmad.lib" Name="ibmad.lib"
-                    Source="..\bin\HCA\x86\libibmad.lib" />
-              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmad.pdb" Name="ibmad.pdb"
-                    Source="..\bin\HCA\x86\libibmad.pdb" />
-              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.lib" Name="ibmadd.lib"
-                    Source="..\bin\HCA\x86\libibmadd.lib" />
-              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                    Source="..\bin\HCA\x86\libibmadd.pdb" />
-
-              <File Id="libibumad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumad.lib" Name="ibumad.lib"
-                    Source="..\bin\HCA\x86\libibumad.lib" />
-              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumad.pdb" Name="ibumad.pdb"
-                    Source="..\bin\HCA\x86\libibumad.pdb" />
-              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.lib" Name="ibumadd.lib"
-                    Source="..\bin\HCA\x86\libibumadd.lib" />
-              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                    Source="..\bin\HCA\x86\libibumadd.pdb" />
-             </Component>
-           </Directory>
-
-           <Directory Id="IB_inc" Name="Inc">
-             <Component Id="cIBAL_Incs"
-                        Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">
-               <CreateFolder />
-
-               <File Id="oib_ver.h" Compressed="yes" DiskId="1"
-                     LongName="oib_ver.h" Name="oib_ver.h"
-                     Source="..\bin\Inc\oib_ver.h" />
-               <File Id="openib.def" Compressed="yes" DiskId="1"
-                     LongName="openib.def" Name="openib.def"
-                     Source="..\bin\Inc\openib.def" />
-             </Component>
+          <Component Id="cSRP_driver_installed"
+                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
+          </Component>
+
+          <!-- RDMA SCSI over IB (aka SRP) -->
+          <Directory Id="srpDir" Name="SRP">
+            <Component Id="cSRP_files"
+                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
+              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
+                    LongName="ib_srp.inf" Name="IB_SRP.INF"
+                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
+              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
+                    LongName="ibsrp.cat" Name="IBSRP.CAT"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
+              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
+                    LongName="ibsrp.sys" Name="IBSRP.SYS"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
+              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
+                    Name="ibsrp.pdb"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
+            </Component>
+          </Directory>
+        </Directory>
+      </Directory>
 
-             <Directory Id="IB_complib" Name="complib">
-               <Component Id="cIBAL_Complib"
-                          Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">
-                 <CreateFolder />
-                 <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"
-                       LongName="cl_async_proc.h" Name="CL_ASYN.H" 
-                       Source="..\bin\Inc\complib\cl_async_proc.h" />
-                 <File Id="cl_atomic.h" Compressed="yes" DiskId="1"
-                       LongName="cl_atomic.h" Name="CL_ATOM.H" 
-                       Source="..\bin\Inc\complib\cl_atomic.h" />
-                 <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" 
-                       Source="..\bin\Inc\complib\cl_atomic_osd.h" />
-                 <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_byteswap.h" Name="CL_BYTE.H" 
-                       Source="..\bin\Inc\complib\cl_byteswap.h" />
-                 <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" 
-                       Source="..\bin\Inc\complib\cl_byteswap_osd.h" />
-                 <File Id="cl_comppool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_comppool.h" Name="CL_COMP.H" 
-                       Source="..\bin\Inc\complib\cl_comppool.h" />
-                 <File Id="cl_debug.h" Compressed="yes" DiskId="1"
-                       LongName="cl_debug.h" Name="CL_DEBU.H" 
-                       Source="..\bin\Inc\complib\cl_debug.h" />
-                 <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_debug_osd.h" Name="CL_DEBU1.H" 
-                       Source="..\bin\Inc\complib\cl_debug_osd.h" />
-                 <File Id="cl_event.h" Compressed="yes" DiskId="1"
-                       LongName="cl_event.h" Name="CL_EVEN.H" 
-                       Source="..\bin\Inc\complib\cl_event.h" />
-                 <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_event_osd.h" Name="CL_EVEN1.H" 
-                       Source="..\bin\Inc\complib\cl_event_osd.h" />
-                 <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_fleximap.h" Name="CL_FLEX.H" 
-                       Source="..\bin\Inc\complib\cl_fleximap.h" />
-                 <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ioctl.h" Name="CL_IOCT.H" 
-                       Source="..\bin\Inc\complib\cl_ioctl.h" />
-                 <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" 
-                       Source="..\bin\Inc\complib\cl_ioctl_osd.h" />
-                 <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_irqlock.h" Name="CL_IRQL.H" 
-                       Source="..\bin\Inc\complib\cl_irqlock.h" />
-                 <File Id="cl_list.h" Compressed="yes" DiskId="1"
-                       LongName="cl_list.h" Name="CL_LIST.H" 
-                       Source="..\bin\Inc\complib\cl_list.h" />
-                 <File Id="cl_log.h" Compressed="yes" DiskId="1"
-                       LongName="cl_log.h" Name="CL_LOG.H" 
-                       Source="..\bin\Inc\complib\cl_log.h" />
-                 <File Id="cl_map.h" Compressed="yes" DiskId="1"
-                       LongName="cl_map.h" Name="CL_MAP.H" 
-                       Source="..\bin\Inc\complib\cl_map.h" />
-                 <File Id="cl_math.h" Compressed="yes" DiskId="1"
-                       LongName="cl_math.h" Name="CL_MATH.H" 
-                       Source="..\bin\Inc\complib\cl_math.h" />
-                 <File Id="cl_memory.h" Compressed="yes" DiskId="1"
-                       LongName="cl_memory.h" Name="CL_MEMO.H" 
-                       Source="..\bin\Inc\complib\cl_memory.h" />
-                 <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_memory_osd.h" Name="CL_MEMO1.H" 
-                       Source="..\bin\Inc\complib\cl_memory_osd.h" />
-                 <File Id="cl_mutex.h" Compressed="yes" DiskId="1"
-                       LongName="cl_mutex.h" Name="CL_MUTE.H" 
-                       Source="..\bin\Inc\complib\cl_mutex.h" />
-                 <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" 
-                       Source="..\bin\Inc\complib\cl_mutex_osd.h" />
-                 <File Id="cl_obj.h" Compressed="yes" DiskId="1"
-                       LongName="cl_obj.h" Name="CL_OBJ.H" 
-                       Source="..\bin\Inc\complib\cl_obj.h" />
-                 <File Id="cl_packoff.h" Compressed="yes" DiskId="1"
-                       LongName="cl_packoff.h" Name="CL_PACK.H" 
-                       Source="..\bin\Inc\complib\cl_packoff.h" />
-                 <File Id="cl_packon.h" Compressed="yes" DiskId="1"
-                       LongName="cl_packon.h" Name="CL_PACK1.H" 
-                       Source="..\bin\Inc\complib\cl_packon.h" />
-                 <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_passivelock.h" Name="CL_PASS.H" 
-                       Source="..\bin\Inc\complib\cl_passivelock.h" />
-                 <File Id="cl_perf.h" Compressed="yes" DiskId="1"
-                       LongName="cl_perf.h" Name="CL_PERF.H" 
-                       Source="..\bin\Inc\complib\cl_perf.h" />
-                 <File Id="cl_pool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_pool.h" Name="CL_POOL.H" 
-                       Source="..\bin\Inc\complib\cl_pool.h" />
-                 <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ptr_vector.h" Name="CL_PTR_.H" 
-                       Source="..\bin\Inc\complib\cl_ptr_vector.h" />
-                 <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qcomppool.h" Name="CL_QCOM.H" 
-                       Source="..\bin\Inc\complib\cl_qcomppool.h" />
-                 <File Id="cl_qlist.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qlist.h" Name="CL_QLIS.H" 
-                       Source="..\bin\Inc\complib\cl_qlist.h" />
-                 <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qlockpool.h" Name="CL_QLOC.H" 
-                       Source="..\bin\Inc\complib\cl_qlockpool.h" />
-                 <File Id="cl_qmap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qmap.h" Name="CL_QMAP.H" 
-                       Source="..\bin\Inc\complib\cl_qmap.h" />
-                 <File Id="cl_qpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qpool.h" Name="CL_QPOO.H" 
-                       Source="..\bin\Inc\complib\cl_qpool.h" />
-                 <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_rbmap.h" Name="CL_RBMA.H" 
-                       Source="..\bin\Inc\complib\cl_rbmap.h" />
-                 <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"
-                       LongName="cl_reqmgr.h" Name="CL_REQM.H" 
-                       Source="..\bin\Inc\complib\cl_reqmgr.h" />
-                 <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_spinlock.h" Name="CL_SPIN.H" 
-                       Source="..\bin\Inc\complib\cl_spinlock.h" />
-                 <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" 
-                       Source="..\bin\Inc\complib\cl_spinlock_osd.h" />
-                 <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"
-                       LongName="cl_syscallback.h" Name="CL_SYSC.H" 
-                       Source="..\bin\Inc\complib\cl_syscallback.h" />
-                 <File Id="cl_syscallback_osd.h" Compressed="yes"
-                       DiskId="1"
-                       LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" 
-                      Source="..\bin\Inc\complib\cl_syscallback_osd.h" />
-                 <File Id="cl_thread.h" Compressed="yes" DiskId="1"
-                       LongName="cl_thread.h" Name="CL_THRE.H" 
-                       Source="..\bin\Inc\complib\cl_thread.h" />
-                 <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_thread_osd.h" Name="CL_THRE1.H" 
-                       Source="..\bin\Inc\complib\cl_thread_osd.h" />
-                 <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_threadpool.h" Name="CL_THRE2.H" 
-                       Source="..\bin\Inc\complib\cl_threadpool.h" />
-                 <File Id="cl_timer.h" Compressed="yes" DiskId="1"
-                       LongName="cl_timer.h" Name="CL_TIME.H" 
-                       Source="..\bin\Inc\complib\cl_timer.h" />
-                 <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_timer_osd.h" Name="CL_TIME1.H" 
-                       Source="..\bin\Inc\complib\cl_timer_osd.h" />
-                 <File Id="cl_types.h" Compressed="yes" DiskId="1"
-                       LongName="cl_types.h" Name="CL_TYPE.H" 
-                       Source="..\bin\Inc\complib\cl_types.h" />
-                 <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_types_osd.h" Name="CL_TYPE1.H" 
-                       Source="..\bin\Inc\complib\cl_types_osd.h" />
-                 <File Id="cl_vector.h" Compressed="yes" DiskId="1"
-                       LongName="cl_vector.h" Name="CL_VECT.H" 
-                       Source="..\bin\Inc\complib\cl_vector.h" />
-                 <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"
-                       LongName="cl_waitobj.h" Name="CL_WAIT.H" 
-                       Source="..\bin\Inc\complib\cl_waitobj.h" />
-                 <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" 
-                       Source="..\bin\Inc\complib\cl_waitobj_osd.h" />
-                 <File Id="comp_lib.h" Compressed="yes" DiskId="1"
-                       LongName="comp_lib.h" Name="COMP_LI.H" 
-                       Source="..\bin\Inc\complib\comp_lib.h" />
-               </Component>
-             </Directory>
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
 
-             <Directory Id="IB_iba" Name="iba">
-               <Component Id="cIBAL_IBA"
-                          Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">
-                 <CreateFolder />
-                 <File Id="ib_al.h" Compressed="yes" DiskId="1"
-                       LongName="ib_al.h" Name="ib_al.h"
-                       Source="..\bin\Inc\iba\ib_al.h" />
-                 <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="ib_al_ioctl.h" Name="ib_ioctl.h"
-                       Source="..\bin\Inc\iba\ib_al_ioctl.h" />
-                 <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="ib_at_ioctl.h" Name="ib_iocat.h"
-                       Source="..\bin\Inc\iba\ib_at_ioctl.h" />
-                 <File Id="ib_ci.h" Compressed="yes" DiskId="1"
-                       LongName="ib_ci.h" Name="ib_ci.h"
-                       Source="..\bin\Inc\iba\ib_ci.h" />
-                 <File Id="ib_types.h" Compressed="yes" DiskId="1"
-                       LongName="ib_types.h" Name="ib_types.h"
-                       Source="..\bin\Inc\iba\ib_types.h" />
-                 <File Id="ib_uvp.h" Compressed="yes" DiskId="1"
-                       LongName="ib_uvp.h" Name="ib_uvp.h"
-                       Source="..\bin\Inc\iba\ib_uvp.h" />
-               </Component>
-             </Directory>
-           </Directory>
+      <!-- copy DAT header files to
+         %SystemDrive%\DAT\v1-1\DAT
+         %SystemDrive%\DAT\v2-0\DAT
+      -->
 
-          <Directory Id="IB_samples" Name="Samples">
-            <Directory Id="sample_DDK" Name="DDK">
-              <Component Id="cDDK_example"
-                         Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">
-                <CreateFolder />
-                    <File Id="cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\Misc\cmtest.c" />
-                    <File Id="makefile" Compressed="yes" DiskId="1"
-                          LongName="makefile" Name="makefile"
-                          Source="..\..\SDK_Samples\DDK\makefile" />
-                    <File Id="SOURCES" Compressed="yes" DiskId="1"
-                          LongName="SOURCES" Name="SOURCES"
-                          Source="..\..\SDK_Samples\DDK\SOURCES" />
-                    <File Id="README.txt" Compressed="yes" DiskId="1"
-                          LongName="README.txt" Name="README.txt"
-                          Source="..\..\SDK_Samples\DDK\README.txt" />
-              </Component>
-            </Directory>    <!-- End DDK -->
+        <Directory Id="dDATD" Name="DAT">
+          <?include ..\..\common\DAT_config.inc ?>
+        </Directory>
 
-              <Directory Id="sample_VS" Name="VS">
-                <Component Id="cVS_example"
-                           Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">
-                  <CreateFolder />
-                    <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\misc\cmtest.c" />
-                      <File Id="vscmtest.rc" Compressed="yes" DiskId="1"
-                            LongName="cmtest.rc" Name="cmtest.rc"
-                            Source="..\..\SDK_Samples\VS\cmtest.rc" />
-                      <File Id="vsREADME.txt" Compressed="yes" DiskId="1"
-                            LongName="README.txt" Name="README.txt"
-                            Source="..\..\SDK_Samples\VS\README.txt" />
-                    <File Id="Makefile.x86" Compressed="yes" DiskId="1"
-                          LongName="Makefile.x86" Name="Makefile.x86"
-                          Source="..\..\SDK_Samples\VS\Makefile.x86" />
-                </Component>
-              </Directory>    <!-- End VS -->
-          </Directory>    <!-- End Samples -->
-         </Directory>  <!-- End IBSDK -->
+        <Directory Id="IBSDK" Name="IBSDK">
+          <?include ..\..\common\ib_sdk.inc ?>
+        </Directory>
 
-      </Directory>  <!-- End WinRoot -->
+      </Directory>
     </Directory> <!-- End TARGETDIR -->
 
+<!--
+    <Property Id='ARPNOMODIFY'>1</Property>
+    <Property Id='ARPNOREPAIR'>1</Property>
+-->
     <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
     <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
     <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
@@ -1463,25 +157,24 @@
      -->
 
     <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"
-         Description="Mellanox Host Channel Adapter Drivers for ConnectX and InfiniHost"
+         Description="Mellanox InfiniBand Host Channel Adapter Drivers"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
-
       <ComponentRef Id="cMthcaDriver" />
       <ComponentRef Id="cConnectXDriver" />
     </Feature>
 
-    <Feature Id="IBcore" Title="InfiniBand Core" Level="1"
-        Description="InfiniBand: Core, Tools, Docs" Display="expand"
-        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
-        InstallDefault="local" Absent="disallow">
-        <ComponentRef Id="cIBcore" />
-        <ComponentRef Id="cWinVerbsDrivers" />
-        <ComponentRef Id="Docs" />
-        <ComponentRef Id="Tools" />
-        <ComponentRef Id="OpenSMservice" />
-        <ComponentRef Id="cQLVNIC_files" />
-        <ComponentRef Id="cSRP_files" />
+    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"
+        Description="InfiniBand: Core, Tools, Docs"
+        Display="expand" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">
+      <ComponentRef Id="cIBcore" />
+      <ComponentRef Id="cWinVerbsDrivers" />
+      <ComponentRef Id="Docs" />
+      <ComponentRef Id="Tools" />
+      <ComponentRef Id="OpenSMservice" />
+      <ComponentRef Id="cQLVNIC_files" />
+      <ComponentRef Id="cSRP_files" />
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
@@ -1521,10 +214,10 @@
         <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"
+    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"
         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <Condition Level="201"> IPOIB_EXISTS </Condition>
+      <Condition Level="201"> IPOIB_EXISTS </Condition>
 
       <Feature Id="fDatConf" Title="DAT-DAPL Config File"
          Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
@@ -1583,10 +276,10 @@
         Description="QLogic - Virtual NIC over InfiniBand"
         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <ComponentRef Id="cQLVNIC_driver_installed" />
+      <ComponentRef Id="cQLVNIC_driver_installed" />
     </Feature>
 
-    <Feature Id="fIBskd" Title="InfiniBand SDK" Level="2"
+    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"
          Description="InfiniBand Software Development Kit (Headers + Libs)"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
@@ -1606,74 +299,11 @@
       <ComponentRef Id="cCHK_user" />
     </Feature>
 
-    <!--> File where Custom Actions are defined -->
-    <Binary Id="CA" src="..\..\CustomActions.vbs" />
-
-    <CustomAction Id="WinOF_setup" BinaryKey="CA"
-         VBScriptCall="WinOF_setup" Return="check" />
-
-    <CustomAction Id="ChkPreviousInstall" BinaryKey="CA"
-         VBScriptCall="ChkInstallAndReboot" Return="check" />
-
-    <CustomAction Id="DriverInstall" BinaryKey="CA"
-         VBScriptCall="DriverInstall" Return="check" Execute="deferred" />
-
-    <CustomAction Id="DriverUninstall" BinaryKey="CA"
-         VBScriptCall="DriverUninstall" Return="check" />
-
-    <CustomAction Id="WSDStart" BinaryKey="CA"
-         VBScriptCall="WSDEnable" Return="check" />
-
-    <CustomAction Id="ND_start" BinaryKey="CA"
-         VBScriptCall="ND_StartMeUp" Return="check" />
-
-    <CustomAction Id="HammerTime" BinaryKey="CA"
-         VBScriptCall="HammerTime" Return="check" />
-
-    <CustomAction Id="BcastRegChanged" BinaryKey="CA"
-         VBScriptCall="BcastRegChanged" Return="check" />
-
-    <CustomAction Id="InstallChanged" BinaryKey="CA"
-         VBScriptCall="InstallChanged" Return="check" />
-
-    <InstallExecuteSequence>
-       <!-- Always executed (Install or uninstall) -->
-       <Custom Action="WinOF_setup" After="InstallInitialize" />
-
-       <!--> Install ONLY </!-->
-       <Custom Action="ChkPreviousInstall" After="WinOF_setup">
-           NOT Installed</Custom>
-
-       <ScheduleReboot After="ChkPreviousInstall">
-           REBOOT="FORCE"</ScheduleReboot>
-
-       <Custom Action="DriverInstall" After="InstallServices">
-			Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="WSDStart" After="InstallFinalize">
-           Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="ND_start" After="WSDStart">
-          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="BcastRegChanged" After="ND_start">
-           Not Installed</Custom>
-
-       <!--> CHANGE ONLY </!-->
-       <Custom Action="InstallChanged" After="InstallFinalize">
-           Installed </Custom>
-
-       <!--> REMOVE ONLY </!-->
-       <Custom Action="DriverUninstall" After="PublishProduct">
-           REMOVE="ALL" </Custom>
-       <Custom Action="HammerTime" After="InstallFinalize">REMOVE="ALL"</Custom>
-
-    </InstallExecuteSequence>
+    <?include ..\..\common\InstallExecuteSeq.inc ?>
 
     <UIRef Id="WixUI_FeatureTree" />
-        <UIRef Id="WixUI_ErrorProgressText" />
-        <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
     <UI />
-
   </Product>
 </Wix>
diff --git a/trunk/WinOF/WIX/wlh/ia64/wof.wxs b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
index 6da0ce7a..1bdf27b3 100644
--- a/trunk/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
@@ -2,23 +2,31 @@
 <!--
    WinOF (Windows OpenFabrics) for IA64/IPF Itanium on Windows Server 2008
 -->
+
+<?define ARCH=ia64 ?>
+<?define ARCHP=ia64 ?>
+<?define OS=wlh ?>
+<?include ..\..\common\WinOF_cfg.inc ?>
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Product Name="Windows Open Fabrics InfiniBand v2.1 (RC0) ia64"
-    Version="2.1.0"
+  <Product
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"
+    Version="$(var.WOFRELNUM)"
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
-    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' 
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
     Language="1033" Codepage="1252"
     Manufacturer="Open Fabrics Alliance Windows">
 
     <Package Id="????????-????-????-????-????????????"
-     Keywords="Installer, InfiniBand" Description="WinOF Installer"
+     Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
      InstallPrivileges='elevated'
-     Comments="Windows Open Fabrics Alliance InfiniBand stack"
-     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="200"
+     Description="WinOF Installer"
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
      Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Condition Message="Administrator required to install [ProductName].">
-     Privileged
+     AdminUser
     </Condition>
 
     <Condition Message="This package can be installed on IA64 systems only">
@@ -33,59 +41,7 @@
          <![CDATA[(VersionNT=600)]]>
     </Condition>
 
-    <!--
-        System/Machine-wide install, otherwise per-user (Administrator) only.
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.
-     -->
-    <Property Id="ALLUSERS"> Value="1" </Property>
-
-    <!-- Requires files sc.exe & reg.exe -->
-    <Property Id="REG_EXISTS">
-      <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="RegFile" Name="reg.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="SC_EXISTS">
-      <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="ScFile" Name="sc.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="IPOIB_EXISTS">
-      <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">
-        <FileSearch Id="ipoibFile" Name="netipoib.inf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT_CONF_EXISTS">
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">
-        <FileSearch Id="DCFile" Name="dat.conf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT1_INSTALLED">
-      <DirectorySearch Id="Dat1File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="daplFile" Name="dapl.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT2_INSTALLED">
-      <DirectorySearch Id="Dat2File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="dapl2File" Name="dapl2.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Condition Message="[ProductName] requires system file reg.exe">
-       REG_EXISTS
-    </Condition>
-
-    <Condition Message="[ProductName] requires system file sc.exe">
-       SC_EXISTS
-    </Condition>
-
-    <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
-    <Property Id="DiskPrompt" Value="WinOF 1.1 Installation [1]" />
+    <?include ..\..\common\requirements.inc ?>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
@@ -95,833 +51,36 @@
       <Directory Id="DesktopFolder" Name="Desktop" />
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="INSTALLDIR" Name="WinOF">
-          <Component Id="Docs" Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
-
-            <File Id="OFAlogo" Compressed="yes" DiskId="1"
-                    LongName="openfabrics.gif" Name="ofa.gif"
-                    Source="..\..\openfabrics.gif" />
-
-            <!-- implies WIX build only from an svn structured tree.  -->
-            <File Id="manual.htm" Compressed="yes" DiskId="1" Name="Manual.htm"
-                    LongName="Manual.htm"
-                    Source="..\bin\Misc\Manual.htm" Vital="yes" />
-
-            <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
-                    Name="Manual.htm" LongName="Manual"
-                    Target="[INSTALLDIR]\Manual.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="dRelnotes" Compressed="yes" DiskId="1"
-                    LongName="Release_notes.htm" Name="RELEASE_.HTM"
-                    Source="..\..\Release_notes.htm" />
-
-            <Shortcut Id="RelNotes" Directory="ProgramMenuDir" Name="RelNotes"
-                    LongName="Release Notes"
-                    Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="command_window" Name="COMMAND.LNK"
-                    LongName="Command Window.lnk" Compressed="yes" DiskId="1"
-                    Source="..\..\ia64\Command Window.lnk" Vital="yes" />
-
-            <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
-                    Name="COMMAND.LNK" LongName="Command Window.lnk"
-                    Target="[INSTALLDIR]\Command Window.lnk" Icon="openfabrics"
-                    IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />
-
-            <Shortcut Id="UninstallProduct" Name="UnMyApp"
-                LongName="Uninstall WinOF"
-				Target="[System64Folder]msiexec.exe"
-                Arguments="/X [ProductCode]"
-                Directory="ProgramMenuDir"
-                Description="Uninstalls OpenFabrics InfiniBand" />
-            <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
-          </Component>
-
-          <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
-           <Environment Id='UpdatePath' Name='PATH' Action='create'
-                        System='yes' Part='last' Value='[INSTALLDIR]' /> 
-
-            <File Id="qlgcvnic_config" Compressed="yes" DiskId="1" Vital="yes"
-                  Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"
-                  Source="..\bin\tools\ia64\release\qlgcvnic_config.exe" />
-            <File Id="part_man" Name="part_man.exe"
-                  Compressed="yes" DiskId="1" Vital="yes"
-                  Source="..\bin\tools\ia64\release\part_man.exe" />
-            <File Id="vstat" Name="vstat.exe"
-                  Compressed="yes" DiskId="1" Vital="yes"
-                  Source="..\bin\tools\ia64\release\vstat.exe" />
-            <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
-                  DiskId="1" Name="TTCP.EXE"
-                  Source="..\bin\tools\ia64\release\ttcp.exe" />
-            <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
-                  DiskId="1" Name="CMTEST.EXE"
-                  Source="..\bin\tools\ia64\release\cmtest.exe" />
-            <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_limits.exe" Name="IB_LIMI.EXE"
-                  Source="..\bin\tools\ia64\release\ib_limits.exe" />
-            <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_read_bw.exe" Name="IB_READ.EXE"
-                  Source="..\bin\tools\ia64\release\ib_read_bw.exe" />
-            <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
-                  Source="..\bin\tools\ia64\release\ib_read_lat.exe" />
-            <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
-                  Source="..\bin\tools\ia64\release\ib_send_bw.exe" />
-            <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
-                  Source="..\bin\tools\ia64\release\ib_send_lat.exe" />
-            <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
-                  Source="..\bin\tools\ia64\release\ib_write_bw.exe" />
-            <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
-                  Source="..\bin\tools\ia64\release\ib_write_lat.exe" />
-            <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
-                  LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
-                  Source="..\bin\tools\ia64\release\ibtrapgen.exe" />
-            <File Id="osmtest.exe" Compressed="yes" DiskId="1"
-                  LongName="osmtest.exe" Name="OSMTEST.EXE"
-                  Source="..\bin\tools\ia64\release\osmtest.exe" />
-            <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
-                  LongName="PrintIP.exe" Name="PRINTIP.EXE"
-                  Source="..\bin\tools\ia64\release\PrintIP.exe" />
-            <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"
-                     Vital="yes" Source="..\bin\tools\ia64\release\nsc.exe" />
-          </Component>
-
-          <Component Id='OpenSMservice'
-                     Guid='90042B4F-51B5-4720-8E54-6D366253634B'
-                     SharedDllRefCount='no' KeyPath='no'
-                     NeverOverwrite='no'
-                     Permanent='no' Transitive='no' Win64='no'
-                     Location='either'>
-
-              <File Id="opensm.exe" Compressed="yes" DiskId="1"
-                    LongName="opensm.exe" Name="OPENSM.EXE"
-                    Source="..\bin\tools\ia64\release\opensm.exe"
-                    Vital='yes' KeyPath='yes' Hidden='no' System='no' 
-                    Checksum='no' ReadOnly='no' />
-
-              <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
-                  Description='InfiniBand Subnet Configuration and Management'
-                  DisplayName='InfiniBand Subnet Manager'
-                  Arguments='-e --service'
-                  ErrorControl='normal'
-                  Start='disabled'
-                  Interactive='no'
-                  Type='ownProcess' />
-
-              <ServiceControl Id='osmSvcControl' Name='OpenSM'
-                              Stop='uninstall'
-                              Wait='no'
-                              Remove='uninstall' />
-          </Component>
-
-          <Directory Id="hcaDir" Name="IBcore">
-            <Component Id="cIBcore"
-                       Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
-              <CreateFolder />
-              <File Id="dpinst.exe" Compressed="yes" DiskId="1"
-                     LongName="dpinst.exe" Name="dpinst.exe"
-                     Source="..\..\ia64\dpinst.exe" />
-              <File Id="dpinst.xml" Compressed="yes" DiskId="1"
-                     LongName="dpinst.xml" Name="dpinst.xml"
-                     Source="..\..\dpinst.xml" />
-              <File Id="devman.exe" Compressed="yes" DiskId="1"
-                     LongName="devman.exe" Name="devman.exe"
-                     Source="..\..\ia64\devman.exe" />
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\hca\ia64\WdfCoInstaller01007.dll" />
-              <File Id="cl32.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32.dll" Name="CL32.DLL"
-                     Source="..\bin\HCA\ia64\cl32.dll" />
-              <File Id="cl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32d.dll" Name="CL32D.DLL"
-                     Source="..\bin\HCA\ia64\cl32d.dll" />
-              <File Id="complib.dll" Compressed="yes" DiskId="1"
-                     LongName="complib.dll" Name="COMPLIB.DLL"
-                     Source="..\bin\HCA\ia64\complib.dll" />
-              <File Id="complibd.dll" Compressed="yes" DiskId="1"
-                     LongName="complibd.dll" Name="COMPLIB1.DLL"
-                     Source="..\bin\HCA\ia64\complibd.dll" />
-              <File Id="ibal32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32.dll" Name="IBAL32.DLL"
-                     Source="..\bin\HCA\ia64\ibal32.dll" />
-              <File Id="ibal32d.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32d.dll" Name="IBAL32D.DLL"
-                     Source="..\bin\HCA\ia64\ibal32d.dll" />
-              <File Id="ibal.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal.dll" Name="IBAL.DLL"
-                     Source="..\bin\HCA\ia64\ibal.dll" />
-              <File Id="ibald.dll" Compressed="yes" DiskId="1"
-                     LongName="ibald.dll" Name="IBALD.DLL"
-                     Source="..\bin\HCA\ia64\ibald.dll" />
-              <File Id="ibbus.sys" Compressed="yes" DiskId="1"
-                     LongName="ibbus.sys" Name="IBBUS.SYS"
-                     Source="..\bin\HCA\ia64\ibbus.sys" />
-              <File Id="ibbus.pdb" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                     Source="..\bin\HCA\ia64\ibbus.pdb" />
 
-              <File Id="ibiou.sys" Compressed="yes" DiskId="1"
-                     LongName="ibiou.sys" Name="IBIOU.SYS"
-                     Source="..\bin\HCA\ia64\ibiou.sys" />
-              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"
-                     Name="ibiou.pdb" Source="..\bin\HCA\ia64\ibiou.pdb" />
-              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.cat" Name="IB_IOU.cat"
-                     Source="..\bin\HCA\ia64\ib_iou.cat" />
-              <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.inf" Name="IB_IOU.inf"
-                     Source="..\bin\HCA\ia64\ib_iou.inf" />
-            </Component>
-
-            <Component Id="cMthcaDriver"
-                       Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">
-              <File Id="mthca32.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32.dll" Name="MTHCA32.DLL"
-                     Source="..\bin\HCA\ia64\mthca32.dll" />
-              <File Id="mthca32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32d.dll" Name="MTHCA321.DLL"
-                     Source="..\bin\HCA\ia64\mthca32d.dll" />
-              <File Id="mthca.inf" Compressed="yes" DiskId="1"
-                     LongName="mthca.inf" Name="MTHCA.INF"
-                     Source="..\bin\HCA\ia64\mthca.inf" />
-              <File Id="mthca.cat" Compressed="yes" DiskId="1"
-                     LongName="mthca.cat" Name="MTHCA.cat"
-                     Source="..\bin\HCA\ia64\mthca.cat" />
-              <File Id="mthca.sys" Compressed="yes" DiskId="1"
-                     LongName="mthca.sys" Name="MTHCA.SYS"
-                     Source="..\bin\HCA\ia64\mthca.sys" />
-              <File Id="mthca.pdb" Name="mthca.pdb" DiskId="1"
-                     Compressed="yes" Source="..\bin\HCA\ia64\mthca.pdb" />
-              <File Id="mthcau.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcau.dll" Name="MTHCAU.DLL"
-                     Source="..\bin\HCA\ia64\mthcau.dll" />
-              <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcaud.dll" Name="MTHCAUD.DLL"
-                     Source="..\bin\HCA\ia64\mthcaud.dll" />
-            </Component>
-
-            <Component Id="cConnectXDriver"
-                       Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
-              <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.inf" Name="mlx4_bus.INF"
-                     Source="..\bin\hca\ia64\mlx4_bus.inf" />
-              <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.cat" Name="mlx4_bus.cat"
-                     Source="..\bin\hca\ia64\mlx4_bus.cat" />
-              <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
-                     Source="..\bin\hca\ia64\mlx4_bus.sys" />
-              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
-                     Name="mlx4_bus.pdb"
-                     Source="..\bin\hca\ia64\mlx4_bus.pdb" />
-              <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
-                     Source="..\bin\hca\ia64\mlx4_hca.inf" />
-              <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.cat" Name="mlx4_hca.cat"
-                     Source="..\bin\hca\ia64\mlx4_hca.cat" />
-              <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.sys" Name="mlx4_hca.sys"
-                     Source="..\bin\hca\ia64\mlx4_hca.sys" />
-              <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.pdb" Name="mlx4_hca.pdb"
-                     Source="..\bin\hca\ia64\mlx4_hca.pdb" />
-              <File Id="mlx4u.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u.dll" Name="mlx4u.dll"
-                     Source="..\bin\hca\ia64\mlx4u.dll" />
-              <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4ud.dll" Name="mlx4ud.dll"
-                     Source="..\bin\hca\ia64\mlx4ud.dll" />
-
-			  <!-- copy 32-bit binaries --> 
-              <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32d.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\ia64\mlx4u32d.dll" />
-              <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\ia64\mlx4u32.dll" />
-            </Component>
-
-            <Component Id="cWinVerbsDrivers"
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-
-              <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                    LongName="winverbs.sys" Name="winverbs.sys"
-                    Source="..\bin\HCA\ia64\winverbs.sys" />
-              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
-                    LongName="winverbs.pdb" Name="winverbs.pdb"
-                    Source="..\bin\HCA\ia64\winverbs.pdb" />
-              <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                    LongName="winverbs.dll" Name="winvrbs.dll"
-                    Source="..\bin\HCA\ia64\winverbs.dll" />
-              <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.dll" Name="winvrbsd.dll"
-                    Source="..\bin\HCA\ia64\winverbsd.dll" />
-              <File Id="winmad.sys" Compressed="yes" DiskId="1"
-                    LongName="winmad.sys" Name="winmad.sys"
-                    Source="..\bin\HCA\ia64\winmad.sys" />
-              <File Id="winmad.pdb" Compressed="yes" DiskId="1"
-                    LongName="winmad.pdb" Name="winmad.pdb"
-                    Source="..\bin\HCA\ia64\winmad.pdb" />
-              <File Id="winmad.dll" Compressed="yes" DiskId="1"
-                    LongName="winmad.dll" Name="winmad.dll"
-                    Source="..\bin\HCA\ia64\winmad.dll" />
-              <File Id="winmadd.dll" Compressed="yes" DiskId="1"
-                    LongName="winmadd.dll" Name="winmaddd.dll"
-                    Source="..\bin\HCA\ia64\winmadd.dll" />
-            </Component>
-          </Directory>
-
-          <Directory Id="dir_0" Name="Checked">
-            <Directory Id="dir_1" Name="kernel">
-              <Component Id="cCHK_kernel"
-                         Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
-                <CreateFolder />
-
-                <File Id="chk0" DiskId="1" Compressed="yes"
-                      Name="README.txt"
-                      Source="..\..\README_checked.txt" />
-                <File Id="chk1" DiskId="1" Compressed="yes"
-                      Name="mthca.sys"
-                      Source="..\bin\Chk\HCA\ia64\mthca.sys" />
-                <File Id="cat1" DiskId="1" Compressed="yes"
-                      Name="mthca.cat"
-                      Source="..\bin\Chk\HCA\ia64\mthca.cat" />
-                <File Id="sym1" DiskId="1" Compressed="yes"
-                      Name="mthca.pdb"
-                      Source="..\bin\Chk\HCA\ia64\mthca.pdb" />
-
-                <File Id="chk2" DiskId="1" Compressed="yes"
-                      Name="ibbus.sys"
-                      Source="..\bin\Chk\HCA\ia64\ibbus.sys" />
-                <File Id="sym2" DiskId="1" Compressed="yes"
-                      Name="ibbus.pdb"
-                      Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />
-
-                <File Id="chk3" DiskId="1" Compressed="yes"
-                      Name="ibiou.sys"
-                      Source="..\bin\Chk\HCA\ia64\ibiou.sys" />
-                <File Id="cat3" DiskId="1" Compressed="yes"
-                      Name="ib_iou.cat"
-                      Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />
-                <File Id="sym3" DiskId="1" Compressed="yes"
-                      Name="ibiou.pdb"
-                      Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />
-
-                <File Id="chk4" DiskId="1" Compressed="yes"
-                      Name="ipoib.sys"
-                      Source="..\bin\Chk\net\ia64\ipoib.sys" />
-                <File Id="cat4" DiskId="1" Compressed="yes"
-                      Name="ipoib.cat"
-                      Source="..\bin\Chk\net\ia64\ipoib.cat" />
-                <File Id="sym4" DiskId="1" Compressed="yes"
-                      Name="ipoib.pdb"
-                      Source="..\bin\Chk\net\ia64\ipoib.pdb" />
-
-                <File Id="chk5" DiskId="1" Compressed="yes"
-                      Name="qlgcvnic.sys"
-                      Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />
-                <File Id="cat5" DiskId="1" Compressed="yes"
-                      Name="netvnic.cat"
-                      Source="..\bin\Chk\net\ia64\netvnic.cat" />
-                <File Id="sym5" DiskId="1" Compressed="yes"
-                      Name="qlgcvnic.pdb"
-                      Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />
-
-                <File Id="chk6" DiskId="1" Compressed="yes"
-                      Name="ibsrp.sys"
-                      Source="..\bin\Chk\storage\ia64\ibsrp.sys" />
-                <File Id="cat6" DiskId="1" Compressed="yes"
-                      Name="ibsrp.cat"
-                      Source="..\bin\Chk\storage\ia64\ibsrp.cat" />
-                <File Id="sym6" DiskId="1" Compressed="yes"
-                      Name="ibsrp.pdb"
-                      Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />
+          <?include ..\..\common\Docs.inc ?>
+          <?include ..\..\common\Tools.inc ?>
+          <?include ..\..\common\OpenSM_service.inc ?>
 
-                <File Id="chk9" DiskId="1" Compressed="yes"
-                      Name="winverbs.sys"
-                      Source="..\bin\Chk\HCA\ia64\winverbs.sys" />
-                <File Id="sym9" DiskId="1" Compressed="yes"
-                      Name="winverbs.pdb"
-                      Source="..\bin\Chk\HCA\ia64\winverbs.pdb" />
-                <File Id="dll9" DiskId="1" Compressed="yes"
-                      Name="winverbs.dll"
-                      Source="..\bin\Chk\HCA\ia64\winverbs.dll" />
-                <File Id="dlld9" DiskId="1" Compressed="yes"
-                      Name="winverbd.dll"
-                      LongName="winverbsd.dll"
-                      Source="..\bin\Chk\HCA\ia64\winverbsd.dll" />
-              </Component>
-            </Directory>
-      
-            <Directory Id="dir_14" Name="user">
-              <Component Id="cCHK_user" 
-                         Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
-                <CreateFolder />
-                <File Id="file83" Name="DAPL2-_1.DLL"
-                  LongName="dapl2-scmd.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\dapl2-scmd.dll" />
-                <File Id="file84" Name="dapl2d.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\dapl2d.dll" />
-                <File Id="file85" Name="DAPL2T_1.EXE"
-                  LongName="dapl2testd.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\dapl2testd.exe" />
-                <File Id="file86" Name="dapld.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\dapld.dll" />
-                <File Id="file87" Name="DAPLTE_1.EXE"
-                  LongName="dapltestd.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\dapltestd.exe" />
-                <File Id="file88" Name="dat2d.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\dat2d.dll" />
-                <File Id="file89" Name="datd.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\datd.dll" />
-                <File Id="file90" Name="dtest2d.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\dtest2d.exe" />
-                <File Id="file91" Name="dtestxd.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\dtestxd.exe" />
-                <File Id="file94" Name="ibald.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\ibald.dll" />
-                <File Id="file97" Name="ibwsd.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\ibwsd.dll" />
-                <File Id="file105" Name="INSTAL_1.EXE"
-                  LongName="installsp.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\installsp.exe" />
-                <File Id="file108" Name="mthcaud.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\mthcaud.dll" />
-                <File Id="file110" Name="opensm.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\opensm.exe" />
-                <File Id="file115" Name="vstat.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\vstat.exe" />
-                <File Id="file116" Name="part_man.exe"
-                  DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\part_man.exe" />
-              </Component>
-            </Directory>
+          <Directory Id="IBcoreDir" Name="IBcore">
+            <?include ..\..\common\IBcore.inc ?>
+            <?include ..\..\common\mlnx_drivers.inc ?>
+            <?include ..\..\common\winverbs_drivers.inc ?>
           </Directory>
 
-          <Component Id="cWinVerbsOFED"
-                     Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.dll" Name="ibverbs.dll"
-                  Source="..\bin\HCA\ia64\libibverbs.dll" />
-              <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"
-                     DestinationName="ibverbs.dll"
-                     DestinationLongName="libibverbs.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                  Source="..\bin\HCA\ia64\libibverbs.pdb" />
-
-            <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                  Source="..\bin\HCA\ia64\libibverbsd.dll" />
-              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"
-                     DestinationName="ibverbsd.dll"
-                     DestinationLongName="libibverbsd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                  Source="..\bin\HCA\ia64\libibverbsd.pdb" />
-
-            <File Id="libibmad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmad.dll" Name="ibmad.dll"
-                  Source="..\bin\HCA\ia64\libibmad.dll" />
-              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"
-                     DestinationName="ibmad.dll"
-                     DestinationLongName="libibmad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmad.pdb" Name="ibmad.pdb"
-                  Source="..\bin\HCA\ia64\libibmad.pdb" />
-
-            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.dll" Name="ibmadd.dll"
-                  Source="..\bin\HCA\ia64\libibmadd.dll" />
-              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"
-                     DestinationName="ibmadd.dll"
-                     DestinationLongName="libibmadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                  Source="..\bin\HCA\ia64\libibmadd.pdb" />
-
-            <File Id="libibumad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumad.dll" Name="ibumad.dll"
-                  Source="..\bin\HCA\ia64\libibumad.dll" />
-              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"
-                     DestinationName="ibumad.dll"
-                     DestinationLongName="libibumad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumad.pdb" Name="ibumad.pdb"
-                  Source="..\bin\HCA\ia64\libibumad.pdb" />
-
-            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.dll" Name="ibumadd.dll"
-                  Source="..\bin\HCA\ia64\libibumadd.dll" />
-              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"
-                     DestinationName="ibumadd.dll"
-                     DestinationLongName="libibumadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                  Source="..\bin\HCA\ia64\libibumadd.pdb" />
-
-            <File Id="librdmacm.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.dll" Name="rdmacm.dll"
-                  Source="..\bin\HCA\ia64\librdmacm.dll" />
-              <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"
-                     DestinationName="rdmacm.dll"
-                     DestinationLongName="librdmacm.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.pdb" Name="rdmacm.pdb"
-                  Source="..\bin\HCA\ia64\librdmacm.pdb" />
-
-            <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.dll" Name="rdmacmd.dll"
-                  Source="..\bin\HCA\ia64\librdmacmd.dll" />
-              <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"
-                     DestinationName="rdmacmd.dll"
-                     DestinationLongName="librdmacmd.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.pdb" Name="rdmacmd.pdb"
-                  Source="..\bin\HCA\ia64\librdmacmd.pdb" />
-
-          </Component>
-
-          <Component Id="cWinVerbsUApps"
-                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
-
-            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.exe" />
-            <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.pdb" />
-            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.exe" Name="devinfo.exe"
-                  Source="..\bin\tools\ia64\release\ibv_devinfo.exe" />
-            <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_devinfo.pdb" />
-            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"
-                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.exe" />
-            <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.pdb" />
-            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.exe" Name="readbw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_read_bw.exe" />
-            <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_read_bw.pdb" />
-            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.exe" Name="readlat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_read_lat.exe" />
-            <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_read_lat.pdb" />
-            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.exe" Name="send_bw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_send_bw.exe" />
-            <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_send_bw.pdb" />
-            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.exe" Name="send_lat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_send_lat.exe" />
-            <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_send_lat.pdb" />
-            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"
-                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.exe" />
-            <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.pdb" />
-            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"
-                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.exe" />
-            <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.pdb" />
-            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.exe" Name="write_bw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_write_bw.exe" />
-            <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_write_bw.pdb" />
-            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.exe" Name="writelat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_write_lat.exe" />
-            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_write_lat.pdb" />
-            <File Id="sminfo.exe" Compressed="yes" DiskId="1"
-                  LongName="sminfo.exe" Name="sminfo.exe"
-                  Source="..\bin\tools\ia64\release\sminfo.exe" />
-            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="sminfo.pdb" Name="sminfo.pdb"
-                  Source="..\bin\tools\ia64\release\sminfo.pdb" />
-            <File Id="ibstat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibstat.exe" Name="ibstat.exe"
-                  Source="..\bin\tools\ia64\release\ibstat.exe" />
-            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibstat.pdb" Name="ibstat.pdb"
-                  Source="..\bin\tools\ia64\release\ibstat.pdb" />
-            <File Id="perfquery.exe" Compressed="yes" DiskId="1"
-                  LongName="perfquery.exe" Name="perfquer.exe"
-                  Source="..\bin\tools\ia64\release\perfquery.exe" />
-            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"
-                  LongName="perfquery.pdb" Name="perfquer.pdb"
-                  Source="..\bin\tools\ia64\release\perfquery.pdb" />
-            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.exe" Name="ibaddr.exe"
-                  Source="..\bin\tools\ia64\release\ibaddr.exe" />
-            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.pdb" Name="ibaddr.pdb"
-                  Source="..\bin\tools\ia64\release\ibaddr.pdb" />
-            <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.exe" Name="ibnetdis.exe"
-                  Source="..\bin\tools\ia64\release\ibnetdiscover.exe" />
-            <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"
-                  Source="..\bin\tools\ia64\release\ibnetdiscover.pdb" />
-            <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.exe" Name="rcmatose.exe"
-                  Source="..\bin\tools\ia64\release\rdma_cmatose.exe" />
-            <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"
-                  Source="..\bin\tools\ia64\release\rdma_cmatose.pdb" />
-            <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_lat.exe" />
-            <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_lat.pdb" />
-            <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_bw.exe" />
-            <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_bw.pdb" />
-            <File Id="ibroute.exe" Compressed="yes" DiskId="1"
-                  LongName="ibroute.exe" Name="ibroute.exe"
-                  Source="..\bin\tools\ia64\release\ibroute.exe" />
-            <File Id="ibroute.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibroute.pdb" Name="ibroute.pdb"
-                  Source="..\bin\tools\ia64\release\ibroute.pdb" />
-            <File Id="ibtracert.exe" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.exe" Name="ibtrt.exe"
-                  Source="..\bin\tools\ia64\release\ibtracert.exe" />
-            <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.pdb" Name="ibtrt.pdb"
-                  Source="..\bin\tools\ia64\release\ibtracert.pdb" />
-          </Component>
+          <?include ..\..\common\checked.inc ?>
+          <?include ..\..\common\winverbs_OFED.inc ?>
 
           <Directory Id="ipoibDir" Name="net">
-            <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
-              <CreateFolder />
-              <File Id="netipoib_inf" Compressed="yes" DiskId="1"
-                     LongName="netipoib.inf" Name="NETIPOI.INF"
-                     Source="..\bin\net\ia64\netipoib.inf" />
-              <File Id="ipoib_cat" Compressed="yes" DiskId="1"
-                     LongName="ipoib.cat" Name="IPOI.cat"
-                     Source="..\bin\net\ia64\ipoib.cat" />
-              <File Id="ipoib.sys" Compressed="yes" DiskId="1"
-                     LongName="ipoib.sys" Name="IPOIB.SYS"
-                     Source="..\bin\net\ia64\ipoib.sys" />
-              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"
-                     Name="ipoib.pdb"
-                     Source="..\bin\net\ia64\ipoib.pdb" />
-              <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd32.dll" Name="IBWSD32.DLL"
-                     Source="..\bin\net\ia64\ibwsd32.dll" />
-              <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd.dll" Name="IBWSD.DLL"
-                     Source="..\bin\net\ia64\ibwsd.dll" />
-              <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov.dll" Name="IBNDPROV.DLL"
-                     Source="..\bin\net\ia64\ibndprov.dll" />
-              <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"
-                     Source="..\bin\net\ia64\ibndprov32.dll" />
-              <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
-                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"
-                     Source="..\bin\net\ia64\ndinstall.exe" />
-            </Component>
+            <?include ..\..\common\ipoib.inc ?>
           </Directory>
 
           <Component Id="WinsockDirect"
                      Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
             <File Id="installsp.exe" Compressed="yes" DiskId="1"
                      LongName="installsp.exe" Name="INSTALL.EXE"
-                     Source="..\bin\net\ia64\installsp.exe" />
+                     Source="..\bin\net\$(var.ARCH)\installsp.exe" />
           </Component>
 <!-- when ND works for ia64
           <Component Id="cNetworkDirect"
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
           </Component>
 -->
-
-          <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-              <File Id="dapl32.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl32.dll" Name="DAPL32.DLL"
-                     Source="..\bin\DAPL\ia64\dapl32.dll" />
-              <File Id="dapl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl32d.dll" Name="DAPL32D.DLL"
-                     Source="..\bin\DAPL\ia64\dapl32d.dll" />
-              <File Id="dapl.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl.dll" Name="DAPL.DLL"
-                     Source="..\bin\DAPL\ia64\dapl.dll" />
-                <CopyFile Id="dupDAPL" FileId="dapl.dll"
-                        DestinationName="dapl.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="dapld.dll" Compressed="yes" DiskId="1"
-                     LongName="dapld.dll" Name="DAPLD.DLL"
-                     Source="..\bin\DAPL\ia64\dapld.dll" />
-              <File Id="dat32.dll" Compressed="yes" DiskId="1"
-                     LongName="dat32.dll" Name="DAT32.DLL"
-                     Source="..\bin\DAPL\ia64\dat32.dll" />
-              <File Id="dat32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat32d.dll" Name="DAT32D.DLL"
-                     Source="..\bin\DAPL\ia64\dat32d.dll" />
-              <File Id="dat.dll" Compressed="yes" DiskId="1"
-                     LongName="dat.dll" Name="DAT.DLL"
-                     Source="..\bin\DAPL\ia64\dat.dll" />
-              <CopyFile Id="dupDAT" FileId="dat.dll"
-                        DestinationName="dat.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="datd.dll" Compressed="yes" DiskId="1"
-                     LongName="datd.dll" Name="DATD.DLL"
-                     Source="..\bin\DAPL\ia64\datd.dll" />
-
-              <File Id="dat.conf" Compressed="yes" DiskId="1"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
-              <File Id="dapltest.exe" Compressed="yes" DiskId="1"
-                     LongName="dapltest.exe" Name="dapltest.exe"
-                     Source="..\bin\tools\ia64\release\dapltest.exe" />
-              <File Id="dapltestd.exe" Compressed="yes" DiskId="1"
-                     LongName="dapltestd.exe" Name="dapltesd.exe"
-                     Source="..\bin\tools\ia64\debug\dapltestd.exe" />
-
-              <File Id="dapl.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl.pdb" Name="dapl.pdb"
-                    Source="..\bin\DAPL\ia64\dapl.pdb" />
-              <File Id="dapld.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapld.pdb" Name="dapld.pdb"
-                    Source="..\bin\DAPL\ia64\dapld.pdb" />
-              <File Id="dat.lib" Compressed="yes" DiskId="1"
-                    LongName="dat.lib" Name="dat.lib"
-                    Source="..\bin\DAPL\ia64\dat.lib" />
-              <File Id="datd.lib" Compressed="yes" DiskId="1"
-                    LongName="datd.lib" Name="datd.lib"
-                    Source="..\bin\DAPL\ia64\datd.lib" />
-              <File Id="dat.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat.pdb" Name="dat.pdb"
-                    Source="..\bin\DAPL\ia64\dat.pdb" />
-              <File Id="datd.pdb" Compressed="yes" DiskId="1"
-                    LongName="datd.pdb" Name="datd.pdb"
-                    Source="..\bin\DAPL\ia64\datd.pdb" />
-              <File Id="dt_svr.bat" Compressed="yes" DiskId="1"
-                    LongName="dt-svr.bat" Name="dt-svr.bat"
-                    Source="..\bin\DAPL2\dt-svr.bat" />
-              <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"
-                        DestinationName="dt1-svr.bat"
-                        DestinationProperty="INSTALLDIR" />
-              <File Id="dt_cli.bat" Compressed="yes" DiskId="1"
-                    LongName="dt-cli.bat" Name="dt-cli.bat"
-                    Source="..\bin\DAPL2\dt-cli.bat" />
-              <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"
-                        DestinationName="dt1-cli.bat"
-                        DestinationProperty="INSTALLDIR" />
-          </Component>
-
-          <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
-              <File Id="_dapl32.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232.dll" Name="DAPL232.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl232.dll" />
-              <File Id="_dapl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232d.dll" Name="DAPL232D.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl232d.dll" />
-              <File Id="_dapl2.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2.dll" Name="DAPL2.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl2.dll" />
-                <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"
-                        DestinationName="dapl2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2d.dll" Name="DAPL2D.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl2d.dll" />
-              <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scm.dll" Name="D2-scm.DLL"
-                          Source="..\bin\DAPL2\ia64\dapl2-scm.dll" />
-              <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"
-                              DestinationName="d2-scm.dll"
-                              DestinationLongName="dapl2-scm.dll"
-                              DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"
-                          Source="..\bin\DAPL2\ia64\dapl2-scmd.dll" />
-              <File Id="_dat32.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232.dll" Name="DAT232.DLL"
-                     Source="..\bin\DAPL2\ia64\dat232.dll" />
-              <File Id="_dat32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232d.dll" Name="DAT232D.DLL"
-                     Source="..\bin\DAPL2\ia64\dat232d.dll" />
-              <File Id="_dat2.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2.dll" Name="DAT2.DLL"
-                     Source="..\bin\DAPL2\ia64\dat2.dll" />
-              <CopyFile Id="dupDAT2" FileId="_dat2.dll"
-                        DestinationName="dat2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dat2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2d.dll" Name="DAT2D.DLL"
-                     Source="..\bin\DAPL2\ia64\dat2d.dll" />
-              <File Id="dapl2test.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2test.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\ia64\release\dapl2test.exe" />
-              <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2testd.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\ia64\debug\dapl2testd.exe" />
-              <File Id="dtest2.exe" Compressed="yes" DiskId="1"
-                     LongName="dtest2.exe" Name="dtest2.exe"
-                     Source="..\bin\tools\ia64\release\dtest2.exe" />
-              <File Id="dtestx.exe" Compressed="yes" DiskId="1"
-                     LongName="dtestx.exe" Name="dtestx.exe"
-                     Source="..\bin\tools\ia64\release\dtestx.exe" />
-
-              <File Id="dapl2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2.pdb" Name="dapl2.pdb"
-                    Source="..\bin\DAPL2\ia64\dapl2.pdb" />
-              <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2d.pdb" Name="dapl2d.pdb"
-                    Source="..\bin\DAPL2\ia64\dapl2d.pdb" />
-              <File Id="dat2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2.pdb" Name="dat2.pdb"
-                    Source="..\bin\DAPL2\ia64\dat2.pdb" />
-              <File Id="dat2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2d.pdb" Name="dat2d.pdb"
-                    Source="..\bin\DAPL2\ia64\dat2d.pdb" />
-              <File Id="dat2.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2.lib" Name="dat2.lib"
-                    Source="..\bin\DAPL2\ia64\dat2.lib" />
-              <File Id="dat2d.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2d.lib" Name="dat2d.lib"
-                    Source="..\bin\DAPL2\ia64\dat2d.lib" />
-          </Component>
+          <?include ..\..\common\dapl_rt.inc ?>
 
           <Component Id="cQLVNIC_driver_installed"
                      Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
@@ -932,17 +91,17 @@
                        Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
               <CreateFolder />
               <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                     LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                     Source="..\bin\net\ia64\qlgcvnic.sys" />
+                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
               <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                     Name="qlgcvnic.pdb"
-                     Source="..\bin\net\ia64\qlgcvnic.pdb" />
+                    Name="qlgcvnic.pdb"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
               <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                     LongName="netvnic.inf" Name="NETVNIC.INF"
-                     Source="..\bin\net\ia64\netvnic.inf" />
+                    LongName="netvnic.inf" Name="NETVNIC.INF"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
               <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                     LongName="netvnic.cat" Name="NETVNIC.cat"
-                     Source="..\bin\net\ia64\netvnic.cat" />
+                    LongName="netvnic.cat" Name="NETVNIC.cat"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
             </Component>
           </Directory>
 
@@ -955,522 +114,39 @@
             <Component Id="cSRP_files"
                        Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
               <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_srp.inf" Name="IB_SRP.INF"
-                     Source="..\bin\storage\ia64\ib_srp.inf" />
+                    LongName="ib_srp.inf" Name="IB_SRP.INF"
+                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
               <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.cat" Name="IBSRP.CAT"
-                     Source="..\bin\storage\ia64\ibsrp.cat" />
+                    LongName="ibsrp.cat" Name="IBSRP.CAT"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
               <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.sys" Name="IBSRP.SYS"
-                     Source="..\bin\storage\ia64\ibsrp.sys" />
+                    LongName="ibsrp.sys" Name="IBSRP.SYS"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
               <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                     Name="ibsrp.pdb"
-                     Source="..\bin\storage\ia64\ibsrp.pdb" />
-             </Component>
+                    Name="ibsrp.pdb"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
+            </Component>
           </Directory>
-
-          <Component Id="OpenSM_Service_enabled"
-                     Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-          </Component>
-        </Directory>
         </Directory>
+      </Directory>
 
-      <!-- copy DAT header files -->
-
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">    
-
-          <Directory Id="dDATD" Name="DAT">
-            <Component Id="cDatCfg" Guid="54A4F997-AC33-45D8-9899-6332E40B62A8">
-              <CreateFolder />
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
-            </Component>
-
-            <Directory Id="v1_1" Name="v1-1">
-              <Component Id="cDATV1" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049"
-                         KeyPath="yes" SharedDllRefCount="yes">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID" Name="DAT">    
-                <Component Id="cDatBldV1Hdrs"
-                          Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
-                  <CreateFolder />    
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat.h" />    
-
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat_error.h" />    
-    
-                  <File Id="dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    
-    
-                  <File Id="dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL\dat_redirection.h" />    
-    
-                  <File Id="dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL\dat_registry.h" />    
-    
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    
-    
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL\udat.h" />    
-    
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL\udat_config.h" />    
-    
-                  <File Id="udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL\udat_redirection.h" />    
-    
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV1Libs"
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    
-
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"
-                        LongName="dat.lib" Name="dat.lib"
-                        Source="..\bin\DAPL\ia64\dat.lib" />
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"
-                        LongName="datd.lib" Name="datd.lib"
-                        Source="..\bin\DAPL\ia64\datd.lib" />
-              </Component>
-            </Directory>
-
-            <Directory Id="v2_0" Name="v2-0">
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"
-                         KeyPath="yes" SharedDllRefCount="yes">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID2" Name="DAT">    
-                <Component Id="cDatBldV2Hdrs"
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    
-                  <CreateFolder />    
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat.h" />    
-
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat_error.h" />    
-    
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    
-    
-                  <File Id="_dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL2\dat_redirection.h" />    
-    
-                  <File Id="_dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL2\dat_registry.h" />    
-    
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    
-    
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL2\udat.h" />    
-    
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL2\udat_config.h" />    
-    
-                  <File Id="_udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL2\udat_redirection.h" />    
-    
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV2Libs"
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    
-
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2.lib" Name="dat2.lib"
-                        Source="..\bin\DAPL2\ia64\dat2.lib" />
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2d.lib" Name="dat2d.lib"
-                        Source="..\bin\DAPL2\ia64\dat2d.lib" />
-              </Component>    
-            </Directory>    
-
-          </Directory> <!-- DAT -->   
-
-          <Directory Id="IBSDK" Name="IBSDK">
-            <Directory Id="IB_libs" Name="lib">
-              <Component Id="cIBAL_Libs"
-                         Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
-                <CreateFolder />
-                <File Id="ibal.lib" Compressed="yes" DiskId="1"
-                      LongName="ibal.lib" Name="ibal.lib"
-                      Source="..\bin\HCA\ia64\ibal.lib" />
-                <File Id="ibal.pdb" Compressed="yes" DiskId="1"
-                      LongName="ibal.pdb" Name="ibal.pdb"
-                      Source="..\bin\HCA\ia64\ibal.pdb" />
-                <File Id="complib.lib" Compressed="yes" DiskId="1"
-                      LongName="complib.lib" Name="complib.lib"
-                      Source="..\bin\HCA\ia64\complib.lib" />
-                <File Id="complib.pdb" Compressed="yes" DiskId="1"
-                      LongName="complib.pdb" Name="complib.pdb"
-                      Source="..\bin\HCA\ia64\complib.pdb" />
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"
-                    LongName="ibald.lib" Name="ibald.lib"
-                    Source="..\bin\HCA\ia64\ibald.lib" />
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibald.pdb" Name="ibald.pdb"
-                    Source="..\bin\HCA\ia64\ibald.pdb" />
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"
-                    LongName="complibd.lib" Name="complibd.lib"
-                    Source="..\bin\HCA\ia64\complibd.lib" />
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"
-                    LongName="complibd.pdb" Name="complibd.pdb"
-                    Source="..\bin\HCA\ia64\complibd.pdb" />
-
-              <!-- SysWOW64\ 32-bit libs -->
-              <File Id="cl32.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32.lib" Name="cl32.lib"
-                    Source="..\bin\HCA\ia64\cl32.lib" />
-              <File Id="cl32.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32.pdb" Name="cl32.pdb"
-                    Source="..\bin\HCA\ia64\cl32.pdb" />
-              <File Id="cl32d.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32d.lib" Name="cl32d.lib"
-                    Source="..\bin\HCA\ia64\cl32d.lib" />
-              <File Id="cl32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32d.pdb" Name="cl32d.pdb"
-                    Source="..\bin\HCA\ia64\cl32d.pdb" />
-              <File Id="ibal32.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32.lib" Name="ibal32.lib"
-                    Source="..\bin\HCA\ia64\ibal32.lib" />
-              <File Id="ibal32.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32.pdb" Name="ibal32.pdb"
-                    Source="..\bin\HCA\ia64\ibal32.pdb" />
-              <File Id="ibal32d.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.lib" Name="ibal32d.lib"
-                    Source="..\bin\HCA\ia64\ibal32d.lib" />
-              <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.pdb" Name="ibal32d.pdb"
-                    Source="..\bin\HCA\ia64\ibal32d.pdb" />
-
-              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbs.lib" Name="winverbs.lib"
-                    Source="..\bin\HCA\x86\winverbs.lib" />
-              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.lib" Name="winvrbsd.lib"
-                    Source="..\bin\HCA\x86\winverbsd.lib" />
-
-              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.lib" Name="ibverbs.lib"
-                    Source="..\bin\HCA\x86\libibverbs.lib" />
-              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                    Source="..\bin\HCA\x86\libibverbs.pdb" />
-              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                    Source="..\bin\HCA\x86\libibverbsd.lib" />
-              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                    Source="..\bin\HCA\x86\libibverbsd.pdb" />
-
-              <File Id="libibmad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmad.lib" Name="ibmad.lib"
-                    Source="..\bin\HCA\x86\libibmad.lib" />
-              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmad.pdb" Name="ibmad.pdb"
-                    Source="..\bin\HCA\x86\libibmad.pdb" />
-              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.lib" Name="ibmadd.lib"
-                    Source="..\bin\HCA\x86\libibmadd.lib" />
-              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                    Source="..\bin\HCA\x86\libibmadd.pdb" />
-
-              <File Id="libibumad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumad.lib" Name="ibumad.lib"
-                    Source="..\bin\HCA\x86\libibumad.lib" />
-              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumad.pdb" Name="ibumad.pdb"
-                    Source="..\bin\HCA\x86\libibumad.pdb" />
-              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.lib" Name="ibumadd.lib"
-                    Source="..\bin\HCA\x86\libibumadd.lib" />
-              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                    Source="..\bin\HCA\x86\libibumadd.pdb" />
-              </Component>
-            </Directory>
-
-            <Directory Id="IB_inc" Name="Inc">
-              <Component Id="cIBAL_Incs"
-                         Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">
-                <CreateFolder />
-
-                <File Id="oib_ver.h" Compressed="yes" DiskId="1"
-                       LongName="oib_ver.h" Name="oib_ver.h"
-                       Source="..\bin\Inc\oib_ver.h" />
-                <File Id="openib.def" Compressed="yes" DiskId="1"
-                       LongName="openib.def" Name="openib.def"
-                       Source="..\bin\Inc\openib.def" />
-              </Component>
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
 
-              <Directory Id="IB_complib" Name="complib">
-                <Component Id="cIBAL_Complib"
-                           Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">
-                  <CreateFolder />
-                  <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"
-                        LongName="cl_async_proc.h" Name="CL_ASYN.H" 
-                        Source="..\bin\Inc\complib\cl_async_proc.h" />
-                  <File Id="cl_atomic.h" Compressed="yes" DiskId="1"
-                        LongName="cl_atomic.h" Name="CL_ATOM.H" 
-                        Source="..\bin\Inc\complib\cl_atomic.h" />
-                  <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" 
-                        Source="..\bin\Inc\complib\cl_atomic_osd.h" />
-                  <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_byteswap.h" Name="CL_BYTE.H" 
-                        Source="..\bin\Inc\complib\cl_byteswap.h" />
-                  <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" 
-                        Source="..\bin\Inc\complib\cl_byteswap_osd.h" />
-                  <File Id="cl_comppool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_comppool.h" Name="CL_COMP.H" 
-                        Source="..\bin\Inc\complib\cl_comppool.h" />
-                  <File Id="cl_debug.h" Compressed="yes" DiskId="1"
-                        LongName="cl_debug.h" Name="CL_DEBU.H" 
-                        Source="..\bin\Inc\complib\cl_debug.h" />
-                  <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_debug_osd.h" Name="CL_DEBU1.H" 
-                        Source="..\bin\Inc\complib\cl_debug_osd.h" />
-                  <File Id="cl_event.h" Compressed="yes" DiskId="1"
-                        LongName="cl_event.h" Name="CL_EVEN.H" 
-                        Source="..\bin\Inc\complib\cl_event.h" />
-                  <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_event_osd.h" Name="CL_EVEN1.H" 
-                        Source="..\bin\Inc\complib\cl_event_osd.h" />
-                  <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_fleximap.h" Name="CL_FLEX.H" 
-                        Source="..\bin\Inc\complib\cl_fleximap.h" />
-                  <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"
-                        LongName="cl_ioctl.h" Name="CL_IOCT.H" 
-                        Source="..\bin\Inc\complib\cl_ioctl.h" />
-                  <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" 
-                        Source="..\bin\Inc\complib\cl_ioctl_osd.h" />
-                  <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"
-                        LongName="cl_irqlock.h" Name="CL_IRQL.H" 
-                        Source="..\bin\Inc\complib\cl_irqlock.h" />
-                  <File Id="cl_list.h" Compressed="yes" DiskId="1"
-                        LongName="cl_list.h" Name="CL_LIST.H" 
-                        Source="..\bin\Inc\complib\cl_list.h" />
-                  <File Id="cl_log.h" Compressed="yes" DiskId="1"
-                        LongName="cl_log.h" Name="CL_LOG.H" 
-                        Source="..\bin\Inc\complib\cl_log.h" />
-                  <File Id="cl_map.h" Compressed="yes" DiskId="1"
-                        LongName="cl_map.h" Name="CL_MAP.H" 
-                        Source="..\bin\Inc\complib\cl_map.h" />
-                  <File Id="cl_math.h" Compressed="yes" DiskId="1"
-                        LongName="cl_math.h" Name="CL_MATH.H" 
-                        Source="..\bin\Inc\complib\cl_math.h" />
-                  <File Id="cl_memory.h" Compressed="yes" DiskId="1"
-                        LongName="cl_memory.h" Name="CL_MEMO.H" 
-                        Source="..\bin\Inc\complib\cl_memory.h" />
-                  <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_memory_osd.h" Name="CL_MEMO1.H" 
-                        Source="..\bin\Inc\complib\cl_memory_osd.h" />
-                  <File Id="cl_mutex.h" Compressed="yes" DiskId="1"
-                        LongName="cl_mutex.h" Name="CL_MUTE.H" 
-                        Source="..\bin\Inc\complib\cl_mutex.h" />
-                  <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" 
-                        Source="..\bin\Inc\complib\cl_mutex_osd.h" />
-                  <File Id="cl_obj.h" Compressed="yes" DiskId="1"
-                        LongName="cl_obj.h" Name="CL_OBJ.H" 
-                        Source="..\bin\Inc\complib\cl_obj.h" />
-                  <File Id="cl_packoff.h" Compressed="yes" DiskId="1"
-                        LongName="cl_packoff.h" Name="CL_PACK.H" 
-                        Source="..\bin\Inc\complib\cl_packoff.h" />
-                  <File Id="cl_packon.h" Compressed="yes" DiskId="1"
-                        LongName="cl_packon.h" Name="CL_PACK1.H" 
-                        Source="..\bin\Inc\complib\cl_packon.h" />
-                  <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"
-                        LongName="cl_passivelock.h" Name="CL_PASS.H" 
-                        Source="..\bin\Inc\complib\cl_passivelock.h" />
-                  <File Id="cl_perf.h" Compressed="yes" DiskId="1"
-                        LongName="cl_perf.h" Name="CL_PERF.H" 
-                        Source="..\bin\Inc\complib\cl_perf.h" />
-                  <File Id="cl_pool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_pool.h" Name="CL_POOL.H" 
-                        Source="..\bin\Inc\complib\cl_pool.h" />
-                  <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"
-                        LongName="cl_ptr_vector.h" Name="CL_PTR_.H" 
-                        Source="..\bin\Inc\complib\cl_ptr_vector.h" />
-                  <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qcomppool.h" Name="CL_QCOM.H" 
-                        Source="..\bin\Inc\complib\cl_qcomppool.h" />
-                  <File Id="cl_qlist.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qlist.h" Name="CL_QLIS.H" 
-                        Source="..\bin\Inc\complib\cl_qlist.h" />
-                  <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qlockpool.h" Name="CL_QLOC.H" 
-                        Source="..\bin\Inc\complib\cl_qlockpool.h" />
-                  <File Id="cl_qmap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qmap.h" Name="CL_QMAP.H" 
-                        Source="..\bin\Inc\complib\cl_qmap.h" />
-                  <File Id="cl_qpool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qpool.h" Name="CL_QPOO.H" 
-                        Source="..\bin\Inc\complib\cl_qpool.h" />
-                  <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_rbmap.h" Name="CL_RBMA.H" 
-                        Source="..\bin\Inc\complib\cl_rbmap.h" />
-                  <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"
-                        LongName="cl_reqmgr.h" Name="CL_REQM.H" 
-                        Source="..\bin\Inc\complib\cl_reqmgr.h" />
-                  <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"
-                        LongName="cl_spinlock.h" Name="CL_SPIN.H" 
-                        Source="..\bin\Inc\complib\cl_spinlock.h" />
-                  <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" 
-                        Source="..\bin\Inc\complib\cl_spinlock_osd.h" />
-                  <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"
-                        LongName="cl_syscallback.h" Name="CL_SYSC.H" 
-                        Source="..\bin\Inc\complib\cl_syscallback.h" />
-                  <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" 
-                        Source="..\bin\Inc\complib\cl_syscallback_osd.h" />
-                  <File Id="cl_thread.h" Compressed="yes" DiskId="1"
-                        LongName="cl_thread.h" Name="CL_THRE.H" 
-                        Source="..\bin\Inc\complib\cl_thread.h" />
-                  <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_thread_osd.h" Name="CL_THRE1.H" 
-                        Source="..\bin\Inc\complib\cl_thread_osd.h" />
-                  <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_threadpool.h" Name="CL_THRE2.H" 
-                        Source="..\bin\Inc\complib\cl_threadpool.h" />
-                  <File Id="cl_timer.h" Compressed="yes" DiskId="1"
-                        LongName="cl_timer.h" Name="CL_TIME.H" 
-                        Source="..\bin\Inc\complib\cl_timer.h" />
-                  <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_timer_osd.h" Name="CL_TIME1.H" 
-                        Source="..\bin\Inc\complib\cl_timer_osd.h" />
-                  <File Id="cl_types.h" Compressed="yes" DiskId="1"
-                        LongName="cl_types.h" Name="CL_TYPE.H" 
-                        Source="..\bin\Inc\complib\cl_types.h" />
-                  <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_types_osd.h" Name="CL_TYPE1.H" 
-                        Source="..\bin\Inc\complib\cl_types_osd.h" />
-                  <File Id="cl_vector.h" Compressed="yes" DiskId="1"
-                        LongName="cl_vector.h" Name="CL_VECT.H" 
-                        Source="..\bin\Inc\complib\cl_vector.h" />
-                  <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"
-                        LongName="cl_waitobj.h" Name="CL_WAIT.H" 
-                        Source="..\bin\Inc\complib\cl_waitobj.h" />
-                  <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" 
-                        Source="..\bin\Inc\complib\cl_waitobj_osd.h" />
-                  <File Id="comp_lib.h" Compressed="yes" DiskId="1"
-                        LongName="comp_lib.h" Name="COMP_LI.H" 
-                        Source="..\bin\Inc\complib\comp_lib.h" />
-                </Component>
-              </Directory>
+      <!-- copy DAT header files to
+         %SystemDrive%\DAT\v1-1\DAT
+         %SystemDrive%\DAT\v2-0\DAT
+      -->
 
-              <Directory Id="IB_iba" Name="iba">
-                <Component Id="cIBAL_IBA"
-                           Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">
-                  <CreateFolder />
-                  <File Id="ib_al.h" Compressed="yes" DiskId="1"
-                        LongName="ib_al.h" Name="ib_al.h"
-                        Source="..\bin\Inc\iba\ib_al.h" />
-                  <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"
-                        LongName="ib_al_ioctl.h" Name="ib_ioctl.h"
-                        Source="..\bin\Inc\iba\ib_al_ioctl.h" />
-                  <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"
-                        LongName="ib_at_ioctl.h" Name="ib_iocat.h"
-                        Source="..\bin\Inc\iba\ib_at_ioctl.h" />
-                  <File Id="ib_ci.h" Compressed="yes" DiskId="1"
-                        LongName="ib_ci.h" Name="ib_ci.h"
-                        Source="..\bin\Inc\iba\ib_ci.h" />
-                  <File Id="ib_types.h" Compressed="yes" DiskId="1"
-                        LongName="ib_types.h" Name="ib_types.h"
-                        Source="..\bin\Inc\iba\ib_types.h" />
-                  <File Id="ib_uvp.h" Compressed="yes" DiskId="1"
-                        LongName="ib_uvp.h" Name="ib_uvp.h"
-                        Source="..\bin\Inc\iba\ib_uvp.h" />
-                </Component>
-              </Directory>
-            </Directory>
+        <Directory Id="dDATD" Name="DAT">
+          <?include ..\..\common\DAT_config.inc ?>
+        </Directory>
 
-            <Directory Id="IB_samples" Name="Samples">
-              <Directory Id="sample_DDK" Name="DDK">
-                <Component Id="cDDK_example"
-                           Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">
-                  <CreateFolder />
-                      <File Id="cmtest.c" Compressed="yes" DiskId="1"
-                            LongName="cmtest.c" Name="cmtest.c"
-                            Source="..\bin\Misc\cmtest.c" />
-                      <File Id="makefile" Compressed="yes" DiskId="1"
-                            LongName="makefile" Name="makefile"
-                            Source="..\..\SDK_Samples\DDK\makefile" />
-                      <File Id="SOURCES" Compressed="yes" DiskId="1"
-                            LongName="SOURCES" Name="SOURCES"
-                            Source="..\..\SDK_Samples\DDK\SOURCES" />
-                      <File Id="README.txt" Compressed="yes" DiskId="1"
-                            LongName="README.txt" Name="README.txt"
-                            Source="..\..\SDK_Samples\DDK\README.txt" />
-                </Component>
-              </Directory>    <!-- End DDK -->
-              <Directory Id="sample_VS" Name="VS">
-                <Component Id="cVS_example"
-                           Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">
-                  <CreateFolder />
-                      <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"
-                            LongName="cmtest.c" Name="cmtest.c"
-                            Source="..\bin\misc\cmtest.c" />
-                      <File Id="vscmtest.rc" Compressed="yes" DiskId="1"
-                            LongName="cmtest.rc" Name="cmtest.rc"
-                            Source="..\..\SDK_Samples\VS\cmtest.rc" />
-                      <File Id="vsREADME.txt" Compressed="yes" DiskId="1"
-                            LongName="README.txt" Name="README.txt"
-                            Source="..\..\SDK_Samples\VS\README.txt" />
-                </Component>
-              </Directory>    <!-- End VS -->
-            </Directory>    <!-- End Samples -->
-          </Directory>    <!-- End IBSDK -->
+        <Directory Id="IBSDK" Name="IBSDK">
+          <?include ..\..\common\ib_sdk.inc ?>
+        </Directory>
 
-      </Directory>   <!-- WinRoot -->   
-    </Directory> <!-- TARGETDIR --> 
+      </Directory>
+    </Directory> <!-- End TARGETDIR -->
 
 <!--
     <Property Id='ARPNOMODIFY'>1</Property>
@@ -1482,24 +158,22 @@
     <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
     <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
 
-
     <!--
-       Features - Level=1 == Typical, no WSD on XP
+       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
      -->
 
     <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"
-         Description="Mellanox Host Channel Adapter Drivers for InfiniHost"
+         Description="Mellanox InfiniBand Host Channel Adapter Drivers"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
-
-        <ComponentRef Id="cMthcaDriver" />
-        <ComponentRef Id="cConnectXDriver" />
+      <ComponentRef Id="cMthcaDriver" />
+      <ComponentRef Id="cConnectXDriver" />
     </Feature>
 
-    <Feature Id="IBcore" Title="InfiniBand Core" Level="1"
-         Description="InfiniBand: Core, Tools, Docs"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
+    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"
+        Description="InfiniBand: Core, Tools, Docs"
+        Display="expand" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">
       <ComponentRef Id="cIBcore" />
       <ComponentRef Id="cWinVerbsDrivers" />
       <ComponentRef Id="Docs" />
@@ -1510,7 +184,7 @@
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
-        Description="OFED verbs - Libraries and utilities"
+        Description="OFED verbs - Libraries + utilities"
         Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
         <ComponentRef Id="cWinVerbsOFED" />
@@ -1518,9 +192,9 @@
     </Feature>
 
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"
-         Description="Internet Protocols over InfiniBand" Display="expand"
-         ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="Internet Protocols over InfiniBand" Display="expand"
+        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
       <ComponentRef Id="IPoIB" />
     </Feature>
 
@@ -1542,21 +216,20 @@
         <Condition Level="201"> IPOIB_EXISTS </Condition> 
     </Feature>
 -->
-
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"
-         Description="Open Subnet Management started as a local Windows Service"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="Open Subnet Management started as a local Windows Service"
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
       <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"
-         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"
+        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <Condition Level="201"> IPOIB_EXISTS </Condition>
 
       <Feature Id="fDatConf" Title="DAT-DAPL Config File"
-         Description="DAT-DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
+         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
          Display="expand" Level="1" 
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
         <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>
@@ -1605,9 +278,9 @@
     </Feature>
 
     <Feature Id="fVNIC" Title="QLogic-VNIC"
-         Description="QLogic - Virtual NIC over InfiniBand"
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="QLogic - Virtual NIC over InfiniBand"
+        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <ComponentRef Id="cQLVNIC_driver_installed" />
     </Feature>
 
@@ -1631,73 +304,11 @@
       <ComponentRef Id="cCHK_user" />
     </Feature>
 
-    <!--> File where Custom Actions are defined -->
-    <Binary Id='CA' src='..\..\CustomActions.vbs' />
-
-    <CustomAction Id='WinOF_setup' BinaryKey='CA'
-         VBScriptCall='WinOF_setup' Return='check' />
-
-    <CustomAction Id='ChkPreviousInstall' BinaryKey='CA'
-         VBScriptCall='ChkInstallAndReboot' Return='check' />
-
-    <CustomAction Id='DriverInstall' BinaryKey='CA'
-         VBScriptCall='DriverInstall' Return='check' Execute='deferred' />
-
-    <CustomAction Id='DriverUninstall' BinaryKey='CA'
-         VBScriptCall='DriverUninstall' Return='check' />
-
-    <CustomAction Id='WSDStart' BinaryKey='CA'
-         VBScriptCall='WSDEnable' Return='check' />
-
-    <CustomAction Id="ND_start" BinaryKey="CA"
-         VBScriptCall="ND_StartMeUp" Return="check" />
-
-    <CustomAction Id='HammerTime' BinaryKey='CA'
-         VBScriptCall='HammerTime' Return='check' />
-
-    <CustomAction Id="BcastRegChanged" BinaryKey="CA"
-         VBScriptCall="BcastRegChanged" Return="check" />
-
-    <CustomAction Id="InstallChanged" BinaryKey="CA"
-         VBScriptCall="InstallChanged" Return="check" />
-
-    <InstallExecuteSequence>
-       <!--> Always executed (Install or uninstall </!-->
-       <Custom Action="WinOF_setup" After='InstallInitialize' />
-
-       <!--> Install ONLY </!-->
-       <Custom Action="ChkPreviousInstall" After='WinOF_setup'>
-               NOT Installed</Custom>
-
-       <ScheduleReboot After='ChkPreviousInstall'>
-               REBOOT="FORCE"</ScheduleReboot>
-
-       <Custom Action="DriverInstall" After='InstallServices'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="WSDStart" After='InstallFinalize'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="ND_start" After="WSDStart">
-          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="BcastRegChanged" After="ND_start">
-               Not Installed</Custom>
-
-       <!--> CHANGE ONLY </!-->
-       <Custom Action="InstallChanged" After="InstallFinalize">
-           Installed </Custom>
-
-       <!--> REMOVE ONLY </!-->
-       <Custom Action="DriverUninstall" After='PublishProduct'>
-               REMOVE="ALL" </Custom>
-       <Custom Action="HammerTime" After='InstallFinalize'>REMOVE="ALL"</Custom>
-    </InstallExecuteSequence>
-
+    <?include ..\..\common\InstallExecuteSeq.inc ?>
 
     <UIRef Id="WixUI_FeatureTree" />
-    <UIRef Id="WixUI_ErrorProgressText" />
-    <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
     <UI />
   </Product>
 </Wix>
diff --git a/trunk/WinOF/WIX/wlh/x64/wof.wxs b/trunk/WinOF/WIX/wlh/x64/wof.wxs
index cdc9bb42..33b3e4d1 100644
--- a/trunk/WinOF/WIX/wlh/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x64/wof.wxs
@@ -2,11 +2,18 @@
 <!--
    WinOF (Windows OpenFabrics) for x64 Windows Server 2008 or Vista
 -->
+
+<?define ARCH=amd64 ?>
+<?define ARCHP=x64 ?>
+<?define OS=wlh ?>
+<?include ..\..\common\WinOF_cfg.inc ?>
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Product Name="Windows Open Fabrics InfiniBand v2.1.0 (RC0) x64"
-    Version="2.1.0"
+  <Product
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"
+    Version="$(var.WOFRELNUM)"
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
-    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' 
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
     Language="1033" Codepage="1252"
     Manufacturer="Open Fabrics Alliance Windows">
 
@@ -14,8 +21,8 @@
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
      InstallPrivileges='elevated'
      Description="WinOF Installer"
-     Comments="Windows Open Fabrics Alliance InfiniBand stack"
-     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="200"
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
      Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Condition Message="Administrator required to install [ProductName].">
@@ -34,59 +41,7 @@
          <![CDATA[(VersionNT=600)]]>
     </Condition>
 
-    <!--
-        System/Machine-wide install, otherwise per-user (Administrator) only.
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.
-     -->
-    <Property Id="ALLUSERS"> Value="1" </Property>
-
-    <!-- Requires files sc.exe & reg.exe -->
-    <Property Id="REG_EXISTS">
-      <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="RegFile" Name="reg.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="SC_EXISTS">
-      <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="ScFile" Name="sc.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="IPOIB_EXISTS">
-      <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">
-        <FileSearch Id="ipoibFile" Name="netipoib.inf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT_CONF_EXISTS">
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">
-        <FileSearch Id="DCFile" Name="dat.conf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT1_INSTALLED">
-      <DirectorySearch Id="Dat1DS" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="daplFS" Name="dapl.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT2_INSTALLED">
-      <DirectorySearch Id="Dat2DS" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="dapl2FS" Name="dapl2.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Condition Message="[ProductName] requires system file reg.exe">
-       REG_EXISTS
-    </Condition>
-
-    <Condition Message="[ProductName] requires system file sc.exe">
-       SC_EXISTS
-    </Condition>
-
-    <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
-    <Property Id="DiskPrompt" Value="WinOF 1.0 Installation [1]" />
+    <?include ..\..\common\requirements.inc ?>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
@@ -96,891 +51,36 @@
       <Directory Id="DesktopFolder" Name="Desktop" />
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="INSTALLDIR" Name="WinOF">
-          <Component Id="Docs" Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
-
-            <File Id="OFAlogo" Compressed="yes" DiskId="1"
-                    LongName="openfabrics.gif" Name="ofa.gif"
-                    Source="..\..\openfabrics.gif" />
-
-            <!-- implies WIX build only from an svn structured tree.  -->
-            <File Id="manual.htm" Compressed="yes" DiskId="1" Name="Manual.htm"
-                    LongName="Manual.htm"
-                    Source="..\bin\Misc\Manual.htm" Vital="yes" />
 
-            <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
-                    Name="Manual.htm" LongName="Manual"
-                    Target="[INSTALLDIR]\Manual.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="dRelnotes" Compressed="yes" DiskId="1"
-                    LongName="Release_notes.htm" Name="RELEASE_.HTM"
-                    Source="..\..\Release_notes.htm" />
-
-            <Shortcut Id="RelNotes" Directory="ProgramMenuDir"
-                    Name="RelNotes" LongName="Release Notes"
-                    Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="command_window" Name="COMMAND.LNK"
-                    LongName="Command Window.lnk" Compressed="yes" DiskId="1"
-                    Source="..\..\x64\Command Window.lnk" Vital="yes" />
-
-            <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
-                    Name="COMMAND.LNK" LongName="Command Window.lnk"
-                    Target="[INSTALLDIR]\Command Window.lnk" Icon="openfabrics"
-                    IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />
-
-            <Shortcut Id="UninstallProduct" Name="UnMyApp"
-                Directory="ProgramMenuDir"
-                LongName="Uninstall WinOF"
-				Target="[System64Folder]msiexec.exe"
-                Arguments="/X [ProductCode]"
-                Description="Uninstalls OpenFabrics InfiniBand" />
-            <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
-          </Component>
-
-          <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
-            <Environment Id='UpdatePath' Name='PATH' Action='create'
-                         System='yes' Part='last' Value='[INSTALLDIR]' /> 
-
-            <File Id="qlgcvnic_config" Compressed="yes" DiskId="1" Vital="yes"
-                  Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"
-                  Source="..\bin\tools\amd64\release\qlgcvnic_config.exe" />
-            <File Id="part_man" Name="part_man.exe"
-                    Compressed="yes" DiskId="1" Vital="yes"
-                    Source="..\bin\tools\amd64\release\part_man.exe" />
-            <File Id="vstat" Name="vstat.exe"
-                    Compressed="yes" DiskId="1" Vital="yes"
-                    Source="..\bin\tools\amd64\release\vstat.exe" />
-            <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
-                    DiskId="1" Name="TTCP.EXE"
-                    Source="..\bin\tools\amd64\release\ttcp.exe" />
-            <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
-                    DiskId="1" Name="CMTEST.EXE"
-                    Source="..\bin\tools\amd64\release\cmtest.exe" />
-            <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_limits.exe" Name="IB_LIMI.EXE"
-                     Source="..\bin\tools\amd64\release\ib_limits.exe" />
-            <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_read_bw.exe" Name="IB_READ.EXE"
-                     Source="..\bin\tools\amd64\release\ib_read_bw.exe" />
-            <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
-                     Source="..\bin\tools\amd64\release\ib_read_lat.exe" />
-            <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
-                     Source="..\bin\tools\amd64\release\ib_send_bw.exe" />
-            <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
-                     Source="..\bin\tools\amd64\release\ib_send_lat.exe" />
-            <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
-                     Source="..\bin\tools\amd64\release\ib_write_bw.exe" />
-            <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
-                     Source="..\bin\tools\amd64\release\ib_write_lat.exe" />
-            <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
-                     LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
-                     Source="..\bin\tools\amd64\release\ibtrapgen.exe" />
-            <File Id="osmtest.exe" Compressed="yes" DiskId="1"
-                     LongName="osmtest.exe" Name="OSMTEST.EXE"
-                     Source="..\bin\tools\amd64\release\osmtest.exe" />
-            <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
-                     LongName="PrintIP.exe" Name="PRINTIP.EXE"
-                     Source="..\bin\tools\amd64\release\PrintIP.exe" />
-            <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"
-                     Vital="yes" Source="..\bin\tools\amd64\release\nsc.exe" />
-          </Component>
-
-          <Component Id='OpenSMservice'
-                     Guid='90042B4F-51B5-4720-8E54-6D366253634B'
-                     SharedDllRefCount='no' KeyPath='no'
-                     NeverOverwrite='no'
-                     Permanent='no' Transitive='no' Win64='no'
-                     Location='either'>
-
-              <File Id="opensm.exe" Compressed="yes" DiskId="1"
-                    LongName="opensm.exe" Name="OPENSM.EXE"
-                    Source="..\bin\tools\amd64\release\opensm.exe"
-                    Vital='yes' KeyPath='yes' Hidden='no' System='no' 
-                    Checksum='no' ReadOnly='no' />
-
-              <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
-                  Description='InfiniBand Subnet Configuration and Management'
-                  DisplayName='InfiniBand Subnet Manager'
-                  Arguments='-e --service'
-                  ErrorControl='normal'
-                  Start='disabled'
-                  Interactive='no'
-                  Type='ownProcess' />
-
-              <ServiceControl Id='osmSvcControl' Name='OpenSM'
-                              Stop='uninstall'
-                              Wait='no'
-                              Remove='uninstall' />
-          </Component>
+          <?include ..\..\common\Docs.inc ?>
+          <?include ..\..\common\Tools.inc ?>
+          <?include ..\..\common\OpenSM_service.inc ?>
 
           <Directory Id="IBcoreDir" Name="IBcore">
-            <Component Id="cIBcore"
-                       Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
-              <CreateFolder />
-              <File Id="dpinst.exe" Compressed="yes" DiskId="1"
-                     LongName="dpinst.exe" Name="dpinst.exe"
-                     Source="..\..\x64\dpinst.exe" />
-              <File Id="dpinst.xml" Compressed="yes" DiskId="1"
-                     LongName="dpinst.xml" Name="dpinst.xml"
-                     Source="..\..\dpinst.xml" />
-              <File Id="devman.exe" Compressed="yes" DiskId="1"
-                     LongName="devman.exe" Name="devman.exe"
-                     Source="..\..\x64\devman.exe" />
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />
-              <File Id="cl32.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32.dll" Name="CL32.DLL"
-                     Source="..\bin\HCA\amd64\cl32.dll" />
-              <File Id="cl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32d.dll" Name="CL32D.DLL"
-                     Source="..\bin\HCA\amd64\cl32d.dll" />
-              <File Id="complib.dll" Compressed="yes" DiskId="1"
-                     LongName="complib.dll" Name="COMPLIB.DLL"
-                     Source="..\bin\HCA\amd64\complib.dll" />
-              <File Id="complibd.dll" Compressed="yes" DiskId="1"
-                     LongName="complibd.dll" Name="COMPLIB1.DLL"
-                     Source="..\bin\HCA\amd64\complibd.dll" />
-              <File Id="ibal32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32.dll" Name="IBAL32.DLL"
-                     Source="..\bin\HCA\amd64\ibal32.dll" />
-              <File Id="ibal32d.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32d.dll" Name="IBAL32D.DLL"
-                     Source="..\bin\HCA\amd64\ibal32d.dll" />
-              <File Id="ibal.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal.dll" Name="IBAL.DLL"
-                     Source="..\bin\HCA\amd64\ibal.dll" />
-              <File Id="ibald.dll" Compressed="yes" DiskId="1"
-                     LongName="ibald.dll" Name="IBALD.DLL"
-                     Source="..\bin\HCA\amd64\ibald.dll" />
-              <File Id="ibbus.sys" Compressed="yes" DiskId="1"
-                     LongName="ibbus.sys" Name="IBBUS.SYS"
-                     Source="..\bin\HCA\amd64\ibbus.sys" />
-              <File Id="ibbus.pdb" Compressed="yes" DiskId="1"
-                     Name="ibbus.pdb" Source="..\bin\HCA\amd64\ibbus.pdb" />
-              <File Id="ibiou.sys" Compressed="yes" DiskId="1"
-                     LongName="ibiou.sys" Name="IBIOU.SYS"
-                     Source="..\bin\HCA\amd64\ibiou.sys" />
-              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"
-                     Name="ibiou.pdb"
-                     Source="..\bin\HCA\amd64\ibiou.pdb" />
-              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.cat" Name="IB_IOU.cat"
-                     Source="..\bin\HCA\amd64\ib_iou.cat" />
-              <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.inf" Name="IB_IOU.inf"
-                     Source="..\bin\HCA\amd64\ib_iou.inf" />
-              <!--
-                 Orphaned install files - remove on uninstall
-                 Here SystemFolder == SysWOW64, System64Folder == System32
-              -->
-              <RemoveFile Id='o64_ibal.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="ibal.dll" LongName='ibal.dll' />
-              <RemoveFile Id='o64_complib.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="complib.dll" LongName='complib.dll' />
-            </Component>
-
-            <Component Id="cMthcaDriver"
-                       Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">
-              <File Id="mthca32.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32.dll" Name="MTHCA32.DLL"
-                     Source="..\bin\HCA\amd64\mthca32.dll" />
-              <File Id="mthca32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32d.dll" Name="MTHCA321.DLL"
-                     Source="..\bin\HCA\amd64\mthca32d.dll" />
-              <File Id="mthca.inf" Compressed="yes" DiskId="1"
-                     LongName="mthca.inf" Name="MTHCA.INF"
-                     Source="..\bin\HCA\amd64\mthca.inf" />
-              <File Id="mthca.cat" Compressed="yes" DiskId="1"
-                     LongName="mthca.cat" Name="MTHCA.cat"
-                     Source="..\bin\HCA\amd64\mthca.cat" />
-              <File Id="mthca.sys" Compressed="yes" DiskId="1"
-                     LongName="mthca.sys" Name="MTHCA.SYS"
-                     Source="..\bin\HCA\amd64\mthca.sys" />
-              <File Id="mthca.pdb" Compressed="yes" DiskId="1"
-                     Name="mthca.pdb"
-                     Source="..\bin\HCA\amd64\mthca.pdb" />
-              <File Id="mthcau.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcau.dll" Name="MTHCAU.DLL"
-                     Source="..\bin\HCA\amd64\mthcau.dll" />
-              <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcaud.dll" Name="MTHCAUD.DLL"
-                     Source="..\bin\HCA\amd64\mthcaud.dll" />
-            </Component>
-
-            <Component Id="cConnectXDriver"
-                       Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
-              <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.inf" Name="mlx4_bus.INF"
-                     Source="..\bin\hca\amd64\mlx4_bus.inf" />
-              <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.cat" Name="mlx4_bus.cat"
-                     Source="..\bin\hca\amd64\mlx4_bus.cat" />
-              <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
-                     Source="..\bin\hca\amd64\mlx4_bus.sys" />
-              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
-                     Name="mlx4_bus.pdb"
-                     Source="..\bin\hca\amd64\mlx4_bus.pdb" />
-              <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
-                     Source="..\bin\hca\amd64\mlx4_hca.inf" />
-              <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.cat" Name="mlx4_hca.cat"
-                     Source="..\bin\hca\amd64\mlx4_hca.cat" />
-              <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.sys" Name="mlx4_hca.sys"
-                     Source="..\bin\hca\amd64\mlx4_hca.sys" />
-              <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"
-                     Name="mlx4_hca.pdb"
-                     Source="..\bin\hca\amd64\mlx4_hca.pdb" />
-              <File Id="mlx4u.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u.dll" Name="mlx4u.dll"
-                     Source="..\bin\hca\amd64\mlx4u.dll" />
-              <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4ud.dll" Name="mlx4ud.dll"
-                     Source="..\bin\hca\amd64\mlx4ud.dll" />
-
-              <!-- copy 32-bit binaries for 32b in x64 -->
-              <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32d.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\amd64\mlx4u32d.dll" />
-              <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\amd64\mlx4u32.dll" />
-            </Component>
-
-            <Component Id="cWinVerbsDrivers"
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-
-              <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                    LongName="winverbs.sys" Name="winverbs.sys"
-                    Source="..\bin\HCA\amd64\winverbs.sys" />
-              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
-                    LongName="winverbs.pdb" Name="winverbs.pdb"
-                    Source="..\bin\HCA\amd64\winverbs.pdb" />
-              <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                    LongName="winverbs.dll" Name="winvrbs.dll"
-                    Source="..\bin\HCA\amd64\winverbs.dll" />
-              <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.dll" Name="winvrbsd.dll"
-                    Source="..\bin\HCA\amd64\winverbsd.dll" />
-              <File Id="winmad.sys" Compressed="yes" DiskId="1"
-                    LongName="winmad.sys" Name="winmad.sys"
-                    Source="..\bin\HCA\amd64\winmad.sys" />
-              <File Id="winmad.pdb" Compressed="yes" DiskId="1"
-                    LongName="winmad.pdb" Name="winmad.pdb"
-                    Source="..\bin\HCA\amd64\winmad.pdb" />
-              <File Id="winmad.dll" Compressed="yes" DiskId="1"
-                    LongName="winmad.dll" Name="winmad.dll"
-                    Source="..\bin\HCA\amd64\winmad.dll" />
-              <File Id="winmadd.dll" Compressed="yes" DiskId="1"
-                    LongName="winmadd.dll" Name="winmaddd.dll"
-                    Source="..\bin\HCA\amd64\winmadd.dll" />
-            </Component>
-
-          </Directory>
-
-          <Directory Id="dir_0" Name="Checked">
-            <Directory Id="dir_1" Name="kernel">
-                <Component Id="cCHK_kernel"
-                           Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
-                  <CreateFolder />
-
-                  <File Id="chk0" DiskId="1" Compressed="yes"
-                        Name="README.txt"
-                        Source="..\..\README_checked.txt" />
-                  <File Id="chk1" DiskId="1" Compressed="yes"
-                        Name="mthca.sys"
-                        Source="..\bin\Chk\HCA\amd64\mthca.sys" />
-                  <File Id="cat1" DiskId="1" Compressed="yes"
-                        Name="mthca.cat"
-                        Source="..\bin\Chk\HCA\amd64\mthca.cat" />
-                  <File Id="sym1" DiskId="1" Compressed="yes"
-                        Name="mthca.pdb"
-                        Source="..\bin\Chk\HCA\amd64\mthca.pdb" />
-
-                  <File Id="chk2" DiskId="1" Compressed="yes"
-                        Name="ibbus.sys"
-                        Source="..\bin\Chk\HCA\amd64\ibbus.sys" />
-                  <File Id="sym2" DiskId="1" Compressed="yes"
-                        Name="ibbus.pdb"
-                        Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />
-
-                  <File Id="chk3" DiskId="1" Compressed="yes"
-                        Name="ibiou.sys"
-                        Source="..\bin\Chk\HCA\amd64\ibiou.sys" />
-                  <File Id="cat3" DiskId="1" Compressed="yes"
-                        Name="ib_iou.cat"
-                        Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />
-                  <File Id="sym3" DiskId="1" Compressed="yes"
-                        Name="ibiou.pdb"
-                        Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />
-
-                  <File Id="chk4" DiskId="1" Compressed="yes"
-                        Name="ipoib.sys"
-                        Source="..\bin\Chk\net\amd64\ipoib.sys" />
-                  <File Id="cat4" DiskId="1" Compressed="yes"
-                        Name="ipoib.cat"
-                        Source="..\bin\Chk\net\amd64\ipoib.cat" />
-                  <File Id="sym4" DiskId="1" Compressed="yes"
-                        Name="ipoib.pdb"
-                        Source="..\bin\Chk\net\amd64\ipoib.pdb" />
-
-                  <File Id="chk5" DiskId="1" Compressed="yes"
-                        Name="qlgcvnic.sys"
-                        Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />
-                  <File Id="cat5" DiskId="1" Compressed="yes"
-                        Name="netvnic.cat"
-                        Source="..\bin\Chk\net\amd64\netvnic.cat" />
-                  <File Id="sym5" DiskId="1" Compressed="yes"
-                        Name="qlgcvnic.pdb"
-                        Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />
-
-                  <File Id="chk6" DiskId="1" Compressed="yes"
-                        Name="ibsrp.sys"
-                        Source="..\bin\Chk\storage\amd64\ibsrp.sys" />
-                  <File Id="cat6" DiskId="1" Compressed="yes"
-                        Name="ibsrp.cat"
-                        Source="..\bin\Chk\storage\amd64\ibsrp.cat" />
-                  <File Id="sym6" DiskId="1" Compressed="yes"
-                        Name="ibsrp.pdb"
-                        Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />
-
-                  <File Id="chk7" DiskId="1" Compressed="yes"
-                        Name="mlx4_bus.sys"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />
-                  <File Id="cat7" DiskId="1" Compressed="yes"
-                        Name="mlx4_bus.cat"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />
-                  <File Id="sym7" DiskId="1" Compressed="yes"
-                        Name="mlx4_bus.pdb"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />
-
-                  <File Id="chk8" DiskId="1" Compressed="yes"
-                        Name="mlx4_hca.sys"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />
-                  <File Id="cat8" DiskId="1" Compressed="yes"
-                        Name="mlx4_hca.cat"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />
-                  <File Id="sym8" DiskId="1" Compressed="yes"
-                        Name="mlx4_hca.pdb"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />
-
-                  <File Id="chk9" DiskId="1" Compressed="yes"
-                        Name="winverbs.sys"
-                        Source="..\bin\Chk\HCA\amd64\winverbs.sys" />
-                  <File Id="sym9" DiskId="1" Compressed="yes"
-                        Name="winverbs.pdb"
-                        Source="..\bin\Chk\HCA\amd64\winverbs.pdb" />
-                  <File Id="dll9" DiskId="1" Compressed="yes"
-                        Name="winverbs.dll"
-                        Source="..\bin\Chk\HCA\amd64\winverbs.dll" />
-                  <File Id="dlld9" DiskId="1" Compressed="yes"
-                        Name="winverbd.dll"
-                        LongName="winverbsd.dll"
-                        Source="..\bin\Chk\HCA\amd64\winverbsd.dll" />
-                </Component>
-            </Directory>
-      
-            <Directory Id="dir_14" Name="user">
-                <Component Id="cCHK_user"
-                               Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
-                  <CreateFolder />
-                  <File Id="file45" Name="complibd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\complibd.dll" />
-                  <File Id="file46" Name="DAPL2-_1.DLL"
-                    LongName="dapl2-scmd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\dapl2-scmd.dll" />
-                  <File Id="file47" Name="dapl2d.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\dapl2d.dll" />
-                  <File Id="file48" Name="DAPL2T_1.EXE"
-                    LongName="dapl2testd.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\dapl2testd.exe" />
-                  <File Id="file49" Name="dapld.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\dapld.dll" />
-                  <File Id="file50" Name="DAPLTE_1.EXE"
-                    LongName="dapltestd.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\dapltestd.exe" />
-                  <File Id="file51" Name="dat2d.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\dat2d.dll" />
-                  <File Id="file52" Name="datd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\datd.dll" />
-                  <File Id="file53" Name="dtest2d.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\dtest2d.exe" />
-                  <File Id="file54" Name="dtestxd.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\dtestxd.exe" />
-                  <File Id="file57" Name="ibald.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\ibald.dll" />
-                  <File Id="file60" Name="ibwsd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\ibwsd.dll" />
-                  <File Id="file68" Name="INSTAL_1.EXE"
-                    LongName="installsp.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\installsp.exe" />
-                  <File Id="file69" Name="mlx4ud.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\mlx4ud.dll" />
-                  <File Id="file72" Name="mthcaud.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\mthcaud.dll" />
-                  <File Id="file73" Name="opensm.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\opensm.exe" />
-                  <File Id="file174" Name="vstat.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\vstat.exe" />
-                  <File Id="file175" Name="part_man.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\part_man.exe" />
-                </Component>
-            </Directory>
+            <?include ..\..\common\IBcore.inc ?>
+            <?include ..\..\common\mlnx_drivers.inc ?>
+            <?include ..\..\common\winverbs_drivers.inc ?>
           </Directory>
-     
-          <Component Id="cWinVerbsOFED"
-                     Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.dll" Name="ibverbs.dll"
-                  Source="..\bin\HCA\amd64\libibverbs.dll" />
-              <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"
-                     DestinationName="ibverbs.dll"
-                     DestinationLongName="libibverbs.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                  Source="..\bin\HCA\amd64\libibverbs.pdb" />
-
-            <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                  Source="..\bin\HCA\amd64\libibverbsd.dll" />
-              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"
-                     DestinationName="ibverbsd.dll"
-                     DestinationLongName="libibverbsd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                  Source="..\bin\HCA\amd64\libibverbsd.pdb" />
-
-            <File Id="libibmad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmad.dll" Name="ibmad.dll"
-                  Source="..\bin\HCA\amd64\libibmad.dll" />
-              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"
-                     DestinationName="ibmad.dll"
-                     DestinationLongName="libibmad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmad.pdb" Name="ibmad.pdb"
-                  Source="..\bin\HCA\amd64\libibmad.pdb" />
-
-            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.dll" Name="ibmadd.dll"
-                  Source="..\bin\HCA\amd64\libibmadd.dll" />
-              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"
-                     DestinationName="ibmadd.dll"
-                     DestinationLongName="libibmadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                  Source="..\bin\HCA\amd64\libibmadd.pdb" />
-
-            <File Id="libibumad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumad.dll" Name="ibumad.dll"
-                  Source="..\bin\HCA\amd64\libibumad.dll" />
-              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"
-                     DestinationName="ibumad.dll"
-                     DestinationLongName="libibumad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumad.pdb" Name="ibumad.pdb"
-                  Source="..\bin\HCA\amd64\libibumad.pdb" />
-
-            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.dll" Name="ibumadd.dll"
-                  Source="..\bin\HCA\amd64\libibumadd.dll" />
-              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"
-                     DestinationName="ibumadd.dll"
-                     DestinationLongName="libibumadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                  Source="..\bin\HCA\amd64\libibumadd.pdb" />
-
-            <File Id="librdmacm.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.dll" Name="rdmacm.dll"
-                  Source="..\bin\HCA\amd64\librdmacm.dll" />
-              <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"
-                     DestinationName="rdmacm.dll"
-                     DestinationLongName="librdmacm.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.pdb" Name="rdmacm.pdb"
-                  Source="..\bin\HCA\amd64\librdmacm.pdb" />
 
-            <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.dll" Name="rdmacmd.dll"
-                  Source="..\bin\HCA\amd64\librdmacmd.dll" />
-              <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"
-                     DestinationName="rdmacmd.dll"
-                     DestinationLongName="librdmacmd.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.pdb" Name="rdmacmd.pdb"
-                  Source="..\bin\HCA\amd64\librdmacmd.pdb" />
-
-          </Component>
-
-          <Component Id="cWinVerbsUApps"
-                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
-
-            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.exe" />
-            <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.pdb" />
-            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.exe" Name="devinfo.exe"
-                  Source="..\bin\tools\amd64\release\ibv_devinfo.exe" />
-            <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_devinfo.pdb" />
-            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"
-                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.exe" />
-            <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.pdb" />
-            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.exe" Name="readbw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_read_bw.exe" />
-            <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_read_bw.pdb" />
-            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.exe" Name="readlat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_read_lat.exe" />
-            <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_read_lat.pdb" />
-            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.exe" Name="send_bw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_send_bw.exe" />
-            <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_send_bw.pdb" />
-            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.exe" Name="send_lat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_send_lat.exe" />
-            <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_send_lat.pdb" />
-            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"
-                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.exe" />
-            <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.pdb" />
-            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"
-                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.exe" />
-            <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.pdb" />
-            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.exe" Name="write_bw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_write_bw.exe" />
-            <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_write_bw.pdb" />
-            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.exe" Name="writelat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_write_lat.exe" />
-            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_write_lat.pdb" />
-            <File Id="sminfo.exe" Compressed="yes" DiskId="1"
-                  LongName="sminfo.exe" Name="sminfo.exe"
-                  Source="..\bin\tools\amd64\release\sminfo.exe" />
-            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="sminfo.pdb" Name="sminfo.pdb"
-                  Source="..\bin\tools\amd64\release\sminfo.pdb" />
-            <File Id="ibstat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibstat.exe" Name="ibstat.exe"
-                  Source="..\bin\tools\amd64\release\ibstat.exe" />
-            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibstat.pdb" Name="ibstat.pdb"
-                  Source="..\bin\tools\amd64\release\ibstat.pdb" />
-            <File Id="perfquery.exe" Compressed="yes" DiskId="1"
-                  LongName="perfquery.exe" Name="perfquer.exe"
-                  Source="..\bin\tools\amd64\release\perfquery.exe" />
-            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"
-                  LongName="perfquery.pdb" Name="perfquer.pdb"
-                  Source="..\bin\tools\amd64\release\perfquery.pdb" />
-            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.exe" Name="ibaddr.exe"
-                  Source="..\bin\tools\amd64\release\ibaddr.exe" />
-            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.pdb" Name="ibaddr.pdb"
-                  Source="..\bin\tools\amd64\release\ibaddr.pdb" />
-            <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.exe" Name="ibnetdis.exe"
-                  Source="..\bin\tools\amd64\release\ibnetdiscover.exe" />
-            <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"
-                  Source="..\bin\tools\amd64\release\ibnetdiscover.pdb" />
-            <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.exe" Name="rcmatose.exe"
-                  Source="..\bin\tools\amd64\release\rdma_cmatose.exe" />
-            <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"
-                  Source="..\bin\tools\amd64\release\rdma_cmatose.pdb" />
-            <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_lat.exe" />
-            <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_lat.pdb" />
-            <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_bw.exe" />
-            <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_bw.pdb" />
-            <File Id="ibroute.exe" Compressed="yes" DiskId="1"
-                  LongName="ibroute.exe" Name="ibroute.exe"
-                  Source="..\bin\tools\amd64\release\ibroute.exe" />
-            <File Id="ibroute.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibroute.pdb" Name="ibroute.pdb"
-                  Source="..\bin\tools\amd64\release\ibroute.pdb" />
-            <File Id="ibtracert.exe" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.exe" Name="ibtrt.exe"
-                  Source="..\bin\tools\amd64\release\ibtracert.exe" />
-            <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.pdb" Name="ibtrt.pdb"
-                  Source="..\bin\tools\amd64\release\ibtracert.pdb" />
-          </Component>
+          <?include ..\..\common\checked.inc ?>
+          <?include ..\..\common\winverbs_OFED.inc ?>
 
           <Directory Id="ipoibDir" Name="net">
-            <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
-              <CreateFolder />
-              <File Id="netipoib_inf" Compressed="yes" DiskId="1"
-                     LongName="netipoib.inf" Name="NETIPOI.INF"
-                     Source="..\bin\net\amd64\netipoib.inf" />
-              <File Id="ipoib_cat" Compressed="yes" DiskId="1"
-                     LongName="ipoib.cat" Name="IPOI.cat"
-                     Source="..\bin\net\amd64\ipoib.cat" />
-              <File Id="ipoib.sys" Compressed="yes" DiskId="1"
-                     LongName="ipoib.sys" Name="IPOIB.SYS"
-                     Source="..\bin\net\amd64\ipoib.sys" />
-              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"
-                     Name="ipoib.pdb"
-                     Source="..\bin\net\amd64\ipoib.pdb" />
-              <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd32.dll" Name="IBWSD32.DLL"
-                     Source="..\bin\net\amd64\ibwsd32.dll" />
-              <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd.dll" Name="IBWSD.DLL"
-                     Source="..\bin\net\amd64\ibwsd.dll" />
-              <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov.dll" Name="IBNDPROV.DLL"
-                     Source="..\bin\net\amd64\ibndprov.dll" />
-              <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"
-                     Source="..\bin\net\amd64\ibndprov32.dll" />
-              <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
-                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"
-                     Source="..\bin\net\amd64\ndinstall.exe" />
-              <!-- Orphaned install files - remove on uninstall -->
-              <RemoveFile Id='o32_ibwsd.dll' On='uninstall'
-                     Property="System64Folder"
-                     Name="ibwsd.dll" LongName='ibwsd.dll' />
-              <RemoveFile Id='o64_ibwsd.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="ibwsd.dll" LongName='ibwsd.dll' />
-            </Component>
+            <?include ..\..\common\ipoib.inc ?>
           </Directory>
 
           <Component Id="WinsockDirect"
                      Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
             <File Id="installsp.exe" Compressed="yes" DiskId="1"
                      LongName="installsp.exe" Name="INSTALL.EXE"
-                     Source="..\bin\net\amd64\installsp.exe" />
+                     Source="..\bin\net\$(var.ARCH)\installsp.exe" />
           </Component>
 
           <Component Id="cNetworkDirect"
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
           </Component>
 
-          <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-            <File Id="dapl32.dll" Compressed="yes" DiskId="1"
-                   LongName="dapl32.dll" Name="DAPL32.DLL"
-                   Source="..\bin\DAPL\amd64\dapl32.dll" />
-            <File Id="dapl32d.dll" Compressed="yes" DiskId="1"
-                   LongName="dapl32d.dll" Name="DAPL32D.DLL"
-                   Source="..\bin\DAPL\amd64\dapl32d.dll" />
-            <File Id="dapl.dll" Compressed="yes" DiskId="1"
-                   LongName="dapl.dll" Name="DAPL.DLL"
-                   Source="..\bin\DAPL\amd64\dapl.dll" />
-              <CopyFile Id="dupDAPL" FileId="dapl.dll"
-                      DestinationName="dapl.dll"
-                      DestinationProperty="WindowsFolder" />
-            <File Id="dapld.dll" Compressed="yes" DiskId="1"
-                   LongName="dapld.dll" Name="DAPLD.DLL"
-                   Source="..\bin\DAPL\amd64\dapld.dll" />
-            <File Id="dat32.dll" Compressed="yes" DiskId="1"
-                   LongName="dat32.dll" Name="DAT32.DLL"
-                   Source="..\bin\DAPL\amd64\dat32.dll" />
-            <File Id="dat32d.dll" Compressed="yes" DiskId="1"
-                   LongName="dat32d.dll" Name="DAT32D.DLL"
-                   Source="..\bin\DAPL\amd64\dat32d.dll" />
-            <File Id="dat.dll" Compressed="yes" DiskId="1"
-                   LongName="dat.dll" Name="DAT.DLL"
-                   Source="..\bin\DAPL\amd64\dat.dll" />
-            <CopyFile Id="dupDAT" FileId="dat.dll"
-                      DestinationName="dat.dll"
-                      DestinationProperty="WindowsFolder" />
-            <File Id="datd.dll" Compressed="yes" DiskId="1"
-                   LongName="datd.dll" Name="DATD.DLL"
-                   Source="..\bin\DAPL\amd64\datd.dll" />
-            <File Id="dat.conf" Compressed="yes" DiskId="1"
-                   LongName="dat.conf" Name="dat.conf"
-                   Source="..\..\dat.conf" />
-            <File Id="dapltest.exe" Compressed="yes" DiskId="1"
-                   LongName="dapltest.exe" Name="dapltest.exe"
-                   Source="..\bin\tools\amd64\release\dapltest.exe" />
-            <File Id="dapltestd.exe" Compressed="yes" DiskId="1"
-                   LongName="dapltestd.exe" Name="dapltesd.exe"
-                   Source="..\bin\tools\amd64\debug\dapltestd.exe" />
-
-            <File Id="dapl.pdb" Compressed="yes" DiskId="1"
-                  LongName="dapl.pdb" Name="dapl.pdb"
-                  Source="..\bin\DAPL\amd64\dapl.pdb" />
-            <File Id="dapld.pdb" Compressed="yes" DiskId="1"
-                  LongName="dapld.pdb" Name="dapld.pdb"
-                  Source="..\bin\DAPL\amd64\dapld.pdb" />
-            <File Id="dat.lib" Compressed="yes" DiskId="1"
-                  LongName="dat.lib" Name="dat.lib"
-                  Source="..\bin\DAPL\amd64\dat.lib" />
-            <File Id="datd.lib" Compressed="yes" DiskId="1"
-                  LongName="datd.lib" Name="datd.lib"
-                  Source="..\bin\DAPL\amd64\datd.lib" />
-            <File Id="dat.pdb" Compressed="yes" DiskId="1"
-                  LongName="dat.pdb" Name="dat.pdb"
-                  Source="..\bin\DAPL\amd64\dat.pdb" />
-            <File Id="datd.pdb" Compressed="yes" DiskId="1"
-                  LongName="datd.pdb" Name="datd.pdb"
-                  Source="..\bin\DAPL\amd64\datd.pdb" />
-            <File Id="dt_svr.bat" Compressed="yes" DiskId="1"
-                  LongName="dt-svr.bat" Name="dt-svr.bat"
-                  Source="..\bin\DAPL2\dt-svr.bat" />
-            <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"
-                      DestinationName="dt1-svr.bat"
-                      DestinationProperty="INSTALLDIR" />
-            <File Id="dt_cli.bat" Compressed="yes" DiskId="1"
-                  LongName="dt-cli.bat" Name="dt-cli.bat"
-                  Source="..\bin\DAPL2\dt-cli.bat" />
-            <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"
-                      DestinationName="dt1-cli.bat"
-                      DestinationProperty="INSTALLDIR" />
-          </Component>
-
-          <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
-              <File Id="_dapl32.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232.dll" Name="DAPL232.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl232.dll" />
-              <File Id="_dapl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232d.dll" Name="DAPL232D.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl232d.dll" />
-              <File Id="_dapl2.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2.dll" Name="DAPL2.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2.dll" />
-              <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"
-                        DestinationName="dapl2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2d.dll" Name="DAPL2D.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2d.dll" />
-              <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2-scm.dll" Name="D2-scm.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2-scm.dll" />
-              <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"
-                        DestinationName="d2-scm.dll"
-                        DestinationLongName="dapl2-scm.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2-scmd.dll" />
-              <File Id="_dat32.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232.dll" Name="DAT232.DLL"
-                     Source="..\bin\DAPL2\amd64\dat232.dll" />
-              <File Id="_dat32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232d.dll" Name="DAT232D.DLL"
-                     Source="..\bin\DAPL2\amd64\dat232d.dll" />
-              <File Id="_dat2.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2.dll" Name="DAT2.DLL"
-                     Source="..\bin\DAPL2\amd64\dat2.dll" />
-              <CopyFile Id="dupDAT2" FileId="_dat2.dll"
-                        DestinationName="dat2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dat2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2d.dll" Name="DAT2D.DLL"
-                     Source="..\bin\DAPL2\amd64\dat2d.dll" />
-              <File Id="dapl2test.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2test.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\amd64\release\dapl2test.exe" />
-              <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2testd.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\amd64\debug\dapl2testd.exe" />
-              <File Id="dtest2.exe" Compressed="yes" DiskId="1"
-                     LongName="dtest2.exe" Name="dtest2.exe"
-                     Source="..\bin\tools\amd64\release\dtest2.exe" />
-              <File Id="dtestx.exe" Compressed="yes" DiskId="1"
-                     LongName="dtestx.exe" Name="dtestx.exe"
-                     Source="..\bin\tools\amd64\release\dtestx.exe" />
-
-              <File Id="dapl2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2.pdb" Name="dapl2.pdb"
-                    Source="..\bin\DAPL2\amd64\dapl2.pdb" />
-              <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2d.pdb" Name="dapl2d.pdb"
-                    Source="..\bin\DAPL2\amd64\dapl2d.pdb" />
-              <File Id="dat2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2.pdb" Name="dat2.pdb"
-                    Source="..\bin\DAPL2\amd64\dat2.pdb" />
-              <File Id="dat2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2d.pdb" Name="dat2d.pdb"
-                    Source="..\bin\DAPL2\amd64\dat2d.pdb" />
-              <File Id="dat2.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2.lib" Name="dat2.lib"
-                    Source="..\bin\DAPL2\amd64\dat2.lib" />
-              <File Id="dat2d.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2d.lib" Name="dat2d.lib"
-                    Source="..\bin\DAPL2\amd64\dat2d.lib" />
-          </Component>
+          <?include ..\..\common\dapl_rt.inc ?>
 
           <Component Id="cQLVNIC_driver_installed"
                      Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
@@ -991,17 +91,17 @@
                        Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
               <CreateFolder />
               <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                     LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                     Source="..\bin\net\amd64\qlgcvnic.sys" />
+                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
               <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                     Name="qlgcvnic.pdb"
-                     Source="..\bin\net\amd64\qlgcvnic.pdb" />
+                    Name="qlgcvnic.pdb"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
               <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                     LongName="netvnic.inf" Name="NETVNIC.INF"
-                     Source="..\bin\net\amd64\netvnic.inf" />
+                    LongName="netvnic.inf" Name="NETVNIC.INF"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
               <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                     LongName="netvnic.cat" Name="NETVNIC.cat"
-                     Source="..\bin\net\amd64\netvnic.cat" />
+                    LongName="netvnic.cat" Name="NETVNIC.cat"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
             </Component>
           </Directory>
 
@@ -1009,31 +109,28 @@
                      Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
           </Component>
 
+          <!-- RDMA SCSI over IB (aka SRP) -->
           <Directory Id="srpDir" Name="SRP">
             <Component Id="cSRP_files"
                        Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
               <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_srp.inf" Name="IB_SRP.INF"
-                     Source="..\bin\storage\amd64\ib_srp.inf" />
+                    LongName="ib_srp.inf" Name="IB_SRP.INF"
+                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
               <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.cat" Name="IBSRP.CAT"
-                     Source="..\bin\storage\amd64\ibsrp.cat" />
+                    LongName="ibsrp.cat" Name="IBSRP.CAT"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
               <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.sys" Name="IBSRP.SYS"
-                     Source="..\bin\storage\amd64\ibsrp.sys" />
+                    LongName="ibsrp.sys" Name="IBSRP.SYS"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
               <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                     Name="ibsrp.pdb"
-                     Source="..\bin\storage\amd64\ibsrp.pdb" />
+                    Name="ibsrp.pdb"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
             </Component>
           </Directory>
-
-          <Component Id="OpenSM_Service_enabled"
-                     Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-          </Component>
         </Directory>
       </Directory>
 
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot"> 
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
 
       <!-- copy DAT header files to
          %SystemDrive%\DAT\v1-1\DAT
@@ -1041,504 +138,15 @@
       -->
 
         <Directory Id="dDATD" Name="DAT">
-            <Component Id="cDatCfg"
-                       Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >
-              <CreateFolder />
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
-            </Component>
-
-            <Directory Id="v1_1" Name="v1-1">
-              <Component Id="cDATV1"
-                         Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">
-                <CreateFolder />
-              </Component>    
-              <Directory Id="DDID" Name="DAT">    
-                <Component Id="cDatBldV1Hdrs"
-                          Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
-                  <CreateFolder />    
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat.h" />    
-
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat_error.h" />    
-    
-                  <File Id="dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    
-    
-                  <File Id="dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL\dat_redirection.h" />    
-    
-                  <File Id="dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL\dat_registry.h" />    
-    
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    
-    
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL\udat.h" />    
-    
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL\udat_config.h" />    
-    
-                  <File Id="udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL\udat_redirection.h" />    
-    
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    
-                </Component>    
-              </Directory>    
-
-              <Component Id="cDatBldV1Libs"
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    
-
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"
-                        LongName="dat.lib" Name="dat.lib"
-                        Source="..\bin\DAPL\amd64\dat.lib" />
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"
-                        LongName="datd.lib" Name="datd.lib"
-                        Source="..\bin\DAPL\amd64\datd.lib" />
-              </Component>
-            </Directory>    
-
-            <Directory Id="v2_0" Name="v2-0">
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"
-                         KeyPath="yes" SharedDllRefCount="yes">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID2" Name="DAT">    
-                <Component Id="cDatBldV2Hdrs"
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    
-                  <CreateFolder />    
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat.h" />    
-
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat_error.h" />    
-    
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    
-    
-                  <File Id="_dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL2\dat_redirection.h" />    
-    
-                  <File Id="_dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL2\dat_registry.h" />    
-    
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    
-    
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL2\udat.h" />    
-    
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL2\udat_config.h" />    
-    
-                  <File Id="_udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL2\udat_redirection.h" />    
-    
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    
-
-                </Component>    
-              </Directory>    
-
-              <Component Id="cDatBldV2Libs"
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    
-
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2.lib" Name="dat2.lib"
-                        Source="..\bin\DAPL2\amd64\dat2.lib" />
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2d.lib" Name="dat2d.lib"
-                        Source="..\bin\DAPL2\amd64\dat2d.lib" />
-              </Component>    
-            </Directory>    
-
-        </Directory>    
+          <?include ..\..\common\DAT_config.inc ?>
+        </Directory>
 
         <Directory Id="IBSDK" Name="IBSDK">
-          <Directory Id="IB_libs" Name="lib">
-            <Component Id="cIBAL_Libs"
-                       Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
-              <CreateFolder />
-              <File Id="ibal.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal.lib" Name="ibal.lib"
-                    Source="..\bin\HCA\amd64\ibal.lib" />
-              <File Id="ibal.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal.pdb" Name="ibal.pdb"
-                    Source="..\bin\HCA\amd64\ibal.pdb" />
-              <File Id="complib.lib" Compressed="yes" DiskId="1"
-                    LongName="complib.lib" Name="complib.lib"
-                    Source="..\bin\HCA\amd64\complib.lib" />
-              <File Id="complib.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib.pdb" Name="complib.pdb"
-                    Source="..\bin\HCA\amd64\complib.pdb" />
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"
-                    LongName="ibald.lib" Name="ibald.lib"
-                    Source="..\bin\HCA\amd64\ibald.lib" />
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibald.pdb" Name="ibald.pdb"
-                    Source="..\bin\HCA\amd64\ibald.pdb" />
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"
-                    LongName="complibd.lib" Name="complibd.lib"
-                    Source="..\bin\HCA\amd64\complibd.lib" />
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"
-                    LongName="complibd.pdb" Name="complibd.pdb"
-                    Source="..\bin\HCA\amd64\complibd.pdb" />
-
-               <!-- SysWOW64\ 32-bit libs -->
-              <File Id="cl32.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32.lib" Name="cl32.lib"
-                    Source="..\bin\HCA\amd64\cl32.lib" />
-              <File Id="cl32.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32.pdb" Name="cl32.pdb"
-                    Source="..\bin\HCA\amd64\cl32.pdb" />
-              <File Id="cl32d.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32d.lib" Name="cl32d.lib"
-                    Source="..\bin\HCA\amd64\cl32d.lib" />
-              <File Id="cl32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32d.pdb" Name="cl32d.pdb"
-                    Source="..\bin\HCA\amd64\cl32d.pdb" />
-              <File Id="ibal32.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32.lib" Name="ibal32.lib"
-                    Source="..\bin\HCA\amd64\ibal32.lib" />
-              <File Id="ibal32.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32.pdb" Name="ibal32.pdb"
-                    Source="..\bin\HCA\amd64\ibal32.pdb" />
-              <File Id="ibal32d.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.lib" Name="ibal32d.lib"
-                    Source="..\bin\HCA\amd64\ibal32d.lib" />
-              <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.pdb" Name="ibal32d.pdb"
-                    Source="..\bin\HCA\amd64\ibal32d.pdb" />
-
-              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbs.lib" Name="winverbs.lib"
-                    Source="..\bin\HCA\amd64\winverbs.lib" />
-              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.lib" Name="winvrbsd.lib"
-                    Source="..\bin\HCA\amd64\winverbsd.lib" />
-
-              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.lib" Name="ibverbs.lib"
-                    Source="..\bin\HCA\amd64\libibverbs.lib" />
-              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                    Source="..\bin\HCA\amd64\libibverbs.pdb" />
-              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                    Source="..\bin\HCA\amd64\libibverbsd.lib" />
-              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                    Source="..\bin\HCA\amd64\libibverbsd.pdb" />
-
-              <File Id="libibmad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmad.lib" Name="ibmad.lib"
-                    Source="..\bin\HCA\amd64\libibmad.lib" />
-              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmad.pdb" Name="ibmad.pdb"
-                    Source="..\bin\HCA\amd64\libibmad.pdb" />
-              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.lib" Name="ibmadd.lib"
-                    Source="..\bin\HCA\amd64\libibmadd.lib" />
-              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                    Source="..\bin\HCA\amd64\libibmadd.pdb" />
-
-              <File Id="libibumad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumad.lib" Name="ibumad.lib"
-                    Source="..\bin\HCA\amd64\libibumad.lib" />
-              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumad.pdb" Name="ibumad.pdb"
-                    Source="..\bin\HCA\amd64\libibumad.pdb" />
-              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.lib" Name="ibumadd.lib"
-                    Source="..\bin\HCA\amd64\libibumadd.lib" />
-              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                    Source="..\bin\HCA\amd64\libibumadd.pdb" />
-            </Component>
-          </Directory>
-
-          <Directory Id="IB_inc" Name="Inc">
-            <Component Id="cIBAL_Incs"
-                       Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">
-              <CreateFolder />
-
-              <File Id="oib_ver.h" Compressed="yes" DiskId="1"
-                     LongName="oib_ver.h" Name="oib_ver.h"
-                     Source="..\bin\Inc\oib_ver.h" />
-              <File Id="openib.def" Compressed="yes" DiskId="1"
-                     LongName="openib.def" Name="openib.def"
-                     Source="..\bin\Inc\openib.def" />
-            </Component>
-
-            <Directory Id="IB_complib" Name="complib">
-              <Component Id="cIBAL_Complib"
-                         Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">
-                <CreateFolder />
-                <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"
-                      LongName="cl_async_proc.h" Name="CL_ASYN.H" 
-                      Source="..\bin\Inc\complib\cl_async_proc.h" />
-                <File Id="cl_atomic.h" Compressed="yes" DiskId="1"
-                      LongName="cl_atomic.h" Name="CL_ATOM.H" 
-                      Source="..\bin\Inc\complib\cl_atomic.h" />
-                <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" 
-                      Source="..\bin\Inc\complib\cl_atomic_osd.h" />
-                <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_byteswap.h" Name="CL_BYTE.H" 
-                      Source="..\bin\Inc\complib\cl_byteswap.h" />
-                <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" 
-                      Source="..\bin\Inc\complib\cl_byteswap_osd.h" />
-                <File Id="cl_comppool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_comppool.h" Name="CL_COMP.H" 
-                      Source="..\bin\Inc\complib\cl_comppool.h" />
-                <File Id="cl_debug.h" Compressed="yes" DiskId="1"
-                      LongName="cl_debug.h" Name="CL_DEBU.H" 
-                      Source="..\bin\Inc\complib\cl_debug.h" />
-                <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_debug_osd.h" Name="CL_DEBU1.H" 
-                      Source="..\bin\Inc\complib\cl_debug_osd.h" />
-                <File Id="cl_event.h" Compressed="yes" DiskId="1"
-                      LongName="cl_event.h" Name="CL_EVEN.H" 
-                      Source="..\bin\Inc\complib\cl_event.h" />
-                <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_event_osd.h" Name="CL_EVEN1.H" 
-                      Source="..\bin\Inc\complib\cl_event_osd.h" />
-                <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_fleximap.h" Name="CL_FLEX.H" 
-                      Source="..\bin\Inc\complib\cl_fleximap.h" />
-                <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"
-                      LongName="cl_ioctl.h" Name="CL_IOCT.H" 
-                      Source="..\bin\Inc\complib\cl_ioctl.h" />
-                <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" 
-                      Source="..\bin\Inc\complib\cl_ioctl_osd.h" />
-                <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"
-                      LongName="cl_irqlock.h" Name="CL_IRQL.H" 
-                      Source="..\bin\Inc\complib\cl_irqlock.h" />
-                <File Id="cl_list.h" Compressed="yes" DiskId="1"
-                      LongName="cl_list.h" Name="CL_LIST.H" 
-                      Source="..\bin\Inc\complib\cl_list.h" />
-                <File Id="cl_log.h" Compressed="yes" DiskId="1"
-                      LongName="cl_log.h" Name="CL_LOG.H" 
-                      Source="..\bin\Inc\complib\cl_log.h" />
-                <File Id="cl_map.h" Compressed="yes" DiskId="1"
-                      LongName="cl_map.h" Name="CL_MAP.H" 
-                      Source="..\bin\Inc\complib\cl_map.h" />
-                <File Id="cl_math.h" Compressed="yes" DiskId="1"
-                      LongName="cl_math.h" Name="CL_MATH.H" 
-                      Source="..\bin\Inc\complib\cl_math.h" />
-                <File Id="cl_memory.h" Compressed="yes" DiskId="1"
-                      LongName="cl_memory.h" Name="CL_MEMO.H" 
-                      Source="..\bin\Inc\complib\cl_memory.h" />
-                <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_memory_osd.h" Name="CL_MEMO1.H" 
-                      Source="..\bin\Inc\complib\cl_memory_osd.h" />
-                <File Id="cl_mutex.h" Compressed="yes" DiskId="1"
-                      LongName="cl_mutex.h" Name="CL_MUTE.H" 
-                      Source="..\bin\Inc\complib\cl_mutex.h" />
-                <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" 
-                      Source="..\bin\Inc\complib\cl_mutex_osd.h" />
-                <File Id="cl_obj.h" Compressed="yes" DiskId="1"
-                      LongName="cl_obj.h" Name="CL_OBJ.H" 
-                      Source="..\bin\Inc\complib\cl_obj.h" />
-                <File Id="cl_packoff.h" Compressed="yes" DiskId="1"
-                      LongName="cl_packoff.h" Name="CL_PACK.H" 
-                      Source="..\bin\Inc\complib\cl_packoff.h" />
-                <File Id="cl_packon.h" Compressed="yes" DiskId="1"
-                      LongName="cl_packon.h" Name="CL_PACK1.H" 
-                      Source="..\bin\Inc\complib\cl_packon.h" />
-                <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"
-                      LongName="cl_passivelock.h" Name="CL_PASS.H" 
-                      Source="..\bin\Inc\complib\cl_passivelock.h" />
-                <File Id="cl_perf.h" Compressed="yes" DiskId="1"
-                      LongName="cl_perf.h" Name="CL_PERF.H" 
-                      Source="..\bin\Inc\complib\cl_perf.h" />
-                <File Id="cl_pool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_pool.h" Name="CL_POOL.H" 
-                      Source="..\bin\Inc\complib\cl_pool.h" />
-                <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"
-                      LongName="cl_ptr_vector.h" Name="CL_PTR_.H" 
-                      Source="..\bin\Inc\complib\cl_ptr_vector.h" />
-                <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qcomppool.h" Name="CL_QCOM.H" 
-                      Source="..\bin\Inc\complib\cl_qcomppool.h" />
-                <File Id="cl_qlist.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qlist.h" Name="CL_QLIS.H" 
-                      Source="..\bin\Inc\complib\cl_qlist.h" />
-                <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qlockpool.h" Name="CL_QLOC.H" 
-                      Source="..\bin\Inc\complib\cl_qlockpool.h" />
-                <File Id="cl_qmap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qmap.h" Name="CL_QMAP.H" 
-                      Source="..\bin\Inc\complib\cl_qmap.h" />
-                <File Id="cl_qpool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qpool.h" Name="CL_QPOO.H" 
-                      Source="..\bin\Inc\complib\cl_qpool.h" />
-                <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_rbmap.h" Name="CL_RBMA.H" 
-                      Source="..\bin\Inc\complib\cl_rbmap.h" />
-                <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"
-                      LongName="cl_reqmgr.h" Name="CL_REQM.H" 
-                      Source="..\bin\Inc\complib\cl_reqmgr.h" />
-                <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"
-                      LongName="cl_spinlock.h" Name="CL_SPIN.H" 
-                      Source="..\bin\Inc\complib\cl_spinlock.h" />
-                <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" 
-                      Source="..\bin\Inc\complib\cl_spinlock_osd.h" />
-                <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"
-                      LongName="cl_syscallback.h" Name="CL_SYSC.H" 
-                      Source="..\bin\Inc\complib\cl_syscallback.h" />
-                <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" 
-                      Source="..\bin\Inc\complib\cl_syscallback_osd.h" />
-                <File Id="cl_thread.h" Compressed="yes" DiskId="1"
-                      LongName="cl_thread.h" Name="CL_THRE.H" 
-                      Source="..\bin\Inc\complib\cl_thread.h" />
-                <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_thread_osd.h" Name="CL_THRE1.H" 
-                      Source="..\bin\Inc\complib\cl_thread_osd.h" />
-                <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_threadpool.h" Name="CL_THRE2.H" 
-                      Source="..\bin\Inc\complib\cl_threadpool.h" />
-                <File Id="cl_timer.h" Compressed="yes" DiskId="1"
-                      LongName="cl_timer.h" Name="CL_TIME.H" 
-                      Source="..\bin\Inc\complib\cl_timer.h" />
-                <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_timer_osd.h" Name="CL_TIME1.H" 
-                      Source="..\bin\Inc\complib\cl_timer_osd.h" />
-                <File Id="cl_types.h" Compressed="yes" DiskId="1"
-                      LongName="cl_types.h" Name="CL_TYPE.H" 
-                      Source="..\bin\Inc\complib\cl_types.h" />
-                <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_types_osd.h" Name="CL_TYPE1.H" 
-                      Source="..\bin\Inc\complib\cl_types_osd.h" />
-                <File Id="cl_vector.h" Compressed="yes" DiskId="1"
-                      LongName="cl_vector.h" Name="CL_VECT.H" 
-                      Source="..\bin\Inc\complib\cl_vector.h" />
-                <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"
-                      LongName="cl_waitobj.h" Name="CL_WAIT.H" 
-                      Source="..\bin\Inc\complib\cl_waitobj.h" />
-                <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" 
-                      Source="..\bin\Inc\complib\cl_waitobj_osd.h" />
-                <File Id="comp_lib.h" Compressed="yes" DiskId="1"
-                      LongName="comp_lib.h" Name="COMP_LI.H" 
-                      Source="..\bin\Inc\complib\comp_lib.h" />
-              </Component>
-            </Directory>
-
-            <Directory Id="IB_iba" Name="iba">
-              <Component Id="cIBAL_IBA"
-                         Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">
-                <CreateFolder />
-                <File Id="ib_al.h" Compressed="yes" DiskId="1"
-                      LongName="ib_al.h" Name="ib_al.h"
-                      Source="..\bin\Inc\iba\ib_al.h" />
-                <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"
-                      LongName="ib_al_ioctl.h" Name="ib_ioctl.h"
-                      Source="..\bin\Inc\iba\ib_al_ioctl.h" />
-                <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"
-                      LongName="ib_at_ioctl.h" Name="ib_iocat.h"
-                      Source="..\bin\Inc\iba\ib_at_ioctl.h" />
-                <File Id="ib_ci.h" Compressed="yes" DiskId="1"
-                      LongName="ib_ci.h" Name="ib_ci.h"
-                      Source="..\bin\Inc\iba\ib_ci.h" />
-                <File Id="ib_types.h" Compressed="yes" DiskId="1"
-                      LongName="ib_types.h" Name="ib_types.h"
-                      Source="..\bin\Inc\iba\ib_types.h" />
-                <File Id="ib_uvp.h" Compressed="yes" DiskId="1"
-                      LongName="ib_uvp.h" Name="ib_uvp.h"
-                      Source="..\bin\Inc\iba\ib_uvp.h" />
-              </Component>
-            </Directory>
-          </Directory>
-
-          <Directory Id="IB_samples" Name="Samples">
-            <Directory Id="sample_DDK" Name="DDK">
-              <Component Id="cDDK_example"
-                         Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">
-                <CreateFolder />
-                    <File Id="cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\misc\cmtest.c" />
-                    <File Id="cmtest.rc" Compressed="yes" DiskId="1"
-                          LongName="cmtest.rc" Name="cmtest.rc"
-                          Source="..\..\SDK_Samples\DDK\cmtest.rc" />
-                    <File Id="makefile" Compressed="yes" DiskId="1"
-                          LongName="makefile" Name="makefile"
-                          Source="..\..\SDK_Samples\DDK\makefile" />
-                    <File Id="SOURCES" Compressed="yes" DiskId="1"
-                          LongName="SOURCES" Name="SOURCES"
-                          Source="..\..\SDK_Samples\DDK\SOURCES" />
-                    <File Id="README.txt" Compressed="yes" DiskId="1"
-                          LongName="README.txt" Name="README.txt"
-                          Source="..\..\SDK_Samples\DDK\README.txt" />
-              </Component>
-            </Directory>    <!-- End DDK -->
+          <?include ..\..\common\ib_sdk.inc ?>
+        </Directory>
 
-            <Directory Id="sample_VS" Name="VS">
-              <Component Id="cVS_example"
-                         Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">
-                <CreateFolder />
-                    <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\misc\cmtest.c" />
-                    <File Id="vs_cmtest.rc" Compressed="yes" DiskId="1"
-                          LongName="cmtest.rc" Name="cmtest.rc"
-                          Source="..\..\SDK_Samples\VS\cmtest.rc" />
-                    <File Id="vsREADME.txt" Compressed="yes" DiskId="1"
-                          LongName="README.txt" Name="README.txt"
-                          Source="..\..\SDK_Samples\VS\README.txt" />
-                    <File Id="Makefile.x64" Compressed="yes" DiskId="1"
-                          LongName="Makefile.x64" Name="Makefile.x64"
-                          Source="..\..\SDK_Samples\VS\Makefile.x64" />
-              </Component>
-            </Directory>   <!-- End VS -->
-          </Directory>   <!-- End Samples -->
-        </Directory>  <!-- End IBSDK -->
-      </Directory>  <!-- End WinRoot -->
-    </Directory>  <!-- End TARGETDIR -->
+      </Directory>
+    </Directory> <!-- End TARGETDIR -->
 
 <!--
     <Property Id='ARPNOMODIFY'>1</Property>
@@ -1551,11 +159,11 @@
     <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
 
     <!--
-       Features - Level=1 == Typical, no WSD on XP
+       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
      -->
 
     <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"
-         Description="Mellanox Host Channel Adapter Drivers for ConnectX and InfiniHost"
+         Description="Mellanox InfiniBand Host Channel Adapter Drivers"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
       <ComponentRef Id="cMthcaDriver" />
@@ -1563,9 +171,9 @@
     </Feature>
 
     <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"
-         Description="InfiniBand: Core, Tools, Docs"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
+        Description="InfiniBand: Core, Tools, Docs"
+        Display="expand" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">
       <ComponentRef Id="cIBcore" />
       <ComponentRef Id="cWinVerbsDrivers" />
       <ComponentRef Id="Docs" />
@@ -1584,9 +192,9 @@
     </Feature>
 
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"
-         Description="Internet Protocols over InfiniBand" Display="expand"
-         ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="Internet Protocols over InfiniBand" Display="expand"
+        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
       <ComponentRef Id="IPoIB" />
     </Feature>
 
@@ -1608,22 +216,22 @@
     </Feature>
 
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"
-         Description="Open Subnet Management started as a local Windows Service"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="Open Subnet Management started as a local Windows Service"
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
       <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
     <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"
-         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <Condition Level="201"> IPOIB_EXISTS </Condition>
 
       <Feature Id="fDatConf" Title="DAT-DAPL Config File"
-         Description="DAT-DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
+         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
          Display="expand" Level="1" 
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
-        <Condition Level="0"> Not Installed AND DAT_CONF_EXISTS </Condition>
+        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>
         <ComponentRef Id="cDatCfg" />
       </Feature>
 
@@ -1669,9 +277,9 @@
     </Feature>
 
     <Feature Id="fVNIC" Title="QLogic-VNIC"
-         Description="QLogic - Virtual NIC over InfiniBand"
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="QLogic - Virtual NIC over InfiniBand"
+        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <ComponentRef Id="cQLVNIC_driver_installed" />
     </Feature>
 
@@ -1695,69 +303,7 @@
       <ComponentRef Id="cCHK_user" />
     </Feature>
 
-    <!--> File where Custom Actions are defined -->
-    <Binary Id='CA' src='..\..\CustomActions.vbs' />
-
-    <CustomAction Id='WinOF_setup' BinaryKey='CA'
-         VBScriptCall='WinOF_setup' Return='check' />
-
-    <CustomAction Id='ChkPreviousInstall' BinaryKey='CA'
-         VBScriptCall='ChkInstallAndReboot' Return='check' />
-
-    <CustomAction Id='DriverInstall' BinaryKey='CA'
-         VBScriptCall='DriverInstall' Return='check' Execute='deferred' />
-
-    <CustomAction Id='DriverUninstall' BinaryKey='CA'
-         VBScriptCall='DriverUninstall' Return='check' />
-
-    <CustomAction Id='WSDStart' BinaryKey='CA'
-         VBScriptCall='WSDEnable' Return='check' />
-
-    <CustomAction Id="ND_start" BinaryKey="CA"
-         VBScriptCall="ND_StartMeUp" Return="check" />
-
-    <CustomAction Id='HammerTime' BinaryKey='CA'
-         VBScriptCall='HammerTime' Return='check' />
-
-    <CustomAction Id="BcastRegChanged" BinaryKey="CA"
-         VBScriptCall="BcastRegChanged" Return="check" />
-
-    <CustomAction Id="InstallChanged" BinaryKey="CA"
-         VBScriptCall="InstallChanged" Return="check" />
-
-    <InstallExecuteSequence>
-       <!--> Always executed (Install or uninstall </!-->
-       <Custom Action="WinOF_setup" After='InstallInitialize' />
-
-       <!--> Install ONLY </!-->
-       <Custom Action="ChkPreviousInstall" After='WinOF_setup'>
-               NOT Installed</Custom>
-
-       <ScheduleReboot After='ChkPreviousInstall'>
-               REBOOT="FORCE"</ScheduleReboot>
-
-       <Custom Action="DriverInstall" After='InstallServices'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="WSDStart" After='InstallFinalize'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="ND_start" After="WSDStart">
-          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="BcastRegChanged" After="ND_start">
-           Not Installed</Custom>
-
-       <!--> CHANGE ONLY </!-->
-       <Custom Action="InstallChanged" After="InstallFinalize">
-           Installed </Custom>
-
-       <!--> REMOVE ONLY </!-->
-       <Custom Action="DriverUninstall" After='PublishProduct'>
-               REMOVE="ALL" </Custom>
-       <Custom Action="HammerTime" After='InstallFinalize'>REMOVE="ALL"</Custom>
-    </InstallExecuteSequence>
-
+    <?include ..\..\common\InstallExecuteSeq.inc ?>
 
     <UIRef Id="WixUI_FeatureTree" />
       <UIRef Id="WixUI_ErrorProgressText" />
diff --git a/trunk/WinOF/WIX/wlh/x86/wof.wxs b/trunk/WinOF/WIX/wlh/x86/wof.wxs
index 263f2eed..2c142a06 100644
--- a/trunk/WinOF/WIX/wlh/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x86/wof.wxs
@@ -2,22 +2,28 @@
 <!--
    WinOF (Windows OpenFabrics InfiniBand) for x86 Windows Server 2008 or Vista
 -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 
-  <Product Name="Windows OpenFabrics InfiniBand v2.1.0 (RC0) x86"
-   Version="2.1.0"
-   Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
-   UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
-   Language="1033" Codepage="1252"
-   Manufacturer="Open Fabrics Alliance Windows">
+<?define ARCH=x86 ?>
+<?define ARCHP=x86 ?>
+<?define OS=wlh ?>
+<?include ..\..\common\WinOF_cfg.inc ?>
 
-   <Package Id="????????-????-????-????-????????????"
-    Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
-    InstallPrivileges='elevated'
-    Description="WinOF Installer"
-    Comments="Open Fabrics Alliance Windows InfiniBand stack"
-    Manufacturer="OpenFabrics Alliance Windows" InstallerVersion="200"
-    Languages="1033" Compressed="yes" SummaryCodepage="1252" />
+<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+  <Product
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"
+    Version="$(var.WOFRELNUM)"
+    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
+    Language="1033" Codepage="1252"
+    Manufacturer="Open Fabrics Alliance Windows">
+
+    <Package Id="????????-????-????-????-????????????"
+     Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
+     InstallPrivileges='elevated'
+     Description="WinOF Installer"
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
+     Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Condition Message="Administrator required to install [ProductName].">
      Privileged
@@ -29,1429 +35,117 @@
     <Condition Message="[ProductName] requires Windows Server 2008 or Vista to install.">
      <![CDATA[(VersionNT=600)]]></Condition>
 
-    <!--
-        System/Machine-wide install, otherwise per-user (Administrator) only.
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.
-     -->
-    <Property Id="ALLUSERS"> Value="1" </Property>
-
-    <!-- Requires files sc.exe & reg.exe -->
-
-    <Property Id="REG_EXISTS">
-        <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">
-            <FileSearch Id="RegFile" Name="reg.exe" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="SC_EXISTS">
-        <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">
-            <FileSearch Id="ScFile" Name="sc.exe" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="IPOIB_EXISTS">
-        <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">
-            <FileSearch Id="ipoibFile" Name="netipoib.inf" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT_CONF_EXISTS">
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">
-        <FileSearch Id="DCFile" Name="dat.conf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT1_INSTALLED">
-      <DirectorySearch Id="Dat1File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="daplFile" Name="dapl.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT2_INSTALLED">
-      <DirectorySearch Id="Dat2File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="dapl2File" Name="dapl2.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Condition Message="[ProductName] requires system file reg.exe">
-       REG_EXISTS
-    </Condition>
-    <Condition Message="[ProductName] requires system file sc.exe">
-       SC_EXISTS
-    </Condition>
-    <Media Id="1" Cabinet="Data1.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
-    <Property Id="DiskPrompt" Value="WinOF 1.1 Installation [1]" />
+    <?include ..\..\common\requirements.inc ?>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-        <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
-            <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"
-                       Name="WinOF" />
-        </Directory>
-        <Directory Id="DesktopFolder" Name="Desktop" />
-        <Directory Id="ProgramFilesFolder" Name="PFiles">
-            <Directory Id="INSTALLDIR" Name="WinOF">
-                <Component Id="Docs"
-                           Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
-                    <File Id="OFAlogo" Compressed="yes" DiskId="1"
-                          LongName="openfabrics.gif" Name="ofa.gif"
-                          Source="..\..\openfabrics.gif" />
-
-                   <!-- implies WIX build only from an svn structured tree.  -->
-                    <File Id="manual.htm" Compressed="yes" DiskId="1"
-                          Name="Manual.htm" LongName="Manual.htm" Vital="yes"
-                          Source="..\bin\Misc\Manual.htm" /> 
-
-                    <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
-                          Name="Manual.htm" LongName="Manual"
-                          Target="[INSTALLDIR]\Manual.htm" Show="normal"
-                          WorkingDirectory="INSTALLDIR"
-                          Icon="openfabrics" IconIndex="0" />
-
-                    <File Id="dRelnotes" Compressed="yes" DiskId="1"
-                          LongName="Release_notes.htm" Name="RELEASE_.HTM"
-                          Source="..\..\Release_notes.htm" />
-                    <Shortcut Id="RelNotes" Directory="ProgramMenuDir"
-                          Name="RelNotes" LongName="Release Notes"
-                          Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
-                          WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                          IconIndex="0" />
-                    <File Id="command_window" Name="COMMAND.LNK"
-                          LongName="Command Window.lnk" Compressed="yes"
-                          DiskId="1" Source="..\..\x86\Command Window.lnk"
-                          Vital="yes" />
-                    <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
-                          Name="COMMAND.LNK" LongName="Command Window.lnk"
-                          Target="[INSTALLDIR]\Command Window.lnk"
-                          Icon="openfabrics" IconIndex="0" Show="normal"
-                          WorkingDirectory="INSTALLDIR" />
-                    <Shortcut Id="UninstallProduct" Name="UnMyApp"
-                          LongName="Uninstall WinOF"
-                          Target="[SystemFolder]msiexec.exe"
-                          Arguments="/X [ProductCode]"
-                          Directory="ProgramMenuDir"
-                          Description="Uninstall Windows OpenFabrics InfinBand stack" />
-                    <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
-                </Component>
-
-                <Component Id="Tools"
-                           Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
-                    <Environment Id='UpdatePath' Name='PATH' Action='create'
-                           System='yes' Part='last' Value='[INSTALLDIR]' />
-
-                    <File Id="qlgcvnic_config"
-                          Compressed="yes" DiskId="1" Vital="yes"
-                          Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"
-                        Source="..\bin\tools\x86\release\qlgcvnic_config.exe" />
-                    <File Id="part_man" Name="part_man.exe"
-                          Compressed="yes" DiskId="1" Vital="yes"
-                          Source="..\bin\tools\x86\release\part_man.exe" />
-                    <File Id="vstat" Name="vstat.exe"
-                          Compressed="yes" Vital="yes" DiskId="1"
-                          Source="..\bin\tools\x86\release\vstat.exe" />
-                    <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
-                          DiskId="1" Name="TTCP.EXE"
-                          Source="..\bin\tools\x86\release\ttcp.exe" />
-                    <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
-                          DiskId="1" Name="CMTEST.EXE"
-                          Source="..\bin\tools\x86\release\cmtest.exe" />
-                    <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_limits.exe" Name="IB_LIMI.EXE"
-                          Source="..\bin\tools\x86\release\ib_limits.exe" />
-                    <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_read_bw.exe" Name="IB_READ.EXE"
-                          Source="..\bin\tools\x86\release\ib_read_bw.exe" />
-                    <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
-                          Source="..\bin\tools\x86\release\ib_read_lat.exe" />
-                    <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
-                          Source="..\bin\tools\x86\release\ib_send_bw.exe" />
-                    <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
-                          Source="..\bin\tools\x86\release\ib_send_lat.exe" />
-                    <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
-                          Source="..\bin\tools\x86\release\ib_write_bw.exe" />
-                    <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
-                          Source="..\bin\tools\x86\release\ib_write_lat.exe" />
-                    <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
-                          LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
-                          Source="..\bin\tools\x86\release\ibtrapgen.exe" />
-                    <File Id="osmtest.exe" Compressed="yes" DiskId="1"
-                          LongName="osmtest.exe" Name="OSMTEST.EXE"
-                          Source="..\bin\tools\x86\release\osmtest.exe" />
-                    <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
-                          LongName="PrintIP.exe" Name="PRINTIP.EXE"
-                          Source="..\bin\tools\x86\release\PrintIP.exe" />
-                    <File Id="nsc" Name="nsc.exe" Vital="yes"
-                          Compressed="yes" DiskId="1"
-                          Source="..\bin\tools\x86\release\nsc.exe" />
-                </Component>
-
-                <Component Id='OpenSMservice'
-                           Guid='90042B4F-51B5-4720-8E54-6D366253634B'
-                           SharedDllRefCount='no' KeyPath='no'
-                           NeverOverwrite='no'
-                           Permanent='no' Transitive='no' Win64='no'
-                           Location='either'>
-
-                  <File Id="opensm.exe" Compressed="yes" DiskId="1"
-                        LongName="opensm.exe" Name="OPENSM.EXE"
-                        Source="..\bin\tools\x86\release\opensm.exe"
-                        Vital='yes' KeyPath='yes' Hidden='no' System='no' 
-                        Checksum='no' ReadOnly='no' />
-
-                  <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
-                    Description='InfiniBand Subnet Configuration and Management'
-                      DisplayName='InfiniBand Subnet Manager'
-                      Arguments='-e --service'
-                      ErrorControl='normal'
-                      Start='disabled'
-                      Interactive='no'
-                      Type='ownProcess' />
-
-                  <ServiceControl Id='osmSvcControl' Name='OpenSM'
-                                  Stop='uninstall'
-                                  Wait='no'
-                                  Remove='uninstall' />
-                </Component>
-
-                <Directory Id="IBcoreDir" Name="IBcore">
-                    <Component Id="cIBcore"
-                               Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
-                        <CreateFolder />
-                        <File Id="dpinst.exe" Compressed="yes" DiskId="1"
-                              LongName="dpinst.exe" Name="dpinst.exe"
-                              Source="..\..\x86\dpinst.exe" />
-                        <File Id="dpinst.xml" Compressed="yes" DiskId="1"
-                               LongName="dpinst.xml" Name="dpinst.xml"
-                               Source="..\..\dpinst.xml" />
-                        <File Id="devman.exe" Compressed="yes" DiskId="1"
-                              LongName="devman.exe" Name="devman.exe"
-                              Source="..\..\x86\devman.exe" />
-                        <File Id="WdfCoinstaller" Compressed="yes" DiskId="1"
-                              LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                              Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />
-                        <File Id="complib.dll" Compressed="yes" DiskId="1"
-                              LongName="complib.dll" Name="COMPLIB.DLL"
-                              Source="..\bin\HCA\x86\complib.dll" />
-                        <File Id="complibd.dll" Compressed="yes" DiskId="1"
-                              LongName="complibd.dll" Name="COMPLIBD.DLL"
-                              Source="..\bin\HCA\x86\complibd.dll" />
-                        <File Id="ibal.dll" Compressed="yes" DiskId="1"
-                              LongName="ibal.dll" Name="IBAL.DLL"
-                              Source="..\bin\HCA\x86\ibal.dll" />
-                        <File Id="ibald.dll" Compressed="yes" DiskId="1"
-                              LongName="ibald.dll" Name="IBALD.DLL"
-                              Source="..\bin\HCA\x86\ibald.dll" />
-                        <File Id="ibbus.sys" Compressed="yes" DiskId="1"
-                              LongName="ibbus.sys" Name="IBBUS.SYS"
-                              Source="..\bin\HCA\x86\ibbus.sys" />
-                        <File Id="ibbus.pdb" Compressed="yes" DiskId="1"
-                              Name="ibbus.pdb"
-                              Source="..\bin\HCA\x86\ibbus.pdb" />
-                        <File Id="ibiou.sys" Compressed="yes" DiskId="1"
-                              LongName="ibiou.sys" Name="IBIOU.SYS"
-                              Source="..\bin\HCA\x86\ibiou.sys" />
-                        <File Id="ibiou.pdb" Compressed="yes" DiskId="1"
-                              Name="ibiou.pdb"
-                              Source="..\bin\HCA\x86\ibiou.pdb" />
-                        <File Id="ib_iou.cat" Compressed="yes" DiskId="1"
-                              LongName="ib_iou.cat" Name="IB_iou.cat"
-                              Source="..\bin\HCA\x86\ib_iou.cat" />
-                        <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
-                              LongName="ib_iou.inf" Name="ib_iou.inf"
-                              Source="..\bin\HCA\x86\ib_iou.inf" />
-                        <!--
-                           Orphaned install files - remove on uninstall
-                        -->
-                        <RemoveFile Id='o64_ibal.dll' On='uninstall'
-                               Property="SystemFolder"
-                               Name="ibal.dll" LongName='ibal.dll' />
-                        <RemoveFile Id='o64_complib.dll' On='uninstall'
-                               Property="SystemFolder"
-                               Name="complib.dll" LongName='complib.dll' />
-                    </Component>
-
-                    <Component Id="cMthcaDriver"
-                               Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">
-                        <File Id="mthca.inf" Compressed="yes" DiskId="1"
-                              LongName="mthca.inf" Name="MTHCA.INF"
-                              Source="..\bin\HCA\x86\mthca.inf" />
-                        <File Id="mthca.cat" Compressed="yes" DiskId="1"
-                              LongName="mthca.cat" Name="MTHCA.cat"
-                              Source="..\bin\HCA\x86\mthca.cat" />
-                        <File Id="mthca.sys" Compressed="yes" DiskId="1"
-                              LongName="mthca.sys" Name="MTHCA.SYS"
-                              Source="..\bin\HCA\x86\mthca.sys" />
-                        <File Id="mthca.pdb" Compressed="yes" DiskId="1"
-                              Name="mthca.pdb"
-                              Source="..\bin\HCA\x86\mthca.pdb" />
-                        <File Id="mthcau.dll" Compressed="yes" DiskId="1"
-                              LongName="mthcau.dll" Name="MTHCAU.DLL"
-                              Source="..\bin\HCA\x86\mthcau.dll" />
-                        <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
-                              LongName="mthcaud.dll" Name="MTHCAUD.DLL"
-                              Source="..\bin\HCA\x86\mthcaud.dll" />
-                        <!-- Orphaned install files - remove on uninstall -->
-                        <RemoveFile Id='o32_mthcau.dll' On='uninstall'
-                               Property="SystemFolder"
-                               Name="mthcau.dll" LongName='mthcau.dll' />
-                    </Component>
-
-                    <Component Id="cConnectXDriver"
-                               Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
-                        <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.inf" Name="mlx4_bus.INF"
-                              Source="..\bin\hca\x86\mlx4_bus.inf" />
-                        <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.cat" Name="mlx4_bus.cat"
-                              Source="..\bin\hca\x86\mlx4_bus.cat" />
-                        <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
-                              Source="..\bin\hca\x86\mlx4_bus.sys" />
-                        <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
-                              Name="mlx4_bus.pdb"
-                              Source="..\bin\hca\x86\mlx4_bus.pdb" />
-                        <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
-                              Source="..\bin\hca\x86\mlx4_hca.inf" />
-                        <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.cat" Name="mlx4_hca.cat"
-                              Source="..\bin\hca\x86\mlx4_hca.cat" />
-                        <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.sys" Name="mlx4_hca.sys"
-                              Source="..\bin\hca\x86\mlx4_hca.sys" />
-                        <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"
-                              Name="mlx4_hca.pdb"
-                              Source="..\bin\hca\x86\mlx4_hca.pdb" />
-                        <File Id="mlx4u.dll" Compressed="yes" DiskId="1"
-                              LongName="mlx4u.dll" Name="mlx4u.dll"
-                              Source="..\bin\hca\x86\mlx4u.dll" />
-                        <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"
-                              LongName="mlx4ud.dll" Name="mlx4ud.dll"
-                              Source="..\bin\hca\x86\mlx4ud.dll" />
-                    </Component>
-
-                    <Component Id="cWinVerbsDrivers"
-                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-
-                        <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                              LongName="winverbs.sys" Name="winverbs.sys"
-                              Source="..\bin\HCA\x86\winverbs.sys" />
-                        <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
-                              LongName="winverbs.pdb" Name="winverbs.pdb"
-                              Source="..\bin\HCA\x86\winverbs.pdb" />
-                        <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                              LongName="winverbs.dll" Name="winvrbs.dll"
-                              Source="..\bin\HCA\x86\winverbs.dll" />
-                        <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                              LongName="winverbsd.dll" Name="winvrbsd.dll"
-                              Source="..\bin\HCA\x86\winverbsd.dll" />
-                        <File Id="winmad.sys" Compressed="yes" DiskId="1"
-                              LongName="winmad.sys" Name="winmad.sys"
-                              Source="..\bin\HCA\x86\winmad.sys" />
-                        <File Id="winmad.pdb" Compressed="yes" DiskId="1"
-                              LongName="winmad.pdb" Name="winmad.pdb"
-                              Source="..\bin\HCA\x86\winmad.pdb" />
-                        <File Id="winmad.dll" Compressed="yes" DiskId="1"
-                              LongName="winmad.dll" Name="winmad.dll"
-                              Source="..\bin\HCA\x86\winmad.dll" />
-                        <File Id="winmadd.dll" Compressed="yes" DiskId="1"
-                              LongName="winmadd.dll" Name="winmaddd.dll"
-                              Source="..\bin\HCA\x86\winmadd.dll" />
-                    </Component>
-                </Directory>
-
-                <Directory Id="dir_0" Name="Checked">
-                  <Directory Id="dir_1" Name="kernel">
-                    <Component Id="cCHK_kernel"
-                               Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
-                      <CreateFolder />
-     
-                      <File Id="chk0" DiskId="1" Compressed="yes"
-                            Name="README.txt"
-                            Source="..\..\README_checked.txt" />
-                      <File Id="chk1" DiskId="1" Compressed="yes"
-                            Name="mthca.sys"
-                            Source="..\bin\Chk\HCA\x86\mthca.sys" />
-                      <File Id="cat1" DiskId="1" Compressed="yes"
-                            Name="mthca.cat"
-                            Source="..\bin\Chk\HCA\x86\mthca.cat" />
-                      <File Id="sym1" DiskId="1" Compressed="yes"
-                            Name="mthca.pdb"
-                            Source="..\bin\Chk\HCA\x86\mthca.pdb" />
-     
-                      <File Id="chk2" DiskId="1" Compressed="yes"
-                            Name="ibbus.sys"
-                            Source="..\bin\Chk\HCA\x86\ibbus.sys" />
-                      <File Id="sym2" DiskId="1" Compressed="yes"
-                            Name="ibbus.pdb"
-                            Source="..\bin\Chk\HCA\x86\ibbus.pdb" />
-     
-                      <File Id="chk3" DiskId="1" Compressed="yes"
-                            Name="ibiou.sys"
-                            Source="..\bin\Chk\HCA\x86\ibiou.sys" />
-                      <File Id="cat3" DiskId="1" Compressed="yes"
-                            Name="ib_iou.cat"
-                            Source="..\bin\Chk\HCA\x86\ib_iou.cat" />
-                      <File Id="sym3" DiskId="1" Compressed="yes"
-                            Name="ibiou.pdb"
-                            Source="..\bin\Chk\HCA\x86\ibiou.pdb" />
-     
-                      <File Id="chk4" DiskId="1" Compressed="yes"
-                            Name="ipoib.sys"
-                          Source="..\bin\Chk\net\x86\ipoib.sys" />
-                      <File Id="cat4" DiskId="1" Compressed="yes"
-                            Name="ipoib.cat"
-                            Source="..\bin\Chk\net\x86\ipoib.cat" />
-                      <File Id="sym4" DiskId="1" Compressed="yes"
-                            Name="ipoib.pdb"
-                            Source="..\bin\Chk\net\x86\ipoib.pdb" />
-     
-                      <File Id="chk5" DiskId="1" Compressed="yes"
-                            Name="qlgcvnic.sys"
-                            Source="..\bin\Chk\net\x86\qlgcvnic.sys" />
-                      <File Id="cat5" DiskId="1" Compressed="yes"
-                            Name="netvnic.cat"
-                            Source="..\bin\Chk\net\x86\netvnic.cat" />
-                      <File Id="sym5" DiskId="1" Compressed="yes"
-                            Name="qlgcvnic.pdb"
-                            Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />
-     
-                      <File Id="chk6" DiskId="1" Compressed="yes"
-                            Name="ibsrp.sys"
-                            Source="..\bin\Chk\storage\x86\ibsrp.sys" />
-                      <File Id="cat6" DiskId="1" Compressed="yes"
-                            Name="ibsrp.cat"
-                            Source="..\bin\Chk\storage\x86\ibsrp.cat" />
-                      <File Id="sym6" DiskId="1" Compressed="yes"
-                            Name="ibsrp.pdb"
-                            Source="..\bin\Chk\storage\x86\ibsrp.pdb" />
-     
-                      <File Id="chk7" DiskId="1" Compressed="yes"
-                            Name="mlx4_bus.sys"
-                            Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />
-                       <File Id="cat7" DiskId="1" Compressed="yes"
-                            Name="mlx4_bus.cat"
-                            Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />
-                      <File Id="sym7" DiskId="1" Compressed="yes"
-                            Name="mlx4_bus.pdb"
-                            Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />
-     
-                      <File Id="chk8" DiskId="1" Compressed="yes"
-                            Name="mlx4_hca.sys"
-                            Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />
-                      <File Id="cat8" DiskId="1" Compressed="yes"
-                            Name="mlx4_hca.cat"
-                             Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />
-                      <File Id="sym8" DiskId="1" Compressed="yes"
-                            Name="mlx4_hca.pdb"
-                            Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />
-
-                      <File Id="chk9" DiskId="1" Compressed="yes"
-                            Name="winverbs.sys"
-                            Source="..\bin\Chk\HCA\x86\winverbs.sys" />
-                      <File Id="sym9" DiskId="1" Compressed="yes"
-                            Name="winverbs.pdb"
-                            Source="..\bin\Chk\HCA\x86\winverbs.pdb" />
-                      <File Id="dll9" DiskId="1" Compressed="yes"
-                            Name="winverbs.dll"
-                            Source="..\bin\Chk\HCA\x86\winverbs.dll" />
-                      <File Id="dlld9" DiskId="1" Compressed="yes"
-                            Name="winverbd.dll"
-                            LongName="winverbsd.dll"
-                            Source="..\bin\Chk\HCA\x86\winverbsd.dll" />
-                    </Component>
-                  </Directory>
-            
-                  <Directory Id="dir_14" Name="user">
-                    <Component Id="cCHK_user"
-                               Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
-                      <CreateFolder />
-                      <File Id="file118" Name="complibd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\complibd.dll" />
-                      <File Id="file119" Name="DAPL2-_1.DLL"
-                        LongName="dapl2-scmd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\dapl2-scmd.dll" />
-                      <File Id="file120" Name="dapl2d.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\dapl2d.dll" />
-                      <File Id="file121" Name="DAPL2T_1.EXE"
-                        LongName="dapl2testd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\dapl2testd.exe" />
-                      <File Id="file122" Name="dapld.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\dapld.dll" />
-                      <File Id="file123" Name="DAPLTE_1.EXE"
-                        LongName="dapltestd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\dapltestd.exe" />
-                      <File Id="file124" Name="dat2d.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\dat2d.dll" />
-                      <File Id="file125" Name="datd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\datd.dll" />
-                      <File Id="file126" Name="dtest2d.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\dtest2d.exe" />
-                      <File Id="file127" Name="dtestxd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\dtestxd.exe" />
-                      <File Id="file130" Name="ibald.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\ibald.dll" />
-                      <File Id="file133" Name="ibwsd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\ibwsd.dll" />
-                      <File Id="file141" Name="INSTAL_1.EXE"
-                        LongName="installsp.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\installsp.exe" />
-                      <File Id="file144" Name="mthcaud.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\mthcaud.dll" />
-                      <File Id="file146" Name="opensm.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\opensm.exe" />
-                      <File Id="file151" Name="vstat.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\vstat.exe" />
-                      <File Id="file152" Name="part_man.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wlh_x86\i386\part_man.exe" />
-                    </Component>
-                  </Directory>
-                </Directory>
-
-                <Component Id="cWinVerbsOFED"
-                           Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-                  <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                        LongName="libibverbs.dll" Name="ibverbs.dll"
-                        Source="..\bin\HCA\x86\libibverbs.dll" />
-                    <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"
-                           DestinationName="ibverbs.dll"
-                           DestinationLongName="libibverbs.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                        Source="..\bin\HCA\x86\libibverbs.pdb" />
-      
-                  <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                        Source="..\bin\HCA\x86\libibverbsd.dll" />
-                    <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"
-                           DestinationName="ibverbsd.dll"
-                           DestinationLongName="libibverbsd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                        Source="..\bin\HCA\x86\libibverbsd.pdb" />
-      
-                  <File Id="libibmad.dll" Compressed="yes" DiskId="1"
-                        LongName="libibmad.dll" Name="ibmad.dll"
-                        Source="..\bin\HCA\x86\libibmad.dll" />
-                    <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"
-                           DestinationName="ibmad.dll"
-                           DestinationLongName="libibmad.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibmad.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibmad.pdb" Name="ibmad.pdb"
-                        Source="..\bin\HCA\x86\libibmad.pdb" />
-      
-                  <File Id="libibmadd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibmadd.dll" Name="ibmadd.dll"
-                        Source="..\bin\HCA\x86\libibmadd.dll" />
-                    <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"
-                           DestinationName="ibmadd.dll"
-                           DestinationLongName="libibmadd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                        Source="..\bin\HCA\x86\libibmadd.pdb" />
-      
-                  <File Id="libibumad.dll" Compressed="yes" DiskId="1"
-                        LongName="libibumad.dll" Name="ibumad.dll"
-                        Source="..\bin\HCA\x86\libibumad.dll" />
-                    <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"
-                           DestinationName="ibumad.dll"
-                           DestinationLongName="libibumad.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibumad.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibumad.pdb" Name="ibumad.pdb"
-                        Source="..\bin\HCA\x86\libibumad.pdb" />
-      
-                  <File Id="libibumadd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibumadd.dll" Name="ibumadd.dll"
-                        Source="..\bin\HCA\x86\libibumadd.dll" />
-                    <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"
-                           DestinationName="ibumadd.dll"
-                           DestinationLongName="libibumadd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                        Source="..\bin\HCA\x86\libibumadd.pdb" />
-
-                  <File Id="librdmacm.dll" Compressed="yes" DiskId="1"
-                        LongName="librdmacm.dll" Name="rdmacm.dll"
-                        Source="..\bin\HCA\x86\librdmacm.dll" />
-                    <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"
-                           DestinationName="rdmacm.dll"
-                           DestinationLongName="librdmacm.dll"
-                           DestinationProperty="SystemFolder" />
-                  <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"
-                        LongName="librdmacm.pdb" Name="rdmacm.pdb"
-                        Source="..\bin\HCA\x86\librdmacm.pdb" />
-
-                  <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"
-                        LongName="librdmacmd.dll" Name="rdmacmd.dll"
-                        Source="..\bin\HCA\x86\librdmacmd.dll" />
-                    <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"
-                           DestinationName="rdmacmd.dll"
-                           DestinationLongName="librdmacmd.dll"
-                           DestinationProperty="SystemFolder" />
-                  <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"
-                        LongName="librdmacmd.pdb" Name="rdmacmd.pdb"
-                        Source="..\bin\HCA\x86\librdmacmd.pdb" />
-
-                </Component>
-
-                <Component Id="cWinVerbsUApps"
-                          Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
-
-                  <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"
-                        Source="..\bin\tools\x86\release\ibv_asyncwatch.exe" />
-                  <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_asyncwatch.pdb" />
-                  <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_devinfo.exe" Name="devinfo.exe"
-                        Source="..\bin\tools\x86\release\ibv_devinfo.exe" />
-                  <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_devinfo.pdb" Name="devinfo.pdb"
-                        Source="..\bin\tools\x86\release\ibv_devinfo.pdb" />
-                  <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"
-                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.exe" />
-                  <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.pdb" />
-                  <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_bw.exe" Name="readbw.exe"
-                        Source="..\bin\tools\x86\release\ibv_read_bw.exe" />
-                  <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_bw.pdb" Name="readbw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_read_bw.pdb" />
-                  <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_lat.exe" Name="readlat.exe"
-                        Source="..\bin\tools\x86\release\ibv_read_lat.exe" />
-                  <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_lat.pdb" Name="readlat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_read_lat.pdb" />
-                  <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_bw.exe" Name="send_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_send_bw.exe" />
-                  <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_bw.pdb" Name="send_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_send_bw.pdb" />
-                  <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_lat.exe" Name="send_lat.exe"
-                        Source="..\bin\tools\x86\release\ibv_send_lat.exe" />
-                  <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_lat.pdb" Name="send_lat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_send_lat.pdb" />
-                  <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"
-                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.exe" />
-                  <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"
-                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.pdb" />
-                  <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"
-                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.exe" />
-                  <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"
-                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.pdb" />
-                  <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_bw.exe" Name="write_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_write_bw.exe" />
-                  <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_bw.pdb" Name="write_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_write_bw.pdb" />
-                  <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_lat.exe" Name="writelat.exe"
-                        Source="..\bin\tools\x86\release\ibv_write_lat.exe" />
-                  <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_lat.pdb" Name="writelat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_write_lat.pdb" />
-                  <File Id="sminfo.exe" Compressed="yes" DiskId="1"
-                        LongName="sminfo.exe" Name="sminfo.exe"
-                        Source="..\bin\tools\x86\release\sminfo.exe" />
-                  <File Id="sminfo.pdb" Compressed="yes" DiskId="1"
-                        LongName="sminfo.pdb" Name="sminfo.pdb"
-                        Source="..\bin\tools\x86\release\sminfo.pdb" />
-                  <File Id="ibstat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibstat.exe" Name="ibstat.exe"
-                        Source="..\bin\tools\x86\release\ibstat.exe" />
-                  <File Id="ibstat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibstat.pdb" Name="ibstat.pdb"
-                        Source="..\bin\tools\x86\release\ibstat.pdb" />
-                  <File Id="perfquery.exe" Compressed="yes" DiskId="1"
-                        LongName="perfquery.exe" Name="perfquer.exe"
-                        Source="..\bin\tools\x86\release\perfquery.exe" />
-                  <File Id="perfquery.pdb" Compressed="yes" DiskId="1"
-                        LongName="perfquery.pdb" Name="perfquer.pdb"
-                        Source="..\bin\tools\x86\release\perfquery.pdb" />
-                  <File Id="ibaddr.exe" Compressed="yes" DiskId="1"
-                        LongName="ibaddr.exe" Name="ibaddr.exe"
-                        Source="..\bin\tools\x86\release\ibaddr.exe" />
-                  <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibaddr.pdb" Name="ibaddr.pdb"
-                        Source="..\bin\tools\x86\release\ibaddr.pdb" />
-                  <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"
-                        LongName="ibnetdiscover.exe" Name="ibnetdis.exe"
-                        Source="..\bin\tools\x86\release\ibnetdiscover.exe" />
-                  <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"
-                        Source="..\bin\tools\x86\release\ibnetdiscover.pdb" />
-                  <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"
-                        LongName="rdma_cmatose.exe" Name="rcmatose.exe"
-                        Source="..\bin\tools\x86\release\rdma_cmatose.exe" />
-                  <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"
-                        LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"
-                        Source="..\bin\tools\x86\release\rdma_cmatose.pdb" />
-                  <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"
-                        Source="..\bin\tools\x86\release\ibv_rdma_lat.exe" />
-                  <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rdma_lat.pdb" />
-                  <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_rdma_bw.exe" />
-                  <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rdma_bw.pdb" />
-                  <File Id="ibroute.exe" Compressed="yes" DiskId="1"
-                        LongName="ibroute.exe" Name="ibroute.exe"
-                        Source="..\bin\tools\x86\release\ibroute.exe" />
-                  <File Id="ibroute.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibroute.pdb" Name="ibroute.pdb"
-                        Source="..\bin\tools\x86\release\ibroute.pdb" />
-                  <File Id="ibtracert.exe" Compressed="yes" DiskId="1"
-                        LongName="ibtracert.exe" Name="ibtrt.exe"
-                        Source="..\bin\tools\x86\release\ibtracert.exe" />
-                  <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibtracert.pdb" Name="ibtrt.pdb"
-                        Source="..\bin\tools\x86\release\ibtracert.pdb" />
-                </Component>
-
-                <Directory Id="ipoibDir" Name="net">
-                    <Component Id="IPoIB"
-                               Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
-                        <CreateFolder />
-                        <File Id="netipoib_inf" Compressed="yes" DiskId="1"
-                              LongName="netipoib.inf" Name="NETIPOI.INF"
-                              Source="..\bin\net\x86\netipoib.inf" />
-                        <File Id="ipoib_cat" Compressed="yes" DiskId="1"
-                              LongName="ipoib.cat" Name="IPOI.cat"
-                              Source="..\bin\net\x86\ipoib.cat" />
-                        <File Id="ipoib.sys" Compressed="yes" DiskId="1"
-                              LongName="ipoib.sys" Name="IPOIB.SYS"
-                              Source="..\bin\net\x86\ipoib.sys" />
-                        <File Id="ipoib.pdb" Compressed="yes" DiskId="1"
-                              Name="ipoib.pdb"
-                              Source="..\bin\net\x86\ipoib.pdb" />
-                        <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
-                              LongName="ibwsd.dll" Name="IBWSD.DLL"
-                              Source="..\bin\net\x86\ibwsd.dll" />
-                        <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
-                              LongName="ibndprov.dll" Name="IBNDPROV.DLL"
-                              Source="..\bin\net\x86\ibndprov.dll" />
-                        <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
-                              LongName="ndinstall.exe" Name="NDINSTAL.EXE"
-                              Source="..\bin\net\x86\ndinstall.exe" />
-                        <!-- Orphaned install files - remove on uninstall -->
-                        <RemoveFile Id='o32_ibwsd.dll' On='uninstall'
-                               Property="SystemFolder"
-                               Name="ibwsd.dll" LongName='ibwsd.dll' />
-                    </Component>
-                </Directory>
-
-                <Component Id="WinsockDirect"
-                           Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
-                    <File Id="installsp.exe" Compressed="yes" DiskId="1"
-                              LongName="installsp.exe" Name="INSTALL.EXE"
-                              Source="..\bin\net\x86\installsp.exe" />
-                </Component>
-
-                <Component Id="cNetworkDirect"
-                           Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
-                </Component>
-
-                <Component Id="cDAPL1RT"
-                           Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-
-                    <File Id="dapl.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl.dll" Name="DAPL.DLL"
-                          Source="..\bin\DAPL\x86\dapl.dll" />
-                    <CopyFile Id="dupDAPL" FileId="dapl.dll"
-                          DestinationName="dapl.dll"
-                          DestinationProperty="WindowsFolder" />
-                    <File Id="dapld.dll" Compressed="yes" DiskId="1"
-                          LongName="dapld.dll" Name="DAPLD.DLL"
-                          Source="..\bin\DAPL\x86\dapld.dll" />
-                    <File Id="dat.dll" Compressed="yes" DiskId="1"
-                          LongName="dat.dll" Name="DAT.DLL"
-                          Source="..\bin\DAPL\x86\dat.dll" />
-                    <CopyFile Id="dupDAT" FileId="dat.dll"
-                          DestinationName="dat.dll"
-                          DestinationProperty="WindowsFolder" />
-                    <File Id="datd.dll" Compressed="yes" DiskId="1"
-                          LongName="datd.dll" Name="DATD.DLL"
-                          Source="..\bin\DAPL\x86\datd.dll" />
-
-                    <File Id="dat.conf" Compressed="yes" DiskId="1"
-                          LongName="dat.conf" Name="dat.conf"
-                          Source="..\..\dat.conf" />
-                    <File Id="dapltest.exe" Compressed="yes" DiskId="1"
-                          LongName="dapltest.exe" Name="dapltest.exe"
-                          Source="..\bin\tools\x86\release\dapltest.exe" />
-                    <File Id="dapltestd.exe" Compressed="yes" DiskId="1"
-                          LongName="dapltestd.exe" Name="dapltesd.exe"
-                          Source="..\bin\tools\x86\debug\dapltestd.exe" />
-
-                    <File Id="dat.lib" Compressed="yes" DiskId="1"
-                          LongName="dat.lib" Name="dat.lib"
-                          Source="..\bin\DAPL\x86\dat.lib" />
-                    <File Id="datd.lib" Compressed="yes" DiskId="1"
-                          LongName="datd.lib" Name="datd.lib"
-                          Source="..\bin\DAPL\x86\datd.lib" />
-                    <File Id="dat.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat.pdb" Name="dat.pdb"
-                          Source="..\bin\DAPL\x86\dat.pdb" />
-                    <File Id="datd.pdb" Compressed="yes" DiskId="1"
-                          LongName="datd.pdb" Name="datd.pdb"
-                          Source="..\bin\DAPL\x86\datd.pdb" />
-                    <File Id="dapl.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl.pdb" Name="dapl.pdb"
-                          Source="..\bin\DAPL\x86\dapl.pdb" />
-                    <File Id="dapld.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapld.pdb" Name="dapld.pdb"
-                          Source="..\bin\DAPL\x86\dapld.pdb" />
-
-                    <File Id="dt_svr.bat" Compressed="yes" DiskId="1"
-                          LongName="dt-svr.bat" Name="dt-svr.bat"
-                          Source="..\bin\DAPL2\dt-svr.bat" />
-                    <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"
-                          DestinationName="dt1-svr.bat"
-                          DestinationProperty="INSTALLDIR" />
-                    <File Id="dt_cli.bat" Compressed="yes" DiskId="1"
-                          LongName="dt-cli.bat" Name="dt-cli.bat"
-                          Source="..\bin\DAPL2\dt-cli.bat" />
-                    <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"
-                          DestinationName="dt1-cli.bat"
-                          DestinationProperty="INSTALLDIR" />
-                </Component>
-
-                <Component Id="cDAPL2RT"
-                           Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
-
-                    <File Id="_dapl2.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2.dll" Name="DAPL2.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2.dll" />
-                      <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"
-                              DestinationName="dapl2.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2d.dll" Name="DAPL2D.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2d.dll" />
-
-                    <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scm.dll" Name="D2-scm.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2-scm.dll" />
-                      <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"
-                              DestinationName="d2-scm.dll"
-                              DestinationLongName="dapl2-scm.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2-scmd.dll" />
-
-                    <File Id="_dat2.dll" Compressed="yes" DiskId="1"
-                          LongName="dat2.dll" Name="DAT2.DLL"
-                          Source="..\bin\DAPL2\x86\dat2.dll" />
-                    <CopyFile Id="dupDAT2" FileId="_dat2.dll"
-                              DestinationName="dat2.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dat2d.dll" Compressed="yes" DiskId="1"
-                          LongName="dat2d.dll" Name="DAT2D.DLL"
-                          Source="..\bin\DAPL2\x86\dat2d.dll" />
-                    <File Id="dapl2test.exe" Compressed="yes" DiskId="1"
-                          LongName="dapl2test.exe" Name="dapl2tes.exe"
-                          Source="..\bin\tools\x86\release\dapl2test.exe" />
-                    <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"
-                          LongName="dapl2testd.exe" Name="dapl2tes.exe"
-                          Source="..\bin\tools\x86\debug\dapl2testd.exe" />
-                    <File Id="dtest2.exe" Compressed="yes" DiskId="1"
-                           LongName="dtest2.exe" Name="dtest2.exe"
-                           Source="..\bin\tools\x86\release\dtest2.exe" />
-                    <File Id="dtestx.exe" Compressed="yes" DiskId="1"
-                           LongName="dtestx.exe" Name="dtestx.exe"
-                           Source="..\bin\tools\x86\release\dtestx.exe" />
-
-                    <File Id="dapl2.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl2.pdb" Name="dapl2.pdb"
-                          Source="..\bin\DAPL2\x86\dapl2.pdb" />
-                    <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl2d.pdb" Name="dapl2d.pdb"
-                          Source="..\bin\DAPL2\x86\dapl2d.pdb" />
-                    <File Id="dat2.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat2.pdb" Name="dat2.pdb"
-                          Source="..\bin\DAPL2\x86\dat2.pdb" />
-                    <File Id="dat2d.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat2d.pdb" Name="dat2d.pdb"
-                          Source="..\bin\DAPL2\x86\dat2d.pdb" />
-                    <File Id="dat2.lib" Compressed="yes" DiskId="1"
-                          LongName="dat2.lib" Name="dat2.lib"
-                          Source="..\bin\DAPL2\x86\dat2.lib" />
-                    <File Id="dat2d.lib" Compressed="yes" DiskId="1"
-                          LongName="dat2d.lib" Name="dat2d.lib"
-                          Source="..\bin\DAPL2\x86\dat2d.lib" />
-                </Component>
+      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
+        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"
+                   Name="WinOF" />
+      </Directory>
+      <Directory Id="DesktopFolder" Name="Desktop" />
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="INSTALLDIR" Name="WinOF">
+
+          <?include ..\..\common\Docs.inc ?>
+          <?include ..\..\common\Tools.inc ?>
+          <?include ..\..\common\OpenSM_service.inc ?>
+
+          <Directory Id="IBcoreDir" Name="IBcore">
+            <?include ..\..\common\IBcore.inc ?>
+            <?include ..\..\common\mlnx_drivers.inc ?>
+            <?include ..\..\common\winverbs_drivers.inc ?>
+          </Directory>
 
-                <Component Id="cQLVNIC_driver_installed"
-                           Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-                </Component>
+          <?include ..\..\common\checked.inc ?>
+          <?include ..\..\common\winverbs_OFED.inc ?>
 
-                <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-                    <Component Id="cQLVNIC_files"
-                               Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-                        <CreateFolder />
-                        <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                              LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                              Source="..\bin\net\x86\qlgcvnic.sys" />
-                        <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                              Name="qlgcvnic.pdb"
-                              Source="..\bin\net\x86\qlgcvnic.pdb" />
-                        <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                              LongName="netvnic.inf" Name="NETVNIC.INF"
-                              Source="..\bin\net\x86\netvnic.inf" />
-                        <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                              LongName="netvnic.cat" Name="NETVNIC.cat"
-                              Source="..\bin\net\x86\netvnic.cat" />
-                    </Component>
-                </Directory>
+          <Directory Id="ipoibDir" Name="net">
+            <?include ..\..\common\ipoib.inc ?>
+          </Directory>
 
-                <Component Id="cSRP_driver_installed"
-                           Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-                </Component>
+          <Component Id="WinsockDirect"
+                     Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
+            <File Id="installsp.exe" Compressed="yes" DiskId="1"
+                     LongName="installsp.exe" Name="INSTALL.EXE"
+                     Source="..\bin\net\$(var.ARCH)\installsp.exe" />
+          </Component>
 
-                <Directory Id="srpDir" Name="SRP">
-                    <Component Id="cSRP_files"
-                               Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-                        <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                              LongName="ib_srp.inf" Name="IB_SRP.INF"
-                              Source="..\bin\storage\x86\ib_srp.inf" />
-                        <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                              LongName="ibsrp.cat" Name="IBSRP.CAT"
-                              Source="..\bin\storage\x86\ibsrp.cat" />
-                        <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                              LongName="ibsrp.sys" Name="IBSRP.SYS"
-                              Source="..\bin\storage\x86\ibsrp.sys" />
-                        <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                              Name="ibsrp.pdb"
-                              Source="..\bin\storage\x86\ibsrp.pdb" />
-                    </Component>
-                </Directory>
+          <Component Id="cNetworkDirect"
+                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
+          </Component>
 
-                <Component Id="OpenSM_Service_enabled"
-                           Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-                </Component>
-            </Directory>
-          </Directory>
+          <?include ..\..\common\dapl_rt.inc ?>
 
-      <!-- copy DAT header files to
-             %SystemDrive%\DAT\v1-1\DAT
-             %SystemDrive%\DAT\v2-0\DAT
-       -->
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
+          <Component Id="cQLVNIC_driver_installed"
+                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
+          </Component>
 
-         <Directory Id="dDATD" Name="DAT">
-            <Component Id="cDatCfg" Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >
+          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
+            <Component Id="cQLVNIC_files"
+                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
               <CreateFolder />
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
+              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
+                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
+              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
+                    Name="qlgcvnic.pdb"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
+              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
+                    LongName="netvnic.inf" Name="NETVNIC.INF"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
+              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
+                    LongName="netvnic.cat" Name="NETVNIC.cat"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
             </Component>
+          </Directory>
 
-            <Directory Id="v1_1" Name="v1-1">
-              <Component Id="cDATV1" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">
-                <CreateFolder />
-              </Component>
-              <Directory Id="DDID" Name="DAT">    
-                <Component Id="cDatBldV1Hdrs"
-                           Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
-                  <CreateFolder />    
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat.h" />    
-
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat_error.h" />    
-         
-                  <File Id="dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    
-         
-                  <File Id="dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL\dat_redirection.h" />    
-         
-                  <File Id="dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL\dat_registry.h" />    
-         
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    
-         
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL\udat.h" />    
-         
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL\udat_config.h" />    
-         
-                  <File Id="udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL\udat_redirection.h" />    
-         
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV1Libs"
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"
-                        LongName="dat.lib" Name="dat.lib"
-                        Source="..\bin\DAPL\x86\dat.lib" />
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"
-                        LongName="datd.lib" Name="datd.lib"
-                        Source="..\bin\DAPL\x86\datd.lib" />
-              </Component>
-            </Directory>
-
-            <Directory Id="v2_0" Name="v2-0">
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID2" Name="DAT">    
-                <Component Id="cDatBldV2Hdrs"
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    
-                  <CreateFolder />    
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat.h" />    
-
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat_error.h" />    
-         
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    
-         
-                  <File Id="_dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL2\dat_redirection.h" />    
-         
-                  <File Id="_dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL2\dat_registry.h" />    
-         
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    
-         
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL2\udat.h" />    
-         
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL2\udat_config.h" />    
-         
-                  <File Id="_udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL2\udat_redirection.h" />    
-         
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV2Libs"
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    
-
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2.lib" Name="dat2.lib"
-                        Source="..\bin\DAPL2\x86\dat2.lib" />
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2d.lib" Name="dat2d.lib"
-                        Source="..\bin\DAPL2\x86\dat2d.lib" />
-              </Component>    
-            </Directory>
-         </Directory>  <!-- End DAT -->
-
-         <!-- setup IBSDK file structure -->
-         <Directory Id="IBSDK" Name="IBSDK">
-           <Directory Id="IB_libs" Name="lib">
-             <Component Id="cIBAL_Libs"
-                        Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
-               <CreateFolder />
-               <File Id="ibal.lib" Compressed="yes" DiskId="1"
-                     LongName="ibal.lib" Name="ibal.lib"
-                     Source="..\bin\HCA\x86\ibal.lib" />
-               <File Id="ibal.pdb" Compressed="yes" DiskId="1"
-                     LongName="ibal.pdb" Name="ibal.pdb"
-                     Source="..\bin\HCA\x86\ibal.pdb" />
-               <File Id="complib.lib" Compressed="yes" DiskId="1"
-                     LongName="complib.lib" Name="complib.lib"
-                     Source="..\bin\HCA\x86\complib.lib" />
-               <File Id="complib.pdb" Compressed="yes" DiskId="1"
-                     LongName="complib.pdb" Name="complib.pdb"
-                     Source="..\bin\HCA\x86\complib.pdb" />
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"
-                    LongName="ibald.lib" Name="ibald.lib"
-                    Source="..\bin\HCA\x86\ibald.lib" />
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibald.pdb" Name="ibald.pdb"
-                    Source="..\bin\HCA\x86\ibald.pdb" />
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"
-                    LongName="complibd.lib" Name="complibd.lib"
-                    Source="..\bin\HCA\x86\complibd.lib" />
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"
-                    LongName="complibd.pdb" Name="complibd.pdb"
-                    Source="..\bin\HCA\x86\complibd.pdb" />
-
-              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbs.lib" Name="winverbs.lib"
-                    Source="..\bin\HCA\x86\winverbs.lib" />
-              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.lib" Name="winvrbsd.lib"
-                    Source="..\bin\HCA\x86\winverbsd.lib" />
-
-              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.lib" Name="ibverbs.lib"
-                    Source="..\bin\HCA\x86\libibverbs.lib" />
-              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                    Source="..\bin\HCA\x86\libibverbs.pdb" />
-              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                    Source="..\bin\HCA\x86\libibverbsd.lib" />
-              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                    Source="..\bin\HCA\x86\libibverbsd.pdb" />
-
-              <File Id="libibmad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmad.lib" Name="ibmad.lib"
-                    Source="..\bin\HCA\x86\libibmad.lib" />
-              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmad.pdb" Name="ibmad.pdb"
-                    Source="..\bin\HCA\x86\libibmad.pdb" />
-              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.lib" Name="ibmadd.lib"
-                    Source="..\bin\HCA\x86\libibmadd.lib" />
-              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                    Source="..\bin\HCA\x86\libibmadd.pdb" />
-
-              <File Id="libibumad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumad.lib" Name="ibumad.lib"
-                    Source="..\bin\HCA\x86\libibumad.lib" />
-              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumad.pdb" Name="ibumad.pdb"
-                    Source="..\bin\HCA\x86\libibumad.pdb" />
-              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.lib" Name="ibumadd.lib"
-                    Source="..\bin\HCA\x86\libibumadd.lib" />
-              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                    Source="..\bin\HCA\x86\libibumadd.pdb" />
-             </Component>
-           </Directory>
-
-           <Directory Id="IB_inc" Name="Inc">
-             <Component Id="cIBAL_Incs"
-                        Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">
-               <CreateFolder />
-
-               <File Id="oib_ver.h" Compressed="yes" DiskId="1"
-                     LongName="oib_ver.h" Name="oib_ver.h"
-                     Source="..\bin\Inc\oib_ver.h" />
-               <File Id="openib.def" Compressed="yes" DiskId="1"
-                     LongName="openib.def" Name="openib.def"
-                     Source="..\bin\Inc\openib.def" />
-             </Component>
+          <Component Id="cSRP_driver_installed"
+                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
+          </Component>
+
+          <!-- RDMA SCSI over IB (aka SRP) -->
+          <Directory Id="srpDir" Name="SRP">
+            <Component Id="cSRP_files"
+                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
+              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
+                    LongName="ib_srp.inf" Name="IB_SRP.INF"
+                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
+              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
+                    LongName="ibsrp.cat" Name="IBSRP.CAT"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
+              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
+                    LongName="ibsrp.sys" Name="IBSRP.SYS"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
+              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
+                    Name="ibsrp.pdb"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
+            </Component>
+          </Directory>
+        </Directory>
+      </Directory>
 
-             <Directory Id="IB_complib" Name="complib">
-               <Component Id="cIBAL_Complib"
-                          Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">
-                 <CreateFolder />
-                 <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"
-                       LongName="cl_async_proc.h" Name="CL_ASYN.H" 
-                       Source="..\bin\Inc\complib\cl_async_proc.h" />
-                 <File Id="cl_atomic.h" Compressed="yes" DiskId="1"
-                       LongName="cl_atomic.h" Name="CL_ATOM.H" 
-                       Source="..\bin\Inc\complib\cl_atomic.h" />
-                 <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" 
-                       Source="..\bin\Inc\complib\cl_atomic_osd.h" />
-                 <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_byteswap.h" Name="CL_BYTE.H" 
-                       Source="..\bin\Inc\complib\cl_byteswap.h" />
-                 <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" 
-                       Source="..\bin\Inc\complib\cl_byteswap_osd.h" />
-                 <File Id="cl_comppool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_comppool.h" Name="CL_COMP.H" 
-                       Source="..\bin\Inc\complib\cl_comppool.h" />
-                 <File Id="cl_debug.h" Compressed="yes" DiskId="1"
-                       LongName="cl_debug.h" Name="CL_DEBU.H" 
-                       Source="..\bin\Inc\complib\cl_debug.h" />
-                 <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_debug_osd.h" Name="CL_DEBU1.H" 
-                       Source="..\bin\Inc\complib\cl_debug_osd.h" />
-                 <File Id="cl_event.h" Compressed="yes" DiskId="1"
-                       LongName="cl_event.h" Name="CL_EVEN.H" 
-                       Source="..\bin\Inc\complib\cl_event.h" />
-                 <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_event_osd.h" Name="CL_EVEN1.H" 
-                       Source="..\bin\Inc\complib\cl_event_osd.h" />
-                 <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_fleximap.h" Name="CL_FLEX.H" 
-                       Source="..\bin\Inc\complib\cl_fleximap.h" />
-                 <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ioctl.h" Name="CL_IOCT.H" 
-                       Source="..\bin\Inc\complib\cl_ioctl.h" />
-                 <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" 
-                       Source="..\bin\Inc\complib\cl_ioctl_osd.h" />
-                 <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_irqlock.h" Name="CL_IRQL.H" 
-                       Source="..\bin\Inc\complib\cl_irqlock.h" />
-                 <File Id="cl_list.h" Compressed="yes" DiskId="1"
-                       LongName="cl_list.h" Name="CL_LIST.H" 
-                       Source="..\bin\Inc\complib\cl_list.h" />
-                 <File Id="cl_log.h" Compressed="yes" DiskId="1"
-                       LongName="cl_log.h" Name="CL_LOG.H" 
-                       Source="..\bin\Inc\complib\cl_log.h" />
-                 <File Id="cl_map.h" Compressed="yes" DiskId="1"
-                       LongName="cl_map.h" Name="CL_MAP.H" 
-                       Source="..\bin\Inc\complib\cl_map.h" />
-                 <File Id="cl_math.h" Compressed="yes" DiskId="1"
-                       LongName="cl_math.h" Name="CL_MATH.H" 
-                       Source="..\bin\Inc\complib\cl_math.h" />
-                 <File Id="cl_memory.h" Compressed="yes" DiskId="1"
-                       LongName="cl_memory.h" Name="CL_MEMO.H" 
-                       Source="..\bin\Inc\complib\cl_memory.h" />
-                 <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_memory_osd.h" Name="CL_MEMO1.H" 
-                       Source="..\bin\Inc\complib\cl_memory_osd.h" />
-                 <File Id="cl_mutex.h" Compressed="yes" DiskId="1"
-                       LongName="cl_mutex.h" Name="CL_MUTE.H" 
-                       Source="..\bin\Inc\complib\cl_mutex.h" />
-                 <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" 
-                       Source="..\bin\Inc\complib\cl_mutex_osd.h" />
-                 <File Id="cl_obj.h" Compressed="yes" DiskId="1"
-                       LongName="cl_obj.h" Name="CL_OBJ.H" 
-                       Source="..\bin\Inc\complib\cl_obj.h" />
-                 <File Id="cl_packoff.h" Compressed="yes" DiskId="1"
-                       LongName="cl_packoff.h" Name="CL_PACK.H" 
-                       Source="..\bin\Inc\complib\cl_packoff.h" />
-                 <File Id="cl_packon.h" Compressed="yes" DiskId="1"
-                       LongName="cl_packon.h" Name="CL_PACK1.H" 
-                       Source="..\bin\Inc\complib\cl_packon.h" />
-                 <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_passivelock.h" Name="CL_PASS.H" 
-                       Source="..\bin\Inc\complib\cl_passivelock.h" />
-                 <File Id="cl_perf.h" Compressed="yes" DiskId="1"
-                       LongName="cl_perf.h" Name="CL_PERF.H" 
-                       Source="..\bin\Inc\complib\cl_perf.h" />
-                 <File Id="cl_pool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_pool.h" Name="CL_POOL.H" 
-                       Source="..\bin\Inc\complib\cl_pool.h" />
-                 <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ptr_vector.h" Name="CL_PTR_.H" 
-                       Source="..\bin\Inc\complib\cl_ptr_vector.h" />
-                 <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qcomppool.h" Name="CL_QCOM.H" 
-                       Source="..\bin\Inc\complib\cl_qcomppool.h" />
-                 <File Id="cl_qlist.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qlist.h" Name="CL_QLIS.H" 
-                       Source="..\bin\Inc\complib\cl_qlist.h" />
-                 <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qlockpool.h" Name="CL_QLOC.H" 
-                       Source="..\bin\Inc\complib\cl_qlockpool.h" />
-                 <File Id="cl_qmap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qmap.h" Name="CL_QMAP.H" 
-                       Source="..\bin\Inc\complib\cl_qmap.h" />
-                 <File Id="cl_qpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qpool.h" Name="CL_QPOO.H" 
-                       Source="..\bin\Inc\complib\cl_qpool.h" />
-                 <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_rbmap.h" Name="CL_RBMA.H" 
-                       Source="..\bin\Inc\complib\cl_rbmap.h" />
-                 <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"
-                       LongName="cl_reqmgr.h" Name="CL_REQM.H" 
-                       Source="..\bin\Inc\complib\cl_reqmgr.h" />
-                 <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_spinlock.h" Name="CL_SPIN.H" 
-                       Source="..\bin\Inc\complib\cl_spinlock.h" />
-                 <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" 
-                       Source="..\bin\Inc\complib\cl_spinlock_osd.h" />
-                 <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"
-                       LongName="cl_syscallback.h" Name="CL_SYSC.H" 
-                       Source="..\bin\Inc\complib\cl_syscallback.h" />
-                 <File Id="cl_syscallback_osd.h" Compressed="yes"
-                       DiskId="1"
-                       LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" 
-                      Source="..\bin\Inc\complib\cl_syscallback_osd.h" />
-                 <File Id="cl_thread.h" Compressed="yes" DiskId="1"
-                       LongName="cl_thread.h" Name="CL_THRE.H" 
-                       Source="..\bin\Inc\complib\cl_thread.h" />
-                 <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_thread_osd.h" Name="CL_THRE1.H" 
-                       Source="..\bin\Inc\complib\cl_thread_osd.h" />
-                 <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_threadpool.h" Name="CL_THRE2.H" 
-                       Source="..\bin\Inc\complib\cl_threadpool.h" />
-                 <File Id="cl_timer.h" Compressed="yes" DiskId="1"
-                       LongName="cl_timer.h" Name="CL_TIME.H" 
-                       Source="..\bin\Inc\complib\cl_timer.h" />
-                 <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_timer_osd.h" Name="CL_TIME1.H" 
-                       Source="..\bin\Inc\complib\cl_timer_osd.h" />
-                 <File Id="cl_types.h" Compressed="yes" DiskId="1"
-                       LongName="cl_types.h" Name="CL_TYPE.H" 
-                       Source="..\bin\Inc\complib\cl_types.h" />
-                 <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_types_osd.h" Name="CL_TYPE1.H" 
-                       Source="..\bin\Inc\complib\cl_types_osd.h" />
-                 <File Id="cl_vector.h" Compressed="yes" DiskId="1"
-                       LongName="cl_vector.h" Name="CL_VECT.H" 
-                       Source="..\bin\Inc\complib\cl_vector.h" />
-                 <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"
-                       LongName="cl_waitobj.h" Name="CL_WAIT.H" 
-                       Source="..\bin\Inc\complib\cl_waitobj.h" />
-                 <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" 
-                       Source="..\bin\Inc\complib\cl_waitobj_osd.h" />
-                 <File Id="comp_lib.h" Compressed="yes" DiskId="1"
-                       LongName="comp_lib.h" Name="COMP_LI.H" 
-                       Source="..\bin\Inc\complib\comp_lib.h" />
-               </Component>
-             </Directory>
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
 
-             <Directory Id="IB_iba" Name="iba">
-               <Component Id="cIBAL_IBA"
-                          Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">
-                 <CreateFolder />
-                 <File Id="ib_al.h" Compressed="yes" DiskId="1"
-                       LongName="ib_al.h" Name="ib_al.h"
-                       Source="..\bin\Inc\iba\ib_al.h" />
-                 <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="ib_al_ioctl.h" Name="ib_ioctl.h"
-                       Source="..\bin\Inc\iba\ib_al_ioctl.h" />
-                 <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="ib_at_ioctl.h" Name="ib_iocat.h"
-                       Source="..\bin\Inc\iba\ib_at_ioctl.h" />
-                 <File Id="ib_ci.h" Compressed="yes" DiskId="1"
-                       LongName="ib_ci.h" Name="ib_ci.h"
-                       Source="..\bin\Inc\iba\ib_ci.h" />
-                 <File Id="ib_types.h" Compressed="yes" DiskId="1"
-                       LongName="ib_types.h" Name="ib_types.h"
-                       Source="..\bin\Inc\iba\ib_types.h" />
-                 <File Id="ib_uvp.h" Compressed="yes" DiskId="1"
-                       LongName="ib_uvp.h" Name="ib_uvp.h"
-                       Source="..\bin\Inc\iba\ib_uvp.h" />
-               </Component>
-             </Directory>
-           </Directory>
+      <!-- copy DAT header files to
+         %SystemDrive%\DAT\v1-1\DAT
+         %SystemDrive%\DAT\v2-0\DAT
+      -->
 
-          <Directory Id="IB_samples" Name="Samples">
-            <Directory Id="sample_DDK" Name="DDK">
-              <Component Id="cDDK_example"
-                         Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">
-                <CreateFolder />
-                    <File Id="cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\Misc\cmtest.c" />
-                    <File Id="makefile" Compressed="yes" DiskId="1"
-                          LongName="makefile" Name="makefile"
-                          Source="..\..\SDK_Samples\DDK\makefile" />
-                    <File Id="SOURCES" Compressed="yes" DiskId="1"
-                          LongName="SOURCES" Name="SOURCES"
-                          Source="..\..\SDK_Samples\DDK\SOURCES" />
-                    <File Id="README.txt" Compressed="yes" DiskId="1"
-                          LongName="README.txt" Name="README.txt"
-                          Source="..\..\SDK_Samples\DDK\README.txt" />
-              </Component>
-            </Directory>    <!-- End DDK -->
+        <Directory Id="dDATD" Name="DAT">
+          <?include ..\..\common\DAT_config.inc ?>
+        </Directory>
 
-              <Directory Id="sample_VS" Name="VS">
-                <Component Id="cVS_example"
-                           Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">
-                  <CreateFolder />
-                    <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\misc\cmtest.c" />
-                      <File Id="vscmtest.rc" Compressed="yes" DiskId="1"
-                            LongName="cmtest.rc" Name="cmtest.rc"
-                            Source="..\..\SDK_Samples\VS\cmtest.rc" />
-                      <File Id="vsREADME.txt" Compressed="yes" DiskId="1"
-                            LongName="README.txt" Name="README.txt"
-                            Source="..\..\SDK_Samples\VS\README.txt" />
-                    <File Id="Makefile.x86" Compressed="yes" DiskId="1"
-                          LongName="Makefile.x86" Name="Makefile.x86"
-                          Source="..\..\SDK_Samples\VS\Makefile.x86" />
-                </Component>
-              </Directory>    <!-- End VS -->
-          </Directory>    <!-- End Samples -->
-         </Directory>  <!-- End IBSDK -->
+        <Directory Id="IBSDK" Name="IBSDK">
+          <?include ..\..\common\ib_sdk.inc ?>
+        </Directory>
 
-      </Directory>  <!-- End WinRoot -->
+      </Directory>
     </Directory> <!-- End TARGETDIR -->
 
+<!--
+    <Property Id='ARPNOMODIFY'>1</Property>
+    <Property Id='ARPNOREPAIR'>1</Property>
+-->
     <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
     <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
     <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
@@ -1463,25 +157,24 @@
      -->
 
     <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"
-         Description="Mellanox Host Channel Adapter Drivers for ConnectX and InfiniHost"
+         Description="Mellanox InfiniBand Host Channel Adapter Drivers"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
-
       <ComponentRef Id="cMthcaDriver" />
       <ComponentRef Id="cConnectXDriver" />
     </Feature>
 
-    <Feature Id="IBcore" Title="InfiniBand Core" Level="1"
-        Description="InfiniBand: Core, Tools, Docs" Display="expand"
-        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
-        InstallDefault="local" Absent="disallow">
-        <ComponentRef Id="cIBcore" />
-        <ComponentRef Id="cWinVerbsDrivers" />
-        <ComponentRef Id="Docs" />
-        <ComponentRef Id="Tools" />
-        <ComponentRef Id="OpenSMservice" />
-        <ComponentRef Id="cQLVNIC_files" />
-        <ComponentRef Id="cSRP_files" />
+    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"
+        Description="InfiniBand: Core, Tools, Docs"
+        Display="expand" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">
+      <ComponentRef Id="cIBcore" />
+      <ComponentRef Id="cWinVerbsDrivers" />
+      <ComponentRef Id="Docs" />
+      <ComponentRef Id="Tools" />
+      <ComponentRef Id="OpenSMservice" />
+      <ComponentRef Id="cQLVNIC_files" />
+      <ComponentRef Id="cSRP_files" />
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
@@ -1521,10 +214,10 @@
         <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"
+    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"
         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <Condition Level="201"> IPOIB_EXISTS </Condition>
+      <Condition Level="201"> IPOIB_EXISTS </Condition>
 
       <Feature Id="fDatConf" Title="DAT-DAPL Config File"
          Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
@@ -1583,10 +276,10 @@
         Description="QLogic - Virtual NIC over InfiniBand"
         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <ComponentRef Id="cQLVNIC_driver_installed" />
+      <ComponentRef Id="cQLVNIC_driver_installed" />
     </Feature>
 
-    <Feature Id="fIBskd" Title="InfiniBand SDK" Level="2"
+    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"
          Description="InfiniBand Software Development Kit (Headers + Libs)"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
@@ -1606,74 +299,11 @@
       <ComponentRef Id="cCHK_user" />
     </Feature>
 
-    <!--> File where Custom Actions are defined -->
-    <Binary Id="CA" src="..\..\CustomActions.vbs" />
-
-    <CustomAction Id="WinOF_setup" BinaryKey="CA"
-         VBScriptCall="WinOF_setup" Return="check" />
-
-    <CustomAction Id="ChkPreviousInstall" BinaryKey="CA"
-         VBScriptCall="ChkInstallAndReboot" Return="check" />
-
-    <CustomAction Id="DriverInstall" BinaryKey="CA"
-         VBScriptCall="DriverInstall" Return="check" Execute="deferred" />
-
-    <CustomAction Id="DriverUninstall" BinaryKey="CA"
-         VBScriptCall="DriverUninstall" Return="check" />
-
-    <CustomAction Id="WSDStart" BinaryKey="CA"
-         VBScriptCall="WSDEnable" Return="check" />
-
-    <CustomAction Id="ND_start" BinaryKey="CA"
-         VBScriptCall="ND_StartMeUp" Return="check" />
-
-    <CustomAction Id="HammerTime" BinaryKey="CA"
-         VBScriptCall="HammerTime" Return="check" />
-
-    <CustomAction Id="BcastRegChanged" BinaryKey="CA"
-         VBScriptCall="BcastRegChanged" Return="check" />
-
-    <CustomAction Id="InstallChanged" BinaryKey="CA"
-         VBScriptCall="InstallChanged" Return="check" />
-
-    <InstallExecuteSequence>
-       <!-- Always executed (Install or uninstall) -->
-       <Custom Action="WinOF_setup" After="InstallInitialize" />
-
-       <!--> Install ONLY </!-->
-       <Custom Action="ChkPreviousInstall" After="WinOF_setup">
-           NOT Installed</Custom>
-
-       <ScheduleReboot After="ChkPreviousInstall">
-           REBOOT="FORCE"</ScheduleReboot>
-
-       <Custom Action="DriverInstall" After="InstallServices">
-			Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="WSDStart" After="InstallFinalize">
-           Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="ND_start" After="WSDStart">
-          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="BcastRegChanged" After="ND_start">
-           Not Installed</Custom>
-
-       <!--> CHANGE ONLY </!-->
-       <Custom Action="InstallChanged" After="InstallFinalize">
-           Installed </Custom>
-
-       <!--> REMOVE ONLY </!-->
-       <Custom Action="DriverUninstall" After="PublishProduct">
-           REMOVE="ALL" </Custom>
-       <Custom Action="HammerTime" After="InstallFinalize">REMOVE="ALL"</Custom>
-
-    </InstallExecuteSequence>
+    <?include ..\..\common\InstallExecuteSeq.inc ?>
 
     <UIRef Id="WixUI_FeatureTree" />
-        <UIRef Id="WixUI_ErrorProgressText" />
-        <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
     <UI />
-
   </Product>
 </Wix>
diff --git a/trunk/WinOF/WIX/wnet/ia64/wof.wxs b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
index 2a3af05b..e5d3fbf3 100644
--- a/trunk/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
@@ -2,19 +2,27 @@
 <!--
    WinOF for IA64/IPF Itanium on Windows Server 2003
 -->
+
+<?define ARCH=ia64 ?>
+<?define ARCHP=ia64 ?>
+<?define OS=wnet ?>
+<?include ..\..\common\WinOF_cfg.inc ?>
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Product Name="Windows Open Fabrics InfiniBand v2.1.0 (RC0) ia64"
-    Version="2.1.0"
+  <Product
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"
+    Version="$(var.WOFRELNUM)"
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
-    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' 
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
     Language="1033" Codepage="1252"
     Manufacturer="Open Fabrics Alliance Windows">
 
     <Package Id="????????-????-????-????-????????????"
-     Keywords="Installer, InfiniBand" Description="WinOF Installer"
+     Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
      InstallPrivileges='elevated'
-     Comments="Windows Open Fabrics Alliance InfiniBand stack"
-     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="200"
+     Description="WinOF Installer"
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
      Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Condition Message="Administrator required to install [ProductName].">
@@ -33,59 +41,7 @@
          <![CDATA[(VersionNT=502)]]>
     </Condition>
 
-    <!--
-        System/Machine-wide install, otherwise per-user (Administrator) only.
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.
-     -->
-    <Property Id="ALLUSERS"> Value="1" </Property>
-
-    <!-- Requires files sc.exe & reg.exe -->
-    <Property Id="REG_EXISTS">
-      <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="RegFile" Name="reg.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="SC_EXISTS">
-      <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="ScFile" Name="sc.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="IPOIB_EXISTS">
-      <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">
-        <FileSearch Id="ipoibFile" Name="netipoib.inf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT_CONF_EXISTS">
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">
-        <FileSearch Id="DCFile" Name="dat.conf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT1_INSTALLED">
-      <DirectorySearch Id="Dat1File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="daplFile" Name="dapl.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT2_INSTALLED">
-      <DirectorySearch Id="Dat2File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="dapl2File" Name="dapl2.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Condition Message="[ProductName] requires system file reg.exe">
-       REG_EXISTS
-    </Condition>
-
-    <Condition Message="[ProductName] requires system file sc.exe">
-       SC_EXISTS
-    </Condition>
-
-    <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
-    <Property Id="DiskPrompt" Value="WinOF 1.1 Installation [1]" />
+    <?include ..\..\common\requirements.inc ?>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
@@ -95,837 +51,36 @@
       <Directory Id="DesktopFolder" Name="Desktop" />
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="INSTALLDIR" Name="WinOF">
-          <Component Id="Docs" Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
-
-            <File Id="OFAlogo" Compressed="yes" DiskId="1"
-                    LongName="openfabrics.gif" Name="ofa.gif"
-                    Source="..\..\openfabrics.gif" />
-
-            <!-- implies WIX build only from an svn structured tree.  -->
-            <File Id="manual.htm" Compressed="yes" DiskId="1" Name="Manual.htm"
-                    LongName="Manual.htm"
-                    Source="..\bin\Misc\Manual.htm" Vital="yes" />
-
-            <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
-                    Name="Manual.htm" LongName="Manual"
-                    Target="[INSTALLDIR]\Manual.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="dRelnotes" Compressed="yes" DiskId="1"
-                    LongName="Release_notes.htm" Name="RELEASE_.HTM"
-                    Source="..\..\Release_notes.htm" />
-
-            <Shortcut Id="RelNotes" Directory="ProgramMenuDir" Name="RelNotes"
-                    LongName="Release Notes"
-                    Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="command_window" Name="COMMAND.LNK"
-                    LongName="Command Window.lnk" Compressed="yes" DiskId="1"
-                    Source="..\..\ia64\Command Window.lnk" Vital="yes" />
-
-            <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
-                    Name="COMMAND.LNK" LongName="Command Window.lnk"
-                    Target="[INSTALLDIR]\Command Window.lnk" Icon="openfabrics"
-                    IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />
-
-            <Shortcut Id="UninstallProduct" Name="UnMyApp"
-                LongName="Uninstall WinOF"
-				Target="[System64Folder]msiexec.exe"
-                Arguments="/X [ProductCode]"
-                Directory="ProgramMenuDir"
-                Description="Uninstalls OpenFabrics InfiniBand" />
-            <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
-          </Component>
-
-          <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
-           <Environment Id='UpdatePath' Name='PATH' Action='create'
-                           System='yes' Part='last' Value='[INSTALLDIR]' /> 
-
-            <File Id="qlgcvnic_config" Compressed="yes" DiskId="1" Vital="yes"
-                  Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"
-                  Source="..\bin\tools\ia64\release\qlgcvnic_config.exe" />
-            <File Id="part_man" Name="part_man.exe"
-                    Compressed="yes" DiskId="1" Vital="yes"
-                    Source="..\bin\tools\ia64\release\part_man.exe" />
-            <File Id="vstat" Name="vstat.exe"
-                    Compressed="yes" DiskId="1" Vital="yes"
-                    Source="..\bin\tools\ia64\release\vstat.exe" />
-            <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
-                    DiskId="1" Name="TTCP.EXE"
-                    Source="..\bin\tools\ia64\release\ttcp.exe" />
-            <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
-                    DiskId="1" Name="CMTEST.EXE"
-                    Source="..\bin\tools\ia64\release\cmtest.exe" />
-            <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_limits.exe" Name="IB_LIMI.EXE"
-                     Source="..\bin\tools\ia64\release\ib_limits.exe" />
-            <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_read_bw.exe" Name="IB_READ.EXE"
-                     Source="..\bin\tools\ia64\release\ib_read_bw.exe" />
-            <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
-                     Source="..\bin\tools\ia64\release\ib_read_lat.exe" />
-            <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
-                     Source="..\bin\tools\ia64\release\ib_send_bw.exe" />
-            <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
-                     Source="..\bin\tools\ia64\release\ib_send_lat.exe" />
-            <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
-                     Source="..\bin\tools\ia64\release\ib_write_bw.exe" />
-            <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
-                     Source="..\bin\tools\ia64\release\ib_write_lat.exe" />
-            <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
-                     LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
-                     Source="..\bin\tools\ia64\release\ibtrapgen.exe" />
-            <File Id="osmtest.exe" Compressed="yes" DiskId="1"
-                     LongName="osmtest.exe" Name="OSMTEST.EXE"
-                     Source="..\bin\tools\ia64\release\osmtest.exe" />
-            <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
-                     LongName="PrintIP.exe" Name="PRINTIP.EXE"
-                     Source="..\bin\tools\ia64\release\PrintIP.exe" />
-            <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"
-                     Vital="yes" Source="..\bin\tools\ia64\release\nsc.exe" />
-          </Component>
-
-          <Component Id='OpenSMservice'
-                     Guid='90042B4F-51B5-4720-8E54-6D366253634B'
-                     SharedDllRefCount='no' KeyPath='no'
-                     NeverOverwrite='no'
-                     Permanent='no' Transitive='no' Win64='no'
-                     Location='either'>
-
-              <File Id="opensm.exe" Compressed="yes" DiskId="1"
-                    LongName="opensm.exe" Name="OPENSM.EXE"
-                    Source="..\bin\tools\ia64\release\opensm.exe"
-                    Vital='yes' KeyPath='yes' Hidden='no' System='no' 
-                    Checksum='no' ReadOnly='no' />
-
-              <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
-                  Description='InfiniBand Subnet Configuration and Management'
-                  DisplayName='InfiniBand Subnet Manager'
-                  Arguments='-e --service'
-                  ErrorControl='normal'
-                  Start='disabled'
-                  Interactive='no'
-                  Type='ownProcess' />
-
-              <ServiceControl Id='osmSvcControl' Name='OpenSM'
-                              Stop='uninstall'
-                              Wait='no'
-                              Remove='uninstall' />
-          </Component>
-
-          <Directory Id="hcaDir" Name="IBcore">
-            <Component Id="cIBcore"
-                       Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
-              <CreateFolder />
-              <File Id="dpinst.exe" Compressed="yes" DiskId="1"
-                     LongName="dpinst.exe" Name="dpinst.exe"
-                     Source="..\..\ia64\dpinst.exe" />
-              <File Id="dpinst.xml" Compressed="yes" DiskId="1"
-                     LongName="dpinst.xml" Name="dpinst.xml"
-                     Source="..\..\dpinst.xml" />
-              <File Id="devman.exe" Compressed="yes" DiskId="1"
-                     LongName="devman.exe" Name="devman.exe"
-                     Source="..\..\ia64\devman.exe" />
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\hca\ia64\WdfCoInstaller01007.dll" />
-              <File Id="cl32.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32.dll" Name="CL32.DLL"
-                     Source="..\bin\HCA\ia64\cl32.dll" />
-              <File Id="cl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32d.dll" Name="CL32D.DLL"
-                     Source="..\bin\HCA\ia64\cl32d.dll" />
-              <File Id="complib.dll" Compressed="yes" DiskId="1"
-                     LongName="complib.dll" Name="COMPLIB.DLL"
-                     Source="..\bin\HCA\ia64\complib.dll" />
-              <File Id="complibd.dll" Compressed="yes" DiskId="1"
-                     LongName="complibd.dll" Name="COMPLIB1.DLL"
-                     Source="..\bin\HCA\ia64\complibd.dll" />
-              <File Id="ibal32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32.dll" Name="IBAL32.DLL"
-                     Source="..\bin\HCA\ia64\ibal32.dll" />
-              <File Id="ibal32d.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32d.dll" Name="IBAL32D.DLL"
-                     Source="..\bin\HCA\ia64\ibal32d.dll" />
-              <File Id="ibal.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal.dll" Name="IBAL.DLL"
-                     Source="..\bin\HCA\ia64\ibal.dll" />
-              <File Id="ibald.dll" Compressed="yes" DiskId="1"
-                     LongName="ibald.dll" Name="IBALD.DLL"
-                     Source="..\bin\HCA\ia64\ibald.dll" />
-              <File Id="ibbus.sys" Compressed="yes" DiskId="1"
-                     LongName="ibbus.sys" Name="IBBUS.SYS"
-                     Source="..\bin\HCA\ia64\ibbus.sys" />
-              <File Id="ibbus.pdb" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                     Source="..\bin\HCA\ia64\ibbus.pdb" />
-
-              <File Id="ibiou.sys" Compressed="yes" DiskId="1"
-                     LongName="ibiou.sys" Name="IBIOU.SYS"
-                     Source="..\bin\HCA\ia64\ibiou.sys" />
-              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"
-                     Name="ibiou.pdb" Source="..\bin\HCA\ia64\ibiou.pdb" />
-              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.cat" Name="IB_IOU.cat"
-                     Source="..\bin\HCA\ia64\ib_iou.cat" />
-              <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.inf" Name="IB_IOU.inf"
-                     Source="..\bin\HCA\ia64\ib_iou.inf" />
-            </Component>
-
-            <Component Id="cMthcaDriver"
-                       Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">
-              <File Id="mthca32.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32.dll" Name="MTHCA32.DLL"
-                     Source="..\bin\HCA\ia64\mthca32.dll" />
-              <File Id="mthca32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32d.dll" Name="MTHCA321.DLL"
-                     Source="..\bin\HCA\ia64\mthca32d.dll" />
-              <File Id="mthca.inf" Compressed="yes" DiskId="1"
-                     LongName="mthca.inf" Name="MTHCA.INF"
-                     Source="..\bin\HCA\ia64\mthca.inf" />
-              <File Id="mthca.cat" Compressed="yes" DiskId="1"
-                     LongName="mthca.cat" Name="MTHCA.cat"
-                     Source="..\bin\HCA\ia64\mthca.cat" />
-              <File Id="mthca.sys" Compressed="yes" DiskId="1"
-                     LongName="mthca.sys" Name="MTHCA.SYS"
-                     Source="..\bin\HCA\ia64\mthca.sys" />
-              <File Id="mthca.pdb" Name="mthca.pdb" DiskId="1"
-                     Compressed="yes" Source="..\bin\HCA\ia64\mthca.pdb" />
-              <File Id="mthcau.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcau.dll" Name="MTHCAU.DLL"
-                     Source="..\bin\HCA\ia64\mthcau.dll" />
-              <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcaud.dll" Name="MTHCAUD.DLL"
-                     Source="..\bin\HCA\ia64\mthcaud.dll" />
-            </Component>
 
-            <Component Id="cConnectXDriver"
-                       Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
-              <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.inf" Name="mlx4_bus.INF"
-                     Source="..\bin\hca\ia64\mlx4_bus.inf" />
-              <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.cat" Name="mlx4_bus.cat"
-                     Source="..\bin\hca\ia64\mlx4_bus.cat" />
-              <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
-                     Source="..\bin\hca\ia64\mlx4_bus.sys" />
-              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.pdb" Name="mlx4_bus.pdb"
-                     Source="..\bin\hca\ia64\mlx4_bus.pdb" />
-              <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
-                     Source="..\bin\hca\ia64\mlx4_hca.inf" />
-              <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.cat" Name="mlx4_hca.cat"
-                     Source="..\bin\hca\ia64\mlx4_hca.cat" />
-              <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.sys" Name="mlx4_hca.sys"
-                     Source="..\bin\hca\ia64\mlx4_hca.sys" />
-              <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.pdb" Name="mlx4_hca.pdb"
-                     Source="..\bin\hca\ia64\mlx4_hca.pdb" />
-              <File Id="mlx4u.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u.dll" Name="mlx4u.dll"
-                     Source="..\bin\hca\ia64\mlx4u.dll" />
-              <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4ud.dll" Name="mlx4ud.dll"
-                     Source="..\bin\hca\ia64\mlx4ud.dll" />
+          <?include ..\..\common\Docs.inc ?>
+          <?include ..\..\common\Tools.inc ?>
+          <?include ..\..\common\OpenSM_service.inc ?>
 
-			  <!-- copy 32-bit binaries --> 
-              <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32d.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\ia64\mlx4u32d.dll" />
-              <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\ia64\mlx4u32.dll" />
-            </Component>
-
-            <Component Id="cWinVerbsDrivers"
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-
-              <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                    LongName="winverbs.sys" Name="winverbs.sys"
-                    Source="..\bin\HCA\ia64\winverbs.sys" />
-              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
-                    LongName="winverbs.pdb" Name="winverbs.pdb"
-                    Source="..\bin\HCA\ia64\winverbs.pdb" />
-              <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                    LongName="winverbs.dll" Name="winvrbs.dll"
-                    Source="..\bin\HCA\ia64\winverbs.dll" />
-              <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.dll" Name="winvrbsd.dll"
-                    Source="..\bin\HCA\ia64\winverbsd.dll" />
-              <File Id="winmad.sys" Compressed="yes" DiskId="1"
-                    LongName="winmad.sys" Name="winmad.sys"
-                    Source="..\bin\HCA\ia64\winmad.sys" />
-              <File Id="winmad.pdb" Compressed="yes" DiskId="1"
-                    LongName="winmad.pdb" Name="winmad.pdb"
-                    Source="..\bin\HCA\ia64\winmad.pdb" />
-              <File Id="winmad.dll" Compressed="yes" DiskId="1"
-                    LongName="winmad.dll" Name="winmad.dll"
-                    Source="..\bin\HCA\ia64\winmad.dll" />
-              <File Id="winmadd.dll" Compressed="yes" DiskId="1"
-                    LongName="winmadd.dll" Name="winmaddd.dll"
-                    Source="..\bin\HCA\ia64\winmadd.dll" />
-             </Component>
+          <Directory Id="IBcoreDir" Name="IBcore">
+            <?include ..\..\common\IBcore.inc ?>
+            <?include ..\..\common\mlnx_drivers.inc ?>
+            <?include ..\..\common\winverbs_drivers.inc ?>
           </Directory>
 
-          <Directory Id="dir_0" Name="Checked">
-            <Directory Id="dir_1" Name="kernel">
-              <Component Id="cCHK_kernel"
-                         Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
-                <CreateFolder />
-
-                <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"
-                      Source="..\..\README_checked.txt" />
-                <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\HCA\ia64\mthca.sys" />
-                <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\HCA\ia64\mthca.cat" />
-                <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\HCA\ia64\mthca.pdb" />
-
-                <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\HCA\ia64\ibbus.sys" />
-                <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />
-
-                <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\HCA\ia64\ibiou.sys" />
-                <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />
-                <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />
-
-                <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\net\ia64\ipoib.sys" />
-                <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\net\ia64\ipoib.cat" />
-                <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\net\ia64\ipoib.pdb" />
-
-                <File Id="chk5" DiskId="1" Compressed="yes"
-                      Name="qlgcvnic.sys"
-                      Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />
-                <File Id="cat5" DiskId="1" Compressed="yes"
-                      Name="netvnic.cat"
-                      Source="..\bin\Chk\net\ia64\netvnic.cat" />
-                <File Id="sym5" DiskId="1" Compressed="yes"
-                      Name="qlgcvnic.pdb"
-                      Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />
-
-                <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\storage\ia64\ibsrp.sys" />
-                <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\storage\ia64\ibsrp.cat" />
-                <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />
-<!-- when ConnectX works on ia64
-                <File Id="chk7" DiskId="1" Compressed="yes"
-                      Name="mlx4_bus.sys"
-                      Source="..\bin\Chk\HCA\ia64\mlx4_bus.sys" />
-                <File Id="cat7" DiskId="1" Compressed="yes"
-                      Name="mlx4_bus.cat"
-                      Source="..\bin\Chk\HCA\ia64\mlx4_bus.cat" />
-                <File Id="sym7" DiskId="1" Compressed="yes"
-                      Name="mlx4_bus.pdb"
-                      Source="..\bin\Chk\HCA\ia64\mlx4_bus.pdb" />
-
-                <File Id="chk8" DiskId="1" Compressed="yes"
-                      Name="mlx4_hca.sys"
-                      Source="..\bin\Chk\HCA\ia64\mlx4_hca.sys" />
-                <File Id="cat8" DiskId="1" Compressed="yes"
-                      Name="mlx4_hca.cat"
-                      Source="..\bin\Chk\HCA\ia64\mlx4_hca.cat" />
-                <File Id="sym8" DiskId="1" Compressed="yes"
-                      Name="mlx4_hca.pdb"
-                      Source="..\bin\Chk\HCA\ia64\mlx4_hca.pdb" />
-End ConnectX remove -->
-
-                <File Id="chk9" DiskId="1" Compressed="yes"
-                      Name="winverbs.sys"
-                      Source="..\bin\Chk\HCA\ia64\winverbs.sys" />
-                <File Id="sym9" DiskId="1" Compressed="yes"
-                      Name="winverbs.pdb"
-                      Source="..\bin\Chk\HCA\ia64\winverbs.pdb" />
-                <File Id="dll9" DiskId="1" Compressed="yes"
-                      Name="winverbs.dll"
-                      Source="..\bin\Chk\HCA\ia64\winverbs.dll" />
-                <File Id="dlld9" DiskId="1" Compressed="yes"
-                      Name="winverbd.dll"
-                      LongName="winverbsd.dll"
-                      Source="..\bin\Chk\HCA\ia64\winverbsd.dll" />
-              </Component>
-            </Directory>
-      
-            <Directory Id="dir_14" Name="user">
-              <Component Id="cCHK_user" 
-                         Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
-                <CreateFolder />
-                <File Id="file83" Name="DAPL2-_1.DLL"
-                  LongName="dapl2-scmd.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\dapl2-scmd.dll" />
-                <File Id="file84" Name="dapl2d.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\dapl2d.dll" />
-                <File Id="file85" Name="DAPL2T_1.EXE"
-                  LongName="dapl2testd.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\dapl2testd.exe" />
-                <File Id="file86" Name="dapld.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\dapld.dll" />
-                <File Id="file87" Name="DAPLTE_1.EXE"
-                  LongName="dapltestd.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\dapltestd.exe" />
-                <File Id="file88" Name="dat2d.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\dat2d.dll" />
-                <File Id="file89" Name="datd.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\datd.dll" />
-                <File Id="file90" Name="dtest2d.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\dtest2d.exe" />
-                <File Id="file91" Name="dtestxd.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\dtestxd.exe" />
-                <File Id="file94" Name="ibald.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\ibald.dll" />
-                <File Id="file97" Name="ibwsd.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\ibwsd.dll" />
-                <File Id="file105" Name="INSTAL_1.EXE"
-                  LongName="installsp.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\installsp.exe" />
-                <File Id="file108" Name="mthcaud.dll" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\mthcaud.dll" />
-                <File Id="file110" Name="opensm.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\opensm.exe" />
-                <File Id="file115" Name="vstat.exe" DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\vstat.exe" />
-                <File Id="file116" Name="part_man.exe"
-                  DiskId="1" Compressed="yes"
-                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\part_man.exe" />
-              </Component>
-            </Directory>
-          </Directory>
-
-          <Component Id="cWinVerbsOFED"
-                       Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.dll" Name="ibverbs.dll"
-                  Source="..\bin\HCA\ia64\libibverbs.dll" />
-              <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"
-                     DestinationName="ibverbs.dll"
-                     DestinationLongName="libibverbs.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                  Source="..\bin\HCA\ia64\libibverbs.pdb" />
-
-            <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                  Source="..\bin\HCA\ia64\libibverbsd.dll" />
-              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"
-                     DestinationName="ibverbsd.dll"
-                     DestinationLongName="libibverbsd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                  Source="..\bin\HCA\ia64\libibverbsd.pdb" />
-
-            <File Id="libibmad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmad.dll" Name="ibmad.dll"
-                  Source="..\bin\HCA\ia64\libibmad.dll" />
-              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"
-                     DestinationName="ibmad.dll"
-                     DestinationLongName="libibmad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmad.pdb" Name="ibmad.pdb"
-                  Source="..\bin\HCA\ia64\libibmad.pdb" />
-
-            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.dll" Name="ibmadd.dll"
-                  Source="..\bin\HCA\ia64\libibmadd.dll" />
-              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"
-                     DestinationName="ibmadd.dll"
-                     DestinationLongName="libibmadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                  Source="..\bin\HCA\ia64\libibmadd.pdb" />
-
-            <File Id="libibumad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumad.dll" Name="ibumad.dll"
-                  Source="..\bin\HCA\ia64\libibumad.dll" />
-              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"
-                     DestinationName="ibumad.dll"
-                     DestinationLongName="libibumad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumad.pdb" Name="ibumad.pdb"
-                  Source="..\bin\HCA\ia64\libibumad.pdb" />
-
-            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.dll" Name="ibumadd.dll"
-                  Source="..\bin\HCA\ia64\libibumadd.dll" />
-              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"
-                     DestinationName="ibumadd.dll"
-                     DestinationLongName="libibumadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                  Source="..\bin\HCA\ia64\libibumadd.pdb" />
-            <File Id="librdmacm.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.dll" Name="rdmacm.dll"
-                  Source="..\bin\HCA\ia64\librdmacm.dll" />
-              <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"
-                     DestinationName="rdmacm.dll"
-                     DestinationLongName="librdmacm.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.pdb" Name="rdmacm.pdb"
-                  Source="..\bin\HCA\ia64\librdmacm.pdb" />
-
-            <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.dll" Name="rdmacmd.dll"
-                  Source="..\bin\HCA\ia64\librdmacmd.dll" />
-              <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"
-                     DestinationName="rdmacmd.dll"
-                     DestinationLongName="librdmacmd.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.pdb" Name="rdmacmd.pdb"
-                  Source="..\bin\HCA\ia64\librdmacmd.pdb" />
-          </Component>
-
-          <Component Id="cWinVerbsUApps"
-                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
-
-            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.exe" />
-            <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.pdb" />
-            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.exe" Name="devinfo.exe"
-                  Source="..\bin\tools\ia64\release\ibv_devinfo.exe" />
-            <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_devinfo.pdb" />
-            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"
-                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.exe" />
-            <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.pdb" />
-            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.exe" Name="readbw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_read_bw.exe" />
-            <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_read_bw.pdb" />
-            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.exe" Name="readlat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_read_lat.exe" />
-            <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_read_lat.pdb" />
-            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.exe" Name="send_bw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_send_bw.exe" />
-            <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_send_bw.pdb" />
-            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.exe" Name="send_lat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_send_lat.exe" />
-            <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_send_lat.pdb" />
-            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"
-                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.exe" />
-            <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.pdb" />
-            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"
-                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.exe" />
-            <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.pdb" />
-            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.exe" Name="write_bw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_write_bw.exe" />
-            <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_write_bw.pdb" />
-            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.exe" Name="writelat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_write_lat.exe" />
-            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_write_lat.pdb" />
-            <File Id="sminfo.exe" Compressed="yes" DiskId="1"
-                  LongName="sminfo.exe" Name="sminfo.exe"
-                  Source="..\bin\tools\ia64\release\sminfo.exe" />
-            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="sminfo.pdb" Name="sminfo.pdb"
-                  Source="..\bin\tools\ia64\release\sminfo.pdb" />
-            <File Id="ibstat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibstat.exe" Name="ibstat.exe"
-                  Source="..\bin\tools\ia64\release\ibstat.exe" />
-            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibstat.pdb" Name="ibstat.pdb"
-                  Source="..\bin\tools\ia64\release\ibstat.pdb" />
-            <File Id="perfquery.exe" Compressed="yes" DiskId="1"
-                  LongName="perfquery.exe" Name="perfquer.exe"
-                  Source="..\bin\tools\ia64\release\perfquery.exe" />
-            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"
-                  LongName="perfquery.pdb" Name="perfquer.pdb"
-                  Source="..\bin\tools\ia64\release\perfquery.pdb" />
-            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.exe" Name="ibaddr.exe"
-                  Source="..\bin\tools\ia64\release\ibaddr.exe" />
-            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.pdb" Name="ibaddr.pdb"
-                  Source="..\bin\tools\ia64\release\ibaddr.pdb" />
-            <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.exe" Name="ibnetdis.exe"
-                  Source="..\bin\tools\ia64\release\ibnetdiscover.exe" />
-            <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"
-                  Source="..\bin\tools\ia64\release\ibnetdiscover.pdb" />
-            <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.exe" Name="rcmatose.exe"
-                  Source="..\bin\tools\ia64\release\rdma_cmatose.exe" />
-            <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"
-                  Source="..\bin\tools\ia64\release\rdma_cmatose.pdb" />
-            <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_lat.exe" />
-            <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_lat.pdb" />
-            <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_bw.exe" />
-            <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"
-                  Source="..\bin\tools\ia64\release\ibv_rdma_bw.pdb" />
-            <File Id="ibroute.exe" Compressed="yes" DiskId="1"
-                  LongName="ibroute.exe" Name="ibroute.exe"
-                  Source="..\bin\tools\ia64\release\ibroute.exe" />
-            <File Id="ibroute.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibroute.pdb" Name="ibroute.pdb"
-                  Source="..\bin\tools\ia64\release\ibroute.pdb" />
-            <File Id="ibtracert.exe" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.exe" Name="ibtrt.exe"
-                  Source="..\bin\tools\ia64\release\ibtracert.exe" />
-            <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.pdb" Name="ibtrt.pdb"
-                  Source="..\bin\tools\ia64\release\ibtracert.pdb" />
-          </Component>
+          <?include ..\..\common\checked.inc ?>
+          <?include ..\..\common\winverbs_OFED.inc ?>
 
           <Directory Id="ipoibDir" Name="net">
-            <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
-              <CreateFolder />
-              <File Id="netipoib_inf" Compressed="yes" DiskId="1"
-                     LongName="netipoib.inf" Name="NETIPOI.INF"
-                     Source="..\bin\net\ia64\netipoib.inf" />
-              <File Id="ipoib_cat" Compressed="yes" DiskId="1"
-                     LongName="ipoib.cat" Name="IPOI.cat"
-                     Source="..\bin\net\ia64\ipoib.cat" />
-              <File Id="ipoib.sys" Compressed="yes" DiskId="1"
-                     LongName="ipoib.sys" Name="IPOIB.SYS"
-                     Source="..\bin\net\ia64\ipoib.sys" />
-              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"
-                     Name="ipoib.pdb"
-                     Source="..\bin\net\ia64\ipoib.pdb" />
-              <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd32.dll" Name="IBWSD32.DLL"
-                     Source="..\bin\net\ia64\ibwsd32.dll" />
-              <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd.dll" Name="IBWSD.DLL"
-                     Source="..\bin\net\ia64\ibwsd.dll" />
-              <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov.dll" Name="IBNDPROV.DLL"
-                     Source="..\bin\net\ia64\ibndprov.dll" />
-              <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"
-                     Source="..\bin\net\ia64\ibndprov32.dll" />
-              <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
-                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"
-                     Source="..\bin\net\ia64\ndinstall.exe" />
-            </Component>
+            <?include ..\..\common\ipoib.inc ?>
           </Directory>
 
           <Component Id="WinsockDirect"
                      Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
             <File Id="installsp.exe" Compressed="yes" DiskId="1"
                      LongName="installsp.exe" Name="INSTALL.EXE"
-                     Source="..\bin\net\ia64\installsp.exe" />
+                     Source="..\bin\net\$(var.ARCH)\installsp.exe" />
           </Component>
 <!-- when ND works for ia64
           <Component Id="cNetworkDirect"
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
           </Component>
 -->
-
-          <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-              <File Id="dapl32.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl32.dll" Name="DAPL32.DLL"
-                     Source="..\bin\DAPL\ia64\dapl32.dll" />
-              <File Id="dapl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl32d.dll" Name="DAPL32D.DLL"
-                     Source="..\bin\DAPL\ia64\dapl32d.dll" />
-              <File Id="dapl.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl.dll" Name="DAPL.DLL"
-                     Source="..\bin\DAPL\ia64\dapl.dll" />
-                <CopyFile Id="dupDAPL" FileId="dapl.dll"
-                        DestinationName="dapl.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="dapld.dll" Compressed="yes" DiskId="1"
-                     LongName="dapld.dll" Name="DAPLD.DLL"
-                     Source="..\bin\DAPL\ia64\dapld.dll" />
-              <File Id="dat32.dll" Compressed="yes" DiskId="1"
-                     LongName="dat32.dll" Name="DAT32.DLL"
-                     Source="..\bin\DAPL\ia64\dat32.dll" />
-              <File Id="dat32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat32d.dll" Name="DAT32D.DLL"
-                     Source="..\bin\DAPL\ia64\dat32d.dll" />
-              <File Id="dat.dll" Compressed="yes" DiskId="1"
-                     LongName="dat.dll" Name="DAT.DLL"
-                     Source="..\bin\DAPL\ia64\dat.dll" />
-              <CopyFile Id="dupDAT" FileId="dat.dll"
-                        DestinationName="dat.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="datd.dll" Compressed="yes" DiskId="1"
-                     LongName="datd.dll" Name="DATD.DLL"
-                     Source="..\bin\DAPL\ia64\datd.dll" />
-
-              <File Id="dat.conf" Compressed="yes" DiskId="1"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
-              <File Id="dapltest.exe" Compressed="yes" DiskId="1"
-                     LongName="dapltest.exe" Name="dapltest.exe"
-                     Source="..\bin\tools\ia64\release\dapltest.exe" />
-              <File Id="dapltestd.exe" Compressed="yes" DiskId="1"
-                     LongName="dapltestd.exe" Name="dapltesd.exe"
-                     Source="..\bin\tools\ia64\debug\dapltestd.exe" />
-
-              <File Id="dapl.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl.pdb" Name="dapl.pdb"
-                    Source="..\bin\DAPL\ia64\dapl.pdb" />
-              <File Id="dapld.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapld.pdb" Name="dapld.pdb"
-                    Source="..\bin\DAPL\ia64\dapld.pdb" />
-              <File Id="dat.lib" Compressed="yes" DiskId="1"
-                    LongName="dat.lib" Name="dat.lib"
-                    Source="..\bin\DAPL\ia64\dat.lib" />
-              <File Id="datd.lib" Compressed="yes" DiskId="1"
-                    LongName="datd.lib" Name="datd.lib"
-                    Source="..\bin\DAPL\ia64\datd.lib" />
-              <File Id="dat.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat.pdb" Name="dat.pdb"
-                    Source="..\bin\DAPL\ia64\dat.pdb" />
-              <File Id="datd.pdb" Compressed="yes" DiskId="1"
-                    LongName="datd.pdb" Name="datd.pdb"
-                    Source="..\bin\DAPL\ia64\datd.pdb" />
-              <File Id="dt_svr.bat" Compressed="yes" DiskId="1"
-                    LongName="dt-svr.bat" Name="dt-svr.bat"
-                    Source="..\bin\DAPL2\dt-svr.bat" />
-              <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"
-                        DestinationName="dt1-svr.bat"
-                        DestinationProperty="INSTALLDIR" />
-              <File Id="dt_cli.bat" Compressed="yes" DiskId="1"
-                    LongName="dt-cli.bat" Name="dt-cli.bat"
-                    Source="..\bin\DAPL2\dt-cli.bat" />
-              <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"
-                        DestinationName="dt1-cli.bat"
-                        DestinationProperty="INSTALLDIR" />
-          </Component>
-
-          <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
-              <File Id="_dapl32.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232.dll" Name="DAPL232.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl232.dll" />
-              <File Id="_dapl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232d.dll" Name="DAPL232D.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl232d.dll" />
-              <File Id="_dapl2.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2.dll" Name="DAPL2.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl2.dll" />
-                <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"
-                        DestinationName="dapl2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2d.dll" Name="DAPL2D.DLL"
-                     Source="..\bin\DAPL2\ia64\dapl2d.dll" />
-              <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scm.dll" Name="D2-scm.DLL"
-                          Source="..\bin\DAPL2\ia64\dapl2-scm.dll" />
-              <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"
-                              DestinationName="d2-scm.dll"
-                              DestinationLongName="dapl2-scm.dll"
-                              DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"
-                          Source="..\bin\DAPL2\ia64\dapl2-scmd.dll" />
-              <File Id="_dat32.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232.dll" Name="DAT232.DLL"
-                     Source="..\bin\DAPL2\ia64\dat232.dll" />
-              <File Id="_dat32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232d.dll" Name="DAT232D.DLL"
-                     Source="..\bin\DAPL2\ia64\dat232d.dll" />
-              <File Id="_dat2.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2.dll" Name="DAT2.DLL"
-                     Source="..\bin\DAPL2\ia64\dat2.dll" />
-              <CopyFile Id="dupDAT2" FileId="_dat2.dll"
-                        DestinationName="dat2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dat2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2d.dll" Name="DAT2D.DLL"
-                     Source="..\bin\DAPL2\ia64\dat2d.dll" />
-              <File Id="dapl2test.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2test.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\ia64\release\dapl2test.exe" />
-              <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2testd.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\ia64\debug\dapl2testd.exe" />
-              <File Id="dtest2.exe" Compressed="yes" DiskId="1"
-                     LongName="dtest2.exe" Name="dtest2.exe"
-                     Source="..\bin\tools\ia64\release\dtest2.exe" />
-              <File Id="dtestx.exe" Compressed="yes" DiskId="1"
-                     LongName="dtestx.exe" Name="dtestx.exe"
-                     Source="..\bin\tools\ia64\release\dtestx.exe" />
-
-              <File Id="dapl2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2.pdb" Name="dapl2.pdb"
-                    Source="..\bin\DAPL2\ia64\dapl2.pdb" />
-              <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2d.pdb" Name="dapl2d.pdb"
-                    Source="..\bin\DAPL2\ia64\dapl2d.pdb" />
-              <File Id="dat2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2.pdb" Name="dat2.pdb"
-                    Source="..\bin\DAPL2\ia64\dat2.pdb" />
-              <File Id="dat2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2d.pdb" Name="dat2d.pdb"
-                    Source="..\bin\DAPL2\ia64\dat2d.pdb" />
-              <File Id="dat2.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2.lib" Name="dat2.lib"
-                    Source="..\bin\DAPL2\ia64\dat2.lib" />
-              <File Id="dat2d.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2d.lib" Name="dat2d.lib"
-                    Source="..\bin\DAPL2\ia64\dat2d.lib" />
-          </Component>
+          <?include ..\..\common\dapl_rt.inc ?>
 
           <Component Id="cQLVNIC_driver_installed"
                      Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
@@ -936,17 +91,17 @@ End ConnectX remove -->
                        Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
               <CreateFolder />
               <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                     LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                     Source="..\bin\net\ia64\qlgcvnic.sys" />
+                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
               <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                     Name="qlgcvnic.pdb"
-                     Source="..\bin\net\ia64\qlgcvnic.pdb" />
+                    Name="qlgcvnic.pdb"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
               <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                     LongName="netvnic.inf" Name="NETVNIC.INF"
-                     Source="..\bin\net\ia64\netvnic.inf" />
+                    LongName="netvnic.inf" Name="NETVNIC.INF"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
               <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                     LongName="netvnic.cat" Name="NETVNIC.cat"
-                     Source="..\bin\net\ia64\netvnic.cat" />
+                    LongName="netvnic.cat" Name="NETVNIC.cat"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
             </Component>
           </Directory>
 
@@ -959,522 +114,39 @@ End ConnectX remove -->
             <Component Id="cSRP_files"
                        Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
               <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_srp.inf" Name="IB_SRP.INF"
-                     Source="..\bin\storage\ia64\ib_srp.inf" />
+                    LongName="ib_srp.inf" Name="IB_SRP.INF"
+                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
               <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.cat" Name="IBSRP.CAT"
-                     Source="..\bin\storage\ia64\ibsrp.cat" />
+                    LongName="ibsrp.cat" Name="IBSRP.CAT"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
               <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.sys" Name="IBSRP.SYS"
-                     Source="..\bin\storage\ia64\ibsrp.sys" />
+                    LongName="ibsrp.sys" Name="IBSRP.SYS"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
               <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                     Name="ibsrp.pdb"
-                     Source="..\bin\storage\ia64\ibsrp.pdb" />
-             </Component>
+                    Name="ibsrp.pdb"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
+            </Component>
           </Directory>
-
-          <Component Id="OpenSM_Service_enabled"
-                     Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-          </Component>
-        </Directory>
         </Directory>
+      </Directory>
 
-      <!-- copy DAT header files -->
-
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">    
-
-          <Directory Id="dDATD" Name="DAT">
-            <Component Id="cDatCfg" Guid="54A4F997-AC33-45D8-9899-6332E40B62A8">
-              <CreateFolder />
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
-            </Component>
-
-            <Directory Id="v1_1" Name="v1-1">
-              <Component Id="cDATV1" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049"
-                         KeyPath="yes" SharedDllRefCount="yes">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID" Name="DAT">    
-                <Component Id="cDatBldV1Hdrs"
-                          Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
-                  <CreateFolder />    
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat.h" />    
-
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat_error.h" />    
-    
-                  <File Id="dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    
-    
-                  <File Id="dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL\dat_redirection.h" />    
-    
-                  <File Id="dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL\dat_registry.h" />    
-    
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    
-    
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL\udat.h" />    
-    
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL\udat_config.h" />    
-    
-                  <File Id="udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL\udat_redirection.h" />    
-    
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV1Libs"
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    
-
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"
-                        LongName="dat.lib" Name="dat.lib"
-                        Source="..\bin\DAPL\ia64\dat.lib" />
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"
-                        LongName="datd.lib" Name="datd.lib"
-                        Source="..\bin\DAPL\ia64\datd.lib" />
-              </Component>
-            </Directory>
-
-            <Directory Id="v2_0" Name="v2-0">
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"
-                         KeyPath="yes" SharedDllRefCount="yes">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID2" Name="DAT">    
-                <Component Id="cDatBldV2Hdrs"
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    
-                  <CreateFolder />    
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat.h" />    
-
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat_error.h" />    
-    
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    
-    
-                  <File Id="_dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL2\dat_redirection.h" />    
-    
-                  <File Id="_dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL2\dat_registry.h" />    
-    
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    
-    
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL2\udat.h" />    
-    
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL2\udat_config.h" />    
-    
-                  <File Id="_udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL2\udat_redirection.h" />    
-    
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV2Libs"
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    
-
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2.lib" Name="dat2.lib"
-                        Source="..\bin\DAPL2\ia64\dat2.lib" />
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2d.lib" Name="dat2d.lib"
-                        Source="..\bin\DAPL2\ia64\dat2d.lib" />
-              </Component>    
-            </Directory>    
-
-          </Directory> <!-- DAT -->   
-
-          <Directory Id="IBSDK" Name="IBSDK">
-            <Directory Id="IB_libs" Name="lib">
-              <Component Id="cIBAL_Libs"
-                         Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
-                <CreateFolder />
-                <File Id="ibal.lib" Compressed="yes" DiskId="1"
-                      LongName="ibal.lib" Name="ibal.lib"
-                      Source="..\bin\HCA\ia64\ibal.lib" />
-                <File Id="ibal.pdb" Compressed="yes" DiskId="1"
-                      LongName="ibal.pdb" Name="ibal.pdb"
-                      Source="..\bin\HCA\ia64\ibal.pdb" />
-                <File Id="complib.lib" Compressed="yes" DiskId="1"
-                      LongName="complib.lib" Name="complib.lib"
-                      Source="..\bin\HCA\ia64\complib.lib" />
-                <File Id="complib.pdb" Compressed="yes" DiskId="1"
-                      LongName="complib.pdb" Name="complib.pdb"
-                      Source="..\bin\HCA\ia64\complib.pdb" />
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"
-                    LongName="ibald.lib" Name="ibald.lib"
-                    Source="..\bin\HCA\ia64\ibald.lib" />
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibald.pdb" Name="ibald.pdb"
-                    Source="..\bin\HCA\ia64\ibald.pdb" />
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"
-                    LongName="complibd.lib" Name="complibd.lib"
-                    Source="..\bin\HCA\ia64\complibd.lib" />
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"
-                    LongName="complibd.pdb" Name="complibd.pdb"
-                    Source="..\bin\HCA\ia64\complibd.pdb" />
-
-              <!-- SysWOW64\ 32-bit libs -->
-              <File Id="cl32.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32.lib" Name="cl32.lib"
-                    Source="..\bin\HCA\ia64\cl32.lib" />
-              <File Id="cl32.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32.pdb" Name="cl32.pdb"
-                    Source="..\bin\HCA\ia64\cl32.pdb" />
-              <File Id="cl32d.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32d.lib" Name="cl32d.lib"
-                    Source="..\bin\HCA\ia64\cl32d.lib" />
-              <File Id="cl32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32d.pdb" Name="cl32d.pdb"
-                    Source="..\bin\HCA\ia64\cl32d.pdb" />
-              <File Id="ibal32.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32.lib" Name="ibal32.lib"
-                    Source="..\bin\HCA\ia64\ibal32.lib" />
-              <File Id="ibal32.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32.pdb" Name="ibal32.pdb"
-                    Source="..\bin\HCA\ia64\ibal32.pdb" />
-              <File Id="ibal32d.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.lib" Name="ibal32d.lib"
-                    Source="..\bin\HCA\ia64\ibal32d.lib" />
-              <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.pdb" Name="ibal32d.pdb"
-                    Source="..\bin\HCA\ia64\ibal32d.pdb" />
-
-              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbs.lib" Name="winverbs.lib"
-                    Source="..\bin\HCA\ia64\winverbs.lib" />
-              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.lib" Name="winvrbsd.lib"
-                    Source="..\bin\HCA\ia64\winverbsd.lib" />
-
-              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.lib" Name="ibverbs.lib"
-                    Source="..\bin\HCA\ia64\libibverbs.lib" />
-              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                    Source="..\bin\HCA\ia64\libibverbs.pdb" />
-              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                    Source="..\bin\HCA\ia64\libibverbsd.lib" />
-              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                    Source="..\bin\HCA\ia64\libibverbsd.pdb" />
-
-              <File Id="libibmad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmad.lib" Name="ibmad.lib"
-                    Source="..\bin\HCA\ia64\libibmad.lib" />
-              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmad.pdb" Name="ibmad.pdb"
-                    Source="..\bin\HCA\ia64\libibmad.pdb" />
-              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.lib" Name="ibmadd.lib"
-                    Source="..\bin\HCA\ia64\libibmadd.lib" />
-              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                    Source="..\bin\HCA\ia64\libibmadd.pdb" />
-
-              <File Id="libibumad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumad.lib" Name="ibumad.lib"
-                    Source="..\bin\HCA\ia64\libibumad.lib" />
-              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumad.pdb" Name="ibumad.pdb"
-                    Source="..\bin\HCA\ia64\libibumad.pdb" />
-              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.lib" Name="ibumadd.lib"
-                    Source="..\bin\HCA\ia64\libibumadd.lib" />
-              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                    Source="..\bin\HCA\ia64\libibumadd.pdb" />
-              </Component>
-            </Directory>
-
-            <Directory Id="IB_inc" Name="Inc">
-              <Component Id="cIBAL_Incs"
-                         Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">
-                <CreateFolder />
-
-                <File Id="oib_ver.h" Compressed="yes" DiskId="1"
-                       LongName="oib_ver.h" Name="oib_ver.h"
-                       Source="..\bin\Inc\oib_ver.h" />
-                <File Id="openib.def" Compressed="yes" DiskId="1"
-                       LongName="openib.def" Name="openib.def"
-                       Source="..\bin\Inc\openib.def" />
-              </Component>
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
 
-              <Directory Id="IB_complib" Name="complib">
-                <Component Id="cIBAL_Complib"
-                           Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">
-                  <CreateFolder />
-                  <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"
-                        LongName="cl_async_proc.h" Name="CL_ASYN.H" 
-                        Source="..\bin\Inc\complib\cl_async_proc.h" />
-                  <File Id="cl_atomic.h" Compressed="yes" DiskId="1"
-                        LongName="cl_atomic.h" Name="CL_ATOM.H" 
-                        Source="..\bin\Inc\complib\cl_atomic.h" />
-                  <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" 
-                        Source="..\bin\Inc\complib\cl_atomic_osd.h" />
-                  <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_byteswap.h" Name="CL_BYTE.H" 
-                        Source="..\bin\Inc\complib\cl_byteswap.h" />
-                  <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" 
-                        Source="..\bin\Inc\complib\cl_byteswap_osd.h" />
-                  <File Id="cl_comppool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_comppool.h" Name="CL_COMP.H" 
-                        Source="..\bin\Inc\complib\cl_comppool.h" />
-                  <File Id="cl_debug.h" Compressed="yes" DiskId="1"
-                        LongName="cl_debug.h" Name="CL_DEBU.H" 
-                        Source="..\bin\Inc\complib\cl_debug.h" />
-                  <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_debug_osd.h" Name="CL_DEBU1.H" 
-                        Source="..\bin\Inc\complib\cl_debug_osd.h" />
-                  <File Id="cl_event.h" Compressed="yes" DiskId="1"
-                        LongName="cl_event.h" Name="CL_EVEN.H" 
-                        Source="..\bin\Inc\complib\cl_event.h" />
-                  <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_event_osd.h" Name="CL_EVEN1.H" 
-                        Source="..\bin\Inc\complib\cl_event_osd.h" />
-                  <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_fleximap.h" Name="CL_FLEX.H" 
-                        Source="..\bin\Inc\complib\cl_fleximap.h" />
-                  <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"
-                        LongName="cl_ioctl.h" Name="CL_IOCT.H" 
-                        Source="..\bin\Inc\complib\cl_ioctl.h" />
-                  <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" 
-                        Source="..\bin\Inc\complib\cl_ioctl_osd.h" />
-                  <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"
-                        LongName="cl_irqlock.h" Name="CL_IRQL.H" 
-                        Source="..\bin\Inc\complib\cl_irqlock.h" />
-                  <File Id="cl_list.h" Compressed="yes" DiskId="1"
-                        LongName="cl_list.h" Name="CL_LIST.H" 
-                        Source="..\bin\Inc\complib\cl_list.h" />
-                  <File Id="cl_log.h" Compressed="yes" DiskId="1"
-                        LongName="cl_log.h" Name="CL_LOG.H" 
-                        Source="..\bin\Inc\complib\cl_log.h" />
-                  <File Id="cl_map.h" Compressed="yes" DiskId="1"
-                        LongName="cl_map.h" Name="CL_MAP.H" 
-                        Source="..\bin\Inc\complib\cl_map.h" />
-                  <File Id="cl_math.h" Compressed="yes" DiskId="1"
-                        LongName="cl_math.h" Name="CL_MATH.H" 
-                        Source="..\bin\Inc\complib\cl_math.h" />
-                  <File Id="cl_memory.h" Compressed="yes" DiskId="1"
-                        LongName="cl_memory.h" Name="CL_MEMO.H" 
-                        Source="..\bin\Inc\complib\cl_memory.h" />
-                  <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_memory_osd.h" Name="CL_MEMO1.H" 
-                        Source="..\bin\Inc\complib\cl_memory_osd.h" />
-                  <File Id="cl_mutex.h" Compressed="yes" DiskId="1"
-                        LongName="cl_mutex.h" Name="CL_MUTE.H" 
-                        Source="..\bin\Inc\complib\cl_mutex.h" />
-                  <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" 
-                        Source="..\bin\Inc\complib\cl_mutex_osd.h" />
-                  <File Id="cl_obj.h" Compressed="yes" DiskId="1"
-                        LongName="cl_obj.h" Name="CL_OBJ.H" 
-                        Source="..\bin\Inc\complib\cl_obj.h" />
-                  <File Id="cl_packoff.h" Compressed="yes" DiskId="1"
-                        LongName="cl_packoff.h" Name="CL_PACK.H" 
-                        Source="..\bin\Inc\complib\cl_packoff.h" />
-                  <File Id="cl_packon.h" Compressed="yes" DiskId="1"
-                        LongName="cl_packon.h" Name="CL_PACK1.H" 
-                        Source="..\bin\Inc\complib\cl_packon.h" />
-                  <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"
-                        LongName="cl_passivelock.h" Name="CL_PASS.H" 
-                        Source="..\bin\Inc\complib\cl_passivelock.h" />
-                  <File Id="cl_perf.h" Compressed="yes" DiskId="1"
-                        LongName="cl_perf.h" Name="CL_PERF.H" 
-                        Source="..\bin\Inc\complib\cl_perf.h" />
-                  <File Id="cl_pool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_pool.h" Name="CL_POOL.H" 
-                        Source="..\bin\Inc\complib\cl_pool.h" />
-                  <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"
-                        LongName="cl_ptr_vector.h" Name="CL_PTR_.H" 
-                        Source="..\bin\Inc\complib\cl_ptr_vector.h" />
-                  <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qcomppool.h" Name="CL_QCOM.H" 
-                        Source="..\bin\Inc\complib\cl_qcomppool.h" />
-                  <File Id="cl_qlist.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qlist.h" Name="CL_QLIS.H" 
-                        Source="..\bin\Inc\complib\cl_qlist.h" />
-                  <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qlockpool.h" Name="CL_QLOC.H" 
-                        Source="..\bin\Inc\complib\cl_qlockpool.h" />
-                  <File Id="cl_qmap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qmap.h" Name="CL_QMAP.H" 
-                        Source="..\bin\Inc\complib\cl_qmap.h" />
-                  <File Id="cl_qpool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_qpool.h" Name="CL_QPOO.H" 
-                        Source="..\bin\Inc\complib\cl_qpool.h" />
-                  <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"
-                        LongName="cl_rbmap.h" Name="CL_RBMA.H" 
-                        Source="..\bin\Inc\complib\cl_rbmap.h" />
-                  <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"
-                        LongName="cl_reqmgr.h" Name="CL_REQM.H" 
-                        Source="..\bin\Inc\complib\cl_reqmgr.h" />
-                  <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"
-                        LongName="cl_spinlock.h" Name="CL_SPIN.H" 
-                        Source="..\bin\Inc\complib\cl_spinlock.h" />
-                  <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" 
-                        Source="..\bin\Inc\complib\cl_spinlock_osd.h" />
-                  <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"
-                        LongName="cl_syscallback.h" Name="CL_SYSC.H" 
-                        Source="..\bin\Inc\complib\cl_syscallback.h" />
-                  <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" 
-                        Source="..\bin\Inc\complib\cl_syscallback_osd.h" />
-                  <File Id="cl_thread.h" Compressed="yes" DiskId="1"
-                        LongName="cl_thread.h" Name="CL_THRE.H" 
-                        Source="..\bin\Inc\complib\cl_thread.h" />
-                  <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_thread_osd.h" Name="CL_THRE1.H" 
-                        Source="..\bin\Inc\complib\cl_thread_osd.h" />
-                  <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"
-                        LongName="cl_threadpool.h" Name="CL_THRE2.H" 
-                        Source="..\bin\Inc\complib\cl_threadpool.h" />
-                  <File Id="cl_timer.h" Compressed="yes" DiskId="1"
-                        LongName="cl_timer.h" Name="CL_TIME.H" 
-                        Source="..\bin\Inc\complib\cl_timer.h" />
-                  <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_timer_osd.h" Name="CL_TIME1.H" 
-                        Source="..\bin\Inc\complib\cl_timer_osd.h" />
-                  <File Id="cl_types.h" Compressed="yes" DiskId="1"
-                        LongName="cl_types.h" Name="CL_TYPE.H" 
-                        Source="..\bin\Inc\complib\cl_types.h" />
-                  <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_types_osd.h" Name="CL_TYPE1.H" 
-                        Source="..\bin\Inc\complib\cl_types_osd.h" />
-                  <File Id="cl_vector.h" Compressed="yes" DiskId="1"
-                        LongName="cl_vector.h" Name="CL_VECT.H" 
-                        Source="..\bin\Inc\complib\cl_vector.h" />
-                  <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"
-                        LongName="cl_waitobj.h" Name="CL_WAIT.H" 
-                        Source="..\bin\Inc\complib\cl_waitobj.h" />
-                  <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"
-                        LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" 
-                        Source="..\bin\Inc\complib\cl_waitobj_osd.h" />
-                  <File Id="comp_lib.h" Compressed="yes" DiskId="1"
-                        LongName="comp_lib.h" Name="COMP_LI.H" 
-                        Source="..\bin\Inc\complib\comp_lib.h" />
-                </Component>
-              </Directory>
+      <!-- copy DAT header files to
+         %SystemDrive%\DAT\v1-1\DAT
+         %SystemDrive%\DAT\v2-0\DAT
+      -->
 
-              <Directory Id="IB_iba" Name="iba">
-                <Component Id="cIBAL_IBA"
-                           Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">
-                  <CreateFolder />
-                  <File Id="ib_al.h" Compressed="yes" DiskId="1"
-                        LongName="ib_al.h" Name="ib_al.h"
-                        Source="..\bin\Inc\iba\ib_al.h" />
-                  <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"
-                        LongName="ib_al_ioctl.h" Name="ib_ioctl.h"
-                        Source="..\bin\Inc\iba\ib_al_ioctl.h" />
-                  <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"
-                        LongName="ib_at_ioctl.h" Name="ib_iocat.h"
-                        Source="..\bin\Inc\iba\ib_at_ioctl.h" />
-                  <File Id="ib_ci.h" Compressed="yes" DiskId="1"
-                        LongName="ib_ci.h" Name="ib_ci.h"
-                        Source="..\bin\Inc\iba\ib_ci.h" />
-                  <File Id="ib_types.h" Compressed="yes" DiskId="1"
-                        LongName="ib_types.h" Name="ib_types.h"
-                        Source="..\bin\Inc\iba\ib_types.h" />
-                  <File Id="ib_uvp.h" Compressed="yes" DiskId="1"
-                        LongName="ib_uvp.h" Name="ib_uvp.h"
-                        Source="..\bin\Inc\iba\ib_uvp.h" />
-                </Component>
-              </Directory>
-            </Directory>
+        <Directory Id="dDATD" Name="DAT">
+          <?include ..\..\common\DAT_config.inc ?>
+        </Directory>
 
-            <Directory Id="IB_samples" Name="Samples">
-              <Directory Id="sample_DDK" Name="DDK">
-                <Component Id="cDDK_example"
-                           Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">
-                  <CreateFolder />
-                      <File Id="cmtest.c" Compressed="yes" DiskId="1"
-                            LongName="cmtest.c" Name="cmtest.c"
-                            Source="..\bin\Misc\cmtest.c" />
-                      <File Id="makefile" Compressed="yes" DiskId="1"
-                            LongName="makefile" Name="makefile"
-                            Source="..\..\SDK_Samples\DDK\makefile" />
-                      <File Id="SOURCES" Compressed="yes" DiskId="1"
-                            LongName="SOURCES" Name="SOURCES"
-                            Source="..\..\SDK_Samples\DDK\SOURCES" />
-                      <File Id="README.txt" Compressed="yes" DiskId="1"
-                            LongName="README.txt" Name="README.txt"
-                            Source="..\..\SDK_Samples\DDK\README.txt" />
-                </Component>
-              </Directory>    <!-- End DDK -->
-              <Directory Id="sample_VS" Name="VS">
-                <Component Id="cVS_example"
-                           Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">
-                  <CreateFolder />
-                      <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"
-                            LongName="cmtest.c" Name="cmtest.c"
-                            Source="..\bin\misc\cmtest.c" />
-                      <File Id="vscmtest.rc" Compressed="yes" DiskId="1"
-                            LongName="cmtest.rc" Name="cmtest.rc"
-                            Source="..\..\SDK_Samples\VS\cmtest.rc" />
-                      <File Id="vsREADME.txt" Compressed="yes" DiskId="1"
-                            LongName="README.txt" Name="README.txt"
-                            Source="..\..\SDK_Samples\VS\README.txt" />
-                </Component>
-              </Directory>    <!-- End VS -->
-            </Directory>    <!-- End Samples -->
-          </Directory>    <!-- End IBSDK -->
+        <Directory Id="IBSDK" Name="IBSDK">
+          <?include ..\..\common\ib_sdk.inc ?>
+        </Directory>
 
-      </Directory>   <!-- WinRoot -->   
-    </Directory> <!-- TARGETDIR --> 
+      </Directory>
+    </Directory> <!-- End TARGETDIR -->
 
 <!--
     <Property Id='ARPNOMODIFY'>1</Property>
@@ -1486,7 +158,6 @@ End ConnectX remove -->
     <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
     <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
 
-
     <!--
        Features - Level=1 == Typical, no WSD on XP
      -->
@@ -1511,10 +182,10 @@ End ConnectX remove -->
       </Feature>
     </Feature>
 
-    <Feature Id="IBcore" Title="InfiniBand Core" Level="1"
-         Description="InfiniBand: Core, Tools, Docs"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
+    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"
+        Description="InfiniBand: Core, Tools, Docs"
+        Display="expand" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">
       <ComponentRef Id="cIBcore" />
       <ComponentRef Id="cWinVerbsDrivers" />
       <ComponentRef Id="Docs" />
@@ -1533,9 +204,9 @@ End ConnectX remove -->
     </Feature>
 
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"
-         Description="Internet Protocols over InfiniBand" Display="expand"
-         ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="Internet Protocols over InfiniBand" Display="expand"
+        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
       <ComponentRef Id="IPoIB" />
     </Feature>
 
@@ -1554,22 +225,23 @@ End ConnectX remove -->
         Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
         <ComponentRef Id="cNetworkDirect" />
+        <Condition Level="201"> IPOIB_EXISTS </Condition> 
     </Feature>
 -->
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"
-         Description="Open Subnet Management started as a local Windows Service"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="Open Subnet Management started as a local Windows Service"
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
       <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"
-         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"
+        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <Condition Level="201"> IPOIB_EXISTS </Condition>
 
       <Feature Id="fDatConf" Title="DAT-DAPL Config File"
-         Description="DAT-DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
+         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
          Display="expand" Level="1" 
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
         <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>
@@ -1618,9 +290,9 @@ End ConnectX remove -->
     </Feature>
 
     <Feature Id="fVNIC" Title="QLogic-VNIC"
-         Description="QLogic - Virtual NIC over InfiniBand"
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="QLogic - Virtual NIC over InfiniBand"
+        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <ComponentRef Id="cQLVNIC_driver_installed" />
     </Feature>
 
@@ -1644,73 +316,11 @@ End ConnectX remove -->
       <ComponentRef Id="cCHK_user" />
     </Feature>
 
-    <!--> File where Custom Actions are defined -->
-    <Binary Id='CA' src='..\..\CustomActions.vbs' />
-
-    <CustomAction Id='WinOF_setup' BinaryKey='CA'
-         VBScriptCall='WinOF_setup' Return='check' />
-
-    <CustomAction Id='ChkPreviousInstall' BinaryKey='CA'
-         VBScriptCall='ChkInstallAndReboot' Return='check' />
-
-    <CustomAction Id='DriverInstall' BinaryKey='CA'
-         VBScriptCall='DriverInstall' Return='check' Execute='deferred' />
-
-    <CustomAction Id='DriverUninstall' BinaryKey='CA'
-         VBScriptCall='DriverUninstall' Return='check' />
-
-    <CustomAction Id='WSDStart' BinaryKey='CA'
-         VBScriptCall='WSDEnable' Return='check' />
-
-    <CustomAction Id="ND_start" BinaryKey="CA"
-         VBScriptCall="ND_StartMeUp" Return="check" />
-
-    <CustomAction Id='HammerTime' BinaryKey='CA'
-         VBScriptCall='HammerTime' Return='check' />
-
-    <CustomAction Id="BcastRegChanged" BinaryKey="CA"
-         VBScriptCall="BcastRegChanged" Return="check" />
-
-    <CustomAction Id="InstallChanged" BinaryKey="CA"
-         VBScriptCall="InstallChanged" Return="check" />
-
-    <InstallExecuteSequence>
-       <!--> Always executed (Install or uninstall </!-->
-       <Custom Action="WinOF_setup" After='InstallInitialize' />
-
-       <!--> Install ONLY </!-->
-       <Custom Action="ChkPreviousInstall" After='WinOF_setup'>
-               NOT Installed</Custom>
-
-       <ScheduleReboot After='ChkPreviousInstall'>
-               REBOOT="FORCE"</ScheduleReboot>
-
-       <Custom Action="DriverInstall" After='InstallServices'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="WSDStart" After='InstallFinalize'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="ND_start" After="WSDStart">
-          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="BcastRegChanged" After="ND_start">
-               Not Installed</Custom>
-
-       <!--> CHANGE ONLY </!-->
-       <Custom Action="InstallChanged" After="InstallFinalize">
-           Installed </Custom>
-
-       <!--> REMOVE ONLY </!-->
-       <Custom Action="DriverUninstall" After='PublishProduct'>
-               REMOVE="ALL" </Custom>
-       <Custom Action="HammerTime" After='InstallFinalize'>REMOVE="ALL"</Custom>
-    </InstallExecuteSequence>
-
+    <?include ..\..\common\InstallExecuteSeq.inc ?>
 
     <UIRef Id="WixUI_FeatureTree" />
-    <UIRef Id="WixUI_ErrorProgressText" />
-    <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
     <UI />
   </Product>
 </Wix>
diff --git a/trunk/WinOF/WIX/wnet/x64/wof.wxs b/trunk/WinOF/WIX/wnet/x64/wof.wxs
index 82019922..e643deeb 100644
--- a/trunk/WinOF/WIX/wnet/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x64/wof.wxs
@@ -2,11 +2,18 @@
 <!--
    WinOF for x64 Windows Server 2003 or XP64
 -->
+
+<?define ARCH=amd64 ?>
+<?define ARCHP=x64 ?>
+<?define OS="wnet/xp64" ?>
+<?include ..\..\common\WinOF_cfg.inc ?>
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Product Name="Windows Open Fabrics InfiniBand v2.1.0 (RC0) x64"
-    Version="2.1.0"
+  <Product
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"
+    Version="$(var.WOFRELNUM)"
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
-    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' 
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
     Language="1033" Codepage="1252"
     Manufacturer="Open Fabrics Alliance Windows">
 
@@ -14,8 +21,8 @@
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
      InstallPrivileges='elevated'
      Description="WinOF Installer"
-     Comments="Windows Open Fabrics Alliance InfiniBand stack"
-     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="200"
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
      Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Condition Message="Administrator required to install [ProductName].">
@@ -34,59 +41,7 @@
          <![CDATA[(VersionNT64=502) Or (VersionNT64=501)]]>
     </Condition>
 
-    <!--
-        System/Machine-wide install, otherwise per-user (Administrator) only.
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.
-     -->
-    <Property Id="ALLUSERS"> Value="1" </Property>
-
-    <!-- Requires files sc.exe & reg.exe -->
-    <Property Id="REG_EXISTS">
-      <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="RegFile" Name="reg.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="SC_EXISTS">
-      <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">
-        <FileSearch Id="ScFile" Name="sc.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="IPOIB_EXISTS">
-      <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">
-        <FileSearch Id="ipoibFile" Name="netipoib.inf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT_CONF_EXISTS">
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">
-        <FileSearch Id="DCFile" Name="dat.conf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT1_INSTALLED">
-      <DirectorySearch Id="Dat1DS" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="daplFS" Name="dapl.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT2_INSTALLED">
-      <DirectorySearch Id="Dat2DS" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="dapl2FS" Name="dapl2.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Condition Message="[ProductName] requires system file reg.exe">
-       REG_EXISTS
-    </Condition>
-
-    <Condition Message="[ProductName] requires system file sc.exe">
-       SC_EXISTS
-    </Condition>
-
-    <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
-    <Property Id="DiskPrompt" Value="WinOF 1.0 Installation [1]" />
+    <?include ..\..\common\requirements.inc ?>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
@@ -96,907 +51,36 @@
       <Directory Id="DesktopFolder" Name="Desktop" />
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="INSTALLDIR" Name="WinOF">
-          <Component Id="Docs" Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
-
-            <File Id="OFAlogo" Compressed="yes" DiskId="1"
-                    LongName="openfabrics.gif" Name="ofa.gif"
-                    Source="..\..\openfabrics.gif" />
-
-            <!-- implies WIX build only from an svn structured tree.  -->
-            <File Id="manual.htm" Compressed="yes" DiskId="1" Name="Manual.htm"
-                    LongName="Manual.htm"
-                    Source="..\bin\Misc\Manual.htm" Vital="yes" />
 
-            <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
-                    Name="Manual.htm" LongName="Manual"
-                    Target="[INSTALLDIR]\Manual.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="dRelnotes" Compressed="yes" DiskId="1"
-                    LongName="Release_notes.htm" Name="RELEASE_.HTM"
-                    Source="..\..\Release_notes.htm" />
-
-            <Shortcut Id="RelNotes" Directory="ProgramMenuDir"
-                    Name="RelNotes" LongName="Release Notes"
-                    Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                    IconIndex="0" />
-
-            <File Id="command_window" Name="COMMAND.LNK"
-                    LongName="Command Window.lnk" Compressed="yes" DiskId="1"
-                    Source="..\..\x64\Command Window.lnk" Vital="yes" />
-
-            <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
-                    Name="COMMAND.LNK" LongName="Command Window.lnk"
-                    Target="[INSTALLDIR]\Command Window.lnk" Icon="openfabrics"
-                    IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />
-
-            <Shortcut Id="UninstallProduct" Name="UnMyApp"
-                Directory="ProgramMenuDir"
-                LongName="Uninstall WinOF"
-				Target="[System64Folder]msiexec.exe"
-                Arguments="/X [ProductCode]"
-                Description="Uninstalls OpenFabrics InfiniBand" />
-            <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
-          </Component>
-
-          <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
-            <Environment Id='UpdatePath' Name='PATH' Action='create'
-                         System='yes' Part='last' Value='[INSTALLDIR]' /> 
-
-            <File Id="qlgcvnic_config" Compressed="yes" DiskId="1" Vital="yes"
-                  Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"
-                  Source="..\bin\tools\amd64\release\qlgcvnic_config.exe" />
-            <File Id="part_man" Name="part_man.exe"
-                    Compressed="yes" DiskId="1" Vital="yes"
-                    Source="..\bin\tools\amd64\release\part_man.exe" />
-            <File Id="vstat" Name="vstat.exe"
-                    Compressed="yes" DiskId="1" Vital="yes"
-                    Source="..\bin\tools\amd64\release\vstat.exe" />
-            <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
-                    DiskId="1" Name="TTCP.EXE"
-                    Source="..\bin\tools\amd64\release\ttcp.exe" />
-            <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
-                    DiskId="1" Name="CMTEST.EXE"
-                    Source="..\bin\tools\amd64\release\cmtest.exe" />
-            <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_limits.exe" Name="IB_LIMI.EXE"
-                     Source="..\bin\tools\amd64\release\ib_limits.exe" />
-            <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_read_bw.exe" Name="IB_READ.EXE"
-                     Source="..\bin\tools\amd64\release\ib_read_bw.exe" />
-            <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
-                     Source="..\bin\tools\amd64\release\ib_read_lat.exe" />
-            <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
-                     Source="..\bin\tools\amd64\release\ib_send_bw.exe" />
-            <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
-                     Source="..\bin\tools\amd64\release\ib_send_lat.exe" />
-            <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
-                     Source="..\bin\tools\amd64\release\ib_write_bw.exe" />
-            <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
-                     LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
-                     Source="..\bin\tools\amd64\release\ib_write_lat.exe" />
-            <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
-                     LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
-                     Source="..\bin\tools\amd64\release\ibtrapgen.exe" />
-            <File Id="osmtest.exe" Compressed="yes" DiskId="1"
-                     LongName="osmtest.exe" Name="OSMTEST.EXE"
-                     Source="..\bin\tools\amd64\release\osmtest.exe" />
-            <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
-                     LongName="PrintIP.exe" Name="PRINTIP.EXE"
-                     Source="..\bin\tools\amd64\release\PrintIP.exe" />
-            <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"
-                     Vital="yes" Source="..\bin\tools\amd64\release\nsc.exe" />
-          </Component>
-
-          <Component Id='OpenSMservice'
-                     Guid='90042B4F-51B5-4720-8E54-6D366253634B'
-                     SharedDllRefCount='no' KeyPath='no'
-                     NeverOverwrite='no'
-                     Permanent='no' Transitive='no' Win64='no'
-                     Location='either'>
-
-              <File Id="opensm.exe" Compressed="yes" DiskId="1"
-                    LongName="opensm.exe" Name="OPENSM.EXE"
-                    Source="..\bin\tools\amd64\release\opensm.exe"
-                    Vital='yes' KeyPath='yes' Hidden='no' System='no' 
-                    Checksum='no' ReadOnly='no' />
-
-              <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
-                  Description='InfiniBand Subnet Configuration and Management'
-                  DisplayName='InfiniBand Subnet Manager'
-                  Arguments='-e --service'
-                  ErrorControl='normal'
-                  Start='disabled'
-                  Interactive='no'
-                  Type='ownProcess' />
-
-              <ServiceControl Id='osmSvcControl' Name='OpenSM'
-                              Stop='uninstall'
-                              Wait='no'
-                              Remove='uninstall' />
-          </Component>
+          <?include ..\..\common\Docs.inc ?>
+          <?include ..\..\common\Tools.inc ?>
+          <?include ..\..\common\OpenSM_service.inc ?>
 
           <Directory Id="IBcoreDir" Name="IBcore">
-            <Component Id="cIBcore"
-                       Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
-              <CreateFolder />
-              <File Id="dpinst.exe" Compressed="yes" DiskId="1"
-                     LongName="dpinst.exe" Name="dpinst.exe"
-                     Source="..\..\x64\dpinst.exe" />
-              <File Id="dpinst.xml" Compressed="yes" DiskId="1"
-                     LongName="dpinst.xml" Name="dpinst.xml"
-                     Source="..\..\dpinst.xml" />
-              <File Id="devman.exe" Compressed="yes" DiskId="1"
-                     LongName="devman.exe" Name="devman.exe"
-                     Source="..\..\x64\devman.exe" />
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />
-              <File Id="cl32.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32.dll" Name="CL32.DLL"
-                     Source="..\bin\HCA\amd64\cl32.dll" />
-              <File Id="cl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="cl32d.dll" Name="CL32D.DLL"
-                     Source="..\bin\HCA\amd64\cl32d.dll" />
-              <File Id="complib.dll" Compressed="yes" DiskId="1"
-                     LongName="complib.dll" Name="COMPLIB.DLL"
-                     Source="..\bin\HCA\amd64\complib.dll" />
-              <File Id="complibd.dll" Compressed="yes" DiskId="1"
-                     LongName="complibd.dll" Name="COMPLIB1.DLL"
-                     Source="..\bin\HCA\amd64\complibd.dll" />
-              <File Id="ibal32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32.dll" Name="IBAL32.DLL"
-                     Source="..\bin\HCA\amd64\ibal32.dll" />
-              <File Id="ibal32d.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal32d.dll" Name="IBAL32D.DLL"
-                     Source="..\bin\HCA\amd64\ibal32d.dll" />
-              <File Id="ibal.dll" Compressed="yes" DiskId="1"
-                     LongName="ibal.dll" Name="IBAL.DLL"
-                     Source="..\bin\HCA\amd64\ibal.dll" />
-              <File Id="ibald.dll" Compressed="yes" DiskId="1"
-                     LongName="ibald.dll" Name="IBALD.DLL"
-                     Source="..\bin\HCA\amd64\ibald.dll" />
-              <File Id="ibbus.sys" Compressed="yes" DiskId="1"
-                     LongName="ibbus.sys" Name="IBBUS.SYS"
-                     Source="..\bin\HCA\amd64\ibbus.sys" />
-              <File Id="ibbus.pdb" Compressed="yes" DiskId="1"
-                     Name="ibbus.pdb" Source="..\bin\HCA\amd64\ibbus.pdb" />
-              <File Id="ibiou.sys" Compressed="yes" DiskId="1"
-                     LongName="ibiou.sys" Name="IBIOU.SYS"
-                     Source="..\bin\HCA\amd64\ibiou.sys" />
-              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"
-                     Name="ibiou.pdb"
-                     Source="..\bin\HCA\amd64\ibiou.pdb" />
-              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.cat" Name="IB_IOU.cat"
-                     Source="..\bin\HCA\amd64\ib_iou.cat" />
-              <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_iou.inf" Name="IB_IOU.inf"
-                     Source="..\bin\HCA\amd64\ib_iou.inf" />
-              <!--
-                 Orphaned install files - remove on uninstall
-                 x64 SystemFolder == SysWOW64, System64Folder == System32
-              -->
-              <RemoveFile Id='o64_ibal.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="ibal.dll" LongName='ibal.dll' />
-              <RemoveFile Id='o64_ibald.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="ibald.dll" LongName='ibald.dll' />
-              <RemoveFile Id='o64_complib.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="complib.dll" LongName='complib.dll' />
-              <RemoveFile Id='o64_complibd.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="complibd.dll" LongName='complibd.dll' />
-              <RemoveFile Id='o32_ibal.dll' On='uninstall'
-                     Property="System64Folder"
-                     Name="ibal.dll" LongName='ibal.dll' />
-              <RemoveFile Id='o32_ibald.dll' On='uninstall'
-                     Property="System64Folder"
-                     Name="ibald.dll" LongName='ibald.dll' />
-              <RemoveFile Id='o32_complib.dll' On='uninstall'
-                     Property="System64Folder"
-                     Name="complib.dll" LongName='complib.dll' />
-              <RemoveFile Id='o32_complibd.dll' On='uninstall'
-                     Property="System64Folder"
-                     Name="complibd.dll" LongName='complibd.dll' />
-            </Component>
-
-            <Component Id="cMthcaDriver"
-                       Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">
-              <File Id="mthca32.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32.dll" Name="MTHCA32.DLL"
-                     Source="..\bin\HCA\amd64\mthca32.dll" />
-              <File Id="mthca32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mthca32d.dll" Name="MTHCA321.DLL"
-                     Source="..\bin\HCA\amd64\mthca32d.dll" />
-              <File Id="mthca.inf" Compressed="yes" DiskId="1"
-                     LongName="mthca.inf" Name="MTHCA.INF"
-                     Source="..\bin\HCA\amd64\mthca.inf" />
-              <File Id="mthca.cat" Compressed="yes" DiskId="1"
-                     LongName="mthca.cat" Name="MTHCA.cat"
-                     Source="..\bin\HCA\amd64\mthca.cat" />
-              <File Id="mthca.sys" Compressed="yes" DiskId="1"
-                     LongName="mthca.sys" Name="MTHCA.SYS"
-                     Source="..\bin\HCA\amd64\mthca.sys" />
-              <File Id="mthca.pdb" Compressed="yes" DiskId="1"
-                     Name="mthca.pdb"
-                     Source="..\bin\HCA\amd64\mthca.pdb" />
-              <File Id="mthcau.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcau.dll" Name="MTHCAU.DLL"
-                     Source="..\bin\HCA\amd64\mthcau.dll" />
-              <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
-                     LongName="mthcaud.dll" Name="MTHCAUD.DLL"
-                     Source="..\bin\HCA\amd64\mthcaud.dll" />
-              <!-- Orphaned install files - remove on uninstall -->
-              <RemoveFile Id='o32_mthcau.dll' On='uninstall'
-                     Property="System64Folder"
-                     Name="mthcau.dll" LongName='mthcau.dll' />
-              <RemoveFile Id='o32_mthcaud.dll' On='uninstall'
-                     Property="System64Folder"
-                     Name="mthcaud.dll" LongName='mthcaud.dll' />
-            </Component>
-
-            <Component Id="cConnectXDriver"
-                       Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
-              <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.inf" Name="mlx4_bus.INF"
-                     Source="..\bin\hca\amd64\mlx4_bus.inf" />
-              <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.cat" Name="mlx4_bus.cat"
-                     Source="..\bin\hca\amd64\mlx4_bus.cat" />
-              <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
-                     Source="..\bin\hca\amd64\mlx4_bus.sys" />
-              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
-                     Name="mlx4_bus.pdb"
-                     Source="..\bin\hca\amd64\mlx4_bus.pdb" />
-              <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
-                     Source="..\bin\hca\amd64\mlx4_hca.inf" />
-              <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.cat" Name="mlx4_hca.cat"
-                     Source="..\bin\hca\amd64\mlx4_hca.cat" />
-              <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"
-                     LongName="mlx4_hca.sys" Name="mlx4_hca.sys"
-                     Source="..\bin\hca\amd64\mlx4_hca.sys" />
-              <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"
-                     Name="mlx4_hca.pdb"
-                     Source="..\bin\hca\amd64\mlx4_hca.pdb" />
-              <File Id="mlx4u.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u.dll" Name="mlx4u.dll"
-                     Source="..\bin\hca\amd64\mlx4u.dll" />
-              <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4ud.dll" Name="mlx4ud.dll"
-                     Source="..\bin\hca\amd64\mlx4ud.dll" />
-
-              <!-- copy 32-bit binaries for 32b in x64 -->
-              <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32d.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\amd64\mlx4u32d.dll" />
-              <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"
-                     LongName="mlx4u32.dll" Name="mlx4u32.dll"
-                     Source="..\bin\hca\amd64\mlx4u32.dll" />
-            </Component>
-
-            <Component Id="cWinVerbsDrivers"
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-
-               <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                     LongName="winverbs.sys" Name="winverbs.sys"
-                     Source="..\bin\HCA\amd64\winverbs.sys" />
-               <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
-                     LongName="winverbs.pdb" Name="winverbs.pdb"
-                     Source="..\bin\HCA\amd64\winverbs.pdb" />
-               <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                     LongName="winverbs.dll" Name="winvrbs.dll"
-                     Source="..\bin\HCA\amd64\winverbs.dll" />
-               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                     LongName="winverbsd.dll" Name="winvrbsd.dll"
-                     Source="..\bin\HCA\amd64\winverbsd.dll" />
-              <File Id="winmad.sys" Compressed="yes" DiskId="1"
-                    LongName="winmad.sys" Name="winmad.sys"
-                    Source="..\bin\HCA\amd64\winmad.sys" />
-              <File Id="winmad.pdb" Compressed="yes" DiskId="1"
-                    LongName="winmad.pdb" Name="winmad.pdb"
-                    Source="..\bin\HCA\amd64\winmad.pdb" />
-              <File Id="winmad.dll" Compressed="yes" DiskId="1"
-                    LongName="winmad.dll" Name="winmad.dll"
-                    Source="..\bin\HCA\amd64\winmad.dll" />
-              <File Id="winmadd.dll" Compressed="yes" DiskId="1"
-                    LongName="winmadd.dll" Name="winmaddd.dll"
-                    Source="..\bin\HCA\amd64\winmadd.dll" />
-             </Component>
-          </Directory>
-
-          <Directory Id="dir_0" Name="Checked">
-            <Directory Id="dir_1" Name="kernel">
-                <Component Id="cCHK_kernel"
-                           Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
-                  <CreateFolder />
-
-                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"
-                        Source="..\..\README_checked.txt" />
-                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\HCA\amd64\mthca.sys" />
-                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\HCA\amd64\mthca.cat" />
-                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\HCA\amd64\mthca.pdb" />
-
-                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\HCA\amd64\ibbus.sys" />
-                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />
-
-                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\HCA\amd64\ibiou.sys" />
-                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />
-                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />
-
-                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"
-                      Source="..\bin\Chk\net\amd64\ipoib.sys" />
-                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\net\amd64\ipoib.cat" />
-                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\net\amd64\ipoib.pdb" />
-
-                  <File Id="chk5" DiskId="1" Compressed="yes"
-                        Name="qlgcvnic.sys"
-                        Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />
-                  <File Id="cat5" DiskId="1" Compressed="yes"
-                        Name="netvnic.cat"
-                        Source="..\bin\Chk\net\amd64\netvnic.cat" />
-                  <File Id="sym5" DiskId="1" Compressed="yes"
-                        Name="qlgcvnic.pdb"
-                        Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />
-
-                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\storage\amd64\ibsrp.sys" />
-                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\storage\amd64\ibsrp.cat" />
-                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"
-                        Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />
-
-                  <File Id="chk7" DiskId="1" Compressed="yes"
-                        Name="mlx4_bus.sys"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />
-                  <File Id="cat7" DiskId="1" Compressed="yes"
-                        Name="mlx4_bus.cat"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />
-                  <File Id="sym7" DiskId="1" Compressed="yes"
-                        Name="mlx4_bus.pdb"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />
-
-                  <File Id="chk8" DiskId="1" Compressed="yes"
-                        Name="mlx4_hca.sys"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />
-                  <File Id="cat8" DiskId="1" Compressed="yes"
-                        Name="mlx4_hca.cat"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />
-                  <File Id="sym8" DiskId="1" Compressed="yes"
-                        Name="mlx4_hca.pdb"
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />
-
-                  <File Id="chk9" DiskId="1" Compressed="yes"
-                        Name="winverbs.sys"
-                        Source="..\bin\Chk\HCA\amd64\winverbs.sys" />
-                  <File Id="sym9" DiskId="1" Compressed="yes"
-                        Name="winverbs.pdb"
-                        Source="..\bin\Chk\HCA\amd64\winverbs.pdb" />
-                  <File Id="dll9" DiskId="1" Compressed="yes"
-                        Name="winverbs.dll"
-                        Source="..\bin\Chk\HCA\amd64\winverbs.dll" />
-                  <File Id="dlld9" DiskId="1" Compressed="yes"
-                        Name="winverbd.dll"
-                        LongName="winverbsd.dll"
-                        Source="..\bin\Chk\HCA\amd64\winverbsd.dll" />
-
-                </Component>
-            </Directory>
-      
-            <Directory Id="dir_14" Name="user">
-                <Component Id="cCHK_user"
-                               Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
-                  <CreateFolder />
-                  <File Id="file45" Name="complibd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\complibd.dll" />
-                  <File Id="file46" Name="DAPL2-_1.DLL"
-                    LongName="dapl2-scmd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\dapl2-scmd.dll" />
-                  <File Id="file47" Name="dapl2d.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\dapl2d.dll" />
-                  <File Id="file48" Name="DAPL2T_1.EXE"
-                    LongName="dapl2testd.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\dapl2testd.exe" />
-                  <File Id="file49" Name="dapld.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\dapld.dll" />
-                  <File Id="file50" Name="DAPLTE_1.EXE"
-                    LongName="dapltestd.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\dapltestd.exe" />
-                  <File Id="file51" Name="dat2d.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\dat2d.dll" />
-                  <File Id="file52" Name="datd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\datd.dll" />
-                  <File Id="file53" Name="dtest2d.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\dtest2d.exe" />
-                  <File Id="file54" Name="dtestxd.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\dtestxd.exe" />
-                  <File Id="file57" Name="ibald.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\ibald.dll" />
-                  <File Id="file60" Name="ibwsd.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\ibwsd.dll" />
-                  <File Id="file68" Name="INSTAL_1.EXE"
-                    LongName="installsp.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\installsp.exe" />
-                  <File Id="file69" Name="mlx4ud.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\mlx4ud.dll" />
-                  <File Id="file72" Name="mthcaud.dll"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\mthcaud.dll" />
-                  <File Id="file73" Name="opensm.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\opensm.exe" />
-                  <File Id="file174" Name="vstat.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\vstat.exe" />
-                  <File Id="file175" Name="part_man.exe"
-                    DiskId="1" Compressed="yes"
-                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\part_man.exe" />
-                </Component>
-            </Directory>
+            <?include ..\..\common\IBcore.inc ?>
+            <?include ..\..\common\mlnx_drivers.inc ?>
+            <?include ..\..\common\winverbs_drivers.inc ?>
           </Directory>
-     
-          <Component Id="cWinVerbsOFED"
-                       Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.dll" Name="ibverbs.dll"
-                  Source="..\bin\HCA\amd64\libibverbs.dll" />
-              <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"
-                     DestinationName="ibverbs.dll"
-                     DestinationLongName="libibverbs.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                  Source="..\bin\HCA\amd64\libibverbs.pdb" />
-
-            <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                  Source="..\bin\HCA\amd64\libibverbsd.dll" />
-              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"
-                     DestinationName="ibverbsd.dll"
-                     DestinationLongName="libibverbsd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                  Source="..\bin\HCA\amd64\libibverbsd.pdb" />
-
-            <File Id="libibmad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmad.dll" Name="ibmad.dll"
-                  Source="..\bin\HCA\amd64\libibmad.dll" />
-              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"
-                     DestinationName="ibmad.dll"
-                     DestinationLongName="libibmad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmad.pdb" Name="ibmad.pdb"
-                  Source="..\bin\HCA\amd64\libibmad.pdb" />
-
-            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.dll" Name="ibmadd.dll"
-                  Source="..\bin\HCA\amd64\libibmadd.dll" />
-              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"
-                     DestinationName="ibmadd.dll"
-                     DestinationLongName="libibmadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                  Source="..\bin\HCA\amd64\libibmadd.pdb" />
 
-            <File Id="libibumad.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumad.dll" Name="ibumad.dll"
-                  Source="..\bin\HCA\amd64\libibumad.dll" />
-              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"
-                     DestinationName="ibumad.dll"
-                     DestinationLongName="libibumad.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumad.pdb" Name="ibumad.pdb"
-                  Source="..\bin\HCA\amd64\libibumad.pdb" />
-
-            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.dll" Name="ibumadd.dll"
-                  Source="..\bin\HCA\amd64\libibumadd.dll" />
-              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"
-                     DestinationName="ibumadd.dll"
-                     DestinationLongName="libibumadd.dll"
-                     DestinationProperty="WindowsFolder" />
-            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"
-                  LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                  Source="..\bin\HCA\amd64\libibumadd.pdb" />
-
-            <File Id="librdmacm.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.dll" Name="rdmacm.dll"
-                  Source="..\bin\HCA\amd64\librdmacm.dll" />
-              <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"
-                     DestinationName="rdmacm.dll"
-                     DestinationLongName="librdmacm.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacm.pdb" Name="rdmacm.pdb"
-                  Source="..\bin\HCA\amd64\librdmacm.pdb" />
-
-            <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.dll" Name="rdmacmd.dll"
-                  Source="..\bin\HCA\amd64\librdmacmd.dll" />
-              <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"
-                     DestinationName="rdmacmd.dll"
-                     DestinationLongName="librdmacmd.dll"
-                     DestinationProperty="SystemFolder" />
-            <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"
-                  LongName="librdmacmd.pdb" Name="rdmacmd.pdb"
-                  Source="..\bin\HCA\amd64\librdmacmd.pdb" />
-
-          </Component>
-
-          <Component Id="cWinVerbsUApps"
-                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
-
-            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.exe" />
-            <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.pdb" />
-            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.exe" Name="devinfo.exe"
-                  Source="..\bin\tools\amd64\release\ibv_devinfo.exe" />
-            <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_devinfo.pdb" />
-            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"
-                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.exe" />
-            <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.pdb" />
-            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.exe" Name="readbw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_read_bw.exe" />
-            <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_read_bw.pdb" />
-            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.exe" Name="readlat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_read_lat.exe" />
-            <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_read_lat.pdb" />
-            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.exe" Name="send_bw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_send_bw.exe" />
-            <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_send_bw.pdb" />
-            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.exe" Name="send_lat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_send_lat.exe" />
-            <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_send_lat.pdb" />
-            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"
-                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.exe" />
-            <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.pdb" />
-            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"
-                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.exe" />
-            <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.pdb" />
-            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.exe" Name="write_bw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_write_bw.exe" />
-            <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_write_bw.pdb" />
-            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.exe" Name="writelat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_write_lat.exe" />
-            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_write_lat.pdb" />
-            <File Id="sminfo.exe" Compressed="yes" DiskId="1"
-                  LongName="sminfo.exe" Name="sminfo.exe"
-                  Source="..\bin\tools\amd64\release\sminfo.exe" />
-            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"
-                  LongName="sminfo.pdb" Name="sminfo.pdb"
-                  Source="..\bin\tools\amd64\release\sminfo.pdb" />
-            <File Id="ibstat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibstat.exe" Name="ibstat.exe"
-                  Source="..\bin\tools\amd64\release\ibstat.exe" />
-            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibstat.pdb" Name="ibstat.pdb"
-                  Source="..\bin\tools\amd64\release\ibstat.pdb" />
-            <File Id="perfquery.exe" Compressed="yes" DiskId="1"
-                  LongName="perfquery.exe" Name="perfquer.exe"
-                  Source="..\bin\tools\amd64\release\perfquery.exe" />
-            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"
-                  LongName="perfquery.pdb" Name="perfquer.pdb"
-                  Source="..\bin\tools\amd64\release\perfquery.pdb" />
-            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.exe" Name="ibaddr.exe"
-                  Source="..\bin\tools\amd64\release\ibaddr.exe" />
-            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibaddr.pdb" Name="ibaddr.pdb"
-                  Source="..\bin\tools\amd64\release\ibaddr.pdb" />
-            <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.exe" Name="ibnetdis.exe"
-                  Source="..\bin\tools\amd64\release\ibnetdiscover.exe" />
-            <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"
-                  Source="..\bin\tools\amd64\release\ibnetdiscover.pdb" />
-            <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.exe" Name="rcmatose.exe"
-                  Source="..\bin\tools\amd64\release\rdma_cmatose.exe" />
-            <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"
-                  LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"
-                  Source="..\bin\tools\amd64\release\rdma_cmatose.pdb" />
-            <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_lat.exe" />
-            <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_lat.pdb" />
-            <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_bw.exe" />
-            <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"
-                  Source="..\bin\tools\amd64\release\ibv_rdma_bw.pdb" />
-            <File Id="ibroute.exe" Compressed="yes" DiskId="1"
-                  LongName="ibroute.exe" Name="ibroute.exe"
-                  Source="..\bin\tools\amd64\release\ibroute.exe" />
-            <File Id="ibroute.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibroute.pdb" Name="ibroute.pdb"
-                  Source="..\bin\tools\amd64\release\ibroute.pdb" />
-            <File Id="ibtracert.exe" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.exe" Name="ibtrt.exe"
-                  Source="..\bin\tools\amd64\release\ibtracert.exe" />
-            <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"
-                  LongName="ibtracert.pdb" Name="ibtrt.pdb"
-                  Source="..\bin\tools\amd64\release\ibtracert.pdb" />
-          </Component>
+          <?include ..\..\common\checked.inc ?>
+          <?include ..\..\common\winverbs_OFED.inc ?>
 
           <Directory Id="ipoibDir" Name="net">
-            <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
-              <CreateFolder />
-              <File Id="netipoib_inf" Compressed="yes" DiskId="1"
-                     LongName="netipoib.inf" Name="NETIPOI.INF"
-                     Source="..\bin\net\amd64\netipoib.inf" />
-              <File Id="ipoib_cat" Compressed="yes" DiskId="1"
-                     LongName="ipoib.cat" Name="IPOI.cat"
-                     Source="..\bin\net\amd64\ipoib.cat" />
-              <File Id="ipoib.sys" Compressed="yes" DiskId="1"
-                     LongName="ipoib.sys" Name="IPOIB.SYS"
-                     Source="..\bin\net\amd64\ipoib.sys" />
-              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"
-                     Name="ipoib.pdb"
-                     Source="..\bin\net\amd64\ipoib.pdb" />
-              <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd32.dll" Name="IBWSD32.DLL"
-                     Source="..\bin\net\amd64\ibwsd32.dll" />
-              <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
-                     LongName="ibwsd.dll" Name="IBWSD.DLL"
-                     Source="..\bin\net\amd64\ibwsd.dll" />
-              <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov.dll" Name="IBNDPROV.DLL"
-                     Source="..\bin\net\amd64\ibndprov.dll" />
-              <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"
-                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"
-                     Source="..\bin\net\amd64\ibndprov32.dll" />
-              <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
-                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"
-                     Source="..\bin\net\amd64\ndinstall.exe" />
-              <!-- Orphaned install files - remove on uninstall -->
-              <RemoveFile Id='o32_ibwsd.dll' On='uninstall'
-                     Property="System64Folder"
-                     Name="ibwsd.dll" LongName='ibwsd.dll' />
-              <RemoveFile Id='o64_ibwsd.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="ibwsd.dll" LongName='ibwsd.dll' />
-              <RemoveFile Id='o64_ibndprov.dll' On='uninstall'
-                     Property="SystemFolder"
-                     Name="ibndprov.dll" LongName='ibndprov.dll' />
-              <RemoveFile Id='o64_ndinstall.exe' On='uninstall'
-                     Property="SystemFolder"
-                     Name="ndinstal.exe" LongName='ndinstall.exe' />
-            </Component>
+            <?include ..\..\common\ipoib.inc ?>
           </Directory>
 
           <Component Id="WinsockDirect"
                      Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
             <File Id="installsp.exe" Compressed="yes" DiskId="1"
                      LongName="installsp.exe" Name="INSTALL.EXE"
-                     Source="..\bin\net\amd64\installsp.exe" />
+                     Source="..\bin\net\$(var.ARCH)\installsp.exe" />
           </Component>
 
           <Component Id="cNetworkDirect"
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
           </Component>
 
-          <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-            <File Id="dapl32.dll" Compressed="yes" DiskId="1"
-                   LongName="dapl32.dll" Name="DAPL32.DLL"
-                   Source="..\bin\DAPL\amd64\dapl32.dll" />
-            <File Id="dapl32d.dll" Compressed="yes" DiskId="1"
-                   LongName="dapl32d.dll" Name="DAPL32D.DLL"
-                   Source="..\bin\DAPL\amd64\dapl32d.dll" />
-            <File Id="dapl.dll" Compressed="yes" DiskId="1"
-                   LongName="dapl.dll" Name="DAPL.DLL"
-                   Source="..\bin\DAPL\amd64\dapl.dll" />
-              <CopyFile Id="dupDAPL" FileId="dapl.dll"
-                      DestinationName="dapl.dll"
-                      DestinationProperty="WindowsFolder" />
-            <File Id="dapld.dll" Compressed="yes" DiskId="1"
-                   LongName="dapld.dll" Name="DAPLD.DLL"
-                   Source="..\bin\DAPL\amd64\dapld.dll" />
-            <File Id="dat32.dll" Compressed="yes" DiskId="1"
-                   LongName="dat32.dll" Name="DAT32.DLL"
-                   Source="..\bin\DAPL\amd64\dat32.dll" />
-            <File Id="dat32d.dll" Compressed="yes" DiskId="1"
-                   LongName="dat32d.dll" Name="DAT32D.DLL"
-                   Source="..\bin\DAPL\amd64\dat32d.dll" />
-            <File Id="dat.dll" Compressed="yes" DiskId="1"
-                   LongName="dat.dll" Name="DAT.DLL"
-                   Source="..\bin\DAPL\amd64\dat.dll" />
-            <CopyFile Id="dupDAT" FileId="dat.dll"
-                      DestinationName="dat.dll"
-                      DestinationProperty="WindowsFolder" />
-            <File Id="datd.dll" Compressed="yes" DiskId="1"
-                   LongName="datd.dll" Name="DATD.DLL"
-                   Source="..\bin\DAPL\amd64\datd.dll" />
-            <File Id="dat.conf" Compressed="yes" DiskId="1"
-                   LongName="dat.conf" Name="dat.conf"
-                   Source="..\..\dat.conf" />
-            <File Id="dapltest.exe" Compressed="yes" DiskId="1"
-                   LongName="dapltest.exe" Name="dapltest.exe"
-                   Source="..\bin\tools\amd64\release\dapltest.exe" />
-            <File Id="dapltestd.exe" Compressed="yes" DiskId="1"
-                   LongName="dapltestd.exe" Name="dapltesd.exe"
-                   Source="..\bin\tools\amd64\debug\dapltestd.exe" />
-
-            <File Id="dapl.pdb" Compressed="yes" DiskId="1"
-                  LongName="dapl.pdb" Name="dapl.pdb"
-                  Source="..\bin\DAPL\amd64\dapl.pdb" />
-            <File Id="dapld.pdb" Compressed="yes" DiskId="1"
-                  LongName="dapld.pdb" Name="dapld.pdb"
-                  Source="..\bin\DAPL\amd64\dapld.pdb" />
-            <File Id="dat.lib" Compressed="yes" DiskId="1"
-                  LongName="dat.lib" Name="dat.lib"
-                  Source="..\bin\DAPL\amd64\dat.lib" />
-            <File Id="datd.lib" Compressed="yes" DiskId="1"
-                  LongName="datd.lib" Name="datd.lib"
-                  Source="..\bin\DAPL\amd64\datd.lib" />
-            <File Id="dat.pdb" Compressed="yes" DiskId="1"
-                  LongName="dat.pdb" Name="dat.pdb"
-                  Source="..\bin\DAPL\amd64\dat.pdb" />
-            <File Id="datd.pdb" Compressed="yes" DiskId="1"
-                  LongName="datd.pdb" Name="datd.pdb"
-                  Source="..\bin\DAPL\amd64\datd.pdb" />
-            <File Id="dt_svr.bat" Compressed="yes" DiskId="1"
-                  LongName="dt-svr.bat" Name="dt-svr.bat"
-                  Source="..\bin\DAPL2\dt-svr.bat" />
-            <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"
-                      DestinationName="dt1-svr.bat"
-                      DestinationProperty="INSTALLDIR" />
-            <File Id="dt_cli.bat" Compressed="yes" DiskId="1"
-                  LongName="dt-cli.bat" Name="dt-cli.bat"
-                  Source="..\bin\DAPL2\dt-cli.bat" />
-            <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"
-                      DestinationName="dt1-cli.bat"
-                      DestinationProperty="INSTALLDIR" />
-          </Component>
-
-          <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
-              <File Id="_dapl32.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232.dll" Name="DAPL232.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl232.dll" />
-              <File Id="_dapl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl232d.dll" Name="DAPL232D.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl232d.dll" />
-              <File Id="_dapl2.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2.dll" Name="DAPL2.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2.dll" />
-              <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"
-                        DestinationName="dapl2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2d.dll" Name="DAPL2D.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2d.dll" />
-              <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2-scm.dll" Name="D2-scm.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2-scm.dll" />
-              <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"
-                        DestinationName="d2-scm.dll"
-                        DestinationLongName="dapl2-scm.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"
-                     Source="..\bin\DAPL2\amd64\dapl2-scmd.dll" />
-              <File Id="_dat32.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232.dll" Name="DAT232.DLL"
-                     Source="..\bin\DAPL2\amd64\dat232.dll" />
-              <File Id="_dat32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat232d.dll" Name="DAT232D.DLL"
-                     Source="..\bin\DAPL2\amd64\dat232d.dll" />
-              <File Id="_dat2.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2.dll" Name="DAT2.DLL"
-                     Source="..\bin\DAPL2\amd64\dat2.dll" />
-              <CopyFile Id="dupDAT2" FileId="_dat2.dll"
-                        DestinationName="dat2.dll"
-                        DestinationProperty="WindowsFolder" />
-              <File Id="_dat2d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat2d.dll" Name="DAT2D.DLL"
-                     Source="..\bin\DAPL2\amd64\dat2d.dll" />
-              <File Id="dapl2test.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2test.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\amd64\release\dapl2test.exe" />
-              <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"
-                     LongName="dapl2testd.exe" Name="dapl2tes.exe"
-                     Source="..\bin\tools\amd64\debug\dapl2testd.exe" />
-              <File Id="dtest2.exe" Compressed="yes" DiskId="1"
-                     LongName="dtest2.exe" Name="dtest2.exe"
-                     Source="..\bin\tools\amd64\release\dtest2.exe" />
-              <File Id="dtestx.exe" Compressed="yes" DiskId="1"
-                     LongName="dtestx.exe" Name="dtestx.exe"
-                     Source="..\bin\tools\amd64\release\dtestx.exe" />
-
-              <File Id="dapl2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2.pdb" Name="dapl2.pdb"
-                    Source="..\bin\DAPL2\amd64\dapl2.pdb" />
-              <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dapl2d.pdb" Name="dapl2d.pdb"
-                    Source="..\bin\DAPL2\amd64\dapl2d.pdb" />
-              <File Id="dat2.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2.pdb" Name="dat2.pdb"
-                    Source="..\bin\DAPL2\amd64\dat2.pdb" />
-              <File Id="dat2d.pdb" Compressed="yes" DiskId="1"
-                    LongName="dat2d.pdb" Name="dat2d.pdb"
-                    Source="..\bin\DAPL2\amd64\dat2d.pdb" />
-              <File Id="dat2.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2.lib" Name="dat2.lib"
-                    Source="..\bin\DAPL2\amd64\dat2.lib" />
-              <File Id="dat2d.lib" Compressed="yes" DiskId="1"
-                    LongName="dat2d.lib" Name="dat2d.lib"
-                    Source="..\bin\DAPL2\amd64\dat2d.lib" />
-          </Component>
+          <?include ..\..\common\dapl_rt.inc ?>
 
           <Component Id="cQLVNIC_driver_installed"
                      Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
@@ -1007,49 +91,46 @@
                        Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
               <CreateFolder />
               <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                     LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                     Source="..\bin\net\amd64\qlgcvnic.sys" />
+                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
               <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                     Name="qlgcvnic.pdb"
-                     Source="..\bin\net\amd64\qlgcvnic.pdb" />
+                    Name="qlgcvnic.pdb"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
               <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                     LongName="netvnic.inf" Name="NETVNIC.INF"
-                     Source="..\bin\net\amd64\netvnic.inf" />
+                    LongName="netvnic.inf" Name="NETVNIC.INF"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
               <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                     LongName="netvnic.cat" Name="NETVNIC.cat"
-                     Source="..\bin\net\amd64\netvnic.cat" />
+                    LongName="netvnic.cat" Name="NETVNIC.cat"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
             </Component>
           </Directory>
 
           <Component Id="cSRP_driver_installed"
                      Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
           </Component>
- 
+
+          <!-- RDMA SCSI over IB (aka SRP) -->
           <Directory Id="srpDir" Name="SRP">
             <Component Id="cSRP_files"
                        Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
               <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_srp.inf" Name="IB_SRP.INF"
-                     Source="..\bin\storage\amd64\ib_srp.inf" />
+                    LongName="ib_srp.inf" Name="IB_SRP.INF"
+                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
               <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.cat" Name="IBSRP.CAT"
-                     Source="..\bin\storage\amd64\ibsrp.cat" />
+                    LongName="ibsrp.cat" Name="IBSRP.CAT"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
               <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                     LongName="ibsrp.sys" Name="IBSRP.SYS"
-                     Source="..\bin\storage\amd64\ibsrp.sys" />
+                    LongName="ibsrp.sys" Name="IBSRP.SYS"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
               <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                     Name="ibsrp.pdb"
-                     Source="..\bin\storage\amd64\ibsrp.pdb" />
+                    Name="ibsrp.pdb"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
             </Component>
           </Directory>
-
-          <Component Id="OpenSM_Service_enabled"
-                     Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-          </Component>
         </Directory>
       </Directory>
 
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot"> 
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
 
       <!-- copy DAT header files to
          %SystemDrive%\DAT\v1-1\DAT
@@ -1057,504 +138,15 @@
       -->
 
         <Directory Id="dDATD" Name="DAT">
-            <Component Id="cDatCfg"
-                       Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >
-              <CreateFolder />
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
-            </Component>
-
-            <Directory Id="v1_1" Name="v1-1">
-              <Component Id="cDATV1"
-                         Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">
-                <CreateFolder />
-              </Component>    
-              <Directory Id="DDID" Name="DAT">    
-                <Component Id="cDatBldV1Hdrs"
-                          Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
-                  <CreateFolder />    
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat.h" />    
-
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat_error.h" />    
-    
-                  <File Id="dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    
-    
-                  <File Id="dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL\dat_redirection.h" />    
-    
-                  <File Id="dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL\dat_registry.h" />    
-    
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    
-    
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL\udat.h" />    
-    
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL\udat_config.h" />    
-    
-                  <File Id="udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL\udat_redirection.h" />    
-    
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    
-                </Component>    
-              </Directory>    
-
-              <Component Id="cDatBldV1Libs"
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    
-
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"
-                        LongName="dat.lib" Name="dat.lib"
-                        Source="..\bin\DAPL\amd64\dat.lib" />
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"
-                        LongName="datd.lib" Name="datd.lib"
-                        Source="..\bin\DAPL\amd64\datd.lib" />
-              </Component>
-            </Directory>    
-
-            <Directory Id="v2_0" Name="v2-0">
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"
-                         KeyPath="yes" SharedDllRefCount="yes">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID2" Name="DAT">    
-                <Component Id="cDatBldV2Hdrs"
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    
-                  <CreateFolder />    
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat.h" />    
-
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat_error.h" />    
-    
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    
-    
-                  <File Id="_dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL2\dat_redirection.h" />    
-    
-                  <File Id="_dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL2\dat_registry.h" />    
-    
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    
-    
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL2\udat.h" />    
-    
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL2\udat_config.h" />    
-    
-                  <File Id="_udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL2\udat_redirection.h" />    
-    
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    
-
-                </Component>    
-              </Directory>    
-
-              <Component Id="cDatBldV2Libs"
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    
-
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2.lib" Name="dat2.lib"
-                        Source="..\bin\DAPL2\amd64\dat2.lib" />
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2d.lib" Name="dat2d.lib"
-                        Source="..\bin\DAPL2\amd64\dat2d.lib" />
-              </Component>    
-            </Directory>    
-
-        </Directory>    
+          <?include ..\..\common\DAT_config.inc ?>
+        </Directory>
 
         <Directory Id="IBSDK" Name="IBSDK">
-          <Directory Id="IB_libs" Name="lib">
-            <Component Id="cIBAL_Libs"
-                       Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
-              <CreateFolder />
-              <File Id="ibal.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal.lib" Name="ibal.lib"
-                    Source="..\bin\HCA\amd64\ibal.lib" />
-              <File Id="ibal.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal.pdb" Name="ibal.pdb"
-                    Source="..\bin\HCA\amd64\ibal.pdb" />
-              <File Id="complib.lib" Compressed="yes" DiskId="1"
-                    LongName="complib.lib" Name="complib.lib"
-                    Source="..\bin\HCA\amd64\complib.lib" />
-              <File Id="complib.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib.pdb" Name="complib.pdb"
-                    Source="..\bin\HCA\amd64\complib.pdb" />
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"
-                    LongName="ibald.lib" Name="ibald.lib"
-                    Source="..\bin\HCA\amd64\ibald.lib" />
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibald.pdb" Name="ibald.pdb"
-                    Source="..\bin\HCA\amd64\ibald.pdb" />
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"
-                    LongName="complibd.lib" Name="complibd.lib"
-                    Source="..\bin\HCA\amd64\complibd.lib" />
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"
-                    LongName="complibd.pdb" Name="complibd.pdb"
-                    Source="..\bin\HCA\amd64\complibd.pdb" />
-
-               <!-- SysWOW64\ 32-bit libs -->
-              <File Id="cl32.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32.lib" Name="cl32.lib"
-                    Source="..\bin\HCA\amd64\cl32.lib" />
-              <File Id="cl32.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32.pdb" Name="cl32.pdb"
-                    Source="..\bin\HCA\amd64\cl32.pdb" />
-              <File Id="cl32d.lib" Compressed="yes" DiskId="1"
-                    LongName="complib32d.lib" Name="cl32d.lib"
-                    Source="..\bin\HCA\amd64\cl32d.lib" />
-              <File Id="cl32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="complib32d.pdb" Name="cl32d.pdb"
-                    Source="..\bin\HCA\amd64\cl32d.pdb" />
-              <File Id="ibal32.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32.lib" Name="ibal32.lib"
-                    Source="..\bin\HCA\amd64\ibal32.lib" />
-              <File Id="ibal32.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32.pdb" Name="ibal32.pdb"
-                    Source="..\bin\HCA\amd64\ibal32.pdb" />
-              <File Id="ibal32d.lib" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.lib" Name="ibal32d.lib"
-                    Source="..\bin\HCA\amd64\ibal32d.lib" />
-              <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibal32d.pdb" Name="ibal32d.pdb"
-                    Source="..\bin\HCA\amd64\ibal32d.pdb" />
-
-              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbs.lib" Name="winverbs.lib"
-                    Source="..\bin\HCA\amd64\winverbs.lib" />
-              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="winverbsd.lib" Name="winvrbsd.lib"
-                    Source="..\bin\HCA\amd64\winverbsd.lib" />
-
-              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.lib" Name="ibverbs.lib"
-                    Source="..\bin\HCA\amd64\libibverbs.lib" />
-              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                    Source="..\bin\HCA\amd64\libibverbs.pdb" />
-              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                    Source="..\bin\HCA\amd64\libibverbsd.lib" />
-              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                    Source="..\bin\HCA\amd64\libibverbsd.pdb" />
-
-              <File Id="libibmad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmad.lib" Name="ibmad.lib"
-                    Source="..\bin\HCA\amd64\libibmad.lib" />
-              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmad.pdb" Name="ibmad.pdb"
-                    Source="..\bin\HCA\amd64\libibmad.pdb" />
-              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.lib" Name="ibmadd.lib"
-                    Source="..\bin\HCA\amd64\libibmadd.lib" />
-              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                    Source="..\bin\HCA\amd64\libibmadd.pdb" />
-
-              <File Id="libibumad.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumad.lib" Name="ibumad.lib"
-                    Source="..\bin\HCA\amd64\libibumad.lib" />
-              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumad.pdb" Name="ibumad.pdb"
-                    Source="..\bin\HCA\amd64\libibumad.pdb" />
-              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.lib" Name="ibumadd.lib"
-                    Source="..\bin\HCA\amd64\libibumadd.lib" />
-              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"
-                    LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                    Source="..\bin\HCA\amd64\libibumadd.pdb" />
-            </Component>
-          </Directory>
-
-          <Directory Id="IB_inc" Name="Inc">
-            <Component Id="cIBAL_Incs"
-                       Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">
-              <CreateFolder />
-
-              <File Id="oib_ver.h" Compressed="yes" DiskId="1"
-                     LongName="oib_ver.h" Name="oib_ver.h"
-                     Source="..\bin\Inc\oib_ver.h" />
-              <File Id="openib.def" Compressed="yes" DiskId="1"
-                     LongName="openib.def" Name="openib.def"
-                     Source="..\bin\Inc\openib.def" />
-            </Component>
-
-            <Directory Id="IB_complib" Name="complib">
-              <Component Id="cIBAL_Complib"
-                         Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">
-                <CreateFolder />
-                <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"
-                      LongName="cl_async_proc.h" Name="CL_ASYN.H" 
-                      Source="..\bin\Inc\complib\cl_async_proc.h" />
-                <File Id="cl_atomic.h" Compressed="yes" DiskId="1"
-                      LongName="cl_atomic.h" Name="CL_ATOM.H" 
-                      Source="..\bin\Inc\complib\cl_atomic.h" />
-                <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" 
-                      Source="..\bin\Inc\complib\cl_atomic_osd.h" />
-                <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_byteswap.h" Name="CL_BYTE.H" 
-                      Source="..\bin\Inc\complib\cl_byteswap.h" />
-                <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" 
-                      Source="..\bin\Inc\complib\cl_byteswap_osd.h" />
-                <File Id="cl_comppool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_comppool.h" Name="CL_COMP.H" 
-                      Source="..\bin\Inc\complib\cl_comppool.h" />
-                <File Id="cl_debug.h" Compressed="yes" DiskId="1"
-                      LongName="cl_debug.h" Name="CL_DEBU.H" 
-                      Source="..\bin\Inc\complib\cl_debug.h" />
-                <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_debug_osd.h" Name="CL_DEBU1.H" 
-                      Source="..\bin\Inc\complib\cl_debug_osd.h" />
-                <File Id="cl_event.h" Compressed="yes" DiskId="1"
-                      LongName="cl_event.h" Name="CL_EVEN.H" 
-                      Source="..\bin\Inc\complib\cl_event.h" />
-                <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_event_osd.h" Name="CL_EVEN1.H" 
-                      Source="..\bin\Inc\complib\cl_event_osd.h" />
-                <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_fleximap.h" Name="CL_FLEX.H" 
-                      Source="..\bin\Inc\complib\cl_fleximap.h" />
-                <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"
-                      LongName="cl_ioctl.h" Name="CL_IOCT.H" 
-                      Source="..\bin\Inc\complib\cl_ioctl.h" />
-                <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" 
-                      Source="..\bin\Inc\complib\cl_ioctl_osd.h" />
-                <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"
-                      LongName="cl_irqlock.h" Name="CL_IRQL.H" 
-                      Source="..\bin\Inc\complib\cl_irqlock.h" />
-                <File Id="cl_list.h" Compressed="yes" DiskId="1"
-                      LongName="cl_list.h" Name="CL_LIST.H" 
-                      Source="..\bin\Inc\complib\cl_list.h" />
-                <File Id="cl_log.h" Compressed="yes" DiskId="1"
-                      LongName="cl_log.h" Name="CL_LOG.H" 
-                      Source="..\bin\Inc\complib\cl_log.h" />
-                <File Id="cl_map.h" Compressed="yes" DiskId="1"
-                      LongName="cl_map.h" Name="CL_MAP.H" 
-                      Source="..\bin\Inc\complib\cl_map.h" />
-                <File Id="cl_math.h" Compressed="yes" DiskId="1"
-                      LongName="cl_math.h" Name="CL_MATH.H" 
-                      Source="..\bin\Inc\complib\cl_math.h" />
-                <File Id="cl_memory.h" Compressed="yes" DiskId="1"
-                      LongName="cl_memory.h" Name="CL_MEMO.H" 
-                      Source="..\bin\Inc\complib\cl_memory.h" />
-                <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_memory_osd.h" Name="CL_MEMO1.H" 
-                      Source="..\bin\Inc\complib\cl_memory_osd.h" />
-                <File Id="cl_mutex.h" Compressed="yes" DiskId="1"
-                      LongName="cl_mutex.h" Name="CL_MUTE.H" 
-                      Source="..\bin\Inc\complib\cl_mutex.h" />
-                <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" 
-                      Source="..\bin\Inc\complib\cl_mutex_osd.h" />
-                <File Id="cl_obj.h" Compressed="yes" DiskId="1"
-                      LongName="cl_obj.h" Name="CL_OBJ.H" 
-                      Source="..\bin\Inc\complib\cl_obj.h" />
-                <File Id="cl_packoff.h" Compressed="yes" DiskId="1"
-                      LongName="cl_packoff.h" Name="CL_PACK.H" 
-                      Source="..\bin\Inc\complib\cl_packoff.h" />
-                <File Id="cl_packon.h" Compressed="yes" DiskId="1"
-                      LongName="cl_packon.h" Name="CL_PACK1.H" 
-                      Source="..\bin\Inc\complib\cl_packon.h" />
-                <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"
-                      LongName="cl_passivelock.h" Name="CL_PASS.H" 
-                      Source="..\bin\Inc\complib\cl_passivelock.h" />
-                <File Id="cl_perf.h" Compressed="yes" DiskId="1"
-                      LongName="cl_perf.h" Name="CL_PERF.H" 
-                      Source="..\bin\Inc\complib\cl_perf.h" />
-                <File Id="cl_pool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_pool.h" Name="CL_POOL.H" 
-                      Source="..\bin\Inc\complib\cl_pool.h" />
-                <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"
-                      LongName="cl_ptr_vector.h" Name="CL_PTR_.H" 
-                      Source="..\bin\Inc\complib\cl_ptr_vector.h" />
-                <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qcomppool.h" Name="CL_QCOM.H" 
-                      Source="..\bin\Inc\complib\cl_qcomppool.h" />
-                <File Id="cl_qlist.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qlist.h" Name="CL_QLIS.H" 
-                      Source="..\bin\Inc\complib\cl_qlist.h" />
-                <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qlockpool.h" Name="CL_QLOC.H" 
-                      Source="..\bin\Inc\complib\cl_qlockpool.h" />
-                <File Id="cl_qmap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qmap.h" Name="CL_QMAP.H" 
-                      Source="..\bin\Inc\complib\cl_qmap.h" />
-                <File Id="cl_qpool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_qpool.h" Name="CL_QPOO.H" 
-                      Source="..\bin\Inc\complib\cl_qpool.h" />
-                <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"
-                      LongName="cl_rbmap.h" Name="CL_RBMA.H" 
-                      Source="..\bin\Inc\complib\cl_rbmap.h" />
-                <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"
-                      LongName="cl_reqmgr.h" Name="CL_REQM.H" 
-                      Source="..\bin\Inc\complib\cl_reqmgr.h" />
-                <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"
-                      LongName="cl_spinlock.h" Name="CL_SPIN.H" 
-                      Source="..\bin\Inc\complib\cl_spinlock.h" />
-                <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" 
-                      Source="..\bin\Inc\complib\cl_spinlock_osd.h" />
-                <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"
-                      LongName="cl_syscallback.h" Name="CL_SYSC.H" 
-                      Source="..\bin\Inc\complib\cl_syscallback.h" />
-                <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" 
-                      Source="..\bin\Inc\complib\cl_syscallback_osd.h" />
-                <File Id="cl_thread.h" Compressed="yes" DiskId="1"
-                      LongName="cl_thread.h" Name="CL_THRE.H" 
-                      Source="..\bin\Inc\complib\cl_thread.h" />
-                <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_thread_osd.h" Name="CL_THRE1.H" 
-                      Source="..\bin\Inc\complib\cl_thread_osd.h" />
-                <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"
-                      LongName="cl_threadpool.h" Name="CL_THRE2.H" 
-                      Source="..\bin\Inc\complib\cl_threadpool.h" />
-                <File Id="cl_timer.h" Compressed="yes" DiskId="1"
-                      LongName="cl_timer.h" Name="CL_TIME.H" 
-                      Source="..\bin\Inc\complib\cl_timer.h" />
-                <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_timer_osd.h" Name="CL_TIME1.H" 
-                      Source="..\bin\Inc\complib\cl_timer_osd.h" />
-                <File Id="cl_types.h" Compressed="yes" DiskId="1"
-                      LongName="cl_types.h" Name="CL_TYPE.H" 
-                      Source="..\bin\Inc\complib\cl_types.h" />
-                <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_types_osd.h" Name="CL_TYPE1.H" 
-                      Source="..\bin\Inc\complib\cl_types_osd.h" />
-                <File Id="cl_vector.h" Compressed="yes" DiskId="1"
-                      LongName="cl_vector.h" Name="CL_VECT.H" 
-                      Source="..\bin\Inc\complib\cl_vector.h" />
-                <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"
-                      LongName="cl_waitobj.h" Name="CL_WAIT.H" 
-                      Source="..\bin\Inc\complib\cl_waitobj.h" />
-                <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"
-                      LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" 
-                      Source="..\bin\Inc\complib\cl_waitobj_osd.h" />
-                <File Id="comp_lib.h" Compressed="yes" DiskId="1"
-                      LongName="comp_lib.h" Name="COMP_LI.H" 
-                      Source="..\bin\Inc\complib\comp_lib.h" />
-              </Component>
-            </Directory>
-
-            <Directory Id="IB_iba" Name="iba">
-              <Component Id="cIBAL_IBA"
-                         Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">
-                <CreateFolder />
-                <File Id="ib_al.h" Compressed="yes" DiskId="1"
-                      LongName="ib_al.h" Name="ib_al.h"
-                      Source="..\bin\Inc\iba\ib_al.h" />
-                <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"
-                      LongName="ib_al_ioctl.h" Name="ib_ioctl.h"
-                      Source="..\bin\Inc\iba\ib_al_ioctl.h" />
-                <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"
-                      LongName="ib_at_ioctl.h" Name="ib_iocat.h"
-                      Source="..\bin\Inc\iba\ib_at_ioctl.h" />
-                <File Id="ib_ci.h" Compressed="yes" DiskId="1"
-                      LongName="ib_ci.h" Name="ib_ci.h"
-                      Source="..\bin\Inc\iba\ib_ci.h" />
-                <File Id="ib_types.h" Compressed="yes" DiskId="1"
-                      LongName="ib_types.h" Name="ib_types.h"
-                      Source="..\bin\Inc\iba\ib_types.h" />
-                <File Id="ib_uvp.h" Compressed="yes" DiskId="1"
-                      LongName="ib_uvp.h" Name="ib_uvp.h"
-                      Source="..\bin\Inc\iba\ib_uvp.h" />
-              </Component>
-            </Directory>
-          </Directory>
-
-          <Directory Id="IB_samples" Name="Samples">
-            <Directory Id="sample_DDK" Name="DDK">
-              <Component Id="cDDK_example"
-                         Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">
-                <CreateFolder />
-                    <File Id="cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\misc\cmtest.c" />
-                    <File Id="cmtest.rc" Compressed="yes" DiskId="1"
-                          LongName="cmtest.rc" Name="cmtest.rc"
-                          Source="..\..\SDK_Samples\DDK\cmtest.rc" />
-                    <File Id="makefile" Compressed="yes" DiskId="1"
-                          LongName="makefile" Name="makefile"
-                          Source="..\..\SDK_Samples\DDK\makefile" />
-                    <File Id="SOURCES" Compressed="yes" DiskId="1"
-                          LongName="SOURCES" Name="SOURCES"
-                          Source="..\..\SDK_Samples\DDK\SOURCES" />
-                    <File Id="README.txt" Compressed="yes" DiskId="1"
-                          LongName="README.txt" Name="README.txt"
-                          Source="..\..\SDK_Samples\DDK\README.txt" />
-              </Component>
-            </Directory>    <!-- End DDK -->
+          <?include ..\..\common\ib_sdk.inc ?>
+        </Directory>
 
-            <Directory Id="sample_VS" Name="VS">
-              <Component Id="cVS_example"
-                         Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">
-                <CreateFolder />
-                    <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\misc\cmtest.c" />
-                    <File Id="vs_cmtest.rc" Compressed="yes" DiskId="1"
-                          LongName="cmtest.rc" Name="cmtest.rc"
-                          Source="..\..\SDK_Samples\VS\cmtest.rc" />
-                    <File Id="vsREADME.txt" Compressed="yes" DiskId="1"
-                          LongName="README.txt" Name="README.txt"
-                          Source="..\..\SDK_Samples\VS\README.txt" />
-                    <File Id="Makefile.x64" Compressed="yes" DiskId="1"
-                          LongName="Makefile.x64" Name="Makefile.x64"
-                          Source="..\..\SDK_Samples\VS\Makefile.x64" />
-              </Component>
-            </Directory>   <!-- End VS -->
-          </Directory>   <!-- End Samples -->
-        </Directory>  <!-- End IBSDK -->
-      </Directory>  <!-- End WinRoot -->
-    </Directory>  <!-- End TARGETDIR -->
+      </Directory>
+    </Directory> <!-- End TARGETDIR -->
 
 <!--
     <Property Id='ARPNOMODIFY'>1</Property>
@@ -1567,11 +159,11 @@
     <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
 
     <!--
-       Features - Level=1 == Typical, no WSD on XP
+       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
      -->
 
     <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"
-         Description="InfiniBand Host Channel Adapter Drivers"
+         Description="Mellanox InfiniBand Host Channel Adapter Drivers"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
 
@@ -1591,10 +183,10 @@
       </Feature>
     </Feature>
 
-    <Feature Id="IBcore" Title="InfiniBand Core" Level="1"
-         Description="InfiniBand: Core, Tools, Docs"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
+    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"
+        Description="InfiniBand: Core, Tools, Docs"
+        Display="expand" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">
       <ComponentRef Id="cIBcore" />
       <ComponentRef Id="cWinVerbsDrivers" />
       <ComponentRef Id="Docs" />
@@ -1613,9 +205,9 @@
     </Feature>
 
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"
-         Description="Internet Protocols over InfiniBand" Display="expand"
-         ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="Internet Protocols over InfiniBand" Display="expand"
+        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
       <ComponentRef Id="IPoIB" />
     </Feature>
 
@@ -1636,22 +228,22 @@
     </Feature>
 
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"
-         Description="Open Subnet Management started as a local Windows Service"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="Open Subnet Management started as a local Windows Service"
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
       <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
     <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"
-         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <Condition Level="201"> IPOIB_EXISTS </Condition>
 
       <Feature Id="fDatConf" Title="DAT-DAPL Config File"
-         Description="DAT-DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
+         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
          Display="expand" Level="1" 
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
-        <Condition Level="0"> Not Installed AND DAT_CONF_EXISTS </Condition>
+        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>
         <ComponentRef Id="cDatCfg" />
       </Feature>
 
@@ -1697,9 +289,9 @@
     </Feature>
 
     <Feature Id="fVNIC" Title="QLogic-VNIC"
-         Description="QLogic - Virtual NIC over InfiniBand"
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        Description="QLogic - Virtual NIC over InfiniBand"
+        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
       <ComponentRef Id="cQLVNIC_driver_installed" />
     </Feature>
 
@@ -1723,69 +315,7 @@
       <ComponentRef Id="cCHK_user" />
     </Feature>
 
-    <!--> File where Custom Actions are defined -->
-    <Binary Id='CA' src='..\..\CustomActions.vbs' />
-
-    <CustomAction Id='WinOF_setup' BinaryKey='CA'
-         VBScriptCall='WinOF_setup' Return='check' />
-
-    <CustomAction Id='ChkPreviousInstall' BinaryKey='CA'
-         VBScriptCall='ChkInstallAndReboot' Return='check' />
-
-    <CustomAction Id='DriverInstall' BinaryKey='CA'
-         VBScriptCall='DriverInstall' Return='check' Execute='deferred' />
-
-    <CustomAction Id='DriverUninstall' BinaryKey='CA'
-         VBScriptCall='DriverUninstall' Return='check' />
-
-    <CustomAction Id='WSDStart' BinaryKey='CA'
-         VBScriptCall='WSDEnable' Return='check' />
-
-    <CustomAction Id="ND_start" BinaryKey="CA"
-         VBScriptCall="ND_StartMeUp" Return="check" />
-
-    <CustomAction Id='HammerTime' BinaryKey='CA'
-         VBScriptCall='HammerTime' Return='check' />
-
-    <CustomAction Id="BcastRegChanged" BinaryKey="CA"
-         VBScriptCall="BcastRegChanged" Return="check" />
-
-    <CustomAction Id="InstallChanged" BinaryKey="CA"
-         VBScriptCall="InstallChanged" Return="check" />
-
-    <InstallExecuteSequence>
-       <!--> Always executed (Install or uninstall </!-->
-       <Custom Action="WinOF_setup" After='InstallInitialize' />
-
-       <!--> Install ONLY </!-->
-       <Custom Action="ChkPreviousInstall" After='WinOF_setup'>
-               NOT Installed</Custom>
-
-       <ScheduleReboot After='ChkPreviousInstall'>
-               REBOOT="FORCE"</ScheduleReboot>
-
-       <Custom Action="DriverInstall" After='InstallServices'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="WSDStart" After='InstallFinalize'>
-               Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="ND_start" After="WSDStart">
-          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="BcastRegChanged" After="ND_start">
-           Not Installed</Custom>
-
-       <!--> CHANGE ONLY </!-->
-       <Custom Action="InstallChanged" After="InstallFinalize">
-           Installed </Custom>
-
-       <!--> REMOVE ONLY </!-->
-       <Custom Action="DriverUninstall" After='PublishProduct'>
-               REMOVE="ALL" </Custom>
-       <Custom Action="HammerTime" After='InstallFinalize'>REMOVE="ALL"</Custom>
-    </InstallExecuteSequence>
-
+    <?include ..\..\common\InstallExecuteSeq.inc ?>
 
     <UIRef Id="WixUI_FeatureTree" />
       <UIRef Id="WixUI_ErrorProgressText" />
diff --git a/trunk/WinOF/WIX/wnet/x86/wof.wxs b/trunk/WinOF/WIX/wnet/x86/wof.wxs
index 90958d02..b1f4604d 100644
--- a/trunk/WinOF/WIX/wnet/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x86/wof.wxs
@@ -2,22 +2,28 @@
 <!--
    WinOF (Windows OpenFabrics InfiniBand) for x86 Windows Server 2003
 -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 
-  <Product Name="Windows OpenFabrics InfiniBand v2.1.0 (RC0) x86"
-   Version="2.1.0"
-   Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
-   UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
-   Language="1033" Codepage="1252"
-   Manufacturer="Open Fabrics Alliance Windows">
+<?define ARCH=x86 ?>
+<?define ARCHP=x86 ?>
+<?define OS=wnet ?>
+<?include ..\..\common\WinOF_cfg.inc ?>
 
-   <Package Id="????????-????-????-????-????????????"
-    Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
-    InstallPrivileges='elevated'
-    Description="WinOF Installer"
-    Comments="Open Fabrics Alliance Windows InfiniBand stack"
-    Manufacturer="OpenFabrics Alliance Windows" InstallerVersion="200"
-    Languages="1033" Compressed="yes" SummaryCodepage="1252" />
+<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+  <Product
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"
+    Version="$(var.WOFRELNUM)"
+    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
+    Language="1033" Codepage="1252"
+    Manufacturer="Open Fabrics Alliance Windows">
+
+    <Package Id="????????-????-????-????-????????????"
+     Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
+     InstallPrivileges='elevated'
+     Description="WinOF Installer"
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
+     Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Condition Message="Administrator required to install [ProductName].">
      Privileged
@@ -29,1412 +35,117 @@
     <Condition Message="[ProductName] requires Windows 2003 Server to install.">
      <![CDATA[(VersionNT=502)]]></Condition>
 
-    <!--
-        System/Machine-wide install, otherwise per-user (Administrator) only.
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.
-     -->
-    <Property Id="ALLUSERS"> Value="1" </Property>
-
-    <!-- Requires files sc.exe & reg.exe -->
-
-    <Property Id="REG_EXISTS">
-        <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">
-            <FileSearch Id="RegFile" Name="reg.exe" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="SC_EXISTS">
-        <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">
-            <FileSearch Id="ScFile" Name="sc.exe" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="IPOIB_EXISTS">
-        <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">
-            <FileSearch Id="ipoibFile" Name="netipoib.inf" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT_CONF_EXISTS">
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">
-        <FileSearch Id="DCFile" Name="dat.conf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT1_INSTALLED">
-      <DirectorySearch Id="Dat1File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="daplFile" Name="dapl.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT2_INSTALLED">
-      <DirectorySearch Id="Dat2File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="dapl2File" Name="dapl2.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Condition Message="[ProductName] requires system file reg.exe">
-       REG_EXISTS
-    </Condition>
-    <Condition Message="[ProductName] requires system file sc.exe">
-       SC_EXISTS
-    </Condition>
-    <Media Id="1" Cabinet="Data1.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
-    <Property Id="DiskPrompt" Value="WinOF 1.1 Installation [1]" />
+    <?include ..\..\common\requirements.inc ?>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-        <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
-            <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"
-                       Name="WinOF" />
-        </Directory>
-        <Directory Id="DesktopFolder" Name="Desktop" />
-        <Directory Id="ProgramFilesFolder" Name="PFiles">
-            <Directory Id="INSTALLDIR" Name="WinOF">
-                <Component Id="Docs"
-                           Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
-                    <File Id="OFAlogo" Compressed="yes" DiskId="1"
-                          LongName="openfabrics.gif" Name="ofa.gif"
-                          Source="..\..\openfabrics.gif" />
-
-                   <!-- implies WIX build only from an svn structured tree.  -->
-                    <File Id="manual.htm" Compressed="yes" DiskId="1"
-                          Name="Manual.htm" LongName="Manual.htm" Vital="yes"
-                          Source="..\bin\Misc\Manual.htm" /> 
-
-                    <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
-                          Name="Manual.htm" LongName="Manual"
-                          Target="[INSTALLDIR]\Manual.htm" Show="normal"
-                          WorkingDirectory="INSTALLDIR"
-                          Icon="openfabrics" IconIndex="0" />
-
-                    <File Id="dRelnotes" Compressed="yes" DiskId="1"
-                          LongName="Release_notes.htm" Name="RELEASE_.HTM"
-                          Source="..\..\Release_notes.htm" />
-                    <Shortcut Id="RelNotes" Directory="ProgramMenuDir"
-                          Name="RelNotes" LongName="Release Notes"
-                          Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
-                          WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                          IconIndex="0" />
-                    <File Id="command_window" Name="COMMAND.LNK"
-                          LongName="Command Window.lnk" Compressed="yes"
-                          DiskId="1" Source="..\..\x86\Command Window.lnk"
-                          Vital="yes" />
-                    <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
-                          Name="COMMAND.LNK" LongName="Command Window.lnk"
-                          Target="[INSTALLDIR]\Command Window.lnk"
-                          Icon="openfabrics" IconIndex="0" Show="normal"
-                          WorkingDirectory="INSTALLDIR" />
-                    <Shortcut Id="UninstallProduct" Name="UnMyApp"
-                          LongName="Uninstall WinOF"
-                          Target="[SystemFolder]msiexec.exe"
-                          Arguments="/X [ProductCode]"
-                          Directory="ProgramMenuDir"
-                          Description="Uninstall Windows OpenFabrics InfinBand stack" />
-                    <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
-                </Component>
-
-                <Component Id="Tools"
-                           Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
-                    <Environment Id='UpdatePath' Name='PATH' Action='create'
-                           System='yes' Part='last' Value='[INSTALLDIR]' />
-
-                    <File Id="qlgcvnic_config"
-                          Compressed="yes" DiskId="1" Vital="yes"
-                          Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"
-                        Source="..\bin\tools\x86\release\qlgcvnic_config.exe" />
-                    <File Id="part_man" Name="part_man.exe"
-                          Compressed="yes" DiskId="1" Vital="yes"
-                          Source="..\bin\tools\x86\release\part_man.exe" />
-                    <File Id="vstat" Name="vstat.exe"
-                          Compressed="yes" Vital="yes" DiskId="1"
-                          Source="..\bin\tools\x86\release\vstat.exe" />
-                    <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
-                          DiskId="1" Name="TTCP.EXE"
-                          Source="..\bin\tools\x86\release\ttcp.exe" />
-                    <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
-                          DiskId="1" Name="CMTEST.EXE"
-                          Source="..\bin\tools\x86\release\cmtest.exe" />
-                    <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_limits.exe" Name="IB_LIMI.EXE"
-                          Source="..\bin\tools\x86\release\ib_limits.exe" />
-                    <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_read_bw.exe" Name="IB_READ.EXE"
-                          Source="..\bin\tools\x86\release\ib_read_bw.exe" />
-                    <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
-                          Source="..\bin\tools\x86\release\ib_read_lat.exe" />
-                    <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
-                          Source="..\bin\tools\x86\release\ib_send_bw.exe" />
-                    <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
-                          Source="..\bin\tools\x86\release\ib_send_lat.exe" />
-                    <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
-                          Source="..\bin\tools\x86\release\ib_write_bw.exe" />
-                    <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
-                          Source="..\bin\tools\x86\release\ib_write_lat.exe" />
-                    <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
-                          LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
-                          Source="..\bin\tools\x86\release\ibtrapgen.exe" />
-                    <File Id="osmtest.exe" Compressed="yes" DiskId="1"
-                          LongName="osmtest.exe" Name="OSMTEST.EXE"
-                          Source="..\bin\tools\x86\release\osmtest.exe" />
-                    <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
-                          LongName="PrintIP.exe" Name="PRINTIP.EXE"
-                          Source="..\bin\tools\x86\release\PrintIP.exe" />
-                    <File Id="nsc" Name="nsc.exe" Vital="yes"
-                          Compressed="yes" DiskId="1"
-                          Source="..\bin\tools\x86\release\nsc.exe" />
-                </Component>
-
-                <Component Id='OpenSMservice'
-                           Guid='90042B4F-51B5-4720-8E54-6D366253634B'
-                           SharedDllRefCount='no' KeyPath='no'
-                           NeverOverwrite='no'
-                           Permanent='no' Transitive='no' Win64='no'
-                           Location='either'>
-
-                  <File Id="opensm.exe" Compressed="yes" DiskId="1"
-                        LongName="opensm.exe" Name="OPENSM.EXE"
-                        Source="..\bin\tools\x86\release\opensm.exe"
-                        Vital='yes' KeyPath='yes' Hidden='no' System='no' 
-                        Checksum='no' ReadOnly='no' />
-
-                  <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
-                    Description='InfiniBand Subnet Configuration and Management'
-                      DisplayName='InfiniBand Subnet Manager'
-                      Arguments='-e --service'
-                      ErrorControl='normal'
-                      Start='disabled'
-                      Interactive='no'
-                      Type='ownProcess' />
-
-                  <ServiceControl Id='osmSvcControl' Name='OpenSM'
-                                  Stop='uninstall'
-                                  Wait='no'
-                                  Remove='uninstall' />
-                </Component>
-
-                <Directory Id="IBcoreDir" Name="IBcore">
-                    <Component Id="cIBcore"
-                               Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
-                        <CreateFolder />
-                        <File Id="dpinst.exe" Compressed="yes" DiskId="1"
-                              LongName="dpinst.exe" Name="dpinst.exe"
-                              Source="..\..\x86\dpinst.exe" />
-                        <File Id="dpinst.xml" Compressed="yes" DiskId="1"
-                              LongName="dpinst.xml" Name="dpinst.xml"
-                              Source="..\..\dpinst.xml" />
-                        <File Id="devman.exe" Compressed="yes" DiskId="1"
-                              LongName="devman.exe" Name="devman.exe"
-                              Source="..\..\x86\devman.exe" />
-                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                              LongName="WdfCoInstaller01007.dll"
-                              Name="WCO.dll"
-                              Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />
-                        <File Id="complib.dll" Compressed="yes" DiskId="1"
-                              LongName="complib.dll" Name="COMPLIB.DLL"
-                              Source="..\bin\HCA\x86\complib.dll" />
-                        <File Id="complibd.dll" Compressed="yes" DiskId="1"
-                              LongName="complibd.dll" Name="COMPLIBD.DLL"
-                              Source="..\bin\HCA\x86\complibd.dll" />
-                        <File Id="ibal.dll" Compressed="yes" DiskId="1"
-                              LongName="ibal.dll" Name="IBAL.DLL"
-                              Source="..\bin\HCA\x86\ibal.dll" />
-                        <File Id="ibald.dll" Compressed="yes" DiskId="1"
-                              LongName="ibald.dll" Name="IBALD.DLL"
-                              Source="..\bin\HCA\x86\ibald.dll" />
-                        <File Id="ibbus.sys" Compressed="yes" DiskId="1"
-                              LongName="ibbus.sys" Name="IBBUS.SYS"
-                              Source="..\bin\HCA\x86\ibbus.sys" />
-                        <File Id="ibbus.pdb" Compressed="yes" DiskId="1"
-                              Name="ibbus.pdb"
-                              Source="..\bin\HCA\x86\ibbus.pdb" />
-                        <File Id="ibiou.sys" Compressed="yes" DiskId="1"
-                              LongName="ibiou.sys" Name="IBIOU.SYS"
-                              Source="..\bin\HCA\x86\ibiou.sys" />
-                        <File Id="ibiou.pdb" Compressed="yes" DiskId="1"
-                              Name="ibiou.pdb"
-                              Source="..\bin\HCA\x86\ibiou.pdb" />
-                        <File Id="ib_iou.cat" Compressed="yes" DiskId="1"
-                              LongName="ib_iou.cat" Name="IB_iou.cat"
-                              Source="..\bin\HCA\x86\ib_iou.cat" />
-                        <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
-                              LongName="ib_iou.inf" Name="ib_iou.inf"
-                              Source="..\bin\HCA\x86\ib_iou.inf" />
-                    </Component>
-
-                    <Component Id="cMthcaDriver"
-                               Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">
-                        <File Id="mthca.inf" Compressed="yes" DiskId="1"
-                              LongName="mthca.inf" Name="MTHCA.INF"
-                              Source="..\bin\HCA\x86\mthca.inf" />
-                        <File Id="mthca.cat" Compressed="yes" DiskId="1"
-                              LongName="mthca.cat" Name="MTHCA.cat"
-                              Source="..\bin\HCA\x86\mthca.cat" />
-                        <File Id="mthca.sys" Compressed="yes" DiskId="1"
-                              LongName="mthca.sys" Name="MTHCA.SYS"
-                              Source="..\bin\HCA\x86\mthca.sys" />
-                        <File Id="mthca.pdb" Compressed="yes" DiskId="1"
-                              Name="mthca.pdb"
-                              Source="..\bin\HCA\x86\mthca.pdb" />
-                        <File Id="mthcau.dll" Compressed="yes" DiskId="1"
-                              LongName="mthcau.dll" Name="MTHCAU.DLL"
-                              Source="..\bin\HCA\x86\mthcau.dll" />
-                        <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
-                              LongName="mthcaud.dll" Name="MTHCAUD.DLL"
-                              Source="..\bin\HCA\x86\mthcaud.dll" />
-                    </Component>
-
-                    <Component Id="cConnectXDriver"
-                               Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
-                        <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.inf" Name="mlx4_bus.INF"
-                              Source="..\bin\hca\x86\mlx4_bus.inf" />
-                        <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.cat" Name="mlx4_bus.cat"
-                              Source="..\bin\hca\x86\mlx4_bus.cat" />
-                        <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
-                              Source="..\bin\hca\x86\mlx4_bus.sys" />
-                        <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
-                              Name="mlx4_bus.pdb"
-                              Source="..\bin\hca\x86\mlx4_bus.pdb" />
-                        <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
-                              Source="..\bin\hca\x86\mlx4_hca.inf" />
-                        <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.cat" Name="mlx4_hca.cat"
-                              Source="..\bin\hca\x86\mlx4_hca.cat" />
-                        <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.sys" Name="mlx4_hca.sys"
-                              Source="..\bin\hca\x86\mlx4_hca.sys" />
-                        <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"
-                              Name="mlx4_hca.pdb"
-                              Source="..\bin\hca\x86\mlx4_hca.pdb" />
-                        <File Id="mlx4u.dll" Compressed="yes" DiskId="1"
-                              LongName="mlx4u.dll" Name="mlx4u.dll"
-                              Source="..\bin\hca\x86\mlx4u.dll" />
-                        <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"
-                              LongName="mlx4ud.dll" Name="mlx4ud.dll"
-                              Source="..\bin\hca\x86\mlx4ud.dll" />
-                    </Component>
-
-                    <Component Id="cWinVerbsDrivers"
-                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-
-                        <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                              LongName="winverbs.sys" Name="winverbs.sys"
-                              Source="..\bin\HCA\x86\winverbs.sys" />
-                        <File Id="winverbs.pdb" DiskId="1" Compressed="yes"
-                              LongName="winverbs.pdb" Name="winverbs.pdb"
-                              Source="..\bin\HCA\x86\winverbs.pdb" />
-                        <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                              LongName="winverbs.dll" Name="winvrbs.dll"
-                              Source="..\bin\HCA\x86\winverbs.dll" />
-                        <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                              LongName="winverbsd.dll" Name="winvrbsd.dll"
-                              Source="..\bin\HCA\x86\winverbsd.dll" />
-                        <File Id="winmad.sys" Compressed="yes" DiskId="1"
-                              LongName="winmad.sys" Name="winmad.sys"
-                              Source="..\bin\HCA\x86\winmad.sys" />
-                        <File Id="winmad.pdb" Compressed="yes" DiskId="1"
-                              LongName="winmad.pdb" Name="winmad.pdb"
-                              Source="..\bin\HCA\x86\winmad.pdb" />
-                        <File Id="winmad.dll" Compressed="yes" DiskId="1"
-                              LongName="winmad.dll" Name="winmad.dll"
-                              Source="..\bin\HCA\x86\winmad.dll" />
-                        <File Id="winmadd.dll" Compressed="yes" DiskId="1"
-                              LongName="winmadd.dll" Name="winmaddd.dll"
-                              Source="..\bin\HCA\x86\winmadd.dll" />
-                   </Component>
-                </Directory>
-
-                <Directory Id="dir_0" Name="Checked">
-                  <Directory Id="dir_1" Name="kernel">
-                    <Component Id="cCHK_kernel"
-                               Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
-                      <CreateFolder />
-
-                          <File Id="chk0" DiskId="1" Compressed="yes"
-                            Name="README.txt"
-                            Source="..\..\README_checked.txt" />
-                      <File Id="chk1" DiskId="1" Compressed="yes"
-                            Name="mthca.sys"
-                            Source="..\bin\Chk\HCA\x86\mthca.sys" />
-                      <File Id="cat1" DiskId="1" Compressed="yes"
-                            Name="mthca.cat"
-                            Source="..\bin\Chk\HCA\x86\mthca.cat" />
-                      <File Id="sym1" DiskId="1" Compressed="yes"
-                            Name="mthca.pdb"
-                            Source="..\bin\Chk\HCA\x86\mthca.pdb" />
-
-                      <File Id="chk2" DiskId="1" Compressed="yes"
-                            Name="ibbus.sys"
-                            Source="..\bin\Chk\HCA\x86\ibbus.sys" />
-                      <File Id="sym2" DiskId="1" Compressed="yes"
-                            Name="ibbus.pdb"
-                            Source="..\bin\Chk\HCA\x86\ibbus.pdb" />
-                      <File Id="chk3" DiskId="1" Compressed="yes"
-                            Name="ibiou.sys"
-                            Source="..\bin\Chk\HCA\x86\ibiou.sys" />
-                      <File Id="cat3" DiskId="1" Compressed="yes"
-                            Name="ib_iou.cat"
-                            Source="..\bin\Chk\HCA\x86\ib_iou.cat" />
-                      <File Id="sym3" DiskId="1" Compressed="yes"
-                            Name="ibiou.pdb"
-                            Source="..\bin\Chk\HCA\x86\ibiou.pdb" />
-
-                      <File Id="chk4" DiskId="1" Compressed="yes"
-                            Name="ipoib.sys"
-                          Source="..\bin\Chk\net\x86\ipoib.sys" />
-                      <File Id="cat4" DiskId="1" Compressed="yes"
-                            Name="ipoib.cat"
-                            Source="..\bin\Chk\net\x86\ipoib.cat" />
-                      <File Id="sym4" DiskId="1" Compressed="yes"
-                            Name="ipoib.pdb"
-                            Source="..\bin\Chk\net\x86\ipoib.pdb" />
-
-                      <File Id="chk5" DiskId="1" Compressed="yes"
-                            Name="qlgcvnic.sys"
-                            Source="..\bin\Chk\net\x86\qlgcvnic.sys" />
-                      <File Id="cat5" DiskId="1" Compressed="yes"
-                            Name="netvnic.cat"
-                            Source="..\bin\Chk\net\x86\netvnic.cat" />
-                      <File Id="sym5" DiskId="1" Compressed="yes"
-                            Name="qlgcvnic.pdb"
-                            Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />
-
-                      <File Id="chk6" DiskId="1" Compressed="yes"
-                            Name="ibsrp.sys"
-                            Source="..\bin\Chk\storage\x86\ibsrp.sys" />
-                      <File Id="cat6" DiskId="1" Compressed="yes"
-                            Name="ibsrp.cat"
-                            Source="..\bin\Chk\storage\x86\ibsrp.cat" />
-                      <File Id="sym6" DiskId="1" Compressed="yes"
-                            Name="ibsrp.pdb"
-                            Source="..\bin\Chk\storage\x86\ibsrp.pdb" />
-
-                      <File Id="chk7" DiskId="1" Compressed="yes"
-                            Name="mlx4_bus.sys"
-                            Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />
-                      <File Id="cat7" DiskId="1" Compressed="yes"
-                            Name="mlx4_bus.cat"
-                            Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />
-                      <File Id="sym7" DiskId="1" Compressed="yes"
-                            Name="mlx4_bus.pdb"
-                            Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />
-
-                      <File Id="chk8" DiskId="1" Compressed="yes"
-                            Name="mlx4_hca.sys"
-                            Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />
-                      <File Id="cat8" DiskId="1" Compressed="yes"
-                            Name="mlx4_hca.cat"
-                            Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />
-                      <File Id="sym8" DiskId="1" Compressed="yes"
-                            Name="mlx4_hca.pdb"
-                            Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />
-
-                      <File Id="chk9" DiskId="1" Compressed="yes"
-                            Name="winverbs.sys"
-                            Source="..\bin\Chk\HCA\x86\winverbs.sys" />
-                      <File Id="sym9" DiskId="1" Compressed="yes"
-                            Name="winverbs.pdb"
-                            Source="..\bin\Chk\HCA\x86\winverbs.pdb" />
-                      <File Id="dll9" DiskId="1" Compressed="yes"
-                            Name="winverbs.dll"
-                            Source="..\bin\Chk\HCA\x86\winverbs.dll" />
-                      <File Id="dlld9" DiskId="1" Compressed="yes"
-                            Name="winverbd.dll"
-                            LongName="winverbsd.dll"
-                            Source="..\bin\Chk\HCA\x86\winverbsd.dll" />
-                    </Component>
-                  </Directory>
-
-                  <Directory Id="dir_14" Name="user">
-                    <Component Id="cCHK_user"
-                               Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
-                      <CreateFolder />
-                      <File Id="file118" Name="complibd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\complibd.dll" />
-                      <File Id="file119" Name="DAPL2-_1.DLL"
-                        LongName="dapl2-scmd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\dapl2-scmd.dll" />
-                      <File Id="file120" Name="dapl2d.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\dapl2d.dll" />
-                      <File Id="file121" Name="DAPL2T_1.EXE"
-                        LongName="dapl2testd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\dapl2testd.exe" />
-                      <File Id="file122" Name="dapld.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\dapld.dll" />
-                      <File Id="file123" Name="DAPLTE_1.EXE"
-                        LongName="dapltestd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\dapltestd.exe" />
-                      <File Id="file124" Name="dat2d.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\dat2d.dll" />
-                      <File Id="file125" Name="datd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\datd.dll" />
-                      <File Id="file126" Name="dtest2d.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\dtest2d.exe" />
-                      <File Id="file127" Name="dtestxd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\dtestxd.exe" />
-                      <File Id="file130" Name="ibald.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\ibald.dll" />
-                      <File Id="file133" Name="ibwsd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\ibwsd.dll" />
-                      <File Id="file141" Name="INSTAL_1.EXE"
-                        LongName="installsp.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\installsp.exe" />
-                      <File Id="file144" Name="mthcaud.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\mthcaud.dll" />
-                      <File Id="file146" Name="opensm.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\opensm.exe" />
-                      <File Id="file151" Name="vstat.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\vstat.exe" />
-                      <File Id="file152" Name="part_man.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wnet_x86\i386\part_man.exe" />
-                    </Component>
-                  </Directory>
-                </Directory>
-
-                <Component Id="cWinVerbsOFED"
-                           Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-                  <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                        LongName="libibverbs.dll" Name="ibverbs.dll"
-                        Source="..\bin\HCA\x86\libibverbs.dll" />
-                    <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"
-                           DestinationName="ibverbs.dll"
-                           DestinationLongName="libibverbs.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                        Source="..\bin\HCA\x86\libibverbs.pdb" />
-      
-                  <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                        Source="..\bin\HCA\x86\libibverbsd.dll" />
-                    <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"
-                           DestinationName="ibverbsd.dll"
-                           DestinationLongName="libibverbsd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                        Source="..\bin\HCA\x86\libibverbsd.pdb" />
-      
-                  <File Id="libibmad.dll" Compressed="yes" DiskId="1"
-                        LongName="libibmad.dll" Name="ibmad.dll"
-                        Source="..\bin\HCA\x86\libibmad.dll" />
-                    <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"
-                           DestinationName="ibmad.dll"
-                           DestinationLongName="libibmad.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibmad.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibmad.pdb" Name="ibmad.pdb"
-                        Source="..\bin\HCA\x86\libibmad.pdb" />
-      
-                  <File Id="libibmadd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibmadd.dll" Name="ibmadd.dll"
-                        Source="..\bin\HCA\x86\libibmadd.dll" />
-                    <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"
-                           DestinationName="ibmadd.dll"
-                           DestinationLongName="libibmadd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                        Source="..\bin\HCA\x86\libibmadd.pdb" />
-      
-                  <File Id="libibumad.dll" Compressed="yes" DiskId="1"
-                        LongName="libibumad.dll" Name="ibumad.dll"
-                        Source="..\bin\HCA\x86\libibumad.dll" />
-                    <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"
-                           DestinationName="ibumad.dll"
-                           DestinationLongName="libibumad.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibumad.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibumad.pdb" Name="ibumad.pdb"
-                        Source="..\bin\HCA\x86\libibumad.pdb" />
-      
-                  <File Id="libibumadd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibumadd.dll" Name="ibumadd.dll"
-                        Source="..\bin\HCA\x86\libibumadd.dll" />
-                    <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"
-                           DestinationName="ibumadd.dll"
-                           DestinationLongName="libibumadd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                        Source="..\bin\HCA\x86\libibumadd.pdb" />
-
-                  <File Id="librdmacm.dll" Compressed="yes" DiskId="1"
-                        LongName="librdmacm.dll" Name="rdmacm.dll"
-                        Source="..\bin\HCA\x86\librdmacm.dll" />
-                    <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"
-                           DestinationName="rdmacm.dll"
-                           DestinationLongName="librdmacm.dll"
-                           DestinationProperty="SystemFolder" />
-                  <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"
-                        LongName="librdmacm.pdb" Name="rdmacm.pdb"
-                        Source="..\bin\HCA\x86\librdmacm.pdb" />
-
-                  <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"
-                        LongName="librdmacmd.dll" Name="rdmacmd.dll"
-                        Source="..\bin\HCA\x86\librdmacmd.dll" />
-                    <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"
-                           DestinationName="rdmacmd.dll"
-                           DestinationLongName="librdmacmd.dll"
-                           DestinationProperty="SystemFolder" />
-                  <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"
-                        LongName="librdmacmd.pdb" Name="rdmacmd.pdb"
-                        Source="..\bin\HCA\x86\librdmacmd.pdb" />
-
-                </Component>
-
-                <Component Id="cWinVerbsUApps"
-                          Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
-
-                  <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"
-                        Source="..\bin\tools\x86\release\ibv_asyncwatch.exe" />
-                  <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_asyncwatch.pdb" />
-                  <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_devinfo.exe" Name="devinfo.exe"
-                        Source="..\bin\tools\x86\release\ibv_devinfo.exe" />
-                  <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_devinfo.pdb" Name="devinfo.pdb"
-                        Source="..\bin\tools\x86\release\ibv_devinfo.pdb" />
-                  <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"
-                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.exe" />
-                  <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.pdb" />
-                  <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_bw.exe" Name="readbw.exe"
-                        Source="..\bin\tools\x86\release\ibv_read_bw.exe" />
-                  <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_bw.pdb" Name="readbw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_read_bw.pdb" />
-                  <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_lat.exe" Name="readlat.exe"
-                        Source="..\bin\tools\x86\release\ibv_read_lat.exe" />
-                  <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_lat.pdb" Name="readlat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_read_lat.pdb" />
-                  <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_bw.exe" Name="send_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_send_bw.exe" />
-                  <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_bw.pdb" Name="send_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_send_bw.pdb" />
-                  <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_lat.exe" Name="send_lat.exe"
-                        Source="..\bin\tools\x86\release\ibv_send_lat.exe" />
-                  <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_lat.pdb" Name="send_lat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_send_lat.pdb" />
-                  <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"
-                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.exe" />
-                  <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"
-                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.pdb" />
-                  <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"
-                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.exe" />
-                  <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"
-                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.pdb" />
-                  <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_bw.exe" Name="write_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_write_bw.exe" />
-                  <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_bw.pdb" Name="write_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_write_bw.pdb" />
-                  <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_lat.exe" Name="writelat.exe"
-                        Source="..\bin\tools\x86\release\ibv_write_lat.exe" />
-                  <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_lat.pdb" Name="writelat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_write_lat.pdb" />
-                  <File Id="sminfo.exe" Compressed="yes" DiskId="1"
-                        LongName="sminfo.exe" Name="sminfo.exe"
-                        Source="..\bin\tools\x86\release\sminfo.exe" />
-                  <File Id="sminfo.pdb" Compressed="yes" DiskId="1"
-                        LongName="sminfo.pdb" Name="sminfo.pdb"
-                        Source="..\bin\tools\x86\release\sminfo.pdb" />
-                  <File Id="ibstat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibstat.exe" Name="ibstat.exe"
-                        Source="..\bin\tools\x86\release\ibstat.exe" />
-                  <File Id="ibstat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibstat.pdb" Name="ibstat.pdb"
-                        Source="..\bin\tools\x86\release\ibstat.pdb" />
-                  <File Id="perfquery.exe" Compressed="yes" DiskId="1"
-                        LongName="perfquery.exe" Name="perfquer.exe"
-                        Source="..\bin\tools\x86\release\perfquery.exe" />
-                  <File Id="perfquery.pdb" Compressed="yes" DiskId="1"
-                        LongName="perfquery.pdb" Name="perfquer.pdb"
-                        Source="..\bin\tools\x86\release\perfquery.pdb" />
-                  <File Id="ibaddr.exe" Compressed="yes" DiskId="1"
-                        LongName="ibaddr.exe" Name="ibaddr.exe"
-                        Source="..\bin\tools\x86\release\ibaddr.exe" />
-                  <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibaddr.pdb" Name="ibaddr.pdb"
-                        Source="..\bin\tools\x86\release\ibaddr.pdb" />
-                  <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"
-                        LongName="ibnetdiscover.exe" Name="ibnetdis.exe"
-                        Source="..\bin\tools\x86\release\ibnetdiscover.exe" />
-                  <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"
-                        Source="..\bin\tools\x86\release\ibnetdiscover.pdb" />
-                  <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"
-                        LongName="rdma_cmatose.exe" Name="rcmatose.exe"
-                        Source="..\bin\tools\x86\release\rdma_cmatose.exe" />
-                  <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"
-                        LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"
-                        Source="..\bin\tools\x86\release\rdma_cmatose.pdb" />
-                  <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"
-                        Source="..\bin\tools\x86\release\ibv_rdma_lat.exe" />
-                  <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rdma_lat.pdb" />
-                  <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_rdma_bw.exe" />
-                  <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rdma_bw.pdb" />
-                  <File Id="ibroute.exe" Compressed="yes" DiskId="1"
-                        LongName="ibroute.exe" Name="ibroute.exe"
-                        Source="..\bin\tools\x86\release\ibroute.exe" />
-                  <File Id="ibroute.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibroute.pdb" Name="ibroute.pdb"
-                        Source="..\bin\tools\x86\release\ibroute.pdb" />
-                  <File Id="ibtracert.exe" Compressed="yes" DiskId="1"
-                        LongName="ibtracert.exe" Name="ibtrt.exe"
-                        Source="..\bin\tools\x86\release\ibtracert.exe" />
-                  <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibtracert.pdb" Name="ibtrt.pdb"
-                        Source="..\bin\tools\x86\release\ibtracert.pdb" />
-                </Component>
-
-                <Directory Id="ipoibDir" Name="net">
-                    <Component Id="IPoIB"
-                               Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
-                        <CreateFolder />
-                        <File Id="netipoib_inf" Compressed="yes" DiskId="1"
-                              LongName="netipoib.inf" Name="NETIPOI.INF"
-                              Source="..\bin\net\x86\netipoib.inf" />
-                        <File Id="ipoib_cat" Compressed="yes" DiskId="1"
-                              LongName="ipoib.cat" Name="IPOI.cat"
-                              Source="..\bin\net\x86\ipoib.cat" />
-                        <File Id="ipoib.sys" Compressed="yes" DiskId="1"
-                              LongName="ipoib.sys" Name="IPOIB.SYS"
-                              Source="..\bin\net\x86\ipoib.sys" />
-                        <File Id="ipoib.pdb" Compressed="yes" DiskId="1"
-                              Name="ipoib.pdb"
-                              Source="..\bin\net\x86\ipoib.pdb" />
-                        <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
-                              LongName="ibwsd.dll" Name="IBWSD.DLL"
-                              Source="..\bin\net\x86\ibwsd.dll" />
-                        <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
-                              LongName="ibndprov.dll" Name="IBNDPROV.DLL"
-                              Source="..\bin\net\x86\ibndprov.dll" />
-                        <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
-                              LongName="ndinstall.exe" Name="NDINSTAL.EXE"
-                              Source="..\bin\net\x86\ndinstall.exe" />
-                    </Component>
-                </Directory>
-
-                <Component Id="WinsockDirect"
-                           Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
-                    <File Id="installsp.exe" Compressed="yes" DiskId="1"
-                              LongName="installsp.exe" Name="INSTALL.EXE"
-                              Source="..\bin\net\x86\installsp.exe" />
-                </Component>
-
-                <Component Id="cNetworkDirect"
-                           Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
-                </Component>
-
-                <Component Id="cDAPL1RT"
-                           Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-
-                    <File Id="dapl.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl.dll" Name="DAPL.DLL"
-                          Source="..\bin\DAPL\x86\dapl.dll" />
-                    <CopyFile Id="dupDAPL" FileId="dapl.dll"
-                          DestinationName="dapl.dll"
-                          DestinationProperty="WindowsFolder" />
-                    <File Id="dapld.dll" Compressed="yes" DiskId="1"
-                          LongName="dapld.dll" Name="DAPLD.DLL"
-                          Source="..\bin\DAPL\x86\dapld.dll" />
-                    <File Id="dat.dll" Compressed="yes" DiskId="1"
-                          LongName="dat.dll" Name="DAT.DLL"
-                          Source="..\bin\DAPL\x86\dat.dll" />
-                    <CopyFile Id="dupDAT" FileId="dat.dll"
-                          DestinationName="dat.dll"
-                          DestinationProperty="WindowsFolder" />
-                    <File Id="datd.dll" Compressed="yes" DiskId="1"
-                          LongName="datd.dll" Name="DATD.DLL"
-                          Source="..\bin\DAPL\x86\datd.dll" />
-
-                    <File Id="dat.conf" Compressed="yes" DiskId="1"
-                          LongName="dat.conf" Name="dat.conf"
-                          Source="..\..\dat.conf" />
-                    <File Id="dapltest.exe" Compressed="yes" DiskId="1"
-                          LongName="dapltest.exe" Name="dapltest.exe"
-                          Source="..\bin\tools\x86\release\dapltest.exe" />
-                    <File Id="dapltestd.exe" Compressed="yes" DiskId="1"
-                          LongName="dapltestd.exe" Name="dapltesd.exe"
-                          Source="..\bin\tools\x86\debug\dapltestd.exe" />
-
-                    <File Id="dat.lib" Compressed="yes" DiskId="1"
-                          LongName="dat.lib" Name="dat.lib"
-                          Source="..\bin\DAPL\x86\dat.lib" />
-                    <File Id="datd.lib" Compressed="yes" DiskId="1"
-                          LongName="datd.lib" Name="datd.lib"
-                          Source="..\bin\DAPL\x86\datd.lib" />
-                    <File Id="dat.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat.pdb" Name="dat.pdb"
-                          Source="..\bin\DAPL\x86\dat.pdb" />
-                    <File Id="datd.pdb" Compressed="yes" DiskId="1"
-                          LongName="datd.pdb" Name="datd.pdb"
-                          Source="..\bin\DAPL\x86\datd.pdb" />
-                    <File Id="dapl.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl.pdb" Name="dapl.pdb"
-                          Source="..\bin\DAPL\x86\dapl.pdb" />
-                    <File Id="dapld.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapld.pdb" Name="dapld.pdb"
-                          Source="..\bin\DAPL\x86\dapld.pdb" />
-
-                    <File Id="dt_svr.bat" Compressed="yes" DiskId="1"
-                          LongName="dt-svr.bat" Name="dt-svr.bat"
-                          Source="..\bin\DAPL2\dt-svr.bat" />
-                    <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"
-                          DestinationName="dt1-svr.bat"
-                          DestinationProperty="INSTALLDIR" />
-                    <File Id="dt_cli.bat" Compressed="yes" DiskId="1"
-                          LongName="dt-cli.bat" Name="dt-cli.bat"
-                          Source="..\bin\DAPL2\dt-cli.bat" />
-                    <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"
-                          DestinationName="dt1-cli.bat"
-                          DestinationProperty="INSTALLDIR" />
-                </Component>
-
-                <Component Id="cDAPL2RT"
-                           Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
-
-                    <File Id="_dapl2.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2.dll" Name="DAPL2.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2.dll" />
-                      <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"
-                              DestinationName="dapl2.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2d.dll" Name="DAPL2D.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2d.dll" />
-
-                    <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scm.dll" Name="D2-scm.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2-scm.dll" />
-                      <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"
-                              DestinationName="d2-scm.dll"
-                              DestinationLongName="dapl2-scm.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2-scmd.dll" />
-
-                    <File Id="_dat2.dll" Compressed="yes" DiskId="1"
-                          LongName="dat2.dll" Name="DAT2.DLL"
-                          Source="..\bin\DAPL2\x86\dat2.dll" />
-                    <CopyFile Id="dupDAT2" FileId="_dat2.dll"
-                              DestinationName="dat2.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dat2d.dll" Compressed="yes" DiskId="1"
-                          LongName="dat2d.dll" Name="DAT2D.DLL"
-                          Source="..\bin\DAPL2\x86\dat2d.dll" />
-                    <File Id="dapl2test.exe" Compressed="yes" DiskId="1"
-                          LongName="dapl2test.exe" Name="dapl2tes.exe"
-                          Source="..\bin\tools\x86\release\dapl2test.exe" />
-                    <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"
-                          LongName="dapl2testd.exe" Name="dapl2tes.exe"
-                          Source="..\bin\tools\x86\debug\dapl2testd.exe" />
-                    <File Id="dtest2.exe" Compressed="yes" DiskId="1"
-                           LongName="dtest2.exe" Name="dtest2.exe"
-                           Source="..\bin\tools\x86\release\dtest2.exe" />
-                    <File Id="dtestx.exe" Compressed="yes" DiskId="1"
-                           LongName="dtestx.exe" Name="dtestx.exe"
-                           Source="..\bin\tools\x86\release\dtestx.exe" />
-
-                    <File Id="dapl2.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl2.pdb" Name="dapl2.pdb"
-                          Source="..\bin\DAPL2\x86\dapl2.pdb" />
-                    <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl2d.pdb" Name="dapl2d.pdb"
-                          Source="..\bin\DAPL2\x86\dapl2d.pdb" />
-                    <File Id="dat2.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat2.pdb" Name="dat2.pdb"
-                          Source="..\bin\DAPL2\x86\dat2.pdb" />
-                    <File Id="dat2d.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat2d.pdb" Name="dat2d.pdb"
-                          Source="..\bin\DAPL2\x86\dat2d.pdb" />
-                    <File Id="dat2.lib" Compressed="yes" DiskId="1"
-                          LongName="dat2.lib" Name="dat2.lib"
-                          Source="..\bin\DAPL2\x86\dat2.lib" />
-                    <File Id="dat2d.lib" Compressed="yes" DiskId="1"
-                          LongName="dat2d.lib" Name="dat2d.lib"
-                          Source="..\bin\DAPL2\x86\dat2d.lib" />
-                </Component>
+      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
+        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"
+                   Name="WinOF" />
+      </Directory>
+      <Directory Id="DesktopFolder" Name="Desktop" />
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="INSTALLDIR" Name="WinOF">
+
+          <?include ..\..\common\Docs.inc ?>
+          <?include ..\..\common\Tools.inc ?>
+          <?include ..\..\common\OpenSM_service.inc ?>
+
+          <Directory Id="IBcoreDir" Name="IBcore">
+            <?include ..\..\common\IBcore.inc ?>
+            <?include ..\..\common\mlnx_drivers.inc ?>
+            <?include ..\..\common\winverbs_drivers.inc ?>
+          </Directory>
 
-                <Component Id="cQLVNIC_driver_installed"
-                           Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-                </Component>
+          <?include ..\..\common\checked.inc ?>
+          <?include ..\..\common\winverbs_OFED.inc ?>
 
-                <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-                    <Component Id="cQLVNIC_files"
-                               Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-                        <CreateFolder />
-                        <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                              LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                              Source="..\bin\net\x86\qlgcvnic.sys" />
-                        <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                              Name="qlgcvnic.pdb"
-                              Source="..\bin\net\x86\qlgcvnic.pdb" />
-                        <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                              LongName="netvnic.inf" Name="NETVNIC.INF"
-                              Source="..\bin\net\x86\netvnic.inf" />
-                        <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                              LongName="netvnic.cat" Name="NETVNIC.cat"
-                              Source="..\bin\net\x86\netvnic.cat" />
-                    </Component>
-                </Directory>
+          <Directory Id="ipoibDir" Name="net">
+            <?include ..\..\common\ipoib.inc ?>
+          </Directory>
 
-                <Component Id="cSRP_driver_installed"
-                           Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-                </Component>
+          <Component Id="WinsockDirect"
+                     Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
+            <File Id="installsp.exe" Compressed="yes" DiskId="1"
+                     LongName="installsp.exe" Name="INSTALL.EXE"
+                     Source="..\bin\net\$(var.ARCH)\installsp.exe" />
+          </Component>
 
-                <Directory Id="srpDir" Name="SRP">
-                    <Component Id="cSRP_files"
-                               Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-                        <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                              LongName="ib_srp.inf" Name="IB_SRP.INF"
-                              Source="..\bin\storage\x86\ib_srp.inf" />
-                        <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                              LongName="ibsrp.cat" Name="IBSRP.CAT"
-                              Source="..\bin\storage\x86\ibsrp.cat" />
-                        <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                              LongName="ibsrp.sys" Name="IBSRP.SYS"
-                              Source="..\bin\storage\x86\ibsrp.sys" />
-                        <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                              Name="ibsrp.pdb"
-                              Source="..\bin\storage\x86\ibsrp.pdb" />
-                    </Component>
-                </Directory>
+          <Component Id="cNetworkDirect"
+                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
+          </Component>
 
-                <Component Id="OpenSM_Service_enabled"
-                           Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-                </Component>
-            </Directory>
-          </Directory>
+          <?include ..\..\common\dapl_rt.inc ?>
 
-      <!-- copy DAT header files to
-             %SystemDrive%\DAT\v1-1\DAT
-             %SystemDrive%\DAT\v2-0\DAT
-       -->
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
+          <Component Id="cQLVNIC_driver_installed"
+                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
+          </Component>
 
-         <Directory Id="dDATD" Name="DAT">
-            <Component Id="cDatCfg" Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >
+          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
+            <Component Id="cQLVNIC_files"
+                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
               <CreateFolder />
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
+              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
+                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
+              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
+                    Name="qlgcvnic.pdb"
+                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
+              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
+                    LongName="netvnic.inf" Name="NETVNIC.INF"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
+              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
+                    LongName="netvnic.cat" Name="NETVNIC.cat"
+                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
             </Component>
+          </Directory>
 
-            <Directory Id="v1_1" Name="v1-1">
-              <Component Id="cDATV1" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">
-                <CreateFolder />
-              </Component>
-              <Directory Id="DDID" Name="DAT">    
-                <Component Id="cDatBldV1Hdrs"
-                           Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
-                  <CreateFolder />    
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat.h" />    
-
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat_error.h" />    
-         
-                  <File Id="dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    
-         
-                  <File Id="dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL\dat_redirection.h" />    
-         
-                  <File Id="dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL\dat_registry.h" />    
-         
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    
-         
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL\udat.h" />    
-         
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL\udat_config.h" />    
-         
-                  <File Id="udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL\udat_redirection.h" />    
-         
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV1Libs"
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"
-                        LongName="dat.lib" Name="dat.lib"
-                        Source="..\bin\DAPL\x86\dat.lib" />
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"
-                        LongName="datd.lib" Name="datd.lib"
-                        Source="..\bin\DAPL\x86\datd.lib" />
-              </Component>
-            </Directory>
-
-            <Directory Id="v2_0" Name="v2-0">
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876">
-                <CreateFolder />
-              </Component>
-
-              <Directory Id="DDID2" Name="DAT">    
-                <Component Id="cDatBldV2Hdrs"
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    
-                  <CreateFolder />    
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat.h" />    
-
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat_error.h" />    
-         
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    
-         
-                  <File Id="_dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL2\dat_redirection.h" />    
-         
-                  <File Id="_dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL2\dat_registry.h" />    
-         
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    
-         
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL2\udat.h" />    
-         
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL2\udat_config.h" />    
-         
-                  <File Id="_udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL2\udat_redirection.h" />    
-         
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV2Libs"
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    
-
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2.lib" Name="dat2.lib"
-                        Source="..\bin\DAPL2\x86\dat2.lib" />
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2d.lib" Name="dat2d.lib"
-                        Source="..\bin\DAPL2\x86\dat2d.lib" />
-              </Component>    
-            </Directory>
-         </Directory>  <!-- End DAT -->
-
-         <!-- setup IBSDK file structure -->
-         <Directory Id="IBSDK" Name="IBSDK">
-           <Directory Id="IB_libs" Name="lib">
-             <Component Id="cIBAL_Libs"
-                        Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
-               <CreateFolder />
-               <File Id="ibal.lib" Compressed="yes" DiskId="1"
-                     LongName="ibal.lib" Name="ibal.lib"
-                     Source="..\bin\HCA\x86\ibal.lib" />
-               <File Id="ibal.pdb" Compressed="yes" DiskId="1"
-                     LongName="ibal.pdb" Name="ibal.pdb"
-                     Source="..\bin\HCA\x86\ibal.pdb" />
-               <File Id="complib.lib" Compressed="yes" DiskId="1"
-                     LongName="complib.lib" Name="complib.lib"
-                     Source="..\bin\HCA\x86\complib.lib" />
-               <File Id="complib.pdb" Compressed="yes" DiskId="1"
-                     LongName="complib.pdb" Name="complib.pdb"
-                     Source="..\bin\HCA\x86\complib.pdb" />
-               <File Id="ibald.lib" Compressed="yes" DiskId="1"
-                     LongName="ibald.lib" Name="ibald.lib"
-                     Source="..\bin\HCA\x86\ibald.lib" />
-               <File Id="ibald.pdb" Compressed="yes" DiskId="1"
-                     LongName="ibald.pdb" Name="ibald.pdb"
-                     Source="..\bin\HCA\x86\ibald.pdb" />
-               <File Id="complibd.lib" Compressed="yes" DiskId="1"
-                     LongName="complibd.lib" Name="complibd.lib"
-                     Source="..\bin\HCA\x86\complibd.lib" />
-               <File Id="complibd.pdb" Compressed="yes" DiskId="1"
-                     LongName="complibd.pdb" Name="complibd.pdb"
-                     Source="..\bin\HCA\x86\complibd.pdb" />
-
-               <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbs.lib" Name="winverbs.lib"
-                     Source="..\bin\HCA\x86\winverbs.lib" />
-               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbsd.lib" Name="winvrbsd.lib"
-                     Source="..\bin\HCA\x86\winverbsd.lib" />
-
-               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.lib" Name="ibverbs.lib"
-                     Source="..\bin\HCA\x86\libibverbs.lib" />
-               <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                     Source="..\bin\HCA\x86\libibverbs.pdb" />
-               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                     Source="..\bin\HCA\x86\libibverbsd.lib" />
-               <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                     Source="..\bin\HCA\x86\libibverbsd.pdb" />
-
-               <File Id="libibmad.lib" Compressed="yes" DiskId="1"
-                     LongName="libibmad.lib" Name="ibmad.lib"
-                     Source="..\bin\HCA\x86\libibmad.lib" />
-               <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibmad.pdb" Name="ibmad.pdb"
-                     Source="..\bin\HCA\x86\libibmad.pdb" />
-               <File Id="libibmadd.lib" Compressed="yes" DiskId="1"
-                     LongName="libibmadd.lib" Name="ibmadd.lib"
-                     Source="..\bin\HCA\x86\libibmadd.lib" />
-               <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                     Source="..\bin\HCA\x86\libibmadd.pdb" />
-
-               <File Id="libibumad.lib" Compressed="yes" DiskId="1"
-                     LongName="libibumad.lib" Name="ibumad.lib"
-                     Source="..\bin\HCA\x86\libibumad.lib" />
-               <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibumad.pdb" Name="ibumad.pdb"
-                     Source="..\bin\HCA\x86\libibumad.pdb" />
-               <File Id="libibumadd.lib" Compressed="yes" DiskId="1"
-                     LongName="libibumadd.lib" Name="ibumadd.lib"
-                     Source="..\bin\HCA\x86\libibumadd.lib" />
-               <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                     Source="..\bin\HCA\x86\libibumadd.pdb" />
-             </Component>
-           </Directory>
-
-           <Directory Id="IB_inc" Name="Inc">
-             <Component Id="cIBAL_Incs"
-                        Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">
-               <CreateFolder />
-
-               <File Id="oib_ver.h" Compressed="yes" DiskId="1"
-                     LongName="oib_ver.h" Name="oib_ver.h"
-                     Source="..\bin\Inc\oib_ver.h" />
-               <File Id="openib.def" Compressed="yes" DiskId="1"
-                     LongName="openib.def" Name="openib.def"
-                     Source="..\bin\Inc\openib.def" />
-             </Component>
+          <Component Id="cSRP_driver_installed"
+                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
+          </Component>
+
+          <!-- RDMA SCSI over IB (aka SRP) -->
+          <Directory Id="srpDir" Name="SRP">
+            <Component Id="cSRP_files"
+                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
+              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
+                    LongName="ib_srp.inf" Name="IB_SRP.INF"
+                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
+              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
+                    LongName="ibsrp.cat" Name="IBSRP.CAT"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
+              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
+                    LongName="ibsrp.sys" Name="IBSRP.SYS"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
+              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
+                    Name="ibsrp.pdb"
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
+            </Component>
+          </Directory>
+        </Directory>
+      </Directory>
 
-             <Directory Id="IB_complib" Name="complib">
-               <Component Id="cIBAL_Complib"
-                          Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">
-                 <CreateFolder />
-                 <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"
-                       LongName="cl_async_proc.h" Name="CL_ASYN.H" 
-                       Source="..\bin\Inc\complib\cl_async_proc.h" />
-                 <File Id="cl_atomic.h" Compressed="yes" DiskId="1"
-                       LongName="cl_atomic.h" Name="CL_ATOM.H" 
-                       Source="..\bin\Inc\complib\cl_atomic.h" />
-                 <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" 
-                       Source="..\bin\Inc\complib\cl_atomic_osd.h" />
-                 <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_byteswap.h" Name="CL_BYTE.H" 
-                       Source="..\bin\Inc\complib\cl_byteswap.h" />
-                 <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" 
-                       Source="..\bin\Inc\complib\cl_byteswap_osd.h" />
-                 <File Id="cl_comppool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_comppool.h" Name="CL_COMP.H" 
-                       Source="..\bin\Inc\complib\cl_comppool.h" />
-                 <File Id="cl_debug.h" Compressed="yes" DiskId="1"
-                       LongName="cl_debug.h" Name="CL_DEBU.H" 
-                       Source="..\bin\Inc\complib\cl_debug.h" />
-                 <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_debug_osd.h" Name="CL_DEBU1.H" 
-                       Source="..\bin\Inc\complib\cl_debug_osd.h" />
-                 <File Id="cl_event.h" Compressed="yes" DiskId="1"
-                       LongName="cl_event.h" Name="CL_EVEN.H" 
-                       Source="..\bin\Inc\complib\cl_event.h" />
-                 <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_event_osd.h" Name="CL_EVEN1.H" 
-                       Source="..\bin\Inc\complib\cl_event_osd.h" />
-                 <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_fleximap.h" Name="CL_FLEX.H" 
-                       Source="..\bin\Inc\complib\cl_fleximap.h" />
-                 <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ioctl.h" Name="CL_IOCT.H" 
-                       Source="..\bin\Inc\complib\cl_ioctl.h" />
-                 <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" 
-                       Source="..\bin\Inc\complib\cl_ioctl_osd.h" />
-                 <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_irqlock.h" Name="CL_IRQL.H" 
-                       Source="..\bin\Inc\complib\cl_irqlock.h" />
-                 <File Id="cl_list.h" Compressed="yes" DiskId="1"
-                       LongName="cl_list.h" Name="CL_LIST.H" 
-                       Source="..\bin\Inc\complib\cl_list.h" />
-                 <File Id="cl_log.h" Compressed="yes" DiskId="1"
-                       LongName="cl_log.h" Name="CL_LOG.H" 
-                       Source="..\bin\Inc\complib\cl_log.h" />
-                 <File Id="cl_map.h" Compressed="yes" DiskId="1"
-                       LongName="cl_map.h" Name="CL_MAP.H" 
-                       Source="..\bin\Inc\complib\cl_map.h" />
-                 <File Id="cl_math.h" Compressed="yes" DiskId="1"
-                       LongName="cl_math.h" Name="CL_MATH.H" 
-                       Source="..\bin\Inc\complib\cl_math.h" />
-                 <File Id="cl_memory.h" Compressed="yes" DiskId="1"
-                       LongName="cl_memory.h" Name="CL_MEMO.H" 
-                       Source="..\bin\Inc\complib\cl_memory.h" />
-                 <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_memory_osd.h" Name="CL_MEMO1.H" 
-                       Source="..\bin\Inc\complib\cl_memory_osd.h" />
-                 <File Id="cl_mutex.h" Compressed="yes" DiskId="1"
-                       LongName="cl_mutex.h" Name="CL_MUTE.H" 
-                       Source="..\bin\Inc\complib\cl_mutex.h" />
-                 <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" 
-                       Source="..\bin\Inc\complib\cl_mutex_osd.h" />
-                 <File Id="cl_obj.h" Compressed="yes" DiskId="1"
-                       LongName="cl_obj.h" Name="CL_OBJ.H" 
-                       Source="..\bin\Inc\complib\cl_obj.h" />
-                 <File Id="cl_packoff.h" Compressed="yes" DiskId="1"
-                       LongName="cl_packoff.h" Name="CL_PACK.H" 
-                       Source="..\bin\Inc\complib\cl_packoff.h" />
-                 <File Id="cl_packon.h" Compressed="yes" DiskId="1"
-                       LongName="cl_packon.h" Name="CL_PACK1.H" 
-                       Source="..\bin\Inc\complib\cl_packon.h" />
-                 <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_passivelock.h" Name="CL_PASS.H" 
-                       Source="..\bin\Inc\complib\cl_passivelock.h" />
-                 <File Id="cl_perf.h" Compressed="yes" DiskId="1"
-                       LongName="cl_perf.h" Name="CL_PERF.H" 
-                       Source="..\bin\Inc\complib\cl_perf.h" />
-                 <File Id="cl_pool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_pool.h" Name="CL_POOL.H" 
-                       Source="..\bin\Inc\complib\cl_pool.h" />
-                 <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ptr_vector.h" Name="CL_PTR_.H" 
-                       Source="..\bin\Inc\complib\cl_ptr_vector.h" />
-                 <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qcomppool.h" Name="CL_QCOM.H" 
-                       Source="..\bin\Inc\complib\cl_qcomppool.h" />
-                 <File Id="cl_qlist.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qlist.h" Name="CL_QLIS.H" 
-                       Source="..\bin\Inc\complib\cl_qlist.h" />
-                 <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qlockpool.h" Name="CL_QLOC.H" 
-                       Source="..\bin\Inc\complib\cl_qlockpool.h" />
-                 <File Id="cl_qmap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qmap.h" Name="CL_QMAP.H" 
-                       Source="..\bin\Inc\complib\cl_qmap.h" />
-                 <File Id="cl_qpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qpool.h" Name="CL_QPOO.H" 
-                       Source="..\bin\Inc\complib\cl_qpool.h" />
-                 <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_rbmap.h" Name="CL_RBMA.H" 
-                       Source="..\bin\Inc\complib\cl_rbmap.h" />
-                 <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"
-                       LongName="cl_reqmgr.h" Name="CL_REQM.H" 
-                       Source="..\bin\Inc\complib\cl_reqmgr.h" />
-                 <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_spinlock.h" Name="CL_SPIN.H" 
-                       Source="..\bin\Inc\complib\cl_spinlock.h" />
-                 <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" 
-                       Source="..\bin\Inc\complib\cl_spinlock_osd.h" />
-                 <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"
-                       LongName="cl_syscallback.h" Name="CL_SYSC.H" 
-                       Source="..\bin\Inc\complib\cl_syscallback.h" />
-                 <File Id="cl_syscallback_osd.h" Compressed="yes"
-                       DiskId="1"
-                       LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" 
-                      Source="..\bin\Inc\complib\cl_syscallback_osd.h" />
-                 <File Id="cl_thread.h" Compressed="yes" DiskId="1"
-                       LongName="cl_thread.h" Name="CL_THRE.H" 
-                       Source="..\bin\Inc\complib\cl_thread.h" />
-                 <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_thread_osd.h" Name="CL_THRE1.H" 
-                       Source="..\bin\Inc\complib\cl_thread_osd.h" />
-                 <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_threadpool.h" Name="CL_THRE2.H" 
-                       Source="..\bin\Inc\complib\cl_threadpool.h" />
-                 <File Id="cl_timer.h" Compressed="yes" DiskId="1"
-                       LongName="cl_timer.h" Name="CL_TIME.H" 
-                       Source="..\bin\Inc\complib\cl_timer.h" />
-                 <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_timer_osd.h" Name="CL_TIME1.H" 
-                       Source="..\bin\Inc\complib\cl_timer_osd.h" />
-                 <File Id="cl_types.h" Compressed="yes" DiskId="1"
-                       LongName="cl_types.h" Name="CL_TYPE.H" 
-                       Source="..\bin\Inc\complib\cl_types.h" />
-                 <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_types_osd.h" Name="CL_TYPE1.H" 
-                       Source="..\bin\Inc\complib\cl_types_osd.h" />
-                 <File Id="cl_vector.h" Compressed="yes" DiskId="1"
-                       LongName="cl_vector.h" Name="CL_VECT.H" 
-                       Source="..\bin\Inc\complib\cl_vector.h" />
-                 <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"
-                       LongName="cl_waitobj.h" Name="CL_WAIT.H" 
-                       Source="..\bin\Inc\complib\cl_waitobj.h" />
-                 <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" 
-                       Source="..\bin\Inc\complib\cl_waitobj_osd.h" />
-                 <File Id="comp_lib.h" Compressed="yes" DiskId="1"
-                       LongName="comp_lib.h" Name="COMP_LI.H" 
-                       Source="..\bin\Inc\complib\comp_lib.h" />
-               </Component>
-             </Directory>
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
 
-             <Directory Id="IB_iba" Name="iba">
-               <Component Id="cIBAL_IBA"
-                          Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">
-                 <CreateFolder />
-                 <File Id="ib_al.h" Compressed="yes" DiskId="1"
-                       LongName="ib_al.h" Name="ib_al.h"
-                       Source="..\bin\Inc\iba\ib_al.h" />
-                 <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="ib_al_ioctl.h" Name="ib_ioctl.h"
-                       Source="..\bin\Inc\iba\ib_al_ioctl.h" />
-                 <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="ib_at_ioctl.h" Name="ib_iocat.h"
-                       Source="..\bin\Inc\iba\ib_at_ioctl.h" />
-                 <File Id="ib_ci.h" Compressed="yes" DiskId="1"
-                       LongName="ib_ci.h" Name="ib_ci.h"
-                       Source="..\bin\Inc\iba\ib_ci.h" />
-                 <File Id="ib_types.h" Compressed="yes" DiskId="1"
-                       LongName="ib_types.h" Name="ib_types.h"
-                       Source="..\bin\Inc\iba\ib_types.h" />
-                 <File Id="ib_uvp.h" Compressed="yes" DiskId="1"
-                       LongName="ib_uvp.h" Name="ib_uvp.h"
-                       Source="..\bin\Inc\iba\ib_uvp.h" />
-               </Component>
-             </Directory>
-           </Directory>
+      <!-- copy DAT header files to
+         %SystemDrive%\DAT\v1-1\DAT
+         %SystemDrive%\DAT\v2-0\DAT
+      -->
 
-          <Directory Id="IB_samples" Name="Samples">
-            <Directory Id="sample_DDK" Name="DDK">
-              <Component Id="cDDK_example"
-                         Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">
-                <CreateFolder />
-                    <File Id="cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\Misc\cmtest.c" />
-                    <File Id="makefile" Compressed="yes" DiskId="1"
-                          LongName="makefile" Name="makefile"
-                          Source="..\..\SDK_Samples\DDK\makefile" />
-                    <File Id="SOURCES" Compressed="yes" DiskId="1"
-                          LongName="SOURCES" Name="SOURCES"
-                          Source="..\..\SDK_Samples\DDK\SOURCES" />
-                    <File Id="README.txt" Compressed="yes" DiskId="1"
-                          LongName="README.txt" Name="README.txt"
-                          Source="..\..\SDK_Samples\DDK\README.txt" />
-              </Component>
-            </Directory>    <!-- End DDK -->
+        <Directory Id="dDATD" Name="DAT">
+          <?include ..\..\common\DAT_config.inc ?>
+        </Directory>
 
-              <Directory Id="sample_VS" Name="VS">
-                <Component Id="cVS_example"
-                           Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">
-                  <CreateFolder />
-                    <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\misc\cmtest.c" />
-                      <File Id="vscmtest.rc" Compressed="yes" DiskId="1"
-                            LongName="cmtest.rc" Name="cmtest.rc"
-                            Source="..\..\SDK_Samples\VS\cmtest.rc" />
-                      <File Id="vsREADME.txt" Compressed="yes" DiskId="1"
-                            LongName="README.txt" Name="README.txt"
-                            Source="..\..\SDK_Samples\VS\README.txt" />
-                    <File Id="Makefile.x86" Compressed="yes" DiskId="1"
-                          LongName="Makefile.x86" Name="Makefile.x86"
-                          Source="..\..\SDK_Samples\VS\Makefile.x86" />
-                </Component>
-              </Directory>    <!-- End VS -->
-          </Directory>    <!-- End Samples -->
-         </Directory>  <!-- End IBSDK -->
+        <Directory Id="IBSDK" Name="IBSDK">
+          <?include ..\..\common\ib_sdk.inc ?>
+        </Directory>
 
-      </Directory>  <!-- End WinRoot -->
+      </Directory>
     </Directory> <!-- End TARGETDIR -->
 
+<!--
+    <Property Id='ARPNOMODIFY'>1</Property>
+    <Property Id='ARPNOREPAIR'>1</Property>
+-->
     <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
     <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
     <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
@@ -1446,7 +157,7 @@
      -->
 
     <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"
-         Description="InfiniBand Host Channel Adapter Drivers"
+         Description="Mellanox InfiniBand Host Channel Adapter Drivers"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
 
@@ -1466,17 +177,17 @@
       </Feature>
     </Feature>
 
-    <Feature Id="IBcore" Title="InfiniBand Core" Level="1"
-        Description="InfiniBand: Core, Tools, Docs" Display="expand"
-        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
-        InstallDefault="local" Absent="disallow">
-        <ComponentRef Id="cIBcore" />
-        <ComponentRef Id="cWinVerbsDrivers" />
-        <ComponentRef Id="Docs" />
-        <ComponentRef Id="Tools" />
-        <ComponentRef Id="OpenSMservice" />
-        <ComponentRef Id="cQLVNIC_files" />
-        <ComponentRef Id="cSRP_files" />
+    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"
+        Description="InfiniBand: Core, Tools, Docs"
+        Display="expand" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">
+      <ComponentRef Id="cIBcore" />
+      <ComponentRef Id="cWinVerbsDrivers" />
+      <ComponentRef Id="Docs" />
+      <ComponentRef Id="Tools" />
+      <ComponentRef Id="OpenSMservice" />
+      <ComponentRef Id="cQLVNIC_files" />
+      <ComponentRef Id="cSRP_files" />
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
@@ -1516,10 +227,10 @@
         <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"
+    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"
         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <Condition Level="201"> IPOIB_EXISTS </Condition>
+      <Condition Level="201"> IPOIB_EXISTS </Condition>
 
       <Feature Id="fDatConf" Title="DAT-DAPL Config File"
          Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."
@@ -1578,10 +289,10 @@
         Description="QLogic - Virtual NIC over InfiniBand"
         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <ComponentRef Id="cQLVNIC_driver_installed" />
+      <ComponentRef Id="cQLVNIC_driver_installed" />
     </Feature>
 
-    <Feature Id="fIBskd" Title="InfiniBand SDK" Level="2"
+    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"
          Description="InfiniBand Software Development Kit (Headers + Libs)"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
@@ -1601,75 +312,11 @@
       <ComponentRef Id="cCHK_user" />
     </Feature>
 
-    <!--> File where Custom Actions are defined -->
-    <Binary Id="CA" src="..\..\CustomActions.vbs" />
-
-    <CustomAction Id="WinOF_setup" BinaryKey="CA"
-         VBScriptCall="WinOF_setup" Return="check" />
-
-    <CustomAction Id="ChkPreviousInstall" BinaryKey="CA"
-         VBScriptCall="ChkInstallAndReboot" Return="check" />
-
-    <CustomAction Id="DriverInstall" BinaryKey="CA"
-         VBScriptCall="DriverInstall" Return="check" Execute="deferred" />
-
-    <CustomAction Id="DriverUninstall" BinaryKey="CA"
-         VBScriptCall="DriverUninstall" Return="check" />
-
-    <CustomAction Id="WSDStart" BinaryKey="CA"
-         VBScriptCall="WSDEnable" Return="check" />
-
-    <CustomAction Id="ND_start" BinaryKey="CA"
-         VBScriptCall="ND_StartMeUp" Return="check" />
-
-    <CustomAction Id="HammerTime" BinaryKey="CA"
-         VBScriptCall="HammerTime" Return="check" />
-
-    <CustomAction Id="BcastRegChanged" BinaryKey="CA"
-         VBScriptCall="BcastRegChanged" Return="check" />
-
-    <CustomAction Id="InstallChanged" BinaryKey="CA"
-         VBScriptCall="InstallChanged" Return="check" />
-
-    <InstallExecuteSequence>
-       <!-- Always executed (Install or uninstall) -->
-       <Custom Action="WinOF_setup" After="InstallInitialize" />
-
-       <!--> Install ONLY </!-->
-       <Custom Action="ChkPreviousInstall" After="WinOF_setup">
-           NOT Installed</Custom>
-
-       <ScheduleReboot After="ChkPreviousInstall">
-           REBOOT="FORCE"</ScheduleReboot>
-
-       <Custom Action="DriverInstall" After="InstallServices">
-			Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="WSDStart" After="InstallFinalize">
-           Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="ND_start" After="WSDStart">
-          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="BcastRegChanged" After="ND_start">
-           Not Installed</Custom>
-
-       <!--> CHANGE ONLY </!-->
-       <Custom Action="InstallChanged" After="InstallFinalize">
-           Installed </Custom>
-
-       <!--> REMOVE ONLY </!-->
-       <Custom Action="DriverUninstall" After="PublishProduct">
-           REMOVE="ALL" </Custom>
-
-       <Custom Action="HammerTime" After="InstallFinalize">REMOVE="ALL"</Custom>
-
-    </InstallExecuteSequence>
+    <?include ..\..\common\InstallExecuteSeq.inc ?>
 
     <UIRef Id="WixUI_FeatureTree" />
-        <UIRef Id="WixUI_ErrorProgressText" />
-        <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
     <UI />
-
   </Product>
 </Wix>
diff --git a/trunk/WinOF/WIX/wxp/x86/wof.wxs b/trunk/WinOF/WIX/wxp/x86/wof.wxs
index bb67dfb2..c320dad9 100644
--- a/trunk/WinOF/WIX/wxp/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wxp/x86/wof.wxs
@@ -2,22 +2,28 @@
 <!--
    WinOF (Windows OpenFabrics InfiniBand) for x86 XP only.
 -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 
-  <Product Name="Windows OpenFabrics InfiniBand v2.1.0 (RC0) x86 XP"
-   Version="2.1.0"
-   Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
-   UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
-   Language="1033" Codepage="1252"
-   Manufacturer="Open Fabrics Alliance Windows">
+<?define ARCH=x86 ?>
+<?define ARCHP=x86 ?>
+<?define OS=XP ?>
+<?include ..\..\common\WinOF_cfg.inc ?>
 
-   <Package Id="????????-????-????-????-????????????"
-    Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
-    InstallPrivileges='elevated'
-    Description="WinOF Installer"
-    Comments="Open Fabrics Alliance Windows InfiniBand stack"
-    Manufacturer="OpenFabrics Alliance Windows" InstallerVersion="200"
-    Languages="1033" Compressed="yes" SummaryCodepage="1252" />
+<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+  <Product
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"
+    Version="$(var.WOFRELNUM)"
+    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
+    Language="1033" Codepage="1252"
+    Manufacturer="Open Fabrics Alliance Windows">
+
+    <Package Id="????????-????-????-????-????????????"
+     Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
+     InstallPrivileges='elevated'
+     Description="WinOF Installer"
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
+     Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Condition Message="Administrator required to install [ProductName].">
      Privileged
@@ -29,1407 +35,115 @@
     <Condition Message="[ProductName] requires Windows XP to install.">
      <![CDATA[(VersionNT=501)]]></Condition>
 
-    <!--
-        System/Machine-wide install, otherwise per-user (Administrator) only.
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.
-     -->
-    <Property Id="ALLUSERS"> Value="1" </Property>
-
-    <!-- Requires files sc.exe & reg.exe -->
-
-    <Property Id="REG_EXISTS">
-        <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">
-            <FileSearch Id="RegFile" Name="reg.exe" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="SC_EXISTS">
-        <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">
-            <FileSearch Id="ScFile" Name="sc.exe" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="IPOIB_EXISTS">
-        <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">
-            <FileSearch Id="ipoibFile" Name="netipoib.inf" />
-        </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT_CONF_EXISTS">
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">
-        <FileSearch Id="DCFile" Name="dat.conf" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT1_INSTALLED">
-      <DirectorySearch Id="Dat1File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="daplFile" Name="dapl.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="DAT2_INSTALLED">
-      <DirectorySearch Id="Dat2File" Path="[INSTALLDIR]" Depth="0">
-        <FileSearch Id="dapl2File" Name="dapl2.dll" />
-      </DirectorySearch>
-    </Property>
-
-    <Condition Message="[ProductName] requires system file reg.exe">
-       REG_EXISTS
-    </Condition>
-    <Condition Message="[ProductName] requires system file sc.exe">
-       SC_EXISTS
-    </Condition>
-    <Media Id="1" Cabinet="Data1.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
-    <Property Id="DiskPrompt" Value="WinOF 1.1 Installation [1]" />
+    <?include ..\..\common\requirements.inc ?>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-        <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
-            <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"
-                       Name="WinOF" />
-        </Directory>
-        <Directory Id="DesktopFolder" Name="Desktop" />
-        <Directory Id="ProgramFilesFolder" Name="PFiles">
-            <Directory Id="INSTALLDIR" Name="WinOF">
-                <Component Id="Docs"
-                           Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
-                    <File Id="OFAlogo" Compressed="yes" DiskId="1"
-                          LongName="openfabrics.gif" Name="ofa.gif"
-                          Source="..\..\openfabrics.gif" />
-
-                   <!-- implies WIX build only from an svn structured tree.  -->
-                    <File Id="manual.htm" Compressed="yes" DiskId="1"
-                          Name="Manual.htm" LongName="Manual.htm" Vital="yes"
-                          Source="..\bin\Misc\Manual.htm" /> 
-
-                    <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
-                          Name="Manual.htm" LongName="Manual"
-                          Target="[INSTALLDIR]\Manual.htm" Show="normal"
-                          WorkingDirectory="INSTALLDIR"
-                          Icon="openfabrics" IconIndex="0" />
-
-                    <File Id="dRelnotes" Compressed="yes" DiskId="1"
-                          LongName="Release_notes.htm" Name="RELEASE_.HTM"
-                          Source="..\..\Release_notes.htm" />
-                    <Shortcut Id="RelNotes" Directory="ProgramMenuDir"
-                          Name="RelNotes" LongName="Release Notes"
-                          Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
-                          WorkingDirectory="INSTALLDIR" Icon="openfabrics"
-                          IconIndex="0" />
-                    <File Id="command_window" Name="COMMAND.LNK"
-                          LongName="Command Window.lnk" Compressed="yes"
-                          DiskId="1" Source="..\..\x86\Command Window.lnk"
-                          Vital="yes" />
-                    <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
-                          Name="COMMAND.LNK" LongName="Command Window.lnk"
-                          Target="[INSTALLDIR]\Command Window.lnk"
-                          Icon="openfabrics" IconIndex="0" Show="normal"
-                          WorkingDirectory="INSTALLDIR" />
-                    <Shortcut Id="UninstallProduct" Name="UnMyApp"
-                          LongName="Uninstall WinOF"
-                          Target="[SystemFolder]msiexec.exe"
-                          Arguments="/X [ProductCode]"
-                          Directory="ProgramMenuDir"
-                          Description="Uninstall Windows OpenFabrics InfinBand stack" />
-                    <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
-                </Component>
-
-                <Component Id="Tools"
-                           Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
-                    <Environment Id='UpdatePath' Name='PATH' Action='create'
-                           System='yes' Part='last' Value='[INSTALLDIR]' />
-
-                    <File Id="qlgcvnic_config"
-                          Compressed="yes" DiskId="1" Vital="yes"
-                          Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"
-                        Source="..\bin\tools\x86\release\qlgcvnic_config.exe" />
-                    <File Id="part_man" Name="part_man.exe"
-                          Compressed="yes" DiskId="1" Vital="yes"
-                          Source="..\bin\tools\x86\release\part_man.exe" />
-                    <File Id="vstat" Name="vstat.exe"
-                          Compressed="yes" Vital="yes" DiskId="1"
-                          Source="..\bin\tools\x86\release\vstat.exe" />
-                    <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
-                          DiskId="1" Name="TTCP.EXE"
-                          Source="..\bin\tools\x86\release\ttcp.exe" />
-                    <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
-                          DiskId="1" Name="CMTEST.EXE"
-                          Source="..\bin\tools\x86\release\cmtest.exe" />
-                    <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_limits.exe" Name="IB_LIMI.EXE"
-                          Source="..\bin\tools\x86\release\ib_limits.exe" />
-                    <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_read_bw.exe" Name="IB_READ.EXE"
-                          Source="..\bin\tools\x86\release\ib_read_bw.exe" />
-                    <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
-                          Source="..\bin\tools\x86\release\ib_read_lat.exe" />
-                    <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
-                          Source="..\bin\tools\x86\release\ib_send_bw.exe" />
-                    <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
-                          Source="..\bin\tools\x86\release\ib_send_lat.exe" />
-                    <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
-                          Source="..\bin\tools\x86\release\ib_write_bw.exe" />
-                    <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
-                          LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
-                          Source="..\bin\tools\x86\release\ib_write_lat.exe" />
-                    <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
-                          LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
-                          Source="..\bin\tools\x86\release\ibtrapgen.exe" />
-                    <File Id="osmtest.exe" Compressed="yes" DiskId="1"
-                          LongName="osmtest.exe" Name="OSMTEST.EXE"
-                          Source="..\bin\tools\x86\release\osmtest.exe" />
-                    <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
-                          LongName="PrintIP.exe" Name="PRINTIP.EXE"
-                          Source="..\bin\tools\x86\release\PrintIP.exe" />
-                    <File Id="nsc" Name="nsc.exe" Vital="yes"
-                          Compressed="yes" DiskId="1"
-                          Source="..\bin\tools\x86\release\nsc.exe" />
-                </Component>
-
-                <Component Id='OpenSMservice'
-                           Guid='90042B4F-51B5-4720-8E54-6D366253634B'
-                           SharedDllRefCount='no' KeyPath='no'
-                           NeverOverwrite='no'
-                           Permanent='no' Transitive='no' Win64='no'
-                           Location='either'>
-
-                  <File Id="opensm.exe" Compressed="yes" DiskId="1"
-                        LongName="opensm.exe" Name="OPENSM.EXE"
-                        Source="..\bin\tools\x86\release\opensm.exe"
-                        Vital='yes' KeyPath='yes' Hidden='no' System='no' 
-                        Checksum='no' ReadOnly='no' />
-
-                  <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
-                    Description='InfiniBand Subnet Configuration and Management'
-                      DisplayName='InfiniBand Subnet Manager'
-                      Arguments='-e --service'
-                      ErrorControl='normal'
-                      Start='disabled'
-                      Interactive='no'
-                      Type='ownProcess' />
-
-                  <ServiceControl Id='osmSvcControl' Name='OpenSM'
-                                  Stop='uninstall'
-                                  Wait='no'
-                                  Remove='uninstall' />
-                </Component>
-
-                <Directory Id="IBcoreDir" Name="IBcore">
-                    <Component Id="cIBcore"
-                               Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
-                        <CreateFolder />
-                        <File Id="dpinst.exe" Compressed="yes" DiskId="1"
-                              LongName="dpinst.exe" Name="dpinst.exe"
-                              Source="..\..\x86\dpinst.exe" />
-                        <File Id="dpinst.xml" Compressed="yes" DiskId="1"
-                              LongName="dpinst.xml" Name="dpinst.xml"
-                              Source="..\..\dpinst.xml" />
-                        <File Id="devman.exe" Compressed="yes" DiskId="1"
-                              LongName="devman.exe" Name="devman.exe"
-                              Source="..\..\x86\devman.exe" />
-                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                              LongName="WdfCoInstaller01007.dll"
-                              Name="WDFCOIN.dll"
-                              Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />
-                        <File Id="complib.dll" Compressed="yes" DiskId="1"
-                              LongName="complib.dll" Name="COMPLIB.DLL"
-                              Source="..\bin\HCA\x86\complib.dll" />
-                        <File Id="complibd.dll" Compressed="yes" DiskId="1"
-                              LongName="complibd.dll" Name="COMPLIBD.DLL"
-                              Source="..\bin\HCA\x86\complibd.dll" />
-                        <File Id="ibal.dll" Compressed="yes" DiskId="1"
-                              LongName="ibal.dll" Name="IBAL.DLL"
-                              Source="..\bin\HCA\x86\ibal.dll" />
-                        <File Id="ibald.dll" Compressed="yes" DiskId="1"
-                              LongName="ibald.dll" Name="IBALD.DLL"
-                              Source="..\bin\HCA\x86\ibald.dll" />
-                        <File Id="ibbus.sys" Compressed="yes" DiskId="1"
-                              LongName="ibbus.sys" Name="IBBUS.SYS"
-                              Source="..\bin\HCA\x86\ibbus.sys" />
-                        <File Id="ibbus.pdb" Compressed="yes" DiskId="1"
-                              Name="ibbus.pdb"
-                              Source="..\bin\HCA\x86\ibbus.pdb" />
-                        <File Id="ibiou.sys" Compressed="yes" DiskId="1"
-                              LongName="ibiou.sys" Name="IBIOU.SYS"
-                              Source="..\bin\HCA\x86\ibiou.sys" />
-                        <File Id="ibiou.pdb" Compressed="yes" DiskId="1"
-                              Name="ibiou.pdb"
-                              Source="..\bin\HCA\x86\ibiou.pdb" />
-                        <File Id="ib_iou.cat" Compressed="yes" DiskId="1"
-                              LongName="ib_iou.cat" Name="IB_iou.cat"
-                              Source="..\bin\HCA\x86\ib_iou.cat" />
-                        <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
-                              LongName="ib_iou.inf" Name="ib_iou.inf"
-                              Source="..\bin\HCA\x86\ib_iou.inf" />
-                    </Component>
-
-                    <Component Id="cMthcaDriver"
-                               Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">
-                        <File Id="mthca.inf" Compressed="yes" DiskId="1"
-                              LongName="mthca.inf" Name="MTHCA.INF"
-                              Source="..\bin\HCA\x86\mthca.inf" />
-                        <File Id="mthca.cat" Compressed="yes" DiskId="1"
-                              LongName="mthca.cat" Name="MTHCA.cat"
-                              Source="..\bin\HCA\x86\mthca.cat" />
-                        <File Id="mthca.sys" Compressed="yes" DiskId="1"
-                              LongName="mthca.sys" Name="MTHCA.SYS"
-                              Source="..\bin\HCA\x86\mthca.sys" />
-                        <File Id="mthca.pdb" Compressed="yes" DiskId="1"
-                              Name="mthca.pdb"
-                              Source="..\bin\HCA\x86\mthca.pdb" />
-                        <File Id="mthcau.dll" Compressed="yes" DiskId="1"
-                              LongName="mthcau.dll" Name="MTHCAU.DLL"
-                              Source="..\bin\HCA\x86\mthcau.dll" />
-                        <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
-                              LongName="mthcaud.dll" Name="MTHCAUD.DLL"
-                              Source="..\bin\HCA\x86\mthcaud.dll" />
-                    </Component>
-
-                    <Component Id="cConnectXDriver"
-                               Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
-                        <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.inf" Name="mlx4_bus.INF"
-                              Source="..\bin\hca\x86\mlx4_bus.inf" />
-                        <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.cat" Name="mlx4_bus.cat"
-                              Source="..\bin\hca\x86\mlx4_bus.cat" />
-                        <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
-                              LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
-                              Source="..\bin\hca\x86\mlx4_bus.sys" />
-                        <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
-                              Name="mlx4_bus.pdb"
-                              Source="..\bin\hca\x86\mlx4_bus.pdb" />
-                        <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
-                              Source="..\bin\hca\x86\mlx4_hca.inf" />
-                        <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.cat" Name="mlx4_hca.cat"
-                              Source="..\bin\hca\x86\mlx4_hca.cat" />
-                        <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"
-                              LongName="mlx4_hca.sys" Name="mlx4_hca.sys"
-                              Source="..\bin\hca\x86\mlx4_hca.sys" />
-                        <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"
-                              Name="mlx4_hca.pdb"
-                              Source="..\bin\hca\x86\mlx4_hca.pdb" />
-                        <File Id="mlx4u.dll" Compressed="yes" DiskId="1"
-                              LongName="mlx4u.dll" Name="mlx4u.dll"
-                              Source="..\bin\hca\x86\mlx4u.dll" />
-                        <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"
-                              LongName="mlx4ud.dll" Name="mlx4ud.dll"
-                              Source="..\bin\hca\x86\mlx4ud.dll" />
-                    </Component>
-
-                    <Component Id="cWinVerbsDrivers"
-                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-
-                        <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                              LongName="winverbs.sys" Name="winverbs.sys"
-                              Source="..\bin\HCA\x86\winverbs.sys" />
-                        <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
-                              LongName="winverbs.pdb" Name="winverbs.pdb"
-                              Source="..\bin\HCA\x86\winverbs.pdb" />
-                        <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                              LongName="winverbs.dll" Name="winvrbs.dll"
-                              Source="..\bin\HCA\x86\winverbs.dll" />
-                        <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                              LongName="winverbsd.dll" Name="winvrbsd.dll"
-                              Source="..\bin\HCA\x86\winverbsd.dll" />
-                        <File Id="winmad.sys" Compressed="yes" DiskId="1"
-                              LongName="winmad.sys" Name="winmad.sys"
-                              Source="..\bin\HCA\x86\winmad.sys" />
-                        <File Id="winmad.pdb" Compressed="yes" DiskId="1"
-                              LongName="winmad.pdb" Name="winmad.pdb"
-                              Source="..\bin\HCA\x86\winmad.pdb" />
-                        <File Id="winmad.dll" Compressed="yes" DiskId="1"
-                              LongName="winmad.dll" Name="winmad.dll"
-                              Source="..\bin\HCA\x86\winmad.dll" />
-                        <File Id="winmadd.dll" Compressed="yes" DiskId="1"
-                              LongName="winmadd.dll" Name="winmaddd.dll"
-                              Source="..\bin\HCA\x86\winmadd.dll" />
-                    </Component>
-                </Directory>
-
-                <Directory Id="dir_0" Name="Checked">
-                  <Directory Id="dir_1" Name="kernel">
-                    <Component Id="cCHK_kernel"
-                               Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
-                      <CreateFolder />
-                        <File Id="chk0" DiskId="1" Compressed="yes"
-                              Name="README.txt"
-                              Source="..\..\README_checked.txt" />
-                        <File Id="chk1" DiskId="1" Compressed="yes"
-                              Name="mthca.sys"
-                              Source="..\bin\Chk\HCA\x86\mthca.sys" />
-                        <File Id="cat1" DiskId="1" Compressed="yes"
-                              Name="mthca.cat"
-                              Source="..\bin\Chk\HCA\x86\mthca.cat" />
-                        <File Id="sym1" DiskId="1" Compressed="yes"
-                              Name="mthca.pdb"
-                              Source="..\bin\Chk\HCA\x86\mthca.pdb" />
-  
-                        <File Id="chk2" DiskId="1" Compressed="yes"
-                              Name="ibbus.sys"
-                              Source="..\bin\Chk\HCA\x86\ibbus.sys" />
-                        <File Id="sym2" DiskId="1" Compressed="yes"
-                              Name="ibbus.pdb"
-                              Source="..\bin\Chk\HCA\x86\ibbus.pdb" />
-  
-                        <File Id="chk3" DiskId="1" Compressed="yes"
-                              Name="ibiou.sys"
-                              Source="..\bin\Chk\HCA\x86\ibiou.sys" />
-                        <File Id="cat3"
-                              Name="ib_iou.cat" DiskId="1" Compressed="yes"
-                              Source="..\bin\Chk\HCA\x86\ib_iou.cat" />
-                        <File Id="sym3" DiskId="1" Compressed="yes"
-                              Name="ibiou.pdb"
-                              Source="..\bin\Chk\HCA\x86\ibiou.pdb" />
-  
-                        <File Id="chk4" DiskId="1" Compressed="yes"
-                              Name="ipoib.sys"
-                              Source="..\bin\Chk\net\x86\ipoib.sys" />
-                        <File Id="cat4" DiskId="1" Compressed="yes"
-                              Name="ipoib.cat"
-                              Source="..\bin\Chk\net\x86\ipoib.cat" />
-                        <File Id="sym4" DiskId="1" Compressed="yes"
-                              Name="ipoib.pdb"
-                              Source="..\bin\Chk\net\x86\ipoib.pdb" />
-  
-                        <File Id="chk5" DiskId="1" Compressed="yes"
-                              Name="qlgcvnic.sys"
-                              Source="..\bin\Chk\net\x86\qlgcvnic.sys" />
-                        <File Id="cat5" DiskId="1" Compressed="yes"
-                              Name="netvnic.cat"
-                              Source="..\bin\Chk\net\x86\netvnic.cat" />
-                        <File Id="sym5" DiskId="1" Compressed="yes"
-                              Name="qlgcvnic.pdb"
-                              Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />
-  
-                        <File Id="chk6" DiskId="1" Compressed="yes"
-                              Name="ibsrp.sys"
-                              Source="..\bin\Chk\storage\x86\ibsrp.sys" />
-                        <File Id="cat6" DiskId="1" Compressed="yes"
-                              Name="ibsrp.cat"
-                              Source="..\bin\Chk\storage\x86\ibsrp.cat" />
-                        <File Id="sym6" DiskId="1" Compressed="yes"
-                              Name="ibsrp.pdb"
-                              Source="..\bin\Chk\storage\x86\ibsrp.pdb" />
-  
-                        <File Id="chk7" DiskId="1" Compressed="yes"
-                              Name="mlx4_bus.sys"
-                              Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />
-                        <File Id="cat7" DiskId="1" Compressed="yes"
-                              Name="mlx4_bus.cat"
-                              Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />
-                        <File Id="sym7" DiskId="1" Compressed="yes"
-                              Name="mlx4_bus.pdb"
-                              Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />
-  
-                        <File Id="chk8" DiskId="1" Compressed="yes"
-                              Name="mlx4_hca.sys"
-                              Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />
-                        <File Id="cat8" DiskId="1" Compressed="yes"
-                              Name="mlx4_hca.cat"
-                              Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />
-                        <File Id="sym8" DiskId="1" Compressed="yes"
-                              Name="mlx4_hca.pdb"
-                              Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />
-  
-                        <File Id="chk9" DiskId="1" Compressed="yes"
-                              Name="winverbs.sys"
-                              Source="..\bin\Chk\HCA\x86\winverbs.sys" />
-                        <File Id="sym9" DiskId="1" Compressed="yes"
-                              Name="winverbs.pdb"
-                              Source="..\bin\Chk\HCA\x86\winverbs.pdb" />
-                        <File Id="dll9" DiskId="1" Compressed="yes"
-                              Name="winverbs.dll"
-                              Source="..\bin\Chk\HCA\x86\winverbs.dll" />
-                        <File Id="dlld9" DiskId="1" Compressed="yes"
-                              Name="winverbd.dll"
-                              LongName="winverbsd.dll"
-                              Source="..\bin\Chk\HCA\x86\winverbsd.dll" />
-                    </Component>
-                  </Directory>
-            
-                  <Directory Id="dir_14" Name="user">
-                    <Component Id="cCHK_user"
-                               Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
-                      <CreateFolder />
-                      <File Id="file118" Name="complibd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\complibd.dll" />
-                      <File Id="file119" Name="DAPL2-_1.DLL"
-                        LongName="dapl2-scmd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\dapl2-scmd.dll" />
-                      <File Id="file120" Name="dapl2d.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\dapl2d.dll" />
-                      <File Id="file121" Name="DAPL2T_1.EXE"
-                        LongName="dapl2testd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\dapl2testd.exe" />
-                      <File Id="file122" Name="dapld.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\dapld.dll" />
-                      <File Id="file123" Name="DAPLTE_1.EXE"
-                        LongName="dapltestd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\dapltestd.exe" />
-                      <File Id="file124" Name="dat2d.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\dat2d.dll" />
-                      <File Id="file125" Name="datd.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\datd.dll" />
-                      <File Id="file126" Name="dtest2d.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\dtest2d.exe" />
-                      <File Id="file127" Name="dtestxd.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\dtestxd.exe" />
-                      <File Id="file130" Name="ibald.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\ibald.dll" />
-                      <File Id="file144" Name="mthcaud.dll"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\mthcaud.dll" />
-                      <File Id="file146" Name="opensm.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\opensm.exe" />
-                      <File Id="file151" Name="vstat.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\vstat.exe" />
-                      <File Id="file152" Name="part_man.exe"
-                        DiskId="1" Compressed="yes"
-                        Source="..\bin\bin\user\objchk_wxp_x86\i386\part_man.exe" />
-                    </Component>
-                  </Directory>
-                </Directory>
-
-                <Component Id="cWinVerbsOFED"
-                           Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-                  <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                        LongName="libibverbs.dll" Name="ibverbs.dll"
-                        Source="..\bin\HCA\x86\libibverbs.dll" />
-                    <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"
-                           DestinationName="ibverbs.dll"
-                           DestinationLongName="libibverbs.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                        Source="..\bin\HCA\x86\libibverbs.pdb" />
-      
-                  <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                        Source="..\bin\HCA\x86\libibverbsd.dll" />
-                    <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"
-                           DestinationName="ibverbsd.dll"
-                           DestinationLongName="libibverbsd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                        Source="..\bin\HCA\x86\libibverbsd.pdb" />
-      
-                  <File Id="libibmad.dll" Compressed="yes" DiskId="1"
-                        LongName="libibmad.dll" Name="ibmad.dll"
-                        Source="..\bin\HCA\x86\libibmad.dll" />
-                    <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"
-                           DestinationName="ibmad.dll"
-                           DestinationLongName="libibmad.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibmad.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibmad.pdb" Name="ibmad.pdb"
-                        Source="..\bin\HCA\x86\libibmad.pdb" />
-      
-                  <File Id="libibmadd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibmadd.dll" Name="ibmadd.dll"
-                        Source="..\bin\HCA\x86\libibmadd.dll" />
-                    <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"
-                           DestinationName="ibmadd.dll"
-                           DestinationLongName="libibmadd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                        Source="..\bin\HCA\x86\libibmadd.pdb" />
-      
-                  <File Id="libibumad.dll" Compressed="yes" DiskId="1"
-                        LongName="libibumad.dll" Name="ibumad.dll"
-                        Source="..\bin\HCA\x86\libibumad.dll" />
-                    <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"
-                           DestinationName="ibumad.dll"
-                           DestinationLongName="libibumad.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibumad.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibumad.pdb" Name="ibumad.pdb"
-                        Source="..\bin\HCA\x86\libibumad.pdb" />
-      
-                  <File Id="libibumadd.dll" Compressed="yes" DiskId="1"
-                        LongName="libibumadd.dll" Name="ibumadd.dll"
-                        Source="..\bin\HCA\x86\libibumadd.dll" />
-                    <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"
-                           DestinationName="ibumadd.dll"
-                           DestinationLongName="libibumadd.dll"
-                           DestinationProperty="WindowsFolder" />
-                  <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"
-                        LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                        Source="..\bin\HCA\x86\libibumadd.pdb" />
-
-                  <File Id="librdmacm.dll" Compressed="yes" DiskId="1"
-                        LongName="librdmacm.dll" Name="rdmacm.dll"
-                        Source="..\bin\HCA\x86\librdmacm.dll" />
-                    <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"
-                           DestinationName="rdmacm.dll"
-                           DestinationLongName="librdmacm.dll"
-                           DestinationProperty="SystemFolder" />
-                  <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"
-                        LongName="librdmacm.pdb" Name="rdmacm.pdb"
-                        Source="..\bin\HCA\x86\librdmacm.pdb" />
-
-                  <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"
-                        LongName="librdmacmd.dll" Name="rdmacmd.dll"
-                        Source="..\bin\HCA\x86\librdmacmd.dll" />
-                    <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"
-                           DestinationName="rdmacmd.dll"
-                           DestinationLongName="librdmacmd.dll"
-                           DestinationProperty="SystemFolder" />
-                  <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"
-                        LongName="librdmacmd.pdb" Name="rdmacmd.pdb"
-                        Source="..\bin\HCA\x86\librdmacmd.pdb" />
-
-                </Component>
-
-                <Component Id="cWinVerbsUApps"
-                          Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
+      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
+        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"
+                   Name="WinOF" />
+      </Directory>
+      <Directory Id="DesktopFolder" Name="Desktop" />
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="INSTALLDIR" Name="WinOF">
+
+          <?include ..\..\common\Docs.inc ?>
+          <?include ..\..\common\Tools.inc ?>
+          <?include ..\..\common\OpenSM_service.inc ?>
+
+          <Directory Id="IBcoreDir" Name="IBcore">
+            <?include ..\..\common\IBcore.inc ?>
+            <?include ..\..\common\mlnx_drivers.inc ?>
+            <?include ..\..\common\winverbs_drivers.inc ?>
+          </Directory>
 
-                  <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"
-                        Source="..\bin\tools\x86\release\ibv_asyncwatch.exe" />
-                  <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_asyncwatch.pdb" />
-                  <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_devinfo.exe" Name="devinfo.exe"
-                        Source="..\bin\tools\x86\release\ibv_devinfo.exe" />
-                  <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_devinfo.pdb" Name="devinfo.pdb"
-                        Source="..\bin\tools\x86\release\ibv_devinfo.pdb" />
-                  <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"
-                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.exe" />
-                  <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.pdb" />
-                  <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_bw.exe" Name="readbw.exe"
-                        Source="..\bin\tools\x86\release\ibv_read_bw.exe" />
-                  <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_bw.pdb" Name="readbw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_read_bw.pdb" />
-                  <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_lat.exe" Name="readlat.exe"
-                        Source="..\bin\tools\x86\release\ibv_read_lat.exe" />
-                  <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_read_lat.pdb" Name="readlat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_read_lat.pdb" />
-                  <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_bw.exe" Name="send_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_send_bw.exe" />
-                  <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_bw.pdb" Name="send_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_send_bw.pdb" />
-                  <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_lat.exe" Name="send_lat.exe"
-                        Source="..\bin\tools\x86\release\ibv_send_lat.exe" />
-                  <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_send_lat.pdb" Name="send_lat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_send_lat.pdb" />
-                  <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"
-                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.exe" />
-                  <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"
-                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.pdb" />
-                  <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"
-                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.exe" />
-                  <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"
-                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.pdb" />
-                  <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_bw.exe" Name="write_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_write_bw.exe" />
-                  <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_bw.pdb" Name="write_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_write_bw.pdb" />
-                  <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_lat.exe" Name="writelat.exe"
-                        Source="..\bin\tools\x86\release\ibv_write_lat.exe" />
-                  <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_write_lat.pdb" Name="writelat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_write_lat.pdb" />
-                  <File Id="sminfo.exe" Compressed="yes" DiskId="1"
-                        LongName="sminfo.exe" Name="sminfo.exe"
-                        Source="..\bin\tools\x86\release\sminfo.exe" />
-                  <File Id="sminfo.pdb" Compressed="yes" DiskId="1"
-                        LongName="sminfo.pdb" Name="sminfo.pdb"
-                        Source="..\bin\tools\x86\release\sminfo.pdb" />
-                  <File Id="ibstat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibstat.exe" Name="ibstat.exe"
-                        Source="..\bin\tools\x86\release\ibstat.exe" />
-                  <File Id="ibstat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibstat.pdb" Name="ibstat.pdb"
-                        Source="..\bin\tools\x86\release\ibstat.pdb" />
-                  <File Id="perfquery.exe" Compressed="yes" DiskId="1"
-                        LongName="perfquery.exe" Name="perfquer.exe"
-                        Source="..\bin\tools\x86\release\perfquery.exe" />
-                  <File Id="perfquery.pdb" Compressed="yes" DiskId="1"
-                        LongName="perfquery.pdb" Name="perfquer.pdb"
-                        Source="..\bin\tools\x86\release\perfquery.pdb" />
-                  <File Id="ibaddr.exe" Compressed="yes" DiskId="1"
-                        LongName="ibaddr.exe" Name="ibaddr.exe"
-                        Source="..\bin\tools\x86\release\ibaddr.exe" />
-                  <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibaddr.pdb" Name="ibaddr.pdb"
-                        Source="..\bin\tools\x86\release\ibaddr.pdb" />
-                  <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"
-                        LongName="ibnetdiscover.exe" Name="ibnetdis.exe"
-                        Source="..\bin\tools\x86\release\ibnetdiscover.exe" />
-                  <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"
-                        Source="..\bin\tools\x86\release\ibnetdiscover.pdb" />
-                  <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"
-                        LongName="rdma_cmatose.exe" Name="rcmatose.exe"
-                        Source="..\bin\tools\x86\release\rdma_cmatose.exe" />
-                  <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"
-                        LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"
-                        Source="..\bin\tools\x86\release\rdma_cmatose.pdb" />
-                  <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"
-                        Source="..\bin\tools\x86\release\ibv_rdma_lat.exe" />
-                  <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rdma_lat.pdb" />
-                  <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"
-                        Source="..\bin\tools\x86\release\ibv_rdma_bw.exe" />
-                  <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"
-                        Source="..\bin\tools\x86\release\ibv_rdma_bw.pdb" />
-                  <File Id="ibroute.exe" Compressed="yes" DiskId="1"
-                        LongName="ibroute.exe" Name="ibroute.exe"
-                        Source="..\bin\tools\x86\release\ibroute.exe" />
-                  <File Id="ibroute.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibroute.pdb" Name="ibroute.pdb"
-                        Source="..\bin\tools\x86\release\ibroute.pdb" />
-                  <File Id="ibtracert.exe" Compressed="yes" DiskId="1"
-                        LongName="ibtracert.exe" Name="ibtrt.exe"
-                        Source="..\bin\tools\x86\release\ibtracert.exe" />
-                  <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"
-                        LongName="ibtracert.pdb" Name="ibtrt.pdb"
-                        Source="..\bin\tools\x86\release\ibtracert.pdb" />
-                </Component>
+          <?include ..\..\common\checked.inc ?>
+          <?include ..\..\common\winverbs_OFED.inc ?>
 
-                <Directory Id="ipoibDir" Name="net">
-                    <Component Id="IPoIB"
-                               Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
-                        <CreateFolder />
-                        <File Id="netipoib_inf" Compressed="yes" DiskId="1"
-                              LongName="netipoib.inf" Name="NETIPOI.INF"
-                              Source="..\bin\net\x86\netipoib.inf" />
-                        <File Id="ipoib_cat" Compressed="yes" DiskId="1"
-                              LongName="ipoib.cat" Name="IPOI.cat"
-                              Source="..\bin\net\x86\ipoib.cat" />
-                        <File Id="ipoib.sys" Compressed="yes" DiskId="1"
-                              LongName="ipoib.sys" Name="IPOIB.SYS"
-                              Source="..\bin\net\x86\ipoib.sys" />
-                        <File Id="ipoib.pdb" Compressed="yes" DiskId="1"
-                              Name="ipoib.pdb"
-                              Source="..\bin\net\x86\ipoib.pdb" />
-<!--
-  XP does not support WSD
-                        <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
-                              LongName="ibwsd.dll" Name="IBWSD.DLL"
-                              Source="..\bin\net\x86\ibwsd.dll" />
--->
-                        <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
-                              LongName="ibndprov.dll" Name="IBNDPROV.DLL"
-                              Source="..\bin\net\x86\ibndprov.dll" />
-                        <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
-                              LongName="ndinstall.exe" Name="NDINSTAL.EXE"
-                              Source="..\bin\net\x86\ndinstall.exe" />
-                    </Component>
-                </Directory>
+          <Directory Id="ipoibDir" Name="net">
+            <?include ..\..\common\ipoib.inc ?>
+          </Directory>
 
 <!-- XP does not support WSD
-                <Component Id="WinsockDirect"
-                           Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
-                    <File Id="installsp.exe" Compressed="yes" DiskId="1"
-                              LongName="installsp.exe" Name="INSTALL.EXE"
-                              Source="..\bin\net\x86\installsp.exe" />
-                </Component>
--->
-                <Component Id="cNetworkDirect"
-                           Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
-                </Component>
-
-                <Component Id="cDAPL1RT"
-                           Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-
-                    <File Id="dapl.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl.dll" Name="DAPL.DLL"
-                          Source="..\bin\DAPL\x86\dapl.dll" />
-                    <CopyFile Id="dupDAPL" FileId="dapl.dll"
-                          DestinationName="dapl.dll"
-                          DestinationProperty="WindowsFolder" />
-                    <File Id="dapld.dll" Compressed="yes" DiskId="1"
-                          LongName="dapld.dll" Name="DAPLD.DLL"
-                          Source="..\bin\DAPL\x86\dapld.dll" />
-                    <File Id="dat.dll" Compressed="yes" DiskId="1"
-                          LongName="dat.dll" Name="DAT.DLL"
-                          Source="..\bin\DAPL\x86\dat.dll" />
-                    <CopyFile Id="dupDAT" FileId="dat.dll"
-                          DestinationName="dat.dll"
-                          DestinationProperty="WindowsFolder" />
-                    <File Id="datd.dll" Compressed="yes" DiskId="1"
-                          LongName="datd.dll" Name="DATD.DLL"
-                          Source="..\bin\DAPL\x86\datd.dll" />
-
-                    <File Id="dat.conf" Compressed="yes" DiskId="1"
-                          LongName="dat.conf" Name="dat.conf"
-                          Source="..\..\dat.conf" />
-                    <File Id="dapltest.exe" Compressed="yes" DiskId="1"
-                          LongName="dapltest.exe" Name="dapltest.exe"
-                          Source="..\bin\tools\x86\release\dapltest.exe" />
-                    <File Id="dapltestd.exe" Compressed="yes" DiskId="1"
-                          LongName="dapltestd.exe" Name="dapltesd.exe"
-                          Source="..\bin\tools\x86\debug\dapltestd.exe" />
-
-                    <File Id="dat.lib" Compressed="yes" DiskId="1"
-                          LongName="dat.lib" Name="dat.lib"
-                          Source="..\bin\DAPL\x86\dat.lib" />
-                    <File Id="datd.lib" Compressed="yes" DiskId="1"
-                          LongName="datd.lib" Name="datd.lib"
-                          Source="..\bin\DAPL\x86\datd.lib" />
-                    <File Id="dat.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat.pdb" Name="dat.pdb"
-                          Source="..\bin\DAPL\x86\dat.pdb" />
-                    <File Id="datd.pdb" Compressed="yes" DiskId="1"
-                          LongName="datd.pdb" Name="datd.pdb"
-                          Source="..\bin\DAPL\x86\datd.pdb" />
-                    <File Id="dapl.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl.pdb" Name="dapl.pdb"
-                          Source="..\bin\DAPL\x86\dapl.pdb" />
-                    <File Id="dapld.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapld.pdb" Name="dapld.pdb"
-                          Source="..\bin\DAPL\x86\dapld.pdb" />
-
-                    <File Id="dt_svr.bat" Compressed="yes" DiskId="1"
-                          LongName="dt-svr.bat" Name="dt-svr.bat"
-                          Source="..\bin\DAPL2\dt-svr.bat" />
-                    <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"
-                          DestinationName="dt1-svr.bat"
-                          DestinationProperty="INSTALLDIR" />
-                    <File Id="dt_cli.bat" Compressed="yes" DiskId="1"
-                          LongName="dt-cli.bat" Name="dt-cli.bat"
-                          Source="..\bin\DAPL2\dt-cli.bat" />
-                    <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"
-                          DestinationName="dt1-cli.bat"
-                          DestinationProperty="INSTALLDIR" />
-                </Component>
-
-                <Component Id="cDAPL2RT"
-                           Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
-
-                    <File Id="_dapl2.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2.dll" Name="DAPL2.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2.dll" />
-                      <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"
-                              DestinationName="dapl2.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2d.dll" Name="DAPL2D.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2d.dll" />
-
-                    <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scm.dll" Name="D2-scm.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2-scm.dll" />
-                      <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"
-                              DestinationName="d2-scm.dll"
-                              DestinationLongName="dapl2-scm.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"
-                          LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"
-                          Source="..\bin\DAPL2\x86\dapl2-scmd.dll" />
-
-                    <File Id="_dat2.dll" Compressed="yes" DiskId="1"
-                          LongName="dat2.dll" Name="DAT2.DLL"
-                          Source="..\bin\DAPL2\x86\dat2.dll" />
-                    <CopyFile Id="dupDAT2" FileId="_dat2.dll"
-                              DestinationName="dat2.dll"
-                              DestinationProperty="WindowsFolder" />
-                    <File Id="_dat2d.dll" Compressed="yes" DiskId="1"
-                          LongName="dat2d.dll" Name="DAT2D.DLL"
-                          Source="..\bin\DAPL2\x86\dat2d.dll" />
-                    <File Id="dapl2test.exe" Compressed="yes" DiskId="1"
-                          LongName="dapl2test.exe" Name="dapl2tes.exe"
-                          Source="..\bin\tools\x86\release\dapl2test.exe" />
-                    <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"
-                          LongName="dapl2testd.exe" Name="dapl2tes.exe"
-                          Source="..\bin\tools\x86\debug\dapl2testd.exe" />
-                    <File Id="dtest2.exe" Compressed="yes" DiskId="1"
-                           LongName="dtest2.exe" Name="dtest2.exe"
-                           Source="..\bin\tools\x86\release\dtest2.exe" />
-                    <File Id="dtestx.exe" Compressed="yes" DiskId="1"
-                           LongName="dtestx.exe" Name="dtestx.exe"
-                           Source="..\bin\tools\x86\release\dtestx.exe" />
-
-                    <File Id="dapl2.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl2.pdb" Name="dapl2.pdb"
-                          Source="..\bin\DAPL2\x86\dapl2.pdb" />
-                    <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"
-                          LongName="dapl2d.pdb" Name="dapl2d.pdb"
-                          Source="..\bin\DAPL2\x86\dapl2d.pdb" />
-                    <File Id="dat2.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat2.pdb" Name="dat2.pdb"
-                          Source="..\bin\DAPL2\x86\dat2.pdb" />
-                    <File Id="dat2d.pdb" Compressed="yes" DiskId="1"
-                          LongName="dat2d.pdb" Name="dat2d.pdb"
-                          Source="..\bin\DAPL2\x86\dat2d.pdb" />
-                    <File Id="dat2.lib" Compressed="yes" DiskId="1"
-                          LongName="dat2.lib" Name="dat2.lib"
-                          Source="..\bin\DAPL2\x86\dat2.lib" />
-                    <File Id="dat2d.lib" Compressed="yes" DiskId="1"
-                          LongName="dat2d.lib" Name="dat2d.lib"
-                          Source="..\bin\DAPL2\x86\dat2d.lib" />
-                </Component>
-
-                <Component Id="cQLVNIC_driver_installed"
-                           Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-                </Component>
-
-                <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-                    <Component Id="cQLVNIC_files"
-                               Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-                        <CreateFolder />
-                        <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                              LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                              Source="..\bin\net\x86\qlgcvnic.sys" />
-                        <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                              Name="qlgcvnic.pdb"
-                              Source="..\bin\net\x86\qlgcvnic.pdb" />
-                        <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                              LongName="netvnic.inf" Name="NETVNIC.INF"
-                              Source="..\bin\net\x86\netvnic.inf" />
-                        <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                              LongName="netvnic.cat" Name="NETVNIC.cat"
-                              Source="..\bin\net\x86\netvnic.cat" />
-                    </Component>
-                </Directory>
-
-<!-- Skip SRP on XP/32
-                <Directory Id="srpDir" Name="SRP">
-                    <Component Id="cSRP_driver"
-                               Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-                        <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                              LongName="ib_srp.inf" Name="IB_SRP.INF"
-                              Source="..\bin\storage\x86\ib_srp.inf" />
-                        <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                              LongName="ibsrp.cat" Name="IBSRP.CAT"
-                              Source="..\bin\storage\x86\ibsrp.cat" />
-                        <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                              LongName="ibsrp.sys" Name="IBSRP.SYS"
-                              Source="..\bin\storage\x86\ibsrp.sys" />
-                        <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                              Name="ibsrp.pdb"
-                              Source="..\bin\storage\x86\ibsrp.pdb" />
-                    </Component>
-                </Directory>
+            <Component Id="WinsockDirect"
+                       Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
+                <File Id="installsp.exe" Compressed="yes" DiskId="1"
+                          LongName="installsp.exe" Name="INSTALL.EXE"
+                          Source="..\bin\net\$(var.ARCH)\installsp.exe" />
+            </Component>
 -->
-
-                <Component Id="OpenSM_Service_enabled"
-                           Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-                </Component>
-            </Directory>
-          </Directory>
-
-      <!-- copy DAT header files to
-             %SystemDrive%\DAT\v1-1\DAT
-             %SystemDrive%\DAT\v2-0\DAT
-       -->
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
-
-         <Directory Id="dDATD" Name="DAT">
-            <Component Id="cDatCfg" Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >
-              <CreateFolder />
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"
-                     LongName="dat.conf" Name="dat.conf"
-                     Source="..\..\dat.conf" />
+            <Component Id="cNetworkDirect"
+                       Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
             </Component>
 
-            <Directory Id="v1_1" Name="v1-1">
-              <Component Id="cDATV1" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">
-                <CreateFolder />
-              </Component>
-              <Directory Id="DDID" Name="DAT">    
-                <Component Id="cDatBldV1Hdrs"
-                           Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
-                  <CreateFolder />    
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat.h" />    
+            <?include ..\..\common\dapl_rt.inc ?>
 
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL\dat_error.h" />    
-         
-                  <File Id="dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    
-         
-                  <File Id="dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL\dat_redirection.h" />    
-         
-                  <File Id="dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL\dat_registry.h" />    
-         
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    
-         
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL\udat.h" />    
-         
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL\udat_config.h" />    
-         
-                  <File Id="udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL\udat_redirection.h" />    
-         
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
+            <Component Id="cQLVNIC_driver_installed"
+                       Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
+            </Component>
 
-              <Component Id="cDatBldV1Libs"
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"
-                        LongName="dat.lib" Name="dat.lib"
-                        Source="..\bin\DAPL\x86\dat.lib" />
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"
-                        LongName="datd.lib" Name="datd.lib"
-                        Source="..\bin\DAPL\x86\datd.lib" />
+            <Directory Id="qlgcvnicDir" Name="qlgcvnic">
+              <Component Id="cQLVNIC_files"
+                         Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
+                  <CreateFolder />
+                  <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
+                        LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
+                        Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
+                  <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
+                        Name="qlgcvnic.pdb"
+                        Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
+                  <File Id="netvnic.inf" Compressed="yes" DiskId="1"
+                        LongName="netvnic.inf" Name="NETVNIC.INF"
+                        Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
+                  <File Id="netvnic.cat" Compressed="yes" DiskId="1"
+                        LongName="netvnic.cat" Name="NETVNIC.cat"
+                        Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
               </Component>
             </Directory>
 
-            <Directory Id="v2_0" Name="v2-0">
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876">
-                <CreateFolder />
+<!-- Skip SRP on XP/32
+            <Directory Id="srpDir" Name="SRP">
+              <Component Id="cSRP_driver"
+                         Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
+                  <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
+                        LongName="ib_srp.inf" Name="IB_SRP.INF"
+                        Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
+                  <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
+                        LongName="ibsrp.cat" Name="IBSRP.CAT"
+                        Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
+                  <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
+                        LongName="ibsrp.sys" Name="IBSRP.SYS"
+                        Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
+                  <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
+                        Name="ibsrp.pdb"
+                        Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
               </Component>
-
-              <Directory Id="DDID2" Name="DAT">    
-                <Component Id="cDatBldV2Hdrs"
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    
-                  <CreateFolder />    
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    
-                        LongName="dat.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat.h" />    
-
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    
-                        LongName="dat_error.h" Name="dat.h"    
-                        Source="..\bin\DAPL2\dat_error.h" />    
-         
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_platform_specific.h"    
-                        Name="dat_plat.h"    
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    
-         
-                  <File Id="_dat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_redirection.h"    
-                        Name="dat_redi.h"    
-                        Source="..\bin\DAPL2\dat_redirection.h" />    
-         
-                  <File Id="_dat_registry.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_registry.h"    
-                        Name="dat_reg.h"    
-                        Source="..\bin\DAPL2\dat_registry.h" />    
-         
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="dat_vendor_specific.h"    
-                        Name="dat_vend.h"    
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    
-         
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    
-                        LongName="udat.h" Name="udat.h"    
-                        Source="..\bin\DAPL2\udat.h" />    
-         
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    
-                        LongName="udat_config.h" Name="udat_cfg.h"    
-                        Source="..\bin\DAPL2\udat_config.h" />    
-         
-                  <File Id="_udat_redirection.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_redirection.h"    
-                        Name="udat_red.h"    
-                        Source="..\bin\DAPL2\udat_redirection.h" />    
-         
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    
-                        DiskId="1" LongName="udat_vendor_specific.h"    
-                        Name="udat_ven.h"    
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    
-                </Component>
-              </Directory>
-
-              <Component Id="cDatBldV2Libs"
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    
-
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2.lib" Name="dat2.lib"
-                        Source="..\bin\DAPL2\x86\dat2.lib" />
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"
-                        LongName="dat2d.lib" Name="dat2d.lib"
-                        Source="..\bin\DAPL2\x86\dat2d.lib" />
-              </Component>    
             </Directory>
-         </Directory>  <!-- End DAT -->
-
-         <!-- setup IBSDK file structure -->
-         <Directory Id="IBSDK" Name="IBSDK">
-           <Directory Id="IB_libs" Name="lib">
-             <Component Id="cIBAL_Libs"
-                        Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
-               <CreateFolder />
-               <File Id="ibal.lib" Compressed="yes" DiskId="1"
-                     LongName="ibal.lib" Name="ibal.lib"
-                     Source="..\bin\HCA\x86\ibal.lib" />
-               <File Id="ibal.pdb" Compressed="yes" DiskId="1"
-                     LongName="ibal.pdb" Name="ibal.pdb"
-                     Source="..\bin\HCA\x86\ibal.pdb" />
-               <File Id="complib.lib" Compressed="yes" DiskId="1"
-                     LongName="complib.lib" Name="complib.lib"
-                     Source="..\bin\HCA\x86\complib.lib" />
-               <File Id="complib.pdb" Compressed="yes" DiskId="1"
-                     LongName="complib.pdb" Name="complib.pdb"
-                     Source="..\bin\HCA\x86\complib.pdb" />
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"
-                    LongName="ibald.lib" Name="ibald.lib"
-                    Source="..\bin\HCA\x86\ibald.lib" />
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibald.pdb" Name="ibald.pdb"
-                    Source="..\bin\HCA\x86\ibald.pdb" />
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"
-                    LongName="complibd.lib" Name="complibd.lib"
-                    Source="..\bin\HCA\x86\complibd.lib" />
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"
-                    LongName="complibd.pdb" Name="complibd.pdb"
-                    Source="..\bin\HCA\x86\complibd.pdb" />
-
-               <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbs.lib" Name="winverbs.lib"
-                     Source="..\bin\HCA\x86\winverbs.lib" />
-               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbsd.lib" Name="winvrbsd.lib"
-                     Source="..\bin\HCA\x86\winverbsd.lib" />
-
-               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.lib" Name="ibverbs.lib"
-                     Source="..\bin\HCA\x86\libibverbs.lib" />
-               <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.pdb" Name="ibverbs.pdb"
-                     Source="..\bin\HCA\x86\libibverbs.pdb" />
-               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                     Source="..\bin\HCA\x86\libibverbsd.lib" />
-               <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
-                     Source="..\bin\HCA\x86\libibverbsd.pdb" />
-
-               <File Id="libibmad.lib" Compressed="yes" DiskId="1"
-                     LongName="libibmad.lib" Name="ibmad.lib"
-                     Source="..\bin\HCA\x86\libibmad.lib" />
-               <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibmad.pdb" Name="ibmad.pdb"
-                     Source="..\bin\HCA\x86\libibmad.pdb" />
-               <File Id="libibmadd.lib" Compressed="yes" DiskId="1"
-                     LongName="libibmadd.lib" Name="ibmadd.lib"
-                     Source="..\bin\HCA\x86\libibmadd.lib" />
-               <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibmadd.pdb" Name="ibmadd.pdb"
-                     Source="..\bin\HCA\x86\libibmadd.pdb" />
-
-               <File Id="libibumad.lib" Compressed="yes" DiskId="1"
-                     LongName="libibumad.lib" Name="ibumad.lib"
-                     Source="..\bin\HCA\x86\libibumad.lib" />
-               <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibumad.pdb" Name="ibumad.pdb"
-                     Source="..\bin\HCA\x86\libibumad.pdb" />
-               <File Id="libibumadd.lib" Compressed="yes" DiskId="1"
-                     LongName="libibumadd.lib" Name="ibumadd.lib"
-                     Source="..\bin\HCA\x86\libibumadd.lib" />
-               <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"
-                     LongName="libibumadd.pdb" Name="ibumadd.pdb"
-                     Source="..\bin\HCA\x86\libibumadd.pdb" />
-             </Component>
-           </Directory>
-
-           <Directory Id="IB_inc" Name="Inc">
-             <Component Id="cIBAL_Incs"
-                        Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">
-               <CreateFolder />
-
-               <File Id="oib_ver.h" Compressed="yes" DiskId="1"
-                     LongName="oib_ver.h" Name="oib_ver.h"
-                     Source="..\bin\Inc\oib_ver.h" />
-               <File Id="openib.def" Compressed="yes" DiskId="1"
-                     LongName="openib.def" Name="openib.def"
-                     Source="..\bin\Inc\openib.def" />
-             </Component>
+-->
+        </Directory>
+      </Directory>
 
-             <Directory Id="IB_complib" Name="complib">
-               <Component Id="cIBAL_Complib"
-                          Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">
-                 <CreateFolder />
-                 <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"
-                       LongName="cl_async_proc.h" Name="CL_ASYN.H" 
-                       Source="..\bin\Inc\complib\cl_async_proc.h" />
-                 <File Id="cl_atomic.h" Compressed="yes" DiskId="1"
-                       LongName="cl_atomic.h" Name="CL_ATOM.H" 
-                       Source="..\bin\Inc\complib\cl_atomic.h" />
-                 <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" 
-                       Source="..\bin\Inc\complib\cl_atomic_osd.h" />
-                 <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_byteswap.h" Name="CL_BYTE.H" 
-                       Source="..\bin\Inc\complib\cl_byteswap.h" />
-                 <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" 
-                       Source="..\bin\Inc\complib\cl_byteswap_osd.h" />
-                 <File Id="cl_comppool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_comppool.h" Name="CL_COMP.H" 
-                       Source="..\bin\Inc\complib\cl_comppool.h" />
-                 <File Id="cl_debug.h" Compressed="yes" DiskId="1"
-                       LongName="cl_debug.h" Name="CL_DEBU.H" 
-                       Source="..\bin\Inc\complib\cl_debug.h" />
-                 <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_debug_osd.h" Name="CL_DEBU1.H" 
-                       Source="..\bin\Inc\complib\cl_debug_osd.h" />
-                 <File Id="cl_event.h" Compressed="yes" DiskId="1"
-                       LongName="cl_event.h" Name="CL_EVEN.H" 
-                       Source="..\bin\Inc\complib\cl_event.h" />
-                 <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_event_osd.h" Name="CL_EVEN1.H" 
-                       Source="..\bin\Inc\complib\cl_event_osd.h" />
-                 <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_fleximap.h" Name="CL_FLEX.H" 
-                       Source="..\bin\Inc\complib\cl_fleximap.h" />
-                 <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ioctl.h" Name="CL_IOCT.H" 
-                       Source="..\bin\Inc\complib\cl_ioctl.h" />
-                 <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" 
-                       Source="..\bin\Inc\complib\cl_ioctl_osd.h" />
-                 <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_irqlock.h" Name="CL_IRQL.H" 
-                       Source="..\bin\Inc\complib\cl_irqlock.h" />
-                 <File Id="cl_list.h" Compressed="yes" DiskId="1"
-                       LongName="cl_list.h" Name="CL_LIST.H" 
-                       Source="..\bin\Inc\complib\cl_list.h" />
-                 <File Id="cl_log.h" Compressed="yes" DiskId="1"
-                       LongName="cl_log.h" Name="CL_LOG.H" 
-                       Source="..\bin\Inc\complib\cl_log.h" />
-                 <File Id="cl_map.h" Compressed="yes" DiskId="1"
-                       LongName="cl_map.h" Name="CL_MAP.H" 
-                       Source="..\bin\Inc\complib\cl_map.h" />
-                 <File Id="cl_math.h" Compressed="yes" DiskId="1"
-                       LongName="cl_math.h" Name="CL_MATH.H" 
-                       Source="..\bin\Inc\complib\cl_math.h" />
-                 <File Id="cl_memory.h" Compressed="yes" DiskId="1"
-                       LongName="cl_memory.h" Name="CL_MEMO.H" 
-                       Source="..\bin\Inc\complib\cl_memory.h" />
-                 <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_memory_osd.h" Name="CL_MEMO1.H" 
-                       Source="..\bin\Inc\complib\cl_memory_osd.h" />
-                 <File Id="cl_mutex.h" Compressed="yes" DiskId="1"
-                       LongName="cl_mutex.h" Name="CL_MUTE.H" 
-                       Source="..\bin\Inc\complib\cl_mutex.h" />
-                 <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" 
-                       Source="..\bin\Inc\complib\cl_mutex_osd.h" />
-                 <File Id="cl_obj.h" Compressed="yes" DiskId="1"
-                       LongName="cl_obj.h" Name="CL_OBJ.H" 
-                       Source="..\bin\Inc\complib\cl_obj.h" />
-                 <File Id="cl_packoff.h" Compressed="yes" DiskId="1"
-                       LongName="cl_packoff.h" Name="CL_PACK.H" 
-                       Source="..\bin\Inc\complib\cl_packoff.h" />
-                 <File Id="cl_packon.h" Compressed="yes" DiskId="1"
-                       LongName="cl_packon.h" Name="CL_PACK1.H" 
-                       Source="..\bin\Inc\complib\cl_packon.h" />
-                 <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_passivelock.h" Name="CL_PASS.H" 
-                       Source="..\bin\Inc\complib\cl_passivelock.h" />
-                 <File Id="cl_perf.h" Compressed="yes" DiskId="1"
-                       LongName="cl_perf.h" Name="CL_PERF.H" 
-                       Source="..\bin\Inc\complib\cl_perf.h" />
-                 <File Id="cl_pool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_pool.h" Name="CL_POOL.H" 
-                       Source="..\bin\Inc\complib\cl_pool.h" />
-                 <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"
-                       LongName="cl_ptr_vector.h" Name="CL_PTR_.H" 
-                       Source="..\bin\Inc\complib\cl_ptr_vector.h" />
-                 <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qcomppool.h" Name="CL_QCOM.H" 
-                       Source="..\bin\Inc\complib\cl_qcomppool.h" />
-                 <File Id="cl_qlist.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qlist.h" Name="CL_QLIS.H" 
-                       Source="..\bin\Inc\complib\cl_qlist.h" />
-                 <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qlockpool.h" Name="CL_QLOC.H" 
-                       Source="..\bin\Inc\complib\cl_qlockpool.h" />
-                 <File Id="cl_qmap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qmap.h" Name="CL_QMAP.H" 
-                       Source="..\bin\Inc\complib\cl_qmap.h" />
-                 <File Id="cl_qpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_qpool.h" Name="CL_QPOO.H" 
-                       Source="..\bin\Inc\complib\cl_qpool.h" />
-                 <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"
-                       LongName="cl_rbmap.h" Name="CL_RBMA.H" 
-                       Source="..\bin\Inc\complib\cl_rbmap.h" />
-                 <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"
-                       LongName="cl_reqmgr.h" Name="CL_REQM.H" 
-                       Source="..\bin\Inc\complib\cl_reqmgr.h" />
-                 <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"
-                       LongName="cl_spinlock.h" Name="CL_SPIN.H" 
-                       Source="..\bin\Inc\complib\cl_spinlock.h" />
-                 <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" 
-                       Source="..\bin\Inc\complib\cl_spinlock_osd.h" />
-                 <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"
-                       LongName="cl_syscallback.h" Name="CL_SYSC.H" 
-                       Source="..\bin\Inc\complib\cl_syscallback.h" />
-                 <File Id="cl_syscallback_osd.h" Compressed="yes"
-                       DiskId="1"
-                       LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" 
-                      Source="..\bin\Inc\complib\cl_syscallback_osd.h" />
-                 <File Id="cl_thread.h" Compressed="yes" DiskId="1"
-                       LongName="cl_thread.h" Name="CL_THRE.H" 
-                       Source="..\bin\Inc\complib\cl_thread.h" />
-                 <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_thread_osd.h" Name="CL_THRE1.H" 
-                       Source="..\bin\Inc\complib\cl_thread_osd.h" />
-                 <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"
-                       LongName="cl_threadpool.h" Name="CL_THRE2.H" 
-                       Source="..\bin\Inc\complib\cl_threadpool.h" />
-                 <File Id="cl_timer.h" Compressed="yes" DiskId="1"
-                       LongName="cl_timer.h" Name="CL_TIME.H" 
-                       Source="..\bin\Inc\complib\cl_timer.h" />
-                 <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_timer_osd.h" Name="CL_TIME1.H" 
-                       Source="..\bin\Inc\complib\cl_timer_osd.h" />
-                 <File Id="cl_types.h" Compressed="yes" DiskId="1"
-                       LongName="cl_types.h" Name="CL_TYPE.H" 
-                       Source="..\bin\Inc\complib\cl_types.h" />
-                 <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_types_osd.h" Name="CL_TYPE1.H" 
-                       Source="..\bin\Inc\complib\cl_types_osd.h" />
-                 <File Id="cl_vector.h" Compressed="yes" DiskId="1"
-                       LongName="cl_vector.h" Name="CL_VECT.H" 
-                       Source="..\bin\Inc\complib\cl_vector.h" />
-                 <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"
-                       LongName="cl_waitobj.h" Name="CL_WAIT.H" 
-                       Source="..\bin\Inc\complib\cl_waitobj.h" />
-                 <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"
-                       LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" 
-                       Source="..\bin\Inc\complib\cl_waitobj_osd.h" />
-                 <File Id="comp_lib.h" Compressed="yes" DiskId="1"
-                       LongName="comp_lib.h" Name="COMP_LI.H" 
-                       Source="..\bin\Inc\complib\comp_lib.h" />
-               </Component>
-             </Directory>
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">
 
-             <Directory Id="IB_iba" Name="iba">
-               <Component Id="cIBAL_IBA"
-                          Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">
-                 <CreateFolder />
-                 <File Id="ib_al.h" Compressed="yes" DiskId="1"
-                       LongName="ib_al.h" Name="ib_al.h"
-                       Source="..\bin\Inc\iba\ib_al.h" />
-                 <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="ib_al_ioctl.h" Name="ib_ioctl.h"
-                       Source="..\bin\Inc\iba\ib_al_ioctl.h" />
-                 <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"
-                       LongName="ib_at_ioctl.h" Name="ib_iocat.h"
-                       Source="..\bin\Inc\iba\ib_at_ioctl.h" />
-                 <File Id="ib_ci.h" Compressed="yes" DiskId="1"
-                       LongName="ib_ci.h" Name="ib_ci.h"
-                       Source="..\bin\Inc\iba\ib_ci.h" />
-                 <File Id="ib_types.h" Compressed="yes" DiskId="1"
-                       LongName="ib_types.h" Name="ib_types.h"
-                       Source="..\bin\Inc\iba\ib_types.h" />
-                 <File Id="ib_uvp.h" Compressed="yes" DiskId="1"
-                       LongName="ib_uvp.h" Name="ib_uvp.h"
-                       Source="..\bin\Inc\iba\ib_uvp.h" />
-               </Component>
-             </Directory>
-           </Directory>
+      <!-- copy DAT header files to
+         %SystemDrive%\DAT\v1-1\DAT
+         %SystemDrive%\DAT\v2-0\DAT
+      -->
 
-          <Directory Id="IB_samples" Name="Samples">
-            <Directory Id="sample_DDK" Name="DDK">
-              <Component Id="cDDK_example"
-                         Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">
-                <CreateFolder />
-                    <File Id="cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\Misc\cmtest.c" />
-                    <File Id="makefile" Compressed="yes" DiskId="1"
-                          LongName="makefile" Name="makefile"
-                          Source="..\..\SDK_Samples\DDK\makefile" />
-                    <File Id="SOURCES" Compressed="yes" DiskId="1"
-                          LongName="SOURCES" Name="SOURCES"
-                          Source="..\..\SDK_Samples\DDK\SOURCES" />
-                    <File Id="README.txt" Compressed="yes" DiskId="1"
-                          LongName="README.txt" Name="README.txt"
-                          Source="..\..\SDK_Samples\DDK\README.txt" />
-              </Component>
-            </Directory>    <!-- End DDK -->
+        <Directory Id="dDATD" Name="DAT">
+          <?include ..\..\common\DAT_config.inc ?>
+        </Directory>
 
-              <Directory Id="sample_VS" Name="VS">
-                <Component Id="cVS_example"
-                           Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">
-                  <CreateFolder />
-                    <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"
-                          LongName="cmtest.c" Name="cmtest.c"
-                          Source="..\bin\misc\cmtest.c" />
-                      <File Id="vscmtest.rc" Compressed="yes" DiskId="1"
-                            LongName="cmtest.rc" Name="cmtest.rc"
-                            Source="..\..\SDK_Samples\VS\cmtest.rc" />
-                      <File Id="vsREADME.txt" Compressed="yes" DiskId="1"
-                            LongName="README.txt" Name="README.txt"
-                            Source="..\..\SDK_Samples\VS\README.txt" />
-                    <File Id="Makefile.x86" Compressed="yes" DiskId="1"
-                          LongName="Makefile.x86" Name="Makefile.x86"
-                          Source="..\..\SDK_Samples\VS\Makefile.x86" />
-                </Component>
-              </Directory>    <!-- End VS -->
-          </Directory>    <!-- End Samples -->
-         </Directory>  <!-- End IBSDK -->
+        <Directory Id="IBSDK" Name="IBSDK">
+          <?include ..\..\common\ib_sdk.inc ?>
+        </Directory>
 
-      </Directory>  <!-- End WinRoot -->
+      </Directory>
     </Directory> <!-- End TARGETDIR -->
 
+<!--
+    <Property Id='ARPNOMODIFY'>1</Property>
+    <Property Id='ARPNOREPAIR'>1</Property>
+-->
     <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
     <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
     <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
@@ -1441,40 +155,39 @@
      -->
 
     <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"
-         Description="InfiniBand Host Channel Adapter Drivers"
+         Description="Mellanox InfiniBand Host Channel Adapter Drivers"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
+      <ComponentRef Id="cMthcaDriver" />
+      <ComponentRef Id="cConnectXDriver" />
 
-        <ComponentRef Id="cMthcaDriver" />
-        <ComponentRef Id="cConnectXDriver" />
-
-      <Feature Id="hca_mthca" Title="Mellanox InfiniHost" Level="1"
+      <Feature Id="hca_mthca" Title="InfiniHost" Level="1"
            Description="InfiniHost series - all except ConnectX"
            Display="expand" ConfigurableDirectory="INSTALLDIR"
            AllowAdvertise='no' InstallDefault='local' Absent='allow'>
       </Feature>
 
-      <Feature Id="hca_connectX" Title="Mellanox ConnectX" Level="5"
+      <Feature Id="hca_connectX" Title="ConnectX" Level="5"
            Description="ConnectX only - mlx4"
            Display="expand" ConfigurableDirectory="INSTALLDIR"
            AllowAdvertise='no' InstallDefault='local' Absent='allow'>
       </Feature>
     </Feature>
 
-    <Feature Id="IBcore" Title="InfiniBand Core" Level="1"
-        Description="InfiniBand: Core, Tools, Docs" Display="expand"
-        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
-        InstallDefault="local" Absent="disallow">
-        <ComponentRef Id="cIBcore" />
-        <ComponentRef Id="cWinVerbsDrivers" />
-        <ComponentRef Id="Docs" />
-        <ComponentRef Id="Tools" />
-        <ComponentRef Id="OpenSMservice" />
-        <ComponentRef Id="cQLVNIC_files" />
+    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"
+        Description="InfiniBand: Core, Tools, Docs"
+        Display="expand" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">
+      <ComponentRef Id="cIBcore" />
+      <ComponentRef Id="cWinVerbsDrivers" />
+      <ComponentRef Id="Docs" />
+      <ComponentRef Id="Tools" />
+      <ComponentRef Id="OpenSMservice" />
+      <ComponentRef Id="cQLVNIC_files" />
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
-        Description="OFED verbs - Libraries + applications"
+        Description="OFED verbs - Libraries + utilities"
         Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
         <ComponentRef Id="cWinVerbsOFED" />
@@ -1510,7 +223,7 @@
         <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"
+    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"
         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
         <Condition Level="201"> IPOIB_EXISTS </Condition>
@@ -1558,13 +271,6 @@
       </Feature>
     </Feature>
 
-    <Feature Id="fVNIC" Title="QLogic-VNIC"
-        Description="QLogic - Virtual NIC over InfiniBand"
-        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <ComponentRef Id="cQLVNIC_driver_installed" />
-    </Feature>
-
 <!-- Skip SRP on XP/32
     <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"
         Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
@@ -1579,7 +285,14 @@
     </Feature>
 -->
 
-    <Feature Id="fIBskd" Title="InfiniBand SDK" Level="2"
+    <Feature Id="fVNIC" Title="QLogic-VNIC"
+        Description="QLogic - Virtual NIC over InfiniBand"
+        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
+      <ComponentRef Id="cQLVNIC_driver_installed" />
+    </Feature>
+
+    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"
          Description="InfiniBand Software Development Kit (Headers + Libs)"
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
@@ -1599,74 +312,11 @@
       <ComponentRef Id="cCHK_user" />
     </Feature>
 
-    <!--> File where Custom Actions are defined -->
-    <Binary Id="CA" src="..\..\CustomActions.vbs" />
-
-    <CustomAction Id="WinOF_setup" BinaryKey="CA"
-         VBScriptCall="WinOF_setup" Return="check" />
-
-    <CustomAction Id="ChkPreviousInstall" BinaryKey="CA"
-         VBScriptCall="ChkInstallAndReboot" Return="check" />
-
-    <CustomAction Id="DriverInstall" BinaryKey="CA"
-         VBScriptCall="DriverInstall" Return="check" Execute="deferred" />
-
-    <CustomAction Id="DriverUninstall" BinaryKey="CA"
-         VBScriptCall="DriverUninstall" Return="check" />
-
-    <CustomAction Id="WSDStart" BinaryKey="CA"
-         VBScriptCall="WSDEnable" Return="check" />
-
-    <CustomAction Id="ND_start" BinaryKey="CA"
-         VBScriptCall="ND_StartMeUp" Return="check" />
-
-    <CustomAction Id="HammerTime" BinaryKey="CA"
-         VBScriptCall="HammerTime" Return="check" />
-
-    <CustomAction Id="BcastRegChanged" BinaryKey="CA"
-         VBScriptCall="BcastRegChanged" Return="check" />
-
-    <CustomAction Id="InstallChanged" BinaryKey="CA"
-         VBScriptCall="InstallChanged" Return="check" />
-
-    <InstallExecuteSequence>
-       <!-- Always executed (Install or uninstall) -->
-       <Custom Action="WinOF_setup" After="InstallInitialize" />
-
-       <!--> Install ONLY </!-->
-       <Custom Action="ChkPreviousInstall" After="WinOF_setup">
-           NOT Installed</Custom>
-
-       <ScheduleReboot After="ChkPreviousInstall">
-           REBOOT="FORCE"</ScheduleReboot>
-
-       <Custom Action="DriverInstall" After="InstallServices">
-           Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="WSDStart" After="InstallFinalize">
-           Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="ND_start" After="WSDStart">
-          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
-
-       <Custom Action="BcastRegChanged" After="ND_start">
-           Not Installed</Custom>
-
-       <!--> CHANGE ONLY </!-->
-       <Custom Action="InstallChanged" After="InstallFinalize">
-           Installed </Custom>
-
-       <!--> REMOVE ONLY </!-->
-       <Custom Action="DriverUninstall" After="PublishProduct">
-           REMOVE="ALL" </Custom>
-       <Custom Action="HammerTime" After="InstallFinalize">REMOVE="ALL"</Custom>
-
-    </InstallExecuteSequence>
+    <?include ..\..\common\InstallExecuteSeq.inc ?>
 
     <UIRef Id="WixUI_FeatureTree" />
-        <UIRef Id="WixUI_ErrorProgressText" />
-        <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
     <UI />
-
   </Product>
 </Wix>
-- 
2.41.0