 // This file should only be included in macOS targets
 #if os(macOS)
 import Cocoa
+import ClientCore
 #endif
 
-@available(macOS, introduced: 10.12)
+@available(macOS 10.12, *)
 protocol ToolbarItemHandler : class {
 	///called by a top level controller for each toolbar item no one has claimed
 	func handlesToolbarItem(_ item: NSToolbarItem) -> Bool

	func hookupToToolbarItems(_ handler: ToolbarItemHandler, window: NSWindow)
}

@available(macOS, introduced: 10.12)
protocol ToolbarDelegatingOwner : class {
	//should be called when views have loaded
	func assignHandlers(_ rootController: NSViewController, items: [NSToolbarItem])

	}
}

@available(macOS 10.12, *)
extension ToolbarDelegatingOwner {
	func assignUnclaimedToolbarItems(_ toolbar: NSToolbar, handler: ToolbarItemHandler) {
		for item in toolbar.items where item.action == nil {
