diff --git a/Minecraft.Client/cmake/sources/Durango.cmake b/Minecraft.Client/cmake/sources/Durango.cmake
index 13cb8a6c5..5ca0da274 100644
--- a/Minecraft.Client/cmake/sources/Durango.cmake
+++ b/Minecraft.Client/cmake/sources/Durango.cmake
@@ -1,5 +1,12 @@
 set(BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Durango/")
 
+set(_MINECRAFT_CLIENT_DURANGO_COMMON_RES_AUDIO
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/minecraft.xsb"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/resident.xwb"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/streamed.xwb"
+)
+source_group("Common/res/audio" FILES ${_MINECRAFT_CLIENT_DURANGO_COMMON_RES_AUDIO})
+
 set(_MINECRAFT_CLIENT_DURANGO_COMMON_SOURCE_FILES_AUDIO
   "${CMAKE_CURRENT_SOURCE_DIR}/Common/Audio/SoundEngine.cpp"
 )
@@ -466,14 +473,8 @@ set(_MINECRAFT_CLIENT_DURANGO_XBOX_SOURCE_FILES_SENTIENT_DYNAMICCONF
 )
 source_group("Xbox/Source Files/Sentient/DynamicConf" FILES ${_MINECRAFT_CLIENT_DURANGO_XBOX_SOURCE_FILES_SENTIENT_DYNAMICCONF})
 
-set(_MINECRAFT_CLIENT_DURANGO_XBOX_RES_AUDIO
-  "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/res/audio/minecraft.xsb"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/res/audio/resident.xwb"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/res/audio/streamed.xwb"
-)
-source_group("Xbox/res/audio" FILES ${_MINECRAFT_CLIENT_DURANGO_XBOX_RES_AUDIO})
-
 set(MINECRAFT_CLIENT_DURANGO
+  ${_MINECRAFT_CLIENT_DURANGO_COMMON_RES_AUDIO}
   ${_MINECRAFT_CLIENT_DURANGO_COMMON_SOURCE_FILES_AUDIO}
   ${_MINECRAFT_CLIENT_DURANGO_COMMON_SOURCE_FILES_UI}
   ${_MINECRAFT_CLIENT_DURANGO_COMMON_SOURCE_FILES_UI_COMPONENTS}
@@ -504,5 +505,4 @@ set(MINECRAFT_CLIENT_DURANGO
   ${_MINECRAFT_CLIENT_DURANGO_SOURCE_FILES}
   ${_MINECRAFT_CLIENT_DURANGO_XBOX_SENTIENTLIBS_INC}
   ${_MINECRAFT_CLIENT_DURANGO_XBOX_SOURCE_FILES_SENTIENT_DYNAMICCONF}
-  ${_MINECRAFT_CLIENT_DURANGO_XBOX_RES_AUDIO}
 )
diff --git a/Minecraft.Client/cmake/sources/ORBIS.cmake b/Minecraft.Client/cmake/sources/ORBIS.cmake
index 35206847c..b5154ad7b 100644
--- a/Minecraft.Client/cmake/sources/ORBIS.cmake
+++ b/Minecraft.Client/cmake/sources/ORBIS.cmake
@@ -5,6 +5,13 @@ set(_MINECRAFT_CLIENT_ORBIS_ROOT
 )
 source_group("" FILES ${_MINECRAFT_CLIENT_ORBIS_ROOT})
 
+set(_MINECRAFT_CLIENT_ORBIS_COMMON_RES_AUDIO
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/minecraft.xsb"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/resident.xwb"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/streamed.xwb"
+)
+source_group("Common/res/audio" FILES ${_MINECRAFT_CLIENT_ORBIS_COMMON_RES_AUDIO})
+
 set(_MINECRAFT_CLIENT_ORBIS_COMMON_SOURCE_FILES_AUDIO
   "${CMAKE_CURRENT_SOURCE_DIR}/Common/Audio/SoundEngine.cpp"
 )
@@ -508,13 +515,6 @@ set(_MINECRAFT_CLIENT_ORBIS_XBOX_SENTIENTLIBS_INC
 )
 source_group("Xbox/SentientLibs/inc" FILES ${_MINECRAFT_CLIENT_ORBIS_XBOX_SENTIENTLIBS_INC})
 
-set(_MINECRAFT_CLIENT_ORBIS_XBOX_RES_AUDIO
-  "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/res/audio/minecraft.xsb"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/res/audio/resident.xwb"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/res/audio/streamed.xwb"
-)
-source_group("Xbox/res/audio" FILES ${_MINECRAFT_CLIENT_ORBIS_XBOX_RES_AUDIO})
-
 set(_MINECRAFT_CLIENT_ORBIS_NET_MINECRAFT_CLIENT_MULTIPLAYER
   "${CMAKE_CURRENT_SOURCE_DIR}/ConnectScreen.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/ConnectScreen.h"
@@ -533,6 +533,7 @@ source_group("net/minecraft/stats" FILES ${_MINECRAFT_CLIENT_ORBIS_NET_MINECRAFT
 
 set(MINECRAFT_CLIENT_ORBIS
   ${_MINECRAFT_CLIENT_ORBIS_ROOT}
+  ${_MINECRAFT_CLIENT_ORBIS_COMMON_RES_AUDIO}
   ${_MINECRAFT_CLIENT_ORBIS_COMMON_SOURCE_FILES_AUDIO}
   ${_MINECRAFT_CLIENT_ORBIS_COMMON_SOURCE_FILES_LEADERBOARDS}
   ${_MINECRAFT_CLIENT_ORBIS_COMMON_SOURCE_FILES_NETWORK_SONY}
@@ -569,7 +570,6 @@ set(MINECRAFT_CLIENT_ORBIS
   ${_MINECRAFT_CLIENT_ORBIS_WINDOWS}
   ${_MINECRAFT_CLIENT_ORBIS_WINDOWS64_4JLIBS_INC}
   ${_MINECRAFT_CLIENT_ORBIS_XBOX_SENTIENTLIBS_INC}
-  ${_MINECRAFT_CLIENT_ORBIS_XBOX_RES_AUDIO}
   ${_MINECRAFT_CLIENT_ORBIS_NET_MINECRAFT_CLIENT_MULTIPLAYER}
   ${_MINECRAFT_CLIENT_ORBIS_NET_MINECRAFT_STATS}
 )
diff --git a/Minecraft.Client/cmake/sources/Windows.cmake b/Minecraft.Client/cmake/sources/Windows.cmake
index d3233edd8..f4f1ab78b 100644
--- a/Minecraft.Client/cmake/sources/Windows.cmake
+++ b/Minecraft.Client/cmake/sources/Windows.cmake
@@ -1,5 +1,12 @@
 set(BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/")
 
+set(_MINECRAFT_CLIENT_WINDOWS_COMMON_RES_AUDIO
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/minecraft.xsb"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/resident.xwb"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/streamed.xwb"
+)
+source_group("Common/res/audio" FILES ${_MINECRAFT_CLIENT_WINDOWS_COMMON_RES_AUDIO})
+
 set(_MINECRAFT_CLIENT_WINDOWS_COMMON_SOURCE_FILES_AUDIO
   "${CMAKE_CURRENT_SOURCE_DIR}/Common/Audio/SoundEngine.cpp"
 )
@@ -461,19 +468,13 @@ set(_MINECRAFT_CLIENT_WINDOWS_XBOX_SOURCE_FILES_SENTIENT_DYNAMICCONF
 )
 source_group("Xbox/Source Files/Sentient/DynamicConf" FILES ${_MINECRAFT_CLIENT_WINDOWS_XBOX_SOURCE_FILES_SENTIENT_DYNAMICCONF})
 
-set(_MINECRAFT_CLIENT_WINDOWS_XBOX_RES_AUDIO
-  # "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/res/audio/minecraft.xsb"
-  # "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/res/audio/resident.xwb"
-  # "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/res/audio/streamed.xwb"
-)
-source_group("Xbox/res/audio" FILES ${_MINECRAFT_CLIENT_WINDOWS_XBOX_RES_AUDIO})
-
 set(_MINECRAFT_CLIENT_WINDOWS_NET_MINECRAFT_STATS
   "${CMAKE_CURRENT_SOURCE_DIR}/StatsCounter.h"
 )
 source_group("net/minecraft/stats" FILES ${_MINECRAFT_CLIENT_WINDOWS_NET_MINECRAFT_STATS})
 
 set(MINECRAFT_CLIENT_WINDOWS
+  ${_MINECRAFT_CLIENT_WINDOWS_COMMON_RES_AUDIO}
   ${_MINECRAFT_CLIENT_WINDOWS_COMMON_SOURCE_FILES_AUDIO}
   ${_MINECRAFT_CLIENT_WINDOWS_COMMON_SOURCE_FILES_NETWORK}
   ${_MINECRAFT_CLIENT_WINDOWS_COMMON_SOURCE_FILES_UI}
@@ -507,6 +508,5 @@ set(MINECRAFT_CLIENT_WINDOWS
   ${_MINECRAFT_CLIENT_WINDOWS_XBOX_SENTIENTLIBS_INC}
   ${_MINECRAFT_CLIENT_WINDOWS_XBOX_SOURCE_FILES_NETWORK}
   ${_MINECRAFT_CLIENT_WINDOWS_XBOX_SOURCE_FILES_SENTIENT_DYNAMICCONF}
-  ${_MINECRAFT_CLIENT_WINDOWS_XBOX_RES_AUDIO}
   ${_MINECRAFT_CLIENT_WINDOWS_NET_MINECRAFT_STATS}
 )
diff --git a/Minecraft.Client/cmake/sources/Xbox360.cmake b/Minecraft.Client/cmake/sources/Xbox360.cmake
index 90152734d..3733e12dd 100644
--- a/Minecraft.Client/cmake/sources/Xbox360.cmake
+++ b/Minecraft.Client/cmake/sources/Xbox360.cmake
@@ -1,5 +1,12 @@
 set(BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/")
 
+set(_MINECRAFT_CLIENT_XBOX360_COMMON_RES_AUDIO
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/minecraft.xsb"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/resident.xwb"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/streamed.xwb"
+)
+source_group("Common/res/audio" FILES ${_MINECRAFT_CLIENT_XBOX360_COMMON_RES_AUDIO})
+
 set(_MINECRAFT_CLIENT_XBOX360_DURANGO
   "${CMAKE_CURRENT_SOURCE_DIR}/Durango/Durango_UIController.h"
   "${CMAKE_CURRENT_SOURCE_DIR}/Durango/Resource.h"
@@ -436,13 +443,6 @@ set(_MINECRAFT_CLIENT_XBOX360_XBOX_XML
 )
 source_group("Xbox/XML" FILES ${_MINECRAFT_CLIENT_XBOX360_XBOX_XML})
 
-set(_MINECRAFT_CLIENT_XBOX360_XBOX_RES_AUDIO
-  "${BASE_DIR}/res/audio/minecraft.xsb"
-  "${BASE_DIR}/res/audio/resident.xwb"
-  "${BASE_DIR}/res/audio/streamed.xwb"
-)
-source_group("Xbox/res/audio" FILES ${_MINECRAFT_CLIENT_XBOX360_XBOX_RES_AUDIO})
-
 set(_MINECRAFT_CLIENT_XBOX360_XBOX_XEXXML
   "${BASE_DIR}/xex-dev.xml"
   "${BASE_DIR}/xex.xml"
@@ -466,6 +466,7 @@ set(_MINECRAFT_CLIENT_XBOX360_NET_MINECRAFT_STATS
 source_group("net/minecraft/stats" FILES ${_MINECRAFT_CLIENT_XBOX360_NET_MINECRAFT_STATS})
 
 set(MINECRAFT_CLIENT_XBOX360
+  ${_MINECRAFT_CLIENT_XBOX360_COMMON_RES_AUDIO}
   ${_MINECRAFT_CLIENT_XBOX360_DURANGO}
   ${_MINECRAFT_CLIENT_XBOX360_DURANGO_IGGY_GDRAW}
   ${_MINECRAFT_CLIENT_XBOX360_DURANGO_IGGY_INCLUDE}
@@ -504,7 +505,6 @@ set(MINECRAFT_CLIENT_XBOX360
   ${_MINECRAFT_CLIENT_XBOX360_XBOX_SOURCE_FILES_XUI_MENU_SCREENS_SOCIAL}
   ${_MINECRAFT_CLIENT_XBOX360_XBOX_SOURCE_FILES_XUI_MENU_SCREENS_TUTORIAL}
   ${_MINECRAFT_CLIENT_XBOX360_XBOX_XML}
-  ${_MINECRAFT_CLIENT_XBOX360_XBOX_RES_AUDIO}
   ${_MINECRAFT_CLIENT_XBOX360_XBOX_XEXXML}
   ${_MINECRAFT_CLIENT_XBOX360_NET_MINECRAFT_CLIENT_MULTIPLAYER}
   ${_MINECRAFT_CLIENT_XBOX360_NET_MINECRAFT_STATS}