Core/World: Small cleanup on headers in World.cpp