- windows building fixes and other fixes (such as removing dumb #import
  lines)
- fixes for windows