minor cleanup of windows specific includes.