ICU-1887 Try to fix the name mangling problems with the Intel compiler by including utypes.h before the system headers.

X-SVN-Rev: 9124
2002-07-12 21:42:24 +00:00 · 2002-07-12 21:42:24 +00:00 · c85207afbd
commit c85207afbd
parent dbd84a8451
48 changed files with 120 additions and 121 deletions
--- 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

--- 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 <stdlib.h>
 #include <string.h>

--- 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 <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#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)
--- a/icu4c/source/common/digitlst.cpp
+++ b/icu4c/source/common/digitlst.cpp
@ -24,12 +24,12 @@
 ******************************************************************************
 */

+#include "unicode/putil.h"
 #include "digitlst.h"
 #include <stdlib.h>
 #include <limits.h>
 #include <string.h>
 #include <stdio.h>
-#include "unicode/putil.h"

 // ***************************************************************************
 // class DigitList
--- a/icu4c/source/common/putil.c
+++ b/icu4c/source/common/putil.c
@ -58,15 +58,6 @@

 #endif /* PTX */

-/* Include standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <locale.h>
-#include <time.h>
-#include <float.h>
-
 /* 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <locale.h>
+#include <time.h>
+#include <float.h>
+
 /* include system headers */
 #ifdef WIN32
 #   define WIN32_LEAN_AND_MEAN
--- 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 <assert.h>
 #include <stdio.h>
--- 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 <stdio.h>

 #include "rbbisetb.h"
--- a/icu4c/source/common/ustrfmt.c
+++ b/icu4c/source/common/ustrfmt.c
@ -5,10 +5,9 @@
 **********************************************************************
 */

-#include <stdio.h>
 #include "cstring.h"
-
 #include "ustrfmt.h"
+#include <stdio.h>

 U_CAPI double    U_EXPORT2
 uprv_strtod(const char* source, char** end)
--- a/icu4c/source/extra/uconv/uconv.cpp
+++ b/icu4c/source/extra/uconv/uconv.cpp
@ -16,16 +16,16 @@
 *
 */

-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
 #include <unicode/utypes.h>
 #include <unicode/ucnv.h>
 #include <unicode/unistr.h>
 #include <unicode/translit.h>

+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
 #include "cmemory.h"
 #include "cstring.h"
 #include "ustrfmt.h"
--- 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

--- 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
--- 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"

 // *****************************************************************************
--- 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 --------------------------------------------------------------- */
--- 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

--- a/icu4c/source/i18n/digitlst.cpp
+++ b/icu4c/source/i18n/digitlst.cpp
@ -24,12 +24,12 @@
 ******************************************************************************
 */

+#include "unicode/putil.h"
 #include "digitlst.h"
 #include <stdlib.h>
 #include <limits.h>
 #include <string.h>
 #include <stdio.h>
-#include "unicode/putil.h"

 // ***************************************************************************
 // class DigitList
--- 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}; // "( "
--- 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
--- 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.
--- 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"
--- 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 <stdio.h>
+#include "nfrs.h"
+
+#include "cmemory.h"
+#include "cstring.h"

 static const UChar gPercentPercent[] =
 {
--- 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

--- 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

--- 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"
--- 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
--- 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

--- 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 ---------------------------------- */
--- 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

--- 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"

--- 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

--- 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

--- 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; /*;*/
--- 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 <stdio.h>
--- 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

--- 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

--- 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
--- 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 <stdio.h>
 #endif
@ -25,11 +30,6 @@
 /* we are using qsort() */
 #include <stdlib.h>

-#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)
--- 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
--- 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
--- 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

--- 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

--- 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

--- a/icu4c/source/i18n/uni2name.cpp
+++ b/icu4c/source/i18n/uni2name.cpp
@ -8,12 +8,10 @@
 **********************************************************************
 */

-#include <stdio.h>
-
-#include "cstring.h"
-#include "uni2name.h"
 #include "unicode/unifilt.h"
 #include "unicode/uchar.h"
+#include "uni2name.h"
+#include "cstring.h"

 U_NAMESPACE_BEGIN

--- 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*
--- 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 ---------------------------------------------------

--- 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])

--- a/icu4c/source/test/intltest/nmfmtrt.h
+++ b/icu4c/source/test/intltest/nmfmtrt.h
@ -7,10 +7,10 @@
 #ifndef _NUMBERFORMATROUNDTRIPTEST_
 #define _NUMBERFORMATROUNDTRIPTEST_
 
-#include <stdlib.h>
 #include "unicode/numfmt.h"
 #include "unicode/fmtable.h"
 #include "intltest.h"
+#include <stdlib.h>

 /** 
 * Performs round-trip tests for NumberFormat
--- a/icu4c/source/test/intltest/restest.cpp
+++ b/icu4c/source/test/intltest/restest.cpp
@ -4,10 +4,6 @@
 * others. All Rights Reserved.
 ********************************************************************/

-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-
 #include "unicode/utypes.h"

 #include "cstring.h"
@ -15,6 +11,10 @@
 #include "unicode/uniset.h"
 #include "unicode/resbund.h"
 #include "restest.h"
+
+#include <stdlib.h>
+#include <time.h>
+#include <string.h>
 #include <limits.h>

 //***************************************************************************************
--- a/icu4c/source/test/intltest/restsnew.cpp
+++ b/icu4c/source/test/intltest/restsnew.cpp
@ -4,16 +4,16 @@
 * others. All Rights Reserved.
 ********************************************************************/

-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-
 #include "unicode/utypes.h"

 #include "cstring.h"
 #include "unicode/unistr.h"
 #include "unicode/resbund.h"
 #include "restsnew.h"
+
+#include <stdlib.h>
+#include <time.h>
+#include <string.h>
 #include <limits.h>

 //***************************************************************************************