Revert "Reorder includes. (#5749)" (#5771)

This reverts commit d3a0efb.

R-package/src/xgboost_R.cc

@@ -1,17 +1,14 @@
 // Copyright (c) 2014 by Contributors
-#include <cstring>
-#include <cstdio>
+#include <dmlc/logging.h>
+#include <dmlc/omp.h>
+#include <xgboost/c_api.h>
 #include <vector>
 #include <string>
 #include <utility>
+#include <cstring>
+#include <cstdio>
 #include <sstream>
-
-#include <dmlc/logging.h>
-#include <dmlc/omp.h>
-#include <xgboost/c_api.h>
-
-#include "xgboost_R.h"
-
+#include "./xgboost_R.h"
 
 /*!
  * \brief macro to annotate begin of api

include/xgboost/base.h

@@ -6,15 +6,14 @@
 #ifndef XGBOOST_BASE_H_
 #define XGBOOST_BASE_H_
 
+#include <dmlc/base.h>
+#include <dmlc/omp.h>
 #include <cmath>
 #include <iostream>
 #include <vector>
 #include <string>
 #include <utility>
 
-#include <dmlc/base.h>
-#include <dmlc/omp.h>
-
 /*!
  * \brief string flag for R library, to leave hooks when needed.
  */

include/xgboost/data.h

@@ -7,13 +7,6 @@
 #ifndef XGBOOST_DATA_H_
 #define XGBOOST_DATA_H_
 
-#include <memory>
-#include <numeric>
-#include <algorithm>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <dmlc/base.h>
 #include <dmlc/data.h>
 #include <dmlc/serializer.h>
@@ -22,6 +15,13 @@
 #include <xgboost/span.h>
 #include <xgboost/host_device_vector.h>
 
+#include <memory>
+#include <numeric>
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace xgboost {
 // forward declare dmatrix.
 class DMatrix;

include/xgboost/feature_map.h

@@ -7,13 +7,13 @@
 #ifndef XGBOOST_FEATURE_MAP_H_
 #define XGBOOST_FEATURE_MAP_H_
 
+#include <xgboost/logging.h>
+
 #include <vector>
 #include <string>
 #include <cstring>
 #include <iostream>
 
-#include <xgboost/logging.h>
-
 namespace xgboost {
 /*!
  * \brief Feature map data structure to help text model dump.

include/xgboost/gbm.h

@@ -8,20 +8,20 @@
 #ifndef XGBOOST_GBM_H_
 #define XGBOOST_GBM_H_
 
-#include <vector>
-#include <utility>
-#include <string>
-#include <functional>
-#include <unordered_map>
-#include <memory>
-
 #include <dmlc/registry.h>
 #include <dmlc/any.h>
 #include <xgboost/base.h>
 #include <xgboost/data.h>
 #include <xgboost/host_device_vector.h>
 #include <xgboost/model.h>
 
+#include <vector>
+#include <utility>
+#include <string>
+#include <functional>
+#include <unordered_map>
+#include <memory>
+
 namespace xgboost {
 
 class Json;

include/xgboost/generic_parameters.h

@@ -5,11 +5,11 @@
 #ifndef XGBOOST_GENERIC_PARAMETERS_H_
 #define XGBOOST_GENERIC_PARAMETERS_H_
 
-#include <string>
-
 #include <xgboost/logging.h>
 #include <xgboost/parameter.h>
 
+#include <string>
+
 namespace xgboost {
 struct GenericParameter : public XGBoostParameter<GenericParameter> {
   // Constant representing the device ID of CPU.

include/xgboost/json.h

@@ -4,15 +4,15 @@
 #ifndef XGBOOST_JSON_H_
 #define XGBOOST_JSON_H_
 
+#include <xgboost/logging.h>
+#include <xgboost/parameter.h>
+#include <string>
+
 #include <map>
 #include <memory>
 #include <vector>
 #include <functional>
 #include <utility>
-#include <string>
-
-#include <xgboost/logging.h>
-#include <xgboost/parameter.h>
 
 namespace xgboost {
 

include/xgboost/json_io.h

@@ -3,6 +3,7 @@
  */
 #ifndef XGBOOST_JSON_IO_H_
 #define XGBOOST_JSON_IO_H_
+#include <xgboost/json.h>
 
 #include <memory>
 #include <string>
@@ -13,8 +14,6 @@
 #include <sstream>
 #include <locale>
 
-#include <xgboost/json.h>
-
 namespace xgboost {
 
 template <typename Allocator>

include/xgboost/learner.h

@@ -8,12 +8,6 @@
 #ifndef XGBOOST_LEARNER_H_
 #define XGBOOST_LEARNER_H_
 
-#include <utility>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
 #include <dmlc/any.h>
 #include <rabit/rabit.h>
 #include <xgboost/base.h>
@@ -23,6 +17,12 @@
 #include <xgboost/host_device_vector.h>
 #include <xgboost/model.h>
 
+#include <utility>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace xgboost {
 
 class Metric;

include/xgboost/linear_updater.h

@@ -3,18 +3,19 @@
  */
 #pragma once
 
-#include <functional>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <dmlc/registry.h>
 #include <xgboost/base.h>
 #include <xgboost/data.h>
 #include <xgboost/generic_parameters.h>
 #include <xgboost/host_device_vector.h>
 #include <xgboost/model.h>
 
+#include <functional>
+#include <string>
+#include <utility>
+#include <vector>
+
+
 namespace xgboost {
 
 class Json;

include/xgboost/logging.h

@@ -8,18 +8,18 @@
 #ifndef XGBOOST_LOGGING_H_
 #define XGBOOST_LOGGING_H_
 
-#include <sstream>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <dmlc/logging.h>
 #include <dmlc/thread_local.h>
 
 #include <xgboost/base.h>
 #include <xgboost/parameter.h>
 
+#include <sstream>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace xgboost {
 
 class BaseLogger {

include/xgboost/metric.h

@@ -7,18 +7,18 @@
 #ifndef XGBOOST_METRIC_H_
 #define XGBOOST_METRIC_H_
 
-#include <vector>
-#include <string>
-#include <functional>
-#include <utility>
-
 #include <dmlc/registry.h>
 #include <xgboost/model.h>
 #include <xgboost/generic_parameters.h>
 #include <xgboost/data.h>
 #include <xgboost/base.h>
 #include <xgboost/host_device_vector.h>
 
+#include <vector>
+#include <string>
+#include <functional>
+#include <utility>
+
 namespace xgboost {
 /*!
  * \brief interface of evaluation metric used to evaluate model performance.

include/xgboost/objective.h

@@ -7,18 +7,18 @@
 #ifndef XGBOOST_OBJECTIVE_H_
 #define XGBOOST_OBJECTIVE_H_
 
-#include <vector>
-#include <utility>
-#include <string>
-#include <functional>
-
 #include <dmlc/registry.h>
 #include <xgboost/base.h>
 #include <xgboost/data.h>
 #include <xgboost/model.h>
 #include <xgboost/generic_parameters.h>
 #include <xgboost/host_device_vector.h>
 
+#include <vector>
+#include <utility>
+#include <string>
+#include <functional>
+
 namespace xgboost {
 
 /*! \brief interface of objective function */

include/xgboost/parameter.h

@@ -8,11 +8,10 @@
 #ifndef XGBOOST_PARAMETER_H_
 #define XGBOOST_PARAMETER_H_
 
-#include <string>
-#include <type_traits>
-
 #include <dmlc/parameter.h>
 #include <xgboost/base.h>
+#include <string>
+#include <type_traits>
 
 /*!
  * \brief Specialization of FieldEntry for enum class (backed by int)

include/xgboost/predictor.h

@@ -5,6 +5,10 @@
  *  performs predictions for a gradient booster.
  */
 #pragma once
+#include <xgboost/base.h>
+#include <xgboost/data.h>
+#include <xgboost/generic_parameters.h>
+#include <xgboost/host_device_vector.h>
 
 #include <functional>
 #include <memory>
@@ -14,11 +18,6 @@
 #include <vector>
 #include <mutex>
 
-#include <xgboost/base.h>
-#include <xgboost/data.h>
-#include <xgboost/generic_parameters.h>
-#include <xgboost/host_device_vector.h>
-
 // Forward declarations
 namespace xgboost {
 class TreeUpdater;

include/xgboost/span.h

@@ -29,15 +29,15 @@
 #ifndef XGBOOST_SPAN_H_
 #define XGBOOST_SPAN_H_
 
+#include <xgboost/base.h>
+#include <xgboost/logging.h>
+
 #include <cinttypes>          // size_t
 #include <limits>             // numeric_limits
 #include <iterator>
 #include <type_traits>
 #include <cstdio>
 
-#include <xgboost/base.h>
-#include <xgboost/logging.h>
-
 /*!
  * The version number 1910 is picked up from GSL.
  *

include/xgboost/tree_model.h

@@ -7,14 +7,6 @@
 #ifndef XGBOOST_TREE_MODEL_H_
 #define XGBOOST_TREE_MODEL_H_
 
-#include <limits>
-#include <vector>
-#include <string>
-#include <cstring>
-#include <algorithm>
-#include <tuple>
-#include <stack>
-
 #include <dmlc/io.h>
 #include <dmlc/parameter.h>
 
@@ -24,6 +16,14 @@
 #include <xgboost/feature_map.h>
 #include <xgboost/model.h>
 
+#include <limits>
+#include <vector>
+#include <string>
+#include <cstring>
+#include <algorithm>
+#include <tuple>
+#include <stack>
+
 namespace xgboost {
 
 struct PathElement;  // forward declaration

include/xgboost/tree_updater.h

@@ -8,11 +8,6 @@
 #ifndef XGBOOST_TREE_UPDATER_H_
 #define XGBOOST_TREE_UPDATER_H_
 
-#include <functional>
-#include <vector>
-#include <utility>
-#include <string>
-
 #include <dmlc/registry.h>
 #include <xgboost/base.h>
 #include <xgboost/data.h>
@@ -21,6 +16,11 @@
 #include <xgboost/host_device_vector.h>
 #include <xgboost/model.h>
 
+#include <functional>
+#include <vector>
+#include <utility>
+#include <string>
+
 namespace xgboost {
 
 class Json;