LPS-32041 Fix library imports