Index: runtime/src/kmp_settings.cpp
===================================================================
--- runtime/src/kmp_settings.cpp
+++ runtime/src/kmp_settings.cpp
@@ -1898,7 +1898,7 @@
                                      int *out_compact, int *out_offset) {
   char *buffer = NULL; // Copy of env var value.
   char *buf = NULL; // Buffer for strtok_r() function.
-  char *next = NULL; // end of token / start of next.
+  const char *next = NULL; // end of token / start of next.
   const char *start; // start of current token (for err msgs)
   int count = 0; // Counter of parsed integer numbers.
   int number[2]; // Parsed numbers.
@@ -1986,86 +1986,82 @@
   while (*buf != '\0') {
     start = next = buf;
 
-    if (__kmp_match_str("none", buf, CCAST(const char **, &next))) {
+    if (__kmp_match_str("none", buf, &next)) {
       set_type(affinity_none);
 #if OMP_40_ENABLED
       __kmp_nested_proc_bind.bind_types[0] = proc_bind_false;
 #endif
       buf = next;
-    } else if (__kmp_match_str("scatter", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("scatter", buf, &next)) {
       set_type(affinity_scatter);
 #if OMP_40_ENABLED
       __kmp_nested_proc_bind.bind_types[0] = proc_bind_intel;
 #endif
       buf = next;
-    } else if (__kmp_match_str("compact", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("compact", buf, &next)) {
       set_type(affinity_compact);
 #if OMP_40_ENABLED
       __kmp_nested_proc_bind.bind_types[0] = proc_bind_intel;
 #endif
       buf = next;
-    } else if (__kmp_match_str("logical", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("logical", buf, &next)) {
       set_type(affinity_logical);
 #if OMP_40_ENABLED
       __kmp_nested_proc_bind.bind_types[0] = proc_bind_intel;
 #endif
       buf = next;
-    } else if (__kmp_match_str("physical", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("physical", buf, &next)) {
       set_type(affinity_physical);
 #if OMP_40_ENABLED
       __kmp_nested_proc_bind.bind_types[0] = proc_bind_intel;
 #endif
       buf = next;
-    } else if (__kmp_match_str("explicit", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("explicit", buf, &next)) {
       set_type(affinity_explicit);
 #if OMP_40_ENABLED
       __kmp_nested_proc_bind.bind_types[0] = proc_bind_intel;
 #endif
       buf = next;
-    } else if (__kmp_match_str("balanced", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("balanced", buf, &next)) {
       set_type(affinity_balanced);
 #if OMP_40_ENABLED
       __kmp_nested_proc_bind.bind_types[0] = proc_bind_intel;
 #endif
       buf = next;
-    } else if (__kmp_match_str("disabled", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("disabled", buf, &next)) {
       set_type(affinity_disabled);
 #if OMP_40_ENABLED
       __kmp_nested_proc_bind.bind_types[0] = proc_bind_false;
 #endif
       buf = next;
-    } else if (__kmp_match_str("verbose", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("verbose", buf, &next)) {
       set_verbose(TRUE);
       buf = next;
-    } else if (__kmp_match_str("noverbose", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("noverbose", buf, &next)) {
       set_verbose(FALSE);
       buf = next;
-    } else if (__kmp_match_str("warnings", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("warnings", buf, &next)) {
       set_warnings(TRUE);
       buf = next;
-    } else if (__kmp_match_str("nowarnings", buf,
-                               CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("nowarnings", buf, &next)) {
       set_warnings(FALSE);
       buf = next;
-    } else if (__kmp_match_str("respect", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("respect", buf, &next)) {
       set_respect(TRUE);
       buf = next;
-    } else if (__kmp_match_str("norespect", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("norespect", buf, &next)) {
       set_respect(FALSE);
       buf = next;
-    } else if (__kmp_match_str("duplicates", buf,
-                               CCAST(const char **, &next)) ||
-               __kmp_match_str("dups", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("duplicates", buf, &next) ||
+               __kmp_match_str("dups", buf, &next)) {
       set_dups(TRUE);
       buf = next;
-    } else if (__kmp_match_str("noduplicates", buf,
-                               CCAST(const char **, &next)) ||
-               __kmp_match_str("nodups", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("noduplicates", buf, &next) ||
+               __kmp_match_str("nodups", buf, &next)) {
       set_dups(FALSE);
       buf = next;
-    } else if (__kmp_match_str("granularity", buf,
-                               CCAST(const char **, &next)) ||
-               __kmp_match_str("gran", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("granularity", buf, &next) ||
+               __kmp_match_str("gran", buf, &next)) {
       SKIP_WS(next);
       if (*next != '=') {
         EMIT_WARN(TRUE, (AffInvalidParam, name, start));
@@ -2075,23 +2071,23 @@
       SKIP_WS(next);
 
       buf = next;
-      if (__kmp_match_str("fine", buf, CCAST(const char **, &next))) {
+      if (__kmp_match_str("fine", buf, &next)) {
         set_gran(affinity_gran_fine, -1);
         buf = next;
-      } else if (__kmp_match_str("thread", buf, CCAST(const char **, &next))) {
+      } else if (__kmp_match_str("thread", buf, &next)) {
         set_gran(affinity_gran_thread, -1);
         buf = next;
-      } else if (__kmp_match_str("core", buf, CCAST(const char **, &next))) {
+      } else if (__kmp_match_str("core", buf, &next)) {
         set_gran(affinity_gran_core, -1);
         buf = next;
-      } else if (__kmp_match_str("package", buf, CCAST(const char **, &next))) {
+      } else if (__kmp_match_str("package", buf, &next)) {
         set_gran(affinity_gran_package, -1);
         buf = next;
-      } else if (__kmp_match_str("node", buf, CCAST(const char **, &next))) {
+      } else if (__kmp_match_str("node", buf, &next)) {
         set_gran(affinity_gran_node, -1);
         buf = next;
 #if KMP_GROUP_AFFINITY
-      } else if (__kmp_match_str("group", buf, CCAST(const char **, &next))) {
+      } else if (__kmp_match_str("group", buf, &next)) {
         set_gran(affinity_gran_group, -1);
         buf = next;
 #endif /* KMP_GROUP AFFINITY */
@@ -2107,7 +2103,7 @@
         EMIT_WARN(TRUE, (AffInvalidParam, name, start));
         continue;
       }
-    } else if (__kmp_match_str("proclist", buf, CCAST(const char **, &next))) {
+    } else if (__kmp_match_str("proclist", buf, &next)) {
       char *temp_proclist;
 
       SKIP_WS(next);
@@ -2123,8 +2119,8 @@
       }
       next++; // skip '['
       buf = next;
-      if (!__kmp_parse_affinity_proc_id_list(
-              name, buf, CCAST(const char **, &next), &temp_proclist)) {
+      if (!__kmp_parse_affinity_proc_id_list(name, buf, &next,
+                                             &temp_proclist)) {
         // warning already emitted.
         SKIP_TO(next, ']');
         if (*next == ']')
@@ -3298,15 +3294,15 @@
     if (length > INT_MAX) {
       KMP_WARNING(LongValue, name);
     } else {
-      char *semicolon;
+      const char *semicolon;
       if (value[length - 1] == '"' || value[length - 1] == '\'')
         KMP_WARNING(UnbalancedQuotes, name);
       do {
         char sentinel;
 
-        semicolon = CCAST(char *, strchr(value, ';'));
+        semicolon = strchr(value, ';');
         if (*value && semicolon != value) {
-          char *comma = CCAST(char *, strchr(value, ','));
+          const char *comma = strchr(value, ',');
 
           if (comma) {
             ++comma;
@@ -3371,7 +3367,7 @@
   if (value) {
     length = KMP_STRLEN(value);
     if (length) {
-      char *comma = CCAST(char *, strchr(value, ','));
+      const char *comma = strchr(value, ',');
       if (value[length - 1] == '"' || value[length - 1] == '\'')
         KMP_WARNING(UnbalancedQuotes, name);
       /* get the specified scheduling style */
Index: runtime/src/kmp_utility.cpp
===================================================================
--- runtime/src/kmp_utility.cpp
+++ runtime/src/kmp_utility.cpp
@@ -96,14 +96,13 @@
     ) {
 
   double value = 0.0;
-  char const *unit = NULL;
+  char *unit = NULL;
   kmp_uint64 result = 0; /* Zero is a better unknown value than all ones. */
 
   if (frequency == NULL) {
     return result;
   }
-  value = strtod(frequency,
-                 CCAST(char **, &unit)); // strtod() does not like "const"
+  value = strtod(frequency, &unit);
   if (0 < value &&
       value <= DBL_MAX) { // Good value (not overflow, underflow, etc).
     if (strcmp(unit, "MHz") == 0) {