Fix the build problems revolving around CitContext and context.h