diff --git a/icu4c/source/extra/ustdio/loccache.c b/icu4c/source/extra/ustdio/loccache.c
index c814139672..3686a7c89f 100644
--- a/icu4c/source/extra/ustdio/loccache.c
+++ b/icu4c/source/extra/ustdio/loccache.c
@@ -96,12 +96,13 @@ u_loccache_get(const char *loc)
     return result;
 }
 
-static loccache_cleanup()
+static UBool loccache_cleanup()
 {
     if (gLocaleCache) {
         uhash_close(gLocaleCache);
         gLocaleCache = NULL;
     }
+    return TRUE;                   /* Everything was cleaned up */
 }
 
 static UBool ustdio_cleanup(void)
diff --git a/icu4c/source/extra/ustdio/ustdio.c b/icu4c/source/extra/ustdio/ustdio.c
index 5a9df2ff04..fa22c61ff0 100644
--- a/icu4c/source/extra/ustdio/ustdio.c
+++ b/icu4c/source/extra/ustdio/ustdio.c
@@ -106,7 +106,7 @@ u_fsettransliterator(UFILE *file, UFileDirection direction,
 }
 
 
-const UChar * u_file_translit(UFILE *f, const UChar *src, int32_t *count, UBool flush)
+static const UChar * u_file_translit(UFILE *f, const UChar *src, int32_t *count, UBool flush)
 {
     int32_t newlen;
     int32_t junkCount = 0;
diff --git a/icu4c/source/i18n/nfrule.h b/icu4c/source/i18n/nfrule.h
index 9e7818166e..fe61fd2a17 100644
--- a/icu4c/source/i18n/nfrule.h
+++ b/icu4c/source/i18n/nfrule.h
@@ -50,7 +50,7 @@ public:
     UBool operator==(const NFRule& rhs) const;
     UBool operator!=(const NFRule& rhs) const { return !operator==(rhs); }
 
-    ERuleType getType() const { return (ERuleType)(baseValue <= 0 ? baseValue : kOtherRule); }
+    ERuleType getType() const { return (ERuleType)(baseValue <= kNoBase ? (ERuleType)baseValue : kOtherRule); }
     void setType(ERuleType ruleType) { baseValue = (int32_t)ruleType; }
 
     int64_t getBaseValue() const { return baseValue; }