updated include headers and sources paths