fixed more include paths issues