Index: include/_ctype.h
===================================================================
RCS file: /home/ncvs/src/include/_ctype.h,v
retrieving revision 1.30.2.1
diff -u -r1.30.2.1 _ctype.h
--- include/_ctype.h	24 Oct 2007 14:32:32 -0000	1.30.2.1
+++ include/_ctype.h	27 Oct 2007 07:52:12 -0000
@@ -97,6 +97,20 @@
 
 #include <runetype.h>
 
+/*
+ * These four use the __mb_sb_limit symbol which breaks RELENG_6's
+ * forward compatibility after 602113. Force them built as non-inlined
+ * form to recover.
+ */
+#ifndef _EXTERNALIZE_CTYPE_INLINES_
+__BEGIN_DECLS
+int		__sbmaskrune(__ct_rune_t, unsigned long);
+int		__isctype(__ct_rune_t, unsigned long);
+__ct_rune_t	__sbtoupper(__ct_rune_t);
+__ct_rune_t	__sbtolower(__ct_rune_t);
+__END_DECLS
+#endif
+
 static __inline int
 __maskrune(__ct_rune_t _c, unsigned long _f)
 {
@@ -104,12 +118,14 @@
 		_CurrentRuneLocale->__runetype[_c]) & _f;
 }
 
+#ifdef _EXTERNALIZE_CTYPE_INLINES_
 static __inline int
 __sbmaskrune(__ct_rune_t _c, unsigned long _f)
 {
 	return (_c < 0 || _c >= __mb_sb_limit) ? 0 :
 	       _CurrentRuneLocale->__runetype[_c] & _f;
 }
+#endif
 
 static __inline int
 __istype(__ct_rune_t _c, unsigned long _f)
@@ -123,12 +139,14 @@
 	return (!!__sbmaskrune(_c, _f));
 }
 
+#ifdef _EXTERNALIZE_CTYPE_INLINES_
 static __inline int
 __isctype(__ct_rune_t _c, unsigned long _f)
 {
 	return (_c < 0 || _c >= __mb_sb_limit) ? 0 :
 	       !!(_DefaultRuneLocale.__runetype[_c] & _f);
 }
+#endif
 
 static __inline __ct_rune_t
 __toupper(__ct_rune_t _c)
@@ -137,12 +155,14 @@
 	       _CurrentRuneLocale->__mapupper[_c];
 }
 
+#ifdef _EXTERNALIZE_CTYPE_INLINES_
 static __inline __ct_rune_t
 __sbtoupper(__ct_rune_t _c)
 {
 	return (_c < 0 || _c >= __mb_sb_limit) ? _c :
 	       _CurrentRuneLocale->__mapupper[_c];
 }
+#endif
 
 static __inline __ct_rune_t
 __tolower(__ct_rune_t _c)
@@ -151,12 +171,14 @@
 	       _CurrentRuneLocale->__maplower[_c];
 }
 
+#ifdef _EXTERNALIZE_CTYPE_INLINES_
 static __inline __ct_rune_t
 __sbtolower(__ct_rune_t _c)
 {
 	return (_c < 0 || _c >= __mb_sb_limit) ? _c :
 	       _CurrentRuneLocale->__maplower[_c];
 }
+#endif
 
 static __inline int
 __wcwidth(__ct_rune_t _c)
Index: lib/libc/locale/mblocal.h
===================================================================
RCS file: /home/ncvs/src/lib/libc/locale/mblocal.h,v
retrieving revision 1.5
diff -u -r1.5 mblocal.h
--- lib/libc/locale/mblocal.h	27 Feb 2005 15:11:09 -0000	1.5
+++ lib/libc/locale/mblocal.h	27 Oct 2007 07:52:13 -0000
@@ -29,6 +29,8 @@
 #ifndef _MBLOCAL_H_
 #define	_MBLOCAL_H_
 
+#include <runetype.h>
+
 /*
  * Rune initialization function prototypes.
  */
Index: usr.bin/mklocale/ldef.h
===================================================================
RCS file: /home/ncvs/src/usr.bin/mklocale/ldef.h,v
retrieving revision 1.4
diff -u -r1.4 ldef.h
--- usr.bin/mklocale/ldef.h	26 Feb 2005 21:47:54 -0000	1.4
+++ usr.bin/mklocale/ldef.h	27 Oct 2007 07:52:13 -0000
@@ -38,6 +38,7 @@
  */
 
 #include <sys/types.h>
+#include "runefile.h"
 
 /*
  * This should look a LOT like a _RuneEntry