fixing more lib includes