Move X-related config.h types into x.c