Added missing includes for cygwin build; bumped version to 2.8.4.