diff --git a/Makefile.common b/Makefile.common
index a335a7c4c2..6ad3691cdc 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1967,7 +1967,7 @@ ifeq ($(HAVE_FFMPEG), 1)
    OBJ += record/drivers/record_ffmpeg.o \
           cores/libretro-ffmpeg/ffmpeg_core.o \
           cores/libretro-ffmpeg/swsbuffer.o \
-          cores/libretro-ffmpeg/tpool.o
+			 $(LIBRETRO_COMM_DIR)/rthreads/tpool.o
 
    LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS)
    DEFINES += -DHAVE_FFMPEG
diff --git a/cores/libretro-ffmpeg/Makefile.common b/cores/libretro-ffmpeg/Makefile.common
index 87e2e5ef08..75ee087a64 100644
--- a/cores/libretro-ffmpeg/Makefile.common
+++ b/cores/libretro-ffmpeg/Makefile.common
@@ -20,7 +20,7 @@ INCFLAGS           += -I$(BASE_DIR) -I$(CORE_DIR) -I$(LIBRETRO_COMM_DIR)/include
 
 LIBRETRO_SOURCE    += $(CORE_DIR)/ffmpeg_core.c \
 							 $(CORE_DIR)/swsbuffer.c \
-							 $(CORE_DIR)/tpool.c \
+							 $(LIBRETRO_COMM_DIR)/rthreads/tpool.c \
 							 $(LIBRETRO_COMM_DIR)/queues/fifo_queue.c \
 							 $(LIBRETRO_COMM_DIR)/rthreads/rthreads.c
 
diff --git a/cores/libretro-ffmpeg/ffmpeg_core.c b/cores/libretro-ffmpeg/ffmpeg_core.c
index 0627c623e8..07b17cd309 100644
--- a/cores/libretro-ffmpeg/ffmpeg_core.c
+++ b/cores/libretro-ffmpeg/ffmpeg_core.c
@@ -47,10 +47,10 @@ extern "C" {
 #include <features/features_cpu.h>
 #include <retro_miscellaneous.h>
 #include <rthreads/rthreads.h>
+#include <rthreads/tpool.h>
 #include <queues/fifo_queue.h>
 #include <string/stdstring.h>
 #include "swsbuffer.h"
-#include "tpool.h"
 
 #include <libretro.h>
 #ifdef RARCH_INTERNAL
diff --git a/cores/libretro-ffmpeg/tpool.h b/libretro-common/include/rthreads/tpool.h
similarity index 91%
rename from cores/libretro-ffmpeg/tpool.h
rename to libretro-common/include/rthreads/tpool.h
index 3fd4505b7d..fdf5b4d545 100644
--- a/cores/libretro-ffmpeg/tpool.h
+++ b/libretro-common/include/rthreads/tpool.h
@@ -1,7 +1,10 @@
-/* The MIT License
- * 
+/*
  * Copyright (c) 2010-2019 The RetroArch team
  * Copyright (c) 2017 John Schember <john@nachtimwald.com>
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (tpool.h).
+ * ---------------------------------------------------------------------------------------
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/cores/libretro-ffmpeg/tpool.c b/libretro-common/rthreads/tpool.c
similarity index 95%
rename from cores/libretro-ffmpeg/tpool.c
rename to libretro-common/rthreads/tpool.c
index eb3fb573d0..db3529222f 100644
--- a/cores/libretro-ffmpeg/tpool.c
+++ b/libretro-common/rthreads/tpool.c
@@ -1,7 +1,10 @@
-/* The MIT License
- * 
+/*
  * Copyright (c) 2010-2019 The RetroArch team
  * Copyright (c) 2017 John Schember <john@nachtimwald.com>
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (tpool.c).
+ * ---------------------------------------------------------------------------------------
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,9 +26,10 @@
  */
 
 #include <stdlib.h>
-#include <rthreads/rthreads.h>
+#include <boolean.h>
 
-#include "tpool.h"
+#include <rthreads/rthreads.h>
+#include <rthreads/tpool.h>
 
 /* Work object which will sit in a queue
  * waiting for the pool to process it.