same header conflict in hopscotch.o in current version (tried 5a6585009), looks like the patch tries to check LISP_FEATURE_WIN32 before anything defines it.
same header conflict in hopscotch.o in current version (tried 5a6585009), looks like the patch tries to check LISP_FEATURE_WIN32 before anything defines it.