ICU-20119 Merge pull request #152 from gnrunge/icu63_1

ICU-20119 Smalles fixes for public and internal header test failures.

icu4c/source/common/unicode/uniset.h

@@ -1637,9 +1637,11 @@ private:
                      const UnicodeSet* inclusions,
                      UErrorCode &status);
 
+#ifndef U_HIDE_DRAFT_API   // Skipped: ucpmap.h is draft only.
     void applyIntPropertyValue(const UCPMap *map,
                                UCPMapValueFilter *filter, const void *context,
                                UErrorCode &errorCode);
+#endif
 
     /**
      * Set the new pattern to cache.

icu4c/source/i18n/erarules.h

@@ -4,6 +4,7 @@
 #ifndef ERARULES_H_
 #define ERARULES_H_
 
+#include "unicode/localpointer.h"
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING

icu4c/source/test/hdrtst/cxxfiles.txt

@@ -68,6 +68,7 @@ normalizer2.h
 normlzr.h
 nounit.h
 numberformatter.h
+numberrangeformatter.h
 numfmt.h
 numsys.h
 parsepos.h