add include-path, remove classmap