Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 53297)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 53298)
@@ -566,4 +566,5 @@
   	Network/slirp/debug.c \
  	Network/slirp/ip_icmp.c \
+	Network/slirp/ip_icmpwin.c \
  	Network/slirp/ip_input.c \
  	Network/slirp/ip_output.c \
Index: /trunk/src/VBox/Devices/Network/slirp/ip_icmp.c
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/ip_icmp.c	(revision 53297)
+++ /trunk/src/VBox/Devices/Network/slirp/ip_icmp.c	(revision 53298)
@@ -119,43 +119,6 @@
 
 #else /* RT_OS_WINDOWS */
-    /* Resolve symbols we need. */
-    {
-        RTLDRMOD hLdrMod;
-        int rc = RTLdrLoadSystem("Iphlpapi.dll", true /*fNoUnload*/, &hLdrMod);
-        if (RT_SUCCESS(rc))
-        {
-            pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))RTLdrGetFunction(hLdrMod, "IcmpParseReplies");
-            pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE))RTLdrGetFunction(hLdrMod, "IcmpCloseHandle");
-            RTLdrClose(hLdrMod);
-        }
-
-        if (pData->pfIcmpParseReplies == NULL)
-        {
-            int rc = RTLdrLoadSystem("Icmp.dll", true /*fNoUnload*/, &hLdrMod);
-            if (RT_FAILURE(rc))
-            {
-                LogRel(("NAT: Icmp.dll could not be loaded: %Rrc\n", rc));
-                return 1;
-            }
-            pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))RTLdrGetFunction(hLdrMod, "IcmpParseReplies");
-            pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE))RTLdrGetFunction(hLdrMod, "IcmpCloseHandle");
-            RTLdrClose(hLdrMod);
-        }
-    }
-    if (pData->pfIcmpParseReplies == NULL)
-    {
-        LogRel(("NAT: Can't find IcmpParseReplies symbol\n"));
+    if (icmpwin_init(pData) != 0)
         return 1;
-    }
-    if (pData->pfIcmpCloseHandle == NULL)
-    {
-        LogRel(("NAT: Can't find IcmpCloseHandle symbol\n"));
-        return 1;
-    }
-
-    pData->icmp_socket.sh = IcmpCreateFile();
-    pData->phEvents[VBOX_ICMP_EVENT_INDEX] = CreateEvent(NULL, FALSE, FALSE, NULL);
-    pData->cbIcmpBuffer = sizeof(ICMP_ECHO_REPLY) * 10;
-    pData->pvIcmpBuffer = RTMemAlloc(pData->cbIcmpBuffer);
 #endif /* RT_OS_WINDOWS */
 
@@ -172,6 +135,5 @@
     icmp_cache_clean(pData, -1);
 #ifdef RT_OS_WINDOWS
-    pData->pfIcmpCloseHandle(pData->icmp_socket.sh);
-    RTMemFree(pData->pvIcmpBuffer);
+    icmpwin_finit(pData);
 #else
     closesocket(pData->icmp_socket.s);
Index: /trunk/src/VBox/Devices/Network/slirp/ip_icmp.h
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/ip_icmp.h	(revision 53297)
+++ /trunk/src/VBox/Devices/Network/slirp/ip_icmp.h	(revision 53298)
@@ -203,3 +203,9 @@
 struct icmp_msg * icmp_find_original_mbuf (PNATState , struct ip *);
 
+#ifdef RT_OS_WINDOWS
+/* Windows ICMP API code in ip_icmpwin.c */
+int icmpwin_init (PNATState);
+void icmpwin_finit (PNATState);
 #endif
+
+#endif
Index: /trunk/src/VBox/Devices/Network/slirp/ip_icmpwin.c
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/ip_icmpwin.c	(revision 53298)
+++ /trunk/src/VBox/Devices/Network/slirp/ip_icmpwin.c	(revision 53298)
@@ -0,0 +1,83 @@
+/* $Id$ */
+/** @file
+ * NAT - Windows ICMP API based ping proxy.
+ */
+
+/*
+ * Copyright (C) 2006-2014 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#include "slirp.h"
+#include "ip_icmp.h"
+
+#include <iphlpapi.h>
+#include <icmpapi.h>
+
+/*
+ * XXX: we don't support w2k anymore, so we may just as well link to
+ * iphlpapi.dll and use direct references now.  Besides, we already
+ * refer to some of Icmp* functions directly anyway.
+ */
+#include <iprt/ldr.h>
+
+int
+icmpwin_init(PNATState pData)
+{
+    RTLDRMOD hLdrMod;
+    int rc;
+
+    rc = RTLdrLoadSystem("Iphlpapi.dll", true /*fNoUnload*/, &hLdrMod);
+    if (RT_SUCCESS(rc))
+    {
+        pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))RTLdrGetFunction(hLdrMod, "IcmpParseReplies");
+        pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE))RTLdrGetFunction(hLdrMod, "IcmpCloseHandle");
+        RTLdrClose(hLdrMod);
+    }
+
+    if (pData->pfIcmpParseReplies == NULL)
+    {
+        int rc = RTLdrLoadSystem("Icmp.dll", true /*fNoUnload*/, &hLdrMod);
+        if (RT_FAILURE(rc))
+        {
+            LogRel(("NAT: Icmp.dll could not be loaded: %Rrc\n", rc));
+            return 1;
+        }
+        pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))RTLdrGetFunction(hLdrMod, "IcmpParseReplies");
+        pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE))RTLdrGetFunction(hLdrMod, "IcmpCloseHandle");
+        RTLdrClose(hLdrMod);
+    }
+
+    if (pData->pfIcmpParseReplies == NULL)
+    {
+        LogRel(("NAT: Can't find IcmpParseReplies symbol\n"));
+        return 1;
+    }
+    if (pData->pfIcmpCloseHandle == NULL)
+    {
+        LogRel(("NAT: Can't find IcmpCloseHandle symbol\n"));
+        return 1;
+    }
+
+    pData->icmp_socket.sh = IcmpCreateFile();
+    pData->phEvents[VBOX_ICMP_EVENT_INDEX] = CreateEvent(NULL, FALSE, FALSE, NULL);
+    pData->cbIcmpBuffer = sizeof(ICMP_ECHO_REPLY) * 10;
+    pData->pvIcmpBuffer = RTMemAlloc(pData->cbIcmpBuffer);
+
+    return 0;
+}
+
+
+void
+icmpwin_finit(PNATState pData)
+{
+    pData->pfIcmpCloseHandle(pData->icmp_socket.sh);
+    RTMemFree(pData->pvIcmpBuffer);
+}