change file names

73 files changed, 330 insertions, 330 deletions

diff --git a/configure b/configure
index 6c72589..d4ed255 100755
--- a/configure
+++ b/configure
@@ -5534,48 +5534,48 @@ src/tkbltConfig.C
 src/tkbltGrAxis.C
 src/tkbltGrAxisOp.C
 src/tkbltGrAxisOption.C
-src/bltGrBind.C
-src/bltGrElemOp.C
-src/bltGrElemOption.C
-src/bltGrElem.C
-src/bltGrElemBar.C
-src/bltGrElemLine.C
-src/bltGrElemLineSpline.C
-src/bltGrHairs.C
-src/bltGrHairsOp.C
-src/bltGrLegd.C
-src/bltGrLegdOp.C
-src/bltGrMarkerOp.C
-src/bltGrMarkerOption.C
-src/bltGrMarker.C
-src/bltGrMarkerLine.C
-src/bltGrMarkerPolygon.C
-src/bltGrMarkerText.C
-src/bltGrMisc.C
-src/bltGrPenOp.C
-src/bltGrPenOption.C
-src/bltGrPen.C
-src/bltGrPenBar.C
-src/bltGrPenLine.C
-src/bltGrPostscript.C
-src/bltGrPostscriptOp.C
-src/bltGrPSOutput.C
-src/bltGrText.C
-src/bltGrXAxisOp.C
-src/bltGraph.C
-src/bltGraphBar.C
-src/bltGraphLine.C
-src/bltGraphOp.C
-src/bltGraphSup.C
-src/bltInt.C
-src/bltNsUtil.C
-src/bltParse.C
-src/bltOp.C
-src/bltSwitch.C
-src/bltVecCmd.C
-src/bltVecOp.C
-src/bltVecMath.C
-src/bltVector.C
+src/tkbltGrBind.C
+src/tkbltGrElemOp.C
+src/tkbltGrElemOption.C
+src/tkbltGrElem.C
+src/tkbltGrElemBar.C
+src/tkbltGrElemLine.C
+src/tkbltGrElemLineSpline.C
+src/tkbltGrHairs.C
+src/tkbltGrHairsOp.C
+src/tkbltGrLegd.C
+src/tkbltGrLegdOp.C
+src/tkbltGrMarkerOp.C
+src/tkbltGrMarkerOption.C
+src/tkbltGrMarker.C
+src/tkbltGrMarkerLine.C
+src/tkbltGrMarkerPolygon.C
+src/tkbltGrMarkerText.C
+src/tkbltGrMisc.C
+src/tkbltGrPenOp.C
+src/tkbltGrPenOption.C
+src/tkbltGrPen.C
+src/tkbltGrPenBar.C
+src/tkbltGrPenLine.C
+src/tkbltGrPostscript.C
+src/tkbltGrPostscriptOp.C
+src/tkbltGrPSOutput.C
+src/tkbltGrText.C
+src/tkbltGrXAxisOp.C
+src/tkbltGraph.C
+src/tkbltGraphBar.C
+src/tkbltGraphLine.C
+src/tkbltGraphOp.C
+src/tkbltGraphSup.C
+src/tkbltInt.C
+src/tkbltNsUtil.C
+src/tkbltParse.C
+src/tkbltOp.C
+src/tkbltSwitch.C
+src/tkbltVecCmd.C
+src/tkbltVecOp.C
+src/tkbltVecMath.C
+src/tkbltVector.C
 "
     for i in $vars; do
 	case $i in
diff --git a/configure.in b/configure.in
index e0b92c7..1f15ba1 100755
--- a/configure.in
+++ b/configure.in
@@ -76,48 +76,48 @@ src/tkbltConfig.C
 src/tkbltGrAxis.C
 src/tkbltGrAxisOp.C
 src/tkbltGrAxisOption.C
-src/bltGrBind.C
-src/bltGrElemOp.C
-src/bltGrElemOption.C
-src/bltGrElem.C
-src/bltGrElemBar.C
-src/bltGrElemLine.C
-src/bltGrElemLineSpline.C
-src/bltGrHairs.C
-src/bltGrHairsOp.C
-src/bltGrLegd.C
-src/bltGrLegdOp.C
-src/bltGrMarkerOp.C
-src/bltGrMarkerOption.C
-src/bltGrMarker.C
-src/bltGrMarkerLine.C
-src/bltGrMarkerPolygon.C
-src/bltGrMarkerText.C
-src/bltGrMisc.C
-src/bltGrPenOp.C
-src/bltGrPenOption.C
-src/bltGrPen.C
-src/bltGrPenBar.C
-src/bltGrPenLine.C
-src/bltGrPostscript.C
-src/bltGrPostscriptOp.C
-src/bltGrPSOutput.C
-src/bltGrText.C
-src/bltGrXAxisOp.C
-src/bltGraph.C
-src/bltGraphBar.C
-src/bltGraphLine.C
-src/bltGraphOp.C
-src/bltGraphSup.C
-src/bltInt.C
-src/bltNsUtil.C
-src/bltParse.C
-src/bltOp.C
-src/bltSwitch.C
-src/bltVecCmd.C
-src/bltVecOp.C
-src/bltVecMath.C
-src/bltVector.C
+src/tkbltGrBind.C
+src/tkbltGrElemOp.C
+src/tkbltGrElemOption.C
+src/tkbltGrElem.C
+src/tkbltGrElemBar.C
+src/tkbltGrElemLine.C
+src/tkbltGrElemLineSpline.C
+src/tkbltGrHairs.C
+src/tkbltGrHairsOp.C
+src/tkbltGrLegd.C
+src/tkbltGrLegdOp.C
+src/tkbltGrMarkerOp.C
+src/tkbltGrMarkerOption.C
+src/tkbltGrMarker.C
+src/tkbltGrMarkerLine.C
+src/tkbltGrMarkerPolygon.C
+src/tkbltGrMarkerText.C
+src/tkbltGrMisc.C
+src/tkbltGrPenOp.C
+src/tkbltGrPenOption.C
+src/tkbltGrPen.C
+src/tkbltGrPenBar.C
+src/tkbltGrPenLine.C
+src/tkbltGrPostscript.C
+src/tkbltGrPostscriptOp.C
+src/tkbltGrPSOutput.C
+src/tkbltGrText.C
+src/tkbltGrXAxisOp.C
+src/tkbltGraph.C
+src/tkbltGraphBar.C
+src/tkbltGraphLine.C
+src/tkbltGraphOp.C
+src/tkbltGraphSup.C
+src/tkbltInt.C
+src/tkbltNsUtil.C
+src/tkbltParse.C
+src/tkbltOp.C
+src/tkbltSwitch.C
+src/tkbltVecCmd.C
+src/tkbltVecOp.C
+src/tkbltVecMath.C
+src/tkbltVector.C
 ])
 TEA_ADD_HEADERS([src/tkbltVector.h])
 TEA_ADD_INCLUDES([-I./src])
