Adapt to the recent change in include/require semantics.