diff --git a/icu4c/source/extra/uconv/uconv.cpp b/icu4c/source/extra/uconv/uconv.cpp
index 2115a02ab55..633bbca3a52 100644
--- a/icu4c/source/extra/uconv/uconv.cpp
+++ b/icu4c/source/extra/uconv/uconv.cpp
@@ -19,6 +19,7 @@
  */
 
 #include <unicode/utypes.h>
+#include <unicode/putil.h>
 #include <unicode/ucnv.h>
 #include <unicode/uenum.h>
 #include <unicode/unistr.h>
diff --git a/icu4c/source/test/cintltst/callcoll.c b/icu4c/source/test/cintltst/callcoll.c
index 1c63d096011..aa69806c55e 100644
--- a/icu4c/source/test/cintltst/callcoll.c
+++ b/icu4c/source/test/cintltst/callcoll.c
@@ -41,6 +41,7 @@
 #include "unicode/ucoleitr.h"
 #include "unicode/ustring.h"
 #include "unicode/uclean.h"
+#include "unicode/putil.h"
 
 #include "cintltst.h"
 #include "ccolltst.h"
diff --git a/icu4c/source/test/cintltst/ccapitst.c b/icu4c/source/test/cintltst/ccapitst.c
index 4ffbf0b0690..d898d1407a0 100644
--- a/icu4c/source/test/cintltst/ccapitst.c
+++ b/icu4c/source/test/cintltst/ccapitst.c
@@ -19,7 +19,7 @@
 #include "unicode/uloc.h"
 #include "unicode/ucnv.h"
 #include "unicode/ucnv_err.h"
-#include "unicode/utypes.h"
+#include "unicode/putil.h"
 #include "unicode/ustring.h"
 #include "ucnv_bld.h" /* for sizeof(UConverter) */
 #include "cintltst.h"
diff --git a/icu4c/source/test/cintltst/citertst.c b/icu4c/source/test/cintltst/citertst.c
index 94a60bc84c4..055091c2fff 100644
--- a/icu4c/source/test/cintltst/citertst.c
+++ b/icu4c/source/test/cintltst/citertst.c
@@ -25,6 +25,7 @@
 #include "unicode/uloc.h"
 #include "unicode/uchar.h"
 #include "unicode/ustring.h"
+#include "unicode/putil.h"
 #include "callcoll.h"
 #include "cmemory.h"
 #include "cintltst.h"
@@ -1215,7 +1216,7 @@ static FileStream * getFractionalUCA(void)
     FileStream *result = NULL;
 
     /* Look inside ICU_DATA first */
-    uprv_strcpy(newPath, u_getDataDirectory());
+    uprv_strcpy(newPath, ctest_dataSrcDir());
     uprv_strcat(newPath, "unidata" U_FILE_SEP_STRING );
     uprv_strcat(newPath, "FractionalUCA.txt");
 
diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c
index f4ec91183e9..84ce8afa216 100644
--- a/icu4c/source/test/cintltst/creststn.c
+++ b/icu4c/source/test/cintltst/creststn.c
@@ -18,7 +18,7 @@
 #include <time.h>
 #include "unicode/utypes.h"
 #include "cintltst.h"
-#include "unicode/utypes.h"
+#include "unicode/putil.h"
 #include "unicode/ustring.h"
 #include "unicode/ucnv.h"
 #include "string.h"
diff --git a/icu4c/source/test/cintltst/hpmufn.c b/icu4c/source/test/cintltst/hpmufn.c
index b2d125dd1ff..1848abcde1b 100644
--- a/icu4c/source/test/cintltst/hpmufn.c
+++ b/icu4c/source/test/cintltst/hpmufn.c
@@ -9,6 +9,7 @@
 */
 
 #include "unicode/utypes.h"
+#include "unicode/putil.h"
 #include "unicode/uclean.h"
 #include "unicode/uchar.h"
 #include "unicode/ures.h"
diff --git a/icu4c/source/test/cintltst/sprpdata.c b/icu4c/source/test/cintltst/sprpdata.c
index 3086e127bf7..0349541c4be 100644
--- a/icu4c/source/test/cintltst/sprpdata.c
+++ b/icu4c/source/test/cintltst/sprpdata.c
@@ -20,6 +20,7 @@
 #if !UCONFIG_NO_IDNA
 
 #include "unicode/ustring.h"
+#include "unicode/putil.h"
 #include "cintltst.h"
 #include "unicode/usprep.h"
 #include "sprpimpl.h"
