Upstream decided to split the paranoia interface and move the headers
accordingly.