diff --git a/src/tkbltConfig.C b/src/tkbltConfig.C
index 18d1134..82fea4e 100644
--- a/src/tkbltConfig.C
+++ b/src/tkbltConfig.C
@@ -40,7 +40,7 @@
 #include <string.h>
 
 #include "tkbltConfig.h"
-#include "bltGrMisc.h"
+#include "tkbltGrMisc.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrAxis.C b/src/tkbltGrAxis.C
index dd30a62..430d13b 100644
--- a/src/tkbltGrAxis.C
+++ b/src/tkbltGrAxis.C
@@ -32,15 +32,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bltGraph.h"
-#include "bltGrBind.h"
+#include "tkbltGraph.h"
+#include "tkbltGrBind.h"
 #include "tkbltGrAxis.h"
 #include "tkbltGrAxisOption.h"
-#include "bltGrPostscript.h"
-#include "bltGrMisc.h"
-#include "bltGrDef.h"
+#include "tkbltGrPostscript.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrDef.h"
 #include "tkbltConfig.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrPSOutput.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrAxis.h b/src/tkbltGrAxis.h
index 475715b..2e35d3f 100644
--- a/src/tkbltGrAxis.h
+++ b/src/tkbltGrAxis.h
@@ -37,9 +37,9 @@
 
 #include "tkbltChain.h"
 
