Autotools / Fixup include order for win32