Fixed build on OS X
Refactoring: Adapted Cocoa layer to latest ImportWindow changes