diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj
index 833807fc383..894494d6869 100644
--- a/icu4c/source/common/common.vcxproj
+++ b/icu4c/source/common/common.vcxproj
@@ -334,6 +334,7 @@
     <ClCompile Include="utf_impl.cpp" />
     <ClCompile Include="listformatter.cpp" />
     <ClCompile Include="ulistformatter.cpp" />
+    <ClCompile Include="numparse_unisets.cpp" />
     <ClInclude Include="localsvc.h" />
     <ClInclude Include="msvcres.h" />
     <ClInclude Include="pluralmap.h" />
@@ -439,6 +440,7 @@
     <ClInclude Include="uinvchar.h" />
     <ClInclude Include="ustr_cnv.h" />
     <ClInclude Include="ustr_imp.h" />
+    <ClCompile Include="numparse_unisets.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="common.rc" />
diff --git a/icu4c/source/common/common.vcxproj.filters b/icu4c/source/common/common.vcxproj.filters
index f13253be5c0..3731c33d1f5 100644
--- a/icu4c/source/common/common.vcxproj.filters
+++ b/icu4c/source/common/common.vcxproj.filters
@@ -607,6 +607,9 @@
     <ClCompile Include="ubiditransform.cpp">
       <Filter>bidi</Filter>
     </ClCompile>
+    <ClCompile Include="numparse_unisets.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ubidi_props.h">
@@ -936,6 +939,9 @@
     <ClInclude Include="unicode\ubiditransform.h">
       <Filter>bidi</Filter>
     </ClInclude>
+    <ClInclude Include="numparse_unisets.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="common.rc">
diff --git a/icu4c/source/common/common_uwp.vcxproj b/icu4c/source/common/common_uwp.vcxproj
index af2f6538ba9..690ed860f44 100644
--- a/icu4c/source/common/common_uwp.vcxproj
+++ b/icu4c/source/common/common_uwp.vcxproj
@@ -459,6 +459,7 @@
     <ClCompile Include="utf_impl.cpp" />
     <ClCompile Include="listformatter.cpp" />
     <ClCompile Include="ulistformatter.cpp" />
+    <ClCompile Include="numparse_unisets.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="localsvc.h" />
@@ -565,6 +566,7 @@
     <ClInclude Include="uinvchar.h" />
     <ClInclude Include="ustr_cnv.h" />
     <ClInclude Include="ustr_imp.h" />
+    <ClCompile Include="numparse_unisets.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="common.rc" />
diff --git a/icu4c/source/i18n/dcfmtimp.h b/icu4c/source/i18n/dcfmtimp.h
index e582efb344b..387fad596ad 100644
--- a/icu4c/source/i18n/dcfmtimp.h
+++ b/icu4c/source/i18n/dcfmtimp.h
@@ -6,6 +6,8 @@
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************/
 
+// TODO: This file, and the corresponding UCONFIG settings, may be obsolete.
+
 #ifndef DCFMTIMP_H
 #define DCFMTIMP_H
 
diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj
index de4784aeebd..bdd87d3cff8 100644
--- a/icu4c/source/i18n/i18n.vcxproj
+++ b/icu4c/source/i18n/i18n.vcxproj
@@ -197,18 +197,6 @@
     <ClCompile Include="ucol_res.cpp" />
     <ClCompile Include="ucol_sit.cpp" />
     <ClCompile Include="ucoleitr.cpp" />
-    <ClCompile Include="affixpatternparser.cpp" />
-    <ClCompile Include="decimfmtimpl.cpp" />
-    <ClCompile Include="digitaffix.cpp" />
-    <ClCompile Include="digitaffixesandpadding.cpp" />
-    <ClCompile Include="digitformatter.cpp" />
-    <ClCompile Include="digitgrouping.cpp" />
-    <ClCompile Include="digitinterval.cpp" />
-    <ClCompile Include="pluralaffix.cpp" />
-    <ClCompile Include="precision.cpp" />
-    <ClCompile Include="smallintformatter.cpp" />
-    <ClCompile Include="valueformatter.cpp" />
-    <ClCompile Include="visibledigits.cpp" />
     <ClCompile Include="uitercollationiterator.cpp" />
     <ClCompile Include="usearch.cpp" />
     <ClCompile Include="astro.cpp" />
@@ -229,11 +217,8 @@
     <ClCompile Include="dayperiodrules.cpp" />
     <ClCompile Include="dcfmtsym.cpp" />
     <ClCompile Include="decContext.cpp" />
