diff -up tcl8.5.0/generic/tclInt.h.expect-compat tcl8.5.0/generic/tclInt.h
--- tcl8.5.0/generic/tclInt.h.expect-compat	2008-01-04 21:42:44.000000000 +0100
+++ tcl8.5.0/generic/tclInt.h	2008-01-04 21:43:47.000000000 +0100
@@ -2728,7 +2728,7 @@ MODULE_SCOPE void	TclClockInit(Tcl_Inter
 MODULE_SCOPE int	TclClockOldscanObjCmd(
 			    ClientData clientData, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_CloseObjCmd(ClientData clientData,
+extern       int	Tcl_CloseObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
 MODULE_SCOPE int	Tcl_ConcatObjCmd(ClientData clientData,
@@ -2889,7 +2889,7 @@ MODULE_SCOPE int	Tcl_RegsubObjCmd(Client
 MODULE_SCOPE int	Tcl_RenameObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ReturnObjCmd(ClientData clientData,
+extern       int	Tcl_ReturnObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
 MODULE_SCOPE int	Tcl_ScanObjCmd(ClientData clientData,

diff -up tcl8.5.0/generic/tclPort.h.old tcl8.5.0/generic/tclPort.h
--- tcl8.5.0/generic/tclPort.h.old	2008-01-04 17:49:08.000000000 +0100
+++ tcl8.5.0/generic/tclPort.h	2008-01-04 17:49:21.000000000 +0100
@@ -24,7 +24,7 @@
 #if defined(__WIN32__)
 #   include "../win/tclWinPort.h"
 #else
-#   include "tclUnixPort.h"
+#   include "../unix/tclUnixPort.h"
 #endif
 
 #if !defined(LLONG_MIN)