Removed engine.h from headers

engine.h was causing circular inclusion and some linker errors for some
people