Fix OSX ifdef and add Windows, too.