Changes to make the files VS2008-compilable