diff --git a/build/names.c b/build/names.c
index d3a1c1d..3d810d5 100644
--- a/build/names.c
+++ b/build/names.c
@@ -176,7 +176,7 @@ int_32 *const getBuildTime(void)
     return buildTime;
 }
 
-const char *const buildHost(void)
+const char * buildHost(void)
 {
     static char hostname[1024];
     static int gotit = 0;
diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index 008f07f..52c6e21 100644
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -140,7 +140,7 @@ gid_t getGidS(const char * gname)	/*@*/;
  * Return build hostname.
  * @return		build hostname
  */
-extern /*@observer@*/ const char * const buildHost(void)	/*@*/;
+extern /*@observer@*/ const char * buildHost(void)	/*@*/;
 
 /** \ingroup rpmbuild
  * Return build time stamp.
diff --git a/lib/cpio.c b/lib/cpio.c
index 4a9cad7..bdd4bd5 100644
--- a/lib/cpio.c
+++ b/lib/cpio.c
@@ -177,7 +177,7 @@ int cpioHeaderRead(FSM_t fsm, struct stat * st)
     return 0;
 }
 
-const char *const cpioStrerror(int rc)
+const char * cpioStrerror(int rc)
 {
     static char msg[256];
     char *s;
diff --git a/lib/cpio.h b/lib/cpio.h
index 183720f..38cd02d 100644
--- a/lib/cpio.h
+++ b/lib/cpio.h
@@ -131,7 +131,7 @@ int cpioHeaderRead(FSM_t fsm, struct stat * st)
  * @param rc		error code
  * @return		formatted error string
  */
-/*@observer@*/ const char *const cpioStrerror(int rc)		/*@*/;
+/*@observer@*/ const char * cpioStrerror(int rc)		/*@*/;
 
 #ifdef __cplusplus
 }
diff --git a/lib/depends.c b/lib/depends.c
index 9a46a41..85d1951 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -1668,7 +1668,7 @@ static void markLoop(/*@special@*/ tsortInfo tsi,
     }
 }
 
-static inline /*@observer@*/ const char * const identifyDepend(int_32 f)
+static inline /*@observer@*/ const char * identifyDepend(int_32 f)
 {
     if (isLegacyPreReq(f))
 	return "PreReq:";
diff --git a/lib/fsm.c b/lib/fsm.c
index 9569a0f..3731e75 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -2128,7 +2128,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
 }
 /*@=compmempass@*/
 
