Implementing changes to allow for successful compile under Visual Studio...

... 2012.

Sorry, I used spaces and not tabs on my machine so I think I messed up the spacing in the files and I'm not entirely clear how to fix it post-git-rebase. Don't feel the need to implement this, I just wanted a record of it because these changes allow the code to compile in VS2012 which was required for a project I was working on.