Don’t use @import in public headers

As clang++ doesn’t like it.
Fix tests