Reduce number of includes in header