Don't split groupcontext.hxx after all

Change-Id: Ie829765f7d9a6e7ba8b99d8fc973537a2576581f