Fixed include issues in framework
Merge branch 'master' of https://github.com/starand/cpp