Fix for renamed headers module.