diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp
index 1229f767d7..609b108e0f 100644
--- a/icu4c/source/common/locmap.cpp
+++ b/icu4c/source/common/locmap.cpp
@@ -4,7 +4,7 @@
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
 */
-// $Revision: 1.17 $
+// $Revision: 1.18 $
 //
 // Provides functionality for mapping between
 // LCID and Posix IDs.
@@ -719,7 +719,7 @@ ILcidPosixMap::hostID(const char* posixID) const
     char     hostID[ULOC_FULLNAME_CAPACITY];
     char    *hostPtr = hostID;
     uint32_t value;
-    uint32_t hostLen = strlen(posixID);
+    int32_t hostLen = (int32_t)(strlen(posixID));
     int32_t  size, hostSize;
 
     // Check for incomplete id. All LCIDs have a default country,
diff --git a/icu4c/source/tools/genrb/genrb.c b/icu4c/source/tools/genrb/genrb.c
index 0d08f416c4..0114bb8e28 100644
--- a/icu4c/source/tools/genrb/genrb.c
+++ b/icu4c/source/tools/genrb/genrb.c
@@ -11,7 +11,7 @@
 * Modification History:
 *
 *   Date        Name        Description
-*   05/25/99    stephen	    Creation.
+*   05/25/99    stephen     Creation.
 *******************************************************************************
 */
 
@@ -41,13 +41,8 @@ U_CDECL_END
 #include "unicode/uloc.h"
 
 /* Protos */
-static void usage(void);
-static void version(void);
 static void processFile(const char *filename, const char* cp, const char *inputDir, const char *outputDir, UErrorCode *status);
 static char* make_res_filename(const char *filename, const char *outputDir, UErrorCode *status);
-static char* make_col_filename(const char *filename, const char *outputDir, UErrorCode *status);
-static void make_col(const char *filename, UErrorCode *status);
-int main(int argc, char **argv);
 
 /* File suffixes */
 #define RES_SUFFIX ".res"
@@ -343,7 +338,7 @@ make_res_filename(const char *filename,
 static char*
 make_col_filename(const char *filename,
                   const char *outputDir,
-		 UErrorCode *status)
+         UErrorCode *status)
 {
   char *basename;
   char *dirname;