Code

context-fns.h: Supply missing #includes/declarations so that we don't depend on order...