diff --git a/ANX.Framework/ANX.Framework_Linux.csproj b/ANX.Framework/ANX.Framework_Linux.csproj
index 5ce3f85e..bc9cc367 100644
--- a/ANX.Framework/ANX.Framework_Linux.csproj
+++ b/ANX.Framework/ANX.Framework_Linux.csproj
@@ -54,6 +54,10 @@
     <Compile Include="Audio\SoundEffectInstance.cs" />
     <Compile Include="Audio\SoundState.cs" />
     <Compile Include="Audio\WaveBank.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettings.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettingsRpcCurve.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettingsRpcCurvePoint.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettingsVariable.cs" />
     <Compile Include="BoundingBox.cs" />
     <Compile Include="BoundingFrustum.cs" />
     <Compile Include="BoundingSphere.cs" />
diff --git a/ANX.Framework/ANX.Framework_PSVita.csproj b/ANX.Framework/ANX.Framework_PSVita.csproj
index 3e528f7f..dcdb5e55 100644
--- a/ANX.Framework/ANX.Framework_PSVita.csproj
+++ b/ANX.Framework/ANX.Framework_PSVita.csproj
@@ -56,6 +56,10 @@
     <Compile Include="Audio\SoundEffectInstance.cs" />
     <Compile Include="Audio\SoundState.cs" />
     <Compile Include="Audio\WaveBank.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettings.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettingsRpcCurve.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettingsRpcCurvePoint.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettingsVariable.cs" />
     <Compile Include="BoundingBox.cs" />
     <Compile Include="BoundingFrustum.cs" />
     <Compile Include="BoundingSphere.cs" />
diff --git a/ANX.Framework/ANX.Framework_WindowsMetro.csproj b/ANX.Framework/ANX.Framework_WindowsMetro.csproj
index c22e3f9c..7084ef03 100644
--- a/ANX.Framework/ANX.Framework_WindowsMetro.csproj
+++ b/ANX.Framework/ANX.Framework_WindowsMetro.csproj
@@ -57,6 +57,10 @@
     <Compile Include="Audio\SoundEffectInstance.cs" />
     <Compile Include="Audio\SoundState.cs" />
     <Compile Include="Audio\WaveBank.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettings.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettingsRpcCurve.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettingsRpcCurvePoint.cs" />
+    <Compile Include="Audio\XactParser\XactGeneralSettingsVariable.cs" />
     <Compile Include="BoundingBox.cs" />
     <Compile Include="BoundingFrustum.cs" />
     <Compile Include="BoundingSphere.cs" />
diff --git a/Installer/anx.wxs b/Installer/anx.wxs
index ee1ba399..8ecf101a 100644
--- a/Installer/anx.wxs
+++ b/Installer/anx.wxs
@@ -121,9 +121,6 @@
       <Component Id='ANX.SoundSystem.Windows.XAudio' Guid='{4C4EDC2B-BF6B-437C-874C-1573373DB55E}'>
         <File Id='anx.soundsystem.windows.xaudio' Name='ANX.SoundSystem.Windows.XAudio.dll' DiskId='1' Source='../../bin/Release/ANX.SoundSystem.Windows.XAudio.dll' />
       </Component>
-      <Component Id='ANX.MediaSystem.Windows.OpenAL' Guid='{9B798FF1-7E7B-48A6-8D8C-10EBA7EF1BB3}'>
-        <File Id='anx.mediasystem.windows.openal' Name='ANX.MediaSystem.Windows.OpenAL.dll' DiskId='1' Source='../../bin/Release/ANX.MediaSystem.Windows.OpenAL.dll' />
-      </Component>
       <Component Id='ANX.PlatformSystem.Windows' Guid='{0D0EBDD1-9F95-40CE-B314-7A502BC84A2F}'>
         <File Id='anx.platformsystem.windows' Name='ANX.PlatformSystem.Windows.dll' DiskId='1' Source='../../bin/Release/ANX.PlatformSystem.Windows.dll' />
       </Component>
diff --git a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj
index 647fd7e1..8c998402 100644
--- a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj
+++ b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj
@@ -72,6 +72,12 @@
     <Compile Include="OpenALSoundEffectInstance.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SupportedPlatformsImpl.cs" />
+    <Compile Include="Wave\ALaw.cs" />
+    <Compile Include="Wave\MsAdpcm.cs" />
+    <Compile Include="Wave\MuLaw.cs" />
+    <Compile Include="Wave\WaveFile.cs" />
+    <Compile Include="Wave\WaveFormat.cs" />
+    <Compile Include="Wave\WaveInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build
index 547b42cb..a48b4f11 100644
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@@ -180,6 +180,7 @@
       <include name="**/*.csproj" />
       <exclude name="**/*PSVita*.csproj" />
       <exclude name="**/*Metro*.csproj" />
+      <exclude name="**/*ModernUI*.csproj" />
       <exclude name="**/*Kinect*.csproj" />
       <exclude name="**/*_Linux.csproj" />
       <exclude name="**/ANX.InputDevices.Test*.csproj" />
@@ -189,6 +190,7 @@
       <fileset id="inputsystem_files" basedir="../InputSystems/">
         <include name="**/*_Linux.csproj" />
         <exclude name="**/*Metro*.csproj" />
+        <exclude name="**/*ModernUI*.csproj" />
         <exclude name="**/*Kinect*.csproj" />
         <exclude name="**/*PSVITA*.csproj" />
         <exclude name="**/*Windows*.csproj" />
@@ -200,6 +202,7 @@
       <fileset id="inputsystem_files" basedir="../InputSystems/">
         <include name="**/*_PSVITA.csproj" />
         <exclude name="**/*Metro*.csproj" />
+        <exclude name="**/*ModernUI*.csproj" />
         <exclude name="**/*Kinect*.csproj" />
         <exclude name="**/*Windows*.csproj" />
         <exclude name="**/*Linux*.csproj" />
@@ -211,6 +214,7 @@
     <if test="${project.anx.metro}">
       <fileset id="inputsystem_files" basedir="../InputSystems/">
         <include name="**/*_WindowsMetro.csproj" />
+        <include name="**/*ModernUI*.csproj" />
         <exclude name="**/*PsVita*.csproj" />
         <exclude name="**/*Kinect*.csproj" />
         <exclude name="**/*Linux*.csproj" />