Updated the paths for supporting includes