Fixed includes on queries.
Merge pull request #34 from teugis/master

Fixed includes on queries.