Add some missing includes#16

romangg merged 3 commits intowinft:masterwinft/como:masterfrom

gfgit:fix_includesgfgit/como:fix_includesCopy head branch name to clipboard