diff --git a/icu4c/source/common/punycode.c b/icu4c/source/common/punycode.c
index 7f36d6310ef..01e7cf0214e 100644
--- a/icu4c/source/common/punycode.c
+++ b/icu4c/source/common/punycode.c
@@ -86,7 +86,7 @@ Disclaimer and license
  * range 0 to BASE-1. The lowercase form is used unless the uppercase flag is
  * nonzero, in which case the uppercase form is used.
  */
-U_INLINE char
+static U_INLINE char
 digitToBasic(int32_t digit, UBool uppercase) {
     /*  0..25 map to ASCII a..z or A..Z */
     /* 26..35 map to ASCII 0..9         */
@@ -133,7 +133,7 @@ basicToDigit[256]={
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
 
-U_INLINE char
+static U_INLINE char
 asciiCaseMap(char b, UBool uppercase) {
     if(uppercase) {
         if(_SMALL_A<=b && b<=_SMALL_Z) {
diff --git a/icu4c/source/i18n/ucol.cpp b/icu4c/source/i18n/ucol.cpp
index 39b97dcf8f7..d376231c81c 100644
--- a/icu4c/source/i18n/ucol.cpp
+++ b/icu4c/source/i18n/ucol.cpp
@@ -6095,7 +6095,8 @@ ucol_resizeLatinOneTable(UCollator *coll, int32_t size, UErrorCode *status) {
     return TRUE;
 }
 
-UBool ucol_setUpLatinOne(UCollator *coll, UErrorCode *status) {
+static UBool
+ucol_setUpLatinOne(UCollator *coll, UErrorCode *status) {
   UBool result = TRUE;
   if(coll->latinOneCEs == NULL) {
     coll->latinOneCEs = (uint32_t *)uprv_malloc(sizeof(uint32_t)*UCOL_LATINONETABLELEN*3);
diff --git a/icu4c/source/i18n/ucurr.cpp b/icu4c/source/i18n/ucurr.cpp
index 9447d66b09e..f91611c9887 100644
--- a/icu4c/source/i18n/ucurr.cpp
+++ b/icu4c/source/i18n/ucurr.cpp
@@ -210,7 +210,8 @@ CReg* CReg::gHead = 0;
 
 // -------------------------------------
 
-void idForLocale(const char* locale, char* buffer, int capacity, UErrorCode* ec) {
+static void
+idForLocale(const char* locale, char* buffer, int capacity, UErrorCode* ec) {
   // !!! this is internal only, assumes buffer is not null and capacity is sufficient
   // Extract the country name and variant name.  We only
   // recognize two variant names, EURO and PREEURO.
diff --git a/icu4c/source/tools/genpname/Makefile.in b/icu4c/source/tools/genpname/Makefile.in
index 27f52cd2770..e2fe09a81d3 100644
--- a/icu4c/source/tools/genpname/Makefile.in
+++ b/icu4c/source/tools/genpname/Makefile.in
@@ -16,11 +16,8 @@ include $(top_builddir)/icudefs.mk
 ## Build directory information
 subdir = tools/genpname
 
-ICUDATADIR=$(top_builddir)/data
-UNICODEDATADIR=$(top_srcdir)/../data/unidata
-
 ## Extra files to remove for 'make clean'
-CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES)
+CLEANFILES = *~ $(DEPS) $(OBJECTS) $(TARGET)
 
 ## Target information
 TARGET = genpname$(EXEEXT)