diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in
index 312641cd513..6cd6279e14b 100644
--- a/dlls/gdi.exe16/Makefile.in
+++ b/dlls/gdi.exe16/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = gdi.exe16
 IMPORTS   = user32 advapi32 gdi32
 
-EXTRADLLFLAGS = -m16 -Wb,--main-module,gdi32.dll,--heap,65520
+EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,gdi32.dll,--heap,65520
 
 C_SRCS = \
 	bidi.c \
diff --git a/dlls/gdi.exe16/env.c b/dlls/gdi.exe16/env.c
index 582edda23d8..e9b8bc31dce 100644
--- a/dlls/gdi.exe16/env.c
+++ b/dlls/gdi.exe16/env.c
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/dlls/gdi.exe16/metafile.c b/dlls/gdi.exe16/metafile.c
index 2f0ccfebba9..f88c0cddbb7 100644
--- a/dlls/gdi.exe16/metafile.c
+++ b/dlls/gdi.exe16/metafile.c
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
 #include <string.h>
 #include <fcntl.h>