Updated headerimport to now also do root classes.