diff -u gnulib/lib/mbiter.h gnulib/lib/mbiter.h
--- gnulib/lib/mbiter.h	2008-05-12 12:38:21.000000000 +0000
+++ gnulib/lib/mbiter.h	2008-11-19 21:13:17.000000000 +0000
@@ -117,8 +117,10 @@
 {
   if (iter->next_done)
     return;
+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
   if (iter->in_shift)
     goto with_shift;
+#endif
   /* Handle most ASCII characters quickly, without calling mbrtowc().  */
   if (is_basic (*iter->cur.ptr))
     {
@@ -129,6 +131,7 @@
       iter->cur.wc = *iter->cur.ptr;
       iter->cur.wc_valid = true;
     }
+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
   else
     {
       assert (mbsinit (&iter->state));
@@ -169,6 +172,7 @@
 	    iter->in_shift = false;
 	}
     }
+#endif
   iter->next_done = true;
 }
 
diff -u gnulib/lib/mbuiter.h gnulib/lib/mbuiter.h
--- gnulib/lib/mbuiter.h	2007-12-25 23:57:18.000000000 +0000
+++ gnulib/lib/mbuiter.h	2008-11-19 21:15:12.000000000 +0000
@@ -125,8 +125,10 @@
 {
   if (iter->next_done)
     return;
+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
   if (iter->in_shift)
     goto with_shift;
+#endif
   /* Handle most ASCII characters quickly, without calling mbrtowc().  */
   if (is_basic (*iter->cur.ptr))
     {
@@ -137,6 +139,7 @@
       iter->cur.wc = *iter->cur.ptr;
       iter->cur.wc_valid = true;
     }
+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
   else
     {
       assert (mbsinit (&iter->state));
@@ -178,6 +181,7 @@
 	    iter->in_shift = false;
 	}
     }
+#endif
   iter->next_done = true;
 }