diff --git a/icu4c/source/common/unicode/bytestriebuilder.h b/icu4c/source/common/unicode/bytestriebuilder.h
index 6bbd8a212bb..d00ab9b3b09 100644
--- a/icu4c/source/common/unicode/bytestriebuilder.h
+++ b/icu4c/source/common/unicode/bytestriebuilder.h
@@ -1,6 +1,6 @@
 /*
 *******************************************************************************
-*   Copyright (C) 2010-2013, International Business Machines
+*   Copyright (C) 2010-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  bytestriebuilder.h
@@ -141,7 +141,6 @@ private:
     virtual int32_t getMinLinearMatch() const { return BytesTrie::kMinLinearMatch; }
     virtual int32_t getMaxLinearMatchLength() const { return BytesTrie::kMaxLinearMatchLength; }
 
-#ifndef U_HIDE_INTERNAL_API
     /**
      * @internal
      */
@@ -153,7 +152,6 @@ private:
     private:
         const char *s;
     };
-#endif  /* U_HIDE_INTERNAL_API */
 
     virtual Node *createLinearMatchNode(int32_t i, int32_t byteIndex, int32_t length,
                                         Node *nextNode) const;
diff --git a/icu4c/source/common/unicode/locid.h b/icu4c/source/common/unicode/locid.h
index 96b8d2a6435..35461929db0 100644
--- a/icu4c/source/common/unicode/locid.h
+++ b/icu4c/source/common/unicode/locid.h
@@ -493,6 +493,7 @@ public:
      */
     uint32_t        getLCID(void) const;
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Returns whether this locale's script is written right-to-left.
      * If there is no script subtag, then the likely script is used, see uloc_addLikelySubtags().
@@ -507,6 +508,7 @@ public:
      * @draft ICU 54
      */
     UBool isRightToLeft() const;
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Fills in "dispLang" with the name of this locale's language in a format suitable for
diff --git a/icu4c/source/common/unicode/putil.h b/icu4c/source/common/unicode/putil.h
index 47471b6e420..df1b17bad0f 100644
--- a/icu4c/source/common/unicode/putil.h
+++ b/icu4c/source/common/unicode/putil.h
@@ -88,6 +88,7 @@ U_STABLE const char* U_EXPORT2 u_getDataDirectory(void);
  */
 U_STABLE void U_EXPORT2 u_setDataDirectory(const char *directory);
 
+#ifndef U_HIDE_INTERNAL_API
 /**
   * Return the time zone files override directory, or an empty string if
   * no directory was specified. Certain time zone resources will be preferrentially
@@ -107,6 +108,7 @@ U_INTERNAL const char * U_EXPORT2 u_getTimeZoneFilesDirectory(UErrorCode *status
   * @internal
   */
 U_INTERNAL void U_EXPORT2 u_setTimeZoneFilesDirectory(const char *path, UErrorCode *status);
+#endif  /* U_HIDE_INTERNAL_API */
 
 
 /**
diff --git a/icu4c/source/common/unicode/ucharstriebuilder.h b/icu4c/source/common/unicode/ucharstriebuilder.h
index ccfb86e16d1..35e353d41b5 100644
--- a/icu4c/source/common/unicode/ucharstriebuilder.h
+++ b/icu4c/source/common/unicode/ucharstriebuilder.h
@@ -1,6 +1,6 @@
 /*
 *******************************************************************************
-*   Copyright (C) 2010-2013, International Business Machines
+*   Copyright (C) 2010-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  ucharstriebuilder.h
@@ -148,7 +148,6 @@ private:
     virtual int32_t getMinLinearMatch() const { return UCharsTrie::kMinLinearMatch; }
     virtual int32_t getMaxLinearMatchLength() const { return UCharsTrie::kMaxLinearMatchLength; }
 
-#ifndef U_HIDE_INTERNAL_API
     class UCTLinearMatchNode : public LinearMatchNode {
     public:
         UCTLinearMatchNode(const UChar *units, int32_t len, Node *nextNode);
@@ -157,7 +156,6 @@ private:
     private:
         const UChar *s;
     };
-#endif
 
     virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length,
                                         Node *nextNode) const;
diff --git a/icu4c/source/common/unicode/uclean.h b/icu4c/source/common/unicode/uclean.h
index 0e2e9367ea3..d9a1e539058 100644
--- a/icu4c/source/common/unicode/uclean.h
+++ b/icu4c/source/common/unicode/uclean.h
@@ -1,6 +1,6 @@
 /*
 ******************************************************************************
-* Copyright (C) 2001-2013, International Business Machines
+* Copyright (C) 2001-2014, International Business Machines
 *                Corporation and others. All Rights Reserved.
 ******************************************************************************
 *   file name:  uclean.h
@@ -151,6 +151,7 @@ u_setMemoryFunctions(const void *context, UMemAllocFn *a, UMemReallocFn *r, UMem
                     UErrorCode *status);
 
 
+#ifndef U_HIDE_DEPRECATED_API
 /*********************************************************************************
  *
  * Deprecated Functions
@@ -251,6 +252,7 @@ U_DEPRECATED void U_EXPORT2
 u_setAtomicIncDecFunctions(const void *context, UMtxAtomicFn *inc, UMtxAtomicFn *dec,
                     UErrorCode *status);
 
+#endif  /* U_HIDE_DEPRECATED_API */
 #endif  /* U_HIDE_SYSTEM_API */
 
 #endif
