Remove wchar.h & Update VS2012 proj with new headers