diff --git a/src/mzscheme/include/mzscheme.exp b/src/mzscheme/include/mzscheme.exp
index 7ffdac3582..ca686f6a4a 100644
--- a/src/mzscheme/include/mzscheme.exp
+++ b/src/mzscheme/include/mzscheme.exp
@@ -254,7 +254,7 @@ scheme_utf8_decode_all
 scheme_utf8_decode_prefix
 scheme_utf8_decode_to_buffer
 scheme_utf8_decode_to_buffer_len
-MZ_EXTERN
+scheme_utf8_decode_count
 scheme_utf8_encode
 scheme_utf8_encode_all
 scheme_utf8_encode_to_buffer
diff --git a/src/mzscheme/include/mzscheme3m.exp b/src/mzscheme/include/mzscheme3m.exp
index 150c83d086..5507a4b9a2 100644
--- a/src/mzscheme/include/mzscheme3m.exp
+++ b/src/mzscheme/include/mzscheme3m.exp
@@ -261,7 +261,7 @@ scheme_utf8_decode_all
 scheme_utf8_decode_prefix
 scheme_utf8_decode_to_buffer
 scheme_utf8_decode_to_buffer_len
-MZ_EXTERN
+scheme_utf8_decode_count
 scheme_utf8_encode
 scheme_utf8_encode_all
 scheme_utf8_encode_to_buffer
diff --git a/src/mzscheme/include/mzwin.def b/src/mzscheme/include/mzwin.def
index f52892237b..be7c2fb621 100644
--- a/src/mzscheme/include/mzwin.def
+++ b/src/mzscheme/include/mzwin.def
@@ -246,6 +246,7 @@ EXPORTS
  scheme_utf8_decode_prefix
  scheme_utf8_decode_to_buffer
  scheme_utf8_decode_to_buffer_len
+ scheme_utf8_decode_count
  scheme_utf8_encode
  scheme_utf8_encode_all
  scheme_utf8_encode_to_buffer
diff --git a/src/mzscheme/src/makex b/src/mzscheme/src/makex
index ab680e511d..2ace9d36d0 100755
--- a/src/mzscheme/src/makex
+++ b/src/mzscheme/src/makex
@@ -27,6 +27,9 @@ while (<>) {
 		    if ($_ =~ /^extern /) {
 			$_ = substr($_, 7);
 		    }
+		    if ($_ =~ /^XFORM_NONGCING /) {
+			$_ = substr($_, 15);
+		    }
 		    if ($_ =~ /^MZ_EXTERN /) {
 			$_ = substr($_, 10);
 		    }
diff --git a/src/mzscheme/src/schemex.h b/src/mzscheme/src/schemex.h
index 41b5a6843f..b59c6a718d 100644
--- a/src/mzscheme/src/schemex.h
+++ b/src/mzscheme/src/schemex.h
@@ -429,7 +429,7 @@ mzchar *(*scheme_utf8_decode_to_buffer)(const unsigned char *s, int len,
 					       mzchar *buf, int blen);
 mzchar *(*scheme_utf8_decode_to_buffer_len)(const unsigned char *s, int len, 
 						   mzchar *buf, int blen, long *rlen);
-XFORM_NONGCING MZ_EXTERN;
+int (*scheme_utf8_decode_count)(const unsigned char *s, int start, int end, 
 						      int *_state, int might_continue, int permissive);
 int (*scheme_utf8_encode)(const unsigned int *us, int start, int end, 
 				 unsigned char *s, int dstart,
diff --git a/src/mzscheme/src/schemex.inc b/src/mzscheme/src/schemex.inc
index f6cccef135..c999640302 100644
--- a/src/mzscheme/src/schemex.inc
+++ b/src/mzscheme/src/schemex.inc
@@ -285,7 +285,7 @@
   scheme_extension_table->scheme_utf8_decode_prefix = scheme_utf8_decode_prefix;
   scheme_extension_table->scheme_utf8_decode_to_buffer = scheme_utf8_decode_to_buffer;
   scheme_extension_table->scheme_utf8_decode_to_buffer_len = scheme_utf8_decode_to_buffer_len;
-  scheme_extension_table->MZ_EXTERN = MZ_EXTERN;
+  scheme_extension_table->scheme_utf8_decode_count = scheme_utf8_decode_count;
   scheme_extension_table->scheme_utf8_encode = scheme_utf8_encode;
   scheme_extension_table->scheme_utf8_encode_all = scheme_utf8_encode_all;
   scheme_extension_table->scheme_utf8_encode_to_buffer = scheme_utf8_encode_to_buffer;
diff --git a/src/mzscheme/src/schemexm.h b/src/mzscheme/src/schemexm.h
index 715142158f..8788c8651a 100644
--- a/src/mzscheme/src/schemexm.h
+++ b/src/mzscheme/src/schemexm.h
@@ -285,7 +285,7 @@
 #define scheme_utf8_decode_prefix (scheme_extension_table->scheme_utf8_decode_prefix)
 #define scheme_utf8_decode_to_buffer (scheme_extension_table->scheme_utf8_decode_to_buffer)
 #define scheme_utf8_decode_to_buffer_len (scheme_extension_table->scheme_utf8_decode_to_buffer_len)
-#define MZ_EXTERN (scheme_extension_table->MZ_EXTERN)
+#define scheme_utf8_decode_count (scheme_extension_table->scheme_utf8_decode_count)
 #define scheme_utf8_encode (scheme_extension_table->scheme_utf8_encode)
 #define scheme_utf8_encode_all (scheme_extension_table->scheme_utf8_encode_all)
 #define scheme_utf8_encode_to_buffer (scheme_extension_table->scheme_utf8_encode_to_buffer)