-    <ClCompile Include="decfmtst.cpp" />
-    <ClCompile Include="decimalformatpattern.cpp" />
     <ClCompile Include="decimfmt.cpp" />
     <ClCompile Include="decNumber.cpp" />
-    <ClCompile Include="digitlst.cpp" />
     <ClCompile Include="double-conversion-bignum-dtoa.cpp" />
     <ClCompile Include="double-conversion-bignum.cpp" />
     <ClCompile Include="double-conversion-cached-powers.cpp" />
@@ -284,6 +269,22 @@
     <ClCompile Include="number_rounding.cpp" />
     <ClCompile Include="number_scientific.cpp" />
     <ClCompile Include="number_stringbuilder.cpp" />
+    <ClCompile Include="number_utils.cpp" />
+    <ClCompile Include="number_mapper.cpp" />
+    <ClCompile Include="number_multiplier.cpp" />
+    <ClCompile Include="number_currencysymbols.cpp" />
+    <ClCompile Include="number_skeletons.cpp" />
+    <ClCompile Include="number_capi.cpp" />
+    <ClCompile Include="numparse_stringsegment.cpp" />
+    <ClCompile Include="numparse_parsednumber.cpp" />
+    <ClCompile Include="numparse_impl.cpp" />
+    <ClCompile Include="numparse_symbols.cpp" />
+    <ClCompile Include="numparse_decimal.cpp" />
+    <ClCompile Include="numparse_scientific.cpp" />
+    <ClCompile Include="numparse_currency.cpp" />
+    <ClCompile Include="numparse_affixes.cpp" />
+    <ClCompile Include="numparse_compositions.cpp" />
+    <ClCompile Include="numparse_validators.cpp" />
     <ClCompile Include="numfmt.cpp" />
     <ClCompile Include="numsys.cpp" />
     <ClCompile Include="olsontz.cpp" />
@@ -386,20 +387,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="bocsu.h" />
-    <ClInclude Include="affixpatternparser.h" />
-    <ClInclude Include="decimalformatpatternimpl.h" />
-    <ClInclude Include="decimfmtimpl.h" />
-    <ClInclude Include="digitaffix.h" />
-    <ClInclude Include="digitaffixesandpadding.h" />
-    <ClInclude Include="digitformatter.h" />
-    <ClInclude Include="digitgrouping.h" />
-    <ClInclude Include="digitinterval.h" />
-    <ClInclude Include="pluralaffix.h" />
-    <ClInclude Include="precision.h" />
-    <ClInclude Include="significantdigitinterval.h" />
-    <ClInclude Include="smallintformatter.h" />
-    <ClInclude Include="valueformatter.h" />
-    <ClInclude Include="visibledigits.h" />
     <ClInclude Include="collation.h" />
     <ClInclude Include="collationbuilder.h" />
     <ClInclude Include="collationcompare.h" />
@@ -437,11 +424,8 @@
     <ClInclude Include="currfmt.h" />
     <ClInclude Include="dangical.h" />
     <ClInclude Include="decContext.h" />
-    <ClInclude Include="decfmtst.h" />
-    <ClInclude Include="decimalformatpattern.h" />
     <ClInclude Include="decNumber.h" />
     <ClInclude Include="decNumberLocal.h" />
-    <ClInclude Include="digitlst.h" />
     <ClInclude Include="double-conversion-bignum-dtoa.h" />
     <ClInclude Include="double-conversion-bignum.h" />
     <ClInclude Include="double-conversion-cached-powers.h" />
@@ -545,6 +529,21 @@
     <ClInclude Include="number_stringbuilder.h" />
     <ClInclude Include="number_types.h" />
     <ClInclude Include="number_utils.h" />
+    <ClInclude Include="number_mapper.h" />
+    <ClInclude Include="number_multiplier.h" />
+    <ClInclude Include="number_currencysymbols.h" />
+    <ClInclude Include="number_skeletons.h" />
+    <ClInclude Include="numparse_stringsegment.h" />
+    <ClInclude Include="numparse_impl.h" />
+    <ClInclude Include="numparse_symbols.h" />
+    <ClInclude Include="numparse_decimal.h" />
+    <ClInclude Include="numparse_scientific.h" />
+    <ClInclude Include="numparse_currency.h" />
+    <ClInclude Include="numparse_affixes.h" />
+    <ClInclude Include="numparse_compositions.h" />
+    <ClInclude Include="numparse_validators.h" />
+    <ClInclude Include="numparse_types.h" />
+    <ClInclude Include="numparse_utils.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="i18n.rc" />
diff --git a/icu4c/source/i18n/i18n.vcxproj.filters b/icu4c/source/i18n/i18n.vcxproj.filters
index d14910b0100..4b5743c505f 100644
--- a/icu4c/source/i18n/i18n.vcxproj.filters
+++ b/icu4c/source/i18n/i18n.vcxproj.filters
@@ -54,45 +54,6 @@
     <ClCompile Include="usearch.cpp">
       <Filter>collation</Filter>
     </ClCompile>
