Fixed a few cases of improper includes breaking settings checks