Some file headers and includes fixed
Merge branch 'master' of https://github.com/LesZedCB/sumo-cuda