imrpove import/include handling further