[Matahari] [PATCH] A bit of header file nit-picking.