12 files changed, 12 insertions, 8 deletions
diff --git a/sysdeps/sparc/nptl/pthread_barrier_destroy.c b/sysdeps/sparc/nptl/pthread_barrier_destroy.c
index 2221a27e22..883a101a46 100644
--- a/sysdeps/sparc/nptl/pthread_barrier_destroy.c
+++ b/sysdeps/sparc/nptl/pthread_barrier_destroy.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include "pthreadP.h"
 #include <lowlevellock.h>
+#include <sparc-nptl.h>
 
 int
 pthread_barrier_destroy (barrier)
diff --git a/sysdeps/sparc/nptl/pthread_barrier_init.c b/sysdeps/sparc/nptl/pthread_barrier_init.c
index 6af686361d..c076386b75 100644
--- a/sysdeps/sparc/nptl/pthread_barrier_init.c
+++ b/sysdeps/sparc/nptl/pthread_barrier_init.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include "pthreadP.h"
 #include <lowlevellock.h>
+#include <sparc-nptl.h>
 
 int
 pthread_barrier_init (barrier, attr, count)
diff --git a/sysdeps/sparc/nptl/pthread_barrier_wait.c b/sysdeps/sparc/nptl/pthread_barrier_wait.c
index ed5c1f7071..525418ce21 100644
--- a/sysdeps/sparc/nptl/pthread_barrier_wait.c
+++ b/sysdeps/sparc/nptl/pthread_barrier_wait.c
@@ -20,6 +20,7 @@
 #include <sysdep.h>
 #include <lowlevellock.h>
 #include <pthreadP.h>
+#include <sparc-nptl.h>
 
 /* Wait on barrier.  */
 int
diff --git a/sysdeps/sparc/nptl/sem_init.c b/sysdeps/sparc/nptl/sem_init.c
index cbefdc4823..d33881d543 100644
--- a/sysdeps/sparc/nptl/sem_init.c
+++ b/sysdeps/sparc/nptl/sem_init.c
@@ -23,7 +23,7 @@
 #include <shlib-compat.h>
 #include "semaphoreP.h"
 #include <kernel-features.h>
-
+#include <sparc-nptl.h>
 
 int
 __new_sem_init (sem, pshared, value)
diff --git a/sysdeps/sparc/nptl/sem_post.c b/sysdeps/sparc/nptl/sem_post.c
index d83b9d8e2e..c2dbe0a0ce 100644
--- a/sysdeps/sparc/nptl/sem_post.c
+++ b/sysdeps/sparc/nptl/sem_post.c
@@ -24,6 +24,7 @@
 #include <semaphore.h>
 
 #include <shlib-compat.h>
+#include <sparc-nptl.h>
 
 int
 __new_sem_post (sem_t *sem)
diff --git a/sysdeps/sparc/nptl/sem_timedwait.c b/sysdeps/sparc/nptl/sem_timedwait.c
index 0557e4e709..3621f0b2d2 100644
--- a/sysdeps/sparc/nptl/sem_timedwait.c
+++ b/sysdeps/sparc/nptl/sem_timedwait.c
@@ -25,7 +25,7 @@
 
 #include <pthreadP.h>
 #include <shlib-compat.h>
-
+#include <sparc-nptl.h>
 
 extern void __sem_wait_cleanup (void *arg) attribute_hidden;
 
diff --git a/sysdeps/sparc/nptl/sem_wait.c b/sysdeps/sparc/nptl/sem_wait.c
index cfa1ef3727..ccf714d391 100644
--- a/sysdeps/sparc/nptl/sem_wait.c
+++ b/sysdeps/sparc/nptl/sem_wait.c
@@ -25,7 +25,7 @@
 
 #include <pthreadP.h>
 #include <shlib-compat.h>
-
+#include <sparc-nptl.h>
 
 void
 attribute_hidden
diff --git a/sysdeps/sparc/nptl/internaltypes.h b/sysdeps/sparc/nptl/sparc-nptl.h
index e5c27408d8..baff918288 100644
--- a/sysdeps/sparc/nptl/internaltypes.h
+++ b/sysdeps/sparc/nptl/sparc-nptl.h
@@ -1,6 +1,4 @@
-#ifndef _INTERNALTYPES_H
-
-#include_next <internaltypes.h>
+#ifndef _SPARC_NPTL_H
 
 union sparc_pthread_barrier
 {
diff --git a/sysdeps/sparc/sparc32/pthread_barrier_wait.c b/sysdeps/sparc/sparc32/pthread_barrier_wait.c
index 0fed908865..318a47beab 100644
--- a/sysdeps/sparc/sparc32/pthread_barrier_wait.c
+++ b/sysdeps/sparc/sparc32/pthread_barrier_wait.c
@@ -20,6 +20,7 @@
 #include <sysdep.h>
 #include <lowlevellock.h>
 #include <pthreadP.h>
+#include <sparc-nptl.h>
 
 /* Wait on barrier.  */
 int
diff --git a/sysdeps/sparc/sparc32/sem_post.c b/sysdeps/sparc/sparc32/sem_post.c
index d3846c045c..40650a0023 100644
--- a/sysdeps/sparc/sparc32/sem_post.c
+++ b/sysdeps/sparc/sparc32/sem_post.c
@@ -24,6 +24,7 @@
 #include <semaphore.h>
 
 #include <shlib-compat.h>
+#include <sparc-nptl.h>
 
 int
 __new_sem_post (sem_t *sem)
diff --git a/sysdeps/sparc/sparc32/sem_timedwait.c b/sysdeps/sparc/sparc32/sem_timedwait.c
index 5c48cb385a..a10382af84 100644
--- a/sysdeps/sparc/sparc32/sem_timedwait.c
+++ b/sysdeps/sparc/sparc32/sem_timedwait.c
@@ -25,7 +25,7 @@
 
 #include <pthreadP.h>
 #include <shlib-compat.h>
-
+#include <sparc-nptl.h>
 
 extern void __sem_wait_cleanup (void *arg) attribute_hidden;
 
diff --git a/sysdeps/sparc/sparc32/sem_wait.c b/sysdeps/sparc/sparc32/sem_wait.c
index 8c072fe5f4..81dcd0940b 100644
--- a/sysdeps/sparc/sparc32/sem_wait.c
+++ b/sysdeps/sparc/sparc32/sem_wait.c
@@ -25,7 +25,7 @@
 
 #include <pthreadP.h>
 #include <shlib-compat.h>
-
+#include <sparc-nptl.h>
 
 void
 attribute_hidden