-    <ClCompile Include="affixpatternparser.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="dayperiodrules.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="decimfmtimpl.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="digitaffix.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="digitaffixesandpadding.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="digitformatter.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="digitgrouping.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="digitinterval.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="pluralaffix.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="precision.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="smallintformatter.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="valueformatter.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="visibledigits.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
     <ClCompile Include="astro.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
@@ -141,21 +102,12 @@
     <ClCompile Include="decContext.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
-    <ClCompile Include="decfmtst.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
-    <ClCompile Include="decimalformatpattern.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
     <ClCompile Include="decimfmt.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
     <ClCompile Include="decNumber.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
-    <ClCompile Include="digitlst.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
     <ClCompile Include="double-conversion-bignum-dtoa.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
@@ -561,8 +513,8 @@
     <ClCompile Include="uregion.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
-    <ClCompile Include="number_stringbuilder.cpp">
-      <Filter>formatting</Filter>
+    <ClCompile Include="nounit.cpp">
+      <Filter>misc</Filter>
     </ClCompile>
     <ClCompile Include="number_affixutils.cpp">
       <Filter>formatting</Filter>
@@ -612,8 +564,56 @@
     <ClCompile Include="number_scientific.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
-    <ClCompile Include="nounit.cpp">
-      <Filter>misc</Filter>
+    <ClCompile Include="number_stringbuilder.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="number_utils.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="number_mapper.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="number_multiplier.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="number_currencysymbols.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="number_skeletons.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="number_capi.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numparse_stringsegment.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numparse_parsednumber.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numparse_impl.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numparse_symbols.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numparse_decimal.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numparse_scientific.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numparse_currency.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numparse_affixes.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numparse_compositions.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numparse_validators.cpp">
+      <Filter>formatting</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -698,48 +698,6 @@
     <ClInclude Include="usrchimp.h">
       <Filter>collation</Filter>
     </ClInclude>
-    <ClInclude Include="affixpatternparser.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="decimalformatpatternimpl.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="decimfmtimpl.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="digitaffix.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="digitaffixesandpadding.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="digitformatter.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="digitgrouping.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="digitinterval.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="pluralaffix.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="precision.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="significantdigitinterval.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="smallintformatter.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="valueformatter.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="visibledigits.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
     <ClInclude Include="astro.h">
       <Filter>formatting</Filter>
     </ClInclude>
@@ -767,21 +725,12 @@
     <ClInclude Include="decContext.h">
       <Filter>formatting</Filter>
     </ClInclude>
-    <ClInclude Include="decfmtst.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
-    <ClInclude Include="decimalformatpattern.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
     <ClInclude Include="decNumber.h">
       <Filter>formatting</Filter>
     </ClInclude>
     <ClInclude Include="decNumberLocal.h">
       <Filter>formatting</Filter>
     </ClInclude>
-    <ClInclude Include="digitlst.h">
-      <Filter>formatting</Filter>
-    </ClInclude>
     <ClInclude Include="double-conversion-bignum-dtoa.h">
       <Filter>formatting</Filter>
     </ClInclude>
@@ -893,6 +842,51 @@
     <ClInclude Include="number_utils.h">
       <Filter>formatting</Filter>
     </ClInclude>
+    <ClInclude Include="number_mapper.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="number_multiplier.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="number_currencysymbols.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="number_skeletons.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="numparse_stringsegment.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="numparse_impl.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="numparse_symbols.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="numparse_decimal.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="numparse_scientific.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="numparse_currency.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="numparse_affixes.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="numparse_compositions.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="numparse_validators.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="numparse_types.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
+    <ClInclude Include="numparse_utils.h">
+      <Filter>formatting</Filter>
+    </ClInclude>
     <ClInclude Include="olsontz.h">
       <Filter>formatting</Filter>
     </ClInclude>
@@ -1411,10 +1405,13 @@
       <Filter>formatting</Filter>
     </CustomBuild>
     <CustomBuild Include="unicode\nounit.h">
