reverting header changes because we break the header test without including the handful of .hh files we do have, since they are needed for the member objects as the object currently exists