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

Sanitize SPD include paths