Fix more imports

Removing headers from extra, see #556