19 files changed, 27 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index f3dbab12b..32287178f 100644
--- a/Makefile
+++ b/Makefile
@@ -709,23 +709,23 @@ C_SOURCES += water_cmd.c
 C_SOURCES += waypoint.c
 C_SOURCES += widget.c
 C_SOURCES += window.c
-C_SOURCES += music/null.c
-C_SOURCES += sound/null.c
-C_SOURCES += video/null.c
+C_SOURCES += music/null_m.c
+C_SOURCES += sound/null_s.c
+C_SOURCES += video/null_v.c
 
 CXX_SOURCES =
 
 ifdef WITH_SDL
 C_SOURCES += sdl.c
-C_SOURCES += sound/sdl.c
-C_SOURCES += video/sdl.c
+C_SOURCES += sound/sdl_s.c
+C_SOURCES += video/sdl_v.c
 endif
 
 ifdef WIN32
 C_SOURCES += win32.c
-C_SOURCES += music/win32.c
-C_SOURCES += sound/win32.c
-C_SOURCES += video/win32.c
+C_SOURCES += music/win32_m.c
+C_SOURCES += sound/win32_s.c
+C_SOURCES += video/win32_v.c
 else
 C_SOURCES += unix.c
 C_SOURCES += music/extmidi.c
diff --git a/music/null.c b/music/null_m.c
index 136f1d3e2..fda44fdae 100644
--- a/music/null.c
+++ b/music/null_m.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
-#include "music/null.h"
+#include "music/null_m.h"
 
 static const char* NullMidiStart(const char* const* parm) { return NULL; }
 static void NullMidiStop(void) {}
diff --git a/music/null.h b/music/null_m.h
index 5f0be7ca4..5f0be7ca4 100644
--- a/music/null.h
+++ b/music/null_m.h
diff --git a/music/win32.c b/music/win32_m.c
index eb4d42d25..73cb859a3 100644
--- a/music/win32.c
+++ b/music/win32_m.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
-#include "music/win32.h"
+#include "music/win32_m.h"
 #include <windows.h>
 
 static struct {
diff --git a/music/win32.h b/music/win32_m.h
index 8a2a0fb2d..8a2a0fb2d 100644
--- a/music/win32.h
+++ b/music/win32_m.h
diff --git a/sound/null.c b/sound/null_s.c
index e7d0c8c10..744a209bd 100644
--- a/sound/null.c
+++ b/sound/null_s.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
-#include "sound/null.h"
+#include "sound/null_s.h"
 
 static const char *NullSoundStart(const char * const *parm) { return NULL; }
 static void NullSoundStop(void) {}
diff --git a/sound/null.h b/sound/null_s.h
index 63cc5ef8f..63cc5ef8f 100644
--- a/sound/null.h
+++ b/sound/null_s.h
diff --git a/sound/sdl.c b/sound/sdl_s.c
index 2f227ad39..9ff1ca5cb 100644
--- a/sound/sdl.c
+++ b/sound/sdl_s.c
@@ -3,7 +3,7 @@
 #include "driver.h"
 #include "mixer.h"
 #include "sdl.h"
-#include "sound/sdl.h"
+#include "sound/sdl_s.h"
 #include <SDL.h>
 
 static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len)
diff --git a/sound/sdl.h b/sound/sdl_s.h
index 9e593991a..9e593991a 100644
--- a/sound/sdl.h
+++ b/sound/sdl_s.h
diff --git a/sound/win32.c b/sound/win32_s.c
index 9d58515a3..a67249fa5 100644
--- a/sound/win32.c
+++ b/sound/win32_s.c
@@ -3,7 +3,7 @@
 #include "driver.h"
 #include "functions.h"
 #include "mixer.h"
-#include "sound/win32.h"
+#include "sound/win32_s.h"
 #include <windows.h>
 
 static HWAVEOUT _waveout;
diff --git a/sound/win32.h b/sound/win32_s.h
index 1f7b82b27..1f7b82b27 100644
--- a/sound/win32.h
+++ b/sound/win32_s.h
diff --git a/unix.c b/unix.c
index bdbd7112e..d49fc5143 100644
--- a/unix.c
+++ b/unix.c
@@ -8,13 +8,13 @@
 #include "variables.h"
 
 #include "music/extmidi.h"
-#include "music/null.h"
+#include "music/null_m.h"
 
-#include "sound/null.h"
-#include "sound/sdl.h"
+#include "sound/null_s.h"
+#include "sound/sdl_s.h"
 
-#include "video/null.h"
-#include "video/sdl.h"
+#include "video/null_v.h"
+#include "video/sdl_v.h"
 
 #include <dirent.h>
 #include <unistd.h>
diff --git a/video/null.c b/video/null_v.c
index bbd839cc0..47dcb3c61 100644
--- a/video/null.c
+++ b/video/null_v.c
@@ -2,7 +2,7 @@
 #include "openttd.h"
 #include "gfx.h"
 #include "variables.h"
-#include "video/null.h"
+#include "video/null_v.h"
 #include "window.h"
 
 static void* _null_video_mem = NULL;
diff --git a/video/null.h b/video/null_v.h
index d5d379158..d5d379158 100644
--- a/video/null.h
+++ b/video/null_v.h
diff --git a/video/sdl.c b/video/sdl_v.c
index 5dc3a8cd4..549acd3fb 100644
--- a/video/sdl.c
+++ b/video/sdl_v.c
@@ -6,7 +6,7 @@
 #include "macros.h"
 #include "sdl.h"
 #include "window.h"
-#include "video/sdl.h"
+#include "video/sdl_v.h"
 #include <SDL.h>
 #include "network.h"
 #include "variables.h"
diff --git a/video/sdl.h b/video/sdl_v.h
index d2e9dae7b..d2e9dae7b 100644
--- a/video/sdl.h
+++ b/video/sdl_v.h
diff --git a/video/win32.c b/video/win32_v.c
index d7d21b80b..eb9e37a50 100644
--- a/video/win32.c
+++ b/video/win32_v.c
@@ -6,7 +6,7 @@
 #include "network.h"
 #include "variables.h"
 #include "window.h"
-#include "video/win32.h"
+#include "video/win32_v.h"
 #include <windows.h>
 
 static struct {
diff --git a/video/win32.h b/video/win32_v.h
index 235040c44..235040c44 100644
--- a/video/win32.h
+++ b/video/win32_v.h
diff --git a/win32.c b/win32.c
index 3ad0686c7..094e544ff 100644
--- a/win32.c
+++ b/win32.c
@@ -18,14 +18,14 @@
 #include "driver.h"
 
 #include "music/dmusic.h"
-#include "music/null.h"
-#include "music/win32.h"
+#include "music/null_m.h"
+#include "music/win32_m.h"
 
-#include "sound/null.h"
-#include "sound/win32.h"
+#include "sound/null_s.h"
+#include "sound/win32_s.h"
 
-#include "video/null.h"
-#include "video/win32.h"
+#include "video/null_v.h"
+#include "video/win32_v.h"
 
 static bool _has_console;