-      <Filter>misc</Filter>
+      <Filter>formatting</Filter>
     </CustomBuild>
     <CustomBuild Include="unicode\numberformatter.h">
       <Filter>formatting</Filter>
     </CustomBuild>
+    <CustomBuild Include="unicode\unumberformatter.h">
+      <Filter>formatting</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/icu4c/source/i18n/i18n_uwp.vcxproj b/icu4c/source/i18n/i18n_uwp.vcxproj
index 266e3c1e279..972b8ddf958 100644
--- a/icu4c/source/i18n/i18n_uwp.vcxproj
+++ b/icu4c/source/i18n/i18n_uwp.vcxproj
@@ -304,18 +304,6 @@
     <ClCompile Include="ucol_res.cpp" />
     <ClCompile Include="ucol_sit.cpp" />
     <ClCompile Include="ucoleitr.cpp" />
-    <ClCompile Include="affixpatternparser.cpp" />
-    <ClCompile Include="decimfmtimpl.cpp" />
-    <ClCompile Include="digitaffix.cpp" />
-    <ClCompile Include="digitaffixesandpadding.cpp" />
-    <ClCompile Include="digitformatter.cpp" />
-    <ClCompile Include="digitgrouping.cpp" />
-    <ClCompile Include="digitinterval.cpp" />
-    <ClCompile Include="pluralaffix.cpp" />
-    <ClCompile Include="precision.cpp" />
-    <ClCompile Include="smallintformatter.cpp" />
-    <ClCompile Include="valueformatter.cpp" />
-    <ClCompile Include="visibledigits.cpp" />
     <ClCompile Include="uitercollationiterator.cpp" />
     <ClCompile Include="usearch.cpp" />
     <ClCompile Include="astro.cpp" />
@@ -336,11 +324,8 @@
     <ClCompile Include="dayperiodrules.cpp" />
     <ClCompile Include="dcfmtsym.cpp" />
     <ClCompile Include="decContext.cpp" />
-    <ClCompile Include="decfmtst.cpp" />
-    <ClCompile Include="decimalformatpattern.cpp" />
     <ClCompile Include="decimfmt.cpp" />
     <ClCompile Include="decNumber.cpp" />
-    <ClCompile Include="digitlst.cpp" />
     <ClCompile Include="double-conversion-bignum-dtoa.cpp" />
     <ClCompile Include="double-conversion-bignum.cpp" />
     <ClCompile Include="double-conversion-cached-powers.cpp" />
@@ -391,6 +376,22 @@
     <ClCompile Include="number_rounding.cpp" />
     <ClCompile Include="number_scientific.cpp" />
     <ClCompile Include="number_stringbuilder.cpp" />
+    <ClCompile Include="number_utils.cpp" />
+    <ClCompile Include="number_mapper.cpp" />
+    <ClCompile Include="number_multiplier.cpp" />
+    <ClCompile Include="number_currencysymbols.cpp" />
+    <ClCompile Include="number_skeletons.cpp" />
+    <ClCompile Include="number_capi.cpp" />
+    <ClCompile Include="numparse_stringsegment.cpp" />
+    <ClCompile Include="numparse_parsednumber.cpp" />
+    <ClCompile Include="numparse_impl.cpp" />
+    <ClCompile Include="numparse_symbols.cpp" />
+    <ClCompile Include="numparse_decimal.cpp" />
+    <ClCompile Include="numparse_scientific.cpp" />
+    <ClCompile Include="numparse_currency.cpp" />
+    <ClCompile Include="numparse_affixes.cpp" />
+    <ClCompile Include="numparse_compositions.cpp" />
+    <ClCompile Include="numparse_validators.cpp" />
     <ClCompile Include="numfmt.cpp" />
     <ClCompile Include="numsys.cpp" />
     <ClCompile Include="olsontz.cpp" />
@@ -491,20 +492,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="bocsu.h" />
-    <ClInclude Include="affixpatternparser.h" />
-    <ClInclude Include="decimalformatpatternimpl.h" />
-    <ClInclude Include="decimfmtimpl.h" />
-    <ClInclude Include="digitaffix.h" />
-    <ClInclude Include="digitaffixesandpadding.h" />
-    <ClInclude Include="digitformatter.h" />
-    <ClInclude Include="digitgrouping.h" />
-    <ClInclude Include="digitinterval.h" />
-    <ClInclude Include="pluralaffix.h" />
-    <ClInclude Include="precision.h" />
-    <ClInclude Include="significantdigitinterval.h" />
-    <ClInclude Include="smallintformatter.h" />
-    <ClInclude Include="valueformatter.h" />
-    <ClInclude Include="visibledigits.h" />
     <ClInclude Include="collation.h" />
     <ClInclude Include="collationbuilder.h" />
     <ClInclude Include="collationcompare.h" />
