Remove base.h dependency from header