diff --git a/libretro-common/net/net_natt.c b/libretro-common/net/net_natt.c
index 76e92a5d3a..6a7f024eed 100644
--- a/libretro-common/net/net_natt.c
+++ b/libretro-common/net/net_natt.c
@@ -37,7 +37,7 @@
 
 #include <net/net_natt.h>
 
-#if defined(_WIN32)
+#ifdef _WIN32
 #include <iphlpapi.h>
 #endif
 
@@ -631,9 +631,7 @@ static void natt_close_port_cb(retro_task_t *task, void *task_data,
    if (data->status != 200)
       goto done;
 
-   /* We don't need to do anything special here.
-    * Just clear up the request. */
-   memset(request, 0, sizeof(*request));
+   /* We don't need to do anything special here. */
    request->success = true;
 
 done:
diff --git a/tasks/task_netplay_nat_traversal.c b/tasks/task_netplay_nat_traversal.c
index f6dccba546..2ee3ab8614 100644
--- a/tasks/task_netplay_nat_traversal.c
+++ b/tasks/task_netplay_nat_traversal.c
@@ -254,6 +254,8 @@ static void task_netplay_nat_traversal_handler(retro_task_t *task)
 
       case NAT_TRAVERSAL_STATUS_CLOSING:
          {
+            memset(&data->request, 0, sizeof(data->request));
+
             data->status = NAT_TRAVERSAL_STATUS_CLOSED;
 
             goto finished;