diff --git a/Makefile.common b/Makefile.common
index 58d1114b6a..f716af96fa 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -122,7 +122,7 @@ OBJ += frontend/frontend.o \
        intl/msg_hash_pt.o \
        intl/msg_hash_us.o \
        runloop.o \
-       libretro-common/rthreads/task_queue.o \
+       libretro-common/queues/task_queue.o \
        tasks/tasks_internal.o \
        tasks/task_content.o \
        tasks/task_file_transfer.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 11259aec17..592286bc44 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -700,7 +700,7 @@ RETROARCH
 #include "../libretro_version_1.c"
 #include "../retroarch.c"
 #include "../runloop.c"
-#include "../libretro-common/rthreads/task_queue.c"
+#include "../libretro-common/queues/task_queue.c"
 #include "../tasks/tasks_internal.c"
 
 #include "../msg_hash.c"
diff --git a/libretro-common/include/rthreads/task_queue.h b/libretro-common/include/queues/task_queue.h
similarity index 100%
rename from libretro-common/include/rthreads/task_queue.h
rename to libretro-common/include/queues/task_queue.h
diff --git a/libretro-common/rthreads/task_queue.c b/libretro-common/queues/task_queue.c
similarity index 99%
rename from libretro-common/rthreads/task_queue.c
rename to libretro-common/queues/task_queue.c
index 2669ee6897..3c8c1f112e 100644
--- a/libretro-common/rthreads/task_queue.c
+++ b/libretro-common/queues/task_queue.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
-#include <rthreads/task_queue.h>
+#include <queues/task_queue.h>
 
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
diff --git a/runloop.c b/runloop.c
index 9d50f1ee61..6816b164a2 100644
--- a/runloop.c
+++ b/runloop.c
@@ -27,7 +27,7 @@
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
 #endif
-#include <rthreads/task_queue.h>
+#include <queues/task_queue.h>
 #include <string/stdstring.h>
 
 #include <compat/strl.h>
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index 514969cc21..8414bebab2 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -19,7 +19,7 @@
 #include <stdint.h>
 #include <boolean.h>
 
-#include <rthreads/task_queue.h>
+#include <queues/task_queue.h>
 
 #include "../runloop.h"