fixed some includes for gcc
Merge branch 'master' into workshop