Merge pull request #10196 from ronald-cron-arm/move-crypto-struct-inclusion

[Backport 3.6] Move the inclusion of crypto_sizes.h and crypto_struct.h in crypto.h