Use macros and includes from 'rtld' package
New module and some cleanup