Updates and includes for VS2013 compatibility.