Re #7945. Adding missing include for windoze.
Merge branch 'feature/7945_check_events_match' into develop