diff --git a/build/files.c b/build/files.c
index 47625905c2..081db9cc72 100644
--- a/build/files.c
+++ b/build/files.c
@@ -2016,7 +2016,7 @@ static int generateBuildIDs(FileList fl, ARGV_t *files)
 		    if (addsubdir)
 		       argvAddAttr(files, RPMFILE_DIR|RPMFILE_ARTIFACT, buildidsubdir);
 		    if (rc == 0) {
-			char *linkpattern, *targetpattern;
+			const char *linkpattern, *targetpattern;
 			char *linkpath, *targetpath;
 			int dups = 0;
 			if (isDbg) {
@@ -2904,7 +2904,8 @@ static Package cloneDebuginfoPackage(rpmSpec spec, Package pkg, Package maindbg)
  * a (possibly new) debuginfo subpackage */
 static void filterDebuginfoPackage(rpmSpec spec, Package pkg,
 				   Package maindbg, Package dbgsrc,
-				   char *buildroot, char *uniquearch)
+				   const char *buildroot,
+				   const char *uniquearch)
 {
     rpmfi fi;
     ARGV_t files = NULL;
diff --git a/build/parsePrep.c b/build/parsePrep.c
index d92e5cdf05..707d0a6ee9 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -146,7 +146,8 @@ static char *doUntar(rpmSpec spec, uint32_t c, int quietly)
 
     tar = rpmGetPath("%{__tar}", NULL);
     if (compressed != COMPRESSED_NOT) {
-	char *zipper, *t = NULL;
+	char *zipper = NULL;
+	const char *t = NULL;
 	int needtar = 1;
 	int needgemspec = 0;
 
diff --git a/lib/headerfmt.c b/lib/headerfmt.c
index f4c249a26c..6b0372d2c6 100644
--- a/lib/headerfmt.c
+++ b/lib/headerfmt.c
@@ -25,7 +25,7 @@ struct sprintfTag_s {
     rpmTagVal tag;
     int justOne;
     char * format;
-    char * type;
+    const char * type;
 };
 
 typedef enum {
diff --git a/lib/rpmds.c b/lib/rpmds.c
index 610531137d..f7ee763925 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -41,7 +41,7 @@ struct depinfo_s {
     rpmTagVal evrTag;
     rpmTagVal flagTag;
     rpmTagVal ixTag;
-    char *name;
+    const char *name;
     char abrev;
 };
 
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index c411a17fce..12959678cb 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -71,7 +71,7 @@ struct rpmvarValue * next;
 };
 
 struct rpmOption {
-    char * name;
+    const char * name;
     int var;
     int archSpecific;
     int macroize;
@@ -100,7 +100,7 @@ typedef struct canonEntry_s {
  * for giggles, 'key'_canon, 'key'_compat, and 'key'_canon will also work
  */
 typedef struct tableType_s {
-    char * const key;
+    const char *key;
     const int hasCanon;
     const int hasTranslate;
     struct machEquivTable_s equiv;