cleanup of include ordering