diff --git a/quakespasm/Linux/CodeBlocks/QuakeSpasm.cbp b/quakespasm/Linux/CodeBlocks/QuakeSpasm.cbp
index 243216ea..465b40e2 100644
--- a/quakespasm/Linux/CodeBlocks/QuakeSpasm.cbp
+++ b/quakespasm/Linux/CodeBlocks/QuakeSpasm.cbp
@@ -240,7 +240,7 @@
 		<Unit filename="../../Quake/snd_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../../Quake/sound.h" />
+		<Unit filename="../../Quake/q_sound.h" />
 		<Unit filename="../../Quake/spritegn.h" />
 		<Unit filename="../../Quake/sv_main.c">
 			<Option compilerVar="CC" />
diff --git a/quakespasm/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj b/quakespasm/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj
index 0633a2b5..323c9fc8 100644
--- a/quakespasm/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj
+++ b/quakespasm/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj
@@ -175,7 +175,7 @@
 		483A77FB0D2EE9A900CB2E4C /* protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = protocol.h; path = ../Quake/protocol.h; sourceTree = SOURCE_ROOT; };
 		483A77FC0D2EE9A900CB2E4C /* server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = server.h; path = ../Quake/server.h; sourceTree = SOURCE_ROOT; };
 		483A77FD0D2EE9BD00CB2E4C /* cdaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cdaudio.h; path = ../Quake/cdaudio.h; sourceTree = SOURCE_ROOT; };
-		483A77FE0D2EE9BD00CB2E4C /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sound.h; path = ../Quake/sound.h; sourceTree = SOURCE_ROOT; };
+		483A77FE0D2EE9BD00CB2E4C /* q_sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = q_sound.h; path = ../Quake/q_sound.h; sourceTree = SOURCE_ROOT; };
 		483A77FF0D2EE9F300CB2E4C /* anorm_dots.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = anorm_dots.h; path = ../Quake/anorm_dots.h; sourceTree = SOURCE_ROOT; };
 		483A78000D2EE9F300CB2E4C /* anorms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = anorms.h; path = ../Quake/anorms.h; sourceTree = SOURCE_ROOT; };
 		483A78010D2EE9F300CB2E4C /* bspfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bspfile.h; path = ../Quake/bspfile.h; sourceTree = SOURCE_ROOT; };
@@ -551,7 +551,7 @@
 			isa = PBXGroup;
 			children = (
 				483A77FD0D2EE9BD00CB2E4C /* cdaudio.h */,
-				483A77FE0D2EE9BD00CB2E4C /* sound.h */,
+				483A77FE0D2EE9BD00CB2E4C /* q_sound.h */,
 			);
 			name = Headers;
 			sourceTree = "<group>";
diff --git a/quakespasm/Quake/sound.h b/quakespasm/Quake/q_sound.h
similarity index 100%
rename from quakespasm/Quake/sound.h
rename to quakespasm/Quake/q_sound.h
diff --git a/quakespasm/Quake/quakedef.h b/quakespasm/Quake/quakedef.h
index 7c5e25eb..b5ec7649 100644
--- a/quakespasm/Quake/quakedef.h
+++ b/quakespasm/Quake/quakedef.h
@@ -253,7 +253,7 @@ typedef struct
 #include "protocol.h"
 #include "cmd.h"
 #include "sbar.h"
-#include "sound.h"
+#include "q_sound.h"
 #include "render.h"
 #include "client.h"
 #include "progs.h"
diff --git a/quakespasm/Windows/CodeBlocks/QuakeSpasm.cbp b/quakespasm/Windows/CodeBlocks/QuakeSpasm.cbp
index cc121e14..b5d35a2a 100644
--- a/quakespasm/Windows/CodeBlocks/QuakeSpasm.cbp
+++ b/quakespasm/Windows/CodeBlocks/QuakeSpasm.cbp
@@ -251,7 +251,7 @@
 		<Unit filename="..\..\Quake\snd_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\Quake\sound.h" />
+		<Unit filename="..\..\Quake\q_sound.h" />
 		<Unit filename="..\..\Quake\spritegn.h" />
 		<Unit filename="..\..\Quake\sv_main.c">
 			<Option compilerVar="CC" />
diff --git a/quakespasm/Windows/VisualStudio/quakespasm.vcproj b/quakespasm/Windows/VisualStudio/quakespasm.vcproj
index 1d5220c3..cc5acb97 100644
--- a/quakespasm/Windows/VisualStudio/quakespasm.vcproj
+++ b/quakespasm/Windows/VisualStudio/quakespasm.vcproj
@@ -772,7 +772,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Quake\sound.h"
+				RelativePath="..\..\Quake\q_sound.h"
 				>
 			</File>
 			<File