diff --git a/libs/libc/string/lib_strcat.c b/libs/libc/string/lib_strcat.c
index beb23e2652..33f5a97b73 100644
--- a/libs/libc/string/lib_strcat.c
+++ b/libs/libc/string/lib_strcat.c
@@ -32,11 +32,11 @@
 
 #ifndef CONFIG_ARCH_STRCAT
 #undef strcat /* See mm/README.txt */
-char *strcat(char *dest, const char *src)
+FAR char *strcat(FAR char *dest, FAR const char *src)
 {
-  char *ret   = dest;
+  FAR char *ret = dest;
 
-  dest  += strlen(dest);
+  dest += strlen(dest);
   while (*src != '\0')
     {
       *dest++ = *src++;
diff --git a/libs/libc/string/lib_strtokr.c b/libs/libc/string/lib_strtokr.c
index 5193b83b51..f24d3428c2 100644
--- a/libs/libc/string/lib_strtokr.c
+++ b/libs/libc/string/lib_strtokr.c
@@ -77,8 +77,8 @@
 
 FAR char *strtok_r(FAR char *str, FAR const char *delim, FAR char **saveptr)
 {
-  char *pbegin;
-  char *pend = NULL;
+  FAR char *pbegin;
+  FAR char *pend = NULL;
 
   /* Decide if we are starting a new string or continuing from
    * the point we left off.
diff --git a/libs/libc/string/lib_vikmemcpy.c b/libs/libc/string/lib_vikmemcpy.c
index 3e93b175d3..88e5676be7 100644
--- a/libs/libc/string/lib_vikmemcpy.c
+++ b/libs/libc/string/lib_vikmemcpy.c
@@ -51,12 +51,6 @@
  *
  ****************************************************************************/
 
-/****************************************************************************
- * Configuration definitions.
- ****************************************************************************/
-
-#define CONFIG_MEMCPY_INDEXED_COPY
-
 /****************************************************************************
  * Included Files
  ****************************************************************************/