Merge pull request #1726 from antonio-nino-diaz-arm/an/includes

Sanitise includes across codebase