diff --git a/icu4c/source/extra/ustdio/ufile.c b/icu4c/source/extra/ustdio/ufile.c
index 33845ad557..751fd926d2 100644
--- a/icu4c/source/extra/ustdio/ufile.c
+++ b/icu4c/source/extra/ustdio/ufile.c
@@ -123,7 +123,7 @@ ufile_lookup_codepage(const char *locale)
   return 0;
 }
 
-UBool hasICUData(const char *cp) {
+static UBool hasICUData(const char *cp) {
     UErrorCode status = U_ZERO_ERROR;
     UConverter *cnv = NULL;
 #if 0
diff --git a/icu4c/source/extra/ustdio/uprintf.c b/icu4c/source/extra/ustdio/uprintf.c
index dd6c00dc00..23e908fea3 100644
--- a/icu4c/source/extra/ustdio/uprintf.c
+++ b/icu4c/source/extra/ustdio/uprintf.c
@@ -1505,6 +1505,9 @@ u_vfprintf_u(    UFILE        *f,
           case ufmt_date:
             args.dateValue = va_arg(ap, UDate);
             break;
+
+          default:
+            break;  /* Should never get here */
           }
         }
 
diff --git a/icu4c/source/extra/ustdio/uscanf.c b/icu4c/source/extra/ustdio/uscanf.c
index ca0766b087..afb23ca5d8 100644
--- a/icu4c/source/extra/ustdio/uscanf.c
+++ b/icu4c/source/extra/ustdio/uscanf.c
@@ -175,6 +175,10 @@ u_scanf_scanset_handler(UFILE             *stream,
             const UChar        *fmt,
             int32_t            *consumed);
 
+int32_t
+u_scanf_skip_leading_ws(UFILE     *stream,
+            UChar     pad);
+
 /* ANSI style formatting */
 /* Use US-ASCII characters only for formatting */
 
@@ -1311,6 +1315,9 @@ u_vfscanf_u(    UFILE        *f,
           case ufmt_ustring:
             args.ptrValue = va_arg(ap, UChar*);
             break;
+
+          default:
+            break;  /* Should never get here */
           }
         }
         /* call the handler function */
diff --git a/icu4c/source/extra/ustdio/uscanset.c b/icu4c/source/extra/ustdio/uscanset.c
index 2ed0937683..356440ed7a 100644
--- a/icu4c/source/extra/ustdio/uscanset.c
+++ b/icu4c/source/extra/ustdio/uscanset.c
@@ -19,7 +19,7 @@
 #include "uscanset.h"
 
 
-UBool
+static UBool
 u_scanf_scanset_add(u_scanf_scanset     *scanset,
             UChar         c)
 {
@@ -32,7 +32,7 @@ u_scanf_scanset_add(u_scanf_scanset     *scanset,
   return TRUE;
 }
 
-UBool
+static UBool
 u_scanf_scanset_addrange(u_scanf_scanset     *scanset,
              UChar             start, 
              UChar             end)