diff --git a/Makefile.common b/Makefile.common
index 3c4e25dcc0..e59e968a48 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -774,6 +774,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/menu_event.o \
           menu/menu_entries.o \
           menu/menu_setting.o \
+          menu/menu_networking.o \
           menu/menu_shader.o \
 			 menu/widgets/menu_filebrowser.o \
 			 menu/widgets/menu_dialog.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 720965d34d..1f88192ae3 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1046,6 +1046,7 @@ MENU
 #include "../menu/menu_setting.c"
 #include "../menu/menu_cbs.c"
 #include "../menu/menu_content.c"
+#include "../menu/menu_networking.c"
 #include "../menu/widgets/menu_entry.c"
 #include "../menu/widgets/menu_filebrowser.c"
 #include "../menu/widgets/menu_dialog.c"
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index dba4ee47d9..bca45f8de2 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -33,6 +33,7 @@
 #include "../widgets/menu_dialog.h"
 #include "../widgets/menu_filebrowser.h"
 #include "../widgets/menu_input_dialog.h"
+#include "../menu_networking.h"
 #include "../menu_content.h"
 #include "../menu_shader.h"
 
@@ -114,11 +115,6 @@ static char *lakka_get_project(void)
    return lakka_project;
 }
 #endif
-
-void cb_net_generic_subdir(void *task_data, void *user_data, const char *err);
-
-/* defined in menu_cbs_deferred_push */
-void cb_net_generic(void *task_data, void *user_data, const char *err);
 #endif
 
 int generic_action_ok_displaylist_push(const char *path,
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 5cc6008096..a73aee774e 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -25,6 +25,10 @@
 #include "../config.h"
 #endif
 
+#include "menu_entries.h"
+
+#include "../msg_hash.h"
+
 RETRO_BEGIN_DECLS
 
 typedef struct key_desc
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index d3167f036a..9258bb79a8 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -53,6 +53,7 @@
 #include "menu_content.h"
 #include "menu_driver.h"
 #include "menu_shader.h"
+#include "menu_networking.h"
 #include "widgets/menu_dialog.h"
 #include "widgets/menu_list.h"
 #include "widgets/menu_filebrowser.h"
@@ -89,114 +90,6 @@ static enum msg_hash_enums new_type     = MSG_UNKNOWN;
 /* HACK - we have to find some way to pass state inbetween
  * function pointer callback functions that don't necessarily
  * call each other. */
-static char *core_buf                   = NULL;
-static size_t core_len                  = 0;
-
-void cb_net_generic_subdir(void *task_data, void *user_data, const char *err)
-{
-   char subdir_path[PATH_MAX_LENGTH];
-   http_transfer_data_t *data        = (http_transfer_data_t*)task_data;
-   menu_file_transfer_t *state       = (menu_file_transfer_t*)user_data;
-
-   subdir_path[0] = '\0';
-
-   if (!data || err)
-      goto finish;
-
-   if (!string_is_empty(data->data))
-      memcpy(subdir_path, data->data, data->len * sizeof(char));
-   subdir_path[data->len] = '\0';
-
-finish:
-   if (!err && !strstr(subdir_path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
-   {
-      char parent_dir[PATH_MAX_LENGTH];
-
-      parent_dir[0] = '\0';
-
-      fill_pathname_parent_dir(parent_dir,
-            state->path, sizeof(parent_dir));
-
-      /*generic_action_ok_displaylist_push(parent_dir, NULL,
-            subdir_path, 0, 0, 0, ACTION_OK_DL_CORE_CONTENT_DIRS_SUBDIR_LIST);*/
-   }
-
-   if (data)
-   {
-      if (data->data)
-         free(data->data);
-      free(data);
-   }
-
-   if (user_data)
-      free(user_data);
-}
-
-void cb_net_generic(void *task_data, void *user_data, const char *err)
-{
-   bool refresh                = false;
-   http_transfer_data_t *data  = (http_transfer_data_t*)task_data;
-   menu_file_transfer_t *state = (menu_file_transfer_t*)user_data;
-
-   if (core_buf)
-      free(core_buf);
-
-
-   core_buf = NULL;
-   core_len = 0;
-
-   if (!data || err)
-      goto finish;
-
-   core_buf = (char*)malloc((data->len+1) * sizeof(char));
-
-   if (!core_buf)
-      goto finish;
-
-   if (!string_is_empty(data->data))
-      memcpy(core_buf, data->data, data->len * sizeof(char));
-   core_buf[data->len] = '\0';
-   core_len      = data->len;
-
-finish:
-   refresh = true;
-   menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh);
-
-   if (data)
-   {
-      if (data->data)
-         free(data->data);
-      free(data);
-   }
-
-   if (!err && !strstr(state->path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
-   {
-      char *parent_dir                 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-      menu_file_transfer_t *transf     = NULL;
-
-      parent_dir[0] = '\0';
-
-      fill_pathname_parent_dir(parent_dir,
-            state->path, PATH_MAX_LENGTH * sizeof(char));
-      strlcat(parent_dir,
-            file_path_str(FILE_PATH_INDEX_DIRS_URL),
-            PATH_MAX_LENGTH * sizeof(char));
-
-      transf           = (menu_file_transfer_t*)malloc(sizeof(*transf));
-
-      transf->enum_idx = MSG_UNKNOWN;
-      strlcpy(transf->path, parent_dir, sizeof(transf->path));
-
-      task_push_http_transfer(parent_dir, true,
-            "index_dirs", cb_net_generic_subdir, transf);
-
-      free(parent_dir);
-   }
-
-   if (state)
-      free(state);
-}
-
 static void print_buf_lines(file_list_t *list, char *buf,
       const char *label, int buf_size,
       enum msg_file_type type, bool append, bool extended)
diff --git a/menu/menu_networking.c b/menu/menu_networking.c
new file mode 100644
index 0000000000..cc8c3f48b2
--- /dev/null
+++ b/menu/menu_networking.c
@@ -0,0 +1,148 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *  Copyright (C) 2015-2017 - Andrés Suárez
+ *  Copyright (C) 2016-2017 - Brad Parker
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+
+#include <retro_miscellaneous.h>
+#include <lists/file_list.h>
+#include <file/file_path.h>
+#include <compat/strl.h>
+#include <string/stdstring.h>
+
+#ifdef HAVE_NETWORKING
+#include <net/net_http_parse.h>
+#endif
+
+#include "menu_cbs.h"
+#include "menu_entries.h"
+#include "widgets/menu_list.h"
+
+#include "../file_path_special.h"
+#include "../msg_hash.h"
+#include "../tasks/tasks_internal.h"
+
+char *core_buf                   = NULL;
+size_t core_len                  = 0;
+
+void cb_net_generic_subdir(void *task_data, void *user_data, const char *err)
+{
+#ifdef HAVE_NETWORKING
+   char subdir_path[PATH_MAX_LENGTH];
+   http_transfer_data_t *data        = (http_transfer_data_t*)task_data;
+   menu_file_transfer_t *state       = (menu_file_transfer_t*)user_data;
+
+   subdir_path[0] = '\0';
+
+   if (!data || err)
+      goto finish;
+
+   if (!string_is_empty(data->data))
+      memcpy(subdir_path, data->data, data->len * sizeof(char));
+   subdir_path[data->len] = '\0';
+
+finish:
+   if (!err && !strstr(subdir_path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
+   {
+      char parent_dir[PATH_MAX_LENGTH];
+
+      parent_dir[0] = '\0';
+
+      fill_pathname_parent_dir(parent_dir,
+            state->path, sizeof(parent_dir));
+
+      /*generic_action_ok_displaylist_push(parent_dir, NULL,
+            subdir_path, 0, 0, 0, ACTION_OK_DL_CORE_CONTENT_DIRS_SUBDIR_LIST);*/
+   }
+
+   if (data)
+   {
+      if (data->data)
+         free(data->data);
+      free(data);
+   }
+
+   if (user_data)
+      free(user_data);
+#endif
+}
+
+void cb_net_generic(void *task_data, void *user_data, const char *err)
+{
+#ifdef HAVE_NETWORKING
+   bool refresh                = false;
+   http_transfer_data_t *data  = (http_transfer_data_t*)task_data;
+   menu_file_transfer_t *state = (menu_file_transfer_t*)user_data;
+
+   if (core_buf)
+      free(core_buf);
+
+   core_buf = NULL;
+   core_len = 0;
+
+   if (!data || err)
+      goto finish;
+
+   core_buf = (char*)malloc((data->len+1) * sizeof(char));
+
+   if (!core_buf)
+      goto finish;
+
+   if (!string_is_empty(data->data))
+      memcpy(core_buf, data->data, data->len * sizeof(char));
+   core_buf[data->len] = '\0';
+   core_len      = data->len;
+
+finish:
+   refresh = true;
+   menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh);
+
+   if (data)
+   {
+      if (data->data)
+         free(data->data);
+      free(data);
+   }
+
+   if (!err && !strstr(state->path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
+   {
+      char *parent_dir                 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+      menu_file_transfer_t *transf     = NULL;
+
+      parent_dir[0] = '\0';
+
+      fill_pathname_parent_dir(parent_dir,
+            state->path, PATH_MAX_LENGTH * sizeof(char));
+      strlcat(parent_dir,
+            file_path_str(FILE_PATH_INDEX_DIRS_URL),
+            PATH_MAX_LENGTH * sizeof(char));
+
+      transf           = (menu_file_transfer_t*)malloc(sizeof(*transf));
+
+      transf->enum_idx = MSG_UNKNOWN;
+      strlcpy(transf->path, parent_dir, sizeof(transf->path));
+
+      task_push_http_transfer(parent_dir, true,
+            "index_dirs", cb_net_generic_subdir, transf);
+
+      free(parent_dir);
+   }
+
+   if (state)
+      free(state);
+#endif
+}
diff --git a/menu/menu_networking.h b/menu/menu_networking.h
new file mode 100644
index 0000000000..6e22f3844a
--- /dev/null
+++ b/menu/menu_networking.h
@@ -0,0 +1,36 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2016-2017 - Brad Parker
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _MENU_NETWORKING_H
+#define _MENU_NETWORKING_H
+
+#include <stdint.h>
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+extern char *core_buf;
+extern size_t core_len;
+
+void cb_net_generic_subdir(void *task_data, void *user_data,
+      const char *err);
+
+void cb_net_generic(void *task_data, void *user_data, const char *err);
+
+RETRO_END_DECLS
+
+#endif