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