diff --git a/Makefile.common b/Makefile.common
index 24670ea9b2..063b5e50fc 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -654,8 +654,8 @@ endif
 
 ifeq ($(HAVE_NETWORKING), 1)
    DEFINES += -DHAVE_NETWORKING
-   OBJ += net_compat.o \
-			 net_http.o
+   OBJ += libretro-common/net/net_compat.o \
+			 libretro-common/net/net_http.o
 
    ifneq ($(findstring Win32,$(OS)),)
       LIBS += -lws2_32
diff --git a/command.c b/command.c
index b7a1045e76..887fdc7e5f 100644
--- a/command.c
+++ b/command.c
@@ -16,7 +16,7 @@
 
 #include "command.h"
 
-#include "net_compat.h"
+#include <net/net_compat.h>
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
 #include "netplay.h"
 #endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 5ddf002efa..eff67fbfc9 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -655,8 +655,8 @@ NETPLAY
 ============================================================ */
 #ifdef HAVE_NETPLAY
 #include "../netplay.c"
-#include "../net_compat.c"
-#include "../net_http.c"
+#include "../libretro-common/net/net_compat.c"
+#include "../libretro-common/net/net_http.c"
 #endif
 
 /*============================================================
diff --git a/net_compat.h b/libretro-common/include/net/net_compat.h
similarity index 100%
rename from net_compat.h
rename to libretro-common/include/net/net_compat.h
diff --git a/net_http.h b/libretro-common/include/net/net_http.h
similarity index 100%
rename from net_http.h
rename to libretro-common/include/net/net_http.h
diff --git a/net_compat.c b/libretro-common/net/net_compat.c
similarity index 99%
rename from net_compat.c
rename to libretro-common/net/net_compat.c
index 3993a2686b..422d159032 100644
--- a/net_compat.c
+++ b/libretro-common/net/net_compat.c
@@ -14,9 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "net_compat.h"
+#include <net/net_compat.h>
 #include "netplay.h"
-#include "general.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/net_http.c b/libretro-common/net/net_http.c
similarity index 99%
rename from net_http.c
rename to libretro-common/net/net_http.c
index 773d2c9d24..88bd118da9 100644
--- a/net_http.c
+++ b/libretro-common/net/net_http.c
@@ -14,11 +14,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "net_http.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "net_compat.h"
+#include <net/net_http.h>
+#include <net/net_compat.h>
 #include <compat/strl.h>
 
 enum
diff --git a/net_http_test.c b/libretro-common/net/net_http_test.c
similarity index 100%
rename from net_http_test.c
rename to libretro-common/net/net_http_test.c
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 5c8661acd2..a5687d2d30 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -27,10 +27,6 @@
 #include "../retroarch.h"
 #include "../runloop.h"
 
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
 void menu_entries_common_load_content(bool persist)
 {
    menu_handle_t *menu = menu_driver_resolve();
diff --git a/menu/menu_entries_cbs_deferred_push.c b/menu/menu_entries_cbs_deferred_push.c
index 85d5450c20..d1492860f5 100644
--- a/menu/menu_entries_cbs_deferred_push.c
+++ b/menu/menu_entries_cbs_deferred_push.c
@@ -23,10 +23,6 @@
 #include "../retroarch.h"
 #include "../performance.h"
 
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
 #ifdef HAVE_LIBRETRODB
 #include "../database_info.h"
 #endif
diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c
index 540a5742aa..979501d415 100644
--- a/menu/menu_entries_cbs_ok.c
+++ b/menu/menu_entries_cbs_ok.c
@@ -24,10 +24,6 @@
 #include "../retroarch.h"
 #include "../runloop.h"
 
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
 #include "../input/input_remapping.h"
 
 /* FIXME - Global variables, refactor */
diff --git a/netplay.c b/netplay.c
index 1f0fb2ad04..40a4900371 100644
--- a/netplay.c
+++ b/netplay.c
@@ -18,15 +18,15 @@
 #pragma comment(lib, "ws2_32")
 #endif
 
-#include "net_compat.h"
+#include <stdlib.h>
+#include <string.h>
+#include <net/net_compat.h>
+#include <queues/message_queue.h>
 #include "netplay.h"
 #include "general.h"
 #include "runloop.h"
 #include "autosave.h"
 #include "dynamic.h"
-#include <queues/message_queue.h>
-#include <stdlib.h>
-#include <string.h>
 
 struct delta_frame
 {
diff --git a/retroarch.c b/retroarch.c
index c0ee3d700a..9e635f6403 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -53,8 +53,7 @@
 #endif
 
 #ifdef HAVE_NETWORKING
-#include "net_compat.h"
-#include "net_http.h"
+#include <net/net_compat.h>
 #endif
 
 #ifdef HAVE_NETPLAY
diff --git a/runloop_data.c b/runloop_data.c
index 163b53270c..70d42d6da2 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -25,7 +25,7 @@
 typedef int (*transfer_cb_t               )(void *data, size_t len);
 
 #ifdef HAVE_NETWORKING
-#include "net_http.h"
+#include <net/net_http.h>
 
 typedef struct http_handle
 {