Import: narrower headers, include headers

Fixes #60