fix handling enum {

It was throwing an expection because we did not anticipate the scope
that is created by an enum.
delete unused function

we load cpps directly in the tokenizer.
split includes from xentity

now called xinclude. Because they were not sharing much commonality.