Updated include paths
Renamed header checks