diff --git a/icu4c/source/common/rbbitblb.cpp b/icu4c/source/common/rbbitblb.cpp
index d423df7e12..ec9780c28e 100644
--- a/icu4c/source/common/rbbitblb.cpp
+++ b/icu4c/source/common/rbbitblb.cpp
@@ -323,7 +323,7 @@ void RBBITableBuilder::calcFollowPos(RBBINode *n) {
 //                            to implement rule chaining.  NOT described by Aho
 //
 //-----------------------------------------------------------------------------
-void RBBITableBuilder::calcChainedFollowPos(RBBINode *fTree) {
+void RBBITableBuilder::calcChainedFollowPos(RBBINode *tree) {
 
     UVector         endMarkerNodes(*fStatus);
     UVector         leafNodes(*fStatus);
@@ -334,16 +334,16 @@ void RBBITableBuilder::calcChainedFollowPos(RBBINode *fTree) {
     }
 
     // get a list of all endmarker nodes.
-    fTree->findNodes(&endMarkerNodes, RBBINode::endMark, *fStatus);
+    tree->findNodes(&endMarkerNodes, RBBINode::endMark, *fStatus);
 
     // get a list all leaf nodes 
-    fTree->findNodes(&leafNodes, RBBINode::leafChar, *fStatus);
+    tree->findNodes(&leafNodes, RBBINode::leafChar, *fStatus);
     if (U_FAILURE(*fStatus)) {
         return;
     }
 
     // Get all nodes that can be the start a match, which is FirstPosition(root)
-    UVector *matchStartNodes = fTree->fFirstPosSet;
+    UVector *matchStartNodes = tree->fFirstPosSet;
 
 
     // Iteratate over all leaf nodes,
diff --git a/icu4c/source/test/intltest/testidna.cpp b/icu4c/source/test/intltest/testidna.cpp
index dd77be40f9..1489e27685 100644
--- a/icu4c/source/test/intltest/testidna.cpp
+++ b/icu4c/source/test/intltest/testidna.cpp
@@ -1643,24 +1643,24 @@ void TestIDNA::TestDataFile(){
      testData(*this);
 }
 TestIDNA::~TestIDNA(){
-    if(prep!=NULL){
-        delete prep;
-        prep = NULL;
+    if(gPrep!=NULL){
+        delete gPrep;
+        gPrep = NULL;
     }
 }
 
-NamePrepTransform* TestIDNA::prep = NULL;
+NamePrepTransform* TestIDNA::gPrep = NULL;
 
 NamePrepTransform* TestIDNA::getInstance(UErrorCode& status){
-    if(TestIDNA::prep == NULL){
+    if(TestIDNA::gPrep == NULL){
         UParseError parseError;
-        TestIDNA::prep = NamePrepTransform::createInstance(parseError, status);
-        if(TestIDNA::prep ==NULL){
+        TestIDNA::gPrep = NamePrepTransform::createInstance(parseError, status);
+        if(TestIDNA::gPrep ==NULL){
            //status = U_MEMORY_ALLOCATION_ERROR;
            return NULL;
         }
     }
-    return TestIDNA::prep;
+    return TestIDNA::gPrep;
 
 }
 #endif /* #if !UCONFIG_NO_IDNA */
diff --git a/icu4c/source/test/intltest/testidna.h b/icu4c/source/test/intltest/testidna.h
index 0691be679e..022f7d73f9 100644
--- a/icu4c/source/test/intltest/testidna.h
+++ b/icu4c/source/test/intltest/testidna.h
@@ -64,7 +64,7 @@ public:
     void TestIDNAMonkeyTest();
     void TestConformance();
     static NamePrepTransform* getInstance(UErrorCode& status);
-    static NamePrepTransform* prep;
+    static NamePrepTransform* gPrep;
     virtual ~TestIDNA();
 
 private:
diff --git a/icu4c/source/tools/pkgdata/pkgdata.c b/icu4c/source/tools/pkgdata/pkgdata.c
index a74b6d4dbe..002b6f8e4e 100644
--- a/icu4c/source/tools/pkgdata/pkgdata.c
+++ b/icu4c/source/tools/pkgdata/pkgdata.c
@@ -605,7 +605,7 @@ static void loadLists(UPKGOptions *o, UErrorCode *status)
 }
 
 /* Try calling icu-config directly to get information */
-void fillInMakefileFromICUConfig(UOption *option)
+static void fillInMakefileFromICUConfig(UOption *option)
 {
 #if U_HAVE_POPEN
     FILE *p;