+Fixed issues with include directories