diff --git a/Makefile b/Makefile
index aed7decca2..9781802c63 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ ifeq ($(HAVE_PULSE), 1)
 endif
 
 ifeq ($(HAVE_SDL), 1)
-   OBJ += gfx/sdl.o gfx/gl.o input/sdl.o audio/sdl.o audio/buffer.o
+   OBJ += gfx/sdl.o gfx/gl.o input/sdl.o audio/sdl.o fifo_buffer.o
    DEFINES += $(SDL_CFLAGS)
    LIBS += $(SDL_LIBS)
 ifeq ($(OSX),1)
diff --git a/Makefile.win32 b/Makefile.win32
index b2ed690fe3..247139aeaf 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -37,7 +37,7 @@ else
 endif
 
 ifeq ($(HAVE_SDL), 1)
-   OBJ += gfx/sdl.o gfx/gl.o input/sdl.o audio/sdl.o audio/buffer.o
+   OBJ += gfx/sdl.o gfx/gl.o input/sdl.o audio/sdl.o fifo_buffer.o
    LIBS += $(SDL_LIBS) -lopengl32
    DEFINES += $(SDL_CFLAGS) -DHAVE_SDL
 endif
diff --git a/Makefile.win64 b/Makefile.win64
index 5d9d08f3d9..4767213977 100644
--- a/Makefile.win64
+++ b/Makefile.win64
@@ -36,7 +36,7 @@ else
 endif
 
 ifeq ($(HAVE_SDL), 1)
-   OBJ += gfx/sdl.o gfx/gl.o input/sdl.o audio/sdl.o audio/buffer.o
+   OBJ += gfx/sdl.o gfx/gl.o input/sdl.o audio/sdl.o fifo_buffer.o
    LIBS += $(SDL_LIBS) -lopengl32 
    DEFINES += $(SDL_CFLAGS) -DHAVE_SDL
 endif
diff --git a/audio/rsound.c b/audio/rsound.c
index b42115a30a..6de9249e41 100644
--- a/audio/rsound.c
+++ b/audio/rsound.c
@@ -19,7 +19,7 @@
 #include "driver.h"
 #include <stdlib.h>
 #include <rsound.h>
-#include "buffer.h"
+#include "fifo_buffer.h"
 #include <stdbool.h>
 #include "SDL.h"
 
diff --git a/audio/sdl.c b/audio/sdl.c
index 3615a280be..b1d9ffa5d1 100644
--- a/audio/sdl.c
+++ b/audio/sdl.c
@@ -27,7 +27,7 @@
 #include "SDL_audio.h"
 #include "SDL_thread.h"
 #include "general.h"
-#include "buffer.h"
+#include "fifo_buffer.h"
 
 typedef struct sdl_audio
 {
diff --git a/audio/buffer.c b/fifo_buffer.c
similarity index 99%
rename from audio/buffer.c
rename to fifo_buffer.c
index 9f1eb04bc7..714e551834 100644
--- a/audio/buffer.c
+++ b/fifo_buffer.c
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "buffer.h"
+#include "fifo_buffer.h"
 
 struct fifo_buffer
 {
diff --git a/audio/buffer.h b/fifo_buffer.h
similarity index 100%
rename from audio/buffer.h
rename to fifo_buffer.h