diff --git a/Makefile.common b/Makefile.common
index 62a4f904c7..12687b3807 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1208,7 +1208,7 @@ ifeq ($(HAVE_NETWORKING), 1)
    ifeq ($(HAVE_CHEEVOS), 1)
       ifeq ($(HAVE_THREADS), 1)
          DEFINES += -DHAVE_CHEEVOS
-         OBJ += cheevos/cheevos.o \
+         OBJ += tasks/task_cheevos.o \
 					 $(LIBRETRO_COMM_DIR)/utils/md5.o
       endif
    endif
diff --git a/command.c b/command.c
index bd59964c46..715dc53d62 100644
--- a/command.c
+++ b/command.c
@@ -43,7 +43,7 @@
 #endif
 
 #ifdef HAVE_CHEEVOS
-#include "cheevos/cheevos.h"
+#include "tasks/task_cheevos.h"
 #endif
 
 #ifdef HAVE_MENU
diff --git a/dynamic.c b/dynamic.c
index 9d09cde824..915498a84a 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -33,7 +33,7 @@
 #endif
 
 #ifdef HAVE_CHEEVOS
-#include "cheevos/cheevos.h"
+#include "tasks/task_cheevos.h"
 #endif
 
 #ifdef HAVE_NETWORKING
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 5be8e8af3a..cd66acbc9c 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -134,7 +134,7 @@ ACHIEVEMENTS
 
 #include "../libretro-common/formats/json/jsonsax.c"
 #include "../network/net_http_special.c"
-#include "../cheevos/cheevos.c"
+#include "../tasks/task_cheevos.c"
 #endif
 
 /*============================================================
diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index 10d4974d51..4932f193e9 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef HAVE_CHEEVOS
-#include "../cheevos/cheevos.h"
+#include "../tasks/task_cheevos.h"
 #endif
 
 #include "cheat_manager.h"
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index e17d79d962..db59a290eb 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -19,7 +19,7 @@
 #include "../menu_cbs.h"
 
 #ifdef HAVE_CHEEVOS
-#include "../../cheevos/cheevos.h"
+#include "../../tasks/task_cheevos.h"
 #endif
 #include "../../verbosity.h"
 
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 4d227ffadf..f402b542ef 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -37,7 +37,7 @@
 #endif
 
 #ifdef HAVE_CHEEVOS
-#include "../cheevos/cheevos.h"
+#include "../tasks/task_cheevos.h"
 #endif
 
 #ifdef HAVE_NETWORKING
diff --git a/menu/widgets/menu_dialog.c b/menu/widgets/menu_dialog.c
index 4ebeb1bbc2..09ffa520c4 100644
--- a/menu/widgets/menu_dialog.c
+++ b/menu/widgets/menu_dialog.c
@@ -22,7 +22,7 @@
 #endif
 
 #ifdef HAVE_CHEEVOS
-#include "../../cheevos/cheevos.h"
+#include "../../tasks/task_cheevos.h"
 #endif
 
 #include "menu_dialog.h"
diff --git a/network/httpserver/httpserver.c b/network/httpserver/httpserver.c
index 77b7c79a16..c46ba87f2f 100644
--- a/network/httpserver/httpserver.c
+++ b/network/httpserver/httpserver.c
@@ -29,7 +29,7 @@
 #include "../../core.h"
 #include "../../gfx/video_driver.h"
 #include "../../managers/core_option_manager.h"
-#include "../../cheevos/cheevos.h"
+#include "../../tasks/task_cheevos.h"
 #include "../../content.h"
 
 #define BASIC_INFO "info"
diff --git a/runloop.c b/runloop.c
index 08126a2b17..44c585aede 100644
--- a/runloop.c
+++ b/runloop.c
@@ -37,7 +37,7 @@
 #endif
 
 #ifdef HAVE_CHEEVOS
-#include "cheevos/cheevos.h"
+#include "tasks/task_cheevos.h"
 #endif
 
 #ifdef HAVE_MENU
diff --git a/cheevos/cheevos.c b/tasks/task_cheevos.c
similarity index 99%
rename from cheevos/cheevos.c
rename to tasks/task_cheevos.c
index 1fcf0ca293..b0823f96d8 100644
--- a/cheevos/cheevos.c
+++ b/tasks/task_cheevos.c
@@ -13,6 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/* TODO/FIXME - turn these into actual tasks */
+
 #include <string.h>
 #include <ctype.h>
 
@@ -31,7 +33,7 @@
 #include "../menu/menu_entries.h"
 #endif
 
-#include "cheevos.h"
+#include "task_cheevos.h"
 
 #include "../command.h"
 #include "../dynamic.h"
diff --git a/cheevos/cheevos.h b/tasks/task_cheevos.h
similarity index 100%
rename from cheevos/cheevos.h
rename to tasks/task_cheevos.h
diff --git a/tasks/task_content.c b/tasks/task_content.c
index ab05a950d5..06ce0d6c31 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -66,7 +66,7 @@
 #endif
 
 #ifdef HAVE_CHEEVOS
-#include "../cheevos/cheevos.h"
+#include "task_cheevos.h"
 #endif
 
 #include "tasks_internal.h"