Reworked import statements to pass R-devel check