diff --git a/Makefile.common b/Makefile.common
index 52da673179..dd422e8451 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -868,7 +868,7 @@ ifeq ($(HAVE_NETWORKING), 1)
    ifeq ($(HAVE_CHEEVOS), 1)
       ifeq ($(HAVE_THREADS), 1)
          DEFINES += -DHAVE_CHEEVOS
-         OBJ += cheevos.o semaphore.o async_job.o libretro-common/utils/md5.o
+         OBJ += cheevos.o ra_semaphore.o async_job.o libretro-common/utils/md5.o
       endif
    endif
 endif
diff --git a/async_job.c b/async_job.c
index cee815b46f..2c4008823d 100644
--- a/async_job.c
+++ b/async_job.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 
 #include <rthreads/rthreads.h>
-#include <semaphore.h>
+#include <ra_semaphore.h>
 #include <async_job.h>
 
 typedef struct async_job_node async_job_node_t;
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 0014f5d159..0bdb420c7f 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -90,7 +90,7 @@ ACHIEVEMENTS
 #include "../libretro-common/formats/json/jsonsax.c"
 #include "../libretro-common/utils/md5.c"
 #include "../net_http_special.c"
-#include "../semaphore.c"
+#include "../ra_semaphore.c"
 #include "../async_job.c"
 #include "../cheevos.c"
 #endif
diff --git a/semaphore.c b/ra_semaphore.c
similarity index 98%
rename from semaphore.c
rename to ra_semaphore.c
index 6f74e5dfb3..5655c7122c 100644
--- a/semaphore.c
+++ b/ra_semaphore.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 
 #include <rthreads/rthreads.h>
-#include <semaphore.h>
+#include <ra_semaphore.h>
 
 struct ssem
 {
diff --git a/semaphore.h b/ra_semaphore.h
similarity index 100%
rename from semaphore.h
rename to ra_semaphore.h