Fixed includes for new package layout