Patch request from WMayer to fix build failures on Windows.
I have added Nate's SurfaceTools module with the name changed to Surface in all files and filenames.