use iwyu clean include second time, test=develop (#30829)

* use iwyu clean include second time, test=develop

paddle/fluid/distributed/fleet.cc

@@ -13,15 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/distributed/fleet.h"
-#include <algorithm>
-#include <utility>
 #include "paddle/fluid/distributed/service/communicator.h"
 #include "paddle/fluid/distributed/table/table.h"
-#include "paddle/fluid/framework/channel.h"
-#include "paddle/fluid/framework/data_feed.h"
-#include "paddle/fluid/framework/io/fs.h"
-#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/framework/scope.h"
 
 namespace paddle {
 namespace distributed {

paddle/fluid/distributed/fleet.h

@@ -23,7 +23,6 @@ limitations under the License. */
 #include <unordered_map>
 #include <vector>
 
-#include <ThreadPool.h>
 #include "paddle/fluid/distributed/communicator_common.h"
 #include "paddle/fluid/distributed/service/service.h"
 #include "paddle/fluid/framework/archive.h"
@@ -35,9 +34,20 @@ limitations under the License. */
 #include "paddle/fluid/framework/variable_helper.h"
 #include "paddle/fluid/platform/macros.h"  // for DISABLE_COPY_AND_ASSIGN
 
+namespace paddle {
+namespace framework {
+class LoDTensor;
+class Scope;
+class SelectedRows;
+class Variable;
+}  // namespace framework
+}  // namespace paddle
+
 namespace paddle {
 namespace distributed {
 
+class PSCore;
+
 using framework::LoDTensor;
 using framework::Scope;
 using framework::SelectedRows;

paddle/fluid/distributed/service/brpc_ps_client.cc

@@ -12,17 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <algorithm>
 #include <memory>
 #include <sstream>
 #include <string>
-#include <vector>
-#include "Eigen/Dense"
 
 #include "paddle/fluid/distributed/service/brpc_ps_client.h"
-#include "paddle/fluid/distributed/table/table.h"
 #include "paddle/fluid/framework/archive.h"
-#include "paddle/fluid/string/string_helper.h"
 
 const static int max_port = 65535;
 
@@ -62,9 +57,6 @@ namespace framework {
 class Scope;
 class Variable;
 }  // namespace framework
-namespace platform {
-class DeviceContext;
-}  // namespace platform
 }  // namespace paddle
 
 namespace paddle {

paddle/fluid/distributed/service/brpc_ps_client.h

@@ -27,9 +27,22 @@
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/framework/tensor_util.h"
 
+namespace brpc {
+class Channel;
+class Controller;
+}  // namespace brpc
+namespace google {
+namespace protobuf {
+class Closure;
+class RpcController;
+}  // namespace protobuf
+}  // namespace google
+
 namespace paddle {
 namespace distributed {
 
+struct Region;
+
 class DownpourPsClientService : public PsService {
  public:
   DownpourPsClientService() {}

paddle/fluid/distributed/service/brpc_ps_server.cc

@@ -13,15 +13,18 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/service/brpc_ps_server.h"
-#include <netdb.h>
 #include <thread>  // NOLINT
-#include "Eigen/Dense"
-#include "butil/endpoint.h"
-#include "iomanip"
 #include "paddle/fluid/distributed/table/table.h"
 #include "paddle/fluid/framework/archive.h"
 #include "paddle/fluid/platform/profiler.h"
 
+namespace google {
+namespace protobuf {
+class Closure;
+class RpcController;
+}  // namespace protobuf
+}  // namespace google
+
 namespace paddle {
 namespace distributed {
 

paddle/fluid/distributed/service/brpc_ps_server.h

@@ -17,15 +17,26 @@
 #include "brpc/channel.h"
 #include "brpc/controller.h"
 #include "brpc/server.h"
-
-#include <memory>
-#include <vector>
 #include "paddle/fluid/distributed/service/brpc_utils.h"
 #include "paddle/fluid/distributed/service/server.h"
 
+namespace brpc {
+class Controller;
+}  // namespace brpc
+namespace google {
+namespace protobuf {
+class Closure;
+class RpcController;
+}  // namespace protobuf
+}  // namespace google
+
 namespace paddle {
 namespace distributed {
 
+class PsRequestMessage;
+class PsResponseMessage;
+class Table;
+
 class BrpcPsServer : public PSServer {
  public:
   BrpcPsServer() {}

paddle/fluid/distributed/service/brpc_utils.cc

@@ -15,20 +15,13 @@ limitations under the License. */
 #include "paddle/fluid/distributed/service/brpc_utils.h"
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <netinet/in.h>
-#include <limits>
-#include <memory>
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/profiler.h"
 
 namespace paddle {
 namespace framework {
-class Scope;
 class Variable;
+class LoDTensor;
 }  // namespace framework
-namespace platform {
-class DeviceContext;
-}  // namespace platform
 }  // namespace paddle
 
 namespace paddle {

paddle/fluid/distributed/service/brpc_utils.h

@@ -18,6 +18,7 @@ limitations under the License. */
 #include <iostream>
 #include <string>
 #include <vector>
+
 #include "brpc/channel.h"
 #include "paddle/fluid/distributed/service/sendrecv.pb.h"
 #include "paddle/fluid/framework/data_type.h"
@@ -28,6 +29,11 @@ limitations under the License. */
 #include "paddle/fluid/framework/var_type.h"
 #include "paddle/fluid/platform/port.h"
 
+namespace butil {
+class IOBuf;
+class IOBufBytesIterator;
+}  // namespace butil
+
 namespace grpc {
 class ByteBuffer;
 }  // namespace grpc

paddle/fluid/distributed/service/communicator.cc

@@ -15,24 +15,11 @@ limitations under the License. */
 #include "paddle/fluid/distributed/service/communicator.h"
 
 #include <google/protobuf/text_format.h>
-#include <paddle/fluid/framework/program_desc.h>
-
-#include <algorithm>
-#include <chrono>  // NOLINT
-#include <map>
-#include <thread>  // NOLINT
-#include <unordered_set>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/distributed/table/table.h"
-#include "paddle/fluid/framework/eigen.h"
-#include "paddle/fluid/framework/selected_rows.h"
-#include "paddle/fluid/framework/tensor_util.h"
-#include "paddle/fluid/framework/threadpool.h"
-#include "paddle/fluid/framework/variable_helper.h"
+#include "paddle/fluid/distributed/service/brpc_ps_client.h"
 #include "paddle/fluid/platform/profiler.h"
-#include "paddle/fluid/string/printf.h"
-#include "paddle/fluid/string/split.h"
+#include "paddle/fluid/string/string_helper.h"
 
 #define LEARNING_RATE_DECAY_COUNTER "@LR_DECAY_COUNTER@"
 #define STEP_COUNTER "@PS_STEP_COUNTER@"

paddle/fluid/distributed/service/communicator.h

@@ -41,10 +41,15 @@ limitations under the License. */
 #include "paddle/fluid/platform/place.h"
 #include "paddle/fluid/string/split.h"
 
-#include "paddle/fluid/distributed/ps.pb.h"
-#include "paddle/fluid/distributed/service/brpc_ps_client.h"
 #include "paddle/fluid/distributed/service/ps_client.h"
 
+namespace paddle {
+namespace distributed {
+class PSClient;
+struct CommContext;
+}  // namespace distributed
+}  // namespace paddle
+
 DECLARE_bool(communicator_is_sgd_optimizer);
 
 namespace paddle {

paddle/fluid/distributed/service/heter_client.cc

@@ -13,15 +13,7 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/service/heter_client.h"
-#include <algorithm>
-#include <utility>
-#include "paddle/fluid/framework/channel.h"
-#include "paddle/fluid/framework/data_feed.h"
-#include "paddle/fluid/framework/device_worker.h"
-#include "paddle/fluid/framework/io/fs.h"
-#include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/platform/profiler.h"
-#include "paddle/fluid/platform/timer.h"
 #include "paddle/fluid/string/split.h"
 
 DECLARE_int32(rpc_deadline);

paddle/fluid/distributed/service/heter_client.h

@@ -21,6 +21,7 @@ limitations under the License. */
 #include <string>
 #include <unordered_map>
 #include <vector>
+
 #include "brpc/channel.h"
 #include "brpc/controller.h"
 #include "brpc/server.h"
@@ -32,6 +33,15 @@ limitations under the License. */
 #include "paddle/fluid/framework/variable_helper.h"
 #include "paddle/fluid/platform/macros.h"  // for DISABLE_COPY_AND_ASSIGN
 
+namespace paddle {
+namespace framework {
+class Scope;
+}  // namespace framework
+namespace platform {
+class DeviceContext;
+}  // namespace platform
+}  // namespace paddle
+
 namespace paddle {
 namespace distributed {
 

paddle/fluid/distributed/service/heter_server.cc

@@ -13,12 +13,6 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/service/heter_server.h"
-#include <algorithm>
-#include <utility>
-#include "paddle/fluid/framework/fleet/heter_wrapper.h"
-#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/platform/timer.h"
 #include "paddle/fluid/string/split.h"
 
 namespace paddle {

paddle/fluid/distributed/service/heter_server.h

@@ -35,6 +35,22 @@ limitations under the License. */
 #include "paddle/fluid/platform/macros.h"  // for DISABLE_COPY_AND_ASSIGN
 #include "paddle/fluid/platform/profiler.h"
 
+namespace google {
+namespace protobuf {
+class Closure;
+class RpcController;
+}  // namespace protobuf
+}  // namespace google
+namespace paddle {
+namespace framework {
+class Executor;
+class ProgramDesc;
+}  // namespace framework
+namespace platform {
+class DeviceContext;
+}  // namespace platform
+}  // namespace paddle
+
 DECLARE_double(eager_delete_tensor_gb);
 namespace paddle {
 namespace distributed {
@@ -43,6 +59,7 @@ using MultiVarMsg = ::paddle::distributed::MultiVariableMessage;
 using VarMsg = ::paddle::distributed::VariableMessage;
 
 class HeterService;
+
 typedef int32_t (HeterService::*serviceHandlerFunc)(
     const PsRequestMessage& request, PsResponseMessage& response,
     brpc::Controller* cntl);

paddle/fluid/distributed/service/ps_client.cc

@@ -13,8 +13,6 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/service/ps_client.h"
-#include <map>
-#include "brpc/server.h"
 #include "glog/logging.h"
 #include "paddle/fluid/distributed/service/brpc_ps_client.h"
 #include "paddle/fluid/distributed/table/table.h"

paddle/fluid/distributed/service/ps_client.h

@@ -28,6 +28,12 @@
 namespace paddle {
 namespace distributed {
 
+class PSEnvironment;
+class PsRequestMessage;
+class PsResponseMessage;
+class ValueAccessor;
+struct Region;
+
 using paddle::distributed::PsRequestMessage;
 using paddle::distributed::PsResponseMessage;
 

paddle/fluid/distributed/service/server.h

@@ -31,6 +31,17 @@
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/fluid/platform/place.h"
 
+namespace google {
+namespace protobuf {
+class RpcController;
+}  // namespace protobuf
+}  // namespace google
+namespace paddle {
+namespace distributed {
+class PSEnvironment;
+}  // namespace distributed
+}  // namespace paddle
+
 namespace paddle {
 namespace framework {
 class Executor;
@@ -46,6 +57,7 @@ namespace paddle {
 namespace distributed {
 
 class Table;
+
 using paddle::distributed::PsRequestMessage;
 using paddle::distributed::PsResponseMessage;
 

paddle/fluid/distributed/service/service.h

@@ -19,7 +19,6 @@ limitations under the License. */
 #include <string>
 #include <vector>
 
-#include <glog/logging.h>
 #include "paddle/fluid/distributed/ps.pb.h"
 #include "paddle/fluid/distributed/service/ps_client.h"
 #include "paddle/fluid/distributed/service/sendrecv.pb.h"
@@ -28,6 +27,12 @@ limitations under the License. */
 namespace paddle {
 namespace distributed {
 
+class PSClient;
+class PSServer;
+class PsRequestMessage;
+class PsResponseMessage;
+class PsService;
+
 using paddle::distributed::PsRequestMessage;
 using paddle::distributed::PsResponseMessage;
 using paddle::distributed::PsService;

paddle/fluid/distributed/table/barrier_table.cc

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <chrono>  // NOLINT
-#include "paddle/fluid/distributed/common/utils.h"
 #include "paddle/fluid/distributed/table/common_table.h"
 
 namespace paddle {

paddle/fluid/distributed/table/common_dense_table.cc

@@ -13,7 +13,8 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/table/common_dense_table.h"
-#include "paddle/fluid/distributed/common/utils.h"
+
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace distributed {

paddle/fluid/distributed/table/common_dense_table.h

@@ -28,6 +28,8 @@
 namespace paddle {
 namespace distributed {
 
+class DenseOptimizer;
+
 class CommonDenseTable : public DenseTable {
  public:
   explicit CommonDenseTable() {}

paddle/fluid/distributed/table/common_sparse_table.cc

@@ -13,13 +13,17 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/table/common_sparse_table.h"
-#include <algorithm>
+
 #include <sstream>
-#include "paddle/fluid/distributed/common/utils.h"
-#include "paddle/fluid/distributed/table/depends/large_scale_kv.h"
-#include "paddle/fluid/framework/generator.h"
-#include "paddle/fluid/string/printf.h"
-#include "paddle/fluid/string/string_helper.h"
+
+#include "glog/logging.h"
+#include "paddle/fluid/platform/enforce.h"
+
+namespace paddle {
+namespace distributed {
+class ValueBlock;
+}  // namespace distributed
+}  // namespace paddle
 
 #define PSERVER_SAVE_SUFFIX "_txt"
 namespace paddle {

paddle/fluid/distributed/table/common_sparse_table.h

@@ -35,6 +35,8 @@
 namespace paddle {
 namespace distributed {
 
+class SparseOptimizer;
+
 class CommonSparseTable : public SparseTable {
  public:
   CommonSparseTable() { rwlock_.reset(new framework::RWLock); }

paddle/fluid/distributed/table/sparse_geo_table.h

@@ -16,11 +16,13 @@
 
 #include <assert.h>
 #include <pthread.h>
+#include <stdint.h>
 #include <memory>
 #include <mutex>  // NOLINT
 #include <string>
 #include <utility>
 #include <vector>
+
 #include "Eigen/Dense"
 #include "paddle/fluid/distributed/table/accessor.h"
 #include "paddle/fluid/distributed/table/common_sparse_table.h"
@@ -35,6 +37,8 @@
 namespace paddle {
 namespace distributed {
 
+class GeoRecorder;
+
 class SparseGeoTable : public CommonSparseTable {
  public:
   explicit SparseGeoTable() : CommonSparseTable() { geo_recorder = nullptr; }

paddle/fluid/distributed/table/table.cc

@@ -14,8 +14,6 @@
 
 #include "paddle/fluid/distributed/table/table.h"
 
-#include <boost/preprocessor/repetition/repeat_from_to.hpp>
-#include <boost/preprocessor/seq/elem.hpp>
 #include "glog/logging.h"
 #include "paddle/fluid/distributed/common/registerer.h"
 

paddle/fluid/distributed/table/tensor_accessor.h

@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <string>
 #include <vector>
+
 #include "paddle/fluid/distributed/common/registerer.h"
 #include "paddle/fluid/distributed/ps.pb.h"
 #include "paddle/fluid/distributed/table/accessor.h"

paddle/fluid/distributed/table/tensor_table.cc

@@ -13,14 +13,7 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/table/tensor_table.h"
-#include <chrono>  // NOLINT
-#include <map>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-#include "paddle/fluid/distributed/common/utils.h"
+
 DECLARE_double(eager_delete_tensor_gb);
 namespace paddle {
 namespace distributed {

paddle/fluid/distributed/table/tensor_table.h

@@ -22,12 +22,21 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+
 #include "paddle/fluid/distributed/common/utils.h"
 #include "paddle/fluid/distributed/table/table.h"
 #include "paddle/fluid/framework/executor.h"
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/platform/device_context.h"
 
+namespace paddle {
+namespace framework {
+class Executor;
+class Scope;
+struct ExecutorPrepareContext;
+}  // namespace framework
+}  // namespace paddle
+
 namespace paddle {
 namespace distributed {
 

paddle/fluid/distributed/test/barrier_table_test.cc

@@ -13,12 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <ThreadPool.h>
-
-#include <unistd.h>
-#include <string>
-#include <thread>  // NOLINT
-
-#include "google/protobuf/text_format.h"
+#include <unordered_map>
+#include <vector>
 #include "gtest/gtest.h"
 #include "paddle/fluid/distributed/ps.pb.h"
 #include "paddle/fluid/distributed/table/common_table.h"

paddle/fluid/distributed/test/brpc_service_dense_sgd_test.cc

@@ -13,29 +13,28 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <unistd.h>
-
-#include <condition_variable>  // NOLINT
 #include <string>
 #include <thread>  // NOLINT
 
-#include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
-#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/distributed/service/brpc_ps_client.h"
+#include "paddle/fluid/distributed/service/brpc_ps_server.h"
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/framework/tensor_util.h"
-#include "paddle/fluid/framework/variable.h"
 #include "paddle/fluid/operators/math/math_function.h"
 #include "paddle/fluid/platform/place.h"
-#include "paddle/fluid/string/printf.h"
 
-#include "paddle/fluid/distributed/ps.pb.h"
-#include "paddle/fluid/distributed/service/brpc_ps_client.h"
-#include "paddle/fluid/distributed/service/brpc_ps_server.h"
-#include "paddle/fluid/distributed/service/env.h"
-#include "paddle/fluid/distributed/service/ps_client.h"
-#include "paddle/fluid/distributed/service/sendrecv.pb.h"
-#include "paddle/fluid/distributed/service/service.h"
+namespace paddle {
+namespace distributed {
+class DownpourBrpcClosure;
+class PSClient;
+class PSServer;
+}  // namespace distributed
+namespace framework {
+class LoDTensor;
+class Variable;
+}  // namespace framework
+}  // namespace paddle
 
 namespace framework = paddle::framework;
 namespace platform = paddle::platform;

paddle/fluid/distributed/test/brpc_service_sparse_sgd_test.cc

@@ -13,29 +13,29 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <unistd.h>
-#include <condition_variable>  // NOLINT
 #include <string>
 #include <thread>  // NOLINT
 
-#include "google/protobuf/text_format.h"
-
 #include "gtest/gtest.h"
-#include "paddle/fluid/framework/lod_tensor.h"
-#include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/framework/tensor_util.h"
-#include "paddle/fluid/framework/variable.h"
-
 #include "paddle/fluid/distributed/ps.pb.h"
 #include "paddle/fluid/distributed/service/brpc_ps_client.h"
 #include "paddle/fluid/distributed/service/brpc_ps_server.h"
 #include "paddle/fluid/distributed/service/env.h"
-#include "paddle/fluid/distributed/service/ps_client.h"
-#include "paddle/fluid/distributed/service/sendrecv.pb.h"
-#include "paddle/fluid/distributed/service/service.h"
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/operators/math/math_function.h"
 #include "paddle/fluid/platform/place.h"
-#include "paddle/fluid/string/printf.h"
+
+namespace paddle {
+namespace distributed {
+class DownpourBrpcClosure;
+class PSClient;
+class PSServer;
+}  // namespace distributed
+namespace framework {
+class LoDTensor;
+class Variable;
+}  // namespace framework
+}  // namespace paddle
 
 namespace framework = paddle::framework;
 namespace platform = paddle::platform;

paddle/fluid/distributed/test/brpc_utils_test.cc

@@ -12,21 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include <unistd.h>
 #include <string>
-#include <thread>  // NOLINT
 
-#include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
-#include "paddle/fluid/framework/lod_tensor.h"
-#include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/framework/tensor_util.h"
-#include "paddle/fluid/framework/variable.h"
 
 #include "paddle/fluid/distributed/service/brpc_utils.h"
 #include "paddle/fluid/operators/math/math_function.h"
-#include "paddle/fluid/platform/place.h"
-#include "paddle/fluid/string/printf.h"
+
+namespace paddle {
+namespace framework {
+class Variable;
+}  // namespace framework
+}  // namespace paddle
 
 namespace framework = paddle::framework;
 namespace platform = paddle::platform;

paddle/fluid/distributed/test/dense_table_test.cc

@@ -13,23 +13,17 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <ThreadPool.h>
-
-#include <unistd.h>
-#include <string>
-#include <thread>  // NOLINT
-
-#include "google/protobuf/text_format.h"
+#include <vector>
 #include "gtest/gtest.h"
 #include "paddle/fluid/distributed/ps.pb.h"
 #include "paddle/fluid/distributed/table/common_dense_table.h"
-#include "paddle/fluid/distributed/table/common_sparse_table.h"
-#include "paddle/fluid/distributed/table/sparse_geo_table.h"
-#include "paddle/fluid/distributed/table/table.h"
 
 namespace paddle {
 namespace distributed {
 
 // CommonDenseTable + Adam
+class Table;
+
 TEST(CommonDenseTable, Adam) {
   int fea_dim = 10;
   int trainers = 2;

paddle/fluid/distributed/test/table_test.cc

@@ -12,19 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include <ThreadPool.h>
-
-#include <unistd.h>
-#include <string>
-#include <thread>  // NOLINT
-
-#include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
 #include "paddle/fluid/distributed/ps.pb.h"
-#include "paddle/fluid/distributed/table/common_dense_table.h"
 #include "paddle/fluid/distributed/table/common_sparse_table.h"
 #include "paddle/fluid/distributed/table/sparse_geo_table.h"
-#include "paddle/fluid/distributed/table/table.h"
 
 namespace paddle {
 namespace distributed {

paddle/fluid/framework/attribute.h

@@ -14,15 +14,19 @@ limitations under the License. */
 
 #pragma once
 
+#include <stdint.h>
 #include <functional>
+#include <iosfwd>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
+#include "boost/variant/get.hpp"
 #include "paddle/fluid/framework/framework.pb.h"
 #include "paddle/fluid/framework/type_defs.h"
 #include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/errors.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/block_desc.cc

@@ -15,8 +15,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/block_desc.h"
 
 #include <queue>
-#include <unordered_set>
-#include <utility>
 
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/framework/program_desc.h"

paddle/fluid/framework/block_desc.h

@@ -29,8 +29,8 @@ limitations under the License. */
 namespace paddle {
 namespace framework {
 
-class ProgramDesc;
 class OpDesc;
+class ProgramDesc;
 class VarDesc;
 
 // Each Protobuf Message, we provide a XXXBind class. In that class, we optimize

paddle/fluid/framework/c/c_api.cc

@@ -14,6 +14,10 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/c/c_api.h"
 
+#include "paddle/fluid/framework/op_info.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/enforce.h"
+
 extern "C" {
 
 paddle::framework::OpInfoMap &PD_GetOpInfoMap() {

paddle/fluid/framework/copy_same_tensor_test.cc

@@ -12,12 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <sys/types.h>
 #include <random>
 
 #include "gflags/gflags.h"
 #include "gtest/gtest.h"
+#include "paddle/fluid/framework/ddim.h"
 #include "paddle/fluid/framework/tensor.h"
 #include "paddle/fluid/framework/tensor_util.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/place.h"
 
 DECLARE_bool(use_system_allocator);
 

paddle/fluid/framework/data_feed.cc

@@ -22,19 +22,8 @@ limitations under the License. */
 #include <stdio_ext.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #endif
-#include <utility>
-#include "gflags/gflags.h"
-#include "google/protobuf/io/zero_copy_stream_impl.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/text_format.h"
 #include "io/fs.h"
-#include "io/shell.h"
-#include "paddle/fluid/framework/feed_fetch_method.h"
-#include "paddle/fluid/framework/feed_fetch_type.h"
-#include "paddle/fluid/framework/fleet/box_wrapper.h"
-#include "paddle/fluid/framework/fleet/fleet_wrapper.h"
 #include "paddle/fluid/platform/monitor.h"
 #include "paddle/fluid/platform/timer.h"
 

paddle/fluid/framework/data_feed.h

@@ -418,6 +418,7 @@ class MultiSlotType {
   void AppendValues(const float* input, size_t size) {
     CheckFloat();
     offset_.push_back(offset_.back() + size);
+
     float_feasign_.insert(float_feasign_.end(), input, input + size);
   }
   const std::vector<float>& GetFloatData() const { return float_feasign_; }

paddle/fluid/framework/data_feed_factory.cc

@@ -13,9 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/framework/data_feed_factory.h"
+
+#include <stdlib.h>
 #include <memory>
 #include <string>
-#include <unordered_map>
+
+#include "glog/logging.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/data_layout_transform.cc

@@ -13,8 +13,6 @@
 // limitations under the License.
 
 #include "paddle/fluid/framework/data_layout_transform.h"
-#include <string>
-#include "paddle/fluid/platform/profiler.h"
 
 #include "paddle/fluid/operators/math/math_function.h"
 #ifdef PADDLE_WITH_MKLDNN

paddle/fluid/framework/data_set.cc

@@ -13,19 +13,11 @@
  *     limitations under the License. */
 
 #include "paddle/fluid/framework/data_set.h"
-#include <algorithm>
-#include <random>
-#include <unordered_map>
-#include <unordered_set>
-#include "google/protobuf/io/zero_copy_stream_impl.h"
-#include "google/protobuf/message.h"
 #include "google/protobuf/text_format.h"
 #include "paddle/fluid/framework/data_feed_factory.h"
-#include "paddle/fluid/framework/fleet/fleet_wrapper.h"
 #include "paddle/fluid/framework/io/fs.h"
 #include "paddle/fluid/platform/monitor.h"
 #include "paddle/fluid/platform/timer.h"
-#include "xxhash.h"  // NOLINT
 
 #if defined _WIN32 || defined __APPLE__
 #else

paddle/fluid/framework/data_type.cc

@@ -13,8 +13,11 @@
 // limitations under the License.
 
 #include "paddle/fluid/framework/data_type.h"
+
 #include <string>
-#include <unordered_map>
+
+#include "paddle/fluid/platform/bfloat16.h"
+#include "paddle/fluid/platform/float16.h"
 
 using float16 = paddle::platform::float16;
 using bfloat16 = paddle::platform::bfloat16;

paddle/fluid/framework/data_type.h

@@ -26,9 +26,9 @@ limitations under the License. */
 namespace paddle {
 namespace platform {
 struct bfloat16;
-struct float16;
-struct complex64;
 struct complex128;
+struct complex64;
+struct float16;
 }  // namespace platform
 }  // namespace paddle
 

paddle/fluid/framework/dataset_factory.cc

@@ -13,8 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/framework/dataset_factory.h"
+
 #include <string>
-#include <unordered_map>
+
+#include "glog/logging.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/details/all_reduce_op_handle.cc

@@ -13,13 +13,8 @@
 // limitations under the License.
 #include "paddle/fluid/framework/details/all_reduce_op_handle.h"
 
-#include <algorithm>
-
 #include "paddle/fluid/framework/details/container_cast.h"
 #include "paddle/fluid/framework/details/reduce_and_gather.h"
-#include "paddle/fluid/framework/details/variable_visitor.h"
-#include "paddle/fluid/framework/operator.h"
-#include "paddle/fluid/platform/gpu_info.h"
 #include "paddle/fluid/platform/profiler.h"
 
 #ifdef PADDLE_WITH_NCCL

paddle/fluid/framework/details/build_strategy.cc

@@ -15,15 +15,8 @@ limitations under the License. */
 #include "paddle/fluid/framework/details/build_strategy.h"
 
 #include <glog/logging.h>
-#include <memory>
-#include <unordered_set>
-#include <utility>
 #include "paddle/fluid/framework/details/reduce_op_handle.h"
-#include "paddle/fluid/framework/ir/graph.h"
-#include "paddle/fluid/framework/ir/graph_helper.h"
 #include "paddle/fluid/framework/ir/graph_printer.h"
-#include "paddle/fluid/framework/ir/graph_to_program_pass.h"
-#include "paddle/fluid/framework/ir/graph_viz_pass.h"
 #include "paddle/fluid/framework/ir/multi_devices_graph_pass/multi_devices_graph_pass.h"
 
 DECLARE_bool(use_mkldnn);

paddle/fluid/framework/details/computation_op_handle.h

@@ -28,6 +28,7 @@ namespace paddle {
 namespace framework {
 class OperatorBase;
 class Scope;
+
 namespace ir {
 class Node;
 }  // namespace ir

paddle/fluid/framework/details/eager_deletion_op_handle.cc

@@ -14,19 +14,18 @@
 
 #include "paddle/fluid/framework/details/eager_deletion_op_handle.h"
 
-#include <memory>
-#include <unordered_set>
-#include <utility>
-
 #include "paddle/fluid/framework/ir/memory_optimize_pass/memory_optimization_var_info.h"
-#include "paddle/fluid/framework/lod_tensor_array.h"
-#include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/framework/selected_rows.h"
 #include "paddle/fluid/platform/profiler.h"
 #ifdef PADDLE_WITH_CUDA
 #include "paddle/fluid/platform/cuda_device_guard.h"
 #endif
 
+namespace paddle {
+namespace framework {
+class Variable;
+}  // namespace framework
+}  // namespace paddle
+
 namespace paddle {
 namespace framework {
 namespace details {

paddle/fluid/framework/details/eager_deletion_op_handle.h

@@ -31,8 +31,9 @@ class CUDADeviceContext;
 
 namespace paddle {
 namespace framework {
-class Scope;
 class GarbageCollector;
+class Scope;
+
 namespace ir {
 class Node;
 }  // namespace ir

paddle/fluid/framework/details/exception_holder.h

@@ -14,6 +14,7 @@
 
 #pragma once
 
+#include <exception>
 #include <memory>
 #include <mutex>  // NOLINT
 #include <string>

paddle/fluid/framework/details/fetch_async_op_handle.cc

@@ -15,7 +15,6 @@
 #include "paddle/fluid/framework/details/fetch_async_op_handle.h"
 
 #include <string>
-#include <utility>
 
 #include "paddle/fluid/platform/profiler.h"
 

paddle/fluid/framework/details/fetch_async_op_handle.h

@@ -25,6 +25,7 @@
 namespace paddle {
 namespace framework {
 class LoDTensor;
+
 namespace ir {
 class Node;
 }  // namespace ir

paddle/fluid/framework/details/fetch_barrier_op_handle.h

@@ -23,10 +23,12 @@
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace framework {
 class Scope;
+
 namespace ir {
 class Node;
 }  // namespace ir

paddle/fluid/framework/details/fetch_op_handle.cc

@@ -15,8 +15,6 @@
 #include "paddle/fluid/framework/details/fetch_op_handle.h"
 
 #include <string>
-#include <utility>
-#include <vector>
 
 #include "paddle/fluid/platform/profiler.h"
 

paddle/fluid/framework/details/fused_all_reduce_op_handle.cc

@@ -13,11 +13,7 @@
 // limitations under the License.
 #include "paddle/fluid/framework/details/fused_all_reduce_op_handle.h"
 
-#include <algorithm>
-#include <utility>
-
 #include "paddle/fluid/framework/details/container_cast.h"
-#include "paddle/fluid/framework/details/reduce_and_gather.h"
 #include "paddle/fluid/framework/details/variable_visitor.h"
 #include "paddle/fluid/platform/device_memory_aligment.h"
 #include "paddle/fluid/platform/profiler.h"

paddle/fluid/framework/details/fused_broadcast_op_handle.cc

@@ -15,7 +15,6 @@
 #include "paddle/fluid/framework/details/fused_broadcast_op_handle.h"
 
 #include "paddle/fluid/framework/details/container_cast.h"
-#include "paddle/fluid/framework/details/variable_visitor.h"
 #include "paddle/fluid/platform/profiler.h"
 
 namespace paddle {

paddle/fluid/framework/details/fused_broadcast_op_handle_test.cc

@@ -14,12 +14,11 @@
 
 #include "paddle/fluid/framework/details/fused_broadcast_op_handle.h"
 
-#include <memory>
-#include <unordered_map>
-
 #include "gtest/gtest.h"
 #include "paddle/fluid/framework/details/broadcast_op_handle_test.h"
 #include "paddle/fluid/framework/details/op_handle_base.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {
@@ -32,6 +31,7 @@ namespace framework {
 namespace details {
 
 struct VarHandle;
+
 using DeviceType = paddle::platform::DeviceType;
 
 struct TestFusedBroadcastOpHandle : TestBroadcastOpHandle {

paddle/fluid/framework/details/gather_op_handle.cc

@@ -16,6 +16,11 @@
 
 #include "paddle/fluid/framework/details/container_cast.h"
 #include "paddle/fluid/framework/details/variable_visitor.h"
+namespace paddle {
+namespace framework {
+class Tensor;
+}  // namespace framework
+}  // namespace paddle
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/details/gather_op_handle_test.cc

@@ -14,9 +14,6 @@
 
 #include "paddle/fluid/framework/details/gather_op_handle.h"
 
-#include <memory>
-#include <unordered_map>
-
 #include "gtest/gtest.h"
 
 namespace paddle {

paddle/fluid/framework/details/grad_merge_all_reduce_op_handle.cc

@@ -13,15 +13,6 @@
 // limitations under the License.
 #include "paddle/fluid/framework/details/grad_merge_all_reduce_op_handle.h"
 
-#include <algorithm>
-
-#include "paddle/fluid/framework/details/container_cast.h"
-#include "paddle/fluid/framework/details/reduce_and_gather.h"
-#include "paddle/fluid/framework/details/variable_visitor.h"
-#include "paddle/fluid/framework/operator.h"
-#include "paddle/fluid/platform/gpu_info.h"
-#include "paddle/fluid/platform/profiler.h"
-
 #ifdef PADDLE_WITH_NCCL
 DECLARE_bool(sync_nccl_allreduce);
 #endif

paddle/fluid/framework/details/multi_devices_helper.cc

@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "paddle/fluid/framework/details/multi_devices_helper.h"
-#include <algorithm>
-#include <unordered_set>
+
 #include "paddle/fluid/framework/details/computation_op_handle.h"
 #include "paddle/fluid/framework/details/eager_deletion_op_handle.h"
 #include "paddle/fluid/framework/details/share_tensor_buffer_op_handle.h"

paddle/fluid/framework/details/nan_inf_utils_detail.cc

@@ -14,15 +14,7 @@
 
 #include "paddle/fluid/framework/details/nan_inf_utils.h"
 #include "paddle/fluid/framework/details/nan_inf_utils_detail.h"
-
-#include <algorithm>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
 #include "paddle/fluid/framework/op_proto_maker.h"
-#include "paddle/fluid/framework/selected_rows.h"
-
 namespace paddle {
 namespace framework {
 namespace details {

paddle/fluid/framework/details/op_handle_base.cc

@@ -13,9 +13,6 @@
 // limitations under the License.
 #include "paddle/fluid/framework/details/op_handle_base.h"
 
-#include <map>
-#include <unordered_set>
-
 namespace paddle {
 namespace framework {
 namespace details {

paddle/fluid/framework/details/op_handle_base.h

@@ -35,6 +35,7 @@ namespace paddle {
 namespace framework {
 
 class Scope;
+
 namespace details {
 struct VarHandleBase;
 }  // namespace details

paddle/fluid/framework/details/reduce_op_handle.cc

@@ -14,12 +14,9 @@
 
 #include "paddle/fluid/framework/details/reduce_op_handle.h"
 
-#include <memory>
-
 #include "paddle/fluid/framework/details/container_cast.h"
 #include "paddle/fluid/framework/details/reduce_and_gather.h"
 #include "paddle/fluid/framework/details/variable_visitor.h"
-#include "paddle/fluid/operators/math/selected_rows_functor.h"
 #include "paddle/fluid/platform/profiler.h"
 
 DEFINE_bool(

paddle/fluid/framework/details/reduce_op_handle.h

@@ -28,6 +28,7 @@
 namespace paddle {
 namespace framework {
 class SelectedRows;
+
 namespace details {
 struct VarHandle;
 }  // namespace details

paddle/fluid/framework/details/scope_buffered_monitor.cc

@@ -13,13 +13,14 @@
 // limitations under the License.
 
 #include "paddle/fluid/framework/details/scope_buffered_monitor.h"
-#include <memory>
-#include <string>
-#include <vector>
-#include "paddle/fluid/framework/lod_tensor_array.h"
-#include "paddle/fluid/framework/selected_rows.h"
 #include "paddle/fluid/platform/profiler.h"
 
+namespace paddle {
+namespace framework {
+class Variable;
+}  // namespace framework
+}  // namespace paddle
+
 DECLARE_double(local_exe_sub_scope_limit);
 
 namespace paddle {

paddle/fluid/framework/details/share_tensor_buffer_functor.cc

@@ -15,11 +15,8 @@
 #include "paddle/fluid/framework/details/share_tensor_buffer_functor.h"
 
 #include <string>
-#include <unordered_map>
-#include <unordered_set>
 
-#include "paddle/fluid/framework/lod_tensor.h"
-#include "paddle/fluid/framework/selected_rows.h"
+#include "glog/logging.h"
 #include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
@@ -27,6 +24,7 @@ namespace framework {
 class Scope;
 class Tensor;
 class Variable;
+
 namespace ir {
 class MemOptVarInfo;
 }  // namespace ir

paddle/fluid/framework/details/share_tensor_buffer_functor.h

@@ -28,6 +28,7 @@
 namespace paddle {
 namespace framework {
 class Scope;
+
 namespace ir {
 class MemOptVarInfo;
 }  // namespace ir

paddle/fluid/framework/details/share_tensor_buffer_op_handle.cc

@@ -15,12 +15,7 @@
 #include "paddle/fluid/framework/details/share_tensor_buffer_op_handle.h"
 
 #include <string>
-#include <unordered_set>
 
-#include "paddle/fluid/framework/ir/memory_optimize_pass/memory_optimization_var_info.h"
-#include "paddle/fluid/framework/lod_tensor.h"
-#include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/framework/selected_rows.h"
 #include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {

paddle/fluid/framework/details/share_tensor_buffer_op_handle.h

@@ -25,6 +25,7 @@
 namespace paddle {
 namespace framework {
 class Scope;
+
 namespace ir {
 class MemOptVarInfo;
 class Node;

paddle/fluid/framework/device_worker_factory.cc

@@ -13,9 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/framework/device_worker_factory.h"
+
+#include <stdlib.h>
 #include <memory>
 #include <string>
-#include <unordered_map>
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/dist_multi_trainer.cc

@@ -12,13 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include <string>
-#include <vector>
-#include "io/fs.h"
-#include "paddle/fluid/framework/data_feed_factory.h"
-#include "paddle/fluid/framework/data_set.h"
 #include "paddle/fluid/framework/device_worker_factory.h"
-#include "paddle/fluid/framework/fleet/fleet_wrapper.h"
 #include "paddle/fluid/framework/trainer.h"
 
 namespace paddle {

paddle/fluid/framework/dist_multi_trainer_test.cc

@@ -12,12 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include "google/protobuf/io/zero_copy_stream_impl.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
 #include "paddle/fluid/framework/trainer.h"
 

paddle/fluid/framework/dlpack_tensor.cc

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "paddle/fluid/framework/dlpack_tensor.h"
-#include <unordered_map>
 #include "paddle/fluid/framework/data_type.h"
 
 namespace paddle {

paddle/fluid/framework/dlpack_tensor_test.cc

@@ -15,7 +15,6 @@
 #include "paddle/fluid/framework/dlpack_tensor.h"
 #include <glog/logging.h>
 #include <gtest/gtest.h>
-#include <vector>
 
 namespace paddle {
 namespace platform {

paddle/fluid/framework/downpour_worker.cc

@@ -12,8 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include <cstdlib>
-#include <ctime>
 #include "paddle/fluid/framework/device_worker.h"
 #include "paddle/fluid/platform/cpu_helper.h"
 

paddle/fluid/framework/eigen_test.cc

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "paddle/fluid/framework/eigen.h"
+
 #include <gtest/gtest.h>
 
 namespace paddle {

paddle/fluid/framework/executor.cc

@@ -13,24 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/framework/executor.h"
-#include <deque>
 #include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-#include "google/protobuf/io/zero_copy_stream_impl.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/text_format.h"
-#include "paddle/fluid/framework/data_type.h"
 #include "paddle/fluid/framework/feed_fetch_method.h"
-#include "paddle/fluid/framework/lod_rank_table.h"
-#include "paddle/fluid/framework/lod_tensor_array.h"
-#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/framework/reader.h"
 #include "paddle/fluid/framework/trainer_desc.pb.h"
 #include "paddle/fluid/framework/trainer_factory.h"
-#include "paddle/fluid/framework/transfer_scope_cache.h"
-#include "paddle/fluid/framework/variable_helper.h"
 #include "paddle/fluid/operators/controlflow/conditional_block_op_helper.h"
 #include "paddle/fluid/operators/controlflow/recurrent_op_helper.h"
 #include "paddle/fluid/operators/controlflow/while_op_helper.h"
@@ -39,6 +25,7 @@ limitations under the License. */
 #ifdef PADDLE_WITH_MKLDNN
 #include "paddle/fluid/platform/mkldnn_helper.h"
 #endif
+#include "paddle/fluid/framework/executor_gc_helper.h"
 
 DECLARE_bool(benchmark);
 DECLARE_bool(use_mkldnn);

paddle/fluid/framework/executor_cache.cc

@@ -14,9 +14,12 @@
 
 #include "paddle/fluid/framework/executor_cache.h"
 
-#include <string>
-#include <unordered_set>
-#include <vector>
+namespace paddle {
+namespace framework {
+class BlockDesc;
+class ProgramDesc;
+}  // namespace framework
+}  // namespace paddle
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/executor_cache.h

@@ -28,6 +28,11 @@
 namespace paddle {
 namespace framework {
 
+class ExecutionContext;
+class Executor;
+class ProgramDesc;
+struct ExecutorPrepareContext;
+
 class ExecutorInfoCache {
  public:
   /*

paddle/fluid/framework/executor_gc_helper.cc

@@ -14,10 +14,7 @@
 
 #include "paddle/fluid/framework/executor_gc_helper.h"
 
-#include <deque>
 #include <string>
-#include <unordered_set>
-#include <utility>
 
 #include "glog/logging.h"
 #include "paddle/fluid/framework/block_desc.h"

paddle/fluid/framework/fleet/fleet_wrapper.cc

@@ -27,14 +27,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/framework/fleet/fleet_wrapper.h"
-#include <algorithm>
-#include <utility>
-#include "paddle/fluid/framework/channel.h"
-#include "paddle/fluid/framework/data_feed.h"
-#include "paddle/fluid/framework/io/fs.h"
-#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/platform/timer.h"
+
+#include "glog/logging.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/fleet/gloo_wrapper.cc

@@ -13,9 +13,18 @@ limitations under the License. */
 #include "paddle/fluid/framework/io/fs.h"
 #include "paddle/fluid/string/string_helper.h"
 
+namespace gloo {
+namespace transport {
+class Device;
+}  // namespace transport
+}  // namespace gloo
+
 namespace gloo {
 namespace rendezvous {
 
+class HTTPStore;
+class Store;
+
 constexpr int kNodeSize = 136;
 
 HdfsStore::HdfsStore(const std::string& path) {

paddle/fluid/framework/fleet/gloo_wrapper.h

@@ -38,6 +38,13 @@ limitations under the License. */
 #endif
 #include "paddle/fluid/framework/variable_helper.h"
 
+namespace gloo {
+class Context;
+namespace transport {
+class Device;
+}  // namespace transport
+}  // namespace gloo
+
 namespace gloo {
 namespace rendezvous {
 

paddle/fluid/framework/fleet/heter_wrapper.cc

@@ -27,15 +27,6 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/framework/fleet/heter_wrapper.h"
-#include <algorithm>
-#include <utility>
-#include "paddle/fluid/framework/channel.h"
-#include "paddle/fluid/framework/data_feed.h"
-#include "paddle/fluid/framework/device_worker.h"
-#include "paddle/fluid/framework/io/fs.h"
-#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/platform/timer.h"
 #ifdef PADDLE_WITH_PSLIB
 
 namespace paddle {

paddle/fluid/framework/fleet/test_fleet.cc

@@ -13,10 +13,8 @@
 // limitations under the License.
 
 #include <gtest/gtest.h>
-#include <fstream>
 #include "paddle/fluid/framework/fleet/fleet_wrapper.h"
 #include "paddle/fluid/framework/fleet/gloo_wrapper.h"
-#include "paddle/fluid/framework/io/fs.h"
 #include "paddle/fluid/string/string_helper.h"
 
 #if defined _WIN32 || defined __APPLE__

paddle/fluid/framework/garbage_collector.cc

@@ -12,17 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <algorithm>
-#include <deque>
 #include <functional>
-#include <memory>
-#include <mutex>  // NOLINT
-#include <utility>
 #ifdef PADDLE_WITH_CUDA
 #include "paddle/fluid/platform/cuda_device_guard.h"
 #endif
 #include "gflags/gflags.h"
-#include "glog/logging.h"
 #include "paddle/fluid/framework/garbage_collector.h"
 
 DECLARE_double(eager_delete_tensor_gb);

paddle/fluid/framework/generator.cc

@@ -15,17 +15,11 @@ limitations under the License. */
 #include "paddle/fluid/framework/generator.h"
 
 #include <glog/logging.h>
-
-#include <deque>
 #include <memory>
-#include <unordered_map>
-#include <unordered_set>
 #include <utility>
-#include <vector>
 
 #include "paddle/fluid/platform/enforce.h"
 #include "paddle/fluid/platform/gpu_info.h"
-#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/heterbox_trainer.cc

@@ -12,15 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include <cstdlib>
-#include <string>
-#include <vector>
-#include "io/fs.h"
-#include "paddle/fluid/framework/data_feed_factory.h"
-#include "paddle/fluid/framework/data_set.h"
-#include "paddle/fluid/framework/device_worker_factory.h"
-#include "paddle/fluid/framework/fleet/fleet_wrapper.h"
-#include "paddle/fluid/framework/trainer.h"
 #if (defined PADDLE_WITH_CUDA || defined PADDLE_WITH_XPU) && \
     (defined PADDLE_WITH_PSLIB)
 #ifdef PADDLE_WITH_CUDA

paddle/fluid/framework/heterbox_worker.cc

@@ -12,13 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/fluid/framework/device_worker.h"
-#include "paddle/fluid/framework/device_worker_factory.h"
-#include "paddle/fluid/framework/fleet/fleet_wrapper.h"
-#include "paddle/fluid/framework/fleet/heter_wrapper.h"
-#include "paddle/fluid/platform/cpu_helper.h"
-#include "paddle/fluid/string/string_helper.h"
-
 #if (defined PADDLE_WITH_CUDA || defined PADDLE_WITH_XPU) && \
     (defined PADDLE_WITH_PSLIB)
 #include "paddle/fluid/platform/cuda_device_guard.h"

paddle/fluid/framework/hetercpu_worker.cc

@@ -12,13 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/fluid/framework/device_worker.h"
-#include "paddle/fluid/framework/device_worker_factory.h"
-#include "paddle/fluid/framework/fleet/fleet_wrapper.h"
-#include "paddle/fluid/framework/fleet/heter_wrapper.h"
-#include "paddle/fluid/platform/cpu_helper.h"
-#include "paddle/fluid/string/string_helper.h"
-
 #ifdef PADDLE_WITH_PSLIB
 
 #if defined _WIN32 || defined __APPLE__

paddle/fluid/framework/heterxpu_trainer.cc

@@ -12,16 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include <cstdlib>
-#include <ctime>
-#include <string>
-#include <vector>
-#include "io/fs.h"
-#include "paddle/fluid/framework/data_feed_factory.h"
-#include "paddle/fluid/framework/data_set.h"
-#include "paddle/fluid/framework/device_worker_factory.h"
-#include "paddle/fluid/framework/fleet/fleet_wrapper.h"
-#include "paddle/fluid/framework/trainer.h"
 #if (defined PADDLE_WITH_CUDA || defined PADDLE_WITH_XPU) && \
     (defined PADDLE_WITH_PSLIB)
 #ifdef PADDLE_WITH_CUDA

paddle/fluid/framework/hogwild_worker.cc

@@ -14,7 +14,6 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/data_type.h"
 #include "paddle/fluid/framework/device_worker.h"
-#include "paddle/fluid/framework/device_worker_factory.h"
 #include "paddle/fluid/operators/controlflow/conditional_block_op_helper.h"
 #include "paddle/fluid/platform/cpu_helper.h"
 #include "paddle/fluid/platform/lodtensor_printer.h"

paddle/fluid/framework/inlined_vector_test.cc

@@ -17,6 +17,7 @@
 #include <cstdlib>
 #include <ctime>
 
+#include "glog/logging.h"
 #include "gtest/gtest.h"
 
 namespace paddle {

paddle/fluid/framework/io/crypto/aes_cipher_test.cc

@@ -13,15 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/framework/io/crypto/aes_cipher.h"
-
 #include <cryptopp/cryptlib.h>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
-
 #include <fstream>
 #include <string>
-#include <vector>
-#include "paddle/fluid/framework/io/crypto/cipher.h"
 #include "paddle/fluid/framework/io/crypto/cipher_utils.h"
 
 namespace paddle {

paddle/fluid/framework/io/crypto/cipher.cc

@@ -16,6 +16,7 @@
 #include "paddle/fluid/framework/io/crypto/aes_cipher.h"
 #include "paddle/fluid/framework/io/crypto/cipher_utils.h"
 #include "paddle/fluid/platform/enforce.h"
+
 namespace paddle {
 namespace framework {