diff --git a/config-win32.h b/config-win32.h
index 2e54836bc..520c1ca67 100644
--- a/config-win32.h
+++ b/config-win32.h
@@ -173,7 +173,7 @@
 /*************************************************
  * This section is for compiler specific defines.*
  *************************************************/
-#ifndef VC6 /* VC6 => Microsoft Visual C++ 6 */
+#ifdef MINGW32 /* Borland and MS don't have this */
 
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index d60c21a48..1590f38a9 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -15,7 +15,7 @@ OPENSSL_PATH = ../../openssl-0.9.5a
 ## Nothing more to do below this line!
 
 INCLUDES = -I. -I.. -I../include
-CFLAGS = -g -O2
+CFLAGS = -g -O2 -DMINGW32
 ifdef SSL
   INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
   CFLAGS += -DUSE_SSLEAY
@@ -29,14 +29,14 @@ base64.h getenv.h mprintf.c setup.h url.c download.c getpass.c \
 mprintf.h ssluse.c url.h download.h hostip.c netrc.c ssluse.h \
 urldata.h formdata.c hostip.h netrc.h stdcheaders.h formdata.h \
 if2ip.c progress.c sendf.c sendf.h speedcheck.c speedcheck.h \
-ftp.c ftp.h getpass.c getpass.h version.c timeval.c  timeval.h cookie.c \
+ftp.c ftp.h getpass.h version.c timeval.c  timeval.h cookie.c \
 cookie.h escape.c escape.h getdate.c getdate.h dict.h dict.c http.c \
 http.h telnet.c telnet.h file.c file.h ldap.c ldap.h writeout.c writeout.h \
 highlevel.c strequal.c strequal.h easy.c
 
 libcurl_a_OBJECTS =  base64.o getenv.o mprintf.o url.o download.o \
 getpass.o ssluse.o hostip.o netrc.o formdata.o if2ip.o progress.o \
-sendf.o speedcheck.o ftp.o getpass.o version.o timeval.o \
+sendf.o speedcheck.o ftp.o version.o timeval.o \
 cookie.o escape.o getdate.o dict.o http.o telnet.o file.o ldap.o writeout.o \
 highlevel.o strequal.o easy.o
 
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 41b840c3d..0221047a1 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -19,7 +19,7 @@ OPENSSL_PATH = ../../openssl-0.9.5a
 ## Nothing more to do below this line!
 
 INCLUDES = -I. -I.. -I../include
-CFLAGS = -g -O2
+CFLAGS = -g -O2 -DMINGW32
 LDFLAGS = 
 COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
 LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/src/config-win32.h b/src/config-win32.h
index 55d3e3a5f..116c93509 100644
--- a/src/config-win32.h
+++ b/src/config-win32.h
@@ -8,11 +8,21 @@
 /* Define cpu-machine-OS */
 #define OS "win32"
 
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
 /* Define if you have the <io.h> header file.  */
 #define HAVE_IO_H 1
  
 /* Define if you have the strdup function.  */
 #define HAVE_STRDUP 1
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+
+/*************************************************
+ * This section is for compiler specific defines.*
+ *************************************************/
+#ifdef MINGW32 /* Borland and MS don't have this */
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+
+#endif