diff --git a/icu4c/source/common/cstring.h b/icu4c/source/common/cstring.h
index 57357aa8ba2..e8389e5149b 100644
--- a/icu4c/source/common/cstring.h
+++ b/icu4c/source/common/cstring.h
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 1997-2003, International Business Machines
+*   Copyright (C) 1997-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
@@ -31,7 +31,6 @@
 #include <ctype.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)
 #define uprv_strncpy(dst, src, size) U_STANDARD_CPP_NAMESPACE strncpy(dst, src, size)
 #define uprv_strlen(str) U_STANDARD_CPP_NAMESPACE strlen(str)
 #define uprv_strcmp(s1, s2) U_STANDARD_CPP_NAMESPACE strcmp(s1, s2)
@@ -61,6 +60,7 @@ uprv_ebcdictolower(char c);
 #endif
 
 
+#define uprv_strtod(source, end) U_STANDARD_CPP_NAMESPACE strtod(source, end)
 #define uprv_strtoul(str, end, base) U_STANDARD_CPP_NAMESPACE strtoul(str, end, base)
 #define uprv_strtol(str, end, base) U_STANDARD_CPP_NAMESPACE strtol(str, end, base)
 #ifdef WIN32
diff --git a/icu4c/source/common/unicode/urename.h b/icu4c/source/common/unicode/urename.h
index 098ccdfcd06..2da9aff754c 100644
--- a/icu4c/source/common/unicode/urename.h
+++ b/icu4c/source/common/unicode/urename.h
@@ -960,7 +960,6 @@
 #define uprv_sortArray uprv_sortArray_3_1
 #define uprv_strCompare uprv_strCompare_3_1
 #define uprv_strdup uprv_strdup_3_1
-#define uprv_strtod uprv_strtod_3_1
 #define uprv_syntaxError uprv_syntaxError_3_1
 #define uprv_timezone uprv_timezone_3_1
 #define uprv_toupper uprv_toupper_3_1
diff --git a/icu4c/source/common/uniset_props.cpp b/icu4c/source/common/uniset_props.cpp
index b94d1cb7c26..6a1796e2801 100644
--- a/icu4c/source/common/uniset_props.cpp
+++ b/icu4c/source/common/uniset_props.cpp
@@ -36,7 +36,7 @@
 #include "ucase.h"
 #include "uinvchar.h"
 #include "charstr.h"
-#include "ustrfmt.h"
+#include "cstring.h"
 #include "mutex.h"
 #include "uassert.h"
 #include "hash.h"
diff --git a/icu4c/source/common/ustrfmt.c b/icu4c/source/common/ustrfmt.c
index 4072177a815..81b778c1b0f 100644
--- a/icu4c/source/common/ustrfmt.c
+++ b/icu4c/source/common/ustrfmt.c
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2001-2003, International Business Machines
+*   Copyright (C) 2001-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
@@ -9,13 +9,6 @@
 #include "ustrfmt.h"
 #include <stdio.h>
 
-U_CAPI double    U_EXPORT2
-uprv_strtod(const char* source, char** end)
-{
-    return strtod(source,end);
-}
-
-
 U_CAPI char*  U_EXPORT2
 uprv_dtostr(double value, char *buffer, int maximumDigits,UBool fixedPoint)
 {
diff --git a/icu4c/source/common/ustrfmt.h b/icu4c/source/common/ustrfmt.h
index c371aa174f4..814b5373230 100644
--- a/icu4c/source/common/ustrfmt.h
+++ b/icu4c/source/common/ustrfmt.h
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2001-2003, International Business Machines
+*   Copyright (C) 2001-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
@@ -10,8 +10,6 @@
 
 #include "unicode/utypes.h"
 
-U_CAPI double U_EXPORT2 
-uprv_strtod(const char* source, char** end);
 U_CAPI char* U_EXPORT2 
 uprv_dtostr(double value, char *buffer, int maximumDigits,UBool fixedPoint);
 U_CAPI int32_t U_EXPORT2
diff --git a/icu4c/source/i18n/choicfmt.cpp b/icu4c/source/i18n/choicfmt.cpp
index 31e2eb6c48b..dea28fe161b 100644
--- a/icu4c/source/i18n/choicfmt.cpp
+++ b/icu4c/source/i18n/choicfmt.cpp
@@ -32,6 +32,7 @@
 #include "unicode/locid.h"
 #include "cpputils.h"
 #include "ustrfmt.h"
+#include "cstring.h"
 
 // *****************************************************************************
 // class ChoiceFormat