*** empty log message ***

19 files changed, 319 insertions, 321 deletions

diff --git a/src/bltChain.h b/src/bltChain.h
index e0b0259..7c7cbb0 100644
--- a/src/bltChain.h
+++ b/src/bltChain.h
@@ -53,26 +53,26 @@ struct _Blt_Chain {
     long nLinks;		/* Number of elements in chain */
 };
 
-BLT_EXTERN void Blt_Chain_Init(Blt_Chain chain);
-BLT_EXTERN Blt_Chain Blt_Chain_Create(void);
-BLT_EXTERN void Blt_Chain_Destroy(Blt_Chain chain);
-BLT_EXTERN Blt_ChainLink Blt_Chain_NewLink(void);
-BLT_EXTERN Blt_ChainLink Blt_Chain_AllocLink(size_t size);
-BLT_EXTERN Blt_ChainLink Blt_Chain_Append(Blt_Chain chain, 
+extern void Blt_Chain_Init(Blt_Chain chain);
+extern Blt_Chain Blt_Chain_Create(void);
+extern void Blt_Chain_Destroy(Blt_Chain chain);
+extern Blt_ChainLink Blt_Chain_NewLink(void);
+extern Blt_ChainLink Blt_Chain_AllocLink(size_t size);
+extern Blt_ChainLink Blt_Chain_Append(Blt_Chain chain, 
 	ClientData clientData);
-BLT_EXTERN Blt_ChainLink Blt_Chain_Prepend(Blt_Chain chain, 
+extern Blt_ChainLink Blt_Chain_Prepend(Blt_Chain chain, 
 	ClientData clientData);
-BLT_EXTERN void Blt_Chain_Reset(Blt_Chain chain);
-BLT_EXTERN void Blt_Chain_InitLink(Blt_ChainLink link);
-BLT_EXTERN void Blt_Chain_LinkAfter(Blt_Chain chain, Blt_ChainLink link, 
+extern void Blt_Chain_Reset(Blt_Chain chain);
+extern void Blt_Chain_InitLink(Blt_ChainLink link);
+extern void Blt_Chain_LinkAfter(Blt_Chain chain, Blt_ChainLink link, 
 	Blt_ChainLink after);
-BLT_EXTERN void Blt_Chain_LinkBefore(Blt_Chain chain, Blt_ChainLink link, 
+extern void Blt_Chain_LinkBefore(Blt_Chain chain, Blt_ChainLink link, 
 	Blt_ChainLink before);
-BLT_EXTERN void Blt_Chain_UnlinkLink(Blt_Chain chain, Blt_ChainLink link);
-BLT_EXTERN void Blt_Chain_DeleteLink(Blt_Chain chain, Blt_ChainLink link);
-BLT_EXTERN Blt_ChainLink Blt_Chain_GetNthLink(Blt_Chain chain, long position);
-BLT_EXTERN void Blt_Chain_Sort(Blt_Chain chain, Blt_ChainCompareProc *proc);
-BLT_EXTERN int Blt_Chain_IsBefore(Blt_ChainLink first, Blt_ChainLink last);
+extern void Blt_Chain_UnlinkLink(Blt_Chain chain, Blt_ChainLink link);
+extern void Blt_Chain_DeleteLink(Blt_Chain chain, Blt_ChainLink link);
+extern Blt_ChainLink Blt_Chain_GetNthLink(Blt_Chain chain, long position);
+extern void Blt_Chain_Sort(Blt_Chain chain, Blt_ChainCompareProc *proc);
+extern int Blt_Chain_IsBefore(Blt_ChainLink first, Blt_ChainLink last);
 
 #define Blt_Chain_GetLength(c)	(((c) == NULL) ? 0 : (c)->nLinks)
 #define Blt_Chain_FirstLink(c)	(((c) == NULL) ? NULL : (c)->head)
diff --git a/src/bltConfig.h b/src/bltConfig.h
index ad95f06..77e2484 100644
--- a/src/bltConfig.h
+++ b/src/bltConfig.h
@@ -312,61 +312,61 @@ typedef struct {
 					 * if a pane has received any space
 					 * yet */
 
-BLT_EXTERN void Blt_SetDashes (Display *display, GC gc, Blt_Dashes *dashesPtr);
-BLT_EXTERN Blt_Dashes *Blt_GetDashes (GC gc);
+extern void Blt_SetDashes (Display *display, GC gc, Blt_Dashes *dashesPtr);
+extern Blt_Dashes *Blt_GetDashes (GC gc);
 
-BLT_EXTERN void Blt_ResetLimits(Blt_Limits *limitsPtr);
-BLT_EXTERN int Blt_GetLimitsFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
+extern void Blt_ResetLimits(Blt_Limits *limitsPtr);
+extern int Blt_GetLimitsFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
 	Tcl_Obj *objPtr, Blt_Limits *limitsPtr);
 
-BLT_EXTERN int Blt_ConfigureInfoFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
+extern int Blt_ConfigureInfoFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
 	Blt_ConfigSpec *specs, char *widgRec, Tcl_Obj *objPtr, int flags);
 
-BLT_EXTERN int Blt_ConfigureValueFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
+extern int Blt_ConfigureValueFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
 	Blt_ConfigSpec *specs, char *widgRec, Tcl_Obj *objPtr, int flags);
 
-BLT_EXTERN int Blt_ConfigureWidgetFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
+extern int Blt_ConfigureWidgetFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
 	Blt_ConfigSpec *specs, int objc, Tcl_Obj *const *objv, char *widgRec, 
 	int flags);
 
-BLT_EXTERN int Blt_ConfigureComponentFromObj(Tcl_Interp *interp, 
+extern int Blt_ConfigureComponentFromObj(Tcl_Interp *interp, 
 	Tk_Window tkwin, const char *name, const char *className, 
 	Blt_ConfigSpec *specs, int objc, Tcl_Obj *const *objv, char *widgRec, 
 	int flags);
 
-BLT_EXTERN int Blt_ConfigModified TCL_VARARGS(Blt_ConfigSpec *, specs);
+extern int Blt_ConfigModified TCL_VARARGS(Blt_ConfigSpec *, specs);
 
-BLT_EXTERN const char *Blt_NameOfState(int state);
-BLT_EXTERN const char *Blt_NameOfSide(int side);
+extern const char *Blt_NameOfState(int state);
+extern const char *Blt_NameOfSide(int side);
 
-BLT_EXTERN void Blt_FreeOptions(Blt_ConfigSpec *specs, char *widgRec, 
+extern void Blt_FreeOptions(Blt_ConfigSpec *specs, char *widgRec, 
 	Display *display, int needFlags);
 
-BLT_EXTERN int Blt_ObjIsOption(Blt_ConfigSpec *specs, Tcl_Obj *objPtr, 
+extern int Blt_ObjIsOption(Blt_ConfigSpec *specs, Tcl_Obj *objPtr, 
 	int flags);
 
-BLT_EXTERN int Blt_GetSideFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+extern int Blt_GetSideFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
 	int *sidePtr);
 
-BLT_EXTERN int Blt_GetPositionFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+extern int Blt_GetPositionFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
 	long *indexPtr);
 
-BLT_EXTERN int Blt_GetPixelsFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
+extern int Blt_GetPixelsFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
 	Tcl_Obj *objPtr, int flags, int *valuePtr);
 
-BLT_EXTERN int Blt_GetPadFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
+extern int Blt_GetPadFromObj(Tcl_Interp *interp, Tk_Window tkwin, 
 	Tcl_Obj *objPtr, Blt_Pad *padPtr);
 
-BLT_EXTERN int Blt_GetStateFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+extern int Blt_GetStateFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
 	int *statePtr);
 
-BLT_EXTERN int Blt_GetFillFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+extern int Blt_GetFillFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
 	int *fillPtr);
 
-BLT_EXTERN int Blt_GetResizeFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+extern int Blt_GetResizeFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
 	int *fillPtr);
 
-BLT_EXTERN int Blt_GetDashesFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+extern int Blt_GetDashesFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
 	Blt_Dashes *dashesPtr);
 
 #endif /* BLT_CONFIG_H */
diff --git a/src/bltGrBind.h b/src/bltGrBind.h
index 2e2c5cb..937e754 100644
--- a/src/bltGrBind.h
+++ b/src/bltGrBind.h
@@ -85,23 +85,23 @@ struct _Blt_BindTable {
     Blt_BindTagProc *tagProc;	/* Routine to report tags picked items. */
 };
 
-BLT_EXTERN void Blt_DestroyBindingTable(Blt_BindTable table);
+extern void Blt_DestroyBindingTable(Blt_BindTable table);
 
