diff --git a/Makefile.common b/Makefile.common
index 981d5134d9..89f07121c3 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1914,7 +1914,8 @@ ifeq ($(HAVE_NETWORKING), 1)
    ifeq ($(HAVE_DISCORD), 1)
       NEED_CXX_LINKER = 1
       DEFINES += -DHAVE_DISCORD
-      INCLUDE_DIRS += -Ideps/discord-rpc/include/ -Ideps/discord-rpc/thirdparty/rapidjson-1.1.0/include/
+      INCLUDE_DIRS += -Ideps/discord-rpc/include \
+							 -Ideps/discord-rpc/thirdparty/rapidjson-1.1.0/include/
 
       ifneq ($(HAVE_THREADS), 1)
          DEFINES += -DDISCORD_DISABLE_IO_THREAD
@@ -1923,7 +1924,7 @@ ifeq ($(HAVE_NETWORKING), 1)
       OBJ     += deps/discord-rpc/src/discord_rpc.o \
                  deps/discord-rpc/src/rpc_connection.o \
                  deps/discord-rpc/src/serialization.o \
-                 discord/discord.o
+                 network/discord.o
 
       ifneq ($(findstring Win32,$(OS)),)
          OBJ  += deps/discord-rpc/src/discord_register_win.o \
diff --git a/cheevos-new/cheevos.c b/cheevos-new/cheevos.c
index 0b5d7d836f..7c5f0c9982 100644
--- a/cheevos-new/cheevos.c
+++ b/cheevos-new/cheevos.c
@@ -47,7 +47,7 @@
 #endif
 
 #ifdef HAVE_DISCORD
-#include "../discord/discord.h"
+#include "../network/discord.h"
 #endif
 
 #include "badges.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 2464aa23ad..b7e28112a1 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1495,7 +1495,7 @@ XML
 HTTP SERVER
 ============================================================ */
 #if defined(HAVE_DISCORD)
-#include "../discord/discord.c"
+#include "../network/discord.c"
 
 #if defined(_WIN32)
 #include "../deps/discord-rpc/src/discord_register_win.c"
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 180ceeace8..8ddc5b1713 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -32,7 +32,7 @@
 #endif
 
 #ifdef HAVE_DISCORD
-#include "../../discord/discord.h"
+#include "../../network/discord.h"
 #endif
 
 #include "../../config.def.h"
diff --git a/discord/discord.c b/network/discord.c
similarity index 98%
rename from discord/discord.c
rename to network/discord.c
index 45e387370a..66a839f7ef 100644
--- a/discord/discord.c
+++ b/network/discord.c
@@ -38,9 +38,9 @@
 #include "../tasks/task_file_transfer.h"
 
 #ifdef HAVE_NETWORKING
-#include "../../network/netplay/netplay.h"
-#include "../../network/netplay/netplay_discovery.h"
-#include "../../tasks/tasks_internal.h"
+#include "netplay/netplay.h"
+#include "netplay/netplay_discovery.h"
+#include "../tasks/tasks_internal.h"
 #endif
 
 #ifdef HAVE_CHEEVOS
@@ -48,10 +48,10 @@
 #endif
 
 #ifdef HAVE_MENU
-#include "../../menu/menu_cbs.h"
+#include "../menu/menu_cbs.h"
 #endif
 
-#include "../network/net_http_special.h"
+#include "net_http_special.h"
 #include "../tasks/tasks_internal.h"
 #include "../file_path_special.h"
 
diff --git a/discord/discord.h b/network/discord.h
similarity index 100%
rename from discord/discord.h
rename to network/discord.h
diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c
index 9ece3fb050..a9aa3d6537 100644
--- a/network/netplay/netplay_frontend.c
+++ b/network/netplay/netplay_frontend.c
@@ -27,7 +27,7 @@
 #include <net/net_http.h>
 
 #ifdef HAVE_DISCORD
-#include <discord/discord.h>
+#include "../discord.h"
 #endif
 
 #include <file/file_path.h>
diff --git a/network/netplay/netplay_io.c b/network/netplay/netplay_io.c
index 526d5cd4e6..cfa847c1bc 100644
--- a/network/netplay/netplay_io.c
+++ b/network/netplay/netplay_io.c
@@ -29,10 +29,12 @@
 #include "../../command.h"
 #include "../../tasks/tasks_internal.h"
 
-#include "../../discord/discord.h"
+#ifdef HAVE_DISCORD
+#include "../discord.h"
 
 /* TODO/FIXME - global */
 extern bool discord_is_inited;
+#endif
 
 static void handle_play_spectate(netplay_t *netplay, uint32_t client_num,
       struct netplay_connection *connection, uint32_t cmd, uint32_t cmd_size,
diff --git a/retroarch.c b/retroarch.c
index 1e23d0137f..c2fc88a21e 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -167,7 +167,7 @@
 #endif
 
 #ifdef HAVE_DISCORD
-#include "discord/discord.h"
+#include "network/discord.h"
 #endif
 
 #ifdef HAVE_NETWORKING
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 077de9aa74..13ef8d75fc 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -108,8 +108,9 @@
 #include "../paths.h"
 #include "../verbosity.h"
 
-#include "../discord/discord.h"
+#include "../network/discord.h"
 
+/* TODO/FIXME - get rid of this public global */
 extern bool discord_is_inited;
 
 #define MAX_ARGS 32