diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index f4054dff02..a46106d1d0 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.44 2001/01/24 03:42:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.45 2001/01/27 21:49:58 momjian Exp $
  */
 #include "postgres.h"
 #include "command.h"
@@ -19,7 +19,7 @@
 #else
 #include <win32.h>
 #include <io.h>
-#include <fnctl.h>
+#include <fcntl.h>
 #endif
 
 #include "libpq-fe.h"
diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak
index 0365a00311..2d08e9b5d0 100644
--- a/src/bin/psql/win32.mak
+++ b/src/bin/psql/win32.mak
@@ -38,7 +38,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
  "_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
  /I ..\..\include /I ..\..\interfaces\libpq /D "HAVE_STRDUP"
 
diff --git a/src/include/config.h.win32 b/src/include/config.h.win32
index aae6444dd9..ec836d8190 100644
--- a/src/include/config.h.win32
+++ b/src/include/config.h.win32
@@ -3,7 +3,7 @@
  */
 
 
-#define PG_VERSION 7.1
+#define PG_VERSION "7.1"
 #define PG_VERSION_STR "7.1 (win32)"
 
 #define SYSCONFDIR ""
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index eda99d815b..b4fbeda588 100644
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -48,7 +48,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
  "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
  /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c  /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"