-#include "bltGrMisc.h"
-#include "bltGrText.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrText.h"
+#include "tkbltGrPSOutput.h"
 
 namespace Blt {
   class Graph;
diff --git a/src/tkbltGrAxisOp.C b/src/tkbltGrAxisOp.C
index 5b070d3..f5102a5 100644
--- a/src/tkbltGrAxisOp.C
+++ b/src/tkbltGrAxisOp.C
@@ -30,11 +30,11 @@
 #include <math.h>
 #include <string.h>
 
-#include "bltGrBind.h"
-#include "bltGraph.h"
+#include "tkbltGrBind.h"
+#include "tkbltGraph.h"
 #include "tkbltGrAxis.h"
 #include "tkbltGrAxisOp.h"
-#include "bltGrMisc.h"
+#include "tkbltGrMisc.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrAxisOp.h b/src/tkbltGrAxisOp.h
index f2ef45c..777aea7 100644
--- a/src/tkbltGrAxisOp.h
+++ b/src/tkbltGrAxisOp.h
@@ -30,7 +30,7 @@
 #ifndef __BltGrAxisOp_h__
 #define __BltGrAxisOp_h__
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 
 namespace Blt {
   extern const Ensemble axisEnsemble[];
diff --git a/src/tkbltGrAxisOption.C b/src/tkbltGrAxisOption.C
index ffd8b4a..7c396c6 100644
--- a/src/tkbltGrAxisOption.C
+++ b/src/tkbltGrAxisOption.C
@@ -30,7 +30,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 #include "tkbltGrAxis.h"
 #include "tkbltGrAxisOption.h"
 #include "tkbltConfig.h"
diff --git a/src/tkbltGrBind.C b/src/tkbltGrBind.C
index b80456d..2873c8f 100644
--- a/src/tkbltGrBind.C
+++ b/src/tkbltGrBind.C
@@ -34,9 +34,9 @@
 #include <iomanip>
 using namespace std;
 
-#include "bltGrBind.h"
-#include "bltGraph.h"
-#include "bltGrLegd.h"
+#include "tkbltGrBind.h"
+#include "tkbltGraph.h"
+#include "tkbltGrLegd.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrBind.h b/src/tkbltGrBind.h
index 3fe020e..7947210 100644
--- a/src/tkbltGrBind.h
+++ b/src/tkbltGrBind.h
@@ -32,7 +32,7 @@
 
 #include <tk.h>
 
-#include "bltGrMisc.h"
+#include "tkbltGrMisc.h"
 
 namespace Blt {
   class Graph;
diff --git a/src/tkbltGrElem.C b/src/tkbltGrElem.C
index 018a4f1..3591e85 100644
--- a/src/tkbltGrElem.C
+++ b/src/tkbltGrElem.C
@@ -32,10 +32,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bltGraph.h"
-#include "bltGrBind.h"
-#include "bltGrElem.h"
-#include "bltGrPen.h"
+#include "tkbltGraph.h"
+#include "tkbltGrBind.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrPen.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrElem.h b/src/tkbltGrElem.h
index 19b2ab1..eabc9e9 100644
--- a/src/tkbltGrElem.h
+++ b/src/tkbltGrElem.h
@@ -35,9 +35,9 @@
 #include "tkbltVector.h"
 #include "tkbltChain.h"
 
-#include "bltGrMisc.h"
-#include "bltGrPen.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrPen.h"
+#include "tkbltGrPSOutput.h"
 
 #define SHOW_NONE	0
 #define SHOW_X		1
diff --git a/src/tkbltGrElemBar.C b/src/tkbltGrElemBar.C
index a1a1acb..5f72c22 100644
--- a/src/tkbltGrElemBar.C
+++ b/src/tkbltGrElemBar.C
@@ -32,14 +32,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bltGraphBar.h"
-#include "bltGrElemBar.h"
-#include "bltGrElemOption.h"
+#include "tkbltGraphBar.h"
+#include "tkbltGrElemBar.h"
+#include "tkbltGrElemOption.h"
 #include "tkbltGrAxis.h"
-#include "bltGrMisc.h"
-#include "bltGrDef.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrDef.h"
 #include "tkbltConfig.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrPSOutput.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrElemBar.h b/src/tkbltGrElemBar.h
index 9274fb0..7e018af 100644
--- a/src/tkbltGrElemBar.h
+++ b/src/tkbltGrElemBar.h
@@ -34,8 +34,8 @@
 
 #include <tk.h>
 
-#include "bltGrElem.h"
-#include "bltGrPenBar.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrPenBar.h"
 
 namespace Blt {
 
diff --git a/src/tkbltGrElemLine.C b/src/tkbltGrElemLine.C
index 15154b0..91e4c5b 100644
--- a/src/tkbltGrElemLine.C
+++ b/src/tkbltGrElemLine.C
@@ -32,14 +32,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bltGraph.h"
-#include "bltGrElemLine.h"
-#include "bltGrElemOption.h"
+#include "tkbltGraph.h"
+#include "tkbltGrElemLine.h"
+#include "tkbltGrElemOption.h"
 #include "tkbltGrAxis.h"
-#include "bltGrMisc.h"
-#include "bltGrDef.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrDef.h"
 #include "tkbltConfig.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrPSOutput.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrElemLine.h b/src/tkbltGrElemLine.h
index 963fbe6..f937615 100644
--- a/src/tkbltGrElemLine.h
+++ b/src/tkbltGrElemLine.h
@@ -32,9 +32,9 @@
 
 #include <tk.h>
 
-#include "bltGraph.h"
-#include "bltGrElem.h"
-#include "bltGrPenLine.h"
+#include "tkbltGraph.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrPenLine.h"
 
 namespace Blt {
 
diff --git a/src/tkbltGrElemLineSpline.C b/src/tkbltGrElemLineSpline.C
index a50d976..0e4c3d9 100644
--- a/src/tkbltGrElemLineSpline.C
+++ b/src/tkbltGrElemLineSpline.C
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bltGrElemLine.h"
+#include "tkbltGrElemLine.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrElemOp.C b/src/tkbltGrElemOp.C
index b1da872..445f31b 100644
--- a/src/tkbltGrElemOp.C
+++ b/src/tkbltGrElemOp.C
@@ -29,14 +29,14 @@
 
 #include <string.h>
 
-#include "bltGrBind.h"
-#include "bltGraph.h"
+#include "tkbltGrBind.h"
+#include "tkbltGraph.h"
 #include "tkbltGrAxis.h"
-#include "bltGrElem.h"
-#include "bltGrElemOp.h"
-#include "bltGrElemBar.h"
-#include "bltGrElemLine.h"
-#include "bltGrLegd.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrElemOp.h"
+#include "tkbltGrElemBar.h"
+#include "tkbltGrElemLine.h"
+#include "tkbltGrLegd.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrElemOp.h b/src/tkbltGrElemOp.h
index 3301d92..b596b11 100644
--- a/src/tkbltGrElemOp.h
+++ b/src/tkbltGrElemOp.h
@@ -30,7 +30,7 @@
 #ifndef __BltGrElemOp_h__
 #define __BltGrElemOp_h__
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 
 namespace Blt {
   extern const Ensemble elementEnsemble[];
diff --git a/src/tkbltGrElemOption.C b/src/tkbltGrElemOption.C
index 9bbb7ef..bb98975 100644
--- a/src/tkbltGrElemOption.C
+++ b/src/tkbltGrElemOption.C
@@ -34,10 +34,10 @@
 
 #include "tkbltChain.h"
 
-#include "bltGraph.h"
-#include "bltGrElem.h"
-#include "bltGrElemOption.h"
-#include "bltGrPen.h"
+#include "tkbltGraph.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrElemOption.h"
+#include "tkbltGrPen.h"
 #include "tkbltConfig.h"
 
 using namespace Blt;
diff --git a/src/tkbltGrHairs.C b/src/tkbltGrHairs.C
index 3c16393..d7ea3d2 100644
--- a/src/tkbltGrHairs.C
+++ b/src/tkbltGrHairs.C
@@ -32,8 +32,8 @@
 
 #include <stdlib.h>
 
-#include "bltGraph.h"
-#include "bltGrHairs.h"
+#include "tkbltGraph.h"
+#include "tkbltGrHairs.h"
 #include "tkbltConfig.h"
 
 using namespace Blt;
diff --git a/src/tkbltGrHairs.h b/src/tkbltGrHairs.h
index a8830ca..825cf2a 100644
--- a/src/tkbltGrHairs.h
+++ b/src/tkbltGrHairs.h
@@ -35,7 +35,7 @@
 
 #include <tk.h>
 
-#include "bltGrMisc.h"
+#include "tkbltGrMisc.h"
 
 namespace Blt {
   class Graph;
diff --git a/src/tkbltGrHairsOp.C b/src/tkbltGrHairsOp.C
index f5a250f..57650ce 100644
--- a/src/tkbltGrHairsOp.C
+++ b/src/tkbltGrHairsOp.C
@@ -30,9 +30,9 @@
  *	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "bltGraph.h"
-#include "bltGrHairs.h"
-#include "bltGrHairsOp.h"
+#include "tkbltGraph.h"
+#include "tkbltGrHairs.h"
+#include "tkbltGrHairsOp.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrHairsOp.h b/src/tkbltGrHairsOp.h
index 287bbe9..3f3d009 100644
--- a/src/tkbltGrHairsOp.h
+++ b/src/tkbltGrHairsOp.h
@@ -33,7 +33,7 @@
 #ifndef __BltGrHairsOp_h__
 #define __BltGrHairsOp_h__
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 
 namespace Blt {
   extern const Ensemble crosshairsEnsemble[];
diff --git a/src/tkbltGrLegd.C b/src/tkbltGrLegd.C
index 71ca1e1..e18e6dc 100644
--- a/src/tkbltGrLegd.C
+++ b/src/tkbltGrLegd.C
@@ -30,15 +30,15 @@
 #include <tk.h>
 #include <tkInt.h>
 
-#include "bltGrBind.h"
-#include "bltGraph.h"
-#include "bltGrLegd.h"
-#include "bltGrElem.h"
-#include "bltGrPostscript.h"
-#include "bltGrMisc.h"
-#include "bltGrDef.h"
+#include "tkbltGrBind.h"
+#include "tkbltGraph.h"
+#include "tkbltGrLegd.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrPostscript.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrDef.h"
 #include "tkbltConfig.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrPSOutput.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrLegd.h b/src/tkbltGrLegd.h
index 078933f..66ffbc1 100644
--- a/src/tkbltGrLegd.h
+++ b/src/tkbltGrLegd.h
@@ -35,8 +35,8 @@
 
 #include <tk.h>
 
-#include "bltGrMisc.h"
-#include "bltGrText.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrText.h"
 
 namespace Blt {
   class Graph;
diff --git a/src/tkbltGrLegdOp.C b/src/tkbltGrLegdOp.C
index bdd1bfd..139d2f1 100644
--- a/src/tkbltGrLegdOp.C
+++ b/src/tkbltGrLegdOp.C
@@ -30,11 +30,11 @@
 #include <tk.h>
 #include <tkInt.h>
 
-#include "bltGrBind.h"
-#include "bltGraph.h"
-#include "bltGrLegd.h"
-#include "bltGrLegdOp.h"
-#include "bltGrElem.h"
+#include "tkbltGrBind.h"
+#include "tkbltGraph.h"
+#include "tkbltGrLegd.h"
+#include "tkbltGrLegdOp.h"
+#include "tkbltGrElem.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrLegdOp.h b/src/tkbltGrLegdOp.h
index aa6a1cb..6369a2b 100644
--- a/src/tkbltGrLegdOp.h
+++ b/src/tkbltGrLegdOp.h
@@ -30,7 +30,7 @@
 #ifndef __BltGrLegdOp_h__
 #define __BltGrLegdOp_h__
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 
 namespace Blt {
   extern const Ensemble legendEnsemble[];
diff --git a/src/tkbltGrMarker.C b/src/tkbltGrMarker.C
index 7edd119..1b6e1a5 100644
--- a/src/tkbltGrMarker.C
+++ b/src/tkbltGrMarker.C
@@ -31,11 +31,11 @@
 #include <math.h>
 #include <float.h>
 
-#include "bltGraph.h"
-#include "bltGrBind.h"
-#include "bltGrMarker.h"
+#include "tkbltGraph.h"
+#include "tkbltGrBind.h"
+#include "tkbltGrMarker.h"
 #include "tkbltGrAxis.h"
-#include "bltGrMisc.h"
+#include "tkbltGrMisc.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrMarker.h b/src/tkbltGrMarker.h
index 8207968..573357d 100644
--- a/src/tkbltGrMarker.h
+++ b/src/tkbltGrMarker.h
@@ -34,8 +34,8 @@
 
 #include "tkbltChain.h"
 
-#include "bltGrMisc.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrPSOutput.h"
 
 namespace Blt {
   class Graph;
diff --git a/src/tkbltGrMarkerLine.C b/src/tkbltGrMarkerLine.C
index ced16ad..b88c64e 100644
--- a/src/tkbltGrMarkerLine.C
+++ b/src/tkbltGrMarkerLine.C
@@ -31,13 +31,13 @@
 #include <float.h>
 #include <stdlib.h>
 
-#include "bltGraph.h"
-#include "bltGrMarkerLine.h"
-#include "bltGrMarkerOption.h"
-#include "bltGrMisc.h"
-#include "bltGrDef.h"
+#include "tkbltGraph.h"
+#include "tkbltGrMarkerLine.h"
+#include "tkbltGrMarkerOption.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrDef.h"
 #include "tkbltConfig.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrPSOutput.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrMarkerLine.h b/src/tkbltGrMarkerLine.h
index b692c06..3191951 100644
--- a/src/tkbltGrMarkerLine.h
+++ b/src/tkbltGrMarkerLine.h
@@ -30,7 +30,7 @@
 #ifndef __BltGrMarkerLine_h__
 #define __BltGrMarkerLine_h__
 
-#include "bltGrMarker.h"
+#include "tkbltGrMarker.h"
 
 namespace Blt {
 
diff --git a/src/tkbltGrMarkerOp.C b/src/tkbltGrMarkerOp.C
index 06d7ef2..20933ab 100644
--- a/src/tkbltGrMarkerOp.C
+++ b/src/tkbltGrMarkerOp.C
@@ -29,14 +29,14 @@
 
 #include <string.h>
 
-#include "bltGrBind.h"
-#include "bltGraph.h"
-#include "bltGrElem.h"
-#include "bltGrMarkerOp.h"
-#include "bltGrMarker.h"
-#include "bltGrMarkerLine.h"
-#include "bltGrMarkerPolygon.h"
-#include "bltGrMarkerText.h"
+#include "tkbltGrBind.h"
+#include "tkbltGraph.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrMarkerOp.h"
+#include "tkbltGrMarker.h"
+#include "tkbltGrMarkerLine.h"
+#include "tkbltGrMarkerPolygon.h"
+#include "tkbltGrMarkerText.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrMarkerOp.h b/src/tkbltGrMarkerOp.h
index 6051882..6f7c16f 100644
--- a/src/tkbltGrMarkerOp.h
+++ b/src/tkbltGrMarkerOp.h
@@ -30,7 +30,7 @@
 #ifndef __Blt_GrMarkerOp_h__
 #define __Blt_GrMarkerOp_h__
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 
 namespace Blt {
   extern const Ensemble markerEnsemble[];
diff --git a/src/tkbltGrMarkerOption.C b/src/tkbltGrMarkerOption.C
index c7eef13..b6eab57 100644
--- a/src/tkbltGrMarkerOption.C
+++ b/src/tkbltGrMarkerOption.C
@@ -31,8 +31,8 @@
 #include <string.h>
 #include <float.h>
 
-#include "bltGrMarker.h"
-#include "bltGrMarkerOption.h"
+#include "tkbltGrMarker.h"
+#include "tkbltGrMarkerOption.h"
 #include "tkbltConfig.h"
 
 using namespace Blt;
diff --git a/src/tkbltGrMarkerPolygon.C b/src/tkbltGrMarkerPolygon.C
index 6866fd4..ed655aa 100644
--- a/src/tkbltGrMarkerPolygon.C
+++ b/src/tkbltGrMarkerPolygon.C
@@ -29,13 +29,13 @@
 
 #include <stdlib.h>
 
-#include "bltGraph.h"
-#include "bltGrMarkerPolygon.h"
-#include "bltGrMarkerOption.h"
-#include "bltGrMisc.h"
-#include "bltGrDef.h"
+#include "tkbltGraph.h"
+#include "tkbltGrMarkerPolygon.h"
+#include "tkbltGrMarkerOption.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrDef.h"
 #include "tkbltConfig.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrPSOutput.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrMarkerPolygon.h b/src/tkbltGrMarkerPolygon.h
index f8ca31d..8eb2216 100644
--- a/src/tkbltGrMarkerPolygon.h
+++ b/src/tkbltGrMarkerPolygon.h
@@ -30,7 +30,7 @@
 #ifndef __BltGrMarkerPolygon_h__
 #define __BltGrMarkerPolygon_h__
 
-#include "bltGrMarker.h"
+#include "tkbltGrMarker.h"
 
 namespace Blt {
 
diff --git a/src/tkbltGrMarkerText.C b/src/tkbltGrMarkerText.C
index aa9db3d..048e717 100644
--- a/src/tkbltGrMarkerText.C
+++ b/src/tkbltGrMarkerText.C
@@ -30,13 +30,13 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "bltGraph.h"
-#include "bltGrMarkerText.h"
-#include "bltGrMarkerOption.h"
-#include "bltGrMisc.h"
-#include "bltGrDef.h"
+#include "tkbltGraph.h"
+#include "tkbltGrMarkerText.h"
+#include "tkbltGrMarkerOption.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrDef.h"
 #include "tkbltConfig.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrPSOutput.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrMarkerText.h b/src/tkbltGrMarkerText.h
index 1ffca3f..99dc814 100644
--- a/src/tkbltGrMarkerText.h
+++ b/src/tkbltGrMarkerText.h
@@ -32,7 +32,7 @@
 
 #include <tk.h>
 
-#include "bltGrMarker.h"
+#include "tkbltGrMarker.h"
 
 namespace Blt {
 
diff --git a/src/tkbltGrMisc.C b/src/tkbltGrMisc.C
index 5a06eb8..7ccec93 100644
--- a/src/tkbltGrMisc.C
+++ b/src/tkbltGrMisc.C
@@ -36,8 +36,8 @@
 #include <tk.h>
 #include <tkInt.h>
 
-#include "bltGraph.h"
-#include "bltGrMisc.h"
+#include "tkbltGraph.h"
+#include "tkbltGrMisc.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrPSOutput.C b/src/tkbltGrPSOutput.C
index 6d7f2e1..a90e921 100644
--- a/src/tkbltGrPSOutput.C
+++ b/src/tkbltGrPSOutput.C
@@ -85,9 +85,9 @@ typedef struct TkBorder {
 				 * borderTable. */
 } TkBorder;
 
-#include "bltGraph.h"
-#include "bltGrPostscript.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGraph.h"
+#include "tkbltGrPostscript.h"
+#include "tkbltGrPSOutput.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrPen.C b/src/tkbltGrPen.C
index 05064a0..42851d8 100644
--- a/src/tkbltGrPen.C
+++ b/src/tkbltGrPen.C
@@ -29,8 +29,8 @@
 
 #include <stdlib.h>
 
-#include "bltGrPen.h"
-#include "bltGraph.h"
+#include "tkbltGrPen.h"
+#include "tkbltGraph.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrPen.h b/src/tkbltGrPen.h
index 8c8a4af..003e8dd 100644
--- a/src/tkbltGrPen.h
+++ b/src/tkbltGrPen.h
@@ -32,7 +32,7 @@
 
 #include <tk.h>
 
-#include "bltGrText.h"
+#include "tkbltGrText.h"
 
 namespace Blt {
   class Graph;
diff --git a/src/tkbltGrPenBar.C b/src/tkbltGrPenBar.C
index e387977..8f6e59a 100644
--- a/src/tkbltGrPenBar.C
+++ b/src/tkbltGrPenBar.C
@@ -29,9 +29,9 @@
 
 #include <stdlib.h>
 
-#include "bltGrPenBar.h"
-#include "bltGraph.h"
-#include "bltGrDef.h"
+#include "tkbltGrPenBar.h"
+#include "tkbltGraph.h"
+#include "tkbltGrDef.h"
 #include "tkbltConfig.h"
 
 using namespace Blt;
diff --git a/src/tkbltGrPenBar.h b/src/tkbltGrPenBar.h
index 76cae0b..f39db94 100644
--- a/src/tkbltGrPenBar.h
+++ b/src/tkbltGrPenBar.h
@@ -32,7 +32,7 @@
 
 #include <tk.h>
 
-#include "bltGrPen.h"
+#include "tkbltGrPen.h"
 
 namespace Blt {
 
diff --git a/src/tkbltGrPenLine.C b/src/tkbltGrPenLine.C
index 1af399b..5f15ce8 100644
--- a/src/tkbltGrPenLine.C
+++ b/src/tkbltGrPenLine.C
@@ -30,10 +30,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bltGrPenLine.h"
-#include "bltGraph.h"
-#include "bltGrMisc.h"
-#include "bltGrDef.h"
+#include "tkbltGrPenLine.h"
+#include "tkbltGraph.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrDef.h"
 #include "tkbltConfig.h"
 
 using namespace Blt;
diff --git a/src/tkbltGrPenLine.h b/src/tkbltGrPenLine.h
index bb8e5cc..63eeeb8 100644
--- a/src/tkbltGrPenLine.h
+++ b/src/tkbltGrPenLine.h
@@ -30,7 +30,7 @@
 #ifndef __BltGrPenLine_h__
 #define __BltGrPenLine_h__
 
-#include "bltGrPen.h"
+#include "tkbltGrPen.h"
 
 namespace Blt {
 
diff --git a/src/tkbltGrPenOp.C b/src/tkbltGrPenOp.C
index e4e7eb9..8c5669d 100644
--- a/src/tkbltGrPenOp.C
+++ b/src/tkbltGrPenOp.C
@@ -27,11 +27,11 @@
  *	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "bltGraph.h"
-#include "bltGrPen.h"
-#include "bltGrPenOp.h"
-#include "bltGrPenLine.h"
-#include "bltGrPenBar.h"
+#include "tkbltGraph.h"
+#include "tkbltGrPen.h"
+#include "tkbltGrPenOp.h"
+#include "tkbltGrPenLine.h"
+#include "tkbltGrPenBar.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrPenOp.h b/src/tkbltGrPenOp.h
index e345d17..5dab592 100644
--- a/src/tkbltGrPenOp.h
+++ b/src/tkbltGrPenOp.h
@@ -30,7 +30,7 @@
 #ifndef __BltGrPenOp_h__
 #define __BltGrPenOp_h__
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 
 namespace Blt {
   extern const Ensemble penEnsemble[];
diff --git a/src/tkbltGrPenOption.C b/src/tkbltGrPenOption.C
index 90f28a6..b1da1b6 100644
--- a/src/tkbltGrPenOption.C
+++ b/src/tkbltGrPenOption.C
@@ -27,8 +27,8 @@
  *	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "bltGraph.h"
-#include "bltGrPen.h"
+#include "tkbltGraph.h"
+#include "tkbltGrPen.h"
 #include "tkbltConfig.h"
 
 using namespace Blt;
diff --git a/src/tkbltGrPostscript.C b/src/tkbltGrPostscript.C
index a0fb6e9..4bbf504 100644
--- a/src/tkbltGrPostscript.C
+++ b/src/tkbltGrPostscript.C
@@ -29,8 +29,8 @@
 
 #include <stdlib.h>
 
-#include "bltGraph.h"
-#include "bltGrPostscript.h"
+#include "tkbltGraph.h"
+#include "tkbltGrPostscript.h"
 #include "tkbltConfig.h"
 
 using namespace Blt;
diff --git a/src/tkbltGrPostscriptOp.C b/src/tkbltGrPostscriptOp.C
index 4ff9dbc..931feb9 100644
--- a/src/tkbltGrPostscriptOp.C
+++ b/src/tkbltGrPostscriptOp.C
@@ -29,10 +29,10 @@
 
 #include <tk.h>
 
-#include "bltGraph.h"
-#include "bltGrPostscript.h"
-#include "bltGrPostscriptOp.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGraph.h"
+#include "tkbltGrPostscript.h"
+#include "tkbltGrPostscriptOp.h"
+#include "tkbltGrPSOutput.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrPostscriptOp.h b/src/tkbltGrPostscriptOp.h
index 2be79fd..9a81266 100644
--- a/src/tkbltGrPostscriptOp.h
+++ b/src/tkbltGrPostscriptOp.h
@@ -30,7 +30,7 @@
 #ifndef __BltGrPostscriptOp_h__
 #define __BltGrPostscriptOp_h__
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 
 namespace Blt {
   extern const Ensemble postscriptEnsemble[];
diff --git a/src/tkbltGrText.C b/src/tkbltGrText.C
index a0a6d4f..81342a3 100644
--- a/src/tkbltGrText.C
+++ b/src/tkbltGrText.C
@@ -32,9 +32,9 @@
 #include <tk.h>
 #include <tkInt.h>
 
-#include "bltGrText.h"
-#include "bltGraph.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrText.h"
+#include "tkbltGraph.h"
+#include "tkbltGrPSOutput.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGrText.h b/src/tkbltGrText.h
index 930ec49..770e99e 100644
--- a/src/tkbltGrText.h
+++ b/src/tkbltGrText.h
@@ -32,7 +32,7 @@
 
 #include <tk.h>
 
-#include "bltGrMisc.h"
+#include "tkbltGrMisc.h"
 
 namespace Blt {
   class Graph;
diff --git a/src/tkbltGrXAxisOp.C b/src/tkbltGrXAxisOp.C
index 23052b4..b431a43 100644
--- a/src/tkbltGrXAxisOp.C
+++ b/src/tkbltGrXAxisOp.C
@@ -29,9 +29,9 @@
 
 #include <string.h>
 
-#include "bltGraph.h"
-#include "bltGrBind.h"
-#include "bltGrXAxisOp.h"
+#include "tkbltGraph.h"
+#include "tkbltGrBind.h"
+#include "tkbltGrXAxisOp.h"
 #include "tkbltGrAxis.h"
 #include "tkbltGrAxisOp.h"
 
diff --git a/src/tkbltGrXAxisOp.h b/src/tkbltGrXAxisOp.h
index c586d23..b813c83 100644
--- a/src/tkbltGrXAxisOp.h
+++ b/src/tkbltGrXAxisOp.h
@@ -30,7 +30,7 @@
 #ifndef __BltGrXAxisOp_h__
 #define __BltGrXAxisOp_h__
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 
 namespace Blt {
   extern const Ensemble xaxisEnsemble[];
diff --git a/src/tkbltGraph.C b/src/tkbltGraph.C
index 78f13fb..80dbace 100644
--- a/src/tkbltGraph.C
+++ b/src/tkbltGraph.C
@@ -31,25 +31,25 @@
 
 #include <tkInt.h>
 
-#include "bltGraph.h"
-#include "bltGraphOp.h"
+#include "tkbltGraph.h"
+#include "tkbltGraphOp.h"
 
-#include "bltGrBind.h"
+#include "tkbltGrBind.h"
 #include "tkbltGrAxis.h"
 #include "tkbltGrAxisOp.h"
-#include "bltGrXAxisOp.h"
-#include "bltGrPen.h"
-#include "bltGrPenBar.h"
-#include "bltGrPenLine.h"
-#include "bltGrElem.h"
-#include "bltGrElemBar.h"
-#include "bltGrElemLine.h"
-#include "bltGrMarker.h"
-#include "bltGrLegd.h"
-#include "bltGrHairs.h"
-#include "bltGrDef.h"
-#include "bltGrPostscript.h"
-#include "bltGrPSOutput.h"
+#include "tkbltGrXAxisOp.h"
+#include "tkbltGrPen.h"
+#include "tkbltGrPenBar.h"
+#include "tkbltGrPenLine.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrElemBar.h"
+#include "tkbltGrElemLine.h"
+#include "tkbltGrMarker.h"
+#include "tkbltGrLegd.h"
+#include "tkbltGrHairs.h"
+#include "tkbltGrDef.h"
+#include "tkbltGrPostscript.h"
+#include "tkbltGrPSOutput.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGraph.h b/src/tkbltGraph.h
index 7991353..8aece0f 100644
--- a/src/tkbltGraph.h
+++ b/src/tkbltGraph.h
@@ -33,8 +33,8 @@
 #include <tk.h>
 
 #include "tkbltChain.h"
-#include "bltGrMisc.h"
-#include "bltGrText.h"
+#include "tkbltGrMisc.h"
+#include "tkbltGrText.h"
 
 typedef struct Ensemble {
   const char *name;
diff --git a/src/tkbltGraphBar.C b/src/tkbltGraphBar.C
index 5f5a39e..dc8664c 100644
--- a/src/tkbltGraphBar.C
+++ b/src/tkbltGraphBar.C
@@ -29,24 +29,24 @@
 
 #include <stdlib.h>
 
-#include "bltGraphBar.h"
-#include "bltGraphOp.h"
+#include "tkbltGraphBar.h"
+#include "tkbltGraphOp.h"
 
 #include "tkbltGrAxis.h"
-#include "bltGrXAxisOp.h"
-#include "bltGrPen.h"
-#include "bltGrPenOp.h"
-#include "bltGrPenBar.h"
-#include "bltGrPenLine.h"
-#include "bltGrElem.h"
-#include "bltGrElemOp.h"
-#include "bltGrElemBar.h"
-#include "bltGrElemLine.h"
-#include "bltGrMarker.h"
-#include "bltGrLegd.h"
-#include "bltGrHairs.h"
-#include "bltGrPostscript.h"
-#include "bltGrDef.h"
+#include "tkbltGrXAxisOp.h"
+#include "tkbltGrPen.h"
+#include "tkbltGrPenOp.h"
+#include "tkbltGrPenBar.h"
+#include "tkbltGrPenLine.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrElemOp.h"
+#include "tkbltGrElemBar.h"
+#include "tkbltGrElemLine.h"
+#include "tkbltGrMarker.h"
+#include "tkbltGrLegd.h"
+#include "tkbltGrHairs.h"
+#include "tkbltGrPostscript.h"
+#include "tkbltGrDef.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGraphBar.h b/src/tkbltGraphBar.h
index e68593f..252c8d9 100644
--- a/src/tkbltGraphBar.h
+++ b/src/tkbltGraphBar.h
@@ -32,7 +32,7 @@
 
 #include <tk.h>
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 
 namespace Blt {
 
diff --git a/src/tkbltGraphLine.C b/src/tkbltGraphLine.C
index b637758..fe3f5d0 100644
--- a/src/tkbltGraphLine.C
+++ b/src/tkbltGraphLine.C
@@ -29,24 +29,24 @@
 
 #include <stdlib.h>
 
-#include "bltGraphLine.h"
-#include "bltGraphOp.h"
+#include "tkbltGraphLine.h"
+#include "tkbltGraphOp.h"
 
 #include "tkbltGrAxis.h"
-#include "bltGrXAxisOp.h"
-#include "bltGrPen.h"
-#include "bltGrPenOp.h"
-#include "bltGrPenBar.h"
-#include "bltGrPenLine.h"
-#include "bltGrElem.h"
-#include "bltGrElemOp.h"
-#include "bltGrElemBar.h"
-#include "bltGrElemLine.h"
-#include "bltGrMarker.h"
-#include "bltGrLegd.h"
-#include "bltGrHairs.h"
-#include "bltGrPostscript.h"
-#include "bltGrDef.h"
+#include "tkbltGrXAxisOp.h"
+#include "tkbltGrPen.h"
+#include "tkbltGrPenOp.h"
+#include "tkbltGrPenBar.h"
+#include "tkbltGrPenLine.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrElemOp.h"
+#include "tkbltGrElemBar.h"
+#include "tkbltGrElemLine.h"
+#include "tkbltGrMarker.h"
+#include "tkbltGrLegd.h"
+#include "tkbltGrHairs.h"
+#include "tkbltGrPostscript.h"
+#include "tkbltGrDef.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGraphLine.h b/src/tkbltGraphLine.h
index 5fde81a..ea8d2a0 100644
--- a/src/tkbltGraphLine.h
+++ b/src/tkbltGraphLine.h
@@ -32,7 +32,7 @@
 
 #include <tk.h>
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 
 namespace Blt {
 
diff --git a/src/tkbltGraphOp.C b/src/tkbltGraphOp.C
index 042322b..9d4f45b 100644
--- a/src/tkbltGraphOp.C
+++ b/src/tkbltGraphOp.C
@@ -29,26 +29,26 @@
 
 #include <string.h>
 
-#include "bltGraph.h"
-#include "bltGraphLine.h"
-#include "bltGraphBar.h"
-#include "bltGraphOp.h"
+#include "tkbltGraph.h"
+#include "tkbltGraphLine.h"
+#include "tkbltGraphBar.h"
+#include "tkbltGraphOp.h"
 
 #include "tkbltGrAxis.h"
 #include "tkbltGrAxisOp.h"
-#include "bltGrElem.h"
-#include "bltGrElemOp.h"
-#include "bltGrHairs.h"
-#include "bltGrHairsOp.h"
-#include "bltGrLegd.h"
-#include "bltGrLegdOp.h"
-#include "bltGrMarker.h"
-#include "bltGrMarkerOp.h"
-#include "bltGrPostscript.h"
-#include "bltGrPostscriptOp.h"
-#include "bltGrPen.h"
-#include "bltGrPenOp.h"
-#include "bltGrXAxisOp.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrElemOp.h"
+#include "tkbltGrHairs.h"
+#include "tkbltGrHairsOp.h"
+#include "tkbltGrLegd.h"
+#include "tkbltGrLegdOp.h"
+#include "tkbltGrMarker.h"
+#include "tkbltGrMarkerOp.h"
+#include "tkbltGrPostscript.h"
+#include "tkbltGrPostscriptOp.h"
+#include "tkbltGrPen.h"
+#include "tkbltGrPenOp.h"
+#include "tkbltGrXAxisOp.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltGraphSup.C b/src/tkbltGraphSup.C
index b249e17..e51e483 100644
--- a/src/tkbltGraphSup.C
+++ b/src/tkbltGraphSup.C
@@ -31,11 +31,11 @@
 #include <string.h>
 #include <math.h>
 
-#include "bltGraph.h"
+#include "tkbltGraph.h"
 #include "tkbltGrAxis.h"
-#include "bltGrElem.h"
-#include "bltGrLegd.h"
-#include "bltGrMisc.h"
+#include "tkbltGrElem.h"
+#include "tkbltGrLegd.h"
+#include "tkbltGrMisc.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltNsUtil.C b/src/tkbltNsUtil.C
index e1bd9f6..f2ecfa3 100644
--- a/src/tkbltNsUtil.C
+++ b/src/tkbltNsUtil.C
@@ -35,7 +35,7 @@ extern "C" {
 #include <tclInt.h>
 #endif
 
-#include "bltNsUtil.h"
+#include "tkbltNsUtil.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltOp.C b/src/tkbltOp.C
index aee1bff..4199a44 100644
--- a/src/tkbltOp.C
+++ b/src/tkbltOp.C
@@ -29,7 +29,7 @@
 
 #include <string.h>
 
-#include "bltOp.h"
+#include "tkbltOp.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltParse.C b/src/tkbltParse.C
index 111a6bc..095b16a 100644
--- a/src/tkbltParse.C
+++ b/src/tkbltParse.C
@@ -33,7 +33,7 @@ using namespace std;
 
 #include <tcl.h>
 
-#include "bltParse.h"
+#include "tkbltParse.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltSwitch.C b/src/tkbltSwitch.C
index e0fc3b2..bb80663 100644
--- a/src/tkbltSwitch.C
+++ b/src/tkbltSwitch.C
@@ -37,7 +37,7 @@ using namespace std;
 
 #include <tcl.h>
 
-#include "bltSwitch.h"
+#include "tkbltSwitch.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltVecCmd.C b/src/tkbltVecCmd.C
index e4581dc..7d977d1 100644
--- a/src/tkbltVecCmd.C
+++ b/src/tkbltVecCmd.C
@@ -52,10 +52,10 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "bltVecInt.h"
-#include "bltOp.h"
-#include "bltNsUtil.h"
-#include "bltSwitch.h"
+#include "tkbltVecInt.h"
+#include "tkbltOp.h"
+#include "tkbltNsUtil.h"
+#include "tkbltSwitch.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltVecMath.C b/src/tkbltVecMath.C
index 1e79a7b..d5f1f84 100644
--- a/src/tkbltVecMath.C
+++ b/src/tkbltVecMath.C
@@ -36,9 +36,9 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "bltVecInt.h"
-#include "bltNsUtil.h"
-#include "bltParse.h"
+#include "tkbltVecInt.h"
+#include "tkbltNsUtil.h"
+#include "tkbltParse.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltVecOp.C b/src/tkbltVecOp.C
index a382cee..6c84723 100644
--- a/src/tkbltVecOp.C
+++ b/src/tkbltVecOp.C
@@ -29,7 +29,7 @@
 
 #include <tcl.h>
 
-#include "bltVecInt.h"
+#include "tkbltVecInt.h"
 
 using namespace Blt;
 
diff --git a/src/tkbltVector.C b/src/tkbltVector.C
index 51a2596..d812d4d 100644
--- a/src/tkbltVector.C
+++ b/src/tkbltVector.C
@@ -51,10 +51,10 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "bltVecInt.h"
-#include "bltNsUtil.h"
-#include "bltSwitch.h"
-#include "bltOp.h"
+#include "tkbltVecInt.h"
+#include "tkbltNsUtil.h"
+#include "tkbltSwitch.h"
+#include "tkbltOp.h"
 
 using namespace Blt;