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

This reverts commit d3a0efbf16.

src/data/adapter.h

@@ -4,6 +4,8 @@
  */
 #ifndef XGBOOST_DATA_ADAPTER_H_
 #define XGBOOST_DATA_ADAPTER_H_
+#include <dmlc/data.h>
+
 #include <cstddef>
 #include <functional>
 #include <limits>
@@ -12,8 +14,6 @@
 #include <utility>
 #include <vector>
 
-#include <dmlc/data.h>
-
 #include "xgboost/logging.h"
 #include "xgboost/base.h"
 #include "xgboost/data.h"

src/data/data.cc

@@ -2,11 +2,8 @@
  * Copyright 2015-2020 by Contributors
  * \file data.cc
  */
-#include <cstring>
-#include <vector>
-#include <string>
-
 #include <dmlc/registry.h>
+#include <cstring>
 
 #include "dmlc/io.h"
 #include "xgboost/data.h"

src/data/device_dmatrix.cu

@@ -3,16 +3,14 @@
  * \file device_dmatrix.cu
  * \brief Device-memory version of DMatrix.
  */
-#include <memory>
-#include <utility>
 
 #include <thrust/execution_policy.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/transform_output_iterator.h>
-
 #include <xgboost/base.h>
 #include <xgboost/data.h>
-
+#include <memory>
+#include <utility>
 #include "../common/hist_util.h"
 #include "adapter.h"
 #include "device_adapter.cuh"

src/data/device_dmatrix.h

@@ -6,11 +6,11 @@
 #ifndef XGBOOST_DATA_DEVICE_DMATRIX_H_
 #define XGBOOST_DATA_DEVICE_DMATRIX_H_
 
-#include <memory>
-
 #include <xgboost/base.h>
 #include <xgboost/data.h>
 
+#include <memory>
+
 #include "adapter.h"
 #include "simple_batch_iterator.h"
 #include "simple_dmatrix.h"

src/data/ellpack_page_source.h

@@ -5,11 +5,10 @@
 #ifndef XGBOOST_DATA_ELLPACK_PAGE_SOURCE_H_
 #define XGBOOST_DATA_ELLPACK_PAGE_SOURCE_H_
 
+#include <xgboost/data.h>
 #include <memory>
 #include <string>
 
-#include <xgboost/data.h>
-
 #include "../common/timer.h"
 #include "../common/hist_util.h"
 #include "sparse_page_source.h"

src/data/simple_dmatrix.h

@@ -7,11 +7,12 @@
 #ifndef XGBOOST_DATA_SIMPLE_DMATRIX_H_
 #define XGBOOST_DATA_SIMPLE_DMATRIX_H_
 
+#include <xgboost/base.h>
+#include <xgboost/data.h>
+
 #include <memory>
 #include <string>
 
-#include <xgboost/base.h>
-#include <xgboost/data.h>
 
 namespace xgboost {
 namespace data {

src/data/sparse_page_dmatrix.h

@@ -7,14 +7,13 @@
 #ifndef XGBOOST_DATA_SPARSE_PAGE_DMATRIX_H_
 #define XGBOOST_DATA_SPARSE_PAGE_DMATRIX_H_
 
+#include <xgboost/data.h>
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "xgboost/data.h"
-
 #include "ellpack_page_source.h"
 #include "sparse_page_source.h"
 

src/data/sparse_page_source.h

@@ -7,6 +7,9 @@
 #ifndef XGBOOST_DATA_SPARSE_PAGE_SOURCE_H_
 #define XGBOOST_DATA_SPARSE_PAGE_SOURCE_H_
 
+#include <dmlc/threadediter.h>
+#include <dmlc/timer.h>
+
 #include <algorithm>
 #include <limits>
 #include <locale>
@@ -16,9 +19,6 @@
 #include <vector>
 #include <fstream>
 
-#include <dmlc/threadediter.h>
-#include <dmlc/timer.h>
-
 #include "xgboost/base.h"
 #include "xgboost/data.h"
 

src/data/sparse_page_writer.h

@@ -6,6 +6,8 @@
 #ifndef XGBOOST_DATA_SPARSE_PAGE_WRITER_H_
 #define XGBOOST_DATA_SPARSE_PAGE_WRITER_H_
 
+#include <xgboost/data.h>
+#include <dmlc/io.h>
 #include <vector>
 #include <algorithm>
 #include <cstring>
@@ -14,12 +16,9 @@
 #include <memory>
 #include <functional>
 
-#include <xgboost/data.h>
-#include <dmlc/io.h>
-
 #if DMLC_ENABLE_STD_THREAD
 #include <dmlc/concurrency.h>
-#include <thread>  // NOLINT
+#include <thread>
 #endif  // DMLC_ENABLE_STD_THREAD
 
 namespace xgboost {