Fixed suspicious imports; linting

When trying to resolve a possibly circular dependency, I ran across a couple of suspicious imports; I checked with rcc_check_relative_imports. The script looks for imports that are redundant or should/could be more specific or point to missing files and the like. Found very little to help me with my original task, but I cleared the list of imports marked by the script and fixed linting for all the affected files :D