Adapt to lib-less structure