diff --git a/icu4c/source/test/cintltst/udatatst.c b/icu4c/source/test/cintltst/udatatst.c
index 564b431b703..980a453a2fc 100644
--- a/icu4c/source/test/cintltst/udatatst.c
+++ b/icu4c/source/test/cintltst/udatatst.c
@@ -14,6 +14,7 @@
 */
 
 #include "unicode/utypes.h"
+#include "unicode/putil.h"
 #include "unicode/udata.h"
 #include "unicode/uchar.h"
 #include "unicode/ucnv.h"
diff --git a/icu4c/source/test/intltest/normconf.cpp b/icu4c/source/test/intltest/normconf.cpp
index 2952fe10580..eef89c7b8b0 100644
--- a/icu4c/source/test/intltest/normconf.cpp
+++ b/icu4c/source/test/intltest/normconf.cpp
@@ -12,6 +12,7 @@
 #include "unicode/uchar.h"
 #include "unicode/normlzr.h"
 #include "unicode/uniset.h"
+#include "unicode/putil.h"
 #include "unormimp.h"
 #include "cstring.h"
 #include "filestrm.h"
@@ -71,7 +72,7 @@ NormalizerConformanceTest::openNormalizationTestFile(const char *filename) {
     UErrorCode errorCode;
 
     // look inside ICU_DATA first
-    folder=u_getDataDirectory();
+    folder=pathToDataDirectory();
     if(folder!=NULL) {
         strcpy(unidataPath, folder);
         strcat(unidataPath, "unidata" U_FILE_SEP_STRING);
diff --git a/icu4c/source/test/intltest/transrt.cpp b/icu4c/source/test/intltest/transrt.cpp
index 2e0b1aeca51..eb81a89c802 100644
--- a/icu4c/source/test/intltest/transrt.cpp
+++ b/icu4c/source/test/intltest/transrt.cpp
@@ -14,6 +14,7 @@
 
 #include "unicode/translit.h"
 #include "rbt.h"
+#include "unicode/calendar.h"
 #include "unicode/uniset.h"
 #include "unicode/uchar.h"
 #include "unicode/normlzr.h"
@@ -36,9 +37,9 @@
                           if (exec) {                   \
                               logln(#test "---");       \
                               logln((UnicodeString)""); \
-                              UDate t = uprv_getUTCtime(); \
+                              UDate t = Calendar::getNow(); \
                               test();                   \
-                              t = uprv_getUTCtime() - t; \
+                              t = Calendar::getNow() - t; \
                               logln((UnicodeString)#test " took " + t/U_MILLIS_PER_DAY + " seconds"); \
                           }                             \
                           break
diff --git a/icu4c/source/test/intltest/tsmthred.cpp b/icu4c/source/test/intltest/tsmthred.cpp
index 6ef8d7f902d..f9962aada8b 100644
--- a/icu4c/source/test/intltest/tsmthred.cpp
+++ b/icu4c/source/test/intltest/tsmthred.cpp
@@ -117,6 +117,7 @@ void MultithreadTest::runIndexedTest( int32_t index, UBool exec,
 #include "unicode/msgfmt.h"
 #include "unicode/locid.h"
 #include "unicode/ucol.h"
+#include "unicode/calendar.h"
 #include "ucaconf.h"
 
 //-----------------------------------------------------------------------------------
@@ -628,11 +629,11 @@ public:
     virtual void run()
     {
         SimpleThread::sleep(500);          // wait, make sure they aquire the lock
-        fElapsed = uprv_getUTCtime();
+        fElapsed = Calendar::getNow();
         {
             Mutex m;                        // wait here
 
-            fElapsed = uprv_getUTCtime() - fElapsed;
+            fElapsed = Calendar::getNow() - fElapsed;
 
             if(fOtherThread.fDone == FALSE) 
                 fErr = TRUE;                // they didnt get to it yet
diff --git a/icu4c/source/test/intltest/ucdtest.cpp b/icu4c/source/test/intltest/ucdtest.cpp
index 01bff2de0dc..a6d8c9985c0 100644
--- a/icu4c/source/test/intltest/ucdtest.cpp
+++ b/icu4c/source/test/intltest/ucdtest.cpp
@@ -7,6 +7,7 @@
 #include "unicode/ustring.h"
 #include "unicode/uchar.h"
 #include "unicode/uniset.h"
+#include "unicode/putil.h"
 #include "cstring.h"
 #include "uparse.h"
 #include "ucdtest.h"
@@ -139,14 +140,7 @@ void UnicodeTest::TestAdditionalProperties() {
     UErrorCode errorCode=U_ZERO_ERROR;
 
     /* Look inside ICU_DATA first */
-    strcpy(newPath, u_getDataDirectory());
-
-    // remove trailing "out/"
-    length=uprv_strlen(newPath);
-    if(length>=4 && uprv_strcmp(newPath+length-4, "out" U_FILE_SEP_STRING)==0) {
-        newPath[length-4]=0;
-    }
-
+    strcpy(newPath, pathToDataDirectory());
     strcat(newPath, "unidata" U_FILE_SEP_STRING "DerivedCoreProperties.txt");
 
     // As a fallback, try to guess where the source data was located
diff --git a/icu4c/source/tools/gencmn/decmn.c b/icu4c/source/tools/gencmn/decmn.c
index 32bba2ef0d8..87eaaf5b095 100644
--- a/icu4c/source/tools/gencmn/decmn.c
+++ b/icu4c/source/tools/gencmn/decmn.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "unicode/utypes.h"
+#include "unicode/putil.h"
 #include "unicode/udata.h"
 #include "uoptions.h"
 #include "cstring.h"
diff --git a/icu4c/source/tools/genrb/derb.c b/icu4c/source/tools/genrb/derb.c
index f024a9a1c0b..9ea70ea00eb 100644
--- a/icu4c/source/tools/genrb/derb.c
+++ b/icu4c/source/tools/genrb/derb.c
@@ -17,6 +17,7 @@
 
 #include "unicode/ucnv.h"
 #include "unicode/ustring.h"
+#include "unicode/putil.h"
 
 #include "uresimp.h"
 #include "cmemory.h"
diff --git a/icu4c/source/tools/genrb/reslist.c b/icu4c/source/tools/genrb/reslist.c
index ffa50d7c63d..32b45937079 100644
--- a/icu4c/source/tools/genrb/reslist.c
+++ b/icu4c/source/tools/genrb/reslist.c
@@ -20,6 +20,7 @@
 #include "reslist.h"
 #include "unewdata.h"
 #include "unicode/ures.h"
+#include "unicode/putil.h"
 #include "errmsg.h"
 
 #define BIN_ALIGNMENT 16
diff --git a/icu4c/source/tools/genuca/genuca.cpp b/icu4c/source/tools/genuca/genuca.cpp
index b483ee5ac19..b17599c5a7e 100644
--- a/icu4c/source/tools/genuca/genuca.cpp
+++ b/icu4c/source/tools/genuca/genuca.cpp
@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include "unicode/utypes.h"
+#include "unicode/putil.h"
 #include "unicode/udata.h"
 #include "unicode/uclean.h"
 #include "ucol_imp.h"
diff --git a/icu4c/source/tools/icuswap/icuswap.cpp b/icu4c/source/tools/icuswap/icuswap.cpp
index 375f8658eec..4467f4fa62b 100644
--- a/icu4c/source/tools/icuswap/icuswap.cpp
+++ b/icu4c/source/tools/icuswap/icuswap.cpp
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "unicode/utypes.h"
+#include "unicode/putil.h"
 #include "unicode/udata.h"
 #include "cmemory.h"
 #include "cstring.h"
diff --git a/icu4c/source/tools/pkgdata/pkgtypes.c b/icu4c/source/tools/pkgdata/pkgtypes.c
index 87f21d995e8..f7e13053ad9 100644
--- a/icu4c/source/tools/pkgdata/pkgtypes.c
+++ b/icu4c/source/tools/pkgdata/pkgtypes.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "unicode/utypes.h"
+#include "unicode/putil.h"
 #include "cmemory.h"
 #include "cstring.h"
 #include "pkgtypes.h"
diff --git a/icu4c/source/tools/pkgdata/sttcmode.c b/icu4c/source/tools/pkgdata/sttcmode.c
index 890e2534f08..a52a703cdac 100644
--- a/icu4c/source/tools/pkgdata/sttcmode.c
+++ b/icu4c/source/tools/pkgdata/sttcmode.c
@@ -18,6 +18,7 @@
 */
 
 #include "unicode/utypes.h"
+#include "unicode/putil.h"
 #include "unicode/uloc.h"
 #include "cmemory.h"
 #include "cstring.h"
diff --git a/icu4c/source/tools/toolutil/ucbuf.c b/icu4c/source/tools/toolutil/ucbuf.c
index 580109d886c..111fd5844f7 100644
--- a/icu4c/source/tools/toolutil/ucbuf.c
+++ b/icu4c/source/tools/toolutil/ucbuf.c
@@ -16,6 +16,7 @@
 */
 
 #include "unicode/utypes.h"
+#include "unicode/putil.h"
 #include "unicode/ucnv.h"
 #include "unicode/ucnv_err.h"
 #include "filestrm.h"