Index: compat/gettod.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/gettod.c,v
retrieving revision 1.2
diff -u -u -r1.2 gettod.c
--- compat/gettod.c	14 Sep 1998 18:39:44 -0000	1.2
+++ compat/gettod.c	29 Mar 2004 21:52:23 -0000
@@ -12,7 +12,6 @@
  * RCS: @(#) $Id: gettod.c,v 1.2 1998/09/14 18:39:44 stanton Exp $
  */
 
-#include "tcl.h"
 #include "tclPort.h"
 #include <sys/timeb.h>
 
Index: compat/memcmp.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/memcmp.c,v
retrieving revision 1.2
diff -u -u -r1.2 memcmp.c
--- compat/memcmp.c	16 Apr 1999 00:46:29 -0000	1.2
+++ compat/memcmp.c	29 Mar 2004 21:52:23 -0000
@@ -11,7 +11,6 @@
  * SCCS: @(#) memcmp.c 1.2 98/01/19 10:48:58
  */
 
-#include "tcl.h"
 #include "tclPort.h"
 
 /*
Index: compat/opendir.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/opendir.c,v
retrieving revision 1.2
diff -u -u -r1.2 opendir.c
--- compat/opendir.c	14 Sep 1998 18:39:44 -0000	1.2
+++ compat/opendir.c	29 Mar 2004 21:52:23 -0000
@@ -11,7 +11,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 #undef DIRSIZ
 #define DIRSIZ(dp) \
Index: compat/strftime.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/strftime.c,v
retrieving revision 1.14
diff -u -u -r1.14 strftime.c
--- compat/strftime.c	27 Aug 2003 19:31:00 -0000	1.14
+++ compat/strftime.c	29 Mar 2004 21:52:23 -0000
@@ -54,7 +54,6 @@
 #include <string.h>
 #include <locale.h>
 #include "tclInt.h"
-#include "tclPort.h"
 
 #define TM_YEAR_BASE   1900
 #define IsLeapYear(x)   ((x % 4 == 0) && (x % 100 != 0 || x % 400 == 0))
Index: compat/strstr.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/strstr.c,v
retrieving revision 1.3
diff -u -u -r1.3 strstr.c
--- compat/strstr.c	26 Jan 2002 01:10:08 -0000	1.3
+++ compat/strstr.c	29 Mar 2004 21:52:23 -0000
@@ -12,6 +12,8 @@
  * RCS: @(#) $Id: strstr.c,v 1.3 2002/01/26 01:10:08 dgp Exp $
  */
 
+#include "tcl.h"
+
 /*
  *----------------------------------------------------------------------
  *
Index: compat/strtod.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/strtod.c,v
retrieving revision 1.6
diff -u -u -r1.6 strtod.c
--- compat/strtod.c	25 Feb 2002 14:26:12 -0000	1.6
+++ compat/strtod.c	29 Mar 2004 21:52:23 -0000
@@ -13,7 +13,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include <ctype.h>
 
 #ifndef TRUE
Index: compat/strtol.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/strtol.c,v
retrieving revision 1.4
diff -u -u -r1.4 strtol.c
--- compat/strtol.c	25 Feb 2002 16:23:26 -0000	1.4
+++ compat/strtol.c	29 Mar 2004 21:52:23 -0000
@@ -14,7 +14,6 @@
 
 #include <ctype.h>
 #include "tclInt.h"
-#include "tclPort.h"
 
 
 /*
Index: compat/strtoll.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/strtoll.c,v
retrieving revision 1.6
diff -u -u -r1.6 strtoll.c
--- compat/strtoll.c	19 Mar 2004 18:33:51 -0000	1.6
+++ compat/strtoll.c	29 Mar 2004 21:52:23 -0000
@@ -12,7 +12,6 @@
  * RCS: @(#) $Id: strtoll.c,v 1.6 2004/03/19 18:33:51 kennykb Exp $
  */
 
-#include "tcl.h"
 #include "tclInt.h"
 #include <ctype.h>
 
Index: compat/strtoul.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/strtoul.c,v
retrieving revision 1.5
diff -u -u -r1.5 strtoul.c
--- compat/strtoul.c	25 Feb 2002 10:36:32 -0000	1.5
+++ compat/strtoul.c	29 Mar 2004 21:52:23 -0000
@@ -13,7 +13,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * The table below is used to convert from ASCII digits to a
Index: compat/strtoull.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/strtoull.c,v
retrieving revision 1.6
diff -u -u -r1.6 strtoull.c
--- compat/strtoull.c	19 Mar 2004 18:33:52 -0000	1.6
+++ compat/strtoull.c	29 Mar 2004 21:52:23 -0000
@@ -12,7 +12,6 @@
  * RCS: @(#) $Id: strtoull.c,v 1.6 2004/03/19 18:33:52 kennykb Exp $
  */
 
-#include "tcl.h"
 #include "tclInt.h"
 #include <ctype.h>
 
Index: compat/waitpid.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/waitpid.c,v
retrieving revision 1.3
diff -u -u -r1.3 waitpid.c
--- compat/waitpid.c	11 Jan 2000 22:08:50 -0000	1.3
+++ compat/waitpid.c	29 Mar 2004 21:52:23 -0000
@@ -15,7 +15,6 @@
  * RCS: @(#) $Id: waitpid.c,v 1.3 2000/01/11 22:08:50 hobbs Exp $
  */
 
-#include "tclInt.h"
 #include "tclPort.h"
 
 #ifndef pid_t
Index: generic/tclAlloc.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclAlloc.c,v
retrieving revision 1.18
diff -u -u -r1.18 tclAlloc.c
--- generic/tclAlloc.c	17 Mar 2004 18:14:13 -0000	1.18
+++ generic/tclAlloc.c	29 Mar 2004 21:52:23 -0000
@@ -26,7 +26,6 @@
 #if !defined(TCL_THREADS) || !defined(USE_THREAD_ALLOC)
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 #if USE_TCLALLOC
 
Index: generic/tclAsync.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclAsync.c,v
retrieving revision 1.6
diff -u -u -r1.6 tclAsync.c
--- generic/tclAsync.c	30 Aug 2001 07:50:18 -0000	1.6
+++ generic/tclAsync.c	29 Mar 2004 21:52:23 -0000
@@ -16,7 +16,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /* Forward declaration */
 struct ThreadSpecificData;
Index: generic/tclBasic.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclBasic.c,v
retrieving revision 1.98
diff -u -u -r1.98 tclBasic.c
--- generic/tclBasic.c	17 Mar 2004 18:14:13 -0000	1.98
+++ generic/tclBasic.c	29 Mar 2004 21:52:24 -0000
@@ -18,9 +18,6 @@
 
 #include "tclInt.h"
 #include "tclCompile.h"
-#ifndef TCL_GENERIC_ONLY
-#   include "tclPort.h"
-#endif
 
 /*
  * Static procedures in this file:
Index: generic/tclBinary.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclBinary.c,v
retrieving revision 1.16
diff -u -u -r1.16 tclBinary.c
--- generic/tclBinary.c	24 Dec 2003 04:18:18 -0000	1.16
+++ generic/tclBinary.c	29 Mar 2004 21:52:24 -0000
@@ -14,8 +14,12 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
+
+#ifdef TCL_NO_MATH
+#define fabs(x) (x<0 ? -x : x)
+#else
 #include <math.h>
+#endif
 
 /*
  * The following constants are used by GetFormatSpec to indicate various
Index: generic/tclCkalloc.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclCkalloc.c,v
retrieving revision 1.20
diff -u -u -r1.20 tclCkalloc.c
--- generic/tclCkalloc.c	24 Dec 2003 04:18:18 -0000	1.20
+++ generic/tclCkalloc.c	29 Mar 2004 21:52:24 -0000
@@ -17,7 +17,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 #define FALSE	0
 #define TRUE	1
Index: generic/tclClock.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclClock.c,v
retrieving revision 1.25
diff -u -u -r1.25 tclClock.c
--- generic/tclClock.c	18 Mar 2004 18:50:40 -0000	1.25
+++ generic/tclClock.c	29 Mar 2004 21:52:24 -0000
@@ -14,9 +14,7 @@
  * RCS: @(#) $Id: tclClock.c,v 1.25 2004/03/18 18:50:40 rmax Exp $
  */
 
-#include "tcl.h"
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * The date parsing stuff uses lexx and has tons o statics.
Index: generic/tclCmdAH.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclCmdAH.c,v
retrieving revision 1.43
diff -u -u -r1.43 tclCmdAH.c
--- generic/tclCmdAH.c	17 Mar 2004 18:14:13 -0000	1.43
+++ generic/tclCmdAH.c	29 Mar 2004 21:52:24 -0000
@@ -15,7 +15,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include <locale.h>
 
 /*
Index: generic/tclCmdIL.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclCmdIL.c,v
retrieving revision 1.61
diff -u -u -r1.61 tclCmdIL.c
--- generic/tclCmdIL.c	17 Jan 2004 00:52:18 -0000	1.61
+++ generic/tclCmdIL.c	29 Mar 2004 21:52:24 -0000
@@ -19,7 +19,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include "tclRegexp.h"
 
 /*
Index: generic/tclCmdMZ.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclCmdMZ.c,v
retrieving revision 1.100
diff -u -u -r1.100 tclCmdMZ.c
--- generic/tclCmdMZ.c	13 Jan 2004 23:37:11 -0000	1.100
+++ generic/tclCmdMZ.c	29 Mar 2004 21:52:25 -0000
@@ -19,7 +19,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include "tclRegexp.h"
 
 /*
Index: generic/tclCompExpr.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclCompExpr.c,v
retrieving revision 1.21
diff -u -u -r1.21 tclCompExpr.c
--- generic/tclCompExpr.c	12 Jan 2004 18:50:15 -0000	1.21
+++ generic/tclCompExpr.c	29 Mar 2004 21:52:25 -0000
@@ -21,9 +21,7 @@
  * the errno from tclExecute.c here.
  */
 
-#ifndef TCL_GENERIC_ONLY
-#include "tclPort.h"
-#else
+#ifdef TCL_GENERIC_ONLY
 #define NO_ERRNO_H
 #endif
 
Index: generic/tclDate.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclDate.c,v
retrieving revision 1.24
diff -u -u -r1.24 tclDate.c
--- generic/tclDate.c	18 Mar 2004 18:50:48 -0000	1.24
+++ generic/tclDate.c	29 Mar 2004 21:52:25 -0000
@@ -14,7 +14,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 #define EPOCH           1970
 #define START_OF_TIME   1902
Index: generic/tclEncoding.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclEncoding.c,v
retrieving revision 1.17
diff -u -u -r1.17 tclEncoding.c
--- generic/tclEncoding.c	24 Dec 2003 04:18:19 -0000	1.17
+++ generic/tclEncoding.c	29 Mar 2004 21:52:25 -0000
@@ -12,7 +12,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 typedef size_t (LengthProc)_ANSI_ARGS_((CONST char *src));
 
Index: generic/tclEnv.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclEnv.c,v
retrieving revision 1.21
diff -u -u -r1.21 tclEnv.c
--- generic/tclEnv.c	14 May 2003 06:17:49 -0000	1.21
+++ generic/tclEnv.c	29 Mar 2004 21:52:25 -0000
@@ -16,7 +16,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 TCL_DECLARE_MUTEX(envMutex)	/* To serialize access to environ */
 
Index: generic/tclEvent.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclEvent.c,v
retrieving revision 1.31
diff -u -u -r1.31 tclEvent.c
--- generic/tclEvent.c	24 Dec 2003 04:18:19 -0000	1.31
+++ generic/tclEvent.c	29 Mar 2004 21:52:25 -0000
@@ -15,7 +15,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * The data structure below is used to report background errors.  One
Index: generic/tclExecute.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclExecute.c,v
retrieving revision 1.121
diff -u -u -r1.121 tclExecute.c
--- generic/tclExecute.c	18 Jan 2004 16:19:05 -0000	1.121
+++ generic/tclExecute.c	29 Mar 2004 21:52:26 -0000
@@ -18,7 +18,7 @@
 #include "tclCompile.h"
 
 #ifndef TCL_NO_MATH
-#   include "tclMath.h"
+#   include <math.h>
 #endif
 
 /*
@@ -27,9 +27,7 @@
  * errno here.
  */
 
-#ifndef TCL_GENERIC_ONLY
-#   include "tclPort.h"
-#else /* TCL_GENERIC_ONLY */
+#ifdef TCL_GENERIC_ONLY
 #   ifndef NO_FLOAT_H
 #	include <float.h>
 #   else /* NO_FLOAT_H */
Index: generic/tclFCmd.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclFCmd.c,v
retrieving revision 1.25
diff -u -u -r1.25 tclFCmd.c
--- generic/tclFCmd.c	17 Mar 2004 18:14:13 -0000	1.25
+++ generic/tclFCmd.c	29 Mar 2004 21:52:26 -0000
@@ -13,7 +13,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * Declarations for local procedures defined in this file:
Index: generic/tclFileName.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclFileName.c,v
retrieving revision 1.50
diff -u -u -r1.50 tclFileName.c
--- generic/tclFileName.c	17 Mar 2004 18:14:13 -0000	1.50
+++ generic/tclFileName.c	29 Mar 2004 21:52:26 -0000
@@ -14,7 +14,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include "tclRegexp.h"
 
 /*
Index: generic/tclGet.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclGet.c,v
retrieving revision 1.8
diff -u -u -r1.8 tclGet.c
--- generic/tclGet.c	19 Nov 2002 02:34:49 -0000	1.8
+++ generic/tclGet.c	29 Mar 2004 21:52:26 -0000
@@ -15,8 +15,7 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
-#include "tclMath.h"
+#include <math.h>
 
 
 /*
Index: generic/tclHash.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclHash.c,v
retrieving revision 1.16
diff -u -u -r1.16 tclHash.c
--- generic/tclHash.c	24 Dec 2003 04:18:19 -0000	1.16
+++ generic/tclHash.c	29 Mar 2004 21:52:26 -0000
@@ -14,7 +14,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * Prevent macros from clashing with function definitions.
Index: generic/tclHistory.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclHistory.c,v
retrieving revision 1.4
diff -u -u -r1.4 tclHistory.c
--- generic/tclHistory.c	16 Jan 2002 06:02:34 -0000	1.4
+++ generic/tclHistory.c	29 Mar 2004 21:52:26 -0000
@@ -16,7 +16,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 
 /*
Index: generic/tclIO.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclIO.c,v
retrieving revision 1.71
diff -u -u -r1.71 tclIO.c
--- generic/tclIO.c	9 Mar 2004 12:59:04 -0000	1.71
+++ generic/tclIO.c	29 Mar 2004 21:52:27 -0000
@@ -14,7 +14,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include "tclIO.h"
 #include <assert.h>
 
Index: generic/tclIOCmd.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclIOCmd.c,v
retrieving revision 1.17
diff -u -u -r1.17 tclIOCmd.c
--- generic/tclIOCmd.c	17 Mar 2004 18:14:13 -0000	1.17
+++ generic/tclIOCmd.c	29 Mar 2004 21:52:27 -0000
@@ -12,7 +12,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * Callback structure for accept callback in a TCP server.
Index: generic/tclIOGT.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclIOGT.c,v
retrieving revision 1.7
diff -u -u -r1.7 tclIOGT.c
--- generic/tclIOGT.c	24 May 2002 21:19:06 -0000	1.7
+++ generic/tclIOGT.c	29 Mar 2004 21:52:27 -0000
@@ -14,7 +14,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include "tclIO.h"
 
 
Index: generic/tclIOSock.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclIOSock.c,v
retrieving revision 1.7
diff -u -u -r1.7 tclIOSock.c
--- generic/tclIOSock.c	29 Jul 2002 16:54:41 -0000	1.7
+++ generic/tclIOSock.c	29 Mar 2004 21:52:27 -0000
@@ -12,7 +12,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  *---------------------------------------------------------------------------
Index: generic/tclIOUtil.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclIOUtil.c,v
retrieving revision 1.96
diff -u -u -r1.96 tclIOUtil.c
--- generic/tclIOUtil.c	17 Mar 2004 18:14:13 -0000	1.96
+++ generic/tclIOUtil.c	29 Mar 2004 21:52:27 -0000
@@ -21,9 +21,7 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #ifdef __WIN32__
-/* for tclWinProcs->useWide */
 #include "tclWinInt.h"
 #endif
 #include "tclFileSystem.h"
Index: generic/tclIndexObj.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclIndexObj.c,v
retrieving revision 1.17
diff -u -u -r1.17 tclIndexObj.c
--- generic/tclIndexObj.c	13 Jan 2004 09:42:57 -0000	1.17
+++ generic/tclIndexObj.c	29 Mar 2004 21:52:27 -0000
@@ -14,7 +14,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * Prototypes for procedures defined later in this file:
Index: generic/tclInt.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclInt.h,v
retrieving revision 1.148
diff -u -u -r1.148 tclInt.h
--- generic/tclInt.h	18 Mar 2004 18:54:02 -0000	1.148
+++ generic/tclInt.h	29 Mar 2004 21:52:28 -0000
@@ -2337,7 +2337,9 @@
 	(nsPtr)->exportLookupEpoch++; \
     }
 
+#include "tclPort.h"
 #include "tclIntDecls.h"
+#include "tclIntPlatDecls.h"
 
 # undef TCL_STORAGE_CLASS
 # define TCL_STORAGE_CLASS DLLIMPORT
Index: generic/tclInterp.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclInterp.c,v
retrieving revision 1.25
diff -u -u -r1.25 tclInterp.c
--- generic/tclInterp.c	24 Dec 2003 04:18:20 -0000	1.25
+++ generic/tclInterp.c	29 Mar 2004 21:52:28 -0000
@@ -13,7 +13,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include <stdio.h>
 
 /*
Index: generic/tclLiteral.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclLiteral.c,v
retrieving revision 1.12
diff -u -u -r1.12 tclLiteral.c
--- generic/tclLiteral.c	24 Dec 2003 04:18:20 -0000	1.12
+++ generic/tclLiteral.c	29 Mar 2004 21:52:28 -0000
@@ -17,7 +17,6 @@
 
 #include "tclInt.h"
 #include "tclCompile.h"
-#include "tclPort.h"
 /*
  * When there are this many entries per bucket, on average, rebuild
  * a literal's hash table to make it larger.
Index: generic/tclMain.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclMain.c,v
retrieving revision 1.24
diff -u -u -r1.24 tclMain.c
--- generic/tclMain.c	29 Mar 2004 15:47:31 -0000	1.24
+++ generic/tclMain.c	29 Mar 2004 21:52:28 -0000
@@ -13,7 +13,6 @@
  * RCS: @(#) $Id: tclMain.c,v 1.24 2004/03/29 15:47:31 dgp Exp $
  */
 
-#include "tcl.h"
 #include "tclInt.h"
 
 # undef TCL_STORAGE_CLASS
Index: generic/tclMath.h
===================================================================
RCS file: generic/tclMath.h
diff -N generic/tclMath.h
--- generic/tclMath.h	17 Mar 2004 18:14:14 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-/*
- * tclMath.h --
- *
- *	This file used to be necessary on the Macintosh.
- *	It is only kept for backward compatibility purposes.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMath.h,v 1.3 2004/03/17 18:14:14 das Exp $
- */
-
-#ifndef _TCLMATH
-#define _TCLMATH
-
-#include <math.h>
-
-#endif /* _TCLMATH */
Index: generic/tclNotify.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclNotify.c,v
retrieving revision 1.13
diff -u -u -r1.13 tclNotify.c
--- generic/tclNotify.c	17 Mar 2004 18:14:14 -0000	1.13
+++ generic/tclNotify.c	29 Mar 2004 21:52:28 -0000
@@ -18,7 +18,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 extern TclStubs tclStubs;
 
Index: generic/tclObj.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclObj.c,v
retrieving revision 1.55
diff -u -u -r1.55 tclObj.c
--- generic/tclObj.c	19 Mar 2004 18:33:52 -0000	1.55
+++ generic/tclObj.c	29 Mar 2004 21:52:28 -0000
@@ -16,7 +16,6 @@
 
 #include "tclInt.h"
 #include "tclCompile.h"
-#include "tclPort.h"
 
 /*
  * Table of all object types.
Index: generic/tclPanic.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclPanic.c,v
retrieving revision 1.4
diff -u -u -r1.4 tclPanic.c
--- generic/tclPanic.c	17 Jun 2001 03:48:19 -0000	1.4
+++ generic/tclPanic.c	29 Mar 2004 21:52:28 -0000
@@ -16,7 +16,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * The panicProc variable contains a pointer to an application
Index: generic/tclParse.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclParse.c,v
retrieving revision 1.35
diff -u -u -r1.35 tclParse.c
--- generic/tclParse.c	8 Mar 2004 16:34:22 -0000	1.35
+++ generic/tclParse.c	29 Mar 2004 21:52:28 -0000
@@ -17,7 +17,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * The following table provides parsing information about each possible
Index: generic/tclParseExpr.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclParseExpr.c,v
retrieving revision 1.20
diff -u -u -r1.20 tclParseExpr.c
--- generic/tclParseExpr.c	4 Mar 2004 23:25:15 -0000	1.20
+++ generic/tclParseExpr.c	29 Mar 2004 21:52:28 -0000
@@ -24,9 +24,7 @@
  * the errno from tclExecute.c here.
  */
 
-#ifndef TCL_GENERIC_ONLY
-#include "tclPort.h"
-#else
+#ifdef TCL_GENERIC_ONLY
 #define NO_ERRNO_H
 #endif
 
Index: generic/tclPathObj.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclPathObj.c,v
retrieving revision 1.27
diff -u -u -r1.27 tclPathObj.c
--- generic/tclPathObj.c	26 Mar 2004 19:04:49 -0000	1.27
+++ generic/tclPathObj.c	29 Mar 2004 21:52:29 -0000
@@ -14,7 +14,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include "tclFileSystem.h"
 
 /*
Index: generic/tclPipe.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclPipe.c,v
retrieving revision 1.7
diff -u -u -r1.7 tclPipe.c
--- generic/tclPipe.c	17 Dec 2002 02:47:39 -0000	1.7
+++ generic/tclPipe.c	29 Mar 2004 21:52:29 -0000
@@ -14,7 +14,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * A linked list of the following structures is used to keep track
Index: generic/tclPosixStr.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclPosixStr.c,v
retrieving revision 1.9
diff -u -u -r1.9 tclPosixStr.c
--- generic/tclPosixStr.c	27 May 2002 10:14:21 -0000	1.9
+++ generic/tclPosixStr.c	29 Mar 2004 21:52:29 -0000
@@ -15,7 +15,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  *----------------------------------------------------------------------
Index: generic/tclRegexp.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclRegexp.c,v
retrieving revision 1.14
diff -u -u -r1.14 tclRegexp.c
--- generic/tclRegexp.c	17 Jan 2002 03:03:12 -0000	1.14
+++ generic/tclRegexp.c	29 Mar 2004 21:52:29 -0000
@@ -14,7 +14,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include "tclRegexp.h"
 
 /*
Index: generic/tclScan.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclScan.c,v
retrieving revision 1.12
diff -u -u -r1.12 tclScan.c
--- generic/tclScan.c	25 Feb 2002 15:23:02 -0000	1.12
+++ generic/tclScan.c	29 Mar 2004 21:52:29 -0000
@@ -12,10 +12,6 @@
  */
 
 #include "tclInt.h"
-/*
- * For strtoll() and strtoull() declarations on some platforms...
- */
-#include "tclPort.h"
 
 /*
  * Flag values used by Tcl_ScanObjCmd.
Index: generic/tclStubInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclStubInit.c,v
retrieving revision 1.93
diff -u -u -r1.93 tclStubInit.c
--- generic/tclStubInit.c	17 Mar 2004 18:14:14 -0000	1.93
+++ generic/tclStubInit.c	29 Mar 2004 21:52:29 -0000
@@ -12,7 +12,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * Remove macros that will interfere with the definitions below.
Index: generic/tclStubLib.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclStubLib.c,v
retrieving revision 1.7
diff -u -u -r1.7 tclStubLib.c
--- generic/tclStubLib.c	18 Mar 2004 18:55:16 -0000	1.7
+++ generic/tclStubLib.c	29 Mar 2004 21:52:29 -0000
@@ -26,7 +26,6 @@
 #undef USE_TCL_STUB_PROCS
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * Ensure that Tcl_InitStubs is built as an exported symbol.  The other stub
Index: generic/tclTest.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclTest.c,v
retrieving revision 1.80
diff -u -u -r1.80 tclTest.c
--- generic/tclTest.c	17 Mar 2004 18:14:14 -0000	1.80
+++ generic/tclTest.c	29 Mar 2004 21:52:30 -0000
@@ -19,7 +19,6 @@
 
 #define TCL_TEST
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * Required for Testregexp*Cmd
Index: generic/tclThreadAlloc.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclThreadAlloc.c,v
retrieving revision 1.8
diff -u -u -r1.8 tclThreadAlloc.c
--- generic/tclThreadAlloc.c	24 Dec 2003 04:18:20 -0000	1.8
+++ generic/tclThreadAlloc.c	29 Mar 2004 21:52:30 -0000
@@ -18,9 +18,7 @@
 
 #include "tclInt.h"
 
-#ifdef WIN32
-#include "tclWinInt.h"
-#else
+#ifndef WIN32
 extern Tcl_Mutex *TclpNewAllocMutex(void);
 extern void *TclpGetAllocCache(void);
 extern void TclpSetAllocCache(void *);
Index: generic/tclTimer.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclTimer.c,v
retrieving revision 1.7
diff -u -u -r1.7 tclTimer.c
--- generic/tclTimer.c	24 Dec 2003 04:18:20 -0000	1.7
+++ generic/tclTimer.c	29 Mar 2004 21:52:30 -0000
@@ -13,7 +13,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * For each timer callback that's pending there is one record of the following
Index: generic/tclUtil.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclUtil.c,v
retrieving revision 1.43
diff -u -u -r1.43 tclUtil.c
--- generic/tclUtil.c	4 Sep 2003 16:44:12 -0000	1.43
+++ generic/tclUtil.c	29 Mar 2004 21:52:30 -0000
@@ -15,7 +15,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * The following variable holds the full path name of the binary
Index: generic/tclVar.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclVar.c,v
retrieving revision 1.77
diff -u -u -r1.77 tclVar.c
--- generic/tclVar.c	24 Dec 2003 04:18:20 -0000	1.77
+++ generic/tclVar.c	29 Mar 2004 21:52:31 -0000
@@ -19,7 +19,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * The strings below are used to indicate what went wrong when a
Index: macosx/Makefile
===================================================================
RCS file: /cvsroot/tcl/tcl/macosx/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- macosx/Makefile	26 Feb 2004 09:10:23 -0000	1.12
+++ macosx/Makefile	29 Mar 2004 21:52:31 -0000
@@ -94,7 +94,7 @@
 				echo "${PRODUCT_VERSION}$${TCL_PATCH_LEVEL}")
 YEAR                    := $(shell date +%Y)
 
-PRIVATE_HEADERS		:= tclInt.h tclIntDecls.h tclIntPlatDecls.h tclMath.h
+PRIVATE_HEADERS		:= tclInt.h tclIntDecls.h tclIntPlatDecls.h
 TARGETS			:= tclsh tcltest
 TCLSH			:= tclsh${PRODUCT_VERSION}
 TCL_EXE			?= ${SYMROOT}/${TCLSH}
Index: macosx/tclMacOSXFCmd.c
===================================================================
RCS file: /cvsroot/tcl/tcl/macosx/tclMacOSXFCmd.c,v
retrieving revision 1.1
diff -u -u -r1.1 tclMacOSXFCmd.c
--- macosx/tclMacOSXFCmd.c	14 May 2003 19:21:24 -0000	1.1
+++ macosx/tclMacOSXFCmd.c	29 Mar 2004 21:52:31 -0000
@@ -13,7 +13,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 #ifdef HAVE_GETATTRLIST
 #include <sys/attr.h>
Index: unix/tclLoadDyld.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclLoadDyld.c,v
retrieving revision 1.14
diff -u -u -r1.14 tclLoadDyld.c
--- unix/tclLoadDyld.c	29 Oct 2002 00:04:08 -0000	1.14
+++ unix/tclLoadDyld.c	29 Mar 2004 21:52:31 -0000
@@ -15,7 +15,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include <mach-o/dyld.h>
 
 typedef struct Tcl_DyldModuleHandle {
Index: unix/tclUnixChan.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixChan.c,v
retrieving revision 1.47
diff -u -u -r1.47 tclUnixChan.c
--- unix/tclUnixChan.c	18 Mar 2004 18:55:44 -0000	1.47
+++ unix/tclUnixChan.c	29 Mar 2004 21:52:32 -0000
@@ -14,7 +14,6 @@
  */
 
 #include "tclInt.h"	/* Internal definitions for Tcl. */
-#include "tclPort.h"	/* Portability features for Tcl. */
 #include "tclIO.h"	/* To get Channel type declaration. */
 
 /*
Index: unix/tclUnixEvent.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixEvent.c,v
retrieving revision 1.4
diff -u -u -r1.4 tclUnixEvent.c
--- unix/tclUnixEvent.c	21 Nov 2001 02:36:21 -0000	1.4
+++ unix/tclUnixEvent.c	29 Mar 2004 21:52:32 -0000
@@ -11,7 +11,6 @@
  * RCS: @(#) $Id: tclUnixEvent.c,v 1.4 2001/11/21 02:36:21 hobbs Exp $
  */
 
-#include "tclInt.h"
 #include "tclPort.h"
 
 /*
Index: unix/tclUnixFCmd.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixFCmd.c,v
retrieving revision 1.35
diff -u -u -r1.35 tclUnixFCmd.c
--- unix/tclUnixFCmd.c	5 Mar 2004 14:06:55 -0000	1.35
+++ unix/tclUnixFCmd.c	29 Mar 2004 21:52:32 -0000
@@ -48,7 +48,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include <utime.h>
 #include <grp.h>
 #ifndef HAVE_ST_BLKSIZE
Index: unix/tclUnixFile.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixFile.c,v
retrieving revision 1.38
diff -u -u -r1.38 tclUnixFile.c
--- unix/tclUnixFile.c	29 Jan 2004 10:28:23 -0000	1.38
+++ unix/tclUnixFile.c	29 Mar 2004 21:52:32 -0000
@@ -13,7 +13,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 static int NativeMatchType(CONST char* nativeName, Tcl_GlobTypeData *types);
 
Index: unix/tclUnixInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixInit.c,v
retrieving revision 1.39
diff -u -u -r1.39 tclUnixInit.c
--- unix/tclUnixInit.c	9 Mar 2004 13:34:45 -0000	1.39
+++ unix/tclUnixInit.c	29 Mar 2004 21:52:32 -0000
@@ -14,7 +14,6 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 #include "tclInt.h"
-#include "tclPort.h"
 #include <locale.h>
 #ifdef HAVE_LANGINFO
 #include <langinfo.h>
Index: unix/tclUnixNotfy.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixNotfy.c,v
retrieving revision 1.14
diff -u -u -r1.14 tclUnixNotfy.c
--- unix/tclUnixNotfy.c	24 Dec 2003 04:18:22 -0000	1.14
+++ unix/tclUnixNotfy.c	29 Mar 2004 21:52:32 -0000
@@ -15,7 +15,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include <signal.h> 
 
 extern TclStubs tclStubs;
Index: unix/tclUnixPipe.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixPipe.c,v
retrieving revision 1.23
diff -u -u -r1.23 tclUnixPipe.c
--- unix/tclUnixPipe.c	21 Feb 2003 14:15:58 -0000	1.23
+++ unix/tclUnixPipe.c	29 Mar 2004 21:52:32 -0000
@@ -14,7 +14,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 #ifdef USE_VFORK
 #define fork vfork
Index: unix/tclUnixPort.h
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixPort.h,v
retrieving revision 1.34
diff -u -u -r1.34 tclUnixPort.h
--- unix/tclUnixPort.h	9 Mar 2004 13:32:26 -0000	1.34
+++ unix/tclUnixPort.h	29 Mar 2004 21:52:32 -0000
@@ -25,10 +25,6 @@
 #ifndef _TCLUNIXPORT
 #define _TCLUNIXPORT
 
-#ifndef _TCLINT
-#   include "tclInt.h"
-#endif
-
 /*
  *---------------------------------------------------------------------------
  * The following sets of #includes and #ifdefs are required to get Tcl to
@@ -585,7 +581,4 @@
 #define	TclpMutexUnlock(a)
 #endif /* TCL_THREADS */
 
-#include "tclPlatDecls.h"
-#include "tclIntPlatDecls.h"
-
 #endif /* _TCLUNIXPORT */
Index: unix/tclUnixSock.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixSock.c,v
retrieving revision 1.8
diff -u -u -r1.8 tclUnixSock.c
--- unix/tclUnixSock.c	19 Mar 2004 18:34:02 -0000	1.8
+++ unix/tclUnixSock.c	29 Mar 2004 21:52:32 -0000
@@ -11,7 +11,6 @@
  * RCS: @(#) $Id: tclUnixSock.c,v 1.8 2004/03/19 18:34:02 rmax Exp $
  */
 
-#include "tcl.h"
 #include "tclInt.h"
 
 /*
Index: unix/tclUnixTest.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixTest.c,v
retrieving revision 1.15
diff -u -u -r1.15 tclUnixTest.c
--- unix/tclUnixTest.c	13 Oct 2003 00:59:48 -0000	1.15
+++ unix/tclUnixTest.c	29 Mar 2004 21:52:32 -0000
@@ -13,7 +13,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 /*
  * The headers are needed for the testalarm command that verifies the
Index: unix/tclUnixThrd.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixThrd.c,v
retrieving revision 1.26
diff -u -u -r1.26 tclUnixThrd.c
--- unix/tclUnixThrd.c	24 Dec 2003 04:18:22 -0000	1.26
+++ unix/tclUnixThrd.c	29 Mar 2004 21:52:32 -0000
@@ -13,7 +13,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 
 #ifdef TCL_THREADS
 
Index: unix/tclUnixTime.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixTime.c,v
retrieving revision 1.19
diff -u -u -r1.19 tclUnixTime.c
--- unix/tclUnixTime.c	18 Mar 2004 18:55:55 -0000	1.19
+++ unix/tclUnixTime.c	29 Mar 2004 21:52:32 -0000
@@ -13,7 +13,6 @@
  */
 
 #include "tclInt.h"
-#include "tclPort.h"
 #include <locale.h>
 #define TM_YEAR_BASE 1900
 #define IsLeapYear(x)   ((x % 4 == 0) && (x % 100 != 0 || x % 400 == 0))
Index: unix/tclXtNotify.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclXtNotify.c,v
retrieving revision 1.5
diff -u -u -r1.5 tclXtNotify.c
--- unix/tclXtNotify.c	24 Dec 2003 04:18:22 -0000	1.5
+++ unix/tclXtNotify.c	29 Mar 2004 21:52:32 -0000
@@ -13,7 +13,7 @@
  */
 
 #include <X11/Intrinsic.h>
-#include <tclInt.h>
+#include "tclInt.h"
 
 /*
  * This structure is used to keep track of the notifier info for a 
Index: win/Makefile.in
===================================================================
RCS file: /cvsroot/tcl/tcl/win/Makefile.in,v
retrieving revision 1.75
diff -u -u -r1.75 Makefile.in
--- win/Makefile.in	10 Nov 2003 22:55:47 -0000	1.75
+++ win/Makefile.in	29 Mar 2004 21:52:32 -0000
@@ -281,7 +281,6 @@
 	tclWinFile.$(OBJEXT) \
 	tclWinInit.$(OBJEXT) \
 	tclWinLoad.$(OBJEXT) \
-	tclWinMtherr.$(OBJEXT) \
 	tclWinNotify.$(OBJEXT) \
 	tclWinPipe.$(OBJEXT) \
 	tclWinSock.$(OBJEXT) \
Index: win/makefile.bc
===================================================================
RCS file: /cvsroot/tcl/tcl/win/makefile.bc,v
retrieving revision 1.18
diff -u -u -r1.18 makefile.bc
--- win/makefile.bc	10 Nov 2003 22:55:48 -0000	1.18
+++ win/makefile.bc	29 Mar 2004 21:52:32 -0000
@@ -267,7 +267,6 @@
 	$(TMPDIR)\tclWinFile.obj \
 	$(TMPDIR)\tclWinInit.obj \
 	$(TMPDIR)\tclWinLoad.obj \
-	$(TMPDIR)\tclWinMtherr.obj \
 	$(TMPDIR)\tclWinNotify.obj \
 	$(TMPDIR)\tclWinPipe.obj \
 	$(TMPDIR)\tclWinSock.obj \
Index: win/makefile.vc
===================================================================
RCS file: /cvsroot/tcl/tcl/win/makefile.vc,v
retrieving revision 1.124
diff -u -u -r1.124 makefile.vc
--- win/makefile.vc	3 Mar 2004 10:47:22 -0000	1.124
+++ win/makefile.vc	29 Mar 2004 21:52:32 -0000
@@ -322,7 +322,6 @@
 	$(TMP_DIR)\tclWinFile.obj \
 	$(TMP_DIR)\tclWinInit.obj \
 	$(TMP_DIR)\tclWinLoad.obj \
-	$(TMP_DIR)\tclWinMtherr.obj \
 	$(TMP_DIR)\tclWinNotify.obj \
 	$(TMP_DIR)\tclWinPipe.obj \
 	$(TMP_DIR)\tclWinSock.obj \
Index: win/tcl.dsp
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tcl.dsp,v
retrieving revision 1.3
diff -u -u -r1.3 tcl.dsp
--- win/tcl.dsp	17 Mar 2004 18:14:19 -0000	1.3
+++ win/tcl.dsp	29 Mar 2004 21:52:32 -0000
@@ -1232,10 +1232,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\generic\tclMath.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\generic\tclNamesp.c
 # End Source File
 # Begin Source File
@@ -1544,10 +1540,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\tclWinMtherr.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\tclWinNotify.c
 # End Source File
 # Begin Source File
Index: win/tclWinError.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinError.c,v
retrieving revision 1.5
diff -u -u -r1.5 tclWinError.c
--- win/tclWinError.c	27 May 2002 10:14:21 -0000	1.5
+++ win/tclWinError.c	29 Mar 2004 21:52:33 -0000
@@ -12,7 +12,7 @@
  * RCS: @(#) $Id: tclWinError.c,v 1.5 2002/05/27 10:14:21 dkf Exp $
  */
 
-#include "tclWinInt.h"
+#include "tclInt.h"
 
 /*
  * The following table contains the mapping from Win32 errors to
Index: win/tclWinInt.h
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinInt.h,v
retrieving revision 1.24
diff -u -u -r1.24 tclWinInt.h
--- win/tclWinInt.h	21 Jan 2004 19:59:34 -0000	1.24
+++ win/tclWinInt.h	29 Mar 2004 21:52:33 -0000
@@ -14,12 +14,7 @@
 #ifndef _TCLWININT
 #define _TCLWININT
 
-#ifndef _TCLINT
 #include "tclInt.h"
-#endif
-#ifndef _TCLPORT
-#include "tclPort.h"
-#endif
 
 /*
  * The following specifies how much stack space TclpCheckStackSpace()
@@ -146,14 +141,24 @@
  * stubs table.
  */
 
+EXTERN char		TclWinDriveLetterForVolMountPoint(
+				CONST WCHAR *mountPoint);
 EXTERN void		TclWinEncodingsCleanup();
-EXTERN void		TclWinResetInterfaceEncodings();
 EXTERN void		TclWinInit(HINSTANCE hInst);
+EXTERN TclFile		TclWinMakeFile(HANDLE handle);
+EXTERN Tcl_Channel	TclWinOpenConsoleChannel(HANDLE handle,
+				char *channelName, int permissions);
+EXTERN Tcl_Channel	TclWinOpenFileChannel(HANDLE handle, char *channelName,
+				int permissions, int appendMode);
+EXTERN Tcl_Channel	TclWinOpenSerialChannel(HANDLE handle,
+				char *channelName, int permissions);
+EXTERN void		TclWinResetInterfaceEncodings();
+EXTERN HANDLE		TclWinSerialReopen(HANDLE handle, CONST TCHAR *name,
+				DWORD access);
 EXTERN int              TclWinSymLinkCopyDirectory(CONST TCHAR* LinkOriginal,
-						   CONST TCHAR* LinkCopy);
+				CONST TCHAR* LinkCopy);
 EXTERN int              TclWinSymLinkDelete(CONST TCHAR* LinkOriginal, 
-					    int linkOnly);
-EXTERN char TclWinDriveLetterForVolMountPoint(CONST WCHAR *mountPoint);
+				int linkOnly);
 #if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
 EXTERN void		TclWinFreeAllocCache(void);
 EXTERN void		TclFreeAllocCache(void *);
@@ -167,8 +172,6 @@
 #define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
 #endif
 
-#include "tclIntPlatDecls.h"
-
 # undef TCL_STORAGE_CLASS
 # define TCL_STORAGE_CLASS DLLIMPORT
 
Index: win/tclWinMtherr.c
===================================================================
RCS file: win/tclWinMtherr.c
diff -N win/tclWinMtherr.c
--- win/tclWinMtherr.c	31 May 2002 22:20:22 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-/* 
- * tclWinMtherr.c --
- *
- *	This function provides a default implementation of the
- *	_matherr function for Borland C++.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinMtherr.c,v 1.5 2002/05/31 22:20:22 dgp Exp $
- */
-
-#include "tclWinInt.h"
-#include <math.h>
-
-
-/*
- *----------------------------------------------------------------------
- *
- * _matherr --
- *
- *	This procedure is invoked by Borland C++ when certain
- *	errors occur in mathematical functions.  This procedure
- *	replaces the default implementation which generates pop-up
- *	warnings.
- *
- * Results:
- *	Returns 1 to indicate that we've handled the error
- *	locally.
- *
- * Side effects:
- *	Sets errno based on what's in xPtr.
- *
- *----------------------------------------------------------------------
- */
-
-int
-_matherr(xPtr)
-    struct exception *xPtr;	/* Describes error that occurred. */
-{
-    if ((xPtr->type == DOMAIN)
-#ifdef __BORLANDC__
-	    || (xPtr->type == TLOSS)
-#endif
-	    || (xPtr->type == SING)) {
-	errno = EDOM;
-    } else {
-	errno = ERANGE;
-    }
-    return 1;
-}
Index: win/tclWinNotify.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinNotify.c,v
retrieving revision 1.15
diff -u -u -r1.15 tclWinNotify.c
--- win/tclWinNotify.c	16 Mar 2004 03:40:36 -0000	1.15
+++ win/tclWinNotify.c	29 Mar 2004 21:52:33 -0000
@@ -13,7 +13,7 @@
  * RCS: @(#) $Id: tclWinNotify.c,v 1.15 2004/03/16 03:40:36 davygrvy Exp $
  */
 
-#include "tclWinInt.h"
+#include "tclInt.h"
 
 /*
  * The follwing static indicates whether this module has been initialized.
Index: win/tclWinPort.h
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinPort.h,v
retrieving revision 1.39
diff -u -u -r1.39 tclWinPort.h
--- win/tclWinPort.h	5 Mar 2004 21:27:46 -0000	1.39
+++ win/tclWinPort.h	29 Mar 2004 21:52:33 -0000
@@ -16,10 +16,6 @@
 #ifndef _TCLWINPORT
 #define _TCLWINPORT
 
-#ifndef _TCLINT
-#   include "tclInt.h"
-#endif
-
 #ifdef CHECK_UNICODE_CALLS
 #   define _UNICODE
 #   define UNICODE
@@ -499,24 +495,6 @@
 #define TclpExit		exit
 
 /*
- * Declarations for Windows-only functions.
- */
-
-EXTERN HANDLE	    TclWinSerialReopen _ANSI_ARGS_(( HANDLE handle,
-			CONST TCHAR *name, DWORD access));
-
-EXTERN Tcl_Channel  TclWinOpenSerialChannel _ANSI_ARGS_((HANDLE handle,
-                        char *channelName, int permissions));
-					 
-EXTERN Tcl_Channel  TclWinOpenConsoleChannel _ANSI_ARGS_((HANDLE handle,
-                        char *channelName, int permissions));
-
-EXTERN Tcl_Channel  TclWinOpenFileChannel _ANSI_ARGS_((HANDLE handle,
-                        char *channelName, int permissions, int appendMode));
-
-EXTERN TclFile TclWinMakeFile _ANSI_ARGS_((HANDLE handle));
-
-/*
  * Platform specific mutex definition used by memory allocators.
  * These mutexes are statically allocated and explicitly initialized.
  * Most modules do not use this, but instead use Tcl_Mutex types and
@@ -546,9 +524,6 @@
 #define INVALID_SET_FILE_POINTER 0xFFFFFFFF
 #endif /* INVALID_SET_FILE_POINTER */
 
-#include "tclPlatDecls.h"
-#include "tclIntPlatDecls.h"
-
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
Index: win/tclWinReg.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinReg.c,v
retrieving revision 1.27
diff -u -u -r1.27 tclWinReg.c
--- win/tclWinReg.c	19 Mar 2004 18:33:53 -0000	1.27
+++ win/tclWinReg.c	29 Mar 2004 21:52:33 -0000
@@ -14,7 +14,7 @@
  * RCS: @(#) $Id: tclWinReg.c,v 1.27 2004/03/19 18:33:53 kennykb Exp $
  */
 
-#include <tclInt.h>
+#include "tclInt.h"
 #ifdef _MSC_VER
 #   pragma comment (lib, "advapi32.lib")
 #endif
Index: win/tclWinTest.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinTest.c,v
retrieving revision 1.9
diff -u -u -r1.9 tclWinTest.c
--- win/tclWinTest.c	12 Apr 2003 19:08:55 -0000	1.9
+++ win/tclWinTest.c	29 Mar 2004 21:52:33 -0000
@@ -12,7 +12,7 @@
  */
 
 #define USE_COMPAT_CONST
-#include "tclWinInt.h"
+#include "tclInt.h"
 
 /*
  * Forward declarations of procedures defined later in this file:
Index: win/tclWinTime.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinTime.c,v
retrieving revision 1.23
diff -u -u -r1.23 tclWinTime.c
--- win/tclWinTime.c	19 Mar 2004 18:33:53 -0000	1.23
+++ win/tclWinTime.c	29 Mar 2004 21:52:33 -0000
@@ -12,7 +12,7 @@
  * RCS: @(#) $Id: tclWinTime.c,v 1.23 2004/03/19 18:33:53 kennykb Exp $
  */
 
-#include "tclWinInt.h"
+#include "tclInt.h"
 
 #define SECSPERDAY (60L * 60L * 24L)
 #define SECSPERYEAR (SECSPERDAY * 365L)