diff --git a/icu4c/source/common/unicode/uloc.h b/icu4c/source/common/unicode/uloc.h
index f16380f0378..c305c8b78c8 100644
--- a/icu4c/source/common/unicode/uloc.h
+++ b/icu4c/source/common/unicode/uloc.h
@@ -886,6 +886,7 @@ uloc_setKeywordValue(const char* keywordName,
                      char* buffer, int32_t bufferCapacity,
                      UErrorCode* status);
 
+#ifndef U_HIDE_DRAFT_API
 /**
  * Returns whether the locale's script is written right-to-left.
  * If there is no script subtag, then the likely script is used, see uloc_addLikelySubtags().
@@ -902,6 +903,7 @@ uloc_setKeywordValue(const char* keywordName,
  */
 U_DRAFT UBool U_EXPORT2
 uloc_isRightToLeft(const char *locale);
+#endif  /* U_HIDE_DRAFT_API */
 
 /**
  * enums for the  return value for the character and line orientation
diff --git a/icu4c/source/common/unicode/uscript.h b/icu4c/source/common/unicode/uscript.h
index 1d9643e8aaf..943e2ea3265 100644
--- a/icu4c/source/common/unicode/uscript.h
+++ b/icu4c/source/common/unicode/uscript.h
@@ -345,8 +345,10 @@ typedef enum UScriptCode {
       USCRIPT_BASSA_VAH                     = 134,/* Bass */
       /** @stable ICU 54 */
       USCRIPT_DUPLOYAN                      = 135,/* Dupl */
+#ifndef U_HIDE_DEPRECATED_API
       /** @deprecated ICU 54 Typo, use USCRIPT_DUPLOYAN */
       USCRIPT_DUPLOYAN_SHORTAND             = USCRIPT_DUPLOYAN,
+#endif  /* U_HIDE_DEPRECATED_API */
       /** @stable ICU 4.6 */
       USCRIPT_ELBASAN                       = 136,/* Elba */
       /** @stable ICU 4.6 */
diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h
index c0e954f4ce9..ec15f9863ad 100644
--- a/icu4c/source/common/unicode/uvernum.h
+++ b/icu4c/source/common/unicode/uvernum.h
@@ -157,6 +157,7 @@
  */
 #define UCOL_BUILDER_VERSION 9
 
+#ifndef U_HIDE_DEPRECATED_API
 /**
  * Constant 1.
  * This was intended to be the version of collation tailorings,
@@ -164,5 +165,6 @@
  * @deprecated ICU 54
  */
 #define UCOL_TAILORINGS_VERSION 1
+#endif  /* U_HIDE_DEPRECATED_API */
 
 #endif
diff --git a/icu4c/source/i18n/unicode/calendar.h b/icu4c/source/i18n/unicode/calendar.h
index 63e3ae1f7c2..e8ebaae0acb 100644
--- a/icu4c/source/i18n/unicode/calendar.h
+++ b/icu4c/source/i18n/unicode/calendar.h
@@ -2486,7 +2486,7 @@ Calendar::roll(EDateFields field, UBool up, UErrorCode& status)
 {
     roll((UCalendarDateFields) field, up, status);
 }
-#endif
+#endif  /* U_HIDE_DEPRECATED_API */
 
 
 // -------------------------------------
@@ -2510,7 +2510,7 @@ inline int32_t  Calendar::weekNumber(int32_t dayOfPeriod, int32_t dayOfWeek)
 {
   return weekNumber(dayOfPeriod, dayOfPeriod, dayOfWeek);
 }
-#endif
+#endif  /* U_HIDE_INTERNAL_API */
 
 U_NAMESPACE_END
 
diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h
index 8156f0c2e54..dd62a92e420 100644
--- a/icu4c/source/i18n/unicode/dcfmtsym.h
+++ b/icu4c/source/i18n/unicode/dcfmtsym.h
@@ -360,7 +360,7 @@ public:
      * The returned reference becomes invalid when the symbol is changed
      * or when the DecimalFormatSymbols are destroyed.
      * ### TODO markus 2002oct11: Consider proposing getConstSymbol() to be really public.
-     * Note: moved #ifndef U_HIDE_INTERNAL_API after this, it is needed for inline in DecimalFormat
+     * Note: moved #ifndef U_HIDE_INTERNAL_API after this, since this is needed for inline in DecimalFormat
      *
      * @param symbol Constant to indicate a number format symbol.
      * @return the format symbol by the param 'symbol'
diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h
index 116d65c93fe..75249a4bc43 100644
--- a/icu4c/source/i18n/unicode/decimfmt.h
+++ b/icu4c/source/i18n/unicode/decimfmt.h
@@ -1631,6 +1631,7 @@ public:
      */
     virtual void setDecimalSeparatorAlwaysShown(UBool newValue);
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Allows you to get the parse behavior of the pattern decimal mark.
      *
