Fixed some includes for the Windows build.
Merge branch 'master' of https://bitbucket.org/kasbah/alphalive2