Fix imports for dependencies on other toolkits