- fixed include directives in some cpp files