add missing includes
Merge pull request #3058 from ptarjan/master

add missing includes