Various cosmetic fixes, another reduction in header inter-dependencies