Fix for new location and owner of the headers more module.