Re: [PATCH v2] Add missing includes to headers