diff --git a/ChangeLog b/ChangeLog
index 64d024abd7..5c35704456 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-10-26  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/bits/types.h: Include
+	bits/pthreadtypes.h only not for POSIX 199506.
+	* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise.
+
 1998-10-26  Mark Kettenis  <kettenis@phys.uva.nl>
 
 	* sysdeps/unix/sysv/linux/Versions: Move shutdown ...
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/types.h b/sysdeps/unix/sysv/linux/alpha/bits/types.h
index aee9d046ec..6a1e846263 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/types.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/types.h
@@ -120,7 +120,7 @@ typedef long int __intptr_t;
 
 
 /* Now add the thread types.  */
-#if defined __USE_POSIX199506 || defined __USE_UNIX98
+#ifdef __USE_UNIX98
 # include <bits/pthreadtypes.h>
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/bits/types.h b/sysdeps/unix/sysv/linux/bits/types.h
index 1543ff7c34..d95746a53d 100644
--- a/sysdeps/unix/sysv/linux/bits/types.h
+++ b/sysdeps/unix/sysv/linux/bits/types.h
@@ -144,7 +144,7 @@ typedef int __intptr_t;
 
 
 /* Now add the thread types.  */
-#if defined __USE_POSIX199506 || defined __USE_UNIX98
+#ifdef __USE_UNIX98
 # include <bits/pthreadtypes.h>
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/mips/bits/types.h b/sysdeps/unix/sysv/linux/mips/bits/types.h
index e32dadf57f..6629366c30 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/types.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/types.h
@@ -144,7 +144,7 @@ typedef int __intptr_t;
 
 
 /* Now add the thread types.  */
-#if defined __USE_POSIX199506 || defined __USE_UNIX98
+#ifdef __USE_UNIX98
 # include <bits/pthreadtypes.h>
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h
index 6093eba084..a26cac8064 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h
@@ -132,7 +132,7 @@ typedef long int __intptr_t;
 
 
 /* Now add the thread types.  */
-#if defined __USE_POSIX199506 || defined __USE_UNIX98
+#ifdef __USE_UNIX98
 # include <bits/pthreadtypes.h>
 #endif