diff --git a/icu4c/source/common/uchar.c b/icu4c/source/common/uchar.c
index 8b9fe3bb8c6..e71d864bf2a 100644
--- a/icu4c/source/common/uchar.c
+++ b/icu4c/source/common/uchar.c
@@ -817,7 +817,7 @@ ublock_getCode(UChar32 c) {
 /* property starts for UnicodeSet ------------------------------------------- */
 
 /* for Hangul_Syllable_Type */
-U_CAPI void U_EXPORT2
+U_CFUNC void U_EXPORT2
 uhst_addPropertyStarts(const USetAdder *sa, UErrorCode *pErrorCode) {
     UChar32 c;
     int32_t value, value2;
@@ -891,7 +891,7 @@ _enumPropertyStartsRange(const void *context, UChar32 start, UChar32 limit, uint
 
 #define USET_ADD_CP_AND_NEXT(sa, cp) sa->add(sa->set, cp); sa->add(sa->set, cp+1)
 
-U_CAPI void U_EXPORT2
+U_CFUNC void U_EXPORT2
 uchar_addPropertyStarts(const USetAdder *sa, UErrorCode *pErrorCode) {
     if(U_FAILURE(*pErrorCode)) {
         return;
diff --git a/icu4c/source/common/uprops.h b/icu4c/source/common/uprops.h
index bd42456a2b4..c2ecf8d4a96 100644
--- a/icu4c/source/common/uprops.h
+++ b/icu4c/source/common/uprops.h
@@ -375,7 +375,7 @@ uprops_getSource(UProperty which);
  * start of each range of same properties to the set.
  * @internal
  */
-U_CAPI void U_EXPORT2
+U_CFUNC void U_EXPORT2
 uchar_addPropertyStarts(const USetAdder *sa, UErrorCode *pErrorCode);
 
 /**
@@ -390,7 +390,7 @@ upropsvec_addPropertyStarts(const USetAdder *sa, UErrorCode *pErrorCode);
  * Same as uchar_addPropertyStarts() but only for Hangul_Syllable_Type.
  * @internal
  */
-U_CAPI void U_EXPORT2
+U_CFUNC void U_EXPORT2
 uhst_addPropertyStarts(const USetAdder *sa, UErrorCode *pErrorCode);
 
 /**
@@ -401,8 +401,9 @@ uhst_addPropertyStarts(const USetAdder *sa, UErrorCode *pErrorCode);
  * @param sa USetAdder to receive result. Existing contents are lost.
  * @internal
  */
-U_CAPI void U_EXPORT2
+/*U_CFUNC void U_EXPORT2
 uprv_getInclusions(const USetAdder *sa, UErrorCode *pErrorCode);
+*/
 
 /**
  * Swap the ICU Unicode properties file. See uchar.c.
diff --git a/icu4c/source/configure b/icu4c/source/configure
index 5a4e0e2d198..56a3891657a 100755
--- a/icu4c/source/configure
+++ b/icu4c/source/configure
@@ -3675,9 +3675,9 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -3691,7 +3691,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3704,7 +3704,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 SHAREDLIBEXPORT=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
     # Restore to their original state because the Intel compiler chokes
     # on this option when checking for the wchar_t size, but the
     # option otherwise works.
diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in
index 6f2711479e8..4aa0d6f9d80 100644
--- a/icu4c/source/configure.in
+++ b/icu4c/source/configure.in
@@ -191,7 +191,7 @@ if test "$ac_cv_c_compiler_gnu" = yes; then
     LIBCXXFLAGS="-fvisibility=hidden"
     CFLAGS="${CFLAGS} ${LIBCFLAGS}"
     CXXFLAGS="${CXXFLAGS} ${LIBCXXFLAGS}"
-    AC_TRY_COMPILE([__attribute__ ((visibility ("default"))) void f(void);],[],
+    AC_TRY_LINK([__attribute__ ((visibility ("default"))) void f(void);],[],
         [SHAREDLIBEXPORT=yes],[SHAREDLIBEXPORT=no])
     # Restore to their original state because the Intel compiler chokes
     # on this option when checking for the wchar_t size, but the
diff --git a/icu4c/source/io/ufile.h b/icu4c/source/io/ufile.h
index 4a261789506..5494a96f065 100644
--- a/icu4c/source/io/ufile.h
+++ b/icu4c/source/io/ufile.h
@@ -75,7 +75,7 @@ struct UFILE {
 /**
  * Like u_file_write but takes a flush parameter
  */
-U_CAPI int32_t U_EXPORT2
+U_CFUNC int32_t U_EXPORT2
 u_file_write_flush( const UChar     *chars, 
         int32_t     count, 
         UFILE       *f,
diff --git a/icu4c/source/io/ustdio.c b/icu4c/source/io/ustdio.c
index 04dd2f95fca..8ab05d4a966 100644
--- a/icu4c/source/io/ustdio.c
+++ b/icu4c/source/io/ustdio.c
@@ -286,7 +286,7 @@ u_fputc(UChar32      uc,
 }
 
 
-U_CAPI int32_t U_EXPORT2
+U_CFUNC int32_t U_EXPORT2
 u_file_write_flush(const UChar *chars,
                    int32_t     count,
                    UFILE       *f,