@@ -1638,6 +1639,7 @@ public:
      * @draft ICU 54
      */
     UBool isDecimalPatternMatchRequired(void) const;
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Allows you to set the behavior of the pattern decimal mark.
@@ -1892,6 +1894,7 @@ public:
      */
     virtual void setCurrency(const UChar* theCurrency);
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Sets the <tt>Currency Context</tt> object used to display currency.
      * This takes effect immediately, if this format is a
@@ -1906,14 +1909,17 @@ public:
      * @draft ICU 54
      */
     UCurrencyUsage getCurrencyUsage() const;
+#endif  /* U_HIDE_DRAFT_API */
 
 
+#ifndef U_HIDE_DEPRECATED_API
     /**
      * The resource tags we use to retrieve decimal format data from
      * locale resource bundles.
      * @deprecated ICU 3.4. This string has no public purpose. Please don't use it.
      */
     static const char fgNumberPatterns[];
+#endif  /* U_HIDE_DEPRECATED_API */
 
 #ifndef U_HIDE_INTERNAL_API
     /**
diff --git a/icu4c/source/i18n/unicode/filteredbrk.h b/icu4c/source/i18n/unicode/filteredbrk.h
index 486c3fa4349..1412418be50 100644
--- a/icu4c/source/i18n/unicode/filteredbrk.h
+++ b/icu4c/source/i18n/unicode/filteredbrk.h
@@ -12,6 +12,7 @@
 #include "unicode/brkiter.h"
 
 #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILTERED_BREAK_ITERATION
+#ifndef U_HIDE_INTERNAL_API
 
 U_NAMESPACE_BEGIN
 
@@ -124,6 +125,7 @@ class U_I18N_API FilteredBreakIteratorBuilder : public UObject {
 
 U_NAMESPACE_END
 
+#endif  /* U_HIDE_INTERNAL_API */
 #endif // #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILTERED_BREAK_ITERATION
 
 #endif // #ifndef FILTEREDBRK_H
diff --git a/icu4c/source/i18n/unicode/fmtable.h b/icu4c/source/i18n/unicode/fmtable.h
index 560cafc3e56..6cad276f423 100644
--- a/icu4c/source/i18n/unicode/fmtable.h
+++ b/icu4c/source/i18n/unicode/fmtable.h
@@ -736,7 +736,6 @@ inline int32_t Formattable::getLong(UErrorCode* status) const {
 }
 #endif  /* U_HIDE_DEPRECATED_API */
 
-#ifndef U_HIDE_DRAFT_API
 inline UFormattable* Formattable::toUFormattable() {
   return reinterpret_cast<UFormattable*>(this);
 }
