builder: fix imports