diff --git a/icu4c/source/i18n/name2uni.cpp b/icu4c/source/i18n/name2uni.cpp
index 4abf5d03531..264a1badaf9 100644
--- a/icu4c/source/i18n/name2uni.cpp
+++ b/icu4c/source/i18n/name2uni.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2001-2003, International Business Machines
+*   Copyright (C) 2001-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -24,7 +24,7 @@ U_NAMESPACE_BEGIN
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(NameUnicodeTransliterator)
 
-const char CURR_ID[] = "Name-Any";
+static const char CURR_ID[] = "Name-Any";
 
 static const UChar OPEN[] = {92,78,126,123,126,0}; // "\N~{~"
 static const UChar OPEN_DELIM  = 92;  // '\\' first char of OPEN
diff --git a/icu4c/source/i18n/titletrn.cpp b/icu4c/source/i18n/titletrn.cpp
index d50eff07ca8..0bdffc8f286 100644
--- a/icu4c/source/i18n/titletrn.cpp
+++ b/icu4c/source/i18n/titletrn.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2001-2003, International Business Machines
+*   Copyright (C) 2001-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -28,7 +28,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(TitlecaseTransliterator)
 /**
  * ID for this transliterator.
  */
-const char CURR_ID[] = "Any-Title";
+static const char CURR_ID[] = "Any-Title";
 
 /**
  * The set of characters we skip.  These are neither cased nor
diff --git a/icu4c/source/i18n/tolowtrn.cpp b/icu4c/source/i18n/tolowtrn.cpp
index 1f8e6f89bfa..f0ebaea7719 100644
--- a/icu4c/source/i18n/tolowtrn.cpp
+++ b/icu4c/source/i18n/tolowtrn.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2001-2003, International Business Machines
+*   Copyright (C) 2001-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -22,7 +22,7 @@ U_NAMESPACE_BEGIN
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(LowercaseTransliterator)
 
-const char CURR_ID[] = "Any-Lower";
+static const char CURR_ID[] = "Any-Lower";
 
 /**
  * Constructs a transliterator.
diff --git a/icu4c/source/i18n/toupptrn.cpp b/icu4c/source/i18n/toupptrn.cpp
index 9547c31d0b1..4b59737a5cc 100644
--- a/icu4c/source/i18n/toupptrn.cpp
+++ b/icu4c/source/i18n/toupptrn.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2001-2003, International Business Machines
+*   Copyright (C) 2001-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -22,7 +22,7 @@ U_NAMESPACE_BEGIN
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UppercaseTransliterator)
 
-const char CURR_ID[] = "Any-Upper";
+static const char CURR_ID[] = "Any-Upper";
 
 /**
  * Constructs a transliterator.
diff --git a/icu4c/source/i18n/uni2name.cpp b/icu4c/source/i18n/uni2name.cpp
index 1e99cc81db0..3dc8200b3e8 100644
--- a/icu4c/source/i18n/uni2name.cpp
+++ b/icu4c/source/i18n/uni2name.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2001-2003, International Business Machines
+*   Copyright (C) 2001-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -23,7 +23,7 @@ U_NAMESPACE_BEGIN
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UnicodeNameTransliterator)
 
-const char CURR_ID[] = "Any-Name";
+static const char CURR_ID[] = "Any-Name";
 
 static const UChar OPEN_DELIM[] = {92,78,123,0}; // "\N{"
 static const UChar CLOSE_DELIM  = 125; // "}"
diff --git a/icu4c/source/layout/ArabicShaping.cpp b/icu4c/source/layout/ArabicShaping.cpp
index 570ef18c510..e3e89d4b5a7 100644
--- a/icu4c/source/layout/ArabicShaping.cpp
+++ b/icu4c/source/layout/ArabicShaping.cpp
@@ -64,25 +64,25 @@ ArabicShaping::ShapeType ArabicShaping::getShapeType(LEUnicode c)
     return ST_NOSHAPE_NONE;
 }
 
-const LETag isolFeatureTag = LE_ISOL_FEATURE_TAG;
-const LETag initFeatureTag = LE_INIT_FEATURE_TAG;
-const LETag mediFeatureTag = LE_MEDI_FEATURE_TAG;
-const LETag finaFeatureTag = LE_FINA_FEATURE_TAG;
-const LETag ligaFeatureTag = LE_LIGA_FEATURE_TAG;
-const LETag msetFeatureTag = LE_MSET_FEATURE_TAG;
-const LETag markFeatureTag = LE_MARK_FEATURE_TAG;
-const LETag ccmpFeatureTag = LE_CCMP_FEATURE_TAG;
-const LETag rligFeatureTag = LE_RLIG_FEATURE_TAG;
-const LETag caltFeatureTag = LE_CALT_FEATURE_TAG;
-const LETag dligFeatureTag = LE_DLIG_FEATURE_TAG;
-const LETag cswhFeatureTag = LE_CSWH_FEATURE_TAG;
-const LETag cursFeatureTag = LE_CURS_FEATURE_TAG;
-const LETag kernFeatureTag = LE_KERN_FEATURE_TAG;
-const LETag mkmkFeatureTag = LE_MKMK_FEATURE_TAG;
+static const LETag isolFeatureTag = LE_ISOL_FEATURE_TAG;
+static const LETag initFeatureTag = LE_INIT_FEATURE_TAG;
+static const LETag mediFeatureTag = LE_MEDI_FEATURE_TAG;
+static const LETag finaFeatureTag = LE_FINA_FEATURE_TAG;
+static const LETag ligaFeatureTag = LE_LIGA_FEATURE_TAG;
+static const LETag msetFeatureTag = LE_MSET_FEATURE_TAG;
+static const LETag markFeatureTag = LE_MARK_FEATURE_TAG;
+static const LETag ccmpFeatureTag = LE_CCMP_FEATURE_TAG;
+static const LETag rligFeatureTag = LE_RLIG_FEATURE_TAG;
+static const LETag caltFeatureTag = LE_CALT_FEATURE_TAG;
+static const LETag dligFeatureTag = LE_DLIG_FEATURE_TAG;
+static const LETag cswhFeatureTag = LE_CSWH_FEATURE_TAG;
+static const LETag cursFeatureTag = LE_CURS_FEATURE_TAG;
+static const LETag kernFeatureTag = LE_KERN_FEATURE_TAG;
+static const LETag mkmkFeatureTag = LE_MKMK_FEATURE_TAG;
 
-const LETag emptyTag       = 0x00000000; // ''
+static const LETag emptyTag       = 0x00000000; // ''
 
-const LETag featureOrder[] = 
+static const LETag featureOrder[] = 
 {
     ccmpFeatureTag, isolFeatureTag, finaFeatureTag, mediFeatureTag, initFeatureTag, rligFeatureTag,
     caltFeatureTag, ligaFeatureTag, dligFeatureTag, cswhFeatureTag, msetFeatureTag, cursFeatureTag,
diff --git a/icu4c/source/layout/IndicReordering.cpp b/icu4c/source/layout/IndicReordering.cpp
index fda9d406372..472dc17e965 100644
--- a/icu4c/source/layout/IndicReordering.cpp
+++ b/icu4c/source/layout/IndicReordering.cpp
@@ -262,28 +262,28 @@ enum
     C_DOTTED_CIRCLE = 0x25CC
 };
 
-const LETag emptyTag       = 0x00000000; // ''
+static const LETag emptyTag       = 0x00000000; // ''
 
-const LETag nuktFeatureTag = LE_NUKT_FEATURE_TAG;
-const LETag akhnFeatureTag = LE_AKHN_FEATURE_TAG;
-const LETag rphfFeatureTag = LE_RPHF_FEATURE_TAG;
-const LETag blwfFeatureTag = LE_BLWF_FEATURE_TAG;
-const LETag halfFeatureTag = LE_HALF_FEATURE_TAG;
-const LETag pstfFeatureTag = LE_PSTF_FEATURE_TAG;
-const LETag vatuFeatureTag = LE_VATU_FEATURE_TAG;
-const LETag presFeatureTag = LE_PRES_FEATURE_TAG;
-const LETag blwsFeatureTag = LE_BLWS_FEATURE_TAG;
-const LETag abvsFeatureTag = LE_ABVS_FEATURE_TAG;
-const LETag pstsFeatureTag = LE_PSTS_FEATURE_TAG;
-const LETag halnFeatureTag = LE_HALN_FEATURE_TAG;
+static const LETag nuktFeatureTag = LE_NUKT_FEATURE_TAG;
+static const LETag akhnFeatureTag = LE_AKHN_FEATURE_TAG;
+static const LETag rphfFeatureTag = LE_RPHF_FEATURE_TAG;
+static const LETag blwfFeatureTag = LE_BLWF_FEATURE_TAG;
+static const LETag halfFeatureTag = LE_HALF_FEATURE_TAG;
+static const LETag pstfFeatureTag = LE_PSTF_FEATURE_TAG;
+static const LETag vatuFeatureTag = LE_VATU_FEATURE_TAG;
+static const LETag presFeatureTag = LE_PRES_FEATURE_TAG;
+static const LETag blwsFeatureTag = LE_BLWS_FEATURE_TAG;
+static const LETag abvsFeatureTag = LE_ABVS_FEATURE_TAG;
+static const LETag pstsFeatureTag = LE_PSTS_FEATURE_TAG;
+static const LETag halnFeatureTag = LE_HALN_FEATURE_TAG;
 
-const LETag blwmFeatureTag = LE_BLWM_FEATURE_TAG;
-const LETag abvmFeatureTag = LE_ABVM_FEATURE_TAG;
-const LETag distFeatureTag = LE_DIST_FEATURE_TAG;
+static const LETag blwmFeatureTag = LE_BLWM_FEATURE_TAG;
+static const LETag abvmFeatureTag = LE_ABVM_FEATURE_TAG;
+static const LETag distFeatureTag = LE_DIST_FEATURE_TAG;
 
 // These are in the order in which the features need to be applied
 // for correct processing
-const LETag featureOrder[] =
+static const LETag featureOrder[] =
 {
     nuktFeatureTag, akhnFeatureTag, rphfFeatureTag, blwfFeatureTag, halfFeatureTag, pstfFeatureTag,
     vatuFeatureTag, presFeatureTag, blwsFeatureTag, abvsFeatureTag, pstsFeatureTag, halnFeatureTag,
@@ -295,14 +295,14 @@ const LETag featureOrder[] =
 // FIXME: do we want a seperate tag array for each kind of character??
 // FIXME: are there cases where this ordering causes glyphs to get tags
 // that they shouldn't?
-const LETag tagArray[] =
+static const LETag tagArray[] =
 {
     rphfFeatureTag, blwfFeatureTag, halfFeatureTag, pstfFeatureTag, nuktFeatureTag, akhnFeatureTag,
     vatuFeatureTag, presFeatureTag, blwsFeatureTag, abvsFeatureTag, pstsFeatureTag, halnFeatureTag,
     blwmFeatureTag, abvmFeatureTag, distFeatureTag, emptyTag
 };
 
-const le_int8 stateTable[][IndicClassTable::CC_COUNT] =
+static const le_int8 stateTable[][IndicClassTable::CC_COUNT] =
 {
 //   xx  vm  sm  iv  ct  cn  nu  dv  vr  zw
     { 1,  1,  1,  5,  3,  2,  1,  1,  1,  1}, // 0