fix import declarations
Merge pull request #806 from 9rnsr/fix12359

fix import declarations