Fix more imports

Removing headers from extra, see #556
Merge pull request #577 from ashchan/master

Fix more imports