main.h->core.h include dependency improvements.