Remove astobj.h from some places where it wasn't needed