Improving include practices