removing hard-coded lib includes