Move some headers file #include from build to World.