@@ -542,11 +529,8 @@
     <ClInclude Include="currfmt.h" />
     <ClInclude Include="dangical.h" />
     <ClInclude Include="decContext.h" />
-    <ClInclude Include="decfmtst.h" />
-    <ClInclude Include="decimalformatpattern.h" />
     <ClInclude Include="decNumber.h" />
     <ClInclude Include="decNumberLocal.h" />
-    <ClInclude Include="digitlst.h" />
     <ClInclude Include="double-conversion-bignum-dtoa.h" />
     <ClInclude Include="double-conversion-bignum.h" />
     <ClInclude Include="double-conversion-cached-powers.h" />
@@ -650,6 +634,21 @@
     <ClInclude Include="number_stringbuilder.h" />
     <ClInclude Include="number_types.h" />
     <ClInclude Include="number_utils.h" />
+    <ClInclude Include="number_mapper.h" />
+    <ClInclude Include="number_multiplier.h" />
+    <ClInclude Include="number_currencysymbols.h" />
+    <ClInclude Include="number_skeletons.h" />
+    <ClInclude Include="numparse_stringsegment.h" />
+    <ClInclude Include="numparse_impl.h" />
+    <ClInclude Include="numparse_symbols.h" />
+    <ClInclude Include="numparse_decimal.h" />
+    <ClInclude Include="numparse_scientific.h" />
+    <ClInclude Include="numparse_currency.h" />
+    <ClInclude Include="numparse_affixes.h" />
+    <ClInclude Include="numparse_compositions.h" />
+    <ClInclude Include="numparse_validators.h" />
+    <ClInclude Include="numparse_types.h" />
+    <ClInclude Include="numparse_utils.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="i18n.rc" />
diff --git a/icu4c/source/i18n/significantdigitinterval.h b/icu4c/source/i18n/significantdigitinterval.h
deleted file mode 100644
index fc23370de5b..00000000000
--- a/icu4c/source/i18n/significantdigitinterval.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// © 2016 and later: Unicode, Inc. and others.
-// License & terms of use: http://www.unicode.org/copyright.html
-/*
-*******************************************************************************
-* Copyright (C) 2015, International Business Machines
-* Corporation and others.  All Rights Reserved.
-*******************************************************************************
-* significantdigitinterval.h
-*
-* created on: 2015jan6
-* created by: Travis Keep
-*/
-
-#ifndef __SIGNIFICANTDIGITINTERVAL_H__
-#define __SIGNIFICANTDIGITINTERVAL_H__
-
-#include "unicode/uobject.h"
-#include "unicode/utypes.h"
-
-U_NAMESPACE_BEGIN
-
-/**
- * An interval of allowed significant digit counts.
- */
-class U_I18N_API SignificantDigitInterval : public UMemory {
-public:
-
-    /**
-     * No limits on significant digits.
-     */
-    SignificantDigitInterval()
-            : fMax(INT32_MAX), fMin(0) { }
-
-    /**
-     * Make this instance have no limit on significant digits.
-     */
-    void clear() {
-        fMin = 0;
-        fMax = INT32_MAX;
-    }
-
-    /**
-     * Returns TRUE if this object is equal to rhs.
-     */
-    UBool equals(const SignificantDigitInterval &rhs) const {
-        return ((fMax == rhs.fMax) && (fMin == rhs.fMin));
-    }
-
-    /**
-     * Sets maximum significant digits. 0 or negative means no maximum.
-     */
-    void setMax(int32_t count) {
-        fMax = count <= 0 ? INT32_MAX : count;
-    }
-
-    /**
-     * Get maximum significant digits. INT32_MAX means no maximum.
-     */
-    int32_t getMax() const {
-        return fMax;
-    }
-
-    /**
-     * Sets minimum significant digits. 0 or negative means no minimum.
-     */
-    void setMin(int32_t count) {
-        fMin = count <= 0 ? 0 : count;
-    }
-
-    /**
-     * Get maximum significant digits. 0 means no minimum.
-     */
-    int32_t getMin() const {
-        return fMin;
-    }
-
-    /**
-     * Returns TRUE if this instance represents no constraints on significant
-     * digits.
-     */
-    UBool isNoConstraints() const {
-        return fMin == 0 && fMax == INT32_MAX;
-    }
-
-private:
-    int32_t fMax;
-    int32_t fMin;
-};
-
-U_NAMESPACE_END
-
-#endif  // __SIGNIFICANTDIGITINTERVAL_H__
diff --git a/icu4c/source/test/cintltst/cintltst.vcxproj b/icu4c/source/test/cintltst/cintltst.vcxproj
index f64f9d20048..143e9176a1a 100644
--- a/icu4c/source/test/cintltst/cintltst.vcxproj
+++ b/icu4c/source/test/cintltst/cintltst.vcxproj
@@ -242,6 +242,7 @@
     <ClCompile Include="spooftest.c" />
     <ClCompile Include="uregiontest.c" />
     <ClCompile Include="ulistfmttest.c" />
