More glibc 2.15 multilib header work