diff --git a/commands/CmdFI.c b/commands/CmdFI.c
index 0b730d8a..21b79c51 100644
--- a/commands/CmdFI.c
+++ b/commands/CmdFI.c
@@ -1824,7 +1824,7 @@ CmdGoto(
     /* are multiple layers drawn at the indicated point.		*/
 
 #ifdef MAGIC_WRAPPER
-    Tcl_SetResult(magicinterp, DBTypeLongName(ttype), NULL);
+    Tcl_SetResult(magicinterp, (char*)DBTypeLongName(ttype), NULL); /* Tcl treats as const */
 #else
     TxPrintf("node %s is type %s\n", s, DBTypeLongName(ttype));
 #endif
diff --git a/commands/CmdRS.c b/commands/CmdRS.c
index c35af018..e6dd8360 100644
--- a/commands/CmdRS.c
+++ b/commands/CmdRS.c
@@ -2534,7 +2534,7 @@ CmdSetLabel(
 		    else
 #ifdef MAGIC_WRAPPER
 		        Tcl_SetResult(magicinterp,
-				DBTypeLongNameTbl[DefaultLabel->lab_type],
+				(char*)DBTypeLongNameTbl[DefaultLabel->lab_type], /* Tcl treats as const */
 				TCL_VOLATILE);
 #else
 		    	TxPrintf("%s\n", DBTypeLongNameTbl[DefaultLabel->lab_type]);
diff --git a/database/DBtechtype.c b/database/DBtechtype.c
index 35a13db4..0a427910 100644
--- a/database/DBtechtype.c
+++ b/database/DBtechtype.c
@@ -45,7 +45,7 @@ HashTable DBTypeAliasTable;
 
     /* Planes and their names */
 int DBNumPlanes;
-char *DBPlaneLongNameTbl[PL_MAXTYPES];
+const char *DBPlaneLongNameTbl[PL_MAXTYPES];
 NameList dbPlaneNameLists = {NULL, NULL, NULL, (ClientData)0, FALSE};
 
 
@@ -116,10 +116,10 @@ NameList *dbTechNameAddOne();
  */
 
 void
-DBTechInitPlane()
+DBTechInitPlane(void)
 {
     DefaultPlane *dpp;
-    char *cp;
+    const char *cp;
 
     /* Clear out any old information */
     if (dbPlaneNameLists.sn_next != NULL)
diff --git a/database/database.h.in b/database/database.h.in
index a800f197..89dc62c8 100644
--- a/database/database.h.in
+++ b/database/database.h.in
@@ -785,7 +785,7 @@ extern int DBTechNamePlane(), DBTechNoisyNamePlane();
 extern PlaneMask DBTechNameMask(), DBTechNoisyNameMask();
 extern PlaneMask DBTechTypesToPlanes();
 extern bool DBTechTypesOnPlane();
-extern void DBTechInitPlane();
+extern void DBTechInitPlane(void);
 extern void DBTypeInit();
 extern void DBTechInitType();
 extern void DBTechInitCompose();
@@ -1059,7 +1059,7 @@ extern int DBNumPlanes;
 extern HashTable	DBTypeAliasTable;
 
     /* Gives the official long name of each plane: */
-extern char		*DBPlaneLongNameTbl[NP];
+extern const char	*DBPlaneLongNameTbl[NP];
 
     /* Gives a short name for each plane: */
 extern const char	*DBPlaneShortName();