Fix more imports

Removing headers from extra, see #556

Otherwise project using CocoaPods won't compile.