[PATCH v2 0/6] cleanups, fixes, and progress towards avoiding "make headers"