Fix some remaining paths for includes