diff --git a/Makefile.common b/Makefile.common
index edac155950..9e9d147471 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -282,7 +282,7 @@ ifeq ($(HAVE_FREETYPE), 1)
 endif
 
 ifeq ($(HAVE_THREADS), 1)
-   OBJ += autosave.o thread.o gfx/video_thread_wrapper.o audio/thread_wrapper.o
+   OBJ += autosave.o thread.o gfx/video_thread_wrapper.o audio/audio_thread_wrapper.o
    DEFINES += -DHAVE_THREADS
    ifeq ($(findstring Haiku,$(OS)),)
       LIBS += -lpthread
diff --git a/audio/thread_wrapper.c b/audio/audio_thread_wrapper.c
similarity index 99%
rename from audio/thread_wrapper.c
rename to audio/audio_thread_wrapper.c
index c210daeabf..5f49f5a850 100644
--- a/audio/thread_wrapper.c
+++ b/audio/audio_thread_wrapper.c
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "thread_wrapper.h"
+#include "audio_thread_wrapper.h"
 #include "../thread.h"
 #include "../general.h"
 #include "../performance.h"
diff --git a/audio/thread_wrapper.h b/audio/audio_thread_wrapper.h
similarity index 100%
rename from audio/thread_wrapper.h
rename to audio/audio_thread_wrapper.h
diff --git a/driver.c b/driver.c
index c51413aed8..0199d824db 100644
--- a/driver.c
+++ b/driver.c
@@ -24,8 +24,8 @@
 #include <math.h>
 #include "compat/posix_string.h"
 #include "audio/utils.h"
-#include "gfx/thread_wrapper.h"
-#include "audio/thread_wrapper.h"
+#include "gfx/video_thread_wrapper.h"
+#include "audio/audio_thread_wrapper.h"
 #include "gfx/gfx_common.h"
 
 #ifdef HAVE_X11
diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c
index bdfe296f38..7feb27a693 100644
--- a/gfx/video_thread_wrapper.c
+++ b/gfx/video_thread_wrapper.c
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "thread_wrapper.h"
+#include "video_thread_wrapper.h"
 #include "../thread.h"
 #include "../general.h"
 #include "../performance.h"
diff --git a/gfx/thread_wrapper.h b/gfx/video_thread_wrapper.h
similarity index 100%
rename from gfx/thread_wrapper.h
rename to gfx/video_thread_wrapper.h
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 4acddb9bf7..17a71d092f 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -598,7 +598,7 @@ THREAD
 #elif defined(HAVE_THREADS)
 #include "../thread.c"
 #include "../gfx/video_thread_wrapper.c"
-#include "../audio/thread_wrapper.c"
+#include "../audio/audio_thread_wrapper.c"
 #include "../autosave.c"
 #endif