Fixed includes in base application
Merge pull request #1 from daltenty/master

Fixed includes in base application