cleanups and adjustments for compiling in Visual C++ 2010 Express