Instead of using a defines and conditional building of AES parts, move the conditional functionality into separate files.