diff --git a/newlib/libc/ctype/ctype_cp.h b/newlib/libc/ctype/ctype_cp.h
index 7ce0ab33d..004c1e2e8 100644
--- a/newlib/libc/ctype/ctype_cp.h
+++ b/newlib/libc/ctype/ctype_cp.h
@@ -470,9 +470,6 @@
 	_L,	_L,	_L,	_L,	_L,	_L,	_L
 #define _CTYPE_PT154_255 _L
 
-
-extern int __cp_index (const char *charset_ext);
-
 #if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
 
 #ifndef __CYGWIN__
diff --git a/newlib/libc/stdlib/sb_charsets.c b/newlib/libc/stdlib/sb_charsets.c
index 38583e572..961eb1573 100644
--- a/newlib/libc/stdlib/sb_charsets.c
+++ b/newlib/libc/stdlib/sb_charsets.c
@@ -786,7 +786,7 @@ __cp_val_index (int val)
 int
 __cp_index (const char *charset_ext)
 {
-  int cp_idx = __cp_val_index (__micro_atoi (charset_ext));
+  return __cp_val_index (__micro_atoi (charset_ext));
 }
 
 #endif /* _MB_EXTENDED_CHARSETS_WINDOWS */