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

This reverts commit d3a0efbf16.

src/gbm/gblinear.cc

@@ -5,14 +5,14 @@
  *        the update rule is parallel coordinate descent (shotgun)
  * \author Tianqi Chen
  */
+#include <dmlc/omp.h>
+#include <dmlc/parameter.h>
+
 #include <vector>
 #include <string>
 #include <sstream>
 #include <algorithm>
 
-#include <dmlc/omp.h>
-#include <dmlc/parameter.h>
-
 #include "xgboost/gbm.h"
 #include "xgboost/json.h"
 #include "xgboost/predictor.h"

src/gbm/gblinear_model.h

@@ -2,14 +2,14 @@
  * Copyright 2018-2019 by Contributors
  */
 #pragma once
+#include <dmlc/io.h>
+#include <dmlc/parameter.h>
+#include <xgboost/learner.h>
+
 #include <vector>
 #include <string>
 #include <cstring>
 
-#include <dmlc/io.h>
-#include <dmlc/parameter.h>
-
-#include <xgboost/learner.h>
 #include "xgboost/base.h"
 #include "xgboost/feature_map.h"
 #include "xgboost/model.h"

src/gbm/gbm.cc

@@ -3,12 +3,11 @@
  * \file gbm.cc
  * \brief Registry of gradient boosters.
  */
+#include <dmlc/registry.h>
 #include <string>
 #include <vector>
 #include <memory>
 
-#include <dmlc/registry.h>
-
 #include "xgboost/gbm.h"
 #include "xgboost/learner.h"
 #include "xgboost/generic_parameters.h"

src/gbm/gbtree.cc

@@ -4,6 +4,9 @@
  * \brief gradient boosted tree implementation.
  * \author Tianqi Chen
  */
+#include <dmlc/omp.h>
+#include <dmlc/parameter.h>
+
 #include <vector>
 #include <memory>
 #include <utility>
@@ -11,9 +14,6 @@
 #include <limits>
 #include <algorithm>
 
-#include <dmlc/omp.h>
-#include <dmlc/parameter.h>
-
 #include "xgboost/data.h"
 #include "xgboost/gbm.h"
 #include "xgboost/logging.h"

src/gbm/gbtree.h

@@ -7,6 +7,8 @@
 #ifndef XGBOOST_GBM_GBTREE_H_
 #define XGBOOST_GBM_GBTREE_H_
 
+#include <dmlc/omp.h>
+
 #include <vector>
 #include <map>
 #include <memory>
@@ -14,7 +16,6 @@
 #include <string>
 #include <unordered_map>
 
-#include <dmlc/omp.h>
 #include "xgboost/base.h"
 #include "xgboost/data.h"
 #include "xgboost/logging.h"

src/gbm/gbtree_model.h

@@ -4,10 +4,6 @@
  */
 #ifndef XGBOOST_GBM_GBTREE_MODEL_H_
 #define XGBOOST_GBM_GBTREE_MODEL_H_
-#include <memory>
-#include <utility>
-#include <string>
-#include <vector>
 
 #include <dmlc/parameter.h>
 #include <dmlc/io.h>
@@ -16,6 +12,11 @@
 #include <xgboost/parameter.h>
 #include <xgboost/learner.h>
 
+#include <memory>
+#include <utility>
+#include <string>
+#include <vector>
+
 namespace xgboost {
 
 class Json;