aa5e4c
diff --git a/generic/tclInt.h b/generic/tclInt.h
aa5e4c
index 39fb740..bbe342b 100644
aa5e4c
--- a/generic/tclInt.h
aa5e4c
+++ b/generic/tclInt.h
aa5e4c
@@ -3277,7 +3277,7 @@ MODULE_SCOPE void	TclClockInit(Tcl_Interp *interp);
aa5e4c
 MODULE_SCOPE int	TclClockOldscanObjCmd(
aa5e4c
 			    ClientData clientData, Tcl_Interp *interp,
aa5e4c
 			    int objc, Tcl_Obj *const objv[]);
aa5e4c
-MODULE_SCOPE int	Tcl_CloseObjCmd(ClientData clientData,
aa5e4c
+extern int	Tcl_CloseObjCmd(ClientData clientData,
aa5e4c
 			    Tcl_Interp *interp, int objc,
aa5e4c
 			    Tcl_Obj *const objv[]);
aa5e4c
 MODULE_SCOPE int	Tcl_ConcatObjCmd(ClientData clientData,
aa5e4c
@@ -3458,7 +3458,7 @@ MODULE_SCOPE int	Tcl_RenameObjCmd(ClientData clientData,
aa5e4c
 MODULE_SCOPE int	Tcl_RepresentationCmd(ClientData clientData,
aa5e4c
 			    Tcl_Interp *interp, int objc,
aa5e4c
 			    Tcl_Obj *const objv[]);
aa5e4c
-MODULE_SCOPE int	Tcl_ReturnObjCmd(ClientData clientData,
aa5e4c
+extern int	Tcl_ReturnObjCmd(ClientData clientData,
aa5e4c
 			    Tcl_Interp *interp, int objc,
aa5e4c
 			    Tcl_Obj *const objv[]);
aa5e4c
 MODULE_SCOPE int	Tcl_ScanObjCmd(ClientData clientData,
aa5e4c
diff --git a/generic/tclPort.h b/generic/tclPort.h
aa5e4c
index 9485567..f329cde 100644
aa5e4c
--- a/generic/tclPort.h
aa5e4c
+++ b/generic/tclPort.h
aa5e4c
@@ -20,7 +20,7 @@
aa5e4c
 #if defined(_WIN32)
aa5e4c
 #   include "tclWinPort.h"
aa5e4c
 #else
aa5e4c
-#   include "tclUnixPort.h"
aa5e4c
+#   include "../unix/tclUnixPort.h"
aa5e4c
 #endif
aa5e4c
 #include "tcl.h"
aa5e4c