-/*@obserever@*/ const char *const fileActionString(fileAction a)
+/*@obserever@*/ const char * fileActionString(fileAction a)
 {
     switch (a) {
     case FA_UNKNOWN:	return "unknown";
@@ -2148,7 +2148,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     /*@notreached@*/
 }
 
-/*@observer@*/ const char *const fileStageString(fileStage a) {
+/*@observer@*/ const char * fileStageString(fileStage a) {
     switch(a) {
     case FSM_UNKNOWN:	return "unknown";
 
diff --git a/lib/fsm.h b/lib/fsm.h
index 651bfff..051c7a9 100644
--- a/lib/fsm.h
+++ b/lib/fsm.h
@@ -178,14 +178,14 @@ extern "C" {
  * @param a		file stage
  * @return		formatted string
  */
-/*@observer@*/ const char *const fileStageString(fileStage a)	/*@*/;
+/*@observer@*/ const char * fileStageString(fileStage a)	/*@*/;
 
 /**
  * Return formatted string representation of file disposition.
  * @param a		file dispostion
  * @return		formatted string
  */
-/*@observer@*/ const char *const fileActionString(fileAction a)	/*@*/;
+/*@observer@*/ const char * fileActionString(fileAction a)	/*@*/;
 /*@=exportlocal@*/
 
 /**
diff --git a/lib/psm.c b/lib/psm.c
index 3b7c17f..70b9e8a 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -281,7 +281,7 @@ void freeFi(TFI_t fi)
     /*@=nullstate@*/
 }
 
-/*@observer@*/ const char *const fiTypeString(TFI_t fi)
+/*@observer@*/ const char * fiTypeString(TFI_t fi)
 {
     switch(fi->type) {
     case TR_ADDED:	return " install";
@@ -840,7 +840,7 @@ static char * SCRIPT_PATH =
  * @param tag		scriptlet tag
  * @return		name of scriptlet
  */
-static /*@observer@*/ const char * const tag2sln(int tag)
+static /*@observer@*/ const char * tag2sln(int tag)
 	/*@*/
 {
     switch (tag) {
@@ -1362,7 +1362,7 @@ static int runImmedTriggers(PSM_t psm)
     return rc;
 }
 
-/*@observer@*/ static const char *const pkgStageString(pkgStage a)
+/*@observer@*/ static const char * pkgStageString(pkgStage a)
 	/*@*/
 {
     switch(a) {
diff --git a/lib/psm.h b/lib/psm.h
index c544533..689ddda 100644
--- a/lib/psm.h
+++ b/lib/psm.h
@@ -217,7 +217,7 @@ void freeFi(TFI_t fi)
  * @param fi		transaction element file info
  * @return		formatted string
  */
-/*@observer@*/ const char *const fiTypeString(/*@partial@*/TFI_t fi)
+/*@observer@*/ const char * fiTypeString(/*@partial@*/TFI_t fi)
 	/*@*/;
 
 /**
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 148e52e..3d387fe 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -1597,7 +1597,7 @@ int rpmRunTransactions(rpmTransactionSet ts,
  * @return		name of tag
  */
 /*@-redecl@*/
-/*@observer@*/ extern const char *const tagName(int tag)
+/*@observer@*/ extern const char * tagName(int tag)
 	/*@*/;
 /*@=redecl@*/
 
diff --git a/lib/transaction.c b/lib/transaction.c
index a0dd37c..ce84321 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -270,7 +270,7 @@ void rpmProblemSetFree(rpmProblemSet probs)
     free(probs);
 }
 
-static /*@observer@*/ const char *const ftstring (fileTypes ft)
+static /*@observer@*/ const char * ftstring (fileTypes ft)
 	/*@*/
 {
     switch (ft) {
diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c
index 7833385..de6354a 100644
--- a/rpmdb/dbconfig.c
+++ b/rpmdb/dbconfig.c
@@ -539,7 +539,7 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
     /*@=globstate@*/
 }
 
-const char *const prDbiOpenFlags(int dbflags, int print_dbenv_flags)
+const char * prDbiOpenFlags(int dbflags, int print_dbenv_flags)
 {
     static char buf[256];
     struct dbOption *opt;
diff --git a/rpmdb/header.c b/rpmdb/header.c
index ee47b88..db7268d 100644
--- a/rpmdb/header.c
+++ b/rpmdb/header.c
@@ -23,7 +23,7 @@
 #include "debug.h"
 
 /*@-redecl@*/	/* FIX: avoid rpmlib.h, need for debugging. */
-/*@observer@*/ const char *const tagName(int tag)	/*@*/;
+/*@observer@*/ const char * tagName(int tag)	/*@*/;
 /*@=redecl@*/
 
 /*@access entryInfo @*/
diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
index c321e14..ea15028 100644
--- a/rpmdb/rpmdb.h
+++ b/rpmdb/rpmdb.h
@@ -372,7 +372,7 @@ extern "C" {
  * @return			formatted flags (static buffer)
  */
 /*@-redecl@*/
-/*@exposed@*/ extern const char *const prDbiOpenFlags(int dbflags,
+/*@exposed@*/ extern const char * prDbiOpenFlags(int dbflags,
 						int print_dbenv_flags)
 	/*@*/;
 /*@=redecl@*/
diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c
index 030f03a..5591d2c 100644
--- a/rpmdb/tagname.c
+++ b/rpmdb/tagname.c
@@ -7,7 +7,7 @@
 #include "rpmlib.h"
 #include "debug.h"
 
-const char *const tagName(int tag)
+const char * tagName(int tag)
 {
     int i;
     static char nameBuf[128];	/* XXX yuk */
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index b7288c4..b44fe17 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -648,7 +648,7 @@ fprintf(stderr, "*** read: fd %p rc %d EOF errno %d %s \"%s\"\n", fd, rc, errno,
 /* =============================================================== */
 /* Support for FTP/HTTP I/O.
  */
-const char *const ftpStrerror(int errorNumber) {
+const char * ftpStrerror(int errorNumber) {
   switch (errorNumber) {
     case 0:
 	return _("Success");
diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h
index 54924a6..bbcff98 100644
--- a/rpmio/rpmio.h
+++ b/rpmio/rpmio.h
@@ -560,7 +560,7 @@ typedef enum ftperrCode_e {
 /**
  */
 /*@-redecl@*/
-/*@observer@*/ const char *const ftpStrerror(int errorNumber)	/*@*/;
+/*@observer@*/ const char * ftpStrerror(int errorNumber)	/*@*/;
 /*@=redecl@*/
 
 /**