diff --git a/tdbcmysql/generic/mysqlStubInit.c b/tdbcmysql/generic/mysqlStubInit.c
index 3f4164f..6eb0214 100644
--- a/tdbcmysql/generic/mysqlStubInit.c
+++ b/tdbcmysql/generic/mysqlStubInit.c
@@ -29,7 +29,7 @@
  * Names of the libraries that might contain the MySQL API
  */
 
-static const char* mysqlStubLibNames[] = {
+static const char *const mysqlStubLibNames[] = {
     /* @LIBNAMES@: DO NOT EDIT THESE NAMES */
     "libmysqlclient_r", "libmysqlclient", "libmysql", NULL
     /* @END@ */
@@ -37,13 +37,13 @@ static const char* mysqlStubLibNames[] = {
 
 /* ABI Version numbers of the MySQL API that we can cope with */
 
-static const char* mysqlSuffixes[] = {
-    "", ".16", ".15", NULL
+static const char *const mysqlSuffixes[] = {
+    "", ".18", ".17", ".16", ".15", NULL
 };
 
 /* Names of the functions that we need from MySQL */
 
-static const char* mysqlSymbolNames[] = {
+static const char *const mysqlSymbolNames[] = {
     /* @SYMNAMES@: DO NOT EDIT THESE NAMES */
     "mysql_server_init",
     "mysql_server_end",
diff --git a/tdbcmysql/generic/tdbcmysql.c b/tdbcmysql/generic/tdbcmysql.c
index 506142e..0c5b929 100644
--- a/tdbcmysql/generic/tdbcmysql.c
+++ b/tdbcmysql/generic/tdbcmysql.c
@@ -363,14 +363,14 @@ static const struct {
 
 /* Tables of isolation levels: Tcl, SQL, and MySQL 'tx_isolation' */
 
-static const char* TclIsolationLevels[] = {
+static const char *const TclIsolationLevels[] = {
     "readuncommitted",
     "readcommitted",
     "repeatableread",
     "serializable",
     NULL
 };
-static const char* SqlIsolationLevels[] = {
+static const char *const SqlIsolationLevels[] = {
     "SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED",
     "SET TRANSACTION ISOLATION LEVEL READ COMMITTED",
     "SET TRANSACTION ISOLATION LEVEL REPEATABLE READ",
diff --git a/tdbcodbc/generic/odbcStubInit.c b/tdbcodbc/generic/odbcStubInit.c
index edf9460..608f4e4 100644
--- a/tdbcodbc/generic/odbcStubInit.c
+++ b/tdbcodbc/generic/odbcStubInit.c
@@ -29,12 +29,12 @@
  * Names of the libraries that might contain the ODBC API
  */
 
-static const char* odbcStubLibNames[] = {
+static const char *const odbcStubLibNames[] = {
     /* @LIBNAMES@: DO NOT EDIT THESE NAMES */
     "odbc32", "odbc", "libodbc32", "libodbc", NULL
     /* @END@ */
 };
-static const char* odbcOptLibNames[] = {
+static const char *const odbcOptLibNames[] = {
     "odbccp", "odbccp32", "odbcinst", 
     "libodbccp", "libodbccp32", "libodbcinst", NULL
 };
@@ -43,7 +43,7 @@ static const char* odbcOptLibNames[] = {
  * Names of the functions that we need from ODBC
  */
 
-static const char* odbcSymbolNames[] = {
+static const char *const odbcSymbolNames[] = {
     /* @SYMNAMES@: DO NOT EDIT THESE NAMES */
     "SQLAllocHandle",
     "SQLBindParameter",
diff --git a/tdbcoracle/generic/tdbcoracle.c b/tdbcoracle/generic/tdbcoracle.c
index cfaa3e0..1b88475 100644
--- a/tdbcoracle/generic/tdbcoracle.c
+++ b/tdbcoracle/generic/tdbcoracle.c
@@ -274,13 +274,13 @@ static const struct {
 
 /* Tables of isolation levels: Tcl, SQL, and MySQL 'tx_isolation' */
 
-static const char* TclIsolationLevels[] = {
+static const char *const TclIsolationLevels[] = {
     "readcommitted",
     "serializable",
     NULL
 };
 
-static const char* SqlIsolationLevels[] = {
+static const char *const SqlIsolationLevels[] = {
     "SET TRANSACTION ISOLATION LEVEL READ COMMITTED",
     "SET TRANSACTION ISOLATION LEVEL SERIALIZABLE",
     NULL
diff --git a/tdbcpostgres/generic/pqStubInit.c b/tdbcpostgres/generic/pqStubInit.c
index 9ceca2e..ef51978 100644
--- a/tdbcpostgres/generic/pqStubInit.c
+++ b/tdbcpostgres/generic/pqStubInit.c
@@ -29,7 +29,7 @@
  * ABI version numbers of the PostgreSQL API that we can cope with.
  */
 
-static const char* pqSuffixes[] = {
+static const char *const pqSuffixes[] = {
     "", ".5", NULL
 };
 
@@ -37,7 +37,7 @@ static const char* pqSuffixes[] = {
  * Names of the libraries that might contain the PostgreSQL API
  */
 
-static const char* pqStubLibNames[] = {
+static const char *const pqStubLibNames[] = {
     /* @LIBNAMES@: DO NOT EDIT THESE NAMES */
     "libpq", NULL
     /* @END@ */
@@ -47,7 +47,7 @@ static const char* pqStubLibNames[] = {
  * Names of the functions that we need from PostgreSQL
  */
 
-static const char* pqSymbolNames[] = {
+static const char *const pqSymbolNames[] = {
     /* @SYMNAMES@: DO NOT EDIT THESE NAMES */
     "pg_encoding_to_char",
     "PQclear",
diff --git a/tdbcpostgres/generic/tdbcpostgres.c b/tdbcpostgres/generic/tdbcpostgres.c
index a033403..5539804 100644
--- a/tdbcpostgres/generic/tdbcpostgres.c
+++ b/tdbcpostgres/generic/tdbcpostgres.c
@@ -62,7 +62,7 @@ static Tcl_LoadHandle pgLoadHandle = NULL;
 
 /* Pool of literal values used to avoid excess Tcl_NewStringObj calls */
 
-const char* LiteralValues[] = {
+static const char *const LiteralValues[] = {
     "",
     "0",
     "1",
@@ -160,7 +160,7 @@ enum OptStringIndex {
 
 /* Names of string options for Postgres PGconnectdb() */
 
-const char *  optStringNames[] = {
+static const char *const optStringNames[] = {
     "host", "hostaddr", "port", "dbname", "user",
     "password", "options", "tty", "service", "connect_timeout", 
     "sslmode", "requiressl", "krbsrvname"
@@ -367,7 +367,7 @@ typedef struct ResultSetData {
 
 /* Tables of isolation levels: Tcl, SQL and Postgres C API */
 
-static const char* TclIsolationLevels[] = {
+static const char *const TclIsolationLevels[] = {
     "readuncommitted",
     "readcommitted",
     "repeatableread",
@@ -375,7 +375,7 @@ static const char* TclIsolationLevels[] = {
     NULL
 };
 
-static const char* SqlIsolationLevels[] = {
+static const char *const SqlIsolationLevels[] = {
     "SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED",
     "SET TRANSACTION ISOLATION LEVEL READ COMMITTED",
     "SET TRANSACTION ISOLATION LEVEL REPEATABLE READ",