Sync with the header separation in context-common