Fixup includes after cleanup of EegeoWorld.h. Buddy: Salva