Added BasicShapes and relative include paths to libraries