Don't include output_api.h in output_internal.h.  This change requires
adding missing includes in several sources.