Reduce header interdependencies, initially in engine.h (the rest of the