Cleanup Qt includes
Merge pull request #318 from mwachtler/cleanup_includes

Cleanup Qt includes: include the directory name in public headers