Fixed possible roundup and howmany macros collision
Fixed headers circular dependency

pthread-functions.h is included before struct pthread is defined:

In file included from ../nptl/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/bits/libc-lock.h:50:0,
                 from ../nptl/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/lowlevellock.h:16,
                 from ../nptl/descr.h:30,
                 from ../nptl/sysdeps/x86_64/tls.h:100,
                 from ../nptl/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/x86_64/tls.h:31,
                 from ../include/errno.h:22,
                 from ../sysdeps/unix/sysv/solaris2/kopensolaris-gnu/check_fds.c:20:
../nptl/sysdeps/pthread/pthread-functions.h:99:34: warning: ‘struct pthread’ declared inside parameter list
   void (*ptr_set_robust) (struct pthread *);
                                  ^