diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index ad9c8affb4f..b45c5370598 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -42,9 +42,9 @@ static bool describeOneTableDetails(const char *schemaname,
 									const char *relationname,
 									const char *oid,
 									bool verbose);
-static void add_tablespace_footer(printTableContent *const cont, char relkind,
-								  Oid tablespace, const bool newline);
-static void add_role_attribute(PQExpBuffer buf, const char *const str);
+static void add_tablespace_footer(printTableContent *cont, char relkind,
+								  Oid tablespace, bool newline);
+static void add_role_attribute(PQExpBuffer buf, const char *str);
 static bool listTSParsersVerbose(const char *pattern);
 static bool describeOneTSParser(const char *oid, const char *nspname,
 								const char *prsname);
@@ -3719,7 +3719,7 @@ error_return:
  * footer.
  */
 static void
-add_tablespace_footer(printTableContent *const cont, char relkind,
+add_tablespace_footer(printTableContent *cont, char relkind,
 					  Oid tablespace, const bool newline)
 {
 	/* relkinds for which we support tablespaces */
@@ -3917,7 +3917,7 @@ describeRoles(const char *pattern, bool verbose, bool showSystem)
 }
 
 static void
-add_role_attribute(PQExpBuffer buf, const char *const str)
+add_role_attribute(PQExpBuffer buf, const char *str)
 {
 	if (buf->len > 0)
 		appendPQExpBufferStr(buf, ", ");
@@ -6573,7 +6573,7 @@ listPublications(const char *pattern)
  */
 static bool
 addFooterToPublicationDesc(PQExpBuffer buf, const char *footermsg,
-						   bool as_schema, printTableContent *const cont)
+						   bool as_schema, printTableContent *cont)
 {
 	PGresult   *res;
 	int			count = 0;
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index 4d9b12a7e1c..c08f8cf0f76 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -607,7 +607,7 @@ print_unaligned_vertical(const printTableContent *cont, FILE *fout)
 
 /* draw "line" */
 static void
-_print_horizontal_line(const unsigned int ncolumns, const unsigned int *widths,
+_print_horizontal_line(unsigned int ncolumns, const unsigned int *widths,
 					   unsigned short border, printTextRule pos,
 					   const printTextFormat *format,
 					   FILE *fout)