+    <ClCompile Include="unumberformattertst.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="cbiditst.h" />
diff --git a/icu4c/source/test/cintltst/cintltst.vcxproj.filters b/icu4c/source/test/cintltst/cintltst.vcxproj.filters
index e51a98f964f..be69d72a8a7 100644
--- a/icu4c/source/test/cintltst/cintltst.vcxproj.filters
+++ b/icu4c/source/test/cintltst/cintltst.vcxproj.filters
@@ -216,6 +216,9 @@
     <ClCompile Include="ulistfmttest.c">
       <Filter>formatting</Filter>
     </ClCompile>
+    <ClInclude Include="unumberformattertst.c">
+      <Filter>formatting</Filter>
+    </ClInclude>
     <ClCompile Include="cldrtest.c">
       <Filter>locales &amp; resources</Filter>
     </ClCompile>
diff --git a/icu4c/source/test/intltest/intltest.vcxproj b/icu4c/source/test/intltest/intltest.vcxproj
index 32bd338d795..8dda453125e 100644
--- a/icu4c/source/test/intltest/intltest.vcxproj
+++ b/icu4c/source/test/intltest/intltest.vcxproj
@@ -248,12 +248,15 @@
     <ClCompile Include="numbertest_affixutils.cpp" />
     <ClCompile Include="numbertest_api.cpp" />
     <ClCompile Include="numbertest_decimalquantity.cpp" />
-    <ClCompile Include="numbertest_doubleconversion.cpp" />
     <ClCompile Include="numbertest_modifiers.cpp" />
     <ClCompile Include="numbertest_patternmodifier.cpp" />
     <ClCompile Include="numbertest_patternstring.cpp" />
     <ClCompile Include="numbertest_stringbuilder.cpp" />
-    <ClCompile Include="numberformat2test.cpp" />
+    <ClCompile Include="numbertest_stringsegment.cpp" />
+    <ClCompile Include="numbertest_unisets.cpp" />
+    <ClCompile Include="numbertest_parse.cpp" />
+    <ClCompile Include="numbertest_doubleconversion.cpp" />
+    <ClCompile Include="numbertest_skeletons.cpp" />
     <ClCompile Include="numfmtst.cpp" />
     <ClCompile Include="numrgts.cpp" />
     <ClCompile Include="pluralmaptest.cpp" />
diff --git a/icu4c/source/test/intltest/intltest.vcxproj.filters b/icu4c/source/test/intltest/intltest.vcxproj.filters
index 442793e69df..2e54fee0920 100644
--- a/icu4c/source/test/intltest/intltest.vcxproj.filters
+++ b/icu4c/source/test/intltest/intltest.vcxproj.filters
@@ -256,9 +256,6 @@
     <ClCompile Include="numberformattesttuple.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
-    <ClCompile Include="numberformat2test.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
     <ClCompile Include="numbertest_affixutils.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
@@ -268,9 +265,6 @@
     <ClCompile Include="numbertest_decimalquantity.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
-    <ClCompile Include="numbertest_doubleconversion.cpp">
-      <Filter>formatting</Filter>
-    </ClCompile>
     <ClCompile Include="numbertest_modifiers.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
@@ -283,6 +277,21 @@
     <ClCompile Include="numbertest_stringbuilder.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
+    <ClCompile Include="numbertest_stringsegment.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numbertest_unisets.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numbertest_parse.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numbertest_doubleconversion.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
+    <ClCompile Include="numbertest_skeletons.cpp">
+      <Filter>formatting</Filter>
+    </ClCompile>
     <ClCompile Include="numfmtst.cpp">
       <Filter>formatting</Filter>
     </ClCompile>