Index: interfaces/libpgtcl/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/libpgtcl/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- interfaces/libpgtcl/Makefile	2002/12/30 17:19:52	1.30
+++ interfaces/libpgtcl/Makefile	2003/01/14 19:40:46
@@ -20,7 +20,7 @@ override CPPFLAGS := -I$(libpq_srcdir) $
 
 OBJS= pgtcl.o pgtclCmds.o pgtclId.o
 
-SHLIB_LINK = $(libpq)
+SHLIB_LINK += $(libpq)
 
 # If crypt is a separate library, rather than part of libc, it may need
 # to be referenced separately to keep (broken) linkers happy.  (This is
Index: makefiles/Makefile.win
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/makefiles/Makefile.win,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile.win
--- makefiles/Makefile.win	2002/09/05 18:28:46	1.18
+++ makefiles/Makefile.win	2003/01/14 19:40:46
@@ -34,4 +34,8 @@ endif
 
 override javadir := '$(shell cygpath -w $(javadir))'
 
+ifneq (,$(findstring interfaces/libpgtcl,$(subdir)))
+SHLIB_LINK+= $(TCL_LIB_SPEC)
+endif
+
 sqlmansect = 7
Index: pl/tcl/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/pl/tcl/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- pl/tcl/Makefile	2002/12/30 17:19:54	1.39
+++ pl/tcl/Makefile	2003/01/14 19:40:46
@@ -43,7 +43,7 @@ ifeq ($(PORTNAME), hpux)
 SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) -lc
 else
 # link command for a shared lib must NOT mention shared libs it uses
-SHLIB_LINK = $(TCL_LIB_SPEC)
+SHLIB_LINK = $(BE_DLLLIBS) $(TCL_LIB_SPEC)
 endif
 endif
 
Index: pl/tcl/pltcl.c
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/pl/tcl/pltcl.c,v
retrieving revision 1.68
diff -u -p -r1.68 pltcl.c
--- pl/tcl/pltcl.c	2002/12/30 22:10:54	1.68
+++ pl/tcl/pltcl.c	2003/01/14 19:40:49
@@ -35,9 +35,9 @@
  *
  **********************************************************************/
 
-#include "postgres.h"
-
 #include <tcl.h>
+
+#include "postgres.h"
 
 #include <unistd.h>
 #include <fcntl.h>