diff --git a/icu4c/source/common/unicode/filteredbrk.h b/icu4c/source/common/unicode/filteredbrk.h
index 71be928057c..fff9bb5771f 100644
--- a/icu4c/source/common/unicode/filteredbrk.h
+++ b/icu4c/source/common/unicode/filteredbrk.h
@@ -13,6 +13,8 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILTERED_BREAK_ITERATION
 
+#ifndef U_HIDE_DRAFT_API
+
 U_NAMESPACE_BEGIN
 
 /**
@@ -112,6 +114,8 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject {
 
 U_NAMESPACE_END
 
+#endif  /* U_HIDE_DRAFT_API */
+
 #endif // #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILTERED_BREAK_ITERATION
 
 #endif // #ifndef FILTEREDBRK_H
diff --git a/icu4c/source/common/unicode/uniset.h b/icu4c/source/common/unicode/uniset.h
index 0a3aeb79782..0456f2bdb94 100644
--- a/icu4c/source/common/unicode/uniset.h
+++ b/icu4c/source/common/unicode/uniset.h
@@ -389,7 +389,7 @@ public:
      */
     UnicodeSet(const uint16_t buffer[], int32_t bufferLen,
                ESerialization serialization, UErrorCode &status);
-#endif
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * Constructs a set from the given pattern.  See the class
diff --git a/icu4c/source/common/unicode/unistr.h b/icu4c/source/common/unicode/unistr.h
index 468edcb7d55..63f19335004 100644
--- a/icu4c/source/common/unicode/unistr.h
+++ b/icu4c/source/common/unicode/unistr.h
@@ -172,6 +172,8 @@ class UnicodeStringAppendable;  // unicode/appendable.h
 # endif
 #endif
 
+/* Cannot make the following #ifndef U_HIDE_INTERNAL_API,
+   it is used to construct other non-internal constants */
 /**
  * \def UNISTR_OBJECT_SIZE
  * Desired sizeof(UnicodeString) in bytes.
diff --git a/icu4c/source/i18n/unicode/datefmt.h b/icu4c/source/i18n/unicode/datefmt.h
index 9388c687a96..f401cfe5de9 100644
--- a/icu4c/source/i18n/unicode/datefmt.h
+++ b/icu4c/source/i18n/unicode/datefmt.h
@@ -571,8 +571,6 @@ public:
                                               EStyle timeStyle = kDefault,
                                               const Locale& aLocale = Locale::getDefault());
 
-#ifndef U_HIDE_DRAFT_API
-
 #ifndef U_HIDE_INTERNAL_API
     /**
      * Returns the best pattern given a skeleton and locale.
@@ -586,8 +584,9 @@ public:
             const Locale &locale,
             const UnicodeString &skeleton,
             UErrorCode &status);
-#endif
+#endif  /* U_HIDE_INTERNAL_API */
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Creates a date/time formatter for the given skeleton and 
      * default locale.
diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h
index 88f5fbce756..046bc1475b6 100644
--- a/icu4c/source/i18n/unicode/dcfmtsym.h
+++ b/icu4c/source/i18n/unicode/dcfmtsym.h
@@ -355,6 +355,7 @@ private:
 
 public:
 
+#ifndef U_HIDE_INTERNAL_API
     /** 
      * @internal For ICU use only 
      */ 
@@ -368,6 +369,7 @@ public:
     inline UBool isCustomIntlCurrencySymbol() const {
         return fIsCustomIntlCurrencySymbol;
     }
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * _Internal_ function - more efficient version of getSymbol,
diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h
index e09b8c54740..59a4fb5c0db 100644
--- a/icu4c/source/i18n/unicode/decimfmt.h
+++ b/icu4c/source/i18n/unicode/decimfmt.h
@@ -41,6 +41,7 @@
 #include "unicode/curramt.h"
 #include "unicode/enumset.h"
 
+#ifndef U_HIDE_INTERNAL_API
 /**
  * \def UNUM_DECIMALFORMAT_INTERNAL_SIZE
  * @internal
@@ -48,6 +49,7 @@
 #if UCONFIG_FORMAT_FASTPATHS_49
 #define UNUM_DECIMALFORMAT_INTERNAL_SIZE 16
 #endif
+#endif  /* U_HIDE_INTERNAL_API */
 
 U_NAMESPACE_BEGIN
 
@@ -1682,7 +1684,7 @@ public:
      */
     virtual void setMinimumGroupingDigits(int32_t newValue);
 
-#endif
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * Allows you to get the behavior of the decimal separator with integers.
diff --git a/icu4c/source/i18n/unicode/dtptngen.h b/icu4c/source/i18n/unicode/dtptngen.h
index f83872ae24b..4a14377a256 100644
--- a/icu4c/source/i18n/unicode/dtptngen.h
+++ b/icu4c/source/i18n/unicode/dtptngen.h
@@ -116,6 +116,7 @@ public:
      */
     UBool operator!=(const DateTimePatternGenerator& other) const;
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Utility to return a unique skeleton from a given pattern. For example,
      * both "MMM-dd" and "dd/MMM" produce the skeleton "MMMdd".
@@ -127,6 +128,7 @@ public:
      * @draft ICU 56
      */
     static UnicodeString staticGetSkeleton(const UnicodeString& pattern, UErrorCode& status);
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Utility to return a unique skeleton from a given pattern. For example,
@@ -144,6 +146,7 @@ public:
         return staticGetSkeleton(pattern, status);
     }
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Utility to return a unique base skeleton from a given pattern. This is
      * the same as the skeleton, except that differences in length are minimized
@@ -158,6 +161,7 @@ public:
      * @draft ICU 56
      */
     static UnicodeString staticGetBaseSkeleton(const UnicodeString& pattern, UErrorCode& status);
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Utility to return a unique base skeleton from a given pattern. This is
diff --git a/icu4c/source/i18n/unicode/timezone.h b/icu4c/source/i18n/unicode/timezone.h
index 14463c1a02d..9fec21ec8fd 100644
--- a/icu4c/source/i18n/unicode/timezone.h
+++ b/icu4c/source/i18n/unicode/timezone.h
@@ -288,7 +288,7 @@ public:
      * @draft ICU 55
      */
     static TimeZone* U_EXPORT2 detectHostTimeZone();
-#endif
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Creates a new copy of the default TimeZone for this host. Unless the default time
diff --git a/icu4c/source/i18n/unicode/ucol.h b/icu4c/source/i18n/unicode/ucol.h
index 510ddc8c6bd..8b44716e7e8 100644
--- a/icu4c/source/i18n/unicode/ucol.h
+++ b/icu4c/source/i18n/unicode/ucol.h
@@ -1269,6 +1269,7 @@ ucol_setVariableTop(UCollator *coll,
  */
 U_STABLE uint32_t U_EXPORT2 ucol_getVariableTop(const UCollator *coll, UErrorCode *status);
 
+#ifndef U_HIDE_DEPRECATED_API
 /**
  * Sets the variable top to the specified primary weight.
  *
@@ -1284,6 +1285,7 @@ U_STABLE uint32_t U_EXPORT2 ucol_getVariableTop(const UCollator *coll, UErrorCod
  */
 U_DEPRECATED void U_EXPORT2 
 ucol_restoreVariableTop(UCollator *coll, const uint32_t varTop, UErrorCode *status);
+#endif  /* U_HIDE_DEPRECATED_API */
 
 /**
  * Thread safe cloning operation. The result is a clone of a given collator.