Fixed a missing semicolon.... not sure how that was missed.
Fixed the workaround for mingw header bugs.