Reduce include dependencies