diff --git a/general.h b/general.h
index 5856126609..78c6a20355 100644
--- a/general.h
+++ b/general.h
@@ -403,7 +403,9 @@ typedef int (*transfer_cb_t               )(void *data, size_t len);
 
 typedef struct nbio_image_handle
 {
+#ifndef IS_SALAMANDER
    struct texture_image ti;
+#endif
    bool is_blocking;
    bool is_blocking_on_processing;
    bool is_finished;
diff --git a/runloop_data.c b/runloop_data.c
index 80738d8d83..236caaa585 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -579,9 +579,9 @@ static void rarch_main_data_nbio_iterate(nbio_handle_t *nbio)
       rarch_main_data_image_iterate_poll(nbio);
 }
 
+#ifdef HAVE_NETWORKING
 static void rarch_main_data_http_iterate(http_handle_t *http)
 {
-#ifdef HAVE_NETWORKING
    if (!http)
       return;
 
@@ -598,8 +598,8 @@ static void rarch_main_data_http_iterate(http_handle_t *http)
    }
    else
       rarch_main_data_http_iterate_poll(http);
-#endif
 }
+#endif
 
 static void rarch_main_data_db_iterate(void)
 {
@@ -612,6 +612,8 @@ static void rarch_main_data_db_iterate(void)
 void rarch_main_data_iterate(void)
 {
    rarch_main_data_nbio_iterate(&g_runloop.data.nbio);
+#ifdef HAVE_NETWORKING
    rarch_main_data_http_iterate(&g_runloop.data.http);
+#endif
    rarch_main_data_db_iterate();
 }