Cleanup of include order