diff --git a/core/oslib/alsa_audiostream.cpp b/core/oslib/alsa_audiostream.cpp
index 801d6bc7b..85b18f78d 100644
--- a/core/oslib/alsa_audiostream.cpp
+++ b/core/oslib/alsa_audiostream.cpp
@@ -1,5 +1,5 @@
 
-#include "audiostream_rif.h"
+#include "audiostream.h"
 #include "oslib/oslib.h"
 
 #include "cfg/cfg.h"
diff --git a/core/oslib/audiostream.cpp b/core/oslib/audiostream.cpp
index c5ff15fab..4a6f96044 100644
--- a/core/oslib/audiostream.cpp
+++ b/core/oslib/audiostream.cpp
@@ -1,4 +1,4 @@
-#include "audiostream_rif.h"
+#include "audiostream.h"
 #include "stdclass.h"
 #include "oslib/oslib.h"
 
diff --git a/core/oslib/audiostream_rif.h b/core/oslib/audiostream.h
similarity index 100%
rename from core/oslib/audiostream_rif.h
rename to core/oslib/audiostream.h
diff --git a/core/oslib/ds_audiostream.cpp b/core/oslib/ds_audiostream.cpp
index 8c99a071b..f559cd2ae 100644
--- a/core/oslib/ds_audiostream.cpp
+++ b/core/oslib/ds_audiostream.cpp
@@ -3,7 +3,7 @@
 #if HOST_OS==OS_WINDOWS
 #include <initguid.h>
 #include <dsound.h>
-#include "audiostream_rif.h"
+#include "audiostream.h"
 #include "oslib.h"
 
 void* SoundThread(void* param);
diff --git a/core/windows/winmain.cpp b/core/windows/winmain.cpp
index f22c5a53c..667c91ae8 100644
--- a/core/windows/winmain.cpp
+++ b/core/windows/winmain.cpp
@@ -1,5 +1,5 @@
 #include "oslib\oslib.h"
-#include "oslib\audiostream_rif.h"
+#include "oslib\audiostream.h"
 #include "imgread\common.h"
 
 #define _WIN32_WINNT 0x0500 
diff --git a/shell/ios/emulator.xcodeproj/project.pbxproj b/shell/ios/emulator.xcodeproj/project.pbxproj
index f9a3d2ee8..9efaa2fad 100644
--- a/shell/ios/emulator.xcodeproj/project.pbxproj
+++ b/shell/ios/emulator.xcodeproj/project.pbxproj
@@ -550,6 +550,11 @@
 		9C7A3A7118C806E00070BB5F /* gl3platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gl3platform.h; sourceTree = "<group>"; };
 		9C7A3A7318C806E00070BB5F /* khrplatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = khrplatform.h; sourceTree = "<group>"; };
 		9C7A3A7C18C806E00070BB5F /* nullDC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nullDC.cpp; sourceTree = "<group>"; };
+		9C7A3A7E18C806E00070BB5F /* alsa_audiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = alsa_audiostream.cpp; sourceTree = "<group>"; };
+		9C7A3A7F18C806E00070BB5F /* audiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiostream.cpp; sourceTree = "<group>"; };
+		9C7A3A8018C806E00070BB5F /* audiostream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audiostream.h; sourceTree = "<group>"; };
+		9C7A3A8118C806E00070BB5F /* ds_audiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ds_audiostream.cpp; sourceTree = "<group>"; };
+		9C7A3A8218C806E00070BB5F /* oslib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = oslib.h; sourceTree = "<group>"; };
 		9C7A3A8418C806E00070BB5F /* profiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = profiler.cpp; sourceTree = "<group>"; };
 		9C7A3A8518C806E00070BB5F /* profiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = profiler.h; sourceTree = "<group>"; };
 		9C7A3A8618C806E00070BB5F /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
diff --git a/shell/reicast.vcxproj b/shell/reicast.vcxproj
index d3f104ad5..7749710f0 100644
--- a/shell/reicast.vcxproj
+++ b/shell/reicast.vcxproj
@@ -317,7 +317,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Fast|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Fast|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\core\oslib\audiostream_rif.h" />
+    <ClInclude Include="..\core\oslib\audiostream.h" />
     <ClInclude Include="..\core\oslib\oslib.h" />
     <ClInclude Include="..\core\profiler\profiler.h" />
     <ClInclude Include="..\core\rec-x86\win86_ngen.h">
diff --git a/shell/reicast.vcxproj.filters b/shell/reicast.vcxproj.filters
index b47ab6dcb..27b61a045 100644
--- a/shell/reicast.vcxproj.filters
+++ b/shell/reicast.vcxproj.filters
@@ -751,7 +751,7 @@
     <ClInclude Include="..\core\hw\sh4\sh4_mem.h">
       <Filter>hw\sh4</Filter>
     </ClInclude>
-    <ClInclude Include="..\core\oslib\audiostream_rif.h">
+    <ClInclude Include="..\core\oslib\audiostream.h">
       <Filter>oslib</Filter>
     </ClInclude>
     <ClInclude Include="..\core\hw\sh4\modules\ccn.h">