Destroy all the TCL_STORAGE_CLASS and associated nonsense.

19 files changed, 927 insertions, 1105 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 818f713..ec7864d 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -21,7 +21,7 @@ library tcl
 
 interface tcl
 hooks {tclPlat tclInt tclIntPlat}
-scspec EXTERN
+scspec TCLAPI
 
 # Declare each of the functions in the public Tcl interface.  Note that
 # the an index should never be reused for a different function in order
diff --git a/generic/tcl.h b/generic/tcl.h
index 1926dc7..786c64e 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -214,15 +214,10 @@ extern "C" {
  * be reset to DLLIMPORT.
  */
 
-#undef TCL_STORAGE_CLASS
 #ifdef BUILD_tcl
-#   define TCL_STORAGE_CLASS DLLEXPORT
+#   define TCLAPI DLLEXPORT
 #else
-#   ifdef USE_TCL_STUBS
-#      define TCL_STORAGE_CLASS
-#   else
-#      define TCL_STORAGE_CLASS DLLIMPORT
-#   endif
+#   define TCLAPI DLLIMPORT
 #endif
 
 /*
@@ -235,20 +230,6 @@ extern "C" {
 #endif
 
 /*
- * Make sure EXTERN isn't defined elsewhere.
- */
-
-#ifdef EXTERN
-#   undef EXTERN
-#endif /* EXTERN */
-
-#ifdef __cplusplus
-#   define EXTERN extern "C" TCL_STORAGE_CLASS
-#else
-#   define EXTERN extern TCL_STORAGE_CLASS
-#endif
-
-/*
  *----------------------------------------------------------------------------
  * The following code is copied from winnt.h. If we don't replicate it here,
  * then <windows.h> can't be included after tcl.h, since tcl.h also defines
@@ -2295,13 +2276,13 @@ const char *		TclTomMathInitializeStubs(Tcl_Interp *interp,
 
 #define Tcl_Main(argc, argv, proc) Tcl_MainEx(argc, argv, proc, \
 	    (Tcl_FindExecutable(argv[0]), (Tcl_CreateInterp)()))
-EXTERN void		Tcl_FindExecutable(const char *argv0);
-EXTERN void		Tcl_MainEx(int argc, char **argv,
+TCLAPI void		Tcl_FindExecutable(const char *argv0);
+TCLAPI void		Tcl_MainEx(int argc, char **argv,
 			    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
-EXTERN const char *	Tcl_PkgInitStubsCheck(Tcl_Interp *interp,
+TCLAPI const char *	Tcl_PkgInitStubsCheck(Tcl_Interp *interp,
 			    const char *version, int exact);
 #if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
-EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
+TCLAPI void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
 #endif
 
 /*
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index e12e969..d152ea8 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -12,17 +12,6 @@
 #ifndef _TCLDECLS
 #define _TCLDECLS
 
-#undef TCL_STORAGE_CLASS
-#ifdef BUILD_tcl
-#   define TCL_STORAGE_CLASS DLLEXPORT
-#else
-#   ifdef USE_TCL_STUBS
-#      define TCL_STORAGE_CLASS
-#   else
-#      define TCL_STORAGE_CLASS DLLIMPORT
-#   endif
-#endif
-
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
  * script.  Any modifications to the function declarations below should be made
@@ -36,1749 +25,1749 @@
  */
 
 /* 0 */
-EXTERN int		Tcl_PkgProvideEx(Tcl_Interp *interp,
+TCLAPI int		Tcl_PkgProvideEx(Tcl_Interp *interp,
 				const char *name, const char *version,
 				const void *clientData);
 /* 1 */
-EXTERN const char *	Tcl_PkgRequireEx(Tcl_Interp *interp,
+TCLAPI const char *	Tcl_PkgRequireEx(Tcl_Interp *interp,
 				const char *name, const char *version,
 				int exact, void *clientDataPtr);
 /* 2 */
-EXTERN void		Tcl_Panic(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
+TCLAPI void		Tcl_Panic(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
 /* 3 */
-EXTERN char *		Tcl_Alloc(unsigned int size);
+TCLAPI char *		Tcl_Alloc(unsigned int size);
 /* 4 */
-EXTERN void		Tcl_Free(char *ptr);
+TCLAPI void		Tcl_Free(char *ptr);
 /* 5 */
-EXTERN char *		Tcl_Realloc(char *ptr, unsigned int size);
+TCLAPI char *		Tcl_Realloc(char *ptr, unsigned int size);
 /* 6 */
-EXTERN char *		Tcl_DbCkalloc(unsigned int size, const char *file,
+TCLAPI char *		Tcl_DbCkalloc(unsigned int size, const char *file,
 				int line);
 /* 7 */
-EXTERN void		Tcl_DbCkfree(char *ptr, const char *file, int line);
+TCLAPI void		Tcl_DbCkfree(char *ptr, const char *file, int line);
 /* 8 */
-EXTERN char *		Tcl_DbCkrealloc(char *ptr, unsigned int size,
+TCLAPI char *		Tcl_DbCkrealloc(char *ptr, unsigned int size,
 				const char *file, int line);
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
 /* 9 */
-EXTERN void		Tcl_CreateFileHandler(int fd, int mask,
+TCLAPI void		Tcl_CreateFileHandler(int fd, int mask,
 				Tcl_FileProc *proc, ClientData clientData);
 #endif /* UNIX */
 #ifdef MAC_OSX_TCL /* MACOSX */
 /* 9 */
-EXTERN void		Tcl_CreateFileHandler(int fd, int mask,
+TCLAPI void		Tcl_CreateFileHandler(int fd, int mask,
 				Tcl_FileProc *proc, ClientData clientData);
 #endif /* MACOSX */
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
 /* 10 */
-EXTERN void		Tcl_DeleteFileHandler(int fd);
+TCLAPI void		Tcl_DeleteFileHandler(int fd);
 #endif /* UNIX */
 #ifdef MAC_OSX_TCL /* MACOSX */
 /* 10 */
-EXTERN void		Tcl_DeleteFileHandler(int fd);
+TCLAPI void		Tcl_DeleteFileHandler(int fd);
 #endif /* MACOSX */
 /* 11 */
-EXTERN void		Tcl_SetTimer(const Tcl_Time *timePtr);
+TCLAPI void		Tcl_SetTimer(const Tcl_Time *timePtr);
 /* 12 */
-EXTERN void		Tcl_Sleep(int ms);
+TCLAPI void		Tcl_Sleep(int ms);
 /* 13 */
-EXTERN int		Tcl_WaitForEvent(const Tcl_Time *timePtr);
+TCLAPI int		Tcl_WaitForEvent(const Tcl_Time *timePtr);
 /* 14 */
-EXTERN int		Tcl_AppendAllObjTypes(Tcl_Interp *interp,
+TCLAPI int		Tcl_AppendAllObjTypes(Tcl_Interp *interp,
 				Tcl_Obj *objPtr);
 /* 15 */
-EXTERN void		Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...);
+TCLAPI void		Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...);
 /* 16 */
-EXTERN void		Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes,
+TCLAPI void		Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes,
 				int length);
 /* 17 */
-EXTERN Tcl_Obj *	Tcl_ConcatObj(int objc, Tcl_Obj *const objv[]);
+TCLAPI Tcl_Obj *	Tcl_ConcatObj(int objc, Tcl_Obj *const objv[]);
 /* 18 */
-EXTERN int		Tcl_ConvertToType(Tcl_Interp *interp,
+TCLAPI int		Tcl_ConvertToType(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, const Tcl_ObjType *typePtr);
 /* 19 */
-EXTERN void		Tcl_DbDecrRefCount(Tcl_Obj *objPtr, const char *file,
+TCLAPI void		Tcl_DbDecrRefCount(Tcl_Obj *objPtr, const char *file,
 				int line);
 /* 20 */
-EXTERN void		Tcl_DbIncrRefCount(Tcl_Obj *objPtr, const char *file,
+TCLAPI void		Tcl_DbIncrRefCount(Tcl_Obj *objPtr, const char *file,
 				int line);
 /* 21 */
-EXTERN int		Tcl_DbIsShared(Tcl_Obj *objPtr, const char *file,
+TCLAPI int		Tcl_DbIsShared(Tcl_Obj *objPtr, const char *file,
 				int line);
 /* 22 */
-EXTERN Tcl_Obj *	Tcl_DbNewBooleanObj(int boolValue, const char *file,
+TCLAPI Tcl_Obj *	Tcl_DbNewBooleanObj(int boolValue, const char *file,
 				int line);
 /* 23 */
-EXTERN Tcl_Obj *	Tcl_DbNewByteArrayObj(const unsigned char *bytes,
+TCLAPI Tcl_Obj *	Tcl_DbNewByteArrayObj(const unsigned char *bytes,
 				int length, const char *file, int line);
 /* 24 */
-EXTERN Tcl_Obj *	Tcl_DbNewDoubleObj(double doubleValue,
+TCLAPI Tcl_Obj *	Tcl_DbNewDoubleObj(double doubleValue,
 				const char *file, int line);
 /* 25 */
-EXTERN Tcl_Obj *	Tcl_DbNewListObj(int objc, Tcl_Obj *const *objv,
+TCLAPI Tcl_Obj *	Tcl_DbNewListObj(int objc, Tcl_Obj *const *objv,
 				const char *file, int line);
 /* 26 */
-EXTERN Tcl_Obj *	Tcl_DbNewLongObj(long longValue, const char *file,
+TCLAPI Tcl_Obj *	Tcl_DbNewLongObj(long longValue, const char *file,
 				int line);
 /* 27 */
-EXTERN Tcl_Obj *	Tcl_DbNewObj(const char *file, int line);
+TCLAPI Tcl_Obj *	Tcl_DbNewObj(const char *file, int line);
 /* 28 */
-EXTERN Tcl_Obj *	Tcl_DbNewStringObj(const char *bytes, int length,
+TCLAPI Tcl_Obj *	Tcl_DbNewStringObj(const char *bytes, int length,
 				const char *file, int line);
 /* 29 */
-EXTERN Tcl_Obj *	Tcl_DuplicateObj(Tcl_Obj *objPtr);
+TCLAPI Tcl_Obj *	Tcl_DuplicateObj(Tcl_Obj *objPtr);
 /* 30 */
-EXTERN void		TclFreeObj(Tcl_Obj *objPtr);
+TCLAPI void		TclFreeObj(Tcl_Obj *objPtr);
 /* 31 */
-EXTERN int		Tcl_GetBoolean(Tcl_Interp *interp, const char *src,
+TCLAPI int		Tcl_GetBoolean(Tcl_Interp *interp, const char *src,
 				int *boolPtr);
 /* 32 */
-EXTERN int		Tcl_GetBooleanFromObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetBooleanFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *boolPtr);
 /* 33 */
-EXTERN unsigned char *	Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr,
+TCLAPI unsigned char *	Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr,
 				int *lengthPtr);
 /* 34 */
-EXTERN int		Tcl_GetDouble(Tcl_Interp *interp, const char *src,
+TCLAPI int		Tcl_GetDouble(Tcl_Interp *interp, const char *src,
 				double *doublePtr);
 /* 35 */
-EXTERN int		Tcl_GetDoubleFromObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetDoubleFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, double *doublePtr);
 /* 36 */
-EXTERN int		Tcl_GetIndexFromObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetIndexFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, const char *const *tablePtr,
 				const char *msg, int flags, int *indexPtr);
 /* 37 */
-EXTERN int		Tcl_GetInt(Tcl_Interp *interp, const char *src,
+TCLAPI int		Tcl_GetInt(Tcl_Interp *interp, const char *src,
 				int *intPtr);
 /* 38 */
-EXTERN int		Tcl_GetIntFromObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetIntFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *intPtr);
 /* 39 */
-EXTERN int		Tcl_GetLongFromObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetLongFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, long *longPtr);
 /* 40 */
-EXTERN const Tcl_ObjType * Tcl_GetObjType(const char *typeName);
+TCLAPI const Tcl_ObjType * Tcl_GetObjType(const char *typeName);
 /* 41 */
-EXTERN char *		Tcl_GetStringFromObj(Tcl_Obj *objPtr, int *lengthPtr);
+TCLAPI char *		Tcl_GetStringFromObj(Tcl_Obj *objPtr, int *lengthPtr);
 /* 42 */
-EXTERN void		Tcl_InvalidateStringRep(Tcl_Obj *objPtr);
+TCLAPI void		Tcl_InvalidateStringRep(Tcl_Obj *objPtr);
 /* 43 */
-EXTERN int		Tcl_ListObjAppendList(Tcl_Interp *interp,
+TCLAPI int		Tcl_ListObjAppendList(Tcl_Interp *interp,
 				Tcl_Obj *listPtr, Tcl_Obj *elemListPtr);
 /* 44 */
-EXTERN int		Tcl_ListObjAppendElement(Tcl_Interp *interp,
+TCLAPI int		Tcl_ListObjAppendElement(Tcl_Interp *interp,
 				Tcl_Obj *listPtr, Tcl_Obj *objPtr);
 /* 45 */
-EXTERN int		Tcl_ListObjGetElements(Tcl_Interp *interp,
+TCLAPI int		Tcl_ListObjGetElements(Tcl_Interp *interp,
 				Tcl_Obj *listPtr, int *objcPtr,
 				Tcl_Obj ***objvPtr);
 /* 46 */
-EXTERN int		Tcl_ListObjIndex(Tcl_Interp *interp,
+TCLAPI int		Tcl_ListObjIndex(Tcl_Interp *interp,
 				Tcl_Obj *listPtr, int index,
 				Tcl_Obj **objPtrPtr);
 /* 47 */
-EXTERN int		Tcl_ListObjLength(Tcl_Interp *interp,
+TCLAPI int		Tcl_ListObjLength(Tcl_Interp *interp,
 				Tcl_Obj *listPtr, int *lengthPtr);
 /* 48 */
-EXTERN int		Tcl_ListObjReplace(Tcl_Interp *interp,
+TCLAPI int		Tcl_ListObjReplace(Tcl_Interp *interp,
 				Tcl_Obj *listPtr, int first, int count,
 				int objc, Tcl_Obj *const objv[]);
 /* 49 */
-EXTERN Tcl_Obj *	Tcl_NewBooleanObj(int boolValue);
+TCLAPI Tcl_Obj *	Tcl_NewBooleanObj(int boolValue);
 /* 50 */
-EXTERN Tcl_Obj *	Tcl_NewByteArrayObj(const unsigned char *bytes,
+TCLAPI Tcl_Obj *	Tcl_NewByteArrayObj(const unsigned char *bytes,
 				int length);
 /* 51 */
-EXTERN Tcl_Obj *	Tcl_NewDoubleObj(double doubleValue);
+TCLAPI Tcl_Obj *	Tcl_NewDoubleObj(double doubleValue);
 /* 52 */
-EXTERN Tcl_Obj *	Tcl_NewIntObj(int intValue);
+TCLAPI Tcl_Obj *	Tcl_NewIntObj(int intValue);
 /* 53 */
-EXTERN Tcl_Obj *	Tcl_NewListObj(int objc, Tcl_Obj *const objv[]);
+TCLAPI Tcl_Obj *	Tcl_NewListObj(int objc, Tcl_Obj *const objv[]);
 /* 54 */
-EXTERN Tcl_Obj *	Tcl_NewLongObj(long longValue);
+TCLAPI Tcl_Obj *	Tcl_NewLongObj(long longValue);
 /* 55 */
-EXTERN Tcl_Obj *	Tcl_NewObj(void);
+TCLAPI Tcl_Obj *	Tcl_NewObj(void);
 /* 56 */
-EXTERN Tcl_Obj *	Tcl_NewStringObj(const char *bytes, int length);
+TCLAPI Tcl_Obj *	Tcl_NewStringObj(const char *bytes, int length);
 /* 57 */
-EXTERN void		Tcl_SetBooleanObj(Tcl_Obj *objPtr, int boolValue);
+TCLAPI void		Tcl_SetBooleanObj(Tcl_Obj *objPtr, int boolValue);
 /* 58 */
-EXTERN unsigned char *	Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int length);
+TCLAPI unsigned char *	Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int length);
 /* 59 */
-EXTERN void		Tcl_SetByteArrayObj(Tcl_Obj *objPtr,
+TCLAPI void		Tcl_SetByteArrayObj(Tcl_Obj *objPtr,
 				const unsigned char *bytes, int length);
 /* 60 */
-EXTERN void		Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue);
+TCLAPI void		Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue);
 /* 61 */
-EXTERN void		Tcl_SetIntObj(Tcl_Obj *objPtr, int intValue);
+TCLAPI void		Tcl_SetIntObj(Tcl_Obj *objPtr, int intValue);
 /* 62 */
-EXTERN void		Tcl_SetListObj(Tcl_Obj *objPtr, int objc,
+TCLAPI void		Tcl_SetListObj(Tcl_Obj *objPtr, int objc,
 				Tcl_Obj *const objv[]);
 /* 63 */
-EXTERN void		Tcl_SetLongObj(Tcl_Obj *objPtr, long longValue);
+TCLAPI void		Tcl_SetLongObj(Tcl_Obj *objPtr, long longValue);
 /* 64 */
-EXTERN void		Tcl_SetObjLength(Tcl_Obj *objPtr, int length);
+TCLAPI void		Tcl_SetObjLength(Tcl_Obj *objPtr, int length);
 /* 65 */
-EXTERN void		Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes,
+TCLAPI void		Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes,
 				int length);
 /* 66 */
-EXTERN void		Tcl_AddErrorInfo(Tcl_Interp *interp,
+TCLAPI void		Tcl_AddErrorInfo(Tcl_Interp *interp,
 				const char *message);
 /* 67 */
-EXTERN void		Tcl_AddObjErrorInfo(Tcl_Interp *interp,
+TCLAPI void		Tcl_AddObjErrorInfo(Tcl_Interp *interp,
 				const char *message, int length);
 /* 68 */
-EXTERN void		Tcl_AllowExceptions(Tcl_Interp *interp);
+TCLAPI void		Tcl_AllowExceptions(Tcl_Interp *interp);
 /* 69 */
-EXTERN void		Tcl_AppendElement(Tcl_Interp *interp,
+TCLAPI void		Tcl_AppendElement(Tcl_Interp *interp,
 				const char *element);
 /* 70 */
-EXTERN void		Tcl_AppendResult(Tcl_Interp *interp, ...);
+TCLAPI void		Tcl_AppendResult(Tcl_Interp *interp, ...);
 /* 71 */
-EXTERN Tcl_AsyncHandler	 Tcl_AsyncCreate(Tcl_AsyncProc *proc,
+TCLAPI Tcl_AsyncHandler	 Tcl_AsyncCreate(Tcl_AsyncProc *proc,
 				ClientData clientData);
 /* 72 */
-EXTERN void		Tcl_AsyncDelete(Tcl_AsyncHandler async);
+TCLAPI void		Tcl_AsyncDelete(Tcl_AsyncHandler async);
 /* 73 */
-EXTERN int		Tcl_AsyncInvoke(Tcl_Interp *interp, int code);
+TCLAPI int		Tcl_AsyncInvoke(Tcl_Interp *interp, int code);
 /* 74 */
-EXTERN void		Tcl_AsyncMark(Tcl_AsyncHandler async);
+TCLAPI void		Tcl_AsyncMark(Tcl_AsyncHandler async);
 /* 75 */
-EXTERN int		Tcl_AsyncReady(void);
+TCLAPI int		Tcl_AsyncReady(void);
 /* 76 */
-EXTERN void		Tcl_BackgroundError(Tcl_Interp *interp);
+TCLAPI void		Tcl_BackgroundError(Tcl_Interp *interp);
 /* Slot 77 is reserved */
 /* 78 */
-EXTERN int		Tcl_BadChannelOption(Tcl_Interp *interp,
+TCLAPI int		Tcl_BadChannelOption(Tcl_Interp *interp,
 				const char *optionName,
 				const char *optionList);
 /* 79 */
-EXTERN void		Tcl_CallWhenDeleted(Tcl_Interp *interp,
+TCLAPI void		Tcl_CallWhenDeleted(Tcl_Interp *interp,
 				Tcl_InterpDeleteProc *proc,
 				ClientData clientData);
 /* 80 */
-EXTERN void		Tcl_CancelIdleCall(Tcl_IdleProc *idleProc,
+TCLAPI void		Tcl_CancelIdleCall(Tcl_IdleProc *idleProc,
 				ClientData clientData);
 /* 81 */
-EXTERN int		Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan);
+TCLAPI int		Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan);
 /* 82 */
-EXTERN int		Tcl_CommandComplete(const char *cmd);
+TCLAPI int		Tcl_CommandComplete(const char *cmd);
 /* 83 */
-EXTERN char *		Tcl_Concat(int argc, const char *const *argv);
+TCLAPI char *		Tcl_Concat(int argc, const char *const *argv);
 /* 84 */
-EXTERN int		Tcl_ConvertElement(const char *src, char *dst,
+TCLAPI int		Tcl_ConvertElement(const char *src, char *dst,
 				int flags);
 /* 85 */
-EXTERN int		Tcl_ConvertCountedElement(const char *src,
+TCLAPI int		Tcl_ConvertCountedElement(const char *src,
 				int length, char *dst, int flags);
 /* 86 */
-EXTERN int		Tcl_CreateAlias(Tcl_Interp *slave,
+TCLAPI int		Tcl_CreateAlias(Tcl_Interp *slave,
 				const char *slaveCmd, Tcl_Interp *target,
 				const char *targetCmd, int argc,
 				const char *const *argv);
 /* 87 */
-EXTERN int		Tcl_CreateAliasObj(Tcl_Interp *slave,
+TCLAPI int		Tcl_CreateAliasObj(Tcl_Interp *slave,
 				const char *slaveCmd, Tcl_Interp *target,
 				const char *targetCmd, int objc,
 				Tcl_Obj *const objv[]);
 /* 88 */
-EXTERN Tcl_Channel	Tcl_CreateChannel(const Tcl_ChannelType *typePtr,
+TCLAPI Tcl_Channel	Tcl_CreateChannel(const Tcl_ChannelType *typePtr,
 				const char *chanName,
 				ClientData instanceData, int mask);
 /* 89 */
-EXTERN void		Tcl_CreateChannelHandler(Tcl_Channel chan, int mask,
+TCLAPI void		Tcl_CreateChannelHandler(Tcl_Channel chan, int mask,
 				Tcl_ChannelProc *proc, ClientData clientData);
 /* 90 */
-EXTERN void		Tcl_CreateCloseHandler(Tcl_Channel chan,
+TCLAPI void		Tcl_CreateCloseHandler(Tcl_Channel chan,
 				Tcl_CloseProc *proc, ClientData clientData);
 /* 91 */
-EXTERN Tcl_Command	Tcl_CreateCommand(Tcl_Interp *interp,
+TCLAPI Tcl_Command	Tcl_CreateCommand(Tcl_Interp *interp,
 				const char *cmdName, Tcl_CmdProc *proc,
 				ClientData clientData,
 				Tcl_CmdDeleteProc *deleteProc);
 /* 92 */
-EXTERN void		Tcl_CreateEventSource(Tcl_EventSetupProc *setupProc,
+TCLAPI void		Tcl_CreateEventSource(Tcl_EventSetupProc *setupProc,
 				Tcl_EventCheckProc *checkProc,
 				ClientData clientData);
 /* 93 */
-EXTERN void		Tcl_CreateExitHandler(Tcl_ExitProc *proc,
+TCLAPI void		Tcl_CreateExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
 /* 94 */
-EXTERN Tcl_Interp *	Tcl_CreateInterp(void);
+TCLAPI Tcl_Interp *	Tcl_CreateInterp(void);
 /* Slot 95 is reserved */
 /* 96 */
-EXTERN Tcl_Command	Tcl_CreateObjCommand(Tcl_Interp *interp,
+TCLAPI Tcl_Command	Tcl_CreateObjCommand(Tcl_Interp *interp,
 				const char *cmdName, Tcl_ObjCmdProc *proc,
 				ClientData clientData,
 				Tcl_CmdDeleteProc *deleteProc);
 /* 97 */
-EXTERN Tcl_Interp *	Tcl_CreateSlave(Tcl_Interp *interp,
+TCLAPI Tcl_Interp *	Tcl_CreateSlave(Tcl_Interp *interp,
 				const char *slaveName, int isSafe);
 /* 98 */
-EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler(int milliseconds,
+TCLAPI Tcl_TimerToken	Tcl_CreateTimerHandler(int milliseconds,
 				Tcl_TimerProc *proc, ClientData clientData);
 /* 99 */
-EXTERN Tcl_Trace	Tcl_CreateTrace(Tcl_Interp *interp, int level,
+TCLAPI Tcl_Trace	Tcl_CreateTrace(Tcl_Interp *interp, int level,
 				Tcl_CmdTraceProc *proc,
 				ClientData clientData);
 /* 100 */
-EXTERN void		Tcl_DeleteAssocData(Tcl_Interp *interp,
+TCLAPI void		Tcl_DeleteAssocData(Tcl_Interp *interp,
 				const char *name);
 /* 101 */
-EXTERN void		Tcl_DeleteChannelHandler(Tcl_Channel chan,
+TCLAPI void		Tcl_DeleteChannelHandler(Tcl_Channel chan,
 				Tcl_ChannelProc *proc, ClientData clientData);
 /* 102 */
-EXTERN void		Tcl_DeleteCloseHandler(Tcl_Channel chan,
+TCLAPI void		Tcl_DeleteCloseHandler(Tcl_Channel chan,
 				Tcl_CloseProc *proc, ClientData clientData);
 /* 103 */
-EXTERN int		Tcl_DeleteCommand(Tcl_Interp *interp,
+TCLAPI int		Tcl_DeleteCommand(Tcl_Interp *interp,
 				const char *cmdName);
 /* 104 */
-EXTERN int		Tcl_DeleteCommandFromToken(Tcl_Interp *interp,
+TCLAPI int		Tcl_DeleteCommandFromToken(Tcl_Interp *interp,
 				Tcl_Command command);
 /* 105 */
-EXTERN void		Tcl_DeleteEvents(Tcl_EventDeleteProc *proc,
+TCLAPI void		Tcl_DeleteEvents(Tcl_EventDeleteProc *proc,
 				ClientData clientData);
 /* 106 */
-EXTERN void		Tcl_DeleteEventSource(Tcl_EventSetupProc *setupProc,
+TCLAPI void		Tcl_DeleteEventSource(Tcl_EventSetupProc *setupProc,
 				Tcl_EventCheckProc *checkProc,
 				ClientData clientData);
 /* 107 */
-EXTERN void		Tcl_DeleteExitHandler(Tcl_ExitProc *proc,
+TCLAPI void		Tcl_DeleteExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
 /* 108 */
-EXTERN void		Tcl_DeleteHashEntry(Tcl_HashEntry *entryPtr);
+TCLAPI void		Tcl_DeleteHashEntry(Tcl_HashEntry *entryPtr);
 /* 109 */
-EXTERN void		Tcl_DeleteHashTable(Tcl_HashTable *tablePtr);
+TCLAPI void		Tcl_DeleteHashTable(Tcl_HashTable *tablePtr);
 /* 110 */
-EXTERN void		Tcl_DeleteInterp(Tcl_Interp *interp);
+TCLAPI void		Tcl_DeleteInterp(Tcl_Interp *interp);
 /* 111 */
-EXTERN void		Tcl_DetachPids(int numPids, Tcl_Pid *pidPtr);
+TCLAPI void		Tcl_DetachPids(int numPids, Tcl_Pid *pidPtr);
 /* 112 */
-EXTERN void		Tcl_DeleteTimerHandler(Tcl_TimerToken token);
+TCLAPI void		Tcl_DeleteTimerHandler(Tcl_TimerToken token);
 /* 113 */
-EXTERN void		Tcl_DeleteTrace(Tcl_Interp *interp, Tcl_Trace trace);
+TCLAPI void		Tcl_DeleteTrace(Tcl_Interp *interp, Tcl_Trace trace);
 /* 114 */
-EXTERN void		Tcl_DontCallWhenDeleted(Tcl_Interp *interp,
+TCLAPI void		Tcl_DontCallWhenDeleted(Tcl_Interp *interp,
 				Tcl_InterpDeleteProc *proc,
 				ClientData clientData);
 /* 115 */
-EXTERN int		Tcl_DoOneEvent(int flags);
+TCLAPI int		Tcl_DoOneEvent(int flags);
 /* 116 */
-EXTERN void		Tcl_DoWhenIdle(Tcl_IdleProc *proc,
+TCLAPI void		Tcl_DoWhenIdle(Tcl_IdleProc *proc,
 				ClientData clientData);
 /* 117 */
-EXTERN char *		Tcl_DStringAppend(Tcl_DString *dsPtr,
+TCLAPI char *		Tcl_DStringAppend(Tcl_DString *dsPtr,
 				const char *bytes, int length);
 /* 118 */
-EXTERN char *		Tcl_DStringAppendElement(Tcl_DString *dsPtr,
+TCLAPI char *		Tcl_DStringAppendElement(Tcl_DString *dsPtr,
 				const char *element);
 /* 119 */
-EXTERN void		Tcl_DStringEndSublist(Tcl_DString *dsPtr);
+TCLAPI void		Tcl_DStringEndSublist(Tcl_DString *dsPtr);
 /* 120 */
-EXTERN void		Tcl_DStringFree(Tcl_DString *dsPtr);
+TCLAPI void		Tcl_DStringFree(Tcl_DString *dsPtr);
 /* 121 */
-EXTERN void		Tcl_DStringGetResult(Tcl_Interp *interp,
+TCLAPI void		Tcl_DStringGetResult(Tcl_Interp *interp,
 				Tcl_DString *dsPtr);
 /* 122 */
-EXTERN void		Tcl_DStringInit(Tcl_DString *dsPtr);
+TCLAPI void		Tcl_DStringInit(Tcl_DString *dsPtr);
 /* 123 */
-EXTERN void		Tcl_DStringResult(Tcl_Interp *interp,
+TCLAPI void		Tcl_DStringResult(Tcl_Interp *interp,
 				Tcl_DString *dsPtr);
 /* 124 */
-EXTERN void		Tcl_DStringSetLength(Tcl_DString *dsPtr, int length);
+TCLAPI void		Tcl_DStringSetLength(Tcl_DString *dsPtr, int length);
 /* 125 */
-EXTERN void		Tcl_DStringStartSublist(Tcl_DString *dsPtr);
+TCLAPI void		Tcl_DStringStartSublist(Tcl_DString *dsPtr);
 /* 126 */
-EXTERN int		Tcl_Eof(Tcl_Channel chan);
+TCLAPI int		Tcl_Eof(Tcl_Channel chan);
 /* 127 */
-EXTERN const char *	Tcl_ErrnoId(void);
+TCLAPI const char *	Tcl_ErrnoId(void);
 /* 128 */
-EXTERN const char *	Tcl_ErrnoMsg(int err);
+TCLAPI const char *	Tcl_ErrnoMsg(int err);
 /* 129 */
-EXTERN int		Tcl_Eval(Tcl_Interp *interp, const char *script);
+TCLAPI int		Tcl_Eval(Tcl_Interp *interp, const char *script);
 /* Slot 130 is reserved */
 /* 131 */
-EXTERN int		Tcl_EvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr);
+TCLAPI int		Tcl_EvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr);
 /* 132 */
-EXTERN void		Tcl_EventuallyFree(ClientData clientData,
+TCLAPI void		Tcl_EventuallyFree(ClientData clientData,
 				Tcl_FreeProc *freeProc);
 /* 133 */
-EXTERN void		Tcl_Exit(int status);
+TCLAPI void		Tcl_Exit(int status);
 /* 134 */
-EXTERN int		Tcl_ExposeCommand(Tcl_Interp *interp,
+TCLAPI int		Tcl_ExposeCommand(Tcl_Interp *interp,
 				const char *hiddenCmdToken,
 				const char *cmdName);
 /* 135 */
-EXTERN int		Tcl_ExprBoolean(Tcl_Interp *interp, const char *expr,
+TCLAPI int		Tcl_ExprBoolean(Tcl_Interp *interp, const char *expr,
 				int *ptr);
 /* 136 */
-EXTERN int		Tcl_ExprBooleanObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_ExprBooleanObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *ptr);
 /* 137 */
-EXTERN int		Tcl_ExprDouble(Tcl_Interp *interp, const char *expr,
+TCLAPI int		Tcl_ExprDouble(Tcl_Interp *interp, const char *expr,
 				double *ptr);
 /* 138 */
-EXTERN int		Tcl_ExprDoubleObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_ExprDoubleObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, double *ptr);
 /* 139 */
-EXTERN int		Tcl_ExprLong(Tcl_Interp *interp, const char *expr,
+TCLAPI int		Tcl_ExprLong(Tcl_Interp *interp, const char *expr,
 				long *ptr);
 /* 140 */
-EXTERN int		Tcl_ExprLongObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+TCLAPI int		Tcl_ExprLongObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				long *ptr);
 /* 141 */
-EXTERN int		Tcl_ExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+TCLAPI int		Tcl_ExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				Tcl_Obj **resultPtrPtr);
 /* 142 */
-EXTERN int		Tcl_ExprString(Tcl_Interp *interp, const char *expr);
+TCLAPI int		Tcl_ExprString(Tcl_Interp *interp, const char *expr);
 /* 143 */
-EXTERN void		Tcl_Finalize(void);
+TCLAPI void		Tcl_Finalize(void);
 /* Slot 144 is reserved */
 /* 145 */
-EXTERN Tcl_HashEntry *	Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
+TCLAPI Tcl_HashEntry *	Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
 				Tcl_HashSearch *searchPtr);
 /* 146 */
-EXTERN int		Tcl_Flush(Tcl_Channel chan);
+TCLAPI int		Tcl_Flush(Tcl_Channel chan);
 /* 147 */
-EXTERN void		Tcl_FreeResult(Tcl_Interp *interp);
+TCLAPI void		Tcl_FreeResult(Tcl_Interp *interp);
 /* 148 */
-EXTERN int		Tcl_GetAlias(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetAlias(Tcl_Interp *interp,
 				const char *slaveCmd,
 				Tcl_Interp **targetInterpPtr,
 				const char **targetCmdPtr, int *argcPtr,
 				const char ***argvPtr);
 /* 149 */
-EXTERN int		Tcl_GetAliasObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetAliasObj(Tcl_Interp *interp,
 				const char *slaveCmd,
 				Tcl_Interp **targetInterpPtr,
 				const char **targetCmdPtr, int *objcPtr,
 				Tcl_Obj ***objv);
 /* 150 */
-EXTERN ClientData	Tcl_GetAssocData(Tcl_Interp *interp,
+TCLAPI ClientData	Tcl_GetAssocData(Tcl_Interp *interp,
 				const char *name,
 				Tcl_InterpDeleteProc **procPtr);
 /* 151 */
-EXTERN Tcl_Channel	Tcl_GetChannel(Tcl_Interp *interp,
+TCLAPI Tcl_Channel	Tcl_GetChannel(Tcl_Interp *interp,
 				const char *chanName, int *modePtr);
 /* 152 */
-EXTERN int		Tcl_GetChannelBufferSize(Tcl_Channel chan);
+TCLAPI int		Tcl_GetChannelBufferSize(Tcl_Channel chan);
 /* 153 */
-EXTERN int		Tcl_GetChannelHandle(Tcl_Channel chan, int direction,
+TCLAPI int		Tcl_GetChannelHandle(Tcl_Channel chan, int direction,
 				ClientData *handlePtr);
 /* 154 */
-EXTERN ClientData	Tcl_GetChannelInstanceData(Tcl_Channel chan);
+TCLAPI ClientData	Tcl_GetChannelInstanceData(Tcl_Channel chan);
 /* 155 */
-EXTERN int		Tcl_GetChannelMode(Tcl_Channel chan);
+TCLAPI int		Tcl_GetChannelMode(Tcl_Channel chan);
 /* 156 */
-EXTERN const char *	Tcl_GetChannelName(Tcl_Channel chan);
+TCLAPI const char *	Tcl_GetChannelName(Tcl_Channel chan);
 /* 157 */
-EXTERN int		Tcl_GetChannelOption(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetChannelOption(Tcl_Interp *interp,
 				Tcl_Channel chan, const char *optionName,
 				Tcl_DString *dsPtr);
 /* 158 */
-EXTERN const Tcl_ChannelType * Tcl_GetChannelType(Tcl_Channel chan);
+TCLAPI const Tcl_ChannelType * Tcl_GetChannelType(Tcl_Channel chan);
 /* 159 */
-EXTERN int		Tcl_GetCommandInfo(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetCommandInfo(Tcl_Interp *interp,
 				const char *cmdName, Tcl_CmdInfo *infoPtr);
 /* 160 */
-EXTERN const char *	Tcl_GetCommandName(Tcl_Interp *interp,
+TCLAPI const char *	Tcl_GetCommandName(Tcl_Interp *interp,
 				Tcl_Command command);
 /* 161 */
-EXTERN int		Tcl_GetErrno(void);
+TCLAPI int		Tcl_GetErrno(void);
 /* 162 */
-EXTERN const char *	Tcl_GetHostName(void);
+TCLAPI const char *	Tcl_GetHostName(void);
 /* 163 */
-EXTERN int		Tcl_GetInterpPath(Tcl_Interp *askInterp,
+TCLAPI int		Tcl_GetInterpPath(Tcl_Interp *askInterp,
 				Tcl_Interp *slaveInterp);
 /* 164 */
-EXTERN Tcl_Interp *	Tcl_GetMaster(Tcl_Interp *interp);
+TCLAPI Tcl_Interp *	Tcl_GetMaster(Tcl_Interp *interp);
 /* 165 */
-EXTERN const char *	Tcl_GetNameOfExecutable(void);
+TCLAPI const char *	Tcl_GetNameOfExecutable(void);
 /* 166 */
-EXTERN Tcl_Obj *	Tcl_GetObjResult(Tcl_Interp *interp);
+TCLAPI Tcl_Obj *	Tcl_GetObjResult(Tcl_Interp *interp);
 #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
 /* 167 */
-EXTERN int		Tcl_GetOpenFile(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetOpenFile(Tcl_Interp *interp,
 				const char *chanID, int forWriting,
 				int checkUsage, ClientData *filePtr);
 #endif /* UNIX */
 #ifdef MAC_OSX_TCL /* MACOSX */
 /* 167 */
-EXTERN int		Tcl_GetOpenFile(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetOpenFile(Tcl_Interp *interp,
 				const char *chanID, int forWriting,
 				int checkUsage, ClientData *filePtr);
 #endif /* MACOSX */
 /* 168 */
-EXTERN Tcl_PathType	Tcl_GetPathType(const char *path);
+TCLAPI Tcl_PathType	Tcl_GetPathType(const char *path);
 /* 169 */
-EXTERN int		Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr);
+TCLAPI int		Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr);
 /* 170 */
-EXTERN int		Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+TCLAPI int		Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr);
 /* 171 */
-EXTERN int		Tcl_GetServiceMode(void);
+TCLAPI int		Tcl_GetServiceMode(void);
 /* 172 */
-EXTERN Tcl_Interp *	Tcl_GetSlave(Tcl_Interp *interp,
+TCLAPI Tcl_Interp *	Tcl_GetSlave(Tcl_Interp *interp,
 				const char *slaveName);
 /* 173 */
-EXTERN Tcl_Channel	Tcl_GetStdChannel(int type);
+TCLAPI Tcl_Channel	Tcl_GetStdChannel(int type);
 /* 174 */
-EXTERN const char *	Tcl_GetStringResult(Tcl_Interp *interp);
+TCLAPI const char *	Tcl_GetStringResult(Tcl_Interp *interp);
 /* 175 */
-EXTERN const char *	Tcl_GetVar(Tcl_Interp *interp, const char *varName,
+TCLAPI const char *	Tcl_GetVar(Tcl_Interp *interp, const char *varName,
 				int flags);
 /* 176 */
-EXTERN const char *	Tcl_GetVar2(Tcl_Interp *interp, const char *part1,
+TCLAPI const char *	Tcl_GetVar2(Tcl_Interp *interp, const char *part1,
 				const char *part2, int flags);
 /* Slot 177 is reserved */
 /* Slot 178 is reserved */
 /* 179 */
-EXTERN int		Tcl_HideCommand(Tcl_Interp *interp,
+TCLAPI int		Tcl_HideCommand(Tcl_Interp *interp,
 				const char *cmdName,
 				const char *hiddenCmdToken);
 /* 180 */
-EXTERN int		Tcl_Init(Tcl_Interp *interp);
+TCLAPI int		Tcl_Init(Tcl_Interp *interp);
 /* 181 */
-EXTERN void		Tcl_InitHashTable(Tcl_HashTable *tablePtr,
+TCLAPI void		Tcl_InitHashTable(Tcl_HashTable *tablePtr,
 				int keyType);
 /* 182 */
-EXTERN int		Tcl_InputBlocked(Tcl_Channel chan);
+TCLAPI int		Tcl_InputBlocked(Tcl_Channel chan);
 /* 183 */
-EXTERN int		Tcl_InputBuffered(Tcl_Channel chan);
+TCLAPI int		Tcl_InputBuffered(Tcl_Channel chan);
 /* 184 */
-EXTERN int		Tcl_InterpDeleted(Tcl_Interp *interp);
+TCLAPI int		Tcl_InterpDeleted(Tcl_Interp *interp);
 /* 185 */
-EXTERN int		Tcl_IsSafe(Tcl_Interp *interp);
+TCLAPI int		Tcl_IsSafe(Tcl_Interp *interp);
 /* 186 */
-EXTERN char *		Tcl_JoinPath(int argc, const char *const *argv,
+TCLAPI char *		Tcl_JoinPath(int argc, const char *const *argv,
 				Tcl_DString *resultPtr);
 /* 187 */
-EXTERN int		Tcl_LinkVar(Tcl_Interp *interp, const char *varName,
+TCLAPI int		Tcl_LinkVar(Tcl_Interp *interp, const char *varName,
 				char *addr, int type);
 /* Slot 188 is reserved */
 /* 189 */
-EXTERN Tcl_Channel	Tcl_MakeFileChannel(ClientData handle, int mode);
+TCLAPI Tcl_Channel	Tcl_MakeFileChannel(ClientData handle, int mode);
 /* 190 */
-EXTERN int		Tcl_MakeSafe(Tcl_Interp *interp);
+TCLAPI int		Tcl_MakeSafe(Tcl_Interp *interp);
 /* 191 */
-EXTERN Tcl_Channel	Tcl_MakeTcpClientChannel(ClientData tcpSocket);
+TCLAPI Tcl_Channel	Tcl_MakeTcpClientChannel(ClientData tcpSocket);
 /* 192 */
-EXTERN char *		Tcl_Merge(int argc, const char *const *argv);
+TCLAPI char *		Tcl_Merge(int argc, const char *const *argv);
 /* 193 */
-EXTERN Tcl_HashEntry *	Tcl_NextHashEntry(Tcl_HashSearch *searchPtr);
+TCLAPI Tcl_HashEntry *	Tcl_NextHashEntry(Tcl_HashSearch *searchPtr);
 /* 194 */
-EXTERN void		Tcl_NotifyChannel(Tcl_Channel channel, int mask);
+TCLAPI void		Tcl_NotifyChannel(Tcl_Channel channel, int mask);
 /* 195 */
-EXTERN Tcl_Obj *	Tcl_ObjGetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
+TCLAPI Tcl_Obj *	Tcl_ObjGetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
 				Tcl_Obj *part2Ptr, int flags);
 /* 196 */
-EXTERN Tcl_Obj *	Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
+TCLAPI Tcl_Obj *	Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
 				Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr,
 				int flags);
 /* 197 */
-EXTERN Tcl_Channel	Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc,
+TCLAPI Tcl_Channel	Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc,
 				const char **argv, int flags);
 /* 198 */
-EXTERN Tcl_Channel	Tcl_OpenFileChannel(Tcl_Interp *interp,
+TCLAPI Tcl_Channel	Tcl_OpenFileChannel(Tcl_Interp *interp,
 				const char *fileName, const char *modeString,
 				int permissions);
 /* 199 */
-EXTERN Tcl_Channel	Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
+TCLAPI Tcl_Channel	Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
 				const char *address, const char *myaddr,
 				int myport, int async);
 /* 200 */
-EXTERN Tcl_Channel	Tcl_OpenTcpServer(Tcl_Interp *interp, int port,
+TCLAPI Tcl_Channel	Tcl_OpenTcpServer(Tcl_Interp *interp, int port,
 				const char *host,
 				Tcl_TcpAcceptProc *acceptProc,
 				ClientData callbackData);
 /* 201 */
-EXTERN void		Tcl_Preserve(ClientData data);
+TCLAPI void		Tcl_Preserve(ClientData data);
 /* 202 */
-EXTERN void		Tcl_PrintDouble(Tcl_Interp *interp, double value,
+TCLAPI void		Tcl_PrintDouble(Tcl_Interp *interp, double value,
 				char *dst);
 /* 203 */
-EXTERN int		Tcl_PutEnv(const char *assignment);
+TCLAPI int		Tcl_PutEnv(const char *assignment);
 /* 204 */
-EXTERN const char *	Tcl_PosixError(Tcl_Interp *interp);
+TCLAPI const char *	Tcl_PosixError(Tcl_Interp *interp);
 /* 205 */
-EXTERN void		Tcl_QueueEvent(Tcl_Event *evPtr,
+TCLAPI void		Tcl_QueueEvent(Tcl_Event *evPtr,
 				Tcl_QueuePosition position);
 /* 206 */
-EXTERN int		Tcl_Read(Tcl_Channel chan, char *bufPtr, int toRead);
+TCLAPI int		Tcl_Read(Tcl_Channel chan, char *bufPtr, int toRead);
 /* 207 */
-EXTERN void		Tcl_ReapDetachedProcs(void);
+TCLAPI void		Tcl_ReapDetachedProcs(void);
 /* 208 */
-EXTERN int		Tcl_RecordAndEval(Tcl_Interp *interp,
+TCLAPI int		Tcl_RecordAndEval(Tcl_Interp *interp,
 				const char *cmd, int flags);
 /* 209 */
-EXTERN int		Tcl_RecordAndEvalObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_RecordAndEvalObj(Tcl_Interp *interp,
 				Tcl_Obj *cmdPtr, int flags);
 /* 210 */
-EXTERN void		Tcl_RegisterChannel(Tcl_Interp *interp,
+TCLAPI void		Tcl_RegisterChannel(Tcl_Interp *interp,
 				Tcl_Channel chan);
 /* 211 */
-EXTERN void		Tcl_RegisterObjType(const Tcl_ObjType *typePtr);
+TCLAPI void		Tcl_RegisterObjType(const Tcl_ObjType *typePtr);
 /* 212 */
-EXTERN Tcl_RegExp	Tcl_RegExpCompile(Tcl_Interp *interp,
+TCLAPI Tcl_RegExp	Tcl_RegExpCompile(Tcl_Interp *interp,
 				const char *pattern);
 /* 213 */
-EXTERN int		Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp,
+TCLAPI int		Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp,
 				const char *text, const char *start);
 /* 214 */
-EXTERN int		Tcl_RegExpMatch(Tcl_Interp *interp, const char *text,
+TCLAPI int		Tcl_RegExpMatch(Tcl_Interp *interp, const char *text,
 				const char *pattern);
 /* 215 */
-EXTERN void		Tcl_RegExpRange(Tcl_RegExp regexp, int index,
+TCLAPI void		Tcl_RegExpRange(Tcl_RegExp regexp, int index,
 				const char **startPtr, const char **endPtr);
 /* 216 */
-EXTERN void		Tcl_Release(ClientData clientData);
+TCLAPI void		Tcl_Release(ClientData clientData);
 /* 217 */
-EXTERN void		Tcl_ResetResult(Tcl_Interp *interp);
+TCLAPI void		Tcl_ResetResult(Tcl_Interp *interp);
 /* 218 */
-EXTERN int		Tcl_ScanElement(const char *src, int *flagPtr);
+TCLAPI int		Tcl_ScanElement(const char *src, int *flagPtr);
 /* 219 */
-EXTERN int		Tcl_ScanCountedElement(const char *src, int length,
+TCLAPI int		Tcl_ScanCountedElement(const char *src, int length,
 				int *flagPtr);
 /* Slot 220 is reserved */
 /* 221 */
-EXTERN int		Tcl_ServiceAll(void);
+TCLAPI int		Tcl_ServiceAll(void);
 /* 222 */
-EXTERN int		Tcl_ServiceEvent(int flags);
+TCLAPI int		Tcl_ServiceEvent(int flags);
 /* 223 */
-EXTERN void		Tcl_SetAssocData(Tcl_Interp *interp,
+TCLAPI void		Tcl_SetAssocData(Tcl_Interp *interp,
 				const char *name, Tcl_InterpDeleteProc *proc,
 				ClientData clientData);
 /* 224 */
-EXTERN void		Tcl_SetChannelBufferSize(Tcl_Channel chan, int sz);
+TCLAPI void		Tcl_SetChannelBufferSize(Tcl_Channel chan, int sz);
 /* 225 */
-EXTERN int		Tcl_SetChannelOption(Tcl_Interp *interp,
+TCLAPI int		Tcl_SetChannelOption(Tcl_Interp *interp,
 				Tcl_Channel chan, const char *optionName,
 				const char *newValue);
 /* 226 */
-EXTERN int		Tcl_SetCommandInfo(Tcl_Interp *interp,
+TCLAPI int		Tcl_SetCommandInfo(Tcl_Interp *interp,
 				const char *cmdName,
 				const Tcl_CmdInfo *infoPtr);
 /* 227 */
-EXTERN void		Tcl_SetErrno(int err);
+TCLAPI void		Tcl_SetErrno(int err);
 /* 228 */
-EXTERN void		Tcl_SetErrorCode(Tcl_Interp *interp, ...);
+TCLAPI void		Tcl_SetErrorCode(Tcl_Interp *interp, ...);
 /* 229 */
-EXTERN void		Tcl_SetMaxBlockTime(const Tcl_Time *timePtr);
+TCLAPI void		Tcl_SetMaxBlockTime(const Tcl_Time *timePtr);
 /* 230 */
-EXTERN void		Tcl_SetPanicProc(Tcl_PanicProc *panicProc);
+TCLAPI void		Tcl_SetPanicProc(Tcl_PanicProc *panicProc);
 /* 231 */
-EXTERN int		Tcl_SetRecursionLimit(Tcl_Interp *interp, int depth);
+TCLAPI int		Tcl_SetRecursionLimit(Tcl_Interp *interp, int depth);
 /* 232 */
-EXTERN void		Tcl_SetResult(Tcl_Interp *interp, char *result,
+TCLAPI void		Tcl_SetResult(Tcl_Interp *interp, char *result,
 				Tcl_FreeProc *freeProc);
 /* 233 */
-EXTERN int		Tcl_SetServiceMode(int mode);
+TCLAPI int		Tcl_SetServiceMode(int mode);
 /* 234 */
-EXTERN void		Tcl_SetObjErrorCode(Tcl_Interp *interp,
+TCLAPI void		Tcl_SetObjErrorCode(Tcl_Interp *interp,
 				Tcl_Obj *errorObjPtr);
 /* 235 */
-EXTERN void		Tcl_SetObjResult(Tcl_Interp *interp,
+TCLAPI void		Tcl_SetObjResult(Tcl_Interp *interp,
 				Tcl_Obj *resultObjPtr);
 /* 236 */
-EXTERN void		Tcl_SetStdChannel(Tcl_Channel channel, int type);
+TCLAPI void		Tcl_SetStdChannel(Tcl_Channel channel, int type);
 /* 237 */
-EXTERN const char *	Tcl_SetVar(Tcl_Interp *interp, const char *varName,
+TCLAPI const char *	Tcl_SetVar(Tcl_Interp *interp, const char *varName,
 				const char *newValue, int flags);
 /* 238 */
-EXTERN const char *	Tcl_SetVar2(Tcl_Interp *interp, const char *part1,
+TCLAPI const char *	Tcl_SetVar2(Tcl_Interp *interp, const char *part1,
 				const char *part2, const char *newValue,
 				int flags);
 /* 239 */
-EXTERN const char *	Tcl_SignalId(int sig);
+TCLAPI const char *	Tcl_SignalId(int sig);
 /* 240 */
-EXTERN const char *	Tcl_SignalMsg(int sig);
+TCLAPI const char *	Tcl_SignalMsg(int sig);
 /* 241 */
-EXTERN void		Tcl_SourceRCFile(Tcl_Interp *interp);
+TCLAPI void		Tcl_SourceRCFile(Tcl_Interp *interp);
 /* 242 */
-EXTERN int		Tcl_SplitList(Tcl_Interp *interp,
+TCLAPI int		Tcl_SplitList(Tcl_Interp *interp,
 				const char *listStr, int *argcPtr,
 				const char ***argvPtr);
 /* 243 */
-EXTERN void		Tcl_SplitPath(const char *path, int *argcPtr,
+TCLAPI void		Tcl_SplitPath(const char *path, int *argcPtr,
 				const char ***argvPtr);
 /* 244 */
-EXTERN void		Tcl_StaticPackage(Tcl_Interp *interp,
+TCLAPI void		Tcl_StaticPackage(Tcl_Interp *interp,
 				const char *pkgName,
 				Tcl_PackageInitProc *initProc,
 				Tcl_PackageInitProc *safeInitProc);
 /* 245 */
-EXTERN int		Tcl_StringMatch(const char *str, const char *pattern);
+TCLAPI int		Tcl_StringMatch(const char *str, const char *pattern);
 /* Slot 246 is reserved */
 /* 247 */
-EXTERN int		Tcl_TraceVar(Tcl_Interp *interp, const char *varName,
+TCLAPI int		Tcl_TraceVar(Tcl_Interp *interp, const char *varName,
 				int flags, Tcl_VarTraceProc *proc,
 				ClientData clientData);
 /* 248 */
-EXTERN int		Tcl_TraceVar2(Tcl_Interp *interp, const char *part1,
+TCLAPI int		Tcl_TraceVar2(Tcl_Interp *interp, const char *part1,
 				const char *part2, int flags,
 				Tcl_VarTraceProc *proc,
 				ClientData clientData);
 /* 249 */
-EXTERN char *		Tcl_TranslateFileName(Tcl_Interp *interp,
+TCLAPI char *		Tcl_TranslateFileName(Tcl_Interp *interp,
 				const char *name, Tcl_DString *bufferPtr);
 /* 250 */
-EXTERN int		Tcl_Ungets(Tcl_Channel chan, const char *str,
+TCLAPI int		Tcl_Ungets(Tcl_Channel chan, const char *str,
 				int len, int atHead);
 /* 251 */
-EXTERN void		Tcl_UnlinkVar(Tcl_Interp *interp,
+TCLAPI void		Tcl_UnlinkVar(Tcl_Interp *interp,
 				const char *varName);
 /* 252 */
-EXTERN int		Tcl_UnregisterChannel(Tcl_Interp *interp,
+TCLAPI int		Tcl_UnregisterChannel(Tcl_Interp *interp,
 				Tcl_Channel chan);
 /* 253 */
-EXTERN int		Tcl_UnsetVar(Tcl_Interp *interp, const char *varName,
+TCLAPI int		Tcl_UnsetVar(Tcl_Interp *interp, const char *varName,
 				int flags);
 /* 254 */
-EXTERN int		Tcl_UnsetVar2(Tcl_Interp *interp, const char *part1,
+TCLAPI int		Tcl_UnsetVar2(Tcl_Interp *interp, const char *part1,
 				const char *part2, int flags);
 /* 255 */
-EXTERN void		Tcl_UntraceVar(Tcl_Interp *interp,
+TCLAPI void		Tcl_UntraceVar(Tcl_Interp *interp,
 				const char *varName, int flags,
 				Tcl_VarTraceProc *proc,
 				ClientData clientData);
 /* 256 */
-EXTERN void		Tcl_UntraceVar2(Tcl_Interp *interp,
+TCLAPI void		Tcl_UntraceVar2(Tcl_Interp *interp,
 				const char *part1, const char *part2,
 				int flags, Tcl_VarTraceProc *proc,
 				ClientData clientData);
 /* 257 */
-EXTERN void		Tcl_UpdateLinkedVar(Tcl_Interp *interp,
+TCLAPI void		Tcl_UpdateLinkedVar(Tcl_Interp *interp,
 				const char *varName);
 /* 258 */
-EXTERN int		Tcl_UpVar(Tcl_Interp *interp, const char *frameName,
+TCLAPI int		Tcl_UpVar(Tcl_Interp *interp, const char *frameName,
 				const char *varName, const char *localName,
 				int flags);
 /* 259 */
-EXTERN int		Tcl_UpVar2(Tcl_Interp *interp, const char *frameName,
+TCLAPI int		Tcl_UpVar2(Tcl_Interp *interp, const char *frameName,
 				const char *part1, const char *part2,
 				const char *localName, int flags);
 /* 260 */
-EXTERN int		Tcl_VarEval(Tcl_Interp *interp, ...);
+TCLAPI int		Tcl_VarEval(Tcl_Interp *interp, ...);
 /* 261 */
-EXTERN ClientData	Tcl_VarTraceInfo(Tcl_Interp *interp,
+TCLAPI ClientData	Tcl_VarTraceInfo(Tcl_Interp *interp,
 				const char *varName, int flags,
 				Tcl_VarTraceProc *procPtr,
 				ClientData prevClientData);
 /* 262 */
-EXTERN ClientData	Tcl_VarTraceInfo2(Tcl_Interp *interp,
+TCLAPI ClientData	Tcl_VarTraceInfo2(Tcl_Interp *interp,
 				const char *part1, const char *part2,
 				int flags, Tcl_VarTraceProc *procPtr,
 				ClientData prevClientData);
 /* 263 */
-EXTERN int		Tcl_Write(Tcl_Channel chan, const char *s, int slen);
+TCLAPI int		Tcl_Write(Tcl_Channel chan, const char *s, int slen);
 /* 264 */
-EXTERN void		Tcl_WrongNumArgs(Tcl_Interp *interp, int objc,
+TCLAPI void		Tcl_WrongNumArgs(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], const char *message);
 /* 265 */
-EXTERN int		Tcl_DumpActiveMemory(const char *fileName);
+TCLAPI int		Tcl_DumpActiveMemory(const char *fileName);
 /* 266 */
-EXTERN void		Tcl_ValidateAllMemory(const char *file, int line);
+TCLAPI void		Tcl_ValidateAllMemory(const char *file, int line);
 /* 267 */
-EXTERN void		Tcl_AppendResultVA(Tcl_Interp *interp,
+TCLAPI void		Tcl_AppendResultVA(Tcl_Interp *interp,
 				va_list argList);
 /* 268 */
-EXTERN void		Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr,
+TCLAPI void		Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr,
 				va_list argList);
 /* 269 */
-EXTERN char *		Tcl_HashStats(Tcl_HashTable *tablePtr);
+TCLAPI char *		Tcl_HashStats(Tcl_HashTable *tablePtr);
 /* 270 */
-EXTERN const char *	Tcl_ParseVar(Tcl_Interp *interp, const char *start,
+TCLAPI const char *	Tcl_ParseVar(Tcl_Interp *interp, const char *start,
 				const char **termPtr);
 /* 271 */
-EXTERN const char *	Tcl_PkgPresent(Tcl_Interp *interp, const char *name,
+TCLAPI const char *	Tcl_PkgPresent(Tcl_Interp *interp, const char *name,
 				const char *version, int exact);
 /* 272 */
-EXTERN const char *	Tcl_PkgPresentEx(Tcl_Interp *interp,
+TCLAPI const char *	Tcl_PkgPresentEx(Tcl_Interp *interp,
 				const char *name, const char *version,
 				int exact, void *clientDataPtr);
 /* 273 */
-EXTERN int		Tcl_PkgProvide(Tcl_Interp *interp, const char *name,
+TCLAPI int		Tcl_PkgProvide(Tcl_Interp *interp, const char *name,
 				const char *version);
 /* 274 */
-EXTERN const char *	Tcl_PkgRequire(Tcl_Interp *interp, const char *name,
+TCLAPI const char *	Tcl_PkgRequire(Tcl_Interp *interp, const char *name,
 				const char *version, int exact);
 /* 275 */
-EXTERN void		Tcl_SetErrorCodeVA(Tcl_Interp *interp,
+TCLAPI void		Tcl_SetErrorCodeVA(Tcl_Interp *interp,
 				va_list argList);
 /* 276 */
-EXTERN int		Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList);
+TCLAPI int		Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList);
 /* 277 */
-EXTERN Tcl_Pid		Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options);
+TCLAPI Tcl_Pid		Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options);
 /* 278 */
-EXTERN void		Tcl_PanicVA(const char *format, va_list argList);
+TCLAPI void		Tcl_PanicVA(const char *format, va_list argList);
 /* 279 */
-EXTERN void		Tcl_GetVersion(int *major, int *minor,
+TCLAPI void		Tcl_GetVersion(int *major, int *minor,
 				int *patchLevel, int *type);
 /* 280 */
-EXTERN void		Tcl_InitMemory(Tcl_Interp *interp);
+TCLAPI void		Tcl_InitMemory(Tcl_Interp *interp);
 /* 281 */
-EXTERN Tcl_Channel	Tcl_StackChannel(Tcl_Interp *interp,
+TCLAPI Tcl_Channel	Tcl_StackChannel(Tcl_Interp *interp,
 				const Tcl_ChannelType *typePtr,
 				ClientData instanceData, int mask,
 				Tcl_Channel prevChan);
 /* 282 */
-EXTERN int		Tcl_UnstackChannel(Tcl_Interp *interp,
+TCLAPI int		Tcl_UnstackChannel(Tcl_Interp *interp,
 				Tcl_Channel chan);
 /* 283 */
-EXTERN Tcl_Channel	Tcl_GetStackedChannel(Tcl_Channel chan);
+TCLAPI Tcl_Channel	Tcl_GetStackedChannel(Tcl_Channel chan);
 /* 284 */
-EXTERN void		Tcl_SetMainLoop(Tcl_MainLoopProc *proc);
+TCLAPI void		Tcl_SetMainLoop(Tcl_MainLoopProc *proc);
 /* Slot 285 is reserved */
 /* 286 */
-EXTERN void		Tcl_AppendObjToObj(Tcl_Obj *objPtr,
+TCLAPI void		Tcl_AppendObjToObj(Tcl_Obj *objPtr,
 				Tcl_Obj *appendObjPtr);
 /* 287 */
-EXTERN Tcl_Encoding	Tcl_CreateEncoding(const Tcl_EncodingType *typePtr);
+TCLAPI Tcl_Encoding	Tcl_CreateEncoding(const Tcl_EncodingType *typePtr);
 /* 288 */
-EXTERN void		Tcl_CreateThreadExitHandler(Tcl_ExitProc *proc,
+TCLAPI void		Tcl_CreateThreadExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
 /* 289 */
-EXTERN void		Tcl_DeleteThreadExitHandler(Tcl_ExitProc *proc,
+TCLAPI void		Tcl_DeleteThreadExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
 /* 290 */
-EXTERN void		Tcl_DiscardResult(Tcl_SavedResult *statePtr);
+TCLAPI void		Tcl_DiscardResult(Tcl_SavedResult *statePtr);
 /* 291 */
-EXTERN int		Tcl_EvalEx(Tcl_Interp *interp, const char *script,
+TCLAPI int		Tcl_EvalEx(Tcl_Interp *interp, const char *script,
 				int numBytes, int flags);
 /* 292 */
-EXTERN int		Tcl_EvalObjv(Tcl_Interp *interp, int objc,
+TCLAPI int		Tcl_EvalObjv(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], int flags);
 /* 293 */
-EXTERN int		Tcl_EvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
+TCLAPI int		Tcl_EvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				int flags);
 /* 294 */
-EXTERN void		Tcl_ExitThread(int status);
+TCLAPI void		Tcl_ExitThread(int status);
 /* 295 */
-EXTERN int		Tcl_ExternalToUtf(Tcl_Interp *interp,
+TCLAPI int		Tcl_ExternalToUtf(Tcl_Interp *interp,
 				Tcl_Encoding encoding, const char *src,
 				int srcLen, int flags,
 				Tcl_EncodingState *statePtr, char *dst,
 				int dstLen, int *srcReadPtr,
 				int *dstWrotePtr, int *dstCharsPtr);
 /* 296 */
-EXTERN char *		Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
+TCLAPI char *		Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
 				const char *src, int srcLen,
 				Tcl_DString *dsPtr);
 /* 297 */
-EXTERN void		Tcl_FinalizeThread(void);
+TCLAPI void		Tcl_FinalizeThread(void);
 /* 298 */
-EXTERN void		Tcl_FinalizeNotifier(ClientData clientData);
+TCLAPI void		Tcl_FinalizeNotifier(ClientData clientData);
 /* 299 */
-EXTERN void		Tcl_FreeEncoding(Tcl_Encoding encoding);
+TCLAPI void		Tcl_FreeEncoding(Tcl_Encoding encoding);
 /* 300 */
-EXTERN Tcl_ThreadId	Tcl_GetCurrentThread(void);
+TCLAPI Tcl_ThreadId	Tcl_GetCurrentThread(void);
 /* 301 */
-EXTERN Tcl_Encoding	Tcl_GetEncoding(Tcl_Interp *interp, const char *name);
+TCLAPI Tcl_Encoding	Tcl_GetEncoding(Tcl_Interp *interp, const char *name);
 /* 302 */
-EXTERN const char *	Tcl_GetEncodingName(Tcl_Encoding encoding);
+TCLAPI const char *	Tcl_GetEncodingName(Tcl_Encoding encoding);
 /* 303 */
-EXTERN void		Tcl_GetEncodingNames(Tcl_Interp *interp);
+TCLAPI void		Tcl_GetEncodingNames(Tcl_Interp *interp);
 /* 304 */
-EXTERN int		Tcl_GetIndexFromObjStruct(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetIndexFromObjStruct(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, const void *tablePtr,
 				int offset, const char *msg, int flags,
 				int *indexPtr);
 /* 305 */
-EXTERN void *		Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr,
+TCLAPI void *		Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr,
 				int size);
 /* 306 */
-EXTERN Tcl_Obj *	Tcl_GetVar2Ex(Tcl_Interp *interp, const char *part1,
+TCLAPI Tcl_Obj *	Tcl_GetVar2Ex(Tcl_Interp *interp, const char *part1,
 				const char *part2, int flags);
 /* 307 */
-EXTERN ClientData	Tcl_InitNotifier(void);
+TCLAPI ClientData	Tcl_InitNotifier(void);
 /* 308 */
-EXTERN void		Tcl_MutexLock(Tcl_Mutex *mutexPtr);
+TCLAPI void		Tcl_MutexLock(Tcl_Mutex *mutexPtr);
 /* 309 */
-EXTERN void		Tcl_MutexUnlock(Tcl_Mutex *mutexPtr);
+TCLAPI void		Tcl_MutexUnlock(Tcl_Mutex *mutexPtr);
 /* 310 */
-EXTERN void		Tcl_ConditionNotify(Tcl_Condition *condPtr);
+TCLAPI void		Tcl_ConditionNotify(Tcl_Condition *condPtr);
 /* 311 */
-EXTERN void		Tcl_ConditionWait(Tcl_Condition *condPtr,
+TCLAPI void		Tcl_ConditionWait(Tcl_Condition *condPtr,
 				Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr);
 /* 312 */
-EXTERN int		Tcl_NumUtfChars(const char *src, int length);
+TCLAPI int		Tcl_NumUtfChars(const char *src, int length);
 /* 313 */
-EXTERN int		Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
+TCLAPI int		Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
 				int charsToRead, int appendFlag);
 /* 314 */
-EXTERN void		Tcl_RestoreResult(Tcl_Interp *interp,
+TCLAPI void		Tcl_RestoreResult(Tcl_Interp *interp,
 				Tcl_SavedResult *statePtr);
 /* 315 */
-EXTERN void		Tcl_SaveResult(Tcl_Interp *interp,
+TCLAPI void		Tcl_SaveResult(Tcl_Interp *interp,
 				Tcl_SavedResult *statePtr);
 /* 316 */
-EXTERN int		Tcl_SetSystemEncoding(Tcl_Interp *interp,
+TCLAPI int		Tcl_SetSystemEncoding(Tcl_Interp *interp,
 				const char *name);
 /* 317 */
-EXTERN Tcl_Obj *	Tcl_SetVar2Ex(Tcl_Interp *interp, const char *part1,
+TCLAPI Tcl_Obj *	Tcl_SetVar2Ex(Tcl_Interp *interp, const char *part1,
 				const char *part2, Tcl_Obj *newValuePtr,
 				int flags);
 /* 318 */
-EXTERN void		Tcl_ThreadAlert(Tcl_ThreadId threadId);
+TCLAPI void		Tcl_ThreadAlert(Tcl_ThreadId threadId);
 /* 319 */
-EXTERN void		Tcl_ThreadQueueEvent(Tcl_ThreadId threadId,
+TCLAPI void		Tcl_ThreadQueueEvent(Tcl_ThreadId threadId,
 				Tcl_Event *evPtr, Tcl_QueuePosition position);
 /* 320 */
-EXTERN Tcl_UniChar	Tcl_UniCharAtIndex(const char *src, int index);
+TCLAPI Tcl_UniChar	Tcl_UniCharAtIndex(const char *src, int index);
 /* 321 */
-EXTERN Tcl_UniChar	Tcl_UniCharToLower(int ch);
+TCLAPI Tcl_UniChar	Tcl_UniCharToLower(int ch);
 /* 322 */
-EXTERN Tcl_UniChar	Tcl_UniCharToTitle(int ch);
+TCLAPI Tcl_UniChar	Tcl_UniCharToTitle(int ch);
 /* 323 */
-EXTERN Tcl_UniChar	Tcl_UniCharToUpper(int ch);
+TCLAPI Tcl_UniChar	Tcl_UniCharToUpper(int ch);
 /* 324 */
-EXTERN int		Tcl_UniCharToUtf(int ch, char *buf);
+TCLAPI int		Tcl_UniCharToUtf(int ch, char *buf);
 /* 325 */
-EXTERN const char *	Tcl_UtfAtIndex(const char *src, int index);
+TCLAPI const char *	Tcl_UtfAtIndex(const char *src, int index);
 /* 326 */
-EXTERN int		Tcl_UtfCharComplete(const char *src, int length);
+TCLAPI int		Tcl_UtfCharComplete(const char *src, int length);
 /* 327 */
-EXTERN int		Tcl_UtfBackslash(const char *src, int *readPtr,
+TCLAPI int		Tcl_UtfBackslash(const char *src, int *readPtr,
 				char *dst);
 /* 328 */
-EXTERN const char *	Tcl_UtfFindFirst(const char *src, int ch);
+TCLAPI const char *	Tcl_UtfFindFirst(const char *src, int ch);
 /* 329 */
-EXTERN const char *	Tcl_UtfFindLast(const char *src, int ch);
+TCLAPI const char *	Tcl_UtfFindLast(const char *src, int ch);
 /* 330 */
-EXTERN const char *	Tcl_UtfNext(const char *src);
+TCLAPI const char *	Tcl_UtfNext(const char *src);
 /* 331 */
-EXTERN const char *	Tcl_UtfPrev(const char *src, const char *start);
+TCLAPI const char *	Tcl_UtfPrev(const char *src, const char *start);
 /* 332 */
-EXTERN int		Tcl_UtfToExternal(Tcl_Interp *interp,
+TCLAPI int		Tcl_UtfToExternal(Tcl_Interp *interp,
 				Tcl_Encoding encoding, const char *src,
 				int srcLen, int flags,
 				Tcl_EncodingState *statePtr, char *dst,
 				int dstLen, int *srcReadPtr,
 				int *dstWrotePtr, int *dstCharsPtr);
 /* 333 */
-EXTERN char *		Tcl_UtfToExternalDString(Tcl_Encoding encoding,
+TCLAPI char *		Tcl_UtfToExternalDString(Tcl_Encoding encoding,
 				const char *src, int srcLen,
 				Tcl_DString *dsPtr);
 /* 334 */
-EXTERN int		Tcl_UtfToLower(char *src);
+TCLAPI int		Tcl_UtfToLower(char *src);
 /* 335 */
-EXTERN int		Tcl_UtfToTitle(char *src);
+TCLAPI int		Tcl_UtfToTitle(char *src);
 /* 336 */
-EXTERN int		Tcl_UtfToUniChar(const char *src, Tcl_UniChar *chPtr);
+TCLAPI int		Tcl_UtfToUniChar(const char *src, Tcl_UniChar *chPtr);
 /* 337 */
-EXTERN int		Tcl_UtfToUpper(char *src);
+TCLAPI int		Tcl_UtfToUpper(char *src);
 /* 338 */
-EXTERN int		Tcl_WriteChars(Tcl_Channel chan, const char *src,
+TCLAPI int		Tcl_WriteChars(Tcl_Channel chan, const char *src,
 				int srcLen);
 /* 339 */
-EXTERN int		Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+TCLAPI int		Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr);
 /* 340 */
-EXTERN char *		Tcl_GetString(Tcl_Obj *objPtr);
+TCLAPI char *		Tcl_GetString(Tcl_Obj *objPtr);
 /* 341 */
-EXTERN const char *	Tcl_GetDefaultEncodingDir(void);
+TCLAPI const char *	Tcl_GetDefaultEncodingDir(void);
 /* 342 */
-EXTERN void		Tcl_SetDefaultEncodingDir(const char *path);
+TCLAPI void		Tcl_SetDefaultEncodingDir(const char *path);
 /* 343 */
-EXTERN void		Tcl_AlertNotifier(ClientData clientData);
+TCLAPI void		Tcl_AlertNotifier(ClientData clientData);
 /* 344 */
-EXTERN void		Tcl_ServiceModeHook(int mode);
+TCLAPI void		Tcl_ServiceModeHook(int mode);
 /* 345 */
-EXTERN int		Tcl_UniCharIsAlnum(int ch);
+TCLAPI int		Tcl_UniCharIsAlnum(int ch);
 /* 346 */
-EXTERN int		Tcl_UniCharIsAlpha(int ch);
+TCLAPI int		Tcl_UniCharIsAlpha(int ch);
 /* 347 */
-EXTERN int		Tcl_UniCharIsDigit(int ch);
+TCLAPI int		Tcl_UniCharIsDigit(int ch);
 /* 348 */
-EXTERN int		Tcl_UniCharIsLower(int ch);
+TCLAPI int		Tcl_UniCharIsLower(int ch);
 /* 349 */
-EXTERN int		Tcl_UniCharIsSpace(int ch);
+TCLAPI int		Tcl_UniCharIsSpace(int ch);
 /* 350 */
-EXTERN int		Tcl_UniCharIsUpper(int ch);
+TCLAPI int		Tcl_UniCharIsUpper(int ch);
 /* 351 */
-EXTERN int		Tcl_UniCharIsWordChar(int ch);
+TCLAPI int		Tcl_UniCharIsWordChar(int ch);
 /* 352 */
-EXTERN int		Tcl_UniCharLen(const Tcl_UniChar *uniStr);
+TCLAPI int		Tcl_UniCharLen(const Tcl_UniChar *uniStr);
 /* 353 */
-EXTERN int		Tcl_UniCharNcmp(const Tcl_UniChar *ucs,
+TCLAPI int		Tcl_UniCharNcmp(const Tcl_UniChar *ucs,
 				const Tcl_UniChar *uct,
 				unsigned long numChars);
 /* 354 */
-EXTERN char *		Tcl_UniCharToUtfDString(const Tcl_UniChar *uniStr,
+TCLAPI char *		Tcl_UniCharToUtfDString(const Tcl_UniChar *uniStr,
 				int uniLength, Tcl_DString *dsPtr);
 /* 355 */
-EXTERN Tcl_UniChar *	Tcl_UtfToUniCharDString(const char *src, int length,
+TCLAPI Tcl_UniChar *	Tcl_UtfToUniCharDString(const char *src, int length,
 				Tcl_DString *dsPtr);
 /* 356 */
-EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj(Tcl_Interp *interp,
+TCLAPI Tcl_RegExp	Tcl_GetRegExpFromObj(Tcl_Interp *interp,
 				Tcl_Obj *patObj, int flags);
 /* Slot 357 is reserved */
 /* 358 */
-EXTERN void		Tcl_FreeParse(Tcl_Parse *parsePtr);
+TCLAPI void		Tcl_FreeParse(Tcl_Parse *parsePtr);
 /* 359 */
-EXTERN void		Tcl_LogCommandInfo(Tcl_Interp *interp,
+TCLAPI void		Tcl_LogCommandInfo(Tcl_Interp *interp,
 				const char *script, const char *command,
 				int length);
 /* 360 */
-EXTERN int		Tcl_ParseBraces(Tcl_Interp *interp,
+TCLAPI int		Tcl_ParseBraces(Tcl_Interp *interp,
 				const char *start, int numBytes,
 				Tcl_Parse *parsePtr, int append,
 				const char **termPtr);
 /* 361 */
-EXTERN int		Tcl_ParseCommand(Tcl_Interp *interp,
+TCLAPI int		Tcl_ParseCommand(Tcl_Interp *interp,
 				const char *start, int numBytes, int nested,
 				Tcl_Parse *parsePtr);
 /* 362 */
-EXTERN int		Tcl_ParseExpr(Tcl_Interp *interp, const char *start,
+TCLAPI int		Tcl_ParseExpr(Tcl_Interp *interp, const char *start,
 				int numBytes, Tcl_Parse *parsePtr);
 /* 363 */
-EXTERN int		Tcl_ParseQuotedString(Tcl_Interp *interp,
+TCLAPI int		Tcl_ParseQuotedString(Tcl_Interp *interp,
 				const char *start, int numBytes,
 				Tcl_Parse *parsePtr, int append,
 				const char **termPtr);
 /* 364 */
-EXTERN int		Tcl_ParseVarName(Tcl_Interp *interp,
+TCLAPI int		Tcl_ParseVarName(Tcl_Interp *interp,
 				const char *start, int numBytes,
 				Tcl_Parse *parsePtr, int append);
 /* 365 */
-EXTERN char *		Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr);
+TCLAPI char *		Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr);
 /* 366 */
-EXTERN int		Tcl_Chdir(const char *dirName);
+TCLAPI int		Tcl_Chdir(const char *dirName);
 /* 367 */
-EXTERN int		Tcl_Access(const char *path, int mode);
+TCLAPI int		Tcl_Access(const char *path, int mode);
 /* 368 */
-EXTERN int		Tcl_Stat(const char *path, struct stat *bufPtr);
+TCLAPI int		Tcl_Stat(const char *path, struct stat *bufPtr);
 /* 369 */
-EXTERN int		Tcl_UtfNcmp(const char *s1, const char *s2,
+TCLAPI int		Tcl_UtfNcmp(const char *s1, const char *s2,
 				unsigned long n);
 /* 370 */
-EXTERN int		Tcl_UtfNcasecmp(const char *s1, const char *s2,
+TCLAPI int		Tcl_UtfNcasecmp(const char *s1, const char *s2,
 				unsigned long n);
 /* 371 */
-EXTERN int		Tcl_StringCaseMatch(const char *str,
+TCLAPI int		Tcl_StringCaseMatch(const char *str,
 				const char *pattern, int nocase);
 /* 372 */
-EXTERN int		Tcl_UniCharIsControl(int ch);
+TCLAPI int		Tcl_UniCharIsControl(int ch);
 /* 373 */
-EXTERN int		Tcl_UniCharIsGraph(int ch);
+TCLAPI int		Tcl_UniCharIsGraph(int ch);
 /* 374 */
-EXTERN int		Tcl_UniCharIsPrint(int ch);
+TCLAPI int		Tcl_UniCharIsPrint(int ch);
 /* 375 */
-EXTERN int		Tcl_UniCharIsPunct(int ch);
+TCLAPI int		Tcl_UniCharIsPunct(int ch);
 /* 376 */
-EXTERN int		Tcl_RegExpExecObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_RegExpExecObj(Tcl_Interp *interp,
 				Tcl_RegExp regexp, Tcl_Obj *textObj,
 				int offset, int nmatches, int flags);
 /* 377 */
-EXTERN void		Tcl_RegExpGetInfo(Tcl_RegExp regexp,
+TCLAPI void		Tcl_RegExpGetInfo(Tcl_RegExp regexp,
 				Tcl_RegExpInfo *infoPtr);
 /* 378 */
-EXTERN Tcl_Obj *	Tcl_NewUnicodeObj(const Tcl_UniChar *unicode,
+TCLAPI Tcl_Obj *	Tcl_NewUnicodeObj(const Tcl_UniChar *unicode,
 				int numChars);
 /* 379 */
-EXTERN void		Tcl_SetUnicodeObj(Tcl_Obj *objPtr,
+TCLAPI void		Tcl_SetUnicodeObj(Tcl_Obj *objPtr,
 				const Tcl_UniChar *unicode, int numChars);
 /* 380 */
-EXTERN int		Tcl_GetCharLength(Tcl_Obj *objPtr);
+TCLAPI int		Tcl_GetCharLength(Tcl_Obj *objPtr);
 /* 381 */
-EXTERN Tcl_UniChar	Tcl_GetUniChar(Tcl_Obj *objPtr, int index);
+TCLAPI Tcl_UniChar	Tcl_GetUniChar(Tcl_Obj *objPtr, int index);
 /* 382 */
-EXTERN Tcl_UniChar *	Tcl_GetUnicode(Tcl_Obj *objPtr);
+TCLAPI Tcl_UniChar *	Tcl_GetUnicode(Tcl_Obj *objPtr);
 /* 383 */
-EXTERN Tcl_Obj *	Tcl_GetRange(Tcl_Obj *objPtr, int first, int last);
+TCLAPI Tcl_Obj *	Tcl_GetRange(Tcl_Obj *objPtr, int first, int last);
 /* 384 */
-EXTERN void		Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr,
+TCLAPI void		Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr,
 				const Tcl_UniChar *unicode, int length);
 /* 385 */
-EXTERN int		Tcl_RegExpMatchObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_RegExpMatchObj(Tcl_Interp *interp,
 				Tcl_Obj *textObj, Tcl_Obj *patternObj);
 /* 386 */
-EXTERN void		Tcl_SetNotifier(Tcl_NotifierProcs *notifierProcPtr);
+TCLAPI void		Tcl_SetNotifier(Tcl_NotifierProcs *notifierProcPtr);
 /* 387 */
-EXTERN Tcl_Mutex *	Tcl_GetAllocMutex(void);
+TCLAPI Tcl_Mutex *	Tcl_GetAllocMutex(void);
 /* 388 */
-EXTERN int		Tcl_GetChannelNames(Tcl_Interp *interp);
+TCLAPI int		Tcl_GetChannelNames(Tcl_Interp *interp);
 /* 389 */
-EXTERN int		Tcl_GetChannelNamesEx(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetChannelNamesEx(Tcl_Interp *interp,
 				const char *pattern);
 /* 390 */
-EXTERN int		Tcl_ProcObjCmd(ClientData clientData,
+TCLAPI int		Tcl_ProcObjCmd(ClientData clientData,
 				Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[]);
 /* 391 */
-EXTERN void		Tcl_ConditionFinalize(Tcl_Condition *condPtr);
+TCLAPI void		Tcl_ConditionFinalize(Tcl_Condition *condPtr);
 /* 392 */
-EXTERN void		Tcl_MutexFinalize(Tcl_Mutex *mutex);
+TCLAPI void		Tcl_MutexFinalize(Tcl_Mutex *mutex);
 /* 393 */
-EXTERN int		Tcl_CreateThread(Tcl_ThreadId *idPtr,
+TCLAPI int		Tcl_CreateThread(Tcl_ThreadId *idPtr,
 				Tcl_ThreadCreateProc *proc,
 				ClientData clientData, int stackSize,
 				int flags);
 /* 394 */
-EXTERN int		Tcl_ReadRaw(Tcl_Channel chan, char *dst,
+TCLAPI int		Tcl_ReadRaw(Tcl_Channel chan, char *dst,
 				int bytesToRead);
 /* 395 */
-EXTERN int		Tcl_WriteRaw(Tcl_Channel chan, const char *src,
+TCLAPI int		Tcl_WriteRaw(Tcl_Channel chan, const char *src,
 				int srcLen);
 /* 396 */
-EXTERN Tcl_Channel	Tcl_GetTopChannel(Tcl_Channel chan);
+TCLAPI Tcl_Channel	Tcl_GetTopChannel(Tcl_Channel chan);
 /* 397 */
-EXTERN int		Tcl_ChannelBuffered(Tcl_Channel chan);
+TCLAPI int		Tcl_ChannelBuffered(Tcl_Channel chan);
 /* 398 */
-EXTERN const char *	Tcl_ChannelName(const Tcl_ChannelType *chanTypePtr);
+TCLAPI const char *	Tcl_ChannelName(const Tcl_ChannelType *chanTypePtr);
 /* 399 */
-EXTERN Tcl_ChannelTypeVersion Tcl_ChannelVersion(
+TCLAPI Tcl_ChannelTypeVersion Tcl_ChannelVersion(
 				const Tcl_ChannelType *chanTypePtr);
 /* 400 */
-EXTERN Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc(
+TCLAPI Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 401 */
-EXTERN Tcl_DriverCloseProc * Tcl_ChannelCloseProc(
+TCLAPI Tcl_DriverCloseProc * Tcl_ChannelCloseProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 402 */
-EXTERN Tcl_DriverClose2Proc * Tcl_ChannelClose2Proc(
+TCLAPI Tcl_DriverClose2Proc * Tcl_ChannelClose2Proc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 403 */
-EXTERN Tcl_DriverInputProc * Tcl_ChannelInputProc(
+TCLAPI Tcl_DriverInputProc * Tcl_ChannelInputProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 404 */
-EXTERN Tcl_DriverOutputProc * Tcl_ChannelOutputProc(
+TCLAPI Tcl_DriverOutputProc * Tcl_ChannelOutputProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 405 */
-EXTERN Tcl_DriverSeekProc * Tcl_ChannelSeekProc(
+TCLAPI Tcl_DriverSeekProc * Tcl_ChannelSeekProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 406 */
-EXTERN Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc(
+TCLAPI Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 407 */
-EXTERN Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc(
+TCLAPI Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 408 */
-EXTERN Tcl_DriverWatchProc * Tcl_ChannelWatchProc(
+TCLAPI Tcl_DriverWatchProc * Tcl_ChannelWatchProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 409 */
-EXTERN Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc(
+TCLAPI Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 410 */
-EXTERN Tcl_DriverFlushProc * Tcl_ChannelFlushProc(
+TCLAPI Tcl_DriverFlushProc * Tcl_ChannelFlushProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 411 */
-EXTERN Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc(
+TCLAPI Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 412 */
-EXTERN int		Tcl_JoinThread(Tcl_ThreadId threadId, int *result);
+TCLAPI int		Tcl_JoinThread(Tcl_ThreadId threadId, int *result);
 /* 413 */
-EXTERN int		Tcl_IsChannelShared(Tcl_Channel channel);
+TCLAPI int		Tcl_IsChannelShared(Tcl_Channel channel);
 /* 414 */
-EXTERN int		Tcl_IsChannelRegistered(Tcl_Interp *interp,
+TCLAPI int		Tcl_IsChannelRegistered(Tcl_Interp *interp,
 				Tcl_Channel channel);
 /* 415 */
-EXTERN void		Tcl_CutChannel(Tcl_Channel channel);
+TCLAPI void		Tcl_CutChannel(Tcl_Channel channel);
 /* 416 */
-EXTERN void		Tcl_SpliceChannel(Tcl_Channel channel);
+TCLAPI void		Tcl_SpliceChannel(Tcl_Channel channel);
 /* 417 */
-EXTERN void		Tcl_ClearChannelHandlers(Tcl_Channel channel);
+TCLAPI void		Tcl_ClearChannelHandlers(Tcl_Channel channel);
 /* 418 */
-EXTERN int		Tcl_IsChannelExisting(const char *channelName);
+TCLAPI int		Tcl_IsChannelExisting(const char *channelName);
 /* 419 */
-EXTERN int		Tcl_UniCharNcasecmp(const Tcl_UniChar *ucs,
+TCLAPI int		Tcl_UniCharNcasecmp(const Tcl_UniChar *ucs,
 				const Tcl_UniChar *uct,
 				unsigned long numChars);
 /* 420 */
-EXTERN int		Tcl_UniCharCaseMatch(const Tcl_UniChar *uniStr,
+TCLAPI int		Tcl_UniCharCaseMatch(const Tcl_UniChar *uniStr,
 				const Tcl_UniChar *uniPattern, int nocase);
 /* 421 */
-EXTERN Tcl_HashEntry *	Tcl_FindHashEntry(Tcl_HashTable *tablePtr,
+TCLAPI Tcl_HashEntry *	Tcl_FindHashEntry(Tcl_HashTable *tablePtr,
 				const void *key);
 /* 422 */
-EXTERN Tcl_HashEntry *	Tcl_CreateHashEntry(Tcl_HashTable *tablePtr,
+TCLAPI Tcl_HashEntry *	Tcl_CreateHashEntry(Tcl_HashTable *tablePtr,
 				const void *key, int *newPtr);
 /* 423 */
-EXTERN void		Tcl_InitCustomHashTable(Tcl_HashTable *tablePtr,
+TCLAPI void		Tcl_InitCustomHashTable(Tcl_HashTable *tablePtr,
 				int keyType, const Tcl_HashKeyType *typePtr);
 /* 424 */
-EXTERN void		Tcl_InitObjHashTable(Tcl_HashTable *tablePtr);
+TCLAPI void		Tcl_InitObjHashTable(Tcl_HashTable *tablePtr);
 /* 425 */
-EXTERN ClientData	Tcl_CommandTraceInfo(Tcl_Interp *interp,
+TCLAPI ClientData	Tcl_CommandTraceInfo(Tcl_Interp *interp,
 				const char *varName, int flags,
 				Tcl_CommandTraceProc *procPtr,
 				ClientData prevClientData);
 /* 426 */
-EXTERN int		Tcl_TraceCommand(Tcl_Interp *interp,
+TCLAPI int		Tcl_TraceCommand(Tcl_Interp *interp,
 				const char *varName, int flags,
 				Tcl_CommandTraceProc *proc,
 				ClientData clientData);
 /* 427 */
-EXTERN void		Tcl_UntraceCommand(Tcl_Interp *interp,
+TCLAPI void		Tcl_UntraceCommand(Tcl_Interp *interp,
 				const char *varName, int flags,
 				Tcl_CommandTraceProc *proc,
 				ClientData clientData);
 /* 428 */
-EXTERN char *		Tcl_AttemptAlloc(unsigned int size);
+TCLAPI char *		Tcl_AttemptAlloc(unsigned int size);
 /* 429 */
-EXTERN char *		Tcl_AttemptDbCkalloc(unsigned int size,
+TCLAPI char *		Tcl_AttemptDbCkalloc(unsigned int size,
 				const char *file, int line);
 /* 430 */
-EXTERN char *		Tcl_AttemptRealloc(char *ptr, unsigned int size);
+TCLAPI char *		Tcl_AttemptRealloc(char *ptr, unsigned int size);
 /* 431 */
-EXTERN char *		Tcl_AttemptDbCkrealloc(char *ptr, unsigned int size,
+TCLAPI char *		Tcl_AttemptDbCkrealloc(char *ptr, unsigned int size,
 				const char *file, int line);
 /* 432 */
-EXTERN int		Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, int length);
+TCLAPI int		Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, int length);
 /* 433 */
-EXTERN Tcl_ThreadId	Tcl_GetChannelThread(Tcl_Channel channel);
+TCLAPI Tcl_ThreadId	Tcl_GetChannelThread(Tcl_Channel channel);
 /* 434 */
-EXTERN Tcl_UniChar *	Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr,
+TCLAPI Tcl_UniChar *	Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr,
 				int *lengthPtr);
 /* Slot 435 is reserved */
 /* Slot 436 is reserved */
 /* 437 */
-EXTERN Tcl_Obj *	Tcl_SubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+TCLAPI Tcl_Obj *	Tcl_SubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				int flags);
 /* 438 */
-EXTERN int		Tcl_DetachChannel(Tcl_Interp *interp,
+TCLAPI int		Tcl_DetachChannel(Tcl_Interp *interp,
 				Tcl_Channel channel);
 /* 439 */
-EXTERN int		Tcl_IsStandardChannel(Tcl_Channel channel);
+TCLAPI int		Tcl_IsStandardChannel(Tcl_Channel channel);
 /* 440 */
-EXTERN int		Tcl_FSCopyFile(Tcl_Obj *srcPathPtr,
+TCLAPI int		Tcl_FSCopyFile(Tcl_Obj *srcPathPtr,
 				Tcl_Obj *destPathPtr);
 /* 441 */
-EXTERN int		Tcl_FSCopyDirectory(Tcl_Obj *srcPathPtr,
+TCLAPI int		Tcl_FSCopyDirectory(Tcl_Obj *srcPathPtr,
 				Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr);
 /* 442 */
-EXTERN int		Tcl_FSCreateDirectory(Tcl_Obj *pathPtr);
+TCLAPI int		Tcl_FSCreateDirectory(Tcl_Obj *pathPtr);
 /* 443 */
-EXTERN int		Tcl_FSDeleteFile(Tcl_Obj *pathPtr);
+TCLAPI int		Tcl_FSDeleteFile(Tcl_Obj *pathPtr);
 /* 444 */
-EXTERN int		Tcl_FSLoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
+TCLAPI int		Tcl_FSLoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
 				const char *sym1, const char *sym2,
 				Tcl_PackageInitProc **proc1Ptr,
 				Tcl_PackageInitProc **proc2Ptr,
 				Tcl_LoadHandle *handlePtr,
 				Tcl_FSUnloadFileProc **unloadProcPtr);
 /* 445 */
-EXTERN int		Tcl_FSMatchInDirectory(Tcl_Interp *interp,
+TCLAPI int		Tcl_FSMatchInDirectory(Tcl_Interp *interp,
 				Tcl_Obj *result, Tcl_Obj *pathPtr,
 				const char *pattern, Tcl_GlobTypeData *types);
 /* 446 */
-EXTERN Tcl_Obj *	Tcl_FSLink(Tcl_Obj *pathPtr, Tcl_Obj *toPtr,
+TCLAPI Tcl_Obj *	Tcl_FSLink(Tcl_Obj *pathPtr, Tcl_Obj *toPtr,
 				int linkAction);
 /* 447 */
-EXTERN int		Tcl_FSRemoveDirectory(Tcl_Obj *pathPtr,
+TCLAPI int		Tcl_FSRemoveDirectory(Tcl_Obj *pathPtr,
 				int recursive, Tcl_Obj **errorPtr);
 /* 448 */
-EXTERN int		Tcl_FSRenameFile(Tcl_Obj *srcPathPtr,
+TCLAPI int		Tcl_FSRenameFile(Tcl_Obj *srcPathPtr,
 				Tcl_Obj *destPathPtr);
 /* 449 */
-EXTERN int		Tcl_FSLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+TCLAPI int		Tcl_FSLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
 /* 450 */
-EXTERN int		Tcl_FSUtime(Tcl_Obj *pathPtr, struct utimbuf *tval);
+TCLAPI int		Tcl_FSUtime(Tcl_Obj *pathPtr, struct utimbuf *tval);
 /* 451 */
-EXTERN int		Tcl_FSFileAttrsGet(Tcl_Interp *interp, int index,
+TCLAPI int		Tcl_FSFileAttrsGet(Tcl_Interp *interp, int index,
 				Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef);
 /* 452 */
-EXTERN int		Tcl_FSFileAttrsSet(Tcl_Interp *interp, int index,
+TCLAPI int		Tcl_FSFileAttrsSet(Tcl_Interp *interp, int index,
 				Tcl_Obj *pathPtr, Tcl_Obj *objPtr);
 /* 453 */
-EXTERN const char *const * Tcl_FSFileAttrStrings(Tcl_Obj *pathPtr,
+TCLAPI const char *const * Tcl_FSFileAttrStrings(Tcl_Obj *pathPtr,
 				Tcl_Obj **objPtrRef);
 /* 454 */
-EXTERN int		Tcl_FSStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+TCLAPI int		Tcl_FSStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
 /* 455 */
-EXTERN int		Tcl_FSAccess(Tcl_Obj *pathPtr, int mode);
+TCLAPI int		Tcl_FSAccess(Tcl_Obj *pathPtr, int mode);
 /* 456 */
-EXTERN Tcl_Channel	Tcl_FSOpenFileChannel(Tcl_Interp *interp,
+TCLAPI Tcl_Channel	Tcl_FSOpenFileChannel(Tcl_Interp *interp,
 				Tcl_Obj *pathPtr, const char *modeString,
 				int permissions);
 /* 457 */
-EXTERN Tcl_Obj *	Tcl_FSGetCwd(Tcl_Interp *interp);
+TCLAPI Tcl_Obj *	Tcl_FSGetCwd(Tcl_Interp *interp);
 /* 458 */
-EXTERN int		Tcl_FSChdir(Tcl_Obj *pathPtr);
+TCLAPI int		Tcl_FSChdir(Tcl_Obj *pathPtr);
 /* 459 */
-EXTERN int		Tcl_FSConvertToPathType(Tcl_Interp *interp,
+TCLAPI int		Tcl_FSConvertToPathType(Tcl_Interp *interp,
 				Tcl_Obj *pathPtr);
 /* 460 */
-EXTERN Tcl_Obj *	Tcl_FSJoinPath(Tcl_Obj *listObj, int elements);
+TCLAPI Tcl_Obj *	Tcl_FSJoinPath(Tcl_Obj *listObj, int elements);
 /* 461 */
-EXTERN Tcl_Obj *	Tcl_FSSplitPath(Tcl_Obj *pathPtr, int *lenPtr);
+TCLAPI Tcl_Obj *	Tcl_FSSplitPath(Tcl_Obj *pathPtr, int *lenPtr);
 /* 462 */
-EXTERN int		Tcl_FSEqualPaths(Tcl_Obj *firstPtr,
+TCLAPI int		Tcl_FSEqualPaths(Tcl_Obj *firstPtr,
 				Tcl_Obj *secondPtr);
 /* 463 */
-EXTERN Tcl_Obj *	Tcl_FSGetNormalizedPath(Tcl_Interp *interp,
+TCLAPI Tcl_Obj *	Tcl_FSGetNormalizedPath(Tcl_Interp *interp,
 				Tcl_Obj *pathPtr);
 /* 464 */
-EXTERN Tcl_Obj *	Tcl_FSJoinToPath(Tcl_Obj *pathPtr, int objc,
+TCLAPI Tcl_Obj *	Tcl_FSJoinToPath(Tcl_Obj *pathPtr, int objc,
 				Tcl_Obj *const objv[]);
 /* 465 */
-EXTERN ClientData	Tcl_FSGetInternalRep(Tcl_Obj *pathPtr,
+TCLAPI ClientData	Tcl_FSGetInternalRep(Tcl_Obj *pathPtr,
 				const Tcl_Filesystem *fsPtr);
 /* 466 */
-EXTERN Tcl_Obj *	Tcl_FSGetTranslatedPath(Tcl_Interp *interp,
+TCLAPI Tcl_Obj *	Tcl_FSGetTranslatedPath(Tcl_Interp *interp,
 				Tcl_Obj *pathPtr);
 /* 467 */
-EXTERN int		Tcl_FSEvalFile(Tcl_Interp *interp, Tcl_Obj *fileName);
+TCLAPI int		Tcl_FSEvalFile(Tcl_Interp *interp, Tcl_Obj *fileName);
 /* 468 */
-EXTERN Tcl_Obj *	Tcl_FSNewNativePath(
+TCLAPI Tcl_Obj *	Tcl_FSNewNativePath(
 				const Tcl_Filesystem *fromFilesystem,
 				ClientData clientData);
 /* 469 */
-EXTERN const void *	Tcl_FSGetNativePath(Tcl_Obj *pathPtr);
+TCLAPI const void *	Tcl_FSGetNativePath(Tcl_Obj *pathPtr);
 /* 470 */
-EXTERN Tcl_Obj *	Tcl_FSFileSystemInfo(Tcl_Obj *pathPtr);
+TCLAPI Tcl_Obj *	Tcl_FSFileSystemInfo(Tcl_Obj *pathPtr);
 /* 471 */
-EXTERN Tcl_Obj *	Tcl_FSPathSeparator(Tcl_Obj *pathPtr);
+TCLAPI Tcl_Obj *	Tcl_FSPathSeparator(Tcl_Obj *pathPtr);
 /* 472 */
-EXTERN Tcl_Obj *	Tcl_FSListVolumes(void);
+TCLAPI Tcl_Obj *	Tcl_FSListVolumes(void);
 /* 473 */
-EXTERN int		Tcl_FSRegister(ClientData clientData,
+TCLAPI int		Tcl_FSRegister(ClientData clientData,
 				const Tcl_Filesystem *fsPtr);
 /* 474 */
-EXTERN int		Tcl_FSUnregister(const Tcl_Filesystem *fsPtr);
+TCLAPI int		Tcl_FSUnregister(const Tcl_Filesystem *fsPtr);
 /* 475 */
-EXTERN ClientData	Tcl_FSData(const Tcl_Filesystem *fsPtr);
+TCLAPI ClientData	Tcl_FSData(const Tcl_Filesystem *fsPtr);
 /* 476 */
-EXTERN const char *	Tcl_FSGetTranslatedStringPath(Tcl_Interp *interp,
+TCLAPI const char *	Tcl_FSGetTranslatedStringPath(Tcl_Interp *interp,
 				Tcl_Obj *pathPtr);
 /* 477 */
-EXTERN const Tcl_Filesystem * Tcl_FSGetFileSystemForPath(Tcl_Obj *pathPtr);
+TCLAPI const Tcl_Filesystem * Tcl_FSGetFileSystemForPath(Tcl_Obj *pathPtr);
 /* 478 */
-EXTERN Tcl_PathType	Tcl_FSGetPathType(Tcl_Obj *pathPtr);
+TCLAPI Tcl_PathType	Tcl_FSGetPathType(Tcl_Obj *pathPtr);
 /* 479 */
-EXTERN int		Tcl_OutputBuffered(Tcl_Channel chan);
+TCLAPI int		Tcl_OutputBuffered(Tcl_Channel chan);
 /* 480 */
-EXTERN void		Tcl_FSMountsChanged(const Tcl_Filesystem *fsPtr);
+TCLAPI void		Tcl_FSMountsChanged(const Tcl_Filesystem *fsPtr);
 /* 481 */
-EXTERN int		Tcl_EvalTokensStandard(Tcl_Interp *interp,
+TCLAPI int		Tcl_EvalTokensStandard(Tcl_Interp *interp,
 				Tcl_Token *tokenPtr, int count);
 /* 482 */
-EXTERN void		Tcl_GetTime(Tcl_Time *timeBuf);
+TCLAPI void		Tcl_GetTime(Tcl_Time *timeBuf);
 /* 483 */
-EXTERN Tcl_Trace	Tcl_CreateObjTrace(Tcl_Interp *interp, int level,
+TCLAPI Tcl_Trace	Tcl_CreateObjTrace(Tcl_Interp *interp, int level,
 				int flags, Tcl_CmdObjTraceProc *objProc,
 				ClientData clientData,
 				Tcl_CmdObjTraceDeleteProc *delProc);
 /* 484 */
-EXTERN int		Tcl_GetCommandInfoFromToken(Tcl_Command token,
+TCLAPI int		Tcl_GetCommandInfoFromToken(Tcl_Command token,
 				Tcl_CmdInfo *infoPtr);
 /* 485 */
-EXTERN int		Tcl_SetCommandInfoFromToken(Tcl_Command token,
+TCLAPI int		Tcl_SetCommandInfoFromToken(Tcl_Command token,
 				const Tcl_CmdInfo *infoPtr);
 /* 486 */
-EXTERN Tcl_Obj *	Tcl_DbNewWideIntObj(Tcl_WideInt wideValue,
+TCLAPI Tcl_Obj *	Tcl_DbNewWideIntObj(Tcl_WideInt wideValue,
 				const char *file, int line);
 /* 487 */
-EXTERN int		Tcl_GetWideIntFromObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetWideIntFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tcl_WideInt *widePtr);
 /* 488 */
-EXTERN Tcl_Obj *	Tcl_NewWideIntObj(Tcl_WideInt wideValue);
+TCLAPI Tcl_Obj *	Tcl_NewWideIntObj(Tcl_WideInt wideValue);
 /* 489 */
-EXTERN void		Tcl_SetWideIntObj(Tcl_Obj *objPtr,
+TCLAPI void		Tcl_SetWideIntObj(Tcl_Obj *objPtr,
 				Tcl_WideInt wideValue);
 /* 490 */
-EXTERN Tcl_StatBuf *	Tcl_AllocStatBuf(void);
+TCLAPI Tcl_StatBuf *	Tcl_AllocStatBuf(void);
 /* 491 */
-EXTERN Tcl_WideInt	Tcl_Seek(Tcl_Channel chan, Tcl_WideInt offset,
+TCLAPI Tcl_WideInt	Tcl_Seek(Tcl_Channel chan, Tcl_WideInt offset,
 				int mode);
 /* 492 */
-EXTERN Tcl_WideInt	Tcl_Tell(Tcl_Channel chan);
+TCLAPI Tcl_WideInt	Tcl_Tell(Tcl_Channel chan);
 /* 493 */
-EXTERN Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc(
+TCLAPI Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 494 */
-EXTERN int		Tcl_DictObjPut(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+TCLAPI int		Tcl_DictObjPut(Tcl_Interp *interp, Tcl_Obj *dictPtr,
 				Tcl_Obj *keyPtr, Tcl_Obj *valuePtr);
 /* 495 */
-EXTERN int		Tcl_DictObjGet(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+TCLAPI int		Tcl_DictObjGet(Tcl_Interp *interp, Tcl_Obj *dictPtr,
 				Tcl_Obj *keyPtr, Tcl_Obj **valuePtrPtr);
 /* 496 */
-EXTERN int		Tcl_DictObjRemove(Tcl_Interp *interp,
+TCLAPI int		Tcl_DictObjRemove(Tcl_Interp *interp,
 				Tcl_Obj *dictPtr, Tcl_Obj *keyPtr);
 /* 497 */
-EXTERN int		Tcl_DictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+TCLAPI int		Tcl_DictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
 				int *sizePtr);
 /* 498 */
-EXTERN int		Tcl_DictObjFirst(Tcl_Interp *interp,
+TCLAPI int		Tcl_DictObjFirst(Tcl_Interp *interp,
 				Tcl_Obj *dictPtr, Tcl_DictSearch *searchPtr,
 				Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr,
 				int *donePtr);
 /* 499 */
-EXTERN void		Tcl_DictObjNext(Tcl_DictSearch *searchPtr,
+TCLAPI void		Tcl_DictObjNext(Tcl_DictSearch *searchPtr,
 				Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr,
 				int *donePtr);
 /* 500 */
-EXTERN void		Tcl_DictObjDone(Tcl_DictSearch *searchPtr);
+TCLAPI void		Tcl_DictObjDone(Tcl_DictSearch *searchPtr);
 /* 501 */
-EXTERN int		Tcl_DictObjPutKeyList(Tcl_Interp *interp,
+TCLAPI int		Tcl_DictObjPutKeyList(Tcl_Interp *interp,
 				Tcl_Obj *dictPtr, int keyc,
 				Tcl_Obj *const *keyv, Tcl_Obj *valuePtr);
 /* 502 */
-EXTERN int		Tcl_DictObjRemoveKeyList(Tcl_Interp *interp,
+TCLAPI int		Tcl_DictObjRemoveKeyList(Tcl_Interp *interp,
 				Tcl_Obj *dictPtr, int keyc,
 				Tcl_Obj *const *keyv);
 /* 503 */
-EXTERN Tcl_Obj *	Tcl_NewDictObj(void);
+TCLAPI Tcl_Obj *	Tcl_NewDictObj(void);
 /* 504 */
-EXTERN Tcl_Obj *	Tcl_DbNewDictObj(const char *file, int line);
+TCLAPI Tcl_Obj *	Tcl_DbNewDictObj(const char *file, int line);
 /* 505 */
-EXTERN void		Tcl_RegisterConfig(Tcl_Interp *interp,
+TCLAPI void		Tcl_RegisterConfig(Tcl_Interp *interp,
 				const char *pkgName,
 				const Tcl_Config *configuration,
 				const char *valEncoding);
 /* 506 */
-EXTERN Tcl_Namespace *	Tcl_CreateNamespace(Tcl_Interp *interp,
+TCLAPI Tcl_Namespace *	Tcl_CreateNamespace(Tcl_Interp *interp,
 				const char *name, ClientData clientData,
 				Tcl_NamespaceDeleteProc *deleteProc);
 /* 507 */
-EXTERN void		Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
+TCLAPI void		Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
 /* 508 */
-EXTERN int		Tcl_AppendExportList(Tcl_Interp *interp,
+TCLAPI int		Tcl_AppendExportList(Tcl_Interp *interp,
 				Tcl_Namespace *nsPtr, Tcl_Obj *objPtr);
 /* 509 */
-EXTERN int		Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+TCLAPI int		Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
 				const char *pattern, int resetListFirst);
 /* 510 */
-EXTERN int		Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+TCLAPI int		Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
 				const char *pattern, int allowOverwrite);
 /* 511 */
-EXTERN int		Tcl_ForgetImport(Tcl_Interp *interp,
+TCLAPI int		Tcl_ForgetImport(Tcl_Interp *interp,
 				Tcl_Namespace *nsPtr, const char *pattern);
 /* 512 */
-EXTERN Tcl_Namespace *	Tcl_GetCurrentNamespace(Tcl_Interp *interp);
+TCLAPI Tcl_Namespace *	Tcl_GetCurrentNamespace(Tcl_Interp *interp);
 /* 513 */
-EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace(Tcl_Interp *interp);
+TCLAPI Tcl_Namespace *	Tcl_GetGlobalNamespace(Tcl_Interp *interp);
 /* 514 */
-EXTERN Tcl_Namespace *	Tcl_FindNamespace(Tcl_Interp *interp,
+TCLAPI Tcl_Namespace *	Tcl_FindNamespace(Tcl_Interp *interp,
 				const char *name,
 				Tcl_Namespace *contextNsPtr, int flags);
 /* 515 */
-EXTERN Tcl_Command	Tcl_FindCommand(Tcl_Interp *interp, const char *name,
+TCLAPI Tcl_Command	Tcl_FindCommand(Tcl_Interp *interp, const char *name,
 				Tcl_Namespace *contextNsPtr, int flags);
 /* 516 */
-EXTERN Tcl_Command	Tcl_GetCommandFromObj(Tcl_Interp *interp,
+TCLAPI Tcl_Command	Tcl_GetCommandFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr);
 /* 517 */
-EXTERN void		Tcl_GetCommandFullName(Tcl_Interp *interp,
+TCLAPI void		Tcl_GetCommandFullName(Tcl_Interp *interp,
 				Tcl_Command command, Tcl_Obj *objPtr);
 /* 518 */
-EXTERN int		Tcl_FSEvalFileEx(Tcl_Interp *interp,
+TCLAPI int		Tcl_FSEvalFileEx(Tcl_Interp *interp,
 				Tcl_Obj *fileName, const char *encodingName);
 /* 519 */
-EXTERN Tcl_ExitProc *	Tcl_SetExitProc(Tcl_ExitProc *proc);
+TCLAPI Tcl_ExitProc *	Tcl_SetExitProc(Tcl_ExitProc *proc);
 /* 520 */
-EXTERN void		Tcl_LimitAddHandler(Tcl_Interp *interp, int type,
+TCLAPI void		Tcl_LimitAddHandler(Tcl_Interp *interp, int type,
 				Tcl_LimitHandlerProc *handlerProc,
 				ClientData clientData,
 				Tcl_LimitHandlerDeleteProc *deleteProc);
 /* 521 */
-EXTERN void		Tcl_LimitRemoveHandler(Tcl_Interp *interp, int type,
+TCLAPI void		Tcl_LimitRemoveHandler(Tcl_Interp *interp, int type,
 				Tcl_LimitHandlerProc *handlerProc,
 				ClientData clientData);
 /* 522 */
-EXTERN int		Tcl_LimitReady(Tcl_Interp *interp);
+TCLAPI int		Tcl_LimitReady(Tcl_Interp *interp);
 /* 523 */
-EXTERN int		Tcl_LimitCheck(Tcl_Interp *interp);
+TCLAPI int		Tcl_LimitCheck(Tcl_Interp *interp);
 /* 524 */
-EXTERN int		Tcl_LimitExceeded(Tcl_Interp *interp);
+TCLAPI int		Tcl_LimitExceeded(Tcl_Interp *interp);
 /* 525 */
-EXTERN void		Tcl_LimitSetCommands(Tcl_Interp *interp,
+TCLAPI void		Tcl_LimitSetCommands(Tcl_Interp *interp,
 				int commandLimit);
 /* 526 */
-EXTERN void		Tcl_LimitSetTime(Tcl_Interp *interp,
+TCLAPI void		Tcl_LimitSetTime(Tcl_Interp *interp,
 				Tcl_Time *timeLimitPtr);
 /* 527 */
-EXTERN void		Tcl_LimitSetGranularity(Tcl_Interp *interp, int type,
+TCLAPI void		Tcl_LimitSetGranularity(Tcl_Interp *interp, int type,
 				int granularity);
 /* 528 */
-EXTERN int		Tcl_LimitTypeEnabled(Tcl_Interp *interp, int type);
+TCLAPI int		Tcl_LimitTypeEnabled(Tcl_Interp *interp, int type);
 /* 529 */
-EXTERN int		Tcl_LimitTypeExceeded(Tcl_Interp *interp, int type);
+TCLAPI int		Tcl_LimitTypeExceeded(Tcl_Interp *interp, int type);
 /* 530 */
-EXTERN void		Tcl_LimitTypeSet(Tcl_Interp *interp, int type);
+TCLAPI void		Tcl_LimitTypeSet(Tcl_Interp *interp, int type);
 /* 531 */
-EXTERN void		Tcl_LimitTypeReset(Tcl_Interp *interp, int type);
+TCLAPI void		Tcl_LimitTypeReset(Tcl_Interp *interp, int type);
 /* 532 */
-EXTERN int		Tcl_LimitGetCommands(Tcl_Interp *interp);
+TCLAPI int		Tcl_LimitGetCommands(Tcl_Interp *interp);
 /* 533 */
-EXTERN void		Tcl_LimitGetTime(Tcl_Interp *interp,
+TCLAPI void		Tcl_LimitGetTime(Tcl_Interp *interp,
 				Tcl_Time *timeLimitPtr);
 /* 534 */
-EXTERN int		Tcl_LimitGetGranularity(Tcl_Interp *interp, int type);
+TCLAPI int		Tcl_LimitGetGranularity(Tcl_Interp *interp, int type);
 /* 535 */
-EXTERN Tcl_InterpState	Tcl_SaveInterpState(Tcl_Interp *interp, int status);
+TCLAPI Tcl_InterpState	Tcl_SaveInterpState(Tcl_Interp *interp, int status);
 /* 536 */
-EXTERN int		Tcl_RestoreInterpState(Tcl_Interp *interp,
+TCLAPI int		Tcl_RestoreInterpState(Tcl_Interp *interp,
 				Tcl_InterpState state);
 /* 537 */
-EXTERN void		Tcl_DiscardInterpState(Tcl_InterpState state);
+TCLAPI void		Tcl_DiscardInterpState(Tcl_InterpState state);
 /* 538 */
-EXTERN int		Tcl_SetReturnOptions(Tcl_Interp *interp,
+TCLAPI int		Tcl_SetReturnOptions(Tcl_Interp *interp,
 				Tcl_Obj *options);
 /* 539 */
-EXTERN Tcl_Obj *	Tcl_GetReturnOptions(Tcl_Interp *interp, int result);
+TCLAPI Tcl_Obj *	Tcl_GetReturnOptions(Tcl_Interp *interp, int result);
 /* 540 */
-EXTERN int		Tcl_IsEnsemble(Tcl_Command token);
+TCLAPI int		Tcl_IsEnsemble(Tcl_Command token);
 /* 541 */
-EXTERN Tcl_Command	Tcl_CreateEnsemble(Tcl_Interp *interp,
+TCLAPI Tcl_Command	Tcl_CreateEnsemble(Tcl_Interp *interp,
 				const char *name,
 				Tcl_Namespace *namespacePtr, int flags);
 /* 542 */
-EXTERN Tcl_Command	Tcl_FindEnsemble(Tcl_Interp *interp,
+TCLAPI Tcl_Command	Tcl_FindEnsemble(Tcl_Interp *interp,
 				Tcl_Obj *cmdNameObj, int flags);
 /* 543 */
-EXTERN int		Tcl_SetEnsembleSubcommandList(Tcl_Interp *interp,
+TCLAPI int		Tcl_SetEnsembleSubcommandList(Tcl_Interp *interp,
 				Tcl_Command token, Tcl_Obj *subcmdList);
 /* 544 */
-EXTERN int		Tcl_SetEnsembleMappingDict(Tcl_Interp *interp,
+TCLAPI int		Tcl_SetEnsembleMappingDict(Tcl_Interp *interp,
 				Tcl_Command token, Tcl_Obj *mapDict);
 /* 545 */
-EXTERN int		Tcl_SetEnsembleUnknownHandler(Tcl_Interp *interp,
+TCLAPI int		Tcl_SetEnsembleUnknownHandler(Tcl_Interp *interp,
 				Tcl_Command token, Tcl_Obj *unknownList);
 /* 546 */
-EXTERN int		Tcl_SetEnsembleFlags(Tcl_Interp *interp,
+TCLAPI int		Tcl_SetEnsembleFlags(Tcl_Interp *interp,
 				Tcl_Command token, int flags);
 /* 547 */
-EXTERN int		Tcl_GetEnsembleSubcommandList(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetEnsembleSubcommandList(Tcl_Interp *interp,
 				Tcl_Command token, Tcl_Obj **subcmdListPtr);
 /* 548 */
-EXTERN int		Tcl_GetEnsembleMappingDict(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetEnsembleMappingDict(Tcl_Interp *interp,
 				Tcl_Command token, Tcl_Obj **mapDictPtr);
 /* 549 */
-EXTERN int		Tcl_GetEnsembleUnknownHandler(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetEnsembleUnknownHandler(Tcl_Interp *interp,
 				Tcl_Command token, Tcl_Obj **unknownListPtr);
 /* 550 */
-EXTERN int		Tcl_GetEnsembleFlags(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetEnsembleFlags(Tcl_Interp *interp,
 				Tcl_Command token, int *flagsPtr);
 /* 551 */
-EXTERN int		Tcl_GetEnsembleNamespace(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetEnsembleNamespace(Tcl_Interp *interp,
 				Tcl_Command token,
 				Tcl_Namespace **namespacePtrPtr);
 /* 552 */
-EXTERN void		Tcl_SetTimeProc(Tcl_GetTimeProc *getProc,
+TCLAPI void		Tcl_SetTimeProc(Tcl_GetTimeProc *getProc,
 				Tcl_ScaleTimeProc *scaleProc,
 				ClientData clientData);
 /* 553 */
-EXTERN void		Tcl_QueryTimeProc(Tcl_GetTimeProc **getProc,
+TCLAPI void		Tcl_QueryTimeProc(Tcl_GetTimeProc **getProc,
 				Tcl_ScaleTimeProc **scaleProc,
 				ClientData *clientData);
 /* 554 */
-EXTERN Tcl_DriverThreadActionProc * Tcl_ChannelThreadActionProc(
+TCLAPI Tcl_DriverThreadActionProc * Tcl_ChannelThreadActionProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 555 */
-EXTERN Tcl_Obj *	Tcl_NewBignumObj(mp_int *value);
+TCLAPI Tcl_Obj *	Tcl_NewBignumObj(mp_int *value);
 /* 556 */
-EXTERN Tcl_Obj *	Tcl_DbNewBignumObj(mp_int *value, const char *file,
+TCLAPI Tcl_Obj *	Tcl_DbNewBignumObj(mp_int *value, const char *file,
 				int line);
 /* 557 */
-EXTERN void		Tcl_SetBignumObj(Tcl_Obj *obj, mp_int *value);
+TCLAPI void		Tcl_SetBignumObj(Tcl_Obj *obj, mp_int *value);
 /* 558 */
-EXTERN int		Tcl_GetBignumFromObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetBignumFromObj(Tcl_Interp *interp,
 				Tcl_Obj *obj, mp_int *value);
 /* 559 */
-EXTERN int		Tcl_TakeBignumFromObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_TakeBignumFromObj(Tcl_Interp *interp,
 				Tcl_Obj *obj, mp_int *value);
 /* 560 */
-EXTERN int		Tcl_TruncateChannel(Tcl_Channel chan,
+TCLAPI int		Tcl_TruncateChannel(Tcl_Channel chan,
 				Tcl_WideInt length);
 /* 561 */
-EXTERN Tcl_DriverTruncateProc * Tcl_ChannelTruncateProc(
+TCLAPI Tcl_DriverTruncateProc * Tcl_ChannelTruncateProc(
 				const Tcl_ChannelType *chanTypePtr);
 /* 562 */
-EXTERN void		Tcl_SetChannelErrorInterp(Tcl_Interp *interp,
+TCLAPI void		Tcl_SetChannelErrorInterp(Tcl_Interp *interp,
 				Tcl_Obj *msg);
 /* 563 */
-EXTERN void		Tcl_GetChannelErrorInterp(Tcl_Interp *interp,
+TCLAPI void		Tcl_GetChannelErrorInterp(Tcl_Interp *interp,
 				Tcl_Obj **msg);
 /* 564 */
-EXTERN void		Tcl_SetChannelError(Tcl_Channel chan, Tcl_Obj *msg);
+TCLAPI void		Tcl_SetChannelError(Tcl_Channel chan, Tcl_Obj *msg);
 /* 565 */
-EXTERN void		Tcl_GetChannelError(Tcl_Channel chan, Tcl_Obj **msg);
+TCLAPI void		Tcl_GetChannelError(Tcl_Channel chan, Tcl_Obj **msg);
 /* 566 */
-EXTERN int		Tcl_InitBignumFromDouble(Tcl_Interp *interp,
+TCLAPI int		Tcl_InitBignumFromDouble(Tcl_Interp *interp,
 				double initval, mp_int *toInit);
 /* 567 */
-EXTERN Tcl_Obj *	Tcl_GetNamespaceUnknownHandler(Tcl_Interp *interp,
+TCLAPI Tcl_Obj *	Tcl_GetNamespaceUnknownHandler(Tcl_Interp *interp,
 				Tcl_Namespace *nsPtr);
 /* 568 */
-EXTERN int		Tcl_SetNamespaceUnknownHandler(Tcl_Interp *interp,
+TCLAPI int		Tcl_SetNamespaceUnknownHandler(Tcl_Interp *interp,
 				Tcl_Namespace *nsPtr, Tcl_Obj *handlerPtr);
 /* 569 */
-EXTERN int		Tcl_GetEncodingFromObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetEncodingFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tcl_Encoding *encodingPtr);
 /* 570 */
-EXTERN Tcl_Obj *	Tcl_GetEncodingSearchPath(void);
+TCLAPI Tcl_Obj *	Tcl_GetEncodingSearchPath(void);
 /* 571 */
-EXTERN int		Tcl_SetEncodingSearchPath(Tcl_Obj *searchPath);
+TCLAPI int		Tcl_SetEncodingSearchPath(Tcl_Obj *searchPath);
 /* 572 */
-EXTERN const char *	Tcl_GetEncodingNameFromEnvironment(
+TCLAPI const char *	Tcl_GetEncodingNameFromEnvironment(
 				Tcl_DString *bufPtr);
 /* 573 */
-EXTERN int		Tcl_PkgRequireProc(Tcl_Interp *interp,
+TCLAPI int		Tcl_PkgRequireProc(Tcl_Interp *interp,
 				const char *name, int objc,
 				Tcl_Obj *const objv[], void *clientDataPtr);
 /* 574 */
-EXTERN void		Tcl_AppendObjToErrorInfo(Tcl_Interp *interp,
+TCLAPI void		Tcl_AppendObjToErrorInfo(Tcl_Interp *interp,
 				Tcl_Obj *objPtr);
 /* 575 */
-EXTERN void		Tcl_AppendLimitedToObj(Tcl_Obj *objPtr,
+TCLAPI void		Tcl_AppendLimitedToObj(Tcl_Obj *objPtr,
 				const char *bytes, int length, int limit,
 				const char *ellipsis);
 /* 576 */
-EXTERN Tcl_Obj *	Tcl_Format(Tcl_Interp *interp, const char *format,
+TCLAPI Tcl_Obj *	Tcl_Format(Tcl_Interp *interp, const char *format,
 				int objc, Tcl_Obj *const objv[]);
 /* 577 */
-EXTERN int		Tcl_AppendFormatToObj(Tcl_Interp *interp,
+TCLAPI int		Tcl_AppendFormatToObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, const char *format,
 				int objc, Tcl_Obj *const objv[]);
 /* 578 */
-EXTERN Tcl_Obj *	Tcl_ObjPrintf(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
+TCLAPI Tcl_Obj *	Tcl_ObjPrintf(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
 /* 579 */
-EXTERN void		Tcl_AppendPrintfToObj(Tcl_Obj *objPtr,
+TCLAPI void		Tcl_AppendPrintfToObj(Tcl_Obj *objPtr,
 				const char *format, ...) TCL_FORMAT_PRINTF(2, 3);
 /* 580 */
-EXTERN int		Tcl_CancelEval(Tcl_Interp *interp,
+TCLAPI int		Tcl_CancelEval(Tcl_Interp *interp,
 				Tcl_Obj *resultObjPtr, ClientData clientData,
 				int flags);
 /* 581 */
-EXTERN int		Tcl_Canceled(Tcl_Interp *interp, int flags);
+TCLAPI int		Tcl_Canceled(Tcl_Interp *interp, int flags);
 /* 582 */
-EXTERN int		Tcl_CreatePipe(Tcl_Interp *interp,
+TCLAPI int		Tcl_CreatePipe(Tcl_Interp *interp,
 				Tcl_Channel *rchan, Tcl_Channel *wchan,
 				int flags);
 /* 583 */
-EXTERN Tcl_Command	Tcl_NRCreateCommand(Tcl_Interp *interp,
+TCLAPI Tcl_Command	Tcl_NRCreateCommand(Tcl_Interp *interp,
 				const char *cmdName, Tcl_ObjCmdProc *proc,
 				Tcl_ObjCmdProc *nreProc,
 				ClientData clientData,
 				Tcl_CmdDeleteProc *deleteProc);
 /* 584 */
-EXTERN int		Tcl_NREvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+TCLAPI int		Tcl_NREvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				int flags);
 /* 585 */
-EXTERN int		Tcl_NREvalObjv(Tcl_Interp *interp, int objc,
+TCLAPI int		Tcl_NREvalObjv(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], int flags);
 /* 586 */
-EXTERN int		Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd,
+TCLAPI int		Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd,
 				int objc, Tcl_Obj *const objv[], int flags);
 /* 587 */
-EXTERN void		Tcl_NRAddCallback(Tcl_Interp *interp,
+TCLAPI void		Tcl_NRAddCallback(Tcl_Interp *interp,
 				Tcl_NRPostProc *postProcPtr,
 				ClientData data0, ClientData data1,
 				ClientData data2, ClientData data3);
 /* 588 */
-EXTERN int		Tcl_NRCallObjProc(Tcl_Interp *interp,
+TCLAPI int		Tcl_NRCallObjProc(Tcl_Interp *interp,
 				Tcl_ObjCmdProc *objProc,
 				ClientData clientData, int objc,
 				Tcl_Obj *const objv[]);
 /* 589 */
-EXTERN unsigned		Tcl_GetFSDeviceFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI unsigned		Tcl_GetFSDeviceFromStat(const Tcl_StatBuf *statPtr);
 /* 590 */
-EXTERN unsigned		Tcl_GetFSInodeFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI unsigned		Tcl_GetFSInodeFromStat(const Tcl_StatBuf *statPtr);
 /* 591 */
-EXTERN unsigned		Tcl_GetModeFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI unsigned		Tcl_GetModeFromStat(const Tcl_StatBuf *statPtr);
 /* 592 */
-EXTERN int		Tcl_GetLinkCountFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI int		Tcl_GetLinkCountFromStat(const Tcl_StatBuf *statPtr);
 /* 593 */
-EXTERN int		Tcl_GetUserIdFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI int		Tcl_GetUserIdFromStat(const Tcl_StatBuf *statPtr);
 /* 594 */
-EXTERN int		Tcl_GetGroupIdFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI int		Tcl_GetGroupIdFromStat(const Tcl_StatBuf *statPtr);
 /* 595 */
-EXTERN int		Tcl_GetDeviceTypeFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI int		Tcl_GetDeviceTypeFromStat(const Tcl_StatBuf *statPtr);
 /* 596 */
-EXTERN Tcl_WideInt	Tcl_GetAccessTimeFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI Tcl_WideInt	Tcl_GetAccessTimeFromStat(const Tcl_StatBuf *statPtr);
 /* 597 */
-EXTERN Tcl_WideInt	Tcl_GetModificationTimeFromStat(
+TCLAPI Tcl_WideInt	Tcl_GetModificationTimeFromStat(
 				const Tcl_StatBuf *statPtr);
 /* 598 */
-EXTERN Tcl_WideInt	Tcl_GetChangeTimeFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI Tcl_WideInt	Tcl_GetChangeTimeFromStat(const Tcl_StatBuf *statPtr);
 /* 599 */
-EXTERN Tcl_WideUInt	Tcl_GetSizeFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI Tcl_WideUInt	Tcl_GetSizeFromStat(const Tcl_StatBuf *statPtr);
 /* 600 */
-EXTERN Tcl_WideUInt	Tcl_GetBlocksFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI Tcl_WideUInt	Tcl_GetBlocksFromStat(const Tcl_StatBuf *statPtr);
 /* 601 */
-EXTERN unsigned		Tcl_GetBlockSizeFromStat(const Tcl_StatBuf *statPtr);
+TCLAPI unsigned		Tcl_GetBlockSizeFromStat(const Tcl_StatBuf *statPtr);
 /* 602 */
-EXTERN int		Tcl_SetEnsembleParameterList(Tcl_Interp *interp,
+TCLAPI int		Tcl_SetEnsembleParameterList(Tcl_Interp *interp,
 				Tcl_Command token, Tcl_Obj *paramList);
 /* 603 */
-EXTERN int		Tcl_GetEnsembleParameterList(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetEnsembleParameterList(Tcl_Interp *interp,
 				Tcl_Command token, Tcl_Obj **paramListPtr);
 /* 604 */
-EXTERN int		Tcl_ParseArgsObjv(Tcl_Interp *interp,
+TCLAPI int		Tcl_ParseArgsObjv(Tcl_Interp *interp,
 				const Tcl_ArgvInfo *argTable, int *objcPtr,
 				Tcl_Obj *const *objv, Tcl_Obj ***remObjv);
 /* 605 */
-EXTERN int		Tcl_GetErrorLine(Tcl_Interp *interp);
+TCLAPI int		Tcl_GetErrorLine(Tcl_Interp *interp);
 /* 606 */
-EXTERN void		Tcl_SetErrorLine(Tcl_Interp *interp, int lineNum);
+TCLAPI void		Tcl_SetErrorLine(Tcl_Interp *interp, int lineNum);
 /* 607 */
-EXTERN void		Tcl_TransferResult(Tcl_Interp *sourceInterp,
+TCLAPI void		Tcl_TransferResult(Tcl_Interp *sourceInterp,
 				int result, Tcl_Interp *targetInterp);
 /* 608 */
-EXTERN int		Tcl_InterpActive(Tcl_Interp *interp);
+TCLAPI int		Tcl_InterpActive(Tcl_Interp *interp);
 /* 609 */
-EXTERN void		Tcl_BackgroundException(Tcl_Interp *interp, int code);
+TCLAPI void		Tcl_BackgroundException(Tcl_Interp *interp, int code);
 /* 610 */
-EXTERN int		Tcl_ZlibDeflate(Tcl_Interp *interp, int format,
+TCLAPI int		Tcl_ZlibDeflate(Tcl_Interp *interp, int format,
 				Tcl_Obj *data, int level,
 				Tcl_Obj *gzipHeaderDictObj);
 /* 611 */
-EXTERN int		Tcl_ZlibInflate(Tcl_Interp *interp, int format,
+TCLAPI int		Tcl_ZlibInflate(Tcl_Interp *interp, int format,
 				Tcl_Obj *data, int buffersize,
 				Tcl_Obj *gzipHeaderDictObj);
 /* 612 */
-EXTERN unsigned int	Tcl_ZlibCRC32(unsigned int crc,
+TCLAPI unsigned int	Tcl_ZlibCRC32(unsigned int crc,
 				const unsigned char *buf, int len);
 /* 613 */
-EXTERN unsigned int	Tcl_ZlibAdler32(unsigned int adler,
+TCLAPI unsigned int	Tcl_ZlibAdler32(unsigned int adler,
 				const unsigned char *buf, int len);
 /* 614 */
-EXTERN int		Tcl_ZlibStreamInit(Tcl_Interp *interp, int mode,
+TCLAPI int		Tcl_ZlibStreamInit(Tcl_Interp *interp, int mode,
 				int format, int level, Tcl_Obj *dictObj,
 				Tcl_ZlibStream *zshandle);
 /* 615 */
-EXTERN Tcl_Obj *	Tcl_ZlibStreamGetCommandName(Tcl_ZlibStream zshandle);
+TCLAPI Tcl_Obj *	Tcl_ZlibStreamGetCommandName(Tcl_ZlibStream zshandle);
 /* 616 */
-EXTERN int		Tcl_ZlibStreamEof(Tcl_ZlibStream zshandle);
+TCLAPI int		Tcl_ZlibStreamEof(Tcl_ZlibStream zshandle);
 /* 617 */
-EXTERN int		Tcl_ZlibStreamChecksum(Tcl_ZlibStream zshandle);
+TCLAPI int		Tcl_ZlibStreamChecksum(Tcl_ZlibStream zshandle);
 /* 618 */
-EXTERN int		Tcl_ZlibStreamPut(Tcl_ZlibStream zshandle,
+TCLAPI int		Tcl_ZlibStreamPut(Tcl_ZlibStream zshandle,
 				Tcl_Obj *data, int flush);
 /* 619 */
-EXTERN int		Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle,
+TCLAPI int		Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle,
 				Tcl_Obj *data, int count);
 /* 620 */
-EXTERN int		Tcl_ZlibStreamClose(Tcl_ZlibStream zshandle);
+TCLAPI int		Tcl_ZlibStreamClose(Tcl_ZlibStream zshandle);
 /* 621 */
-EXTERN int		Tcl_ZlibStreamReset(Tcl_ZlibStream zshandle);
+TCLAPI int		Tcl_ZlibStreamReset(Tcl_ZlibStream zshandle);
 /* 622 */
-EXTERN void		Tcl_SetStartupScript(Tcl_Obj *path,
+TCLAPI void		Tcl_SetStartupScript(Tcl_Obj *path,
 				const char *encoding);
 /* 623 */
-EXTERN Tcl_Obj *	Tcl_GetStartupScript(const char **encodingPtr);
+TCLAPI Tcl_Obj *	Tcl_GetStartupScript(const char **encodingPtr);
 /* 624 */
-EXTERN int		Tcl_CloseEx(Tcl_Interp *interp, Tcl_Channel chan,
+TCLAPI int		Tcl_CloseEx(Tcl_Interp *interp, Tcl_Channel chan,
 				int flags);
 /* 625 */
-EXTERN int		Tcl_NRExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+TCLAPI int		Tcl_NRExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				Tcl_Obj *resultPtr);
 /* 626 */
-EXTERN int		Tcl_NRSubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+TCLAPI int		Tcl_NRSubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				int flags);
 /* 627 */
-EXTERN int		Tcl_LoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
+TCLAPI int		Tcl_LoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
 				const char *const symv[], int flags,
 				void *procPtrs, Tcl_LoadHandle *handlePtr);
 /* 628 */
-EXTERN void *		Tcl_FindSymbol(Tcl_Interp *interp,
+TCLAPI void *		Tcl_FindSymbol(Tcl_Interp *interp,
 				Tcl_LoadHandle handle, const char *symbol);
 /* 629 */
-EXTERN int		Tcl_FSUnloadFile(Tcl_Interp *interp,
+TCLAPI int		Tcl_FSUnloadFile(Tcl_Interp *interp,
 				Tcl_LoadHandle handlePtr);
 /* 630 */
-EXTERN void		Tcl_ZlibStreamSetCompressionDictionary(
+TCLAPI void		Tcl_ZlibStreamSetCompressionDictionary(
 				Tcl_ZlibStream zhandle,
 				Tcl_Obj *compressionDictionaryObj);
 
@@ -3759,7 +3748,4 @@ extern const TclStubs *tclStubsPtr;
 	    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
 #endif
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TCLDECLS */
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index bf6a21d..65b1888 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -17,17 +17,6 @@
 
 #include "tclPort.h"
 
-#undef TCL_STORAGE_CLASS
-#ifdef BUILD_tcl
-#   define TCL_STORAGE_CLASS DLLEXPORT
-#else
-#   ifdef USE_TCL_STUBS
-#      define TCL_STORAGE_CLASS
-#   else
-#      define TCL_STORAGE_CLASS DLLIMPORT
-#   endif
-#endif
-
 /* [Bug #803489] Tcl_FindNamespace problem in the Stubs table */
 #undef Tcl_AppendExportList
 #undef Tcl_CreateNamespace
@@ -59,162 +48,162 @@
 /* Slot 1 is reserved */
 /* Slot 2 is reserved */
 /* 3 */
-EXTERN void		TclAllocateFreeObjects(void);
+TCLAPI void		TclAllocateFreeObjects(void);
 /* Slot 4 is reserved */
 /* 5 */
-EXTERN int		TclCleanupChildren(Tcl_Interp *interp, int numPids,
+TCLAPI int		TclCleanupChildren(Tcl_Interp *interp, int numPids,
 				Tcl_Pid *pidPtr, Tcl_Channel errorChan);
 /* 6 */
-EXTERN void		TclCleanupCommand(Command *cmdPtr);
+TCLAPI void		TclCleanupCommand(Command *cmdPtr);
 /* 7 */
-EXTERN int		TclCopyAndCollapse(int count, const char *src,
+TCLAPI int		TclCopyAndCollapse(int count, const char *src,
 				char *dst);
 /* Slot 8 is reserved */
 /* 9 */
-EXTERN int		TclCreatePipeline(Tcl_Interp *interp, int argc,
+TCLAPI int		TclCreatePipeline(Tcl_Interp *interp, int argc,
 				const char **argv, Tcl_Pid **pidArrayPtr,
 				TclFile *inPipePtr, TclFile *outPipePtr,
 				TclFile *errFilePtr);
 /* 10 */
-EXTERN int		TclCreateProc(Tcl_Interp *interp, Namespace *nsPtr,
+TCLAPI int		TclCreateProc(Tcl_Interp *interp, Namespace *nsPtr,
 				const char *procName, Tcl_Obj *argsPtr,
 				Tcl_Obj *bodyPtr, Proc **procPtrPtr);
 /* 11 */
-EXTERN void		TclDeleteCompiledLocalVars(Interp *iPtr,
+TCLAPI void		TclDeleteCompiledLocalVars(Interp *iPtr,
 				CallFrame *framePtr);
 /* 12 */
-EXTERN void		TclDeleteVars(Interp *iPtr,
+TCLAPI void		TclDeleteVars(Interp *iPtr,
 				TclVarHashTable *tablePtr);
 /* Slot 13 is reserved */
 /* 14 */
-EXTERN int		TclDumpMemoryInfo(ClientData clientData, int flags);
+TCLAPI int		TclDumpMemoryInfo(ClientData clientData, int flags);
 /* Slot 15 is reserved */
 /* 16 */
-EXTERN void		TclExprFloatError(Tcl_Interp *interp, double value);
+TCLAPI void		TclExprFloatError(Tcl_Interp *interp, double value);
 /* Slot 17 is reserved */
 /* Slot 18 is reserved */
 /* Slot 19 is reserved */
 /* Slot 20 is reserved */
 /* Slot 21 is reserved */
 /* 22 */
-EXTERN int		TclFindElement(Tcl_Interp *interp,
+TCLAPI int		TclFindElement(Tcl_Interp *interp,
 				const char *listStr, int listLength,
 				const char **elementPtr,
 				const char **nextPtr, int *sizePtr,
 				int *bracePtr);
 /* 23 */
-EXTERN Proc *		TclFindProc(Interp *iPtr, const char *procName);
+TCLAPI Proc *		TclFindProc(Interp *iPtr, const char *procName);
 /* 24 */
-EXTERN int		TclFormatInt(char *buffer, long n);
+TCLAPI int		TclFormatInt(char *buffer, long n);
 /* 25 */
-EXTERN void		TclFreePackageInfo(Interp *iPtr);
+TCLAPI void		TclFreePackageInfo(Interp *iPtr);
 /* Slot 26 is reserved */
 /* Slot 27 is reserved */
 /* 28 */
-EXTERN Tcl_Channel	TclpGetDefaultStdChannel(int type);
+TCLAPI Tcl_Channel	TclpGetDefaultStdChannel(int type);
 /* Slot 29 is reserved */
 /* Slot 30 is reserved */
 /* 31 */
-EXTERN const char *	TclGetExtension(const char *name);
+TCLAPI const char *	TclGetExtension(const char *name);
 /* 32 */
-EXTERN int		TclGetFrame(Tcl_Interp *interp, const char *str,
+TCLAPI int		TclGetFrame(Tcl_Interp *interp, const char *str,
 				CallFrame **framePtrPtr);
 /* Slot 33 is reserved */
 /* 34 */
-EXTERN int		TclGetIntForIndex(Tcl_Interp *interp,
+TCLAPI int		TclGetIntForIndex(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int endValue, int *indexPtr);
 /* Slot 35 is reserved */
 /* Slot 36 is reserved */
 /* 37 */
-EXTERN int		TclGetLoadedPackages(Tcl_Interp *interp,
+TCLAPI int		TclGetLoadedPackages(Tcl_Interp *interp,
 				const char *targetName);
 /* 38 */
-EXTERN int		TclGetNamespaceForQualName(Tcl_Interp *interp,
+TCLAPI int		TclGetNamespaceForQualName(Tcl_Interp *interp,
 				const char *qualName, Namespace *cxtNsPtr,
 				int flags, Namespace **nsPtrPtr,
 				Namespace **altNsPtrPtr,
 				Namespace **actualCxtPtrPtr,
 				const char **simpleNamePtr);
 /* 39 */
-EXTERN TclObjCmdProcType TclGetObjInterpProc(void);
+TCLAPI TclObjCmdProcType TclGetObjInterpProc(void);
 /* 40 */
-EXTERN int		TclGetOpenMode(Tcl_Interp *interp, const char *str,
+TCLAPI int		TclGetOpenMode(Tcl_Interp *interp, const char *str,
 				int *seekFlagPtr);
 /* 41 */
-EXTERN Tcl_Command	TclGetOriginalCommand(Tcl_Command command);
+TCLAPI Tcl_Command	TclGetOriginalCommand(Tcl_Command command);
 /* 42 */
-EXTERN const char *	TclpGetUserHome(const char *name,
+TCLAPI const char *	TclpGetUserHome(const char *name,
 				Tcl_DString *bufferPtr);
 /* Slot 43 is reserved */
 /* 44 */
-EXTERN int		TclGuessPackageName(const char *fileName,
+TCLAPI int		TclGuessPackageName(const char *fileName,
 				Tcl_DString *bufPtr);
 /* 45 */
-EXTERN int		TclHideUnsafeCommands(Tcl_Interp *interp);
+TCLAPI int		TclHideUnsafeCommands(Tcl_Interp *interp);
 /* 46 */
-EXTERN int		TclInExit(void);
+TCLAPI int		TclInExit(void);
 /* Slot 47 is reserved */
 /* Slot 48 is reserved */
 /* Slot 49 is reserved */
 /* 50 */
-EXTERN void		TclInitCompiledLocals(Tcl_Interp *interp,
+TCLAPI void		TclInitCompiledLocals(Tcl_Interp *interp,
 				CallFrame *framePtr, Namespace *nsPtr);
 /* 51 */
-EXTERN int		TclInterpInit(Tcl_Interp *interp);
+TCLAPI int		TclInterpInit(Tcl_Interp *interp);
 /* Slot 52 is reserved */
 /* 53 */
-EXTERN int		TclInvokeObjectCommand(ClientData clientData,
+TCLAPI int		TclInvokeObjectCommand(ClientData clientData,
 				Tcl_Interp *interp, int argc,
 				const char **argv);
 /* 54 */
-EXTERN int		TclInvokeStringCommand(ClientData clientData,
+TCLAPI int		TclInvokeStringCommand(ClientData clientData,
 				Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[]);
 /* 55 */
-EXTERN Proc *		TclIsProc(Command *cmdPtr);
+TCLAPI Proc *		TclIsProc(Command *cmdPtr);
 /* Slot 56 is reserved */
 /* Slot 57 is reserved */
 /* 58 */
-EXTERN Var *		TclLookupVar(Tcl_Interp *interp, const char *part1,
+TCLAPI Var *		TclLookupVar(Tcl_Interp *interp, const char *part1,
 				const char *part2, int flags,
 				const char *msg, int createPart1,
 				int createPart2, Var **arrayPtrPtr);
 /* Slot 59 is reserved */
 /* 60 */
-EXTERN int		TclNeedSpace(const char *start, const char *end);
+TCLAPI int		TclNeedSpace(const char *start, const char *end);
 /* 61 */
-EXTERN Tcl_Obj *	TclNewProcBodyObj(Proc *procPtr);
+TCLAPI Tcl_Obj *	TclNewProcBodyObj(Proc *procPtr);
 /* 62 */
-EXTERN int		TclObjCommandComplete(Tcl_Obj *cmdPtr);
+TCLAPI int		TclObjCommandComplete(Tcl_Obj *cmdPtr);
 /* 63 */
-EXTERN int		TclObjInterpProc(ClientData clientData,
+TCLAPI int		TclObjInterpProc(ClientData clientData,
 				Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[]);
 /* 64 */
-EXTERN int		TclObjInvoke(Tcl_Interp *interp, int objc,
+TCLAPI int		TclObjInvoke(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], int flags);
 /* Slot 65 is reserved */
 /* Slot 66 is reserved */
 /* Slot 67 is reserved */
 /* Slot 68 is reserved */
 /* 69 */
-EXTERN char *		TclpAlloc(unsigned int size);
+TCLAPI char *		TclpAlloc(unsigned int size);
 /* Slot 70 is reserved */
 /* Slot 71 is reserved */
 /* Slot 72 is reserved */
 /* Slot 73 is reserved */
 /* 74 */
-EXTERN void		TclpFree(char *ptr);
+TCLAPI void		TclpFree(char *ptr);
 /* 75 */
-EXTERN unsigned long	TclpGetClicks(void);
+TCLAPI unsigned long	TclpGetClicks(void);
 /* 76 */
-EXTERN unsigned long	TclpGetSeconds(void);
+TCLAPI unsigned long	TclpGetSeconds(void);
 /* Slot 77 is reserved */
 /* Slot 78 is reserved */
 /* Slot 79 is reserved */
 /* Slot 80 is reserved */
 /* 81 */
-EXTERN char *		TclpRealloc(char *ptr, unsigned int size);
+TCLAPI char *		TclpRealloc(char *ptr, unsigned int size);
 /* Slot 82 is reserved */
 /* Slot 83 is reserved */
 /* Slot 84 is reserved */
@@ -222,221 +211,221 @@ EXTERN char *		TclpRealloc(char *ptr, unsigned int size);
 /* Slot 86 is reserved */
 /* Slot 87 is reserved */
 /* 88 */
-EXTERN char *		TclPrecTraceProc(ClientData clientData,
+TCLAPI char *		TclPrecTraceProc(ClientData clientData,
 				Tcl_Interp *interp, const char *name1,
 				const char *name2, int flags);
 /* 89 */
-EXTERN int		TclPreventAliasLoop(Tcl_Interp *interp,
+TCLAPI int		TclPreventAliasLoop(Tcl_Interp *interp,
 				Tcl_Interp *cmdInterp, Tcl_Command cmd);
 /* Slot 90 is reserved */
 /* 91 */
-EXTERN void		TclProcCleanupProc(Proc *procPtr);
+TCLAPI void		TclProcCleanupProc(Proc *procPtr);
 /* 92 */
-EXTERN int		TclProcCompileProc(Tcl_Interp *interp, Proc *procPtr,
+TCLAPI int		TclProcCompileProc(Tcl_Interp *interp, Proc *procPtr,
 				Tcl_Obj *bodyPtr, Namespace *nsPtr,
 				const char *description,
 				const char *procName);
 /* 93 */
-EXTERN void		TclProcDeleteProc(ClientData clientData);
+TCLAPI void		TclProcDeleteProc(ClientData clientData);
 /* Slot 94 is reserved */
 /* Slot 95 is reserved */
 /* 96 */
-EXTERN int		TclRenameCommand(Tcl_Interp *interp,
+TCLAPI int		TclRenameCommand(Tcl_Interp *interp,
 				const char *oldName, const char *newName);
 /* 97 */
-EXTERN void		TclResetShadowedCmdRefs(Tcl_Interp *interp,
+TCLAPI void		TclResetShadowedCmdRefs(Tcl_Interp *interp,
 				Command *newCmdPtr);
 /* 98 */
-EXTERN int		TclServiceIdle(void);
+TCLAPI int		TclServiceIdle(void);
 /* Slot 99 is reserved */
 /* Slot 100 is reserved */
 /* 101 */
-EXTERN const char *	TclSetPreInitScript(const char *string);
+TCLAPI const char *	TclSetPreInitScript(const char *string);
 /* 102 */
-EXTERN void		TclSetupEnv(Tcl_Interp *interp);
+TCLAPI void		TclSetupEnv(Tcl_Interp *interp);
 /* 103 */
-EXTERN int		TclSockGetPort(Tcl_Interp *interp, const char *str,
+TCLAPI int		TclSockGetPort(Tcl_Interp *interp, const char *str,
 				const char *proto, int *portPtr);
 /* Slot 104 is reserved */
 /* Slot 105 is reserved */
 /* Slot 106 is reserved */
 /* Slot 107 is reserved */
 /* 108 */
-EXTERN void		TclTeardownNamespace(Namespace *nsPtr);
+TCLAPI void		TclTeardownNamespace(Namespace *nsPtr);
 /* 109 */
-EXTERN int		TclUpdateReturnInfo(Interp *iPtr);
+TCLAPI int		TclUpdateReturnInfo(Interp *iPtr);
 /* 110 */
-EXTERN int		TclSockMinimumBuffers(void *sock, int size);
+TCLAPI int		TclSockMinimumBuffers(void *sock, int size);
 /* 111 */
-EXTERN void		Tcl_AddInterpResolvers(Tcl_Interp *interp,
+TCLAPI void		Tcl_AddInterpResolvers(Tcl_Interp *interp,
 				const char *name,
 				Tcl_ResolveCmdProc *cmdProc,
 				Tcl_ResolveVarProc *varProc,
 				Tcl_ResolveCompiledVarProc *compiledVarProc);
 /* 112 */
-EXTERN int		Tcl_AppendExportList(Tcl_Interp *interp,
+TCLAPI int		Tcl_AppendExportList(Tcl_Interp *interp,
 				Tcl_Namespace *nsPtr, Tcl_Obj *objPtr);
 /* 113 */
-EXTERN Tcl_Namespace *	Tcl_CreateNamespace(Tcl_Interp *interp,
+TCLAPI Tcl_Namespace *	Tcl_CreateNamespace(Tcl_Interp *interp,
 				const char *name, ClientData clientData,
 				Tcl_NamespaceDeleteProc *deleteProc);
 /* 114 */
-EXTERN void		Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
+TCLAPI void		Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
 /* 115 */
-EXTERN int		Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+TCLAPI int		Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
 				const char *pattern, int resetListFirst);
 /* 116 */
-EXTERN Tcl_Command	Tcl_FindCommand(Tcl_Interp *interp, const char *name,
+TCLAPI Tcl_Command	Tcl_FindCommand(Tcl_Interp *interp, const char *name,
 				Tcl_Namespace *contextNsPtr, int flags);
 /* 117 */
-EXTERN Tcl_Namespace *	Tcl_FindNamespace(Tcl_Interp *interp,
+TCLAPI Tcl_Namespace *	Tcl_FindNamespace(Tcl_Interp *interp,
 				const char *name,
 				Tcl_Namespace *contextNsPtr, int flags);
 /* 118 */
-EXTERN int		Tcl_GetInterpResolvers(Tcl_Interp *interp,
+TCLAPI int		Tcl_GetInterpResolvers(Tcl_Interp *interp,
 				const char *name, Tcl_ResolverInfo *resInfo);
 /* 119 */
-EXTERN int		Tcl_GetNamespaceResolvers(
+TCLAPI int		Tcl_GetNamespaceResolvers(
 				Tcl_Namespace *namespacePtr,
 				Tcl_ResolverInfo *resInfo);
 /* 120 */
-EXTERN Tcl_Var		Tcl_FindNamespaceVar(Tcl_Interp *interp,
+TCLAPI Tcl_Var		Tcl_FindNamespaceVar(Tcl_Interp *interp,
 				const char *name,
 				Tcl_Namespace *contextNsPtr, int flags);
 /* 121 */
-EXTERN int		Tcl_ForgetImport(Tcl_Interp *interp,
+TCLAPI int		Tcl_ForgetImport(Tcl_Interp *interp,
 				Tcl_Namespace *nsPtr, const char *pattern);
 /* 122 */
-EXTERN Tcl_Command	Tcl_GetCommandFromObj(Tcl_Interp *interp,
+TCLAPI Tcl_Command	Tcl_GetCommandFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr);
 /* 123 */
-EXTERN void		Tcl_GetCommandFullName(Tcl_Interp *interp,
+TCLAPI void		Tcl_GetCommandFullName(Tcl_Interp *interp,
 				Tcl_Command command, Tcl_Obj *objPtr);
 /* 124 */
-EXTERN Tcl_Namespace *	Tcl_GetCurrentNamespace(Tcl_Interp *interp);
+TCLAPI Tcl_Namespace *	Tcl_GetCurrentNamespace(Tcl_Interp *interp);
 /* 125 */
-EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace(Tcl_Interp *interp);
+TCLAPI Tcl_Namespace *	Tcl_GetGlobalNamespace(Tcl_Interp *interp);
 /* 126 */
-EXTERN void		Tcl_GetVariableFullName(Tcl_Interp *interp,
+TCLAPI void		Tcl_GetVariableFullName(Tcl_Interp *interp,
 				Tcl_Var variable, Tcl_Obj *objPtr);
 /* 127 */
-EXTERN int		Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+TCLAPI int		Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
 				const char *pattern, int allowOverwrite);
 /* 128 */
-EXTERN void		Tcl_PopCallFrame(Tcl_Interp *interp);
+TCLAPI void		Tcl_PopCallFrame(Tcl_Interp *interp);
 /* 129 */
-EXTERN int		Tcl_PushCallFrame(Tcl_Interp *interp,
+TCLAPI int		Tcl_PushCallFrame(Tcl_Interp *interp,
 				Tcl_CallFrame *framePtr,
 				Tcl_Namespace *nsPtr, int isProcCallFrame);
 /* 130 */
-EXTERN int		Tcl_RemoveInterpResolvers(Tcl_Interp *interp,
+TCLAPI int		Tcl_RemoveInterpResolvers(Tcl_Interp *interp,
 				const char *name);
 /* 131 */
-EXTERN void		Tcl_SetNamespaceResolvers(
+TCLAPI void		Tcl_SetNamespaceResolvers(
 				Tcl_Namespace *namespacePtr,
 				Tcl_ResolveCmdProc *cmdProc,
 				Tcl_ResolveVarProc *varProc,
 				Tcl_ResolveCompiledVarProc *compiledVarProc);
 /* 132 */
-EXTERN int		TclpHasSockets(Tcl_Interp *interp);
+TCLAPI int		TclpHasSockets(Tcl_Interp *interp);
 /* Slot 133 is reserved */
 /* Slot 134 is reserved */
 /* Slot 135 is reserved */
 /* Slot 136 is reserved */
 /* Slot 137 is reserved */
 /* 138 */
-EXTERN const char *	TclGetEnv(const char *name, Tcl_DString *valuePtr);
+TCLAPI const char *	TclGetEnv(const char *name, Tcl_DString *valuePtr);
 /* Slot 139 is reserved */
 /* Slot 140 is reserved */
 /* 141 */
-EXTERN const char *	TclpGetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr);
+TCLAPI const char *	TclpGetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr);
 /* 142 */
-EXTERN int		TclSetByteCodeFromAny(Tcl_Interp *interp,
+TCLAPI int		TclSetByteCodeFromAny(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, CompileHookProc *hookProc,
 				ClientData clientData);
 /* 143 */
-EXTERN int		TclAddLiteralObj(struct CompileEnv *envPtr,
+TCLAPI int		TclAddLiteralObj(struct CompileEnv *envPtr,
 				Tcl_Obj *objPtr, LiteralEntry **litPtrPtr);
 /* 144 */
-EXTERN void		TclHideLiteral(Tcl_Interp *interp,
+TCLAPI void		TclHideLiteral(Tcl_Interp *interp,
 				struct CompileEnv *envPtr, int index);
 /* 145 */
-EXTERN const struct AuxDataType * TclGetAuxDataType(const char *typeName);
+TCLAPI const struct AuxDataType * TclGetAuxDataType(const char *typeName);
 /* 146 */
-EXTERN TclHandle	TclHandleCreate(void *ptr);
+TCLAPI TclHandle	TclHandleCreate(void *ptr);
 /* 147 */
-EXTERN void		TclHandleFree(TclHandle handle);
+TCLAPI void		TclHandleFree(TclHandle handle);
 /* 148 */
-EXTERN TclHandle	TclHandlePreserve(TclHandle handle);
+TCLAPI TclHandle	TclHandlePreserve(TclHandle handle);
 /* 149 */
-EXTERN void		TclHandleRelease(TclHandle handle);
+TCLAPI void		TclHandleRelease(TclHandle handle);
 /* 150 */
-EXTERN int		TclRegAbout(Tcl_Interp *interp, Tcl_RegExp re);
+TCLAPI int		TclRegAbout(Tcl_Interp *interp, Tcl_RegExp re);
 /* 151 */
-EXTERN void		TclRegExpRangeUniChar(Tcl_RegExp re, int index,
+TCLAPI void		TclRegExpRangeUniChar(Tcl_RegExp re, int index,
 				int *startPtr, int *endPtr);
 /* 152 */
-EXTERN void		TclSetLibraryPath(Tcl_Obj *pathPtr);
+TCLAPI void		TclSetLibraryPath(Tcl_Obj *pathPtr);
 /* 153 */
-EXTERN Tcl_Obj *	TclGetLibraryPath(void);
+TCLAPI Tcl_Obj *	TclGetLibraryPath(void);
 /* Slot 154 is reserved */
 /* Slot 155 is reserved */
 /* 156 */
-EXTERN void		TclRegError(Tcl_Interp *interp, const char *msg,
+TCLAPI void		TclRegError(Tcl_Interp *interp, const char *msg,
 				int status);
 /* 157 */
-EXTERN Var *		TclVarTraceExists(Tcl_Interp *interp,
+TCLAPI Var *		TclVarTraceExists(Tcl_Interp *interp,
 				const char *varName);
 /* Slot 158 is reserved */
 /* Slot 159 is reserved */
 /* Slot 160 is reserved */
 /* 161 */
-EXTERN int		TclChannelTransform(Tcl_Interp *interp,
+TCLAPI int		TclChannelTransform(Tcl_Interp *interp,
 				Tcl_Channel chan, Tcl_Obj *cmdObjPtr);
 /* 162 */
-EXTERN void		TclChannelEventScriptInvoker(ClientData clientData,
+TCLAPI void		TclChannelEventScriptInvoker(ClientData clientData,
 				int flags);
 /* 163 */
-EXTERN const void *	TclGetInstructionTable(void);
+TCLAPI const void *	TclGetInstructionTable(void);
 /* 164 */
-EXTERN void		TclExpandCodeArray(void *envPtr);
+TCLAPI void		TclExpandCodeArray(void *envPtr);
 /* 165 */
-EXTERN void		TclpSetInitialEncodings(void);
+TCLAPI void		TclpSetInitialEncodings(void);
 /* 166 */
-EXTERN int		TclListObjSetElement(Tcl_Interp *interp,
+TCLAPI int		TclListObjSetElement(Tcl_Interp *interp,
 				Tcl_Obj *listPtr, int index,
 				Tcl_Obj *valuePtr);
 /* Slot 167 is reserved */
 /* Slot 168 is reserved */
 /* 169 */
-EXTERN int		TclpUtfNcmp2(const char *s1, const char *s2,
+TCLAPI int		TclpUtfNcmp2(const char *s1, const char *s2,
 				unsigned long n);
 /* 170 */
-EXTERN int		TclCheckInterpTraces(Tcl_Interp *interp,
+TCLAPI int		TclCheckInterpTraces(Tcl_Interp *interp,
 				const char *command, int numChars,
 				Command *cmdPtr, int result, int traceFlags,
 				int objc, Tcl_Obj *const objv[]);
 /* 171 */
-EXTERN int		TclCheckExecutionTraces(Tcl_Interp *interp,
+TCLAPI int		TclCheckExecutionTraces(Tcl_Interp *interp,
 				const char *command, int numChars,
 				Command *cmdPtr, int result, int traceFlags,
 				int objc, Tcl_Obj *const objv[]);
 /* 172 */
-EXTERN int		TclInThreadExit(void);
+TCLAPI int		TclInThreadExit(void);
 /* 173 */
-EXTERN int		TclUniCharMatch(const Tcl_UniChar *string,
+TCLAPI int		TclUniCharMatch(const Tcl_UniChar *string,
 				int strLen, const Tcl_UniChar *pattern,
 				int ptnLen, int flags);
 /* Slot 174 is reserved */
 /* 175 */
-EXTERN int		TclCallVarTraces(Interp *iPtr, Var *arrayPtr,
+TCLAPI int		TclCallVarTraces(Interp *iPtr, Var *arrayPtr,
 				Var *varPtr, const char *part1,
 				const char *part2, int flags,
 				int leaveErrMsg);
 /* 176 */
-EXTERN void		TclCleanupVar(Var *varPtr, Var *arrayPtr);
+TCLAPI void		TclCleanupVar(Var *varPtr, Var *arrayPtr);
 /* 177 */
-EXTERN void		TclVarErrMsg(Tcl_Interp *interp, const char *part1,
+TCLAPI void		TclVarErrMsg(Tcl_Interp *interp, const char *part1,
 				const char *part2, const char *operation,
 				const char *reason);
 /* Slot 178 is reserved */
@@ -460,136 +449,136 @@ EXTERN void		TclVarErrMsg(Tcl_Interp *interp, const char *part1,
 /* Slot 196 is reserved */
 /* Slot 197 is reserved */
 /* 198 */
-EXTERN int		TclObjGetFrame(Tcl_Interp *interp, Tcl_Obj *objPtr,
+TCLAPI int		TclObjGetFrame(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				CallFrame **framePtrPtr);
 /* Slot 199 is reserved */
 /* 200 */
-EXTERN int		TclpObjRemoveDirectory(Tcl_Obj *pathPtr,
+TCLAPI int		TclpObjRemoveDirectory(Tcl_Obj *pathPtr,
 				int recursive, Tcl_Obj **errorPtr);
 /* 201 */
-EXTERN int		TclpObjCopyDirectory(Tcl_Obj *srcPathPtr,
+TCLAPI int		TclpObjCopyDirectory(Tcl_Obj *srcPathPtr,
 				Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr);
 /* 202 */
-EXTERN int		TclpObjCreateDirectory(Tcl_Obj *pathPtr);
+TCLAPI int		TclpObjCreateDirectory(Tcl_Obj *pathPtr);
 /* 203 */
-EXTERN int		TclpObjDeleteFile(Tcl_Obj *pathPtr);
+TCLAPI int		TclpObjDeleteFile(Tcl_Obj *pathPtr);
 /* 204 */
-EXTERN int		TclpObjCopyFile(Tcl_Obj *srcPathPtr,
+TCLAPI int		TclpObjCopyFile(Tcl_Obj *srcPathPtr,
 				Tcl_Obj *destPathPtr);
 /* 205 */
-EXTERN int		TclpObjRenameFile(Tcl_Obj *srcPathPtr,
+TCLAPI int		TclpObjRenameFile(Tcl_Obj *srcPathPtr,
 				Tcl_Obj *destPathPtr);
 /* 206 */
-EXTERN int		TclpObjStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+TCLAPI int		TclpObjStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
 /* 207 */
-EXTERN int		TclpObjAccess(Tcl_Obj *pathPtr, int mode);
+TCLAPI int		TclpObjAccess(Tcl_Obj *pathPtr, int mode);
 /* 208 */
-EXTERN Tcl_Channel	TclpOpenFileChannel(Tcl_Interp *interp,
+TCLAPI Tcl_Channel	TclpOpenFileChannel(Tcl_Interp *interp,
 				Tcl_Obj *pathPtr, int mode, int permissions);
 /* Slot 209 is reserved */
 /* Slot 210 is reserved */
 /* Slot 211 is reserved */
 /* 212 */
-EXTERN void		TclpFindExecutable(const char *argv0);
+TCLAPI void		TclpFindExecutable(const char *argv0);
 /* 213 */
-EXTERN Tcl_Obj *	TclGetObjNameOfExecutable(void);
+TCLAPI Tcl_Obj *	TclGetObjNameOfExecutable(void);
 /* 214 */
-EXTERN void		TclSetObjNameOfExecutable(Tcl_Obj *name,
+TCLAPI void		TclSetObjNameOfExecutable(Tcl_Obj *name,
 				Tcl_Encoding encoding);
 /* 215 */
-EXTERN void *		TclStackAlloc(Tcl_Interp *interp, int numBytes);
+TCLAPI void *		TclStackAlloc(Tcl_Interp *interp, int numBytes);
 /* 216 */
-EXTERN void		TclStackFree(Tcl_Interp *interp, void *freePtr);
+TCLAPI void		TclStackFree(Tcl_Interp *interp, void *freePtr);
 /* 217 */
-EXTERN int		TclPushStackFrame(Tcl_Interp *interp,
+TCLAPI int		TclPushStackFrame(Tcl_Interp *interp,
 				Tcl_CallFrame **framePtrPtr,
 				Tcl_Namespace *namespacePtr,
 				int isProcCallFrame);
 /* 218 */
-EXTERN void		TclPopStackFrame(Tcl_Interp *interp);
+TCLAPI void		TclPopStackFrame(Tcl_Interp *interp);
 /* Slot 219 is reserved */
 /* Slot 220 is reserved */
 /* Slot 221 is reserved */
 /* Slot 222 is reserved */
 /* Slot 223 is reserved */
 /* 224 */
-EXTERN TclPlatformType * TclGetPlatform(void);
+TCLAPI TclPlatformType * TclGetPlatform(void);
 /* 225 */
-EXTERN Tcl_Obj *	TclTraceDictPath(Tcl_Interp *interp,
+TCLAPI Tcl_Obj *	TclTraceDictPath(Tcl_Interp *interp,
 				Tcl_Obj *rootPtr, int keyc,
 				Tcl_Obj *const keyv[], int flags);
 /* 226 */
-EXTERN int		TclObjBeingDeleted(Tcl_Obj *objPtr);
+TCLAPI int		TclObjBeingDeleted(Tcl_Obj *objPtr);
 /* 227 */
-EXTERN void		TclSetNsPath(Namespace *nsPtr, int pathLength,
+TCLAPI void		TclSetNsPath(Namespace *nsPtr, int pathLength,
 				Tcl_Namespace *pathAry[]);
 /* Slot 228 is reserved */
 /* 229 */
-EXTERN int		TclPtrMakeUpvar(Tcl_Interp *interp, Var *otherP1Ptr,
+TCLAPI int		TclPtrMakeUpvar(Tcl_Interp *interp, Var *otherP1Ptr,
 				const char *myName, int myFlags, int index);
 /* 230 */
-EXTERN Var *		TclObjLookupVar(Tcl_Interp *interp,
+TCLAPI Var *		TclObjLookupVar(Tcl_Interp *interp,
 				Tcl_Obj *part1Ptr, const char *part2,
 				int flags, const char *msg,
 				const int createPart1, const int createPart2,
 				Var **arrayPtrPtr);
 /* 231 */
-EXTERN int		TclGetNamespaceFromObj(Tcl_Interp *interp,
+TCLAPI int		TclGetNamespaceFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tcl_Namespace **nsPtrPtr);
 /* 232 */
-EXTERN int		TclEvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
+TCLAPI int		TclEvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				int flags, const CmdFrame *invoker, int word);
 /* 233 */
-EXTERN void		TclGetSrcInfoForPc(CmdFrame *contextPtr);
+TCLAPI void		TclGetSrcInfoForPc(CmdFrame *contextPtr);
 /* 234 */
-EXTERN Var *		TclVarHashCreateVar(TclVarHashTable *tablePtr,
+TCLAPI Var *		TclVarHashCreateVar(TclVarHashTable *tablePtr,
 				const char *key, int *newPtr);
 /* 235 */
-EXTERN void		TclInitVarHashTable(TclVarHashTable *tablePtr,
+TCLAPI void		TclInitVarHashTable(TclVarHashTable *tablePtr,
 				Namespace *nsPtr);
 /* Slot 236 is reserved */
 /* 237 */
-EXTERN int		TclResetCancellation(Tcl_Interp *interp, int force);
+TCLAPI int		TclResetCancellation(Tcl_Interp *interp, int force);
 /* 238 */
-EXTERN int		TclNRInterpProc(ClientData clientData,
+TCLAPI int		TclNRInterpProc(ClientData clientData,
 				Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[]);
 /* 239 */
-EXTERN int		TclNRInterpProcCore(Tcl_Interp *interp,
+TCLAPI int		TclNRInterpProcCore(Tcl_Interp *interp,
 				Tcl_Obj *procNameObj, int skip,
 				ProcErrorProc *errorProc);
 /* 240 */
-EXTERN int		TclNRRunCallbacks(Tcl_Interp *interp, int result,
+TCLAPI int		TclNRRunCallbacks(Tcl_Interp *interp, int result,
 				struct NRE_callback *rootPtr);
 /* 241 */
-EXTERN int		TclNREvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
+TCLAPI int		TclNREvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				int flags, const CmdFrame *invoker, int word);
 /* 242 */
-EXTERN int		TclNREvalObjv(Tcl_Interp *interp, int objc,
+TCLAPI int		TclNREvalObjv(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], int flags,
 				Command *cmdPtr);
 /* 243 */
-EXTERN void		TclDbDumpActiveObjects(FILE *outFile);
+TCLAPI void		TclDbDumpActiveObjects(FILE *outFile);
 /* 244 */
-EXTERN Tcl_HashTable *	TclGetNamespaceChildTable(Tcl_Namespace *nsPtr);
+TCLAPI Tcl_HashTable *	TclGetNamespaceChildTable(Tcl_Namespace *nsPtr);
 /* 245 */
-EXTERN Tcl_HashTable *	TclGetNamespaceCommandTable(Tcl_Namespace *nsPtr);
+TCLAPI Tcl_HashTable *	TclGetNamespaceCommandTable(Tcl_Namespace *nsPtr);
 /* 246 */
-EXTERN int		TclInitRewriteEnsemble(Tcl_Interp *interp,
+TCLAPI int		TclInitRewriteEnsemble(Tcl_Interp *interp,
 				int numRemoved, int numInserted,
 				Tcl_Obj *const *objv);
 /* 247 */
-EXTERN void		TclResetRewriteEnsemble(Tcl_Interp *interp,
+TCLAPI void		TclResetRewriteEnsemble(Tcl_Interp *interp,
 				int isRootEnsemble);
 /* 248 */
-EXTERN int		TclCopyChannel(Tcl_Interp *interp,
+TCLAPI int		TclCopyChannel(Tcl_Interp *interp,
 				Tcl_Channel inChan, Tcl_Channel outChan,
 				Tcl_WideInt toRead, Tcl_Obj *cmdPtr);
 /* 249 */
-EXTERN char *		TclDoubleDigits(double dv, int ndigits, int flags,
+TCLAPI char *		TclDoubleDigits(double dv, int ndigits, int flags,
 				int *decpt, int *signum, char **endPtr);
 /* 250 */
-EXTERN void		TclSetSlaveCancelFlags(Tcl_Interp *interp, int flags,
+TCLAPI void		TclSetSlaveCancelFlags(Tcl_Interp *interp, int flags,
 				int force);
 
 typedef struct TclIntStubs {
@@ -1270,7 +1259,4 @@ extern const TclIntStubs *tclIntStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TCLINTDECLS */
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index c1531f3..80d6236 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -18,17 +18,6 @@
 #   define DIR void
 #endif
 
-#undef TCL_STORAGE_CLASS
-#ifdef BUILD_tcl
-#   define TCL_STORAGE_CLASS DLLEXPORT
-#else
-#   ifdef USE_TCL_STUBS
-#      define TCL_STORAGE_CLASS
-#   else
-#      define TCL_STORAGE_CLASS DLLIMPORT
-#   endif
-#endif
-
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
  * script.  Any modifications to the function declarations below should be made
@@ -43,38 +32,38 @@
 
 #if !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(MAC_OSX_TCL) /* UNIX */
 /* 0 */
-EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
+TCLAPI void		TclGetAndDetachPids(Tcl_Interp *interp,
 				Tcl_Channel chan);
 /* 1 */
-EXTERN int		TclpCloseFile(TclFile file);
+TCLAPI int		TclpCloseFile(TclFile file);
 /* 2 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
+TCLAPI Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
 				TclFile writeFile, TclFile errorFile,
 				int numPids, Tcl_Pid *pidPtr);
 /* 3 */
-EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
+TCLAPI int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
 /* 4 */
-EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+TCLAPI int		TclpCreateProcess(Tcl_Interp *interp, int argc,
 				const char **argv, TclFile inputFile,
 				TclFile outputFile, TclFile errorFile,
 				Tcl_Pid *pidPtr);
 /* Slot 5 is reserved */
 /* 6 */
-EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
+TCLAPI TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
 /* 7 */
-EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
+TCLAPI TclFile		TclpOpenFile(const char *fname, int mode);
 /* 8 */
-EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
+TCLAPI int		TclUnixWaitForFile(int fd, int mask, int timeout);
 /* 9 */
-EXTERN TclFile		TclpCreateTempFile(const char *contents);
+TCLAPI TclFile		TclpCreateTempFile(const char *contents);
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir(DIR *dir);
+TCLAPI Tcl_DirEntry *	TclpReaddir(DIR *dir);
 /* Slot 11 is reserved */
 /* Slot 12 is reserved */
 /* 13 */
-EXTERN char *		TclpInetNtoa(struct in_addr addr);
+TCLAPI char *		TclpInetNtoa(struct in_addr addr);
 /* 14 */
-EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
+TCLAPI int		TclUnixCopyFile(const char *src, const char *dst,
 				const Tcl_StatBuf *statBufPtr,
 				int dontCopyAtts);
 /* Slot 15 is reserved */
@@ -83,7 +72,7 @@ EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
 /* Slot 18 is reserved */
 /* Slot 19 is reserved */
 /* 20 */
-EXTERN int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
+TCLAPI int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
 				Tcl_Obj *basenameObj, Tcl_Obj *extensionObj,
 				Tcl_Obj *resultingNameObj);
 /* Slot 21 is reserved */
@@ -95,136 +84,136 @@ EXTERN int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
 /* Slot 27 is reserved */
 /* Slot 28 is reserved */
 /* 29 */
-EXTERN int		TclWinCPUID(unsigned int index, unsigned int *regs);
+TCLAPI int		TclWinCPUID(unsigned int index, unsigned int *regs);
 #endif /* UNIX */
 #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
 /* 0 */
-EXTERN void		TclWinConvertError(DWORD errCode);
+TCLAPI void		TclWinConvertError(DWORD errCode);
 /* Slot 1 is reserved */
 /* 2 */
-EXTERN struct servent *	 TclWinGetServByName(const char *nm,
+TCLAPI struct servent *	 TclWinGetServByName(const char *nm,
 				const char *proto);
 /* 3 */
-EXTERN int		TclWinGetSockOpt(SOCKET s, int level, int optname,
+TCLAPI int		TclWinGetSockOpt(SOCKET s, int level, int optname,
 				char *optval, int *optlen);
 /* 4 */
-EXTERN HINSTANCE	TclWinGetTclInstance(void);
+TCLAPI HINSTANCE	TclWinGetTclInstance(void);
 /* 5 */
-EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
+TCLAPI int		TclUnixWaitForFile(int fd, int mask, int timeout);
 /* 6 */
-EXTERN unsigned short	TclWinNToHS(unsigned short ns);
+TCLAPI unsigned short	TclWinNToHS(unsigned short ns);
 /* 7 */
-EXTERN int		TclWinSetSockOpt(SOCKET s, int level, int optname,
+TCLAPI int		TclWinSetSockOpt(SOCKET s, int level, int optname,
 				const char *optval, int optlen);
 /* 8 */
-EXTERN int		TclpGetPid(Tcl_Pid pid);
+TCLAPI int		TclpGetPid(Tcl_Pid pid);
 /* 9 */
-EXTERN int		TclWinGetPlatformId(void);
+TCLAPI int		TclWinGetPlatformId(void);
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir(DIR *dir);
+TCLAPI Tcl_DirEntry *	TclpReaddir(DIR *dir);
 /* 11 */
-EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
+TCLAPI void		TclGetAndDetachPids(Tcl_Interp *interp,
 				Tcl_Channel chan);
 /* 12 */
-EXTERN int		TclpCloseFile(TclFile file);
+TCLAPI int		TclpCloseFile(TclFile file);
 /* 13 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
+TCLAPI Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
 				TclFile writeFile, TclFile errorFile,
 				int numPids, Tcl_Pid *pidPtr);
 /* 14 */
-EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
+TCLAPI int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
 /* 15 */
-EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+TCLAPI int		TclpCreateProcess(Tcl_Interp *interp, int argc,
 				const char **argv, TclFile inputFile,
 				TclFile outputFile, TclFile errorFile,
 				Tcl_Pid *pidPtr);
 /* 16 */
-EXTERN int		TclpIsAtty(int fd);
+TCLAPI int		TclpIsAtty(int fd);
 /* 17 */
-EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
+TCLAPI int		TclUnixCopyFile(const char *src, const char *dst,
 				const Tcl_StatBuf *statBufPtr,
 				int dontCopyAtts);
 /* 18 */
-EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
+TCLAPI TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
 /* 19 */
-EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
+TCLAPI TclFile		TclpOpenFile(const char *fname, int mode);
 /* 20 */
-EXTERN void		TclWinAddProcess(HANDLE hProcess, DWORD id);
+TCLAPI void		TclWinAddProcess(HANDLE hProcess, DWORD id);
 /* 21 */
-EXTERN char *		TclpInetNtoa(struct in_addr addr);
+TCLAPI char *		TclpInetNtoa(struct in_addr addr);
 /* 22 */
-EXTERN TclFile		TclpCreateTempFile(const char *contents);
+TCLAPI TclFile		TclpCreateTempFile(const char *contents);
 /* Slot 23 is reserved */
 /* 24 */
-EXTERN char *		TclWinNoBackslash(char *path);
+TCLAPI char *		TclWinNoBackslash(char *path);
 /* Slot 25 is reserved */
 /* 26 */
-EXTERN void		TclWinSetInterfaces(int wide);
+TCLAPI void		TclWinSetInterfaces(int wide);
 /* 27 */
-EXTERN void		TclWinFlushDirtyChannels(void);
+TCLAPI void		TclWinFlushDirtyChannels(void);
 /* 28 */
-EXTERN void		TclWinResetInterfaces(void);
+TCLAPI void		TclWinResetInterfaces(void);
 /* 29 */
-EXTERN int		TclWinCPUID(unsigned int index, unsigned int *regs);
+TCLAPI int		TclWinCPUID(unsigned int index, unsigned int *regs);
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
 /* 0 */
-EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
+TCLAPI void		TclGetAndDetachPids(Tcl_Interp *interp,
 				Tcl_Channel chan);
 /* 1 */
-EXTERN int		TclpCloseFile(TclFile file);
+TCLAPI int		TclpCloseFile(TclFile file);
 /* 2 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
+TCLAPI Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
 				TclFile writeFile, TclFile errorFile,
 				int numPids, Tcl_Pid *pidPtr);
 /* 3 */
-EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
+TCLAPI int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
 /* 4 */
-EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+TCLAPI int		TclpCreateProcess(Tcl_Interp *interp, int argc,
 				const char **argv, TclFile inputFile,
 				TclFile outputFile, TclFile errorFile,
 				Tcl_Pid *pidPtr);
 /* Slot 5 is reserved */
 /* 6 */
-EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
+TCLAPI TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
 /* 7 */
-EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
+TCLAPI TclFile		TclpOpenFile(const char *fname, int mode);
 /* 8 */
-EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
+TCLAPI int		TclUnixWaitForFile(int fd, int mask, int timeout);
 /* 9 */
-EXTERN TclFile		TclpCreateTempFile(const char *contents);
+TCLAPI TclFile		TclpCreateTempFile(const char *contents);
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir(DIR *dir);
+TCLAPI Tcl_DirEntry *	TclpReaddir(DIR *dir);
 /* Slot 11 is reserved */
 /* Slot 12 is reserved */
 /* 13 */
-EXTERN char *		TclpInetNtoa(struct in_addr addr);
+TCLAPI char *		TclpInetNtoa(struct in_addr addr);
 /* 14 */
-EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
+TCLAPI int		TclUnixCopyFile(const char *src, const char *dst,
 				const Tcl_StatBuf *statBufPtr,
 				int dontCopyAtts);
 /* 15 */
-EXTERN int		TclMacOSXGetFileAttribute(Tcl_Interp *interp,
+TCLAPI int		TclMacOSXGetFileAttribute(Tcl_Interp *interp,
 				int objIndex, Tcl_Obj *fileName,
 				Tcl_Obj **attributePtrPtr);
 /* 16 */
-EXTERN int		TclMacOSXSetFileAttribute(Tcl_Interp *interp,
+TCLAPI int		TclMacOSXSetFileAttribute(Tcl_Interp *interp,
 				int objIndex, Tcl_Obj *fileName,
 				Tcl_Obj *attributePtr);
 /* 17 */
-EXTERN int		TclMacOSXCopyFileAttributes(const char *src,
+TCLAPI int		TclMacOSXCopyFileAttributes(const char *src,
 				const char *dst,
 				const Tcl_StatBuf *statBufPtr);
 /* 18 */
-EXTERN int		TclMacOSXMatchType(Tcl_Interp *interp,
+TCLAPI int		TclMacOSXMatchType(Tcl_Interp *interp,
 				const char *pathName, const char *fileName,
 				Tcl_StatBuf *statBufPtr,
 				Tcl_GlobTypeData *types);
 /* 19 */
-EXTERN void		TclMacOSXNotifierAddRunLoopMode(
+TCLAPI void		TclMacOSXNotifierAddRunLoopMode(
 				const void *runLoopMode);
 /* 20 */
-EXTERN int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
+TCLAPI int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
 				Tcl_Obj *basenameObj, Tcl_Obj *extensionObj,
 				Tcl_Obj *resultingNameObj);
 /* Slot 21 is reserved */
@@ -236,7 +225,7 @@ EXTERN int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
 /* Slot 27 is reserved */
 /* Slot 28 is reserved */
 /* 29 */
-EXTERN int		TclWinCPUID(unsigned int index, unsigned int *regs);
+TCLAPI int		TclWinCPUID(unsigned int index, unsigned int *regs);
 #endif /* MACOSX */
 
 typedef struct TclIntPlatStubs {
@@ -516,9 +505,6 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 #if defined(__WIN32__) || defined(__CYGWIN__)
 #   undef TclWinNToHS
 #   define TclWinNToHS ntohs
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index e9b92fe..4e6f29fa 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -10,17 +10,6 @@
 #ifndef _TCLPLATDECLS
 #define _TCLPLATDECLS
 
-#undef TCL_STORAGE_CLASS
-#ifdef BUILD_tcl
-#   define TCL_STORAGE_CLASS DLLEXPORT
-#else
-#   ifdef USE_TCL_STUBS
-#      define TCL_STORAGE_CLASS
-#   else
-#      define TCL_STORAGE_CLASS DLLIMPORT
-#   endif
-#endif
-
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
  * script.  Any modifications to the function declarations below should be made
@@ -48,19 +37,19 @@
 
 #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
 /* 0 */
-EXTERN TCHAR *		Tcl_WinUtfToTChar(const char *str, int len,
+TCLAPI TCHAR *		Tcl_WinUtfToTChar(const char *str, int len,
 				Tcl_DString *dsPtr);
 /* 1 */
-EXTERN char *		Tcl_WinTCharToUtf(const TCHAR *str, int len,
+TCLAPI char *		Tcl_WinTCharToUtf(const TCHAR *str, int len,
 				Tcl_DString *dsPtr);
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
 /* 0 */
-EXTERN int		Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
+TCLAPI int		Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
 				const char *bundleName, int hasResourceFile,
 				int maxPathLen, char *libraryPath);
 /* 1 */
-EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
+TCLAPI int		Tcl_MacOSXOpenVersionedBundleResources(
 				Tcl_Interp *interp, const char *bundleName,
 				const char *bundleVersion,
 				int hasResourceFile, int maxPathLen,
@@ -112,9 +101,6 @@ extern const TclPlatStubs *tclPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TCLPLATDECLS */
 
 
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 7a10bef..07be9e9 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -42,16 +42,8 @@
  * Declare external functions used in Windows tests.
  */
 
-/*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Tcltest_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-EXTERN int		Tcltest_Init(Tcl_Interp *interp);
-EXTERN int		Tcltest_SafeInit(Tcl_Interp *interp);
+DLLEXPORT int		Tcltest_Init(Tcl_Interp *interp);
+DLLEXPORT int		Tcltest_SafeInit(Tcl_Interp *interp);
 
 /*
  * Dynamic string shared by TestdcallCmd and DelCallbackProc; used to collect
diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls
index ea3abb1..2124378 100644
--- a/generic/tclTomMath.decls
+++ b/generic/tclTomMath.decls
@@ -19,7 +19,7 @@ library tcl
 
 interface tclTomMath
 # hooks {tclTomMathInt}
-scspec EXTERN
+scspec TCLAPI
 
 # Declare each of the functions in the Tcl tommath interface
 
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index ef22153..b6dec32 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.h
@@ -115,17 +115,6 @@
 #define s_mp_sqr TclBN_s_mp_sqr
 #define s_mp_sub TclBN_s_mp_sub
 
-#undef TCL_STORAGE_CLASS
-#ifdef BUILD_tcl
-#   define TCL_STORAGE_CLASS DLLEXPORT
-#else
-#   ifdef USE_TCL_STUBS
-#      define TCL_STORAGE_CLASS
-#   else
-#      define TCL_STORAGE_CLASS DLLIMPORT
-#   endif
-#endif
-
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
  * script.  Any modifications to the function declarations below should be made
@@ -139,142 +128,142 @@
  */
 
 /* 0 */
-EXTERN int		TclBN_epoch(void);
+TCLAPI int		TclBN_epoch(void);
 /* 1 */
-EXTERN int		TclBN_revision(void);
+TCLAPI int		TclBN_revision(void);
 /* 2 */
-EXTERN int		TclBN_mp_add(mp_int *a, mp_int *b, mp_int *c);
+TCLAPI int		TclBN_mp_add(mp_int *a, mp_int *b, mp_int *c);
 /* 3 */
-EXTERN int		TclBN_mp_add_d(mp_int *a, mp_digit b, mp_int *c);
+TCLAPI int		TclBN_mp_add_d(mp_int *a, mp_digit b, mp_int *c);
 /* 4 */
-EXTERN int		TclBN_mp_and(mp_int *a, mp_int *b, mp_int *c);
+TCLAPI int		TclBN_mp_and(mp_int *a, mp_int *b, mp_int *c);
 /* 5 */
-EXTERN void		TclBN_mp_clamp(mp_int *a);
+TCLAPI void		TclBN_mp_clamp(mp_int *a);
 /* 6 */
-EXTERN void		TclBN_mp_clear(mp_int *a);
+TCLAPI void		TclBN_mp_clear(mp_int *a);
 /* 7 */
-EXTERN void		TclBN_mp_clear_multi(mp_int *a, ...);
+TCLAPI void		TclBN_mp_clear_multi(mp_int *a, ...);
 /* 8 */
-EXTERN int		TclBN_mp_cmp(const mp_int *a, const mp_int *b);
+TCLAPI int		TclBN_mp_cmp(const mp_int *a, const mp_int *b);
 /* 9 */
-EXTERN int		TclBN_mp_cmp_d(const mp_int *a, mp_digit b);
+TCLAPI int		TclBN_mp_cmp_d(const mp_int *a, mp_digit b);
 /* 10 */
-EXTERN int		TclBN_mp_cmp_mag(const mp_int *a, const mp_int *b);
+TCLAPI int		TclBN_mp_cmp_mag(const mp_int *a, const mp_int *b);
 /* 11 */
-EXTERN int		TclBN_mp_copy(const mp_int *a, mp_int *b);
+TCLAPI int		TclBN_mp_copy(const mp_int *a, mp_int *b);
 /* 12 */
-EXTERN int		TclBN_mp_count_bits(const mp_int *a);
+TCLAPI int		TclBN_mp_count_bits(const mp_int *a);
 /* 13 */
-EXTERN int		TclBN_mp_div(mp_int *a, mp_int *b, mp_int *q,
+TCLAPI int		TclBN_mp_div(mp_int *a, mp_int *b, mp_int *q,
 				mp_int *r);
 /* 14 */
-EXTERN int		TclBN_mp_div_d(mp_int *a, mp_digit b, mp_int *q,
+TCLAPI int		TclBN_mp_div_d(mp_int *a, mp_digit b, mp_int *q,
 				mp_digit *r);
 /* 15 */
-EXTERN int		TclBN_mp_div_2(mp_int *a, mp_int *q);
+TCLAPI int		TclBN_mp_div_2(mp_int *a, mp_int *q);
 /* 16 */
-EXTERN int		TclBN_mp_div_2d(const mp_int *a, int b, mp_int *q,
+TCLAPI int		TclBN_mp_div_2d(const mp_int *a, int b, mp_int *q,
 				mp_int *r);
 /* 17 */
-EXTERN int		TclBN_mp_div_3(mp_int *a, mp_int *q, mp_digit *r);
+TCLAPI int		TclBN_mp_div_3(mp_int *a, mp_int *q, mp_digit *r);
 /* 18 */
-EXTERN void		TclBN_mp_exch(mp_int *a, mp_int *b);
+TCLAPI void		TclBN_mp_exch(mp_int *a, mp_int *b);
 /* 19 */
-EXTERN int		TclBN_mp_expt_d(mp_int *a, mp_digit b, mp_int *c);
+TCLAPI int		TclBN_mp_expt_d(mp_int *a, mp_digit b, mp_int *c);
 /* 20 */
-EXTERN int		TclBN_mp_grow(mp_int *a, int size);
+TCLAPI int		TclBN_mp_grow(mp_int *a, int size);
 /* 21 */
-EXTERN int		TclBN_mp_init(mp_int *a);
+TCLAPI int		TclBN_mp_init(mp_int *a);
 /* 22 */
-EXTERN int		TclBN_mp_init_copy(mp_int *a, mp_int *b);
+TCLAPI int		TclBN_mp_init_copy(mp_int *a, mp_int *b);
 /* 23 */
-EXTERN int		TclBN_mp_init_multi(mp_int *a, ...);
+TCLAPI int		TclBN_mp_init_multi(mp_int *a, ...);
 /* 24 */
-EXTERN int		TclBN_mp_init_set(mp_int *a, mp_digit b);
+TCLAPI int		TclBN_mp_init_set(mp_int *a, mp_digit b);
 /* 25 */
-EXTERN int		TclBN_mp_init_size(mp_int *a, int size);
+TCLAPI int		TclBN_mp_init_size(mp_int *a, int size);
 /* 26 */
-EXTERN int		TclBN_mp_lshd(mp_int *a, int shift);
+TCLAPI int		TclBN_mp_lshd(mp_int *a, int shift);
 /* 27 */
-EXTERN int		TclBN_mp_mod(mp_int *a, mp_int *b, mp_int *r);
+TCLAPI int		TclBN_mp_mod(mp_int *a, mp_int *b, mp_int *r);
 /* 28 */
-EXTERN int		TclBN_mp_mod_2d(const mp_int *a, int b, mp_int *r);
+TCLAPI int		TclBN_mp_mod_2d(const mp_int *a, int b, mp_int *r);
 /* 29 */
-EXTERN int		TclBN_mp_mul(mp_int *a, mp_int *b, mp_int *p);
+TCLAPI int		TclBN_mp_mul(mp_int *a, mp_int *b, mp_int *p);
 /* 30 */
-EXTERN int		TclBN_mp_mul_d(mp_int *a, mp_digit b, mp_int *p);
+TCLAPI int		TclBN_mp_mul_d(mp_int *a, mp_digit b, mp_int *p);
 /* 31 */
-EXTERN int		TclBN_mp_mul_2(mp_int *a, mp_int *p);
+TCLAPI int		TclBN_mp_mul_2(mp_int *a, mp_int *p);
 /* 32 */
-EXTERN int		TclBN_mp_mul_2d(const mp_int *a, int d, mp_int *p);
+TCLAPI int		TclBN_mp_mul_2d(const mp_int *a, int d, mp_int *p);
 /* 33 */
-EXTERN int		TclBN_mp_neg(const mp_int *a, mp_int *b);
+TCLAPI int		TclBN_mp_neg(const mp_int *a, mp_int *b);
 /* 34 */
-EXTERN int		TclBN_mp_or(mp_int *a, mp_int *b, mp_int *c);
+TCLAPI int		TclBN_mp_or(mp_int *a, mp_int *b, mp_int *c);
 /* 35 */
-EXTERN int		TclBN_mp_radix_size(mp_int *a, int radix, int *size);
+TCLAPI int		TclBN_mp_radix_size(mp_int *a, int radix, int *size);
 /* 36 */
-EXTERN int		TclBN_mp_read_radix(mp_int *a, const char *str,
+TCLAPI int		TclBN_mp_read_radix(mp_int *a, const char *str,
 				int radix);
 /* 37 */
-EXTERN void		TclBN_mp_rshd(mp_int *a, int shift);
+TCLAPI void		TclBN_mp_rshd(mp_int *a, int shift);
 /* 38 */
-EXTERN int		TclBN_mp_shrink(mp_int *a);
+TCLAPI int		TclBN_mp_shrink(mp_int *a);
 /* 39 */
-EXTERN void		TclBN_mp_set(mp_int *a, mp_digit b);
+TCLAPI void		TclBN_mp_set(mp_int *a, mp_digit b);
 /* 40 */
-EXTERN int		TclBN_mp_sqr(mp_int *a, mp_int *b);
+TCLAPI int		TclBN_mp_sqr(mp_int *a, mp_int *b);
 /* 41 */
-EXTERN int		TclBN_mp_sqrt(mp_int *a, mp_int *b);
+TCLAPI int		TclBN_mp_sqrt(mp_int *a, mp_int *b);
 /* 42 */
-EXTERN int		TclBN_mp_sub(mp_int *a, mp_int *b, mp_int *c);
+TCLAPI int		TclBN_mp_sub(mp_int *a, mp_int *b, mp_int *c);
 /* 43 */
-EXTERN int		TclBN_mp_sub_d(mp_int *a, mp_digit b, mp_int *c);
+TCLAPI int		TclBN_mp_sub_d(mp_int *a, mp_digit b, mp_int *c);
 /* 44 */
-EXTERN int		TclBN_mp_to_unsigned_bin(mp_int *a, unsigned char *b);
+TCLAPI int		TclBN_mp_to_unsigned_bin(mp_int *a, unsigned char *b);
 /* 45 */
-EXTERN int		TclBN_mp_to_unsigned_bin_n(mp_int *a,
+TCLAPI int		TclBN_mp_to_unsigned_bin_n(mp_int *a,
 				unsigned char *b, unsigned long *outlen);
 /* 46 */
-EXTERN int		TclBN_mp_toradix_n(mp_int *a, char *str, int radix,
+TCLAPI int		TclBN_mp_toradix_n(mp_int *a, char *str, int radix,
 				int maxlen);
 /* 47 */
-EXTERN int		TclBN_mp_unsigned_bin_size(mp_int *a);
+TCLAPI int		TclBN_mp_unsigned_bin_size(mp_int *a);
 /* 48 */
-EXTERN int		TclBN_mp_xor(mp_int *a, mp_int *b, mp_int *c);
+TCLAPI int		TclBN_mp_xor(mp_int *a, mp_int *b, mp_int *c);
 /* 49 */
-EXTERN void		TclBN_mp_zero(mp_int *a);
+TCLAPI void		TclBN_mp_zero(mp_int *a);
 /* 50 */
-EXTERN void		TclBN_reverse(unsigned char *s, int len);
+TCLAPI void		TclBN_reverse(unsigned char *s, int len);
 /* 51 */
-EXTERN int		TclBN_fast_s_mp_mul_digs(mp_int *a, mp_int *b,
+TCLAPI int		TclBN_fast_s_mp_mul_digs(mp_int *a, mp_int *b,
 				mp_int *c, int digs);
 /* 52 */
-EXTERN int		TclBN_fast_s_mp_sqr(mp_int *a, mp_int *b);
+TCLAPI int		TclBN_fast_s_mp_sqr(mp_int *a, mp_int *b);
 /* 53 */
-EXTERN int		TclBN_mp_karatsuba_mul(mp_int *a, mp_int *b,
+TCLAPI int		TclBN_mp_karatsuba_mul(mp_int *a, mp_int *b,
 				mp_int *c);
 /* 54 */
-EXTERN int		TclBN_mp_karatsuba_sqr(mp_int *a, mp_int *b);
+TCLAPI int		TclBN_mp_karatsuba_sqr(mp_int *a, mp_int *b);
 /* 55 */
-EXTERN int		TclBN_mp_toom_mul(mp_int *a, mp_int *b, mp_int *c);
+TCLAPI int		TclBN_mp_toom_mul(mp_int *a, mp_int *b, mp_int *c);
 /* 56 */
-EXTERN int		TclBN_mp_toom_sqr(mp_int *a, mp_int *b);
+TCLAPI int		TclBN_mp_toom_sqr(mp_int *a, mp_int *b);
 /* 57 */
-EXTERN int		TclBN_s_mp_add(mp_int *a, mp_int *b, mp_int *c);
+TCLAPI int		TclBN_s_mp_add(mp_int *a, mp_int *b, mp_int *c);
 /* 58 */
-EXTERN int		TclBN_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c,
+TCLAPI int		TclBN_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c,
 				int digs);
 /* 59 */
-EXTERN int		TclBN_s_mp_sqr(mp_int *a, mp_int *b);
+TCLAPI int		TclBN_s_mp_sqr(mp_int *a, mp_int *b);
 /* 60 */
-EXTERN int		TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c);
+TCLAPI int		TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c);
 /* 61 */
-EXTERN int		TclBN_mp_init_set_int(mp_int *a, unsigned long i);
+TCLAPI int		TclBN_mp_init_set_int(mp_int *a, unsigned long i);
 /* 62 */
-EXTERN int		TclBN_mp_set_int(mp_int *a, unsigned long i);
+TCLAPI int		TclBN_mp_set_int(mp_int *a, unsigned long i);
 /* 63 */
-EXTERN int		TclBN_mp_cnt_lsb(const mp_int *a);
+TCLAPI int		TclBN_mp_cnt_lsb(const mp_int *a);
 
 typedef struct TclTomMathStubs {
     int magic;
@@ -493,7 +482,4 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TCLINTDECLS */
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 6ce4243..6e49519 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -1135,6 +1135,7 @@ proc genStubs::init {} {
     variable outDir
     variable interfaces
 
+variable scspec
     if {[llength $argv] < 2} {
 	puts stderr "usage: $argv0 outDir declFile ?declFile...?"
 	exit 1
diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c
index c4d3f32..7e5d7d3 100644
--- a/unix/dltest/pkga.c
+++ b/unix/dltest/pkga.c
@@ -10,18 +10,9 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#undef STATIC_BUILD
 #include "tcl.h"
 
 /*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Pkga_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
  * Prototypes for procedures defined later in this file:
  */
 
@@ -124,7 +115,7 @@ Pkga_QuoteObjCmd(
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkga_Init(
     Tcl_Interp *interp)		/* Interpreter in which the package is to be
 				 * made available. */
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index fe0d365..71b42e1 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -11,18 +11,9 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#undef STATIC_BUILD
 #include "tcl.h"
 
 /*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Pkgb_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
  * Prototypes for procedures defined later in this file:
  */
 
@@ -114,7 +105,7 @@ Pkgb_UnsafeObjCmd(
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkgb_Init(
     Tcl_Interp *interp)		/* Interpreter in which the package is to be
 				 * made available. */
@@ -151,7 +142,7 @@ Pkgb_Init(
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkgb_SafeInit(
     Tcl_Interp *interp)		/* Interpreter in which the package is to be
 				 * made available. */
diff --git a/unix/dltest/pkgc.c b/unix/dltest/pkgc.c
index 557f21b..4e3e174 100644
--- a/unix/dltest/pkgc.c
+++ b/unix/dltest/pkgc.c
@@ -11,18 +11,9 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#undef STATIC_BUILD
 #include "tcl.h"
 
 /*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Pkgc_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
  * Prototypes for procedures defined later in this file:
  */
 
@@ -114,7 +105,7 @@ Pkgc_UnsafeObjCmd(
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkgc_Init(
     Tcl_Interp *interp)		/* Interpreter in which the package is to be
 				 * made available. */
@@ -151,7 +142,7 @@ Pkgc_Init(
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkgc_SafeInit(
     Tcl_Interp *interp)		/* Interpreter in which the package is to be
 				 * made available. */
diff --git a/unix/dltest/pkgd.c b/unix/dltest/pkgd.c
index 6e114e9..4a1defa 100644
--- a/unix/dltest/pkgd.c
+++ b/unix/dltest/pkgd.c
@@ -11,18 +11,9 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#undef STATIC_BUILD
 #include "tcl.h"
 
 /*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Pkgd_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
  * Prototypes for procedures defined later in this file:
  */
 
@@ -114,7 +105,7 @@ Pkgd_UnsafeObjCmd(
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkgd_Init(
     Tcl_Interp *interp)		/* Interpreter in which the package is to be
 				 * made available. */
@@ -151,7 +142,7 @@ Pkgd_Init(
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkgd_SafeInit(
     Tcl_Interp *interp)		/* Interpreter in which the package is to be
 				 * made available. */
diff --git a/unix/dltest/pkge.c b/unix/dltest/pkge.c
index d616352..36c8c1a 100644
--- a/unix/dltest/pkge.c
+++ b/unix/dltest/pkge.c
@@ -11,17 +11,8 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#undef STATIC_BUILD
 #include "tcl.h"
 
-/*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Pkge_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
 
 /*
  *----------------------------------------------------------------------
@@ -40,7 +31,7 @@
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkge_Init(
     Tcl_Interp *interp)		/* Interpreter in which the package is to be
 				 * made available. */
diff --git a/unix/dltest/pkgua.c b/unix/dltest/pkgua.c
index 417bedb..2a38525 100644
--- a/unix/dltest/pkgua.c
+++ b/unix/dltest/pkgua.c
@@ -11,18 +11,9 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#undef STATIC_BUILD
 #include "tcl.h"
 
 /*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Pkgua_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
  * Prototypes for procedures defined later in this file:
  */
 
@@ -200,7 +191,7 @@ PkguaQuoteObjCmd(
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkgua_Init(
     Tcl_Interp *interp)		/* Interpreter in which the package is to be
 				 * made available. */
@@ -253,7 +244,7 @@ Pkgua_Init(
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkgua_SafeInit(
     Tcl_Interp *interp)		/* Interpreter in which the package is to be
 				 * made available. */
@@ -278,7 +269,7 @@ Pkgua_SafeInit(
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkgua_Unload(
     Tcl_Interp *interp,		/* Interpreter from which the package is to be
 				 * unloaded. */
@@ -331,7 +322,7 @@ Pkgua_Unload(
  *----------------------------------------------------------------------
  */
 
-EXTERN int
+DLLEXPORT int
 Pkgua_SafeUnload(
     Tcl_Interp *interp,		/* Interpreter from which the package is to be
 				 * unloaded. */
diff --git a/unix/tclLoadShl.c b/unix/tclLoadShl.c
index f73c164..4be3d7b 100644
--- a/unix/tclLoadShl.c
+++ b/unix/tclLoadShl.c
@@ -12,15 +12,6 @@
  */
 
 #include <dl.h>
-
-/*
- * On some HP machines, dl.h defines EXTERN; remove that definition.
- */
-
-#ifdef EXTERN
-#   undef EXTERN
-#endif
-
 #include "tclInt.h"
 
 /*
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 5cf7d60..9b3872e 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -33,16 +33,6 @@
 #endif
 
 /*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the Dde_Init
- * declaration is in the source file itself, which is only accessed when we
- * are building a library. DO NOT MOVE BEFORE ANY #include LINES. ONLY USE
- * EXTERN TO INDICATE EXPORTED FUNCTIONS FROM NOW ON.
- */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
  * The following structure is used to keep track of the interpreters
  * registered by this process.
  */
@@ -134,8 +124,8 @@ static int		DdeObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
 
-EXTERN int		Dde_Init(Tcl_Interp *interp);
-EXTERN int		Dde_SafeInit(Tcl_Interp *interp);
+DLLEXPORT int		Dde_Init(Tcl_Interp *interp);
+DLLEXPORT int		Dde_SafeInit(Tcl_Interp *interp);
 
 /*
  *----------------------------------------------------------------------
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index dadfa2b..619d9df 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -49,15 +49,6 @@
 #endif
 
 /*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Registry_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
  * The following macros convert between different endian ints.
  */
 
@@ -140,8 +131,8 @@ static int		SetValue(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
 			    Tcl_Obj *valueNameObj, Tcl_Obj *dataObj,
 			    Tcl_Obj *typeObj, REGSAM mode);
 
-EXTERN int		Registry_Init(Tcl_Interp *interp);
-EXTERN int		Registry_Unload(Tcl_Interp *interp, int flags);
+DLLEXPORT int		Registry_Init(Tcl_Interp *interp);
+DLLEXPORT int		Registry_Unload(Tcl_Interp *interp, int flags);
 
 /*
  *----------------------------------------------------------------------