diff --git a/include/alltypes.h.in b/include/alltypes.h.in
index 76962ef5..4f26114a 100644
--- a/include/alltypes.h.in
+++ b/include/alltypes.h.in
@@ -80,13 +80,20 @@ STRUCT iovec { void *iov_base; size_t iov_len; };
 TYPEDEF unsigned socklen_t;
 TYPEDEF unsigned char sa_family_t;
 
-TYPEDEF struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
 TYPEDEF struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
 TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
+
+TYPEDEF struct    pthread_rwlock         *pthread_rwlock_t;
+TYPEDEF struct    pthread_rwlockattr     *pthread_rwlockattr_t;
+TYPEDEF struct    pthread_barrier        *pthread_barrier_t;
+TYPEDEF struct    pthread_barrierattr    *pthread_barrierattr_t;
+TYPEDEF struct    pthread_spinlock       *pthread_spinlock_t;
+TYPEDEF struct    pthread                *pthread_t;
+TYPEDEF struct    pthread_attr           *pthread_attr_t;
+TYPEDEF struct    pthread_mutex          *pthread_mutex_t;
+TYPEDEF struct    pthread_mutex_attr     *pthread_mutexattr_t;
+TYPEDEF struct    pthread_cond           *pthread_cond_t;
+TYPEDEF struct    pthread_cond_attr      *pthread_condattr_t;
 
 #undef _Addr
 #undef _Int64