Include fixes after rebase with move into crypto subdir.