Fix missing includes
Merge branch 'master' into navigation