Fixed the issues with includes by replacing the stdafx.h with the new one. This might affect older builds, but it's better to put any tweaks needed to support them into the stdafx.h