@@ -752,7 +751,6 @@ inline Formattable* Formattable::fromUFormattable(UFormattable *fmt) {
 inline const Formattable* Formattable::fromUFormattable(const UFormattable *fmt) {
   return reinterpret_cast<const Formattable *>(fmt);
 }
-#endif  /* U_HIDE_DRAFT_API */
 
 U_NAMESPACE_END
 
diff --git a/icu4c/source/i18n/unicode/measfmt.h b/icu4c/source/i18n/unicode/measfmt.h
index 1554a6887c3..91e08ef8d82 100644
--- a/icu4c/source/i18n/unicode/measfmt.h
+++ b/icu4c/source/i18n/unicode/measfmt.h
@@ -23,7 +23,6 @@
  * \brief C++ API: Formatter for measure objects.
  */
 
-#ifndef U_HIDE_DRAFT_API
 /**
  * Constants for various widths.
  * There are 4 widths: Wide, Short, Narrow, Numeric.
@@ -34,6 +33,7 @@
  */
 enum UMeasureFormatWidth {
 
+#ifndef U_HIDE_DRAFT_API
     // Wide, short, and narrow must be first and in this order.
     /**
      * Spell out measure units.
@@ -59,16 +59,16 @@ enum UMeasureFormatWidth {
      * @draft ICU 53
      */
     UMEASFMT_WIDTH_NUMERIC,
+#endif /* U_HIDE_DRAFT_API */
 
     /**
      * Count of values in this enum.
      * @draft ICU 53
      */
-    UMEASFMT_WIDTH_COUNT
+    UMEASFMT_WIDTH_COUNT = 4
 };
 /** @draft ICU 53 */
 typedef enum UMeasureFormatWidth UMeasureFormatWidth; 
-#endif /* U_HIDE_DRAFT_API */
 
 U_NAMESPACE_BEGIN
 
@@ -271,7 +271,6 @@ class U_I18N_API MeasureFormat : public Format {
 
 #ifndef U_HIDE_INTERNAL_API 
 
-#ifndef U_HIDE_DRAFT_API
     /**
      * ICU use only.
      * Initialize or change MeasureFormat class from subclass.
@@ -282,7 +281,6 @@ class U_I18N_API MeasureFormat : public Format {
             UMeasureFormatWidth width,
             NumberFormat *nfToAdopt,
             UErrorCode &status);
-#endif
     /**
      * ICU use only.
      * Allows subclass to change locale. Note that this method also changes
@@ -329,9 +327,7 @@ class U_I18N_API MeasureFormat : public Format {
     const MeasureFormatCacheData *cache;
     const SharedNumberFormat *numberFormat;
     const SharedPluralRules *pluralRules;
-#ifndef U_HIDE_DRAFT_API
     UMeasureFormatWidth width;    
-#endif
 
     // Declared outside of MeasureFormatSharedData because ListFormatter
     // objects are relatively cheap to copy; therefore, they don't need to be
diff --git a/icu4c/source/i18n/unicode/measunit.h b/icu4c/source/i18n/unicode/measunit.h
index 07cdf22afba..442f4a3e220 100644
--- a/icu4c/source/i18n/unicode/measunit.h
+++ b/icu4c/source/i18n/unicode/measunit.h
@@ -1422,7 +1422,7 @@ class U_I18N_API MeasureUnit: public UObject {
      */
     void initCurrency(const char *isoCurrency);
 
-#endif
+#endif  /* U_HIDE_INTERNAL_API */
 
 private:
     int32_t fTypeId;
diff --git a/icu4c/source/i18n/unicode/numfmt.h b/icu4c/source/i18n/unicode/numfmt.h
index f3b27d8c38e..e7dc33ecadc 100644
--- a/icu4c/source/i18n/unicode/numfmt.h
+++ b/icu4c/source/i18n/unicode/numfmt.h
@@ -730,7 +730,7 @@ public:
     static const SharedNumberFormat* U_EXPORT2 createSharedInstance(
             const Locale& inLocale, UNumberFormatStyle style, UErrorCode& status);
 
-#endif
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * Returns a currency format for the current default locale.
diff --git a/icu4c/source/i18n/unicode/regex.h b/icu4c/source/i18n/unicode/regex.h
index ed3b062ca39..6f805f88e3a 100644
--- a/icu4c/source/i18n/unicode/regex.h
+++ b/icu4c/source/i18n/unicode/regex.h
@@ -608,7 +608,7 @@ private:
       * @internal
       */
     void        dumpPattern() const;
-#endif
+#endif  /* U_HIDE_INTERNAL_API */
 };
 
 
diff --git a/icu4c/source/i18n/unicode/region.h b/icu4c/source/i18n/unicode/region.h
index 9503a227cfa..c33681e7e79 100644
--- a/icu4c/source/i18n/unicode/region.h
+++ b/icu4c/source/i18n/unicode/region.h
@@ -101,11 +101,13 @@ public:
      */
     static const Region* U_EXPORT2 getInstance (int32_t code, UErrorCode &status);
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Returns an enumeration over the IDs of all known regions that match the given type.
-     * @stable ICU 51
+     * @draft ICU 51
      */
     static StringEnumeration* U_EXPORT2 getAvailable(URegionType type);
+#endif /* U_HIDE_DRAFT_API */
    
     /**
      * Returns a pointer to the region that contains this region.  Returns NULL if this region is code "001" (World)
@@ -125,6 +127,7 @@ public:
      */
     const Region* getContainingRegion(URegionType type) const;
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Return an enumeration over the IDs of all the regions that are immediate children of this region in the
      * region hierarchy. These returned regions could be either macro regions, territories, or a mixture of the two,
@@ -132,7 +135,7 @@ public:
      * any sub-regions. For example, calling this method with region "150" (Europe) returns an enumeration containing
      * the various sub regions of Europe - "039" (Southern Europe) - "151" (Eastern Europe) - "154" (Northern Europe)
      * and "155" (Western Europe).
-     * @stable ICU 51 
+     * @draft ICU 51 
      */
     StringEnumeration* getContainedRegions() const;
 
@@ -141,9 +144,10 @@ public:
      * hierarchy and match the given type.  This API may return an empty enumeration if this region doesn't have any
      * sub-regions that match the given type. For example, calling this method with region "150" (Europe) and type
      * "URGN_TERRITORY" returns a set containing all the territories in Europe ( "FR" (France) - "IT" (Italy) - "DE" (Germany) etc. )
-     * @stable ICU 51 
+     * @draft ICU 51 
      */
     StringEnumeration* getContainedRegions( URegionType type ) const;
+#endif /* U_HIDE_DRAFT_API */
  
     /**
      * Returns true if this region contains the supplied other region anywhere in the region hierarchy.
@@ -151,13 +155,15 @@ public:
      */
     UBool contains(const Region &other) const;
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * For deprecated regions, return an enumeration over the IDs of the regions that are the preferred replacement
      * regions for this region.  Returns null for a non-deprecated region.  For example, calling this method with region
      * "SU" (Soviet Union) would return a list of the regions containing "RU" (Russia), "AM" (Armenia), "AZ" (Azerbaijan), etc...
-     * @stable ICU 51 
+     * @draft ICU 51 
      */
     StringEnumeration* getPreferredValues() const;
+#endif /* U_HIDE_DRAFT_API */
 
     /**
      * Return this region's canonical region code.
diff --git a/icu4c/source/i18n/unicode/tblcoll.h b/icu4c/source/i18n/unicode/tblcoll.h
index 40d50902174..6d6e4b96a7c 100644
--- a/icu4c/source/i18n/unicode/tblcoll.h
+++ b/icu4c/source/i18n/unicode/tblcoll.h
@@ -723,13 +723,13 @@ public:
             UCharIterator *iter, uint32_t state[2],
             uint8_t *dest, int32_t count, UErrorCode &errorCode) const;
 
-#ifndef U_HIDE_INTERNAL_API
     /**
      * Only for use in ucol_openRules().
      * @internal
      */
     RuleBasedCollator();
 
+#ifndef U_HIDE_INTERNAL_API
     /**
      * Implements ucol_getLocaleByType().
      * Needed because the lifetime of the locale ID string must match that of the collator.
diff --git a/icu4c/source/i18n/unicode/tmutfmt.h b/icu4c/source/i18n/unicode/tmutfmt.h
index 1b45ef3b37d..728ff13219a 100644
--- a/icu4c/source/i18n/unicode/tmutfmt.h
+++ b/icu4c/source/i18n/unicode/tmutfmt.h
@@ -17,6 +17,7 @@
 
 
 #if !UCONFIG_NO_FORMATTING
+#ifndef U_HIDE_DEPRECATED_API
 
 #include "unicode/unistr.h"
 #include "unicode/tmunit.h"
@@ -25,7 +26,6 @@
 #include "unicode/numfmt.h"
 #include "unicode/plurrule.h"
 
-#ifndef U_HIDE_DEPRECATED_API
 
 /**
  * Constants for various styles.
@@ -44,16 +44,12 @@ enum UTimeUnitFormatStyle {
 };
 typedef enum UTimeUnitFormatStyle UTimeUnitFormatStyle; /**< @deprecated ICU 53 */
 
-#endif  /* U_HIDE_DEPRECATED_API */
-
 
 U_NAMESPACE_BEGIN
 
 class Hashtable;
 class UVector;
 
-#ifndef U_HIDE_DEPRECATED_API
-
 /**
  * Format or parse a TimeUnitAmount, using plural rules for the units where available.
  *
@@ -90,31 +86,31 @@ public:
     /**
      * Create TimeUnitFormat with default locale, and full name style.
      * Use setLocale and/or setFormat to modify.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     TimeUnitFormat(UErrorCode& status);
 
     /**
      * Create TimeUnitFormat given locale, and full name style.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     TimeUnitFormat(const Locale& locale, UErrorCode& status);
 
     /**
      * Create TimeUnitFormat given locale and style.
-     * @stable ICU 4.8
+     * @deprecated ICU 53
      */
     TimeUnitFormat(const Locale& locale, UTimeUnitFormatStyle style, UErrorCode& status);
 
     /**
      * Copy constructor.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     TimeUnitFormat(const TimeUnitFormat&);
 
     /**
      * deconstructor
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     virtual ~TimeUnitFormat();
 
@@ -122,13 +118,13 @@ public:
      * Clone this Format object polymorphically. The caller owns the result and
      * should delete it when done.
      * @return    A copy of the object.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     virtual Format* clone(void) const;
 
     /**
      * Assignment operator
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     TimeUnitFormat& operator=(const TimeUnitFormat& other);
 
@@ -137,7 +133,7 @@ public:
      * Objects of different subclasses are considered unequal.
      * @param other the object to be compared with.
      * @return      true if the given Format objects are not semantically equal.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     UBool operator!=(const Format& other) const;
 
@@ -145,7 +141,7 @@ public:
      * Set the locale used for formatting or parsing.
      * @param locale  the locale to be set
      * @param status  output param set to success/failure code on exit
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     void setLocale(const Locale& locale, UErrorCode& status);
 
@@ -154,14 +150,14 @@ public:
      * Set the number format used for formatting or parsing.
      * @param format  the number formatter to be set
      * @param status  output param set to success/failure code on exit
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     void setNumberFormat(const NumberFormat& format, UErrorCode& status);
 
     /**
      * Parse a TimeUnitAmount.
      * @see Format#parseObject(const UnicodeString&, Formattable&, ParsePosition&) const;
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     virtual void parseObject(const UnicodeString& source,
                              Formattable& result,
@@ -176,7 +172,7 @@ public:
      * .       erived::getStaticClassID()) ...
      * </pre>
      * @return          The class ID for all objects of this class.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     static UClassID U_EXPORT2 getStaticClassID(void);
 
@@ -189,7 +185,7 @@ public:
      * @return          The class ID for this object. All objects of a
      *                  given class have the same class ID.  Objects of
      *                  other classes have different class IDs.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     virtual UClassID getDynamicClassID(void) const;
 
@@ -238,10 +234,9 @@ TimeUnitFormat::operator!=(const Format& other) const  {
     return !operator==(other);
 }
 
-#endif /* U_HIDE_DEPRECATED_API */
-
 U_NAMESPACE_END
 
+#endif /* U_HIDE_DEPRECATED_API */
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif // __TMUTFMT_H__
diff --git a/icu4c/source/i18n/unicode/translit.h b/icu4c/source/i18n/unicode/translit.h
index 4973d424715..22e1e24e500 100644
--- a/icu4c/source/i18n/unicode/translit.h
+++ b/icu4c/source/i18n/unicode/translit.h
@@ -1026,13 +1026,13 @@ protected:
 
 #ifndef U_HIDE_INTERNAL_API
     /**
-     * @internal
      * @param id the ID being registered
      * @param factory a function pointer that will be copied and
      * called later when the given ID is passed to createInstance()
      * @param context a context pointer that will be stored and
      * later passed to the factory function when an ID matching
      * the registration ID is being instantiated with this factory.
+     * @internal
      */
     static void _registerFactory(const UnicodeString& id,
                                  Factory factory,
diff --git a/icu4c/source/i18n/unicode/tzfmt.h b/icu4c/source/i18n/unicode/tzfmt.h
index 53cb7f64f34..24f0e49eb79 100644
--- a/icu4c/source/i18n/unicode/tzfmt.h
+++ b/icu4c/source/i18n/unicode/tzfmt.h
@@ -233,7 +233,9 @@ typedef enum UTimeZoneFormatParseOption {
      * by other styles.
      * @stable ICU 50
      */
-    UTZFMT_PARSE_OPTION_ALL_STYLES  = 0x01,
+    UTZFMT_PARSE_OPTION_ALL_STYLES  = 0x01
+#ifndef U_HIDE_DRAFT_API
+    ,
      /**
       * When parsing a time zone display name in UTZFMT_STYLE_SPECIFIC_SHORT,
       * look for the IANA tz database compatible zone abbreviations in addition
@@ -242,6 +244,7 @@ typedef enum UTimeZoneFormatParseOption {
       * @draft ICU 54
       */
     UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS = 0x02
+#endif  /* U_HIDE_DRAFT_API */
 } UTimeZoneFormatParseOption;
 
 U_CDECL_END
diff --git a/icu4c/source/i18n/unicode/tznames.h b/icu4c/source/i18n/unicode/tznames.h
index 5ae16ef4e2e..9583ded022f 100644
--- a/icu4c/source/i18n/unicode/tznames.h
+++ b/icu4c/source/i18n/unicode/tznames.h
@@ -176,6 +176,7 @@ public:
      * Note: The input locale is used for resolving ambiguous names (e.g. "IST" is parsed
      * as Israel Standard Time for Israel, while it is parsed as India Standard Time for
      * all other regions). The zone names returned by this instance are not localized.
+     * @draft ICU 54
      */
      static TimeZoneNames* U_EXPORT2 createTZDBInstance(const Locale& locale, UErrorCode& status);
 #endif /* U_HIDE_DRAFT_API */
diff --git a/icu4c/source/i18n/unicode/ucol.h b/icu4c/source/i18n/unicode/ucol.h
index 8aecc38c254..511a63cb902 100644
--- a/icu4c/source/i18n/unicode/ucol.h
+++ b/icu4c/source/i18n/unicode/ucol.h
@@ -421,6 +421,7 @@ ucol_openRules( const UChar        *rules,
                 UParseError        *parseError,
                 UErrorCode         *status);
 
+#ifndef U_HIDE_DEPRECATED_API
 /** 
  * Open a collator defined by a short form string.
  * The structure and the syntax of the string is defined in the "Naming collators"
@@ -454,11 +455,12 @@ ucol_openRules( const UChar        *rules,
  * @see ucol_normalizeShortDefinitionString
  * @deprecated ICU 54 Use ucol_open() with language tag collation keywords instead.
  */
-U_STABLE UCollator* U_EXPORT2
+U_DEPRECATED UCollator* U_EXPORT2
 ucol_openFromShortString( const char *definition,
                           UBool forceDefaults,
                           UParseError *parseError,
                           UErrorCode *status);
+#endif  /* U_HIDE_DEPRECATED_API */
 
 #ifndef U_HIDE_DEPRECATED_API
 /**
@@ -911,6 +913,7 @@ U_STABLE const UChar* U_EXPORT2
 ucol_getRules(    const    UCollator    *coll, 
         int32_t            *length);
 
+#ifndef U_HIDE_DEPRECATED_API
 /** Get the short definition string for a collator. This API harvests the collator's
  *  locale and the attribute set and produces a string that can be used for opening 
  *  a collator with the same attributes using the ucol_openFromShortString API.
@@ -931,7 +934,7 @@ ucol_getRules(    const    UCollator    *coll,
  *  @see ucol_normalizeShortDefinitionString
  *  @deprecated ICU 54
  */
-U_STABLE int32_t U_EXPORT2
+U_DEPRECATED int32_t U_EXPORT2
 ucol_getShortDefinitionString(const UCollator *coll,
                               const char *locale,
                               char *buffer,
@@ -958,12 +961,13 @@ ucol_getShortDefinitionString(const UCollator *coll,
  *  @deprecated ICU 54
  */
 
-U_STABLE int32_t U_EXPORT2
+U_DEPRECATED int32_t U_EXPORT2
 ucol_normalizeShortDefinitionString(const char *source,
                                     char *destination,
                                     int32_t capacity,
                                     UParseError *parseError,
                                     UErrorCode *status);
+#endif  /* U_HIDE_DEPRECATED_API */
 
 
 /**
@@ -1220,6 +1224,7 @@ ucol_getMaxVariable(const UCollator *coll);
 
 #endif  /* U_HIDE_DRAFT_API */
 
+#ifndef U_HIDE_DEPRECATED_API
 /**
  * Sets the variable top to the primary weight of the specified string.
  *
@@ -1244,6 +1249,7 @@ U_DEPRECATED uint32_t U_EXPORT2
 ucol_setVariableTop(UCollator *coll, 
                     const UChar *varTop, int32_t len, 
                     UErrorCode *status);
+#endif  /* U_HIDE_DEPRECATED_API */
 
 /** 
  * Gets the variable top value of a Collator. 
diff --git a/icu4c/source/i18n/unicode/ucurr.h b/icu4c/source/i18n/unicode/ucurr.h
index 73a4d054a36..5b196901693 100644
--- a/icu4c/source/i18n/unicode/ucurr.h
+++ b/icu4c/source/i18n/unicode/ucurr.h
@@ -22,6 +22,7 @@
  * @draft ICU 54
  */
 enum UCurrencyUsage {
+#ifndef U_HIDE_DRAFT_API
     /**
      * a setting to specify currency usage which determines currency digit
      * and rounding for standard usage, for example: "50.00 NT$"
@@ -35,11 +36,12 @@ enum UCurrencyUsage {
      * @draft ICU 54
      */
     UCURR_USAGE_CASH=1,
+#endif  /* U_HIDE_DRAFT_API */
     /**
      * One higher than the last enum UCurrencyUsage constant.
      * @draft ICU 54
      */
-    UCURR_USAGE_COUNT
+    UCURR_USAGE_COUNT=2
 };
 typedef enum UCurrencyUsage UCurrencyUsage; 
 
@@ -202,6 +204,7 @@ U_STABLE int32_t U_EXPORT2
 ucurr_getDefaultFractionDigits(const UChar* currency,
                                UErrorCode* ec);
 
+#ifndef U_HIDE_DRAFT_API
 /**
  * Returns the number of the number of fraction digits that should
  * be displayed for the given currency with usage.
@@ -216,6 +219,7 @@ U_DRAFT int32_t U_EXPORT2
 ucurr_getDefaultFractionDigitsForUsage(const UChar* currency, 
                                        const UCurrencyUsage usage,
                                        UErrorCode* ec);
+#endif  /* U_HIDE_DRAFT_API */
 
 /**
  * Returns the rounding increment for the given currency, or 0.0 if no
@@ -231,6 +235,7 @@ U_STABLE double U_EXPORT2
 ucurr_getRoundingIncrement(const UChar* currency,
                            UErrorCode* ec);
 
+#ifndef U_HIDE_DRAFT_API
 /**
  * Returns the rounding increment for the given currency, or 0.0 if no
  * rounding is done by the currency given usage.
@@ -245,6 +250,7 @@ U_DRAFT double U_EXPORT2
 ucurr_getRoundingIncrementForUsage(const UChar* currency,
                                    const UCurrencyUsage usage,
                                    UErrorCode* ec);
+#endif  /* U_HIDE_DRAFT_API */
 
 /**
  * Selector constants for ucurr_openCurrencies().
diff --git a/icu4c/source/i18n/unicode/udat.h b/icu4c/source/i18n/unicode/udat.h
index 87af1d2121b..5bbe5aa0736 100644
--- a/icu4c/source/i18n/unicode/udat.h
+++ b/icu4c/source/i18n/unicode/udat.h
@@ -1084,6 +1084,7 @@ udat_setCalendar(            UDateFormat*    fmt,
 U_STABLE const UNumberFormat* U_EXPORT2 
 udat_getNumberFormat(const UDateFormat* fmt);
 
+#ifndef U_HIDE_DRAFT_API
 /**
 * Get the UNumberFormat for specific field associated with an UDateFormat.
 * For example: 'y' for year and 'M' for month
@@ -1116,6 +1117,7 @@ udat_adoptNumberFormatForFields(  UDateFormat* fmt,
                             const UChar* fields,
                                   UNumberFormat*  numberFormatToSet,
                                   UErrorCode* status);
+#endif  /* U_HIDE_DRAFT_API */
 
 /**
 * Set the UNumberFormat associated with an UDateFormat.
@@ -1133,6 +1135,7 @@ U_STABLE void U_EXPORT2
 udat_setNumberFormat(            UDateFormat*    fmt,
                         const   UNumberFormat*  numberFormatToSet);
 
+#ifndef U_HIDE_DRAFT_API
 /**
 * Adopt the UNumberFormat associated with an UDateFormat.
 * A UDateFormat uses a UNumberFormat to format numbers within a date,
@@ -1145,6 +1148,7 @@ udat_setNumberFormat(            UDateFormat*    fmt,
 U_DRAFT void U_EXPORT2 
 udat_adoptNumberFormat(            UDateFormat*    fmt,
                                    UNumberFormat*  numberFormatToAdopt);
+#endif  /* U_HIDE_DRAFT_API */
 
 /**
 * Get a locale for which date/time formatting patterns are available.
diff --git a/icu4c/source/i18n/unicode/unum.h b/icu4c/source/i18n/unicode/unum.h
index 709fd4ee0c0..3a00e95206e 100644
--- a/icu4c/source/i18n/unicode/unum.h
+++ b/icu4c/source/i18n/unicode/unum.h
@@ -151,73 +151,73 @@ typedef enum UNumberFormatStyle {
      * Currency format with a currency symbol, e.g., "$1.00".
      * @stable ICU 2.0
      */
-    UNUM_CURRENCY,
+    UNUM_CURRENCY=2,
     /**
      * Percent format
      * @stable ICU 2.0
      */
-    UNUM_PERCENT,
+    UNUM_PERCENT=3,
     /**
      * Scientific format
      * @stable ICU 2.1
      */
-    UNUM_SCIENTIFIC,
+    UNUM_SCIENTIFIC=4,
     /**
      * Spellout rule-based format
      * @stable ICU 2.0
      */
-    UNUM_SPELLOUT,
+    UNUM_SPELLOUT=5,
     /** 
      * Ordinal rule-based format 
      * @stable ICU 3.0
      */
-    UNUM_ORDINAL,
+    UNUM_ORDINAL=6,
     /** 
      * Duration rule-based format 
      * @stable ICU 3.0
      */
-    UNUM_DURATION,
+    UNUM_DURATION=7,
     /** 
      * Numbering system rule-based format
      * @stable ICU 4.2
      */
-    UNUM_NUMBERING_SYSTEM,
+    UNUM_NUMBERING_SYSTEM=8,
     /** 
      * Rule-based format defined by a pattern string.
      * @stable ICU 3.0
      */
-    UNUM_PATTERN_RULEBASED,
+    UNUM_PATTERN_RULEBASED=9,
     /**
      * Currency format with an ISO currency code, e.g., "USD1.00".
      * @stable ICU 4.8
      */
-    UNUM_CURRENCY_ISO,
+    UNUM_CURRENCY_ISO=10,
     /**
      * Currency format with a pluralized currency name,
      * e.g., "1.00 US dollar" and "3.00 US dollars".
      * @stable ICU 4.8
      */
-    UNUM_CURRENCY_PLURAL,
+    UNUM_CURRENCY_PLURAL=11,
 #ifndef U_HIDE_DRAFT_API
     /**
      * Currency format for accounting, e.g., "($3.00)" for
      * negative currency amount instead of "-$3.00" ({@link #UNUM_CURRENCY}).
      * @draft ICU 53
      */
-    UNUM_CURRENCY_ACCOUNTING,
+    UNUM_CURRENCY_ACCOUNTING=12,
     /**
      * Currency format with a currency symbol given CASH usage, e.g., 
      * "NT$3" instead of "NT$3.23".
      * @draft ICU 54
      */
-    UNUM_CASH_CURRENCY,
+    UNUM_CASH_CURRENCY=13,
 #endif /* U_HIDE_DRAFT_API */
 
     /**
      * One more than the highest number format style constant.
      * @stable ICU 4.8
      */
-    UNUM_FORMAT_STYLE_COUNT,
+    UNUM_FORMAT_STYLE_COUNT=14,
 
     /**
      * Default format
@@ -936,6 +936,7 @@ typedef enum UNumberFormatAttribute {
    */
   UNUM_PARSE_NO_EXPONENT,
 
+#ifndef U_HIDE_DRAFT_API
   /** 
    * if this attribute is set to 1, specifies that, if the pattern contains a 
    * decimal mark the input is required to have one. If this attribute is set to 0,
@@ -944,12 +945,13 @@ typedef enum UNumberFormatAttribute {
    * Default: 0 (unset)
    * @draft ICU 54
    */
-  UNUM_PARSE_DECIMAL_MARK_REQUIRED,
+  UNUM_PARSE_DECIMAL_MARK_REQUIRED = UNUM_PARSE_NO_EXPONENT+1,
+#endif  /* U_HIDE_DRAFT_API */
 
   /* The following cannot be #ifndef U_HIDE_INTERNAL_API, needed in .h file variable declararions */
   /** Limit of boolean attributes.
    * @internal */
-  UNUM_LIMIT_BOOLEAN_ATTRIBUTE
+  UNUM_LIMIT_BOOLEAN_ATTRIBUTE = UNUM_PARSE_NO_EXPONENT+2
 } UNumberFormatAttribute;
 
 /**
@@ -1216,10 +1218,12 @@ typedef enum UNumberFormatSymbol {
    */
   UNUM_NINE_DIGIT_SYMBOL = 26,
 
+#ifndef U_HIDE_DRAFT_API
   /** Multiplication sign
    * @draft ICU 54
    */
   UNUM_EXPONENT_MULTIPLICATION_SYMBOL = 27,
+#endif  /* U_HIDE_DRAFT_API */
 
   /** count symbol constants */
   UNUM_FORMAT_SYMBOL_COUNT = 28
diff --git a/icu4c/source/io/unicode/ustdio.h b/icu4c/source/io/unicode/ustdio.h
index d31dbe51970..16bcf35eecf 100644
--- a/icu4c/source/io/unicode/ustdio.h
+++ b/icu4c/source/io/unicode/ustdio.h
@@ -243,6 +243,7 @@ u_fopen(const char    *filename,
     const char    *locale,
     const char    *codepage);
 
+#ifndef U_HIDE_DRAFT_API
 /**
  * Open a UFILE with a UChar* filename
  * A UFILE is a wrapper around a FILE* that is locale and codepage aware.
@@ -265,6 +266,7 @@ u_fopen_u(const UChar    *filename,
     const char    *perm,
     const char    *locale,
     const char    *codepage);
+#endif  /* U_HIDE_DRAFT_API */
 
 /**
  * Open a UFILE on top of an existing FILE* stream. The FILE* stream