Merge "Move check of IFF_LOWER_UP after all includes."