diff --git a/icu4c/source/common/brkdict.cpp b/icu4c/source/common/brkdict.cpp index 867fa60d583..6f3977cb967 100644 --- a/icu4c/source/common/brkdict.cpp +++ b/icu4c/source/common/brkdict.cpp @@ -8,9 +8,9 @@ ********************************************************************** */ +#include "unicode/resbund.h" #include "brkdict.h" #include "cmemory.h" -#include "unicode/resbund.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/common/cmemory.h b/icu4c/source/common/cmemory.h index 390bebbc447..16414a50777 100644 --- a/icu4c/source/common/cmemory.h +++ b/icu4c/source/common/cmemory.h @@ -24,6 +24,7 @@ #ifndef CMEMORY_H #define CMEMORY_H +#include "unicode/utypes.h" #include #include diff --git a/icu4c/source/common/cstring.h b/icu4c/source/common/cstring.h index 7998b7ea364..3ea11186800 100644 --- a/icu4c/source/common/cstring.h +++ b/icu4c/source/common/cstring.h @@ -25,10 +25,10 @@ #ifndef CSTRING_H #define CSTRING_H 1 +#include "unicode/utypes.h" #include #include #include -#include "unicode/utypes.h" #define uprv_strcpy(dst, src) U_STANDARD_CPP_NAMESPACE strcpy(dst, src) #define uprv_strcpyWithSize(dst, src, size) U_STANDARD_CPP_NAMESPACE strncpy(dst, src, size) diff --git a/icu4c/source/common/digitlst.cpp b/icu4c/source/common/digitlst.cpp index cdd46cac774..a249a54a1bd 100644 --- a/icu4c/source/common/digitlst.cpp +++ b/icu4c/source/common/digitlst.cpp @@ -24,12 +24,12 @@ ****************************************************************************** */ +#include "unicode/putil.h" #include "digitlst.h" #include #include #include #include -#include "unicode/putil.h" // *************************************************************************** // class DigitList diff --git a/icu4c/source/common/putil.c b/icu4c/source/common/putil.c index 01393d63c0b..eb0c00b27ea 100644 --- a/icu4c/source/common/putil.c +++ b/icu4c/source/common/putil.c @@ -58,15 +58,6 @@ #endif /* PTX */ -/* Include standard headers. */ -#include -#include -#include -#include -#include -#include -#include - /* include ICU headers */ #include "unicode/utypes.h" #include "unicode/putil.h" @@ -76,6 +67,15 @@ #include "locmap.h" #include "ucln_cmn.h" +/* Include standard headers. */ +#include +#include +#include +#include +#include +#include +#include + /* include system headers */ #ifdef WIN32 # define WIN32_LEAN_AND_MEAN diff --git a/icu4c/source/common/rbbidata.cpp b/icu4c/source/common/rbbidata.cpp index f75434bfea0..11d11c94539 100644 --- a/icu4c/source/common/rbbidata.cpp +++ b/icu4c/source/common/rbbidata.cpp @@ -6,10 +6,10 @@ */ #include "unicode/utypes.h" -#include "cmemory.h" #include "rbbidata.h" #include "utrie.h" #include "udatamem.h" +#include "cmemory.h" #include #include diff --git a/icu4c/source/common/rbbisetb.cpp b/icu4c/source/common/rbbisetb.cpp index aa19932d086..7819fb75c9f 100644 --- a/icu4c/source/common/rbbisetb.cpp +++ b/icu4c/source/common/rbbisetb.cpp @@ -30,9 +30,9 @@ #include "unicode/uniset.h" #include "utrie.h" -#include "cmemory.h" #include "uvector.h" #include "assert.h" +#include "cmemory.h" #include #include "rbbisetb.h" diff --git a/icu4c/source/common/ustrfmt.c b/icu4c/source/common/ustrfmt.c index 21c2f2d3453..04cec5f6992 100644 --- a/icu4c/source/common/ustrfmt.c +++ b/icu4c/source/common/ustrfmt.c @@ -5,10 +5,9 @@ ********************************************************************** */ -#include #include "cstring.h" - #include "ustrfmt.h" +#include U_CAPI double U_EXPORT2 uprv_strtod(const char* source, char** end) diff --git a/icu4c/source/extra/uconv/uconv.cpp b/icu4c/source/extra/uconv/uconv.cpp index 276bf615234..2b1c9213883 100644 --- a/icu4c/source/extra/uconv/uconv.cpp +++ b/icu4c/source/extra/uconv/uconv.cpp @@ -16,16 +16,16 @@ * */ -#include -#include -#include -#include - #include #include #include #include +#include +#include +#include +#include + #include "cmemory.h" #include "cstring.h" #include "ustrfmt.h" diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp index f0b57722416..2fb657cfdba 100644 --- a/icu4c/source/i18n/calendar.cpp +++ b/icu4c/source/i18n/calendar.cpp @@ -24,10 +24,10 @@ ******************************************************************************* */ -#include "cpputils.h" #include "unicode/resbund.h" #include "unicode/gregocal.h" #include "unicode/calendar.h" +#include "cpputils.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/caniter.cpp b/icu4c/source/i18n/caniter.cpp index 27438422e08..e7f5a3c1b7f 100644 --- a/icu4c/source/i18n/caniter.cpp +++ b/icu4c/source/i18n/caniter.cpp @@ -5,12 +5,12 @@ ***************************************************************************** */ -#include "hash.h" #include "unicode/uset.h" +#include "unicode/ustring.h" +#include "hash.h" #include "unormimp.h" #include "caniter.h" #include "cmemory.h" -#include "unicode/ustring.h" /** * This class allows one to iterate through all the strings that are canonically equivalent to a given diff --git a/icu4c/source/i18n/choicfmt.cpp b/icu4c/source/i18n/choicfmt.cpp index 14dfeee5991..49600f463c0 100644 --- a/icu4c/source/i18n/choicfmt.cpp +++ b/icu4c/source/i18n/choicfmt.cpp @@ -23,10 +23,10 @@ ******************************************************************************** */ -#include "cpputils.h" #include "unicode/choicfmt.h" #include "unicode/numfmt.h" #include "unicode/locid.h" +#include "cpputils.h" #include "ustrfmt.h" // ***************************************************************************** diff --git a/icu4c/source/i18n/coleitr.cpp b/icu4c/source/i18n/coleitr.cpp index f8ceea524cb..f3ba03f11f4 100644 --- a/icu4c/source/i18n/coleitr.cpp +++ b/icu4c/source/i18n/coleitr.cpp @@ -25,9 +25,9 @@ */ #include "unicode/coleitr.h" +#include "unicode/ustring.h" #include "ucol_imp.h" #include "cmemory.h" -#include "unicode/ustring.h" /* Constants --------------------------------------------------------------- */ diff --git a/icu4c/source/i18n/decimfmt.cpp b/icu4c/source/i18n/decimfmt.cpp index 34e33d6e92d..d37cbee20b6 100644 --- a/icu4c/source/i18n/decimfmt.cpp +++ b/icu4c/source/i18n/decimfmt.cpp @@ -38,14 +38,14 @@ */ #include "unicode/decimfmt.h" -#include "digitlst.h" +#include "unicode/ucurr.h" +#include "unicode/ustring.h" #include "unicode/dcfmtsym.h" #include "unicode/resbund.h" #include "unicode/uchar.h" +#include "digitlst.h" #include "cmemory.h" #include "cstring.h" -#include "unicode/ucurr.h" -#include "unicode/ustring.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/digitlst.cpp b/icu4c/source/i18n/digitlst.cpp index cdd46cac774..a249a54a1bd 100644 --- a/icu4c/source/i18n/digitlst.cpp +++ b/icu4c/source/i18n/digitlst.cpp @@ -24,12 +24,12 @@ ****************************************************************************** */ +#include "unicode/putil.h" #include "digitlst.h" #include #include #include #include -#include "unicode/putil.h" // *************************************************************************** // class DigitList diff --git a/icu4c/source/i18n/funcrepl.cpp b/icu4c/source/i18n/funcrepl.cpp index 3a13e368e66..dbd0b07efd5 100644 --- a/icu4c/source/i18n/funcrepl.cpp +++ b/icu4c/source/i18n/funcrepl.cpp @@ -7,9 +7,9 @@ * 02/04/2002 aliu Creation. ********************************************************************** */ -#include "funcrepl.h" #include "unicode/translit.h" #include "unicode/uniset.h" +#include "funcrepl.h" static const UChar AMPERSAND = 38; // '&' static const UChar OPEN[] = {40,32,0}; // "( " diff --git a/icu4c/source/i18n/name2uni.cpp b/icu4c/source/i18n/name2uni.cpp index 455aafcfc57..89562b4495f 100644 --- a/icu4c/source/i18n/name2uni.cpp +++ b/icu4c/source/i18n/name2uni.cpp @@ -8,9 +8,9 @@ ********************************************************************** */ -#include "name2uni.h" #include "unicode/unifilt.h" #include "unicode/uchar.h" +#include "name2uni.h" // As of Unicode 3.0.0, the longest name is 83 characters long. #define LONGEST_NAME 83 diff --git a/icu4c/source/i18n/nfrlist.h b/icu4c/source/i18n/nfrlist.h index b108897501e..e9d07d9213a 100644 --- a/icu4c/source/i18n/nfrlist.h +++ b/icu4c/source/i18n/nfrlist.h @@ -18,10 +18,10 @@ #include "unicode/utypes.h" #include "unicode/uobject.h" -#include "cmemory.h" - #include "nfrule.h" +#include "cmemory.h" + U_NAMESPACE_BEGIN // unsafe class for internal use only. assume memory allocations succeed, indexes are valid. diff --git a/icu4c/source/i18n/nfrs.cpp b/icu4c/source/i18n/nfrs.cpp index 6adaca601c8..846d20d3b5a 100644 --- a/icu4c/source/i18n/nfrs.cpp +++ b/icu4c/source/i18n/nfrs.cpp @@ -17,9 +17,9 @@ #if U_HAVE_RBNF +#include "unicode/uchar.h" #include "nfrule.h" #include "nfrlist.h" -#include "unicode/uchar.h" #ifdef RBNF_DEBUG #include "cmemory.h" diff --git a/icu4c/source/i18n/rbnf.cpp b/icu4c/source/i18n/rbnf.cpp index c4093584ee8..bbdbbbcd4f2 100644 --- a/icu4c/source/i18n/rbnf.cpp +++ b/icu4c/source/i18n/rbnf.cpp @@ -8,10 +8,6 @@ #if U_HAVE_RBNF -#include "nfrs.h" - -#include "cmemory.h" -#include "cstring.h" #include "unicode/normlzr.h" #include "unicode/tblcoll.h" #include "unicode/uchar.h" @@ -22,7 +18,10 @@ #include "unicode/ustring.h" #include "unicode/utf16.h" -#include +#include "nfrs.h" + +#include "cmemory.h" +#include "cstring.h" static const UChar gPercentPercent[] = { diff --git a/icu4c/source/i18n/rbt.cpp b/icu4c/source/i18n/rbt.cpp index b0c7ce29e66..ca6f4e487cc 100644 --- a/icu4c/source/i18n/rbt.cpp +++ b/icu4c/source/i18n/rbt.cpp @@ -8,11 +8,11 @@ ********************************************************************** */ #include "unicode/rbt.h" +#include "unicode/rep.h" +#include "unicode/uniset.h" #include "rbt_pars.h" #include "rbt_data.h" #include "rbt_rule.h" -#include "unicode/rep.h" -#include "unicode/uniset.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/rbt_data.cpp b/icu4c/source/i18n/rbt_data.cpp index a90c6c8aee8..999b188aaa4 100644 --- a/icu4c/source/i18n/rbt_data.cpp +++ b/icu4c/source/i18n/rbt_data.cpp @@ -7,10 +7,10 @@ * 11/17/99 aliu Creation. ********************************************************************** */ -#include "rbt_data.h" -#include "hash.h" #include "unicode/unistr.h" #include "unicode/uniset.h" +#include "rbt_data.h" +#include "hash.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/rbt_rule.cpp b/icu4c/source/i18n/rbt_rule.cpp index 7b9993ccd5c..b8db220b2e1 100644 --- a/icu4c/source/i18n/rbt_rule.cpp +++ b/icu4c/source/i18n/rbt_rule.cpp @@ -7,11 +7,11 @@ * 11/17/99 aliu Creation. ********************************************************************** */ -#include "rbt_rule.h" #include "unicode/rep.h" -#include "rbt_data.h" #include "unicode/unifilt.h" #include "unicode/uniset.h" +#include "rbt_rule.h" +#include "rbt_data.h" #include "cmemory.h" #include "strmatch.h" #include "strrepl.h" diff --git a/icu4c/source/i18n/rbt_set.cpp b/icu4c/source/i18n/rbt_set.cpp index e971a5270fa..3b6dd90dda6 100644 --- a/icu4c/source/i18n/rbt_set.cpp +++ b/icu4c/source/i18n/rbt_set.cpp @@ -7,10 +7,10 @@ * 11/17/99 aliu Creation. ********************************************************************** */ -#include "rbt_set.h" -#include "rbt_rule.h" #include "unicode/unistr.h" #include "unicode/uniset.h" +#include "rbt_set.h" +#include "rbt_rule.h" #include "cmemory.h" U_CDECL_BEGIN diff --git a/icu4c/source/i18n/stsearch.cpp b/icu4c/source/i18n/stsearch.cpp index 959f7058417..208ee643995 100644 --- a/icu4c/source/i18n/stsearch.cpp +++ b/icu4c/source/i18n/stsearch.cpp @@ -7,9 +7,9 @@ ********************************************************************** */ -#include "cmemory.h" -#include "usrchimp.h" #include "unicode/stsearch.h" +#include "usrchimp.h" +#include "cmemory.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/tblcoll.cpp b/icu4c/source/i18n/tblcoll.cpp index 8e270e151db..1907ab59d6c 100644 --- a/icu4c/source/i18n/tblcoll.cpp +++ b/icu4c/source/i18n/tblcoll.cpp @@ -54,12 +54,12 @@ * 01/29/01 synwee Modified into a C++ wrapper calling C APIs (ucol.h) */ -#include "ucol_imp.h" -#include "uresimp.h" #include "unicode/tblcoll.h" #include "unicode/coleitr.h" -#include "uhash.h" #include "unicode/resbund.h" +#include "ucol_imp.h" +#include "uresimp.h" +#include "uhash.h" #include "cmemory.h" /* public RuleBasedCollator constructor ---------------------------------- */ diff --git a/icu4c/source/i18n/timezone.cpp b/icu4c/source/i18n/timezone.cpp index b5cf7e0bfe8..d053fafb0ad 100644 --- a/icu4c/source/i18n/timezone.cpp +++ b/icu4c/source/i18n/timezone.cpp @@ -41,8 +41,8 @@ #include "mutex.h" #include "unicode/udata.h" #include "tzdat.h" -#include "cstring.h" #include "ucln_in.h" +#include "cstring.h" // static initialization diff --git a/icu4c/source/i18n/titletrn.cpp b/icu4c/source/i18n/titletrn.cpp index 88acf9484cd..f719cdfde91 100644 --- a/icu4c/source/i18n/titletrn.cpp +++ b/icu4c/source/i18n/titletrn.cpp @@ -9,11 +9,11 @@ */ #include "unicode/uchar.h" -#include "titletrn.h" #include "unicode/uniset.h" +#include "unicode/ustring.h" +#include "titletrn.h" #include "mutex.h" #include "ucln_in.h" -#include "unicode/ustring.h" #include "ustr_imp.h" #include "cpputils.h" diff --git a/icu4c/source/i18n/tolowtrn.cpp b/icu4c/source/i18n/tolowtrn.cpp index 31ce5aa4839..beef9010e6a 100644 --- a/icu4c/source/i18n/tolowtrn.cpp +++ b/icu4c/source/i18n/tolowtrn.cpp @@ -8,11 +8,11 @@ ********************************************************************** */ -#include "tolowtrn.h" +#include "unicode/uchar.h" #include "unicode/ustring.h" +#include "tolowtrn.h" #include "ustr_imp.h" #include "cpputils.h" -#include "unicode/uchar.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/toupptrn.cpp b/icu4c/source/i18n/toupptrn.cpp index 0c2c877786a..645a78fde2a 100644 --- a/icu4c/source/i18n/toupptrn.cpp +++ b/icu4c/source/i18n/toupptrn.cpp @@ -8,11 +8,11 @@ ********************************************************************** */ -#include "toupptrn.h" #include "unicode/ustring.h" +#include "unicode/uchar.h" +#include "toupptrn.h" #include "ustr_imp.h" #include "cpputils.h" -#include "unicode/uchar.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/translit.cpp b/icu4c/source/i18n/translit.cpp index f477c0a6d94..06856ba3abe 100644 --- a/icu4c/source/i18n/translit.cpp +++ b/icu4c/source/i18n/translit.cpp @@ -7,38 +7,39 @@ * 11/17/99 aliu Creation. ********************************************************************** */ -#include "cmemory.h" -#include "cstring.h" -#include "hash.h" -#include "mutex.h" -#include "rbt_data.h" -#include "rbt_pars.h" -#include "transreg.h" -#include "ucln_in.h" +#include "unicode/putil.h" +#include "unicode/translit.h" #include "unicode/cpdtrans.h" +#include "unicode/nultrans.h" #include "unicode/locid.h" #include "unicode/msgfmt.h" -#include "name2uni.h" -#include "nortrans.h" -#include "unicode/nultrans.h" -#include "unicode/putil.h" #include "unicode/rep.h" -#include "remtrans.h" #include "unicode/resbund.h" -#include "titletrn.h" -#include "tolowtrn.h" -#include "toupptrn.h" -#include "unicode/translit.h" -#include "uni2name.h" #include "unicode/unifilt.h" #include "unicode/unifltlg.h" #include "unicode/uniset.h" #include "unicode/uscript.h" +#include "rbt_data.h" +#include "rbt_pars.h" +#include "transreg.h" +#include "name2uni.h" +#include "nortrans.h" +#include "remtrans.h" +#include "titletrn.h" +#include "tolowtrn.h" +#include "toupptrn.h" +#include "uni2name.h" #include "esctrn.h" #include "unesctrn.h" -#include "util.h" #include "tridpars.h" #include "anytrans.h" +#include "util.h" +#include "hash.h" +#include "mutex.h" +#include "ucln_in.h" + +#include "cmemory.h" +#include "cstring.h" static const UChar TARGET_SEP = 0x002D; /*-*/ static const UChar ID_DELIM = 0x003B; /*;*/ diff --git a/icu4c/source/i18n/ucol.cpp b/icu4c/source/i18n/ucol.cpp index e031439f943..5c61ea1fb5e 100644 --- a/icu4c/source/i18n/ucol.cpp +++ b/icu4c/source/i18n/ucol.cpp @@ -16,6 +16,14 @@ * 03/16/2001 weiv Collation framework is rewritten in C and made UCA compliant */ +#include "unicode/uloc.h" +#include "unicode/coll.h" +#include "unicode/tblcoll.h" +#include "unicode/coleitr.h" +#include "unicode/unorm.h" +#include "unicode/udata.h" +#include "unicode/uchar.h" + #include "ucol_bld.h" #include "ucol_imp.h" #include "ucol_tok.h" @@ -24,18 +32,10 @@ #include "unormimp.h" #include "uresimp.h" -#include "cstring.h" #include "umutex.h" #include "uhash.h" #include "ucln_in.h" - -#include "unicode/uloc.h" -#include "unicode/coll.h" -#include "unicode/tblcoll.h" -#include "unicode/coleitr.h" -#include "unicode/unorm.h" -#include "unicode/udata.h" -#include "unicode/uchar.h" +#include "cstring.h" #ifdef UCOL_DEBUG #include diff --git a/icu4c/source/i18n/ucol_cnt.cpp b/icu4c/source/i18n/ucol_cnt.cpp index 043c1c0ddbc..5c74be8df46 100644 --- a/icu4c/source/i18n/ucol_cnt.cpp +++ b/icu4c/source/i18n/ucol_cnt.cpp @@ -18,9 +18,9 @@ * */ +#include "unicode/uchar.h" #include "ucol_cnt.h" #include "cmemory.h" -#include "unicode/uchar.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/ucol_elm.cpp b/icu4c/source/i18n/ucol_elm.cpp index 09d97c8297d..77467f01de5 100644 --- a/icu4c/source/i18n/ucol_elm.cpp +++ b/icu4c/source/i18n/ucol_elm.cpp @@ -23,12 +23,12 @@ * 03/07/2001 synwee merged UCA's maxexpansion and tailoring's */ -#include "ucol_elm.h" #include "unicode/uchar.h" -#include "unormimp.h" -#include "cmemory.h" #include "unicode/unistr.h" +#include "ucol_elm.h" +#include "unormimp.h" #include "caniter.h" +#include "cmemory.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/ucol_tok.cpp b/icu4c/source/i18n/ucol_tok.cpp index c3e5a720aca..32e65197687 100644 --- a/icu4c/source/i18n/ucol_tok.cpp +++ b/icu4c/source/i18n/ucol_tok.cpp @@ -21,8 +21,8 @@ #include "unicode/ustring.h" #include "unicode/uchar.h" -#include "cmemory.h" #include "ucol_tok.h" +#include "cmemory.h" U_CDECL_BEGIN static int32_t U_EXPORT2 U_CALLCONV diff --git a/icu4c/source/i18n/ucol_wgt.c b/icu4c/source/i18n/ucol_wgt.c index 7d1939f82a5..ff7b01bd5cf 100644 --- a/icu4c/source/i18n/ucol_wgt.c +++ b/icu4c/source/i18n/ucol_wgt.c @@ -18,6 +18,11 @@ * It is used only internally by ucol_bld. */ +#include "unicode/utypes.h" +#include "ucol_imp.h" +#include "ucol_wgt.h" +#include "cmemory.h" + #ifdef UCOL_DEBUG # include #endif @@ -25,11 +30,6 @@ /* we are using qsort() */ #include -#include "unicode/utypes.h" -#include "cmemory.h" -#include "ucol_imp.h" -#include "ucol_wgt.h" - #if defined(UCOL_DEBUG) && defined(WIN32) /* turn off "unreferenced formal parameter" */ # pragma warning(disable: 4100) diff --git a/icu4c/source/i18n/ucoleitr.cpp b/icu4c/source/i18n/ucoleitr.cpp index e0a705e5da1..a0e23dca780 100644 --- a/icu4c/source/i18n/ucoleitr.cpp +++ b/icu4c/source/i18n/ucoleitr.cpp @@ -15,8 +15,8 @@ #include "unicode/ucoleitr.h" #include "unicode/ustring.h" -#include "ucol_imp.h" #include "unicode/sortkey.h" +#include "ucol_imp.h" #include "cmemory.h" U_NAMESPACE_USE diff --git a/icu4c/source/i18n/ucurr.cpp b/icu4c/source/i18n/ucurr.cpp index 359682122fb..dbd7992fd79 100644 --- a/icu4c/source/i18n/ucurr.cpp +++ b/icu4c/source/i18n/ucurr.cpp @@ -5,10 +5,10 @@ ********************************************************************** */ #include "unicode/ucurr.h" -#include "cstring.h" #include "unicode/locid.h" #include "unicode/resbund.h" #include "unicode/ustring.h" +#include "cstring.h" //------------------------------------------------------------ // Constants diff --git a/icu4c/source/i18n/udat.cpp b/icu4c/source/i18n/udat.cpp index c9269478ae6..578005529ec 100644 --- a/icu4c/source/i18n/udat.cpp +++ b/icu4c/source/i18n/udat.cpp @@ -12,12 +12,12 @@ #include "unicode/timezone.h" #include "unicode/smpdtfmt.h" #include "unicode/fieldpos.h" -#include "cpputils.h" #include "unicode/parsepos.h" #include "unicode/calendar.h" #include "unicode/numfmt.h" #include "unicode/dtfmtsym.h" #include "unicode/ustring.h" +#include "cpputils.h" U_NAMESPACE_USE diff --git a/icu4c/source/i18n/umsg.cpp b/icu4c/source/i18n/umsg.cpp index a56a4cb9bfe..dc8eb6e69c4 100644 --- a/icu4c/source/i18n/umsg.cpp +++ b/icu4c/source/i18n/umsg.cpp @@ -22,9 +22,9 @@ #include "unicode/umsg.h" #include "unicode/ustring.h" #include "unicode/fmtable.h" -#include "cpputils.h" #include "unicode/msgfmt.h" #include "unicode/unistr.h" +#include "cpputils.h" U_NAMESPACE_USE diff --git a/icu4c/source/i18n/unesctrn.cpp b/icu4c/source/i18n/unesctrn.cpp index 6f969204fac..bb60f8d3c6b 100644 --- a/icu4c/source/i18n/unesctrn.cpp +++ b/icu4c/source/i18n/unesctrn.cpp @@ -8,10 +8,11 @@ ********************************************************************** */ -#include "cmemory.h" +#include "unicode/uchar.h" #include "unesctrn.h" #include "util.h" -#include "unicode/uchar.h" + +#include "cmemory.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/uni2name.cpp b/icu4c/source/i18n/uni2name.cpp index ff68bccab54..9731275f2a8 100644 --- a/icu4c/source/i18n/uni2name.cpp +++ b/icu4c/source/i18n/uni2name.cpp @@ -8,12 +8,10 @@ ********************************************************************** */ -#include - -#include "cstring.h" -#include "uni2name.h" #include "unicode/unifilt.h" #include "unicode/uchar.h" +#include "uni2name.h" +#include "cstring.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/unum.cpp b/icu4c/source/i18n/unum.cpp index 17a6515cd28..06ac4db9edf 100644 --- a/icu4c/source/i18n/unum.cpp +++ b/icu4c/source/i18n/unum.cpp @@ -17,9 +17,9 @@ #include "unicode/decimfmt.h" #include "unicode/rbnf.h" #include "unicode/ustring.h" -#include "cpputils.h" #include "unicode/fmtable.h" #include "unicode/dcfmtsym.h" +#include "cpputils.h" U_NAMESPACE_USE /* U_CAPI UNumberFormat* diff --git a/icu4c/source/i18n/usearch.cpp b/icu4c/source/i18n/usearch.cpp index 95c7069e976..291e52aa772 100644 --- a/icu4c/source/i18n/usearch.cpp +++ b/icu4c/source/i18n/usearch.cpp @@ -9,11 +9,11 @@ #include "unicode/usearch.h" #include "unicode/ustring.h" -#include "unormimp.h" #include "unicode/uchar.h" -#include "cmemory.h" +#include "unormimp.h" #include "ucol_imp.h" #include "usrchimp.h" +#include "cmemory.h" // internal definition --------------------------------------------------- diff --git a/icu4c/source/test/intltest/itercoll.cpp b/icu4c/source/test/intltest/itercoll.cpp index ebf31056e03..b435dd53c47 100644 --- a/icu4c/source/test/intltest/itercoll.cpp +++ b/icu4c/source/test/intltest/itercoll.cpp @@ -4,7 +4,6 @@ * others. All Rights Reserved. ********************************************************************/ -#include "cmemory.h" #include "unicode/coll.h" #include "unicode/tblcoll.h" #include "unicode/unistr.h" @@ -13,6 +12,7 @@ #include "unicode/schriter.h" #include "unicode/chariter.h" #include "unicode/uchar.h" +#include "cmemory.h" #define ARRAY_LENGTH(array) (sizeof array / sizeof array[0]) diff --git a/icu4c/source/test/intltest/nmfmtrt.h b/icu4c/source/test/intltest/nmfmtrt.h index b9c0334e0bd..f725984d340 100644 --- a/icu4c/source/test/intltest/nmfmtrt.h +++ b/icu4c/source/test/intltest/nmfmtrt.h @@ -7,10 +7,10 @@ #ifndef _NUMBERFORMATROUNDTRIPTEST_ #define _NUMBERFORMATROUNDTRIPTEST_ -#include #include "unicode/numfmt.h" #include "unicode/fmtable.h" #include "intltest.h" +#include /** * Performs round-trip tests for NumberFormat diff --git a/icu4c/source/test/intltest/restest.cpp b/icu4c/source/test/intltest/restest.cpp index 3dbef5e0760..ecd0aeaedc7 100644 --- a/icu4c/source/test/intltest/restest.cpp +++ b/icu4c/source/test/intltest/restest.cpp @@ -4,10 +4,6 @@ * others. All Rights Reserved. ********************************************************************/ -#include -#include -#include - #include "unicode/utypes.h" #include "cstring.h" @@ -15,6 +11,10 @@ #include "unicode/uniset.h" #include "unicode/resbund.h" #include "restest.h" + +#include +#include +#include #include //*************************************************************************************** diff --git a/icu4c/source/test/intltest/restsnew.cpp b/icu4c/source/test/intltest/restsnew.cpp index 6b21fe1bf75..6c9d8c68c09 100644 --- a/icu4c/source/test/intltest/restsnew.cpp +++ b/icu4c/source/test/intltest/restsnew.cpp @@ -4,16 +4,16 @@ * others. All Rights Reserved. ********************************************************************/ -#include -#include -#include - #include "unicode/utypes.h" #include "cstring.h" #include "unicode/unistr.h" #include "unicode/resbund.h" #include "restsnew.h" + +#include +#include +#include #include //***************************************************************************************