Merge pull request #1738 from ey6es/master

Missing includes.