some minor include untangling