diff --git a/360/xdk360_audio.c b/360/xdk360_audio.c
index 6d23c1fe0d..2f0eeda476 100644
--- a/360/xdk360_audio.c
+++ b/360/xdk360_audio.c
@@ -208,7 +208,7 @@ static void xa_free(void *data)
    }
 }
 
-const audio_driver_t audio_xa = {
+const audio_driver_t audio_xdk360 = {
    xa_init,
    xa_write,
    xa_stop,
diff --git a/360/xdk360_input.cpp b/360/xdk360_input.cpp
index f9f0ad1abe..3167843da7 100644
--- a/360/xdk360_input.cpp
+++ b/360/xdk360_input.cpp
@@ -94,7 +94,7 @@ static int16_t xdk360_input_state(void *data, const struct snes_keybind **binds,
          button = 0;
    }
 
-   return (state[player] & button) ? 1 : 0;
+   return (state[player].Gamepad.wButtons & button) ? 1 : 0;
 }
 
 static void xdk360_free_input(void *data)
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj
index 5a885ffc14..2a59b99b0c 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj
@@ -234,13 +234,17 @@
     <ClCompile Include="..\..\360\xdk360_audio.c" />
     <ClCompile Include="..\..\360\xdk360_input.cpp" />
     <ClCompile Include="..\..\360\xdk360_video.cpp" />
+    <ClCompile Include="..\..\audio\hermite.c" />
+    <ClCompile Include="..\..\audio\utils.c" />
     <ClCompile Include="..\..\autosave.c" />
     <ClCompile Include="..\..\bps.c" />
     <ClCompile Include="..\..\cheats.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\driver.c" />
-    <ClCompile Include="..\..\dynamic.c" />
+    <ClCompile Include="..\..\dynamic.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\fifo_buffer.c" />
     <ClCompile Include="..\..\file.c" />
     <ClCompile Include="..\..\getopt.c" />
@@ -262,6 +266,8 @@
   <ItemGroup>
     <ClInclude Include="..\..\360\msvc_compat.h" />
     <ClInclude Include="..\..\360\xdk360_audio.h" />
+    <ClInclude Include="..\..\audio\hermite.h" />
+    <ClInclude Include="..\..\audio\utils.h" />
     <ClInclude Include="..\..\autosave.h" />
     <ClInclude Include="..\..\boolean.h" />
     <ClInclude Include="..\..\bps.h" />
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
index 11895b15cb..29b05b7a73 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
@@ -15,6 +15,12 @@
     <Filter Include="Header Files\360">
       <UniqueIdentifier>{740056e8-6476-4e8c-b9cb-767bebdb5c60}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\audio">
+      <UniqueIdentifier>{c8038d65-499b-493b-80e9-90bd7c57383f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\audio">
+      <UniqueIdentifier>{747ac5fa-bd8a-4e60-9246-7a8fb0d38b85}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\360\xdk360_video.cpp">
@@ -86,6 +92,12 @@
     <ClCompile Include="..\..\thread.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\audio\hermite.c">
+      <Filter>Source Files\audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio\utils.c">
+      <Filter>Source Files\audio</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\ups.h">
@@ -163,5 +175,11 @@
     <ClInclude Include="..\..\360\msvc_compat.h">
       <Filter>Header Files\360</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\audio\hermite.h">
+      <Filter>Header Files\audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\audio\utils.h">
+      <Filter>Header Files\audio</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file