> This is a mess - if I change elf/dynamic-link.h in a similar way (see > below) I finally get: dynamic-link.h is used at different scopes in different places. You can just make the use of static conditional on #ifndef RTLD_BOOTSTRAP.