-BLT_EXTERN Blt_BindTable Blt_CreateBindingTable(Tcl_Interp *interp, 
+extern Blt_BindTable Blt_CreateBindingTable(Tcl_Interp *interp, 
 	Tk_Window tkwin, ClientData clientData, Blt_BindPickProc *pickProc,
 	Blt_BindTagProc *tagProc);
 
-BLT_EXTERN int Blt_ConfigureBindings(Tcl_Interp *interp, Blt_BindTable table, 
+extern int Blt_ConfigureBindings(Tcl_Interp *interp, Blt_BindTable table, 
 	ClientData item, int argc, const char **argv);
 
-BLT_EXTERN int Blt_ConfigureBindingsFromObj(Tcl_Interp *interp, 
+extern int Blt_ConfigureBindingsFromObj(Tcl_Interp *interp, 
 	Blt_BindTable table, ClientData item, int objc, Tcl_Obj *const *objv);
 
-BLT_EXTERN void Blt_PickCurrentItem(Blt_BindTable table);
+extern void Blt_PickCurrentItem(Blt_BindTable table);
 
-BLT_EXTERN void Blt_DeleteBindings(Blt_BindTable table, ClientData object);
+extern void Blt_DeleteBindings(Blt_BindTable table, ClientData object);
 
-BLT_EXTERN void Blt_MoveBindingTable(Blt_BindTable table, Tk_Window tkwin);
+extern void Blt_MoveBindingTable(Blt_BindTable table, Tk_Window tkwin);
 
 #define Blt_SetFocusItem(bindPtr, object, context) \
 	((bindPtr)->focusItem = (ClientData)(object),\
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index 7b7efaf..7b11f64 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -179,13 +179,13 @@ typedef struct {
     int errorBarCapWidth;		/* Length of cap on error bars */
 } BarElement;
 
-BLT_EXTERN Blt_CustomOption bltBarPenOption;
-BLT_EXTERN Blt_CustomOption bltValuesOption;
-BLT_EXTERN Blt_CustomOption bltValuePairsOption;
-BLT_EXTERN Blt_CustomOption bltXAxisOption;
-BLT_EXTERN Blt_CustomOption bltYAxisOption;
-BLT_EXTERN Blt_CustomOption bltColorOption;
-BLT_EXTERN Blt_CustomOption bltBarStylesOption;
+extern Blt_CustomOption bltBarPenOption;
+extern Blt_CustomOption bltValuesOption;
+extern Blt_CustomOption bltValuePairsOption;
+extern Blt_CustomOption bltXAxisOption;
+extern Blt_CustomOption bltYAxisOption;
+extern Blt_CustomOption bltColorOption;
+extern Blt_CustomOption bltBarStylesOption;
 
 static Blt_OptionParseProc ObjToBarMode;
 static Blt_OptionPrintProc BarModeToObj;
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index 41a0eb8..6cd6a9d 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -364,13 +364,13 @@ static Blt_CustomOption symbolOption =
     ObjToSymbolProc, SymbolToObjProc, FreeSymbolProc, (ClientData)0
 };
 
-BLT_EXTERN Blt_CustomOption bltLineStylesOption;
-BLT_EXTERN Blt_CustomOption bltColorOption;
-BLT_EXTERN Blt_CustomOption bltValuesOption;
-BLT_EXTERN Blt_CustomOption bltValuePairsOption;
-BLT_EXTERN Blt_CustomOption bltLinePenOption;
-BLT_EXTERN Blt_CustomOption bltXAxisOption;
-BLT_EXTERN Blt_CustomOption bltYAxisOption;
+extern Blt_CustomOption bltLineStylesOption;
+extern Blt_CustomOption bltColorOption;
+extern Blt_CustomOption bltValuesOption;
+extern Blt_CustomOption bltValuePairsOption;
+extern Blt_CustomOption bltLinePenOption;
+extern Blt_CustomOption bltXAxisOption;
+extern Blt_CustomOption bltYAxisOption;
 
 #define DEF_LINE_ACTIVE_PEN		"activeLine"
 #define DEF_LINE_AXIS_X			"x"
diff --git a/src/bltGrElemOp.h b/src/bltGrElemOp.h
index f0e3969..60a8fc4 100644
--- a/src/bltGrElemOp.h
+++ b/src/bltGrElemOp.h
@@ -255,17 +255,17 @@ struct _Element {
 };
 
 
-BLT_EXTERN double Blt_FindElemValuesMinimum(ElemValues *vecPtr, double minLimit);
-BLT_EXTERN void Blt_ResizeStatusArray(Element *elemPtr, int nPoints);
-BLT_EXTERN int Blt_GetPenStyle(Graph *graphPtr, char *name, size_t classId, 
+extern double Blt_FindElemValuesMinimum(ElemValues *vecPtr, double minLimit);
+extern void Blt_ResizeStatusArray(Element *elemPtr, int nPoints);
+extern int Blt_GetPenStyle(Graph *graphPtr, char *name, size_t classId, 
 	PenStyle *stylePtr);
-BLT_EXTERN void Blt_FreeStylePalette (Blt_Chain stylePalette);
-BLT_EXTERN PenStyle **Blt_StyleMap (Element *elemPtr);
-BLT_EXTERN void Blt_MapErrorBars(Graph *graphPtr, Element *elemPtr, 
+extern void Blt_FreeStylePalette (Blt_Chain stylePalette);
+extern PenStyle **Blt_StyleMap (Element *elemPtr);
+extern void Blt_MapErrorBars(Graph *graphPtr, Element *elemPtr, 
 	PenStyle **dataToStyle);
-BLT_EXTERN void Blt_FreeDataValues(ElemValues *evPtr);
-BLT_EXTERN int Blt_GetElement(Tcl_Interp *interp, Graph *graphPtr, 
+extern void Blt_FreeDataValues(ElemValues *evPtr);
+extern int Blt_GetElement(Tcl_Interp *interp, Graph *graphPtr, 
 	Tcl_Obj *objPtr, Element **elemPtrPtr);
-BLT_EXTERN void Blt_DestroyTableClients(Graph *graphPtr);
+extern void Blt_DestroyTableClients(Graph *graphPtr);
 
 #endif /* _BLT_GR_ELEM_H */
diff --git a/src/bltGrHairs.C b/src/bltGrHairs.C
index 6cbd3c4..24c4cc9 100644
--- a/src/bltGrHairs.C
+++ b/src/bltGrHairs.C
@@ -73,7 +73,7 @@ struct _Crosshairs {
 #define DEF_HAIRS_HIDE		"yes"
 #define DEF_HAIRS_POSITION	(char *)NULL
 
-BLT_EXTERN Blt_CustomOption bltPointOption;
+extern Blt_CustomOption bltPointOption;
 
 static Blt_ConfigSpec configSpecs[] =
 {
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index 9bd2f57..cad35fc 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -353,7 +353,7 @@ static Tcl_TimerProc BlinkCursorProc;
 static Tk_LostSelProc LostSelectionProc;
 static Tk_SelectionProc SelectionProc;
 
-BLT_EXTERN Tcl_ObjCmdProc Blt_GraphInstCmdProc;
+extern Tcl_ObjCmdProc Blt_GraphInstCmdProc;
 
 /*
  *---------------------------------------------------------------------------
diff --git a/src/bltGrLegd.h b/src/bltGrLegd.h
index 0ba1cb3..e12dd78 100644
--- a/src/bltGrLegd.h
+++ b/src/bltGrLegd.h
@@ -41,20 +41,20 @@
 	(LEGEND_RIGHT | LEGEND_LEFT | LEGEND_BOTTOM | LEGEND_TOP)
 #define LEGEND_PLOTAREA_MASK  (LEGEND_PLOT | LEGEND_XY)
 
-BLT_EXTERN int Blt_CreateLegend(Graph *graphPtr);
-BLT_EXTERN void Blt_DestroyLegend(Graph *graphPtr);
-BLT_EXTERN void Blt_DrawLegend(Graph *graphPtr, Drawable drawable);
-BLT_EXTERN void Blt_MapLegend(Graph *graphPtr, int width, int height);
-BLT_EXTERN int Blt_LegendOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
+extern int Blt_CreateLegend(Graph *graphPtr);
+extern void Blt_DestroyLegend(Graph *graphPtr);
+extern void Blt_DrawLegend(Graph *graphPtr, Drawable drawable);
+extern void Blt_MapLegend(Graph *graphPtr, int width, int height);
+extern int Blt_LegendOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
 	Tcl_Obj *const *objv);
-BLT_EXTERN int Blt_Legend_Site(Graph *graphPtr);
-BLT_EXTERN int Blt_Legend_Width(Graph *graphPtr);
-BLT_EXTERN int Blt_Legend_Height(Graph *graphPtr);
-BLT_EXTERN int Blt_Legend_IsHidden(Graph *graphPtr);
-BLT_EXTERN int Blt_Legend_IsRaised(Graph *graphPtr);
-BLT_EXTERN int Blt_Legend_X(Graph *graphPtr);
-BLT_EXTERN int Blt_Legend_Y(Graph *graphPtr);
-BLT_EXTERN void Blt_Legend_RemoveElement(Graph *graphPtr, Element *elemPtr);
-BLT_EXTERN void Blt_Legend_EventuallyRedraw(Graph *graphPtr);
+extern int Blt_Legend_Site(Graph *graphPtr);
+extern int Blt_Legend_Width(Graph *graphPtr);
+extern int Blt_Legend_Height(Graph *graphPtr);
+extern int Blt_Legend_IsHidden(Graph *graphPtr);
+extern int Blt_Legend_IsRaised(Graph *graphPtr);
+extern int Blt_Legend_X(Graph *graphPtr);
+extern int Blt_Legend_Y(Graph *graphPtr);
+extern void Blt_Legend_RemoveElement(Graph *graphPtr, Element *elemPtr);
+extern void Blt_Legend_EventuallyRedraw(Graph *graphPtr);
 
 #endif /* BLT_GR_LEGEND_H */
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 2df1be6..3970d43 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -115,9 +115,9 @@ static Blt_CustomOption pictImageOption =
     ObjToPictImageProc, PictImageToObjProc, FreePictImageProc, (ClientData)0
 };
 
-BLT_EXTERN Blt_CustomOption bltXAxisOption;
-BLT_EXTERN Blt_CustomOption bltYAxisOption;
-BLT_EXTERN Blt_CustomOption bltFilterOption;
+extern Blt_CustomOption bltXAxisOption;
+extern Blt_CustomOption bltYAxisOption;
+extern Blt_CustomOption bltFilterOption;
 
 typedef Marker *(MarkerCreateProc)(void);
 typedef void    (MarkerDrawProc)(Marker *markerPtr, Drawable drawable);
diff --git a/src/bltGrPSOutput.h b/src/bltGrPSOutput.h
index 944faf8..3649799 100644
--- a/src/bltGrPSOutput.h
+++ b/src/bltGrPSOutput.h
@@ -87,48 +87,48 @@ typedef struct  {
 
 typedef struct _Blt_Ps *Blt_Ps;
 
-BLT_EXTERN Blt_Ps Blt_Ps_Create(Tcl_Interp *interp, PageSetup *setupPtr);
+extern Blt_Ps Blt_Ps_Create(Tcl_Interp *interp, PageSetup *setupPtr);
 
-BLT_EXTERN void Blt_Ps_Free(Blt_Ps ps);
+extern void Blt_Ps_Free(Blt_Ps ps);
 
-BLT_EXTERN const char *Blt_Ps_GetValue(Blt_Ps ps, int *lengthPtr);
+extern const char *Blt_Ps_GetValue(Blt_Ps ps, int *lengthPtr);
 
-BLT_EXTERN Tcl_Interp *Blt_Ps_GetInterp(Blt_Ps ps);
+extern Tcl_Interp *Blt_Ps_GetInterp(Blt_Ps ps);
 
-BLT_EXTERN Tcl_DString *Blt_Ps_GetDString(Blt_Ps ps);
+extern Tcl_DString *Blt_Ps_GetDString(Blt_Ps ps);
 
-BLT_EXTERN char *Blt_Ps_GetScratchBuffer(Blt_Ps ps);
+extern char *Blt_Ps_GetScratchBuffer(Blt_Ps ps);
 
-BLT_EXTERN void Blt_Ps_SetInterp(Blt_Ps ps, Tcl_Interp *interp);
+extern void Blt_Ps_SetInterp(Blt_Ps ps, Tcl_Interp *interp);
 
-BLT_EXTERN void Blt_Ps_Append(Blt_Ps ps, const char *string);
+extern void Blt_Ps_Append(Blt_Ps ps, const char *string);
 
-BLT_EXTERN void Blt_Ps_AppendBytes(Blt_Ps ps, const char *string, int nBytes);
+extern void Blt_Ps_AppendBytes(Blt_Ps ps, const char *string, int nBytes);
 
-BLT_EXTERN void Blt_Ps_VarAppend TCL_VARARGS(Blt_Ps, ps);
+extern void Blt_Ps_VarAppend TCL_VARARGS(Blt_Ps, ps);
 
-BLT_EXTERN void Blt_Ps_Format TCL_VARARGS(Blt_Ps, ps);
+extern void Blt_Ps_Format TCL_VARARGS(Blt_Ps, ps);
 
-BLT_EXTERN void Blt_Ps_SetClearBackground(Blt_Ps ps);
+extern void Blt_Ps_SetClearBackground(Blt_Ps ps);
 
-BLT_EXTERN int Blt_Ps_IncludeFile(Tcl_Interp *interp, Blt_Ps ps, 
+extern int Blt_Ps_IncludeFile(Tcl_Interp *interp, Blt_Ps ps, 
 	const char *fileName);
 
-BLT_EXTERN int Blt_Ps_GetPicaFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+extern int Blt_Ps_GetPicaFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
 	int *picaPtr);
 
-BLT_EXTERN int Blt_Ps_GetPadFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+extern int Blt_Ps_GetPadFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
 	Blt_Pad *padPtr);
 
-BLT_EXTERN int Blt_Ps_ComputeBoundingBox(PageSetup *setupPtr, int w, int h);
+extern int Blt_Ps_ComputeBoundingBox(PageSetup *setupPtr, int w, int h);
 
-BLT_EXTERN void Blt_Ps_DrawPicture(Blt_Ps ps, Blt_Picture picture, 
+extern void Blt_Ps_DrawPicture(Blt_Ps ps, Blt_Picture picture, 
 	double x, double y);
 
-BLT_EXTERN void Blt_Ps_Rectangle(Blt_Ps ps, int x, int y, int w, int h);
+extern void Blt_Ps_Rectangle(Blt_Ps ps, int x, int y, int w, int h);
 
 
-BLT_EXTERN int Blt_Ps_SaveFile(Tcl_Interp *interp, Blt_Ps ps, 
+extern int Blt_Ps_SaveFile(Tcl_Interp *interp, Blt_Ps ps, 
 	const char *fileName);
 
 #ifdef _TK
@@ -136,78 +136,78 @@ BLT_EXTERN int Blt_Ps_SaveFile(Tcl_Interp *interp, Blt_Ps ps,
 #include "bltFont.h"
 #include "bltText.h"
 
-BLT_EXTERN void Blt_Ps_XSetLineWidth(Blt_Ps ps, int lineWidth);
+extern void Blt_Ps_XSetLineWidth(Blt_Ps ps, int lineWidth);
 
-BLT_EXTERN void Blt_Ps_XSetBackground(Blt_Ps ps, XColor *colorPtr);
+extern void Blt_Ps_XSetBackground(Blt_Ps ps, XColor *colorPtr);
 
-BLT_EXTERN void Blt_Ps_XSetBitmapData(Blt_Ps ps, Display *display, 
+extern void Blt_Ps_XSetBitmapData(Blt_Ps ps, Display *display, 
 	Pixmap bitmap, int width, int height);
 
-BLT_EXTERN void Blt_Ps_XSetForeground(Blt_Ps ps, XColor *colorPtr);
+extern void Blt_Ps_XSetForeground(Blt_Ps ps, XColor *colorPtr);
 
-BLT_EXTERN void Blt_Ps_XSetFont(Blt_Ps ps, Blt_Font font);
+extern void Blt_Ps_XSetFont(Blt_Ps ps, Blt_Font font);
 
-BLT_EXTERN void Blt_Ps_XSetDashes(Blt_Ps ps, Blt_Dashes *dashesPtr);
+extern void Blt_Ps_XSetDashes(Blt_Ps ps, Blt_Dashes *dashesPtr);
 
-BLT_EXTERN void Blt_Ps_XSetLineAttributes(Blt_Ps ps, XColor *colorPtr,
+extern void Blt_Ps_XSetLineAttributes(Blt_Ps ps, XColor *colorPtr,
 	int lineWidth, Blt_Dashes *dashesPtr, int capStyle, int joinStyle);
 
-BLT_EXTERN void Blt_Ps_XSetStipple(Blt_Ps ps, Display *display, Pixmap bitmap);
+extern void Blt_Ps_XSetStipple(Blt_Ps ps, Display *display, Pixmap bitmap);
 
-BLT_EXTERN void Blt_Ps_Polyline(Blt_Ps ps, Point2d *screenPts, int nScreenPts);
+extern void Blt_Ps_Polyline(Blt_Ps ps, Point2d *screenPts, int nScreenPts);
 
-BLT_EXTERN void Blt_Ps_XDrawLines(Blt_Ps ps, XPoint *points, int n);
+extern void Blt_Ps_XDrawLines(Blt_Ps ps, XPoint *points, int n);
 
-BLT_EXTERN void Blt_Ps_XDrawSegments(Blt_Ps ps, XSegment *segments, 
+extern void Blt_Ps_XDrawSegments(Blt_Ps ps, XSegment *segments, 
 	int nSegments);
 
-BLT_EXTERN void Blt_Ps_DrawPolyline(Blt_Ps ps, Point2d *points, int n);
+extern void Blt_Ps_DrawPolyline(Blt_Ps ps, Point2d *points, int n);
 
-BLT_EXTERN void Blt_Ps_Draw2DSegments(Blt_Ps ps, Segment2d *segments,
+extern void Blt_Ps_Draw2DSegments(Blt_Ps ps, Segment2d *segments,
 	int nSegments);
 
-BLT_EXTERN void Blt_Ps_Draw3DRectangle(Blt_Ps ps, Tk_3DBorder border, 
+extern void Blt_Ps_Draw3DRectangle(Blt_Ps ps, Tk_3DBorder border, 
 	double x, double y, int width, int height, int borderWidth, int relief);
 
-BLT_EXTERN void Blt_Ps_Fill3DRectangle(Blt_Ps ps, Tk_3DBorder border, double x,
+extern void Blt_Ps_Fill3DRectangle(Blt_Ps ps, Tk_3DBorder border, double x,
 	 double y, int width, int height, int borderWidth, int relief);
 
-BLT_EXTERN void Blt_Ps_XFillRectangle(Blt_Ps ps, double x, double y, 
+extern void Blt_Ps_XFillRectangle(Blt_Ps ps, double x, double y, 
 	int width, int height);
 
-BLT_EXTERN void Blt_Ps_XFillRectangles(Blt_Ps ps, XRectangle *rects, int n);
+extern void Blt_Ps_XFillRectangles(Blt_Ps ps, XRectangle *rects, int n);
 
-BLT_EXTERN void Blt_Ps_XFillPolygon(Blt_Ps ps, Point2d *screenPts, 
+extern void Blt_Ps_XFillPolygon(Blt_Ps ps, Point2d *screenPts, 
 	int nScreenPts);
 
-BLT_EXTERN void Blt_Ps_DrawPhoto(Blt_Ps ps, Tk_PhotoHandle photoToken,
+extern void Blt_Ps_DrawPhoto(Blt_Ps ps, Tk_PhotoHandle photoToken,
 	double x, double y);
 
-BLT_EXTERN void Blt_Ps_XDrawWindow(Blt_Ps ps, Tk_Window tkwin, 
+extern void Blt_Ps_XDrawWindow(Blt_Ps ps, Tk_Window tkwin, 
 	double x, double y);
 
-BLT_EXTERN void Blt_Ps_DrawText(Blt_Ps ps, const char *string, 
+extern void Blt_Ps_DrawText(Blt_Ps ps, const char *string, 
 	TextStyle *attrPtr, double x, double y);
 
-BLT_EXTERN void Blt_Ps_DrawBitmap(Blt_Ps ps, Display *display, Pixmap bitmap, 
+extern void Blt_Ps_DrawBitmap(Blt_Ps ps, Display *display, Pixmap bitmap, 
 	double scaleX, double scaleY);
 
-BLT_EXTERN void Blt_Ps_XSetCapStyle(Blt_Ps ps, int capStyle);
+extern void Blt_Ps_XSetCapStyle(Blt_Ps ps, int capStyle);
 
-BLT_EXTERN void Blt_Ps_XSetJoinStyle(Blt_Ps ps, int joinStyle);
+extern void Blt_Ps_XSetJoinStyle(Blt_Ps ps, int joinStyle);
 
-BLT_EXTERN void Blt_Ps_PolylineFromXPoints(Blt_Ps ps, XPoint *points, int n);
+extern void Blt_Ps_PolylineFromXPoints(Blt_Ps ps, XPoint *points, int n);
 
-BLT_EXTERN void Blt_Ps_Polygon(Blt_Ps ps, Point2d *screenPts, int nScreenPts);
+extern void Blt_Ps_Polygon(Blt_Ps ps, Point2d *screenPts, int nScreenPts);
 
-BLT_EXTERN void Blt_Ps_SetPrinting(Blt_Ps ps, int value);
-BLT_EXTERN int Blt_Ps_IsPrinting(void);
+extern void Blt_Ps_SetPrinting(Blt_Ps ps, int value);
+extern int Blt_Ps_IsPrinting(void);
 
-BLT_EXTERN int Blt_Ps_TextWidth(Blt_Font font, const char *string, int nBytes);
+extern int Blt_Ps_TextWidth(Blt_Font font, const char *string, int nBytes);
 
-BLT_EXTERN int Blt_Ps_GetFontMetrics(Blt_Font font, Blt_FontMetrics *fmPtr);
+extern int Blt_Ps_GetFontMetrics(Blt_Font font, Blt_FontMetrics *fmPtr);
 
-BLT_EXTERN void Blt_Ps_FontName(const char *family, int flags, 
+extern void Blt_Ps_FontName(const char *family, int flags, 
 	Tcl_DString *resultPtr);
 
 #endif /* _TK */
diff --git a/src/bltGrText.h b/src/bltGrText.h
index 7d4ef3d..935b5e0 100644
--- a/src/bltGrText.h
+++ b/src/bltGrText.h
@@ -1,4 +1,3 @@
-
 /*
  * bltText.h --
  *
@@ -153,72 +152,72 @@ typedef struct {
     GC gc;			/* GC used to draw the text */
 } TextStyle;
 
-BLT_EXTERN TextLayout *Blt_Ts_CreateLayout(const char *string, int length, 
+extern TextLayout *Blt_Ts_CreateLayout(const char *string, int length, 
 	TextStyle *tsPtr);
 
-BLT_EXTERN void Blt_Ts_DrawLayout(Tk_Window tkwin, Drawable drawable, 
+extern void Blt_Ts_DrawLayout(Tk_Window tkwin, Drawable drawable, 
 	TextLayout *textPtr, TextStyle *tsPtr, int x, int y);
 
-BLT_EXTERN void Blt_Ts_GetExtents(TextStyle *tsPtr, const char *text, 
+extern void Blt_Ts_GetExtents(TextStyle *tsPtr, const char *text, 
 	unsigned int *widthPtr, unsigned int *heightPtr);
 
-BLT_EXTERN void Blt_Ts_ResetStyle(Tk_Window tkwin, TextStyle *tsPtr);
+extern void Blt_Ts_ResetStyle(Tk_Window tkwin, TextStyle *tsPtr);
 
-BLT_EXTERN void Blt_Ts_FreeStyle(Display *display, TextStyle *tsPtr);
+extern void Blt_Ts_FreeStyle(Display *display, TextStyle *tsPtr);
 
-BLT_EXTERN void Blt_Ts_SetDrawStyle (TextStyle *tsPtr, Blt_Font font, GC gc, 
+extern void Blt_Ts_SetDrawStyle (TextStyle *tsPtr, Blt_Font font, GC gc, 
 	XColor *fgColor, float angle, Tk_Anchor anchor, Tk_Justify justify, 
 	int leader);
 
-BLT_EXTERN void Blt_Ts_SetPrintStyle(TextStyle *tsPtr, Blt_Font font, 
+extern void Blt_Ts_SetPrintStyle(TextStyle *tsPtr, Blt_Font font, 
 	XColor *fgColor, XColor *bgColor, float angle, Tk_Anchor anchor, 
 	Tk_Justify justify, int leader);
 
-BLT_EXTERN void Blt_DrawText(Tk_Window tkwin, Drawable drawable, 
+extern void Blt_DrawText(Tk_Window tkwin, Drawable drawable, 
 	const char *string, TextStyle *tsPtr, int x, int y);
 
-BLT_EXTERN void Blt_DrawText2(Tk_Window tkwin, Drawable drawable, 
+extern void Blt_DrawText2(Tk_Window tkwin, Drawable drawable, 
 	const char *string, TextStyle *tsPtr, int x, int y, Dim2D * dimPtr);
 
-BLT_EXTERN Pixmap Blt_Ts_Bitmap(Tk_Window tkwin, TextLayout *textPtr, 
+extern Pixmap Blt_Ts_Bitmap(Tk_Window tkwin, TextLayout *textPtr, 
 	TextStyle *tsPtr, int *widthPtr, int *heightPtr);
 
-BLT_EXTERN int Blt_DrawTextWithRotatedFont(Tk_Window tkwin, Drawable drawable, 
+extern int Blt_DrawTextWithRotatedFont(Tk_Window tkwin, Drawable drawable, 
 	float angle, TextStyle *tsPtr, TextLayout *textPtr, int x, int y);
 
-BLT_EXTERN void Blt_DrawLayout(Tk_Window tkwin, Drawable drawable, GC gc, 
+extern void Blt_DrawLayout(Tk_Window tkwin, Drawable drawable, GC gc, 
 	Blt_Font font, int depth, float angle, int x, int y, 
 	TextLayout *layoutPtr, int maxLength);
 
-BLT_EXTERN void Blt_GetTextExtents(Blt_Font font, int leader, const char *text, 
+extern void Blt_GetTextExtents(Blt_Font font, int leader, const char *text, 
 	int textLen, unsigned int *widthPtr, unsigned int *heightPtr);
 
-BLT_EXTERN void Blt_RotateStartingTextPositions(TextLayout *textPtr,
+extern void Blt_RotateStartingTextPositions(TextLayout *textPtr,
 	float angle);
 
-BLT_EXTERN Tk_TextLayout Blt_ComputeTextLayout(Blt_Font font, 
+extern Tk_TextLayout Blt_ComputeTextLayout(Blt_Font font, 
 	const char *string, int numChars, int wrapLength, Tk_Justify justify, 
 	int flags, int *widthPtr, int *heightPtr);
 
-BLT_EXTERN void Blt_DrawTextLayout(Display *display, Drawable drawable, GC gc, 
+extern void Blt_DrawTextLayout(Display *display, Drawable drawable, GC gc, 
 	Tk_TextLayout layout, int x, int y, int firstChar, int lastChar);
 
-BLT_EXTERN int Blt_CharBbox(Tk_TextLayout layout, int index, int *xPtr, 
+extern int Blt_CharBbox(Tk_TextLayout layout, int index, int *xPtr, 
 	int *yPtr, int *widthPtr, int *heightPtr);
 
-BLT_EXTERN void Blt_UnderlineTextLayout(Display *display, Drawable drawable,
+extern void Blt_UnderlineTextLayout(Display *display, Drawable drawable,
 	GC gc, Tk_TextLayout layout, int x, int y, int underline);
 
-BLT_EXTERN void Blt_Ts_UnderlineLayout(Tk_Window tkwin, Drawable drawable,
+extern void Blt_Ts_UnderlineLayout(Tk_Window tkwin, Drawable drawable,
 	TextLayout *layoutPtr, TextStyle *tsPtr, int x, int y);
 
-BLT_EXTERN void Blt_Ts_DrawText(Tk_Window tkwin, Drawable drawable, 
+extern void Blt_Ts_DrawText(Tk_Window tkwin, Drawable drawable, 
 	const char *text, int textLen, TextStyle *tsPtr, int x, int y);
 
-BLT_EXTERN int Blt_MeasureText(Blt_Font font, const char *text, int textLen,
+extern int Blt_MeasureText(Blt_Font font, const char *text, int textLen,
 	int maxLength, int *nBytesPtr);
 
-BLT_EXTERN void Blt_FreeTextLayout(Tk_TextLayout layout);
+extern void Blt_FreeTextLayout(Tk_TextLayout layout);
 
 #define Blt_Ts_GetAnchor(ts)		((ts).anchor)
 #define Blt_Ts_GetAngle(ts)		((ts).angle)
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 073f6b2..ae7b4cc 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -82,9 +82,9 @@ static const char *objectClassNames[] = {
     "WindowMarker",
 };
 
-BLT_EXTERN Blt_CustomOption bltLinePenOption;
-BLT_EXTERN Blt_CustomOption bltBarPenOption;
-BLT_EXTERN Blt_CustomOption bltBarModeOption;
+extern Blt_CustomOption bltLinePenOption;
+extern Blt_CustomOption bltBarPenOption;
+extern Blt_CustomOption bltBarModeOption;
 
 #define DEF_GRAPH_ASPECT_RATIO		"0.0"
 #define DEF_GRAPH_BAR_BASELINE		"0.0"
diff --git a/src/bltGraph.h b/src/bltGraph.h
index 62ab031..f7ef9cb 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -512,188 +512,188 @@ struct _Graph {
  * ---------------------- Forward declarations ------------------------
  */
 
-BLT_EXTERN int Blt_CreatePageSetup(Graph *graphPtr);
+extern int Blt_CreatePageSetup(Graph *graphPtr);
 
-BLT_EXTERN int Blt_CreateCrosshairs(Graph *graphPtr);
+extern int Blt_CreateCrosshairs(Graph *graphPtr);
 
-BLT_EXTERN double Blt_InvHMap(Axis *axisPtr, double x);
+extern double Blt_InvHMap(Axis *axisPtr, double x);
 
-BLT_EXTERN double Blt_InvVMap(Axis *axisPtr, double x);
+extern double Blt_InvVMap(Axis *axisPtr, double x);
 
-BLT_EXTERN double Blt_HMap(Axis *axisPtr, double x);
+extern double Blt_HMap(Axis *axisPtr, double x);
 
-BLT_EXTERN double Blt_VMap(Axis *axisPtr, double y);
+extern double Blt_VMap(Axis *axisPtr, double y);
 
-BLT_EXTERN Point2d Blt_InvMap2D(Graph *graphPtr, double x, double y, 
+extern Point2d Blt_InvMap2D(Graph *graphPtr, double x, double y, 
 	Axis2d *pairPtr);
 
-BLT_EXTERN Point2d Blt_Map2D(Graph *graphPtr, double x, double y, 
+extern Point2d Blt_Map2D(Graph *graphPtr, double x, double y, 
 	Axis2d *pairPtr);
 
-BLT_EXTERN Graph *Blt_GetGraphFromWindowData(Tk_Window tkwin);
+extern Graph *Blt_GetGraphFromWindowData(Tk_Window tkwin);
 
-BLT_EXTERN void Blt_AdjustAxisPointers(Graph *graphPtr);
+extern void Blt_AdjustAxisPointers(Graph *graphPtr);
 
-BLT_EXTERN int Blt_PolyRectClip(Region2d *extsPtr, Point2d *inputPts,
+extern int Blt_PolyRectClip(Region2d *extsPtr, Point2d *inputPts,
 	int nInputPts, Point2d *outputPts);
 
-BLT_EXTERN void Blt_ComputeBarStacks(Graph *graphPtr);
+extern void Blt_ComputeBarStacks(Graph *graphPtr);
 
-BLT_EXTERN void Blt_ConfigureCrosshairs(Graph *graphPtr);
-BLT_EXTERN void Blt_ConfigureLegend(Graph *graphPtr);
-BLT_EXTERN void Blt_ConfigureElements(Graph *graphPtr);
-BLT_EXTERN void Blt_ConfigureAxes(Graph *graphPtr);
-BLT_EXTERN void Blt_ConfigureMarkers(Graph *graphPtr);
-BLT_EXTERN void Blt_ReconfigureGraph(Graph *graphPtr);
+extern void Blt_ConfigureCrosshairs(Graph *graphPtr);
+extern void Blt_ConfigureLegend(Graph *graphPtr);
+extern void Blt_ConfigureElements(Graph *graphPtr);
+extern void Blt_ConfigureAxes(Graph *graphPtr);
+extern void Blt_ConfigureMarkers(Graph *graphPtr);
+extern void Blt_ReconfigureGraph(Graph *graphPtr);
 
-BLT_EXTERN void Blt_DestroyAxes(Graph *graphPtr);
+extern void Blt_DestroyAxes(Graph *graphPtr);
 
-BLT_EXTERN void Blt_DestroyCrosshairs(Graph *graphPtr);
+extern void Blt_DestroyCrosshairs(Graph *graphPtr);
 
-BLT_EXTERN void Blt_DestroyElements(Graph *graphPtr);
+extern void Blt_DestroyElements(Graph *graphPtr);
 
-BLT_EXTERN void Blt_DestroyMarkers(Graph *graphPtr);
+extern void Blt_DestroyMarkers(Graph *graphPtr);
 
-BLT_EXTERN void Blt_DestroyPageSetup(Graph *graphPtr);
+extern void Blt_DestroyPageSetup(Graph *graphPtr);
 
-BLT_EXTERN void Blt_DrawAxes(Graph *graphPtr, Drawable drawable);
+extern void Blt_DrawAxes(Graph *graphPtr, Drawable drawable);
 
-BLT_EXTERN void Blt_DrawAxisLimits(Graph *graphPtr, Drawable drawable);
+extern void Blt_DrawAxisLimits(Graph *graphPtr, Drawable drawable);
 
-BLT_EXTERN void Blt_DrawElements(Graph *graphPtr, Drawable drawable);
+extern void Blt_DrawElements(Graph *graphPtr, Drawable drawable);
 
-BLT_EXTERN void Blt_DrawActiveElements(Graph *graphPtr, Drawable drawable);
+extern void Blt_DrawActiveElements(Graph *graphPtr, Drawable drawable);
 
-BLT_EXTERN void Blt_DrawGraph(Graph *graphPtr, Drawable drawable);
+extern void Blt_DrawGraph(Graph *graphPtr, Drawable drawable);
 
-BLT_EXTERN void Blt_DrawMarkers(Graph *graphPtr, Drawable drawable, int under);
+extern void Blt_DrawMarkers(Graph *graphPtr, Drawable drawable, int under);
 
-BLT_EXTERN void Blt_Draw2DSegments(Display *display, Drawable drawable, GC gc, 
+extern void Blt_Draw2DSegments(Display *display, Drawable drawable, GC gc, 
 	Segment2d *segments, int nSegments);
 
-BLT_EXTERN int Blt_GetCoordinate(Tcl_Interp *interp, const char *string, 
+extern int Blt_GetCoordinate(Tcl_Interp *interp, const char *string, 
 	double *valuePtr);
 
-BLT_EXTERN void Blt_InitBarSetTable(Graph *graphPtr);
+extern void Blt_InitBarSetTable(Graph *graphPtr);
 
-BLT_EXTERN void Blt_LayoutGraph(Graph *graphPtr);
+extern void Blt_LayoutGraph(Graph *graphPtr);
 
-BLT_EXTERN void Blt_EventuallyRedrawGraph(Graph *graphPtr);
+extern void Blt_EventuallyRedrawGraph(Graph *graphPtr);
 
-BLT_EXTERN void Blt_ResetAxes(Graph *graphPtr);
+extern void Blt_ResetAxes(Graph *graphPtr);
 
-BLT_EXTERN void Blt_ResetBarGroups(Graph *graphPtr);
+extern void Blt_ResetBarGroups(Graph *graphPtr);
 
-BLT_EXTERN void Blt_GraphExtents(Graph *graphPtr, Region2d *extsPtr);
+extern void Blt_GraphExtents(Graph *graphPtr, Region2d *extsPtr);
 
-BLT_EXTERN void Blt_DisableCrosshairs(Graph *graphPtr);
+extern void Blt_DisableCrosshairs(Graph *graphPtr);
 
-BLT_EXTERN void Blt_EnableCrosshairs(Graph *graphPtr);
+extern void Blt_EnableCrosshairs(Graph *graphPtr);
 
-BLT_EXTERN void Blt_MapGraph(Graph *graphPtr);
+extern void Blt_MapGraph(Graph *graphPtr);
 
-BLT_EXTERN void Blt_MapAxes(Graph *graphPtr);
+extern void Blt_MapAxes(Graph *graphPtr);
 
-BLT_EXTERN void Blt_MapElements(Graph *graphPtr);
+extern void Blt_MapElements(Graph *graphPtr);
 
-BLT_EXTERN void Blt_MapMarkers(Graph *graphPtr);
+extern void Blt_MapMarkers(Graph *graphPtr);
 
-BLT_EXTERN void Blt_UpdateCrosshairs(Graph *graphPtr);
+extern void Blt_UpdateCrosshairs(Graph *graphPtr);
 
-BLT_EXTERN void Blt_DestroyPens(Graph *graphPtr);
+extern void Blt_DestroyPens(Graph *graphPtr);
 
-BLT_EXTERN int Blt_GetPenFromObj(Tcl_Interp *interp, Graph *graphPtr, 
+extern int Blt_GetPenFromObj(Tcl_Interp *interp, Graph *graphPtr, 
 	Tcl_Obj *objPtr, ClassId classId, Pen **penPtrPtr);
 
-BLT_EXTERN Pen *Blt_BarPen(const char *penName);
+extern Pen *Blt_BarPen(const char *penName);
 
-BLT_EXTERN Pen *Blt_LinePen(const char *penName);
+extern Pen *Blt_LinePen(const char *penName);
 
-BLT_EXTERN Pen *Blt_CreatePen(Graph *graphPtr, const char *penName, 
+extern Pen *Blt_CreatePen(Graph *graphPtr, const char *penName, 
 	ClassId classId, int objc, Tcl_Obj *const *objv);
 
-BLT_EXTERN int Blt_InitLinePens(Graph *graphPtr);
+extern int Blt_InitLinePens(Graph *graphPtr);
 
-BLT_EXTERN int Blt_InitBarPens(Graph *graphPtr);
+extern int Blt_InitBarPens(Graph *graphPtr);
 
-BLT_EXTERN void Blt_FreePen(Pen *penPtr);
+extern void Blt_FreePen(Pen *penPtr);
 
-BLT_EXTERN int Blt_VirtualAxisOp(Graph *graphPtr, Tcl_Interp *interp, 
+extern int Blt_VirtualAxisOp(Graph *graphPtr, Tcl_Interp *interp, 
 	int objc, Tcl_Obj *const *objv);
 
-BLT_EXTERN int Blt_AxisOp(Tcl_Interp *interp, Graph *graphPtr, int margin, 
+extern int Blt_AxisOp(Tcl_Interp *interp, Graph *graphPtr, int margin, 
 	int objc, Tcl_Obj *const *objv);
 
-BLT_EXTERN int Blt_ElementOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
+extern int Blt_ElementOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
 	Tcl_Obj *const *objv, ClassId classId);
 
-BLT_EXTERN int Blt_CrosshairsOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
+extern int Blt_CrosshairsOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
 	Tcl_Obj *const *objv);
 
-BLT_EXTERN int Blt_MarkerOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
+extern int Blt_MarkerOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
 	Tcl_Obj *const *objv);
 
-BLT_EXTERN int Blt_PenOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
+extern int Blt_PenOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
 	Tcl_Obj *const *objv);
 
-BLT_EXTERN int Blt_PointInPolygon(Point2d *samplePtr, Point2d *screenPts, 
+extern int Blt_PointInPolygon(Point2d *samplePtr, Point2d *screenPts, 
 	int nScreenPts);
 
-BLT_EXTERN int Blt_RegionInPolygon(Region2d *extsPtr, Point2d *points, 
+extern int Blt_RegionInPolygon(Region2d *extsPtr, Point2d *points, 
 	int nPoints, int enclosed);
 
-BLT_EXTERN int Blt_PointInSegments(Point2d *samplePtr, Segment2d *segments, 
+extern int Blt_PointInSegments(Point2d *samplePtr, Segment2d *segments, 
 	int nSegments, double halo);
 
-BLT_EXTERN int Blt_PostScriptOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
+extern int Blt_PostScriptOp(Graph *graphPtr, Tcl_Interp *interp, int objc, 
 	Tcl_Obj *const *objv);
 
-BLT_EXTERN int Blt_GraphUpdateNeeded(Graph *graphPtr);
+extern int Blt_GraphUpdateNeeded(Graph *graphPtr);
 
-BLT_EXTERN int Blt_DefaultAxes(Graph *graphPtr);
+extern int Blt_DefaultAxes(Graph *graphPtr);
 
-BLT_EXTERN Axis *Blt_GetFirstAxis(Blt_Chain chain);
+extern Axis *Blt_GetFirstAxis(Blt_Chain chain);
 
-BLT_EXTERN void Blt_UpdateAxisBackgrounds(Graph *graphPtr);
+extern void Blt_UpdateAxisBackgrounds(Graph *graphPtr);
 
-BLT_EXTERN Marker *Blt_NearestMarker(Graph *graphPtr, int x, int y, int under);
+extern Marker *Blt_NearestMarker(Graph *graphPtr, int x, int y, int under);
 
-BLT_EXTERN Axis *Blt_NearestAxis(Graph *graphPtr, int x, int y);
+extern Axis *Blt_NearestAxis(Graph *graphPtr, int x, int y);
 
 typedef ClientData (MakeTagProc)(Graph *graphPtr, const char *tagName);
 
-BLT_EXTERN MakeTagProc Blt_MakeElementTag;
-BLT_EXTERN MakeTagProc Blt_MakeMarkerTag;
-BLT_EXTERN MakeTagProc Blt_MakeAxisTag;
-BLT_EXTERN Blt_BindTagProc Blt_GraphTags;
-BLT_EXTERN Blt_BindTagProc Blt_AxisTags;
+extern MakeTagProc Blt_MakeElementTag;
+extern MakeTagProc Blt_MakeMarkerTag;
+extern MakeTagProc Blt_MakeAxisTag;
+extern Blt_BindTagProc Blt_GraphTags;
+extern Blt_BindTagProc Blt_AxisTags;
 
-BLT_EXTERN int Blt_GraphType(Graph *graphPtr);
+extern int Blt_GraphType(Graph *graphPtr);
 
-BLT_EXTERN void Blt_UpdateGraph(ClientData clientData);
+extern void Blt_UpdateGraph(ClientData clientData);
 
-BLT_EXTERN void Blt_GraphSetObjectClass(GraphObj *graphObjPtr,ClassId classId);
+extern void Blt_GraphSetObjectClass(GraphObj *graphObjPtr,ClassId classId);
 
-BLT_EXTERN void Blt_MarkersToPostScript(Graph *graphPtr, Blt_Ps ps, int under);
-BLT_EXTERN void Blt_ElementsToPostScript(Graph *graphPtr, Blt_Ps ps);
-BLT_EXTERN void Blt_ActiveElementsToPostScript(Graph *graphPtr, Blt_Ps ps);
-BLT_EXTERN void Blt_LegendToPostScript(Graph *graphPtr, Blt_Ps ps);
-BLT_EXTERN void Blt_AxesToPostScript(Graph *graphPtr, Blt_Ps ps);
-BLT_EXTERN void Blt_AxisLimitsToPostScript(Graph *graphPtr, Blt_Ps ps);
+extern void Blt_MarkersToPostScript(Graph *graphPtr, Blt_Ps ps, int under);
+extern void Blt_ElementsToPostScript(Graph *graphPtr, Blt_Ps ps);
+extern void Blt_ActiveElementsToPostScript(Graph *graphPtr, Blt_Ps ps);
+extern void Blt_LegendToPostScript(Graph *graphPtr, Blt_Ps ps);
+extern void Blt_AxesToPostScript(Graph *graphPtr, Blt_Ps ps);
+extern void Blt_AxisLimitsToPostScript(Graph *graphPtr, Blt_Ps ps);
 
-BLT_EXTERN Element *Blt_LineElement(Graph *graphPtr, const char *name, 
+extern Element *Blt_LineElement(Graph *graphPtr, const char *name, 
 	ClassId classId);
-BLT_EXTERN Element *Blt_BarElement(Graph *graphPtr, const char *name, 
+extern Element *Blt_BarElement(Graph *graphPtr, const char *name, 
 	ClassId classId);
 
-BLT_EXTERN void Blt_DrawGrids(Graph *graphPtr, Drawable drawable);
+extern void Blt_DrawGrids(Graph *graphPtr, Drawable drawable);
 
-BLT_EXTERN void Blt_GridsToPostScript(Graph *graphPtr, Blt_Ps ps);
-BLT_EXTERN void Blt_InitBarSetTable(Graph *graphPtr);
-BLT_EXTERN void Blt_DestroyBarSets(Graph *graphPtr);
+extern void Blt_GridsToPostScript(Graph *graphPtr, Blt_Ps ps);
+extern void Blt_InitBarSetTable(Graph *graphPtr);
+extern void Blt_DestroyBarSets(Graph *graphPtr);
 
 /* ---------------------- Global declarations ------------------------ */
 
-BLT_EXTERN const char *Blt_GraphClassName(ClassId classId);
+extern const char *Blt_GraphClassName(ClassId classId);
 
 #endif /* _BLT_GRAPH_H */
diff --git a/src/bltNsUtil.h b/src/bltNsUtil.h
index 00769f3..8241004 100644
--- a/src/bltNsUtil.h
+++ b/src/bltNsUtil.h
@@ -48,33 +48,33 @@ typedef struct {
 
 #ifndef USE_TCL_STUBS
 
-BLT_EXTERN Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, const char *name, 
+extern Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, const char *name, 
 	Tcl_Namespace *nsPtr, int flags);
 /*
  * Namespace procedures not prototyped defined in Tcl.h 
  */
-BLT_EXTERN Tcl_Namespace *Tcl_GetCurrentNamespace(Tcl_Interp *interp);
+extern Tcl_Namespace *Tcl_GetCurrentNamespace(Tcl_Interp *interp);
 
-BLT_EXTERN Tcl_Namespace *Tcl_GetGlobalNamespace(Tcl_Interp *interp);
+extern Tcl_Namespace *Tcl_GetGlobalNamespace(Tcl_Interp *interp);
 
-BLT_EXTERN Tcl_Namespace *Tcl_CreateNamespace(Tcl_Interp *interp, 
+extern Tcl_Namespace *Tcl_CreateNamespace(Tcl_Interp *interp, 
 	const char *name, ClientData clientData, 
 	Tcl_NamespaceDeleteProc *nsDelProc);
 
-BLT_EXTERN void Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
+extern void Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
 
-BLT_EXTERN Tcl_Namespace *Tcl_FindNamespace(Tcl_Interp *interp, 
+extern Tcl_Namespace *Tcl_FindNamespace(Tcl_Interp *interp, 
 	const char *name, Tcl_Namespace *context, int flags);
 
-BLT_EXTERN int Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+extern int Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
 	const char *name, int resetFlag);
 
-BLT_EXTERN Tcl_Var Tcl_FindNamespaceVar(Tcl_Interp *interp, const char *name, 
+extern Tcl_Var Tcl_FindNamespaceVar(Tcl_Interp *interp, const char *name, 
 	Tcl_Namespace *contextNsPtr, int flags);
 
-BLT_EXTERN void Tcl_PopCallFrame(Tcl_Interp *interp);
+extern void Tcl_PopCallFrame(Tcl_Interp *interp);
 
-BLT_EXTERN int Tcl_PushCallFrame(Tcl_Interp *interp, Tcl_CallFrame *framePtr, 
+extern int Tcl_PushCallFrame(Tcl_Interp *interp, Tcl_CallFrame *framePtr, 
 	Tcl_Namespace *nsPtr, int isProcCallFrame);
 
 #endif /* USE_TCL_STUBS */
@@ -82,20 +82,20 @@ BLT_EXTERN int Tcl_PushCallFrame(Tcl_Interp *interp, Tcl_CallFrame *framePtr,
 /* 
  * Auxillary procedures 
  */
-BLT_EXTERN Tcl_Namespace *Blt_GetVariableNamespace(Tcl_Interp *interp, 
+extern Tcl_Namespace *Blt_GetVariableNamespace(Tcl_Interp *interp, 
 	const char *varName);
 
-BLT_EXTERN Tcl_Namespace *Blt_GetCommandNamespace(Tcl_Command cmdToken);
+extern Tcl_Namespace *Blt_GetCommandNamespace(Tcl_Command cmdToken);
 
-BLT_EXTERN Tcl_CallFrame *Blt_EnterNamespace(Tcl_Interp *interp, 
+extern Tcl_CallFrame *Blt_EnterNamespace(Tcl_Interp *interp, 
 	Tcl_Namespace *nsPtr);
 
-BLT_EXTERN void Blt_LeaveNamespace(Tcl_Interp *interp, Tcl_CallFrame *framePtr);
+extern void Blt_LeaveNamespace(Tcl_Interp *interp, Tcl_CallFrame *framePtr);
 
-BLT_EXTERN int Blt_ParseObjectName(Tcl_Interp *interp, const char *name, 
+extern int Blt_ParseObjectName(Tcl_Interp *interp, const char *name, 
 	Blt_ObjectName *objNamePtr, unsigned int flags);
 
-BLT_EXTERN char *Blt_MakeQualifiedName(Blt_ObjectName *objNamePtr, 
+extern char *Blt_MakeQualifiedName(Blt_ObjectName *objNamePtr, 
 	Tcl_DString *resultPtr);
 
 #endif /* BLT_NS_UTIL_H */
diff --git a/src/bltOp.h b/src/bltOp.h
index 5887a46..ef4c712 100644
--- a/src/bltOp.h
+++ b/src/bltOp.h
@@ -31,7 +31,7 @@ typedef enum {
 #define BLT_OP_BINARY_SEARCH	0
 #define BLT_OP_LINEAR_SEARCH	1
 
-BLT_EXTERN void *Blt_GetOpFromObj(Tcl_Interp *interp, int nSpecs, 
+extern void *Blt_GetOpFromObj(Tcl_Interp *interp, int nSpecs, 
 	Blt_OpSpec *specs, int operPos, int objc, Tcl_Obj *const *objv, 
 	int flags);
 
diff --git a/src/bltSwitch.h b/src/bltSwitch.h
index 998e23e..a075d0b 100644
--- a/src/bltSwitch.h
+++ b/src/bltSwitch.h
@@ -124,11 +124,11 @@ typedef struct {
 #define BLT_SWITCH_SPECIFIED		(1<<4)
 #define BLT_SWITCH_USER_BIT		(1<<8)
 
-BLT_EXTERN int Blt_ParseSwitches(Tcl_Interp *interp, Blt_SwitchSpec *specPtr, 
+extern int Blt_ParseSwitches(Tcl_Interp *interp, Blt_SwitchSpec *specPtr, 
 	int objc, Tcl_Obj *const *objv, void *rec, int flags);
 
-BLT_EXTERN void Blt_FreeSwitches(Blt_SwitchSpec *specs, void *rec, int flags);
+extern void Blt_FreeSwitches(Blt_SwitchSpec *specs, void *rec, int flags);
 
-BLT_EXTERN int Blt_SwitchChanged TCL_VARARGS(Blt_SwitchSpec *, specs);
+extern int Blt_SwitchChanged TCL_VARARGS(Blt_SwitchSpec *, specs);
  
 #endif /* BLT_SWITCH_H */
diff --git a/src/bltVecInt.h b/src/bltVecInt.h
index 5d30f97..a01c8c8 100644
--- a/src/bltVecInt.h
+++ b/src/bltVecInt.h
@@ -1,4 +1,3 @@
-
 /*
  * bltVecInt.h --
  *
@@ -178,74 +177,74 @@ typedef struct {
     } \
 }
 
-BLT_EXTERN void Blt_Vec_InstallSpecialIndices(Blt_HashTable *tablePtr);
+extern void Blt_Vec_InstallSpecialIndices(Blt_HashTable *tablePtr);
 
-BLT_EXTERN void Blt_Vec_InstallMathFunctions(Blt_HashTable *tablePtr);
+extern void Blt_Vec_InstallMathFunctions(Blt_HashTable *tablePtr);
 
-BLT_EXTERN void Blt_Vec_UninstallMathFunctions(Blt_HashTable *tablePtr);
+extern void Blt_Vec_UninstallMathFunctions(Blt_HashTable *tablePtr);
 
-BLT_EXTERN VectorInterpData *Blt_Vec_GetInterpData (Tcl_Interp *interp);
+extern VectorInterpData *Blt_Vec_GetInterpData (Tcl_Interp *interp);
 
-BLT_EXTERN double Blt_Vec_Max(Vector *vecObjPtr);
-BLT_EXTERN double Blt_Vec_Min(Vector *vecObjPtr);
+extern double Blt_Vec_Max(Vector *vecObjPtr);
+extern double Blt_Vec_Min(Vector *vecObjPtr);
 
-BLT_EXTERN Vector *Blt_Vec_New(VectorInterpData *dataPtr);
+extern Vector *Blt_Vec_New(VectorInterpData *dataPtr);
 
-BLT_EXTERN int Blt_Vec_Duplicate(Vector *destPtr, Vector *srcPtr);
+extern int Blt_Vec_Duplicate(Vector *destPtr, Vector *srcPtr);
 
-BLT_EXTERN int Blt_Vec_SetLength(Tcl_Interp *interp, Vector *vPtr, 
+extern int Blt_Vec_SetLength(Tcl_Interp *interp, Vector *vPtr, 
 	int length);
 
-BLT_EXTERN int Blt_Vec_SetSize(Tcl_Interp *interp, Vector *vPtr, 
+extern int Blt_Vec_SetSize(Tcl_Interp *interp, Vector *vPtr, 
 	int size);
 
-BLT_EXTERN int Blt_Vec_ChangeLength(Tcl_Interp *interp, Vector *vPtr, 
+extern int Blt_Vec_ChangeLength(Tcl_Interp *interp, Vector *vPtr, 
 	int length);
 
-BLT_EXTERN Vector *Blt_Vec_ParseElement(Tcl_Interp *interp, 
+extern Vector *Blt_Vec_ParseElement(Tcl_Interp *interp, 
 	VectorInterpData *dataPtr, const char *start, const char **endPtr, 
 	int flags);
 
-BLT_EXTERN void Blt_Vec_Free(Vector *vPtr);
+extern void Blt_Vec_Free(Vector *vPtr);
 
-BLT_EXTERN size_t *Blt_Vec_SortMap(Vector **vectors, int nVectors);
+extern size_t *Blt_Vec_SortMap(Vector **vectors, int nVectors);
 
-BLT_EXTERN int Blt_Vec_LookupName(VectorInterpData *dataPtr, 
+extern int Blt_Vec_LookupName(VectorInterpData *dataPtr, 
 	const char *vecName, Vector **vPtrPtr);
 
-BLT_EXTERN Vector *Blt_Vec_Create(VectorInterpData *dataPtr, 
+extern Vector *Blt_Vec_Create(VectorInterpData *dataPtr, 
 	const char *name, const char *cmdName, const char *varName, 
 	int *newPtr);
 
-BLT_EXTERN void Blt_Vec_UpdateRange(Vector *vPtr);
+extern void Blt_Vec_UpdateRange(Vector *vPtr);
 
-BLT_EXTERN void Blt_Vec_UpdateClients(Vector *vPtr);
+extern void Blt_Vec_UpdateClients(Vector *vPtr);
 
-BLT_EXTERN void Blt_Vec_FlushCache(Vector *vPtr);
+extern void Blt_Vec_FlushCache(Vector *vPtr);
 
-BLT_EXTERN int Blt_Vec_Reset(Vector *vPtr, double *dataArr,
+extern int Blt_Vec_Reset(Vector *vPtr, double *dataArr,
 	int nValues, int arraySize, Tcl_FreeProc *freeProc);
 
-BLT_EXTERN int  Blt_Vec_GetIndex(Tcl_Interp *interp, Vector *vPtr, 
+extern int  Blt_Vec_GetIndex(Tcl_Interp *interp, Vector *vPtr, 
 	const char *string, int *indexPtr, int flags, 
 	Blt_VectorIndexProc **procPtrPtr);
 
-BLT_EXTERN int  Blt_Vec_GetIndexRange(Tcl_Interp *interp, Vector *vPtr, 
+extern int  Blt_Vec_GetIndexRange(Tcl_Interp *interp, Vector *vPtr, 
 	const char *string, int flags, Blt_VectorIndexProc **procPtrPtr);
 
-BLT_EXTERN int Blt_Vec_MapVariable(Tcl_Interp *interp, Vector *vPtr, 
+extern int Blt_Vec_MapVariable(Tcl_Interp *interp, Vector *vPtr, 
 	const char *name);
 
-BLT_EXTERN int Blt_Vec_FFT(Tcl_Interp *interp, Vector *realPtr,
+extern int Blt_Vec_FFT(Tcl_Interp *interp, Vector *realPtr,
 	Vector *phasesPtr, Vector *freqPtr, double delta, 
 	int flags, Vector *srcPtr);
 
-BLT_EXTERN int Blt_Vec_InverseFFT(Tcl_Interp *interp, Vector *iSrcPtr, 
+extern int Blt_Vec_InverseFFT(Tcl_Interp *interp, Vector *iSrcPtr, 
 	Vector *rDestPtr, Vector *iDestPtr, Vector *srcPtr);
 
-BLT_EXTERN Tcl_ObjCmdProc Blt_Vec_InstCmd;
+extern Tcl_ObjCmdProc Blt_Vec_InstCmd;
 
-BLT_EXTERN Tcl_VarTraceProc Blt_Vec_VarTrace;
+extern Tcl_VarTraceProc Blt_Vec_VarTrace;
 
-BLT_EXTERN Tcl_IdleProc Blt_Vec_NotifyClients;
+extern Tcl_IdleProc Blt_Vec_NotifyClients;
 
diff --git a/src/bltVector.h b/src/bltVector.h
index 78eddc5..2ec03bc 100644
--- a/src/bltVector.h
+++ b/src/bltVector.h
@@ -82,56 +82,56 @@ typedef enum {
 #define Blt_VecSize(v)		((v)->arraySize)
 #define Blt_VecDirty(v)		((v)->dirty)
 
-BLT_EXTERN double Blt_VecMin(Blt_Vector *vPtr);
-BLT_EXTERN double Blt_VecMax(Blt_Vector *vPtr);
+extern double Blt_VecMin(Blt_Vector *vPtr);
+extern double Blt_VecMax(Blt_Vector *vPtr);
 
-BLT_EXTERN Blt_VectorId Blt_AllocVectorId(Tcl_Interp *interp, 
+extern Blt_VectorId Blt_AllocVectorId(Tcl_Interp *interp, 
 	const char *vecName);
 
-BLT_EXTERN void Blt_SetVectorChangedProc(Blt_VectorId clientId, 
+extern void Blt_SetVectorChangedProc(Blt_VectorId clientId, 
 	Blt_VectorChangedProc *proc, ClientData clientData);
 
-BLT_EXTERN void Blt_FreeVectorId(Blt_VectorId clientId);
+extern void Blt_FreeVectorId(Blt_VectorId clientId);
 
-BLT_EXTERN int Blt_GetVectorById(Tcl_Interp *interp, Blt_VectorId clientId, 
+extern int Blt_GetVectorById(Tcl_Interp *interp, Blt_VectorId clientId, 
 	Blt_Vector **vecPtrPtr);
 
-BLT_EXTERN const char *Blt_NameOfVectorId(Blt_VectorId clientId);
+extern const char *Blt_NameOfVectorId(Blt_VectorId clientId);
 
-BLT_EXTERN const char *Blt_NameOfVector(Blt_Vector *vecPtr);
+extern const char *Blt_NameOfVector(Blt_Vector *vecPtr);
 
-BLT_EXTERN int Blt_VectorNotifyPending(Blt_VectorId clientId);
+extern int Blt_VectorNotifyPending(Blt_VectorId clientId);
 
-BLT_EXTERN int Blt_CreateVector(Tcl_Interp *interp, const char *vecName, 
+extern int Blt_CreateVector(Tcl_Interp *interp, const char *vecName, 
 	int size, Blt_Vector ** vecPtrPtr);
 
-BLT_EXTERN int Blt_CreateVector2(Tcl_Interp *interp, const char *vecName, 
+extern int Blt_CreateVector2(Tcl_Interp *interp, const char *vecName, 
 	const char *cmdName, const char *varName, int initialSize, 
 	Blt_Vector **vecPtrPtr);
 
-BLT_EXTERN int Blt_GetVector(Tcl_Interp *interp, const char *vecName, 
+extern int Blt_GetVector(Tcl_Interp *interp, const char *vecName, 
 	Blt_Vector **vecPtrPtr);
 
-BLT_EXTERN int Blt_GetVectorFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+extern int Blt_GetVectorFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
 	Blt_Vector **vecPtrPtr);
 
-BLT_EXTERN int Blt_VectorExists(Tcl_Interp *interp, const char *vecName);
+extern int Blt_VectorExists(Tcl_Interp *interp, const char *vecName);
 
-BLT_EXTERN int Blt_ResetVector(Blt_Vector *vecPtr, double *dataArr, int n, 
+extern int Blt_ResetVector(Blt_Vector *vecPtr, double *dataArr, int n, 
 	int arraySize, Tcl_FreeProc *freeProc);
 
-BLT_EXTERN int Blt_ResizeVector(Blt_Vector *vecPtr, int n);
+extern int Blt_ResizeVector(Blt_Vector *vecPtr, int n);
 
-BLT_EXTERN int Blt_DeleteVectorByName(Tcl_Interp *interp, const char *vecName);
+extern int Blt_DeleteVectorByName(Tcl_Interp *interp, const char *vecName);
 
-BLT_EXTERN int Blt_DeleteVector(Blt_Vector *vecPtr);
+extern int Blt_DeleteVector(Blt_Vector *vecPtr);
 
-BLT_EXTERN int Blt_ExprVector(Tcl_Interp *interp, char *expr, 
+extern int Blt_ExprVector(Tcl_Interp *interp, char *expr, 
 	Blt_Vector *vecPtr);
 
-BLT_EXTERN void Blt_InstallIndexProc(Tcl_Interp *interp, const char *indexName,
+extern void Blt_InstallIndexProc(Tcl_Interp *interp, const char *indexName,
 	Blt_VectorIndexProc * procPtr);
 
-BLT_EXTERN int Blt_VectorExists2(Tcl_Interp *interp, const char *vecName);
+extern int Blt_VectorExists2(Tcl_Interp *interp, const char *vecName);
 
 #endif /* _BLT_VECTOR_H */