Includes

Fixes all the non-win32 issues that you observed in IRC as far as I can tell.