Added necessary include files to not rely on includes in Precompiled.h.
Merge remote-tracking branch 'upstream/master'