Silly of me to overlook it: another obvious way you might like to

[sgt/charset] / istate.c

#include "charset.h"

const charset_state charset_init_state = CHARSET_INIT_STATE;