Fix single amalgamation file with AVX2
Fix single amalgamation file with AVX2

Closes #1700

webmaster128/botan,webmaster128/botan,webmaster128/botan,randombit/botan,randombit/botan,webmaster128/botan,webmaster128/botan,randombit/botan,randombit/botan,randombit/botan