Index: b/usr/src/lib/libc/inc/thr_uberdata.h
===================================================================
--- a/usr/src/lib/libc/inc/thr_uberdata.h
+++ b/usr/src/lib/libc/inc/thr_uberdata.h
@@ -55,7 +55,6 @@
 #include <sys/priocntl.h>
 #include <thread_db.h>
 #include <setjmp.h>
-#include "libc_int.h"
 #include "tdb_agent.h"
 #include "thr_debug.h"
 
Index: b/usr/src/lib/libc/port/threads/thr.c
===================================================================
--- a/usr/src/lib/libc/port/threads/thr.c
+++ b/usr/src/lib/libc/port/threads/thr.c
@@ -33,6 +33,7 @@
 #include <sys/uio.h>
 #include <ctype.h>
 #include "libc.h"
+#include "libc_int.h"
 
 /*
  * These symbols should not be exported from libc, but
Index: b/usr/src/lib/libc/port/threads/thread_interface.c
===================================================================
--- a/usr/src/lib/libc/port/threads/thread_interface.c
+++ b/usr/src/lib/libc/port/threads/thread_interface.c
@@ -26,6 +26,7 @@
 
 #include "lint.h"
 #include "thr_uberdata.h"
+#include "libc_int.h"
 
 extern	int	_ti_bind_guard();
 extern	int	_ti_bind_clear();
Index: b/usr/src/lib/libc/port/threads/tls.c
===================================================================
--- a/usr/src/lib/libc/port/threads/tls.c
+++ b/usr/src/lib/libc/port/threads/tls.c
@@ -26,6 +26,7 @@
 
 #include "lint.h"
 #include "thr_uberdata.h"
+#include "libc_int.h"
 
 #define	MIN_MOD_SLOTS	8