diff --git a/src/grpck.c b/src/grpck.c
index 7accac94..881fb4de 100644
--- a/src/grpck.c
+++ b/src/grpck.c
@@ -455,7 +455,7 @@ static void check_grp_file (int *errors, bool *changed)
 	struct commonio_entry *gre, *tgre;
 	struct group *grp;
 #ifdef SHADOWGRP
-	struct sgrp *sgr;
+	const struct sgrp *sgr;
 #endif
 
 	/*
@@ -596,7 +596,7 @@ static void check_grp_file (int *errors, bool *changed)
 		 */
 
 		if (is_shadow) {
-			sgr = (struct sgrp *) sgr_locate (grp->gr_name);
+			sgr = sgr_locate (grp->gr_name);
 			if (sgr == NULL) {
 				printf (_("no matching group file entry in %s\n"),
 				        sgr_file);
@@ -663,7 +663,7 @@ static void check_grp_file (int *errors, bool *changed)
  */
 static void check_sgr_file (int *errors, bool *changed)
 {
-	struct group *grp;
+	const struct group *grp;
 	struct commonio_entry *sge, *tsge;
 	struct sgrp *sgr;
 
@@ -758,7 +758,7 @@ static void check_sgr_file (int *errors, bool *changed)
 		/*
 		 * Make sure this entry exists in the /etc/group file.
 		 */
-		grp = (struct group *) gr_locate (sgr->sg_name);
+		grp = gr_locate (sgr->sg_name);
 		if (grp == NULL) {
 			printf (_("no matching group file entry in %s\n"),
 			        grp_file);
diff --git a/src/pwck.c b/src/pwck.c
index ee1df500..28209131 100644
--- a/src/pwck.c
+++ b/src/pwck.c
@@ -366,7 +366,7 @@ static void check_pw_file (int *errors, bool *changed)
 {
 	struct commonio_entry *pfe, *tpfe;
 	struct passwd *pwd;
-	struct spwd *spw;
+	const struct spwd *spw;
 	uid_t min_sys_id = (uid_t) getdef_ulong ("SYS_UID_MIN", 101UL);
 	uid_t max_sys_id = (uid_t) getdef_ulong ("SYS_UID_MAX", 999UL);
 
@@ -584,7 +584,7 @@ static void check_pw_file (int *errors, bool *changed)
 				spw_opened = true;
 			}
 #endif				/* WITH_TCB */
-			spw = (struct spwd *) spw_locate (pwd->pw_name);
+			spw = spw_locate (pwd->pw_name);
 			if (NULL == spw) {
 				printf (_("no matching password file entry in %s\n"),
 				        spw_dbname ());