Re: [Matahari] [PATCH] Export more headers