diff --git a/src/folder.c b/src/folder.c
index 811026b3e..d769ae760 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -16,8 +16,8 @@
 
 int sort_by_stringptr (const void *p1, const void *p2)
 {
-  const char **s1 = (const char **) p1;
-  const char **s2 = (const char **) p2;
+  const char* const *s1 = (const char* const *) p1;
+  const char* const *s2 = (const char* const *) p2;
 
   return strcmp (*s1, *s2);
 }
diff --git a/src/induct.c b/src/induct.c
index ba02be91d..c3c06963d 100644
--- a/src/induct.c
+++ b/src/induct.c
@@ -13,8 +13,8 @@
 
 static int sort_by_mtime (const void *p1, const void *p2)
 {
-  const char **f1 = (const char **) p1;
-  const char **f2 = (const char **) p2;
+  const char* const *f1 = (const char* const *) p1;
+  const char* const *f2 = (const char* const *) p2;
 
   hc_stat_t s1;
   hc_stat_t s2;
diff --git a/src/status.c b/src/status.c
index 6225ff59f..784621dca 100644
--- a/src/status.c
+++ b/src/status.c
@@ -69,8 +69,8 @@ static char *status_get_rules_file (const hashcat_ctx_t *hashcat_ctx)
 
 void format_timer_display (struct tm *tm, char *buf, size_t len)
 {
-  const char *time_entities_s[] = { "year",  "day",  "hour",  "min",  "sec"  };
-  const char *time_entities_m[] = { "years", "days", "hours", "mins", "secs" };
+  const char *const time_entities_s[] = { "year",  "day",  "hour",  "min",  "sec"  };
+  const char *const time_entities_m[] = { "years", "days", "hours", "mins", "secs" };
 
   if (tm->tm_year - 70)
   {
diff --git a/src/usage.c b/src/usage.c
index 69a14dd5c..ad69d0fab 100644
--- a/src/usage.c
+++ b/src/usage.c
@@ -8,7 +8,7 @@
 #include "shared.h"
 #include "usage.h"
 
-static const char *USAGE_MINI[] =
+static const char *const USAGE_MINI[] =
 {
   "Usage: %s [options]... hash|hashfile|hccapxfile [dictionary|mask|directory]...",
   "",
@@ -16,7 +16,7 @@ static const char *USAGE_MINI[] =
   NULL
 };
 
-static const char *USAGE_BIG[] =
+static const char *const USAGE_BIG[] =
 {
   "%s - advanced password recovery",
   "",