Finished improving include practices