Include lib-common/lib-local in relevant paths