fix import declarations