rearranged the includes, removed duplicates