From e7ca1dd30a64575f55e2702494dcaac1c882e3fc Mon Sep 17 00:00:00 2001
From: David Wells <drwells@email.unc.edu>
Date: Fri, 12 Aug 2022 09:02:45 -0400
Subject: [PATCH] Clean up some header inclusions.

---
 include/deal.II/base/graph_coloring.h                        | 5 +++--
 include/deal.II/base/index_set.h                             | 1 -
 include/deal.II/dofs/dof_handler.h                           | 2 --
 include/deal.II/numerics/vector_tools_mean_value.templates.h | 1 +
 source/base/graph_coloring.cc                                | 1 +
 source/grid/grid_out.cc                                      | 3 ++-
 source/multigrid/mg_tools.cc                                 | 2 ++
 tests/base/qprojector.cc                                     | 2 ++
 tests/base/quadrature_sorted_test.cc                         | 2 ++
 tests/base/quadrature_test.cc                                | 2 ++
 tests/fe/fe_support_points_common.h                          | 1 +
 tests/fe/rt_normal_02.cc                                     | 1 +
 tests/simplex/q_projection_01.cc                             | 2 ++
 tests/simplex/step-06.cc                                     | 1 +
 tests/simplex/variable_face_quadratures_01.cc                | 1 +
 15 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/include/deal.II/base/graph_coloring.h b/include/deal.II/base/graph_coloring.h
index cdcfa753e6..50aeed6b96 100644
--- a/include/deal.II/base/graph_coloring.h
+++ b/include/deal.II/base/graph_coloring.h
@@ -22,8 +22,7 @@
 
 #  include <deal.II/base/thread_management.h>
 
-#  include <deal.II/lac/sparsity_tools.h>
-
+#  include <algorithm>
 #  include <functional>
 #  include <set>
 #  include <unordered_map>
@@ -33,6 +32,8 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+class SparsityPattern;
+
 /**
  * A namespace containing functions that can color graphs.
  */
diff --git a/include/deal.II/base/index_set.h b/include/deal.II/base/index_set.h
index 9afd33f187..a77f95ce0f 100644
--- a/include/deal.II/base/index_set.h
+++ b/include/deal.II/base/index_set.h
@@ -20,7 +20,6 @@
 
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/mutex.h>
-#include <deal.II/base/utilities.h>
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h
index 87926405a4..2c9417b7be 100644
--- a/include/deal.II/dofs/dof_handler.h
+++ b/include/deal.II/dofs/dof_handler.h
@@ -26,8 +26,6 @@
 #include <deal.II/base/iterator_range.h>
 #include <deal.II/base/smartpointer.h>
 
-#include <deal.II/distributed/tria_base.h>
-
 #include <deal.II/dofs/block_info.h>
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/dofs/dof_faces.h>
diff --git a/include/deal.II/numerics/vector_tools_mean_value.templates.h b/include/deal.II/numerics/vector_tools_mean_value.templates.h
index 1ed260647c..5d360f6039 100644
--- a/include/deal.II/numerics/vector_tools_mean_value.templates.h
+++ b/include/deal.II/numerics/vector_tools_mean_value.templates.h
@@ -16,6 +16,7 @@
 #ifndef dealii_vector_tools_mean_value_templates_h
 #define dealii_vector_tools_mean_value_templates_h
 
+#include <deal.II/distributed/tria_base.h>
 
 #include <deal.II/fe/fe_values.h>
 
diff --git a/source/base/graph_coloring.cc b/source/base/graph_coloring.cc
index 044437b191..43949418d6 100644
--- a/source/base/graph_coloring.cc
+++ b/source/base/graph_coloring.cc
@@ -15,6 +15,7 @@
 
 #include <deal.II/base/graph_coloring.h>
 
+#include <deal.II/lac/sparsity_tools.h>
 
 DEAL_II_NAMESPACE_OPEN
 
diff --git a/source/grid/grid_out.cc b/source/grid/grid_out.cc
index 9357016489..014a37641e 100644
--- a/source/grid/grid_out.cc
+++ b/source/grid/grid_out.cc
@@ -20,6 +20,8 @@
 #include <deal.II/base/qprojector.h>
 #include <deal.II/base/quadrature.h>
 
+#include <deal.II/distributed/tria_base.h>
+
 #include <deal.II/fe/mapping.h>
 
 #include <deal.II/grid/grid_out.h>
@@ -29,7 +31,6 @@
 
 #include <deal.II/numerics/data_out.h>
 
-#include <boost/algorithm/string.hpp>
 #include <boost/archive/binary_oarchive.hpp>
 
 #ifdef DEAL_II_GMSH_WITH_API
diff --git a/source/multigrid/mg_tools.cc b/source/multigrid/mg_tools.cc
index 34cfe0ff07..abc4b66614 100644
--- a/source/multigrid/mg_tools.cc
+++ b/source/multigrid/mg_tools.cc
@@ -18,6 +18,8 @@
 #include <deal.II/base/mpi_compute_index_owner_internal.h>
 #include <deal.II/base/thread_management.h>
 
+#include <deal.II/distributed/tria_base.h>
+
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_tools.h>
diff --git a/tests/base/qprojector.cc b/tests/base/qprojector.cc
index cf66df28f2..330752e9f6 100644
--- a/tests/base/qprojector.cc
+++ b/tests/base/qprojector.cc
@@ -20,6 +20,8 @@
 #include <deal.II/base/qprojector.h>
 #include <deal.II/base/quadrature_lib.h>
 
+#include <deal.II/grid/reference_cell.h>
+
 #include "../tests.h"
 
 template <int dim>
diff --git a/tests/base/quadrature_sorted_test.cc b/tests/base/quadrature_sorted_test.cc
index bef2afcbf9..fb3ad0deff 100644
--- a/tests/base/quadrature_sorted_test.cc
+++ b/tests/base/quadrature_sorted_test.cc
@@ -23,6 +23,8 @@
 #include <deal.II/base/qprojector.h>
 #include <deal.II/base/quadrature_lib.h>
 
+#include <deal.II/grid/reference_cell.h>
+
 #include "../tests.h"
 
 template <int dim>
diff --git a/tests/base/quadrature_test.cc b/tests/base/quadrature_test.cc
index 362d810ffd..c64001e8d9 100644
--- a/tests/base/quadrature_test.cc
+++ b/tests/base/quadrature_test.cc
@@ -23,6 +23,8 @@
 #include <deal.II/base/qprojector.h>
 #include <deal.II/base/quadrature_lib.h>
 
+#include <deal.II/grid/reference_cell.h>
+
 #include "../tests.h"
 
 template <int dim>
diff --git a/tests/fe/fe_support_points_common.h b/tests/fe/fe_support_points_common.h
index de39b504b7..c36fe83b18 100644
--- a/tests/fe/fe_support_points_common.h
+++ b/tests/fe/fe_support_points_common.h
@@ -32,6 +32,7 @@
 #include <deal.II/fe/fe_system.h>
 
 #include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/reference_cell.h>
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/tria_iterator.h>
 
diff --git a/tests/fe/rt_normal_02.cc b/tests/fe/rt_normal_02.cc
index 4c6e559d34..282ca7a9f7 100644
--- a/tests/fe/rt_normal_02.cc
+++ b/tests/fe/rt_normal_02.cc
@@ -45,6 +45,7 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_out.h>
 #include <deal.II/grid/grid_tools.h>
+#include <deal.II/grid/reference_cell.h>
 
 #include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/vector.h>
diff --git a/tests/simplex/q_projection_01.cc b/tests/simplex/q_projection_01.cc
index 237fd298c8..c7434286b2 100644
--- a/tests/simplex/q_projection_01.cc
+++ b/tests/simplex/q_projection_01.cc
@@ -20,6 +20,8 @@
 #include <deal.II/base/qprojector.h>
 #include <deal.II/base/quadrature_lib.h>
 
+#include <deal.II/grid/reference_cell.h>
+
 #include "../tests.h"
 
 using namespace dealii;
diff --git a/tests/simplex/step-06.cc b/tests/simplex/step-06.cc
index 7766127460..6f7c964dcf 100644
--- a/tests/simplex/step-06.cc
+++ b/tests/simplex/step-06.cc
@@ -59,6 +59,7 @@
 
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_refinement.h>
+#include <deal.II/grid/reference_cell.h>
 #include <deal.II/grid/tria.h>
 
 #include <deal.II/lac/affine_constraints.h>
diff --git a/tests/simplex/variable_face_quadratures_01.cc b/tests/simplex/variable_face_quadratures_01.cc
index 55d4479c45..83a43c3619 100644
--- a/tests/simplex/variable_face_quadratures_01.cc
+++ b/tests/simplex/variable_face_quadratures_01.cc
@@ -26,6 +26,7 @@
 #include <deal.II/fe/mapping_fe.h>
 
 #include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/reference_cell.h>
 
 #include <deal.II/hp/q_collection.h>
 
-- 
2.39.5