diff --git a/programs/ping/Makefile.in b/programs/ping/Makefile.in
index 0f87ad0bac8..f814b042fe7 100644
--- a/programs/ping/Makefile.in
+++ b/programs/ping/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = ping.exe
-APPMODE   = -mconsole
 IMPORTS   = ws2_32 iphlpapi
 
+EXTRADLLFLAGS = -mconsole -mno-cygwin
+
 C_SRCS = \
 	ping_main.c
diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c
index 59d36b79583..5022fe27e7c 100644
--- a/programs/ping/ping_main.c
+++ b/programs/ping/ping_main.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 #include "winsock2.h"
 #include "ws2tcpip.h"
 #include "iphlpapi.h"
@@ -30,9 +28,6 @@
 #include <string.h>
 #include <icmpapi.h>
 #include <limits.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
 #include <windows.h>