From f1a397011db443383e4f1e9e83c58ccf7ab69f7d Mon Sep 17 00:00:00 2001
From: David Wells <drwells@email.unc.edu>
Date: Thu, 21 Apr 2022 10:53:57 -0400
Subject: [PATCH] Clean up header inclusions.

Most of this was from cleaning up tensor.h and then also cleaning up
where we include utilities.h.
---
 include/deal.II/base/index_set.h                  | 2 --
 include/deal.II/base/partitioner.h                | 3 ---
 include/deal.II/base/scalar_polynomials_base.h    | 2 ++
 include/deal.II/base/subscriptor.h                | 1 -
 include/deal.II/base/symmetric_tensor.h           | 2 --
 include/deal.II/base/tensor.h                     | 4 ----
 include/deal.II/base/tensor_polynomials_base.h    | 2 ++
 include/deal.II/base/thread_management.h          | 1 -
 include/deal.II/fe/fe.h                           | 1 +
 include/deal.II/lac/la_parallel_vector.h          | 2 ++
 include/deal.II/lac/read_write_vector.templates.h | 5 +++--
 include/deal.II/particles/particle.h              | 2 ++
 source/base/polynomial.cc                         | 1 +
 source/base/tensor.cc                             | 2 ++
 source/numerics/cell_data_transfer.cc             | 2 ++
 15 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/include/deal.II/base/index_set.h b/include/deal.II/base/index_set.h
index 782ded80df..2b8b8a42ba 100644
--- a/include/deal.II/base/index_set.h
+++ b/include/deal.II/base/index_set.h
@@ -22,8 +22,6 @@
 #include <deal.II/base/thread_management.h>
 #include <deal.II/base/utilities.h>
 
-#include <boost/serialization/vector.hpp>
-
 #include <algorithm>
 #include <iterator>
 #include <vector>
diff --git a/include/deal.II/base/partitioner.h b/include/deal.II/base/partitioner.h
index 0e01619b71..89fd6d6af0 100644
--- a/include/deal.II/base/partitioner.h
+++ b/include/deal.II/base/partitioner.h
@@ -21,13 +21,10 @@
 #include <deal.II/base/array_view.h>
 #include <deal.II/base/communication_pattern_base.h>
 #include <deal.II/base/index_set.h>
-#include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/memory_space.h>
 #include <deal.II/base/mpi.h>
 #include <deal.II/base/types.h>
-#include <deal.II/base/utilities.h>
 
-#include <deal.II/lac/vector.h>
 #include <deal.II/lac/vector_operation.h>
 
 #include <limits>
diff --git a/include/deal.II/base/scalar_polynomials_base.h b/include/deal.II/base/scalar_polynomials_base.h
index ee31833096..36dbc7fdfe 100644
--- a/include/deal.II/base/scalar_polynomials_base.h
+++ b/include/deal.II/base/scalar_polynomials_base.h
@@ -23,6 +23,8 @@
 #include <deal.II/base/point.h>
 #include <deal.II/base/tensor.h>
 
+#include <memory>
+#include <string>
 #include <vector>
 
 DEAL_II_NAMESPACE_OPEN
diff --git a/include/deal.II/base/subscriptor.h b/include/deal.II/base/subscriptor.h
index 77d6e784ce..19494c23af 100644
--- a/include/deal.II/base/subscriptor.h
+++ b/include/deal.II/base/subscriptor.h
@@ -22,7 +22,6 @@
 #include <deal.II/base/exceptions.h>
 
 #include <atomic>
-#include <cstring>
 #include <map>
 #include <mutex>
 #include <string>
diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h
index 9133cc9230..e66433cf99 100644
--- a/include/deal.II/base/symmetric_tensor.h
+++ b/include/deal.II/base/symmetric_tensor.h
@@ -24,9 +24,7 @@
 #include <deal.II/base/template_constraints.h>
 #include <deal.II/base/tensor.h>
 
-#include <algorithm>
 #include <array>
-#include <functional>
 
 DEAL_II_NAMESPACE_OPEN
 
diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h
index 7261f447d7..2dfae4d67c 100644
--- a/include/deal.II/base/tensor.h
+++ b/include/deal.II/base/tensor.h
@@ -23,7 +23,6 @@
 #include <deal.II/base/table_indices.h>
 #include <deal.II/base/template_constraints.h>
 #include <deal.II/base/tensor_accessors.h>
-#include <deal.II/base/utilities.h>
 
 #ifdef DEAL_II_WITH_ADOLC
 #  include <adolc/adouble.h> // Taped double
@@ -31,9 +30,6 @@
 
 #include <cmath>
 #include <ostream>
-#include <utility>
-#include <vector>
-
 
 DEAL_II_NAMESPACE_OPEN
 
diff --git a/include/deal.II/base/tensor_polynomials_base.h b/include/deal.II/base/tensor_polynomials_base.h
index de0e14766f..1f8d7e3f37 100644
--- a/include/deal.II/base/tensor_polynomials_base.h
+++ b/include/deal.II/base/tensor_polynomials_base.h
@@ -23,6 +23,8 @@
 #include <deal.II/base/point.h>
 #include <deal.II/base/tensor.h>
 
+#include <memory>
+#include <string>
 #include <vector>
 
 DEAL_II_NAMESPACE_OPEN
diff --git a/include/deal.II/base/thread_management.h b/include/deal.II/base/thread_management.h
index b8484a1b2a..5302505bbe 100644
--- a/include/deal.II/base/thread_management.h
+++ b/include/deal.II/base/thread_management.h
@@ -25,7 +25,6 @@
 #  include <deal.II/base/template_constraints.h>
 
 #  include <atomic>
-#  include <condition_variable>
 #  include <functional>
 #  include <future>
 #  include <iterator>
diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h
index 388d7c0146..1529153850 100644
--- a/include/deal.II/fe/fe.h
+++ b/include/deal.II/fe/fe.h
@@ -26,6 +26,7 @@
 #include <deal.II/fe/mapping.h>
 
 #include <deal.II/lac/full_matrix.h>
+#include <deal.II/lac/vector.h>
 
 #include <memory>
 
diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h
index c0f4bfeedc..c10c405114 100644
--- a/include/deal.II/lac/la_parallel_vector.h
+++ b/include/deal.II/lac/la_parallel_vector.h
@@ -23,7 +23,9 @@
 #include <deal.II/base/memory_space_data.h>
 #include <deal.II/base/mpi.h>
 #include <deal.II/base/numbers.h>
+#include <deal.II/base/parallel.h>
 #include <deal.II/base/partitioner.h>
+#include <deal.II/base/subscriptor.h>
 #include <deal.II/base/thread_management.h>
 
 #include <deal.II/lac/vector_operation.h>
diff --git a/include/deal.II/lac/read_write_vector.templates.h b/include/deal.II/lac/read_write_vector.templates.h
index 3b8fd2c185..32aae8162e 100644
--- a/include/deal.II/lac/read_write_vector.templates.h
+++ b/include/deal.II/lac/read_write_vector.templates.h
@@ -25,10 +25,9 @@
 #include <deal.II/lac/la_parallel_vector.h>
 #include <deal.II/lac/la_vector.h>
 #include <deal.II/lac/read_write_vector.h>
+#include <deal.II/lac/vector.h>
 #include <deal.II/lac/vector_operations_internal.h>
 
-#include <boost/io/ios_state.hpp>
-
 #ifdef DEAL_II_WITH_PETSC
 #  include <deal.II/lac/petsc_vector.h>
 #endif
@@ -44,6 +43,8 @@
 #  include <deal.II/lac/cuda_vector.h>
 #endif
 
+#include <boost/io/ios_state.hpp>
+
 DEAL_II_NAMESPACE_OPEN
 
 
diff --git a/include/deal.II/particles/particle.h b/include/deal.II/particles/particle.h
index a2e9c43845..fa8c8a1188 100644
--- a/include/deal.II/particles/particle.h
+++ b/include/deal.II/particles/particle.h
@@ -24,6 +24,8 @@
 
 #include <deal.II/particles/property_pool.h>
 
+#include <boost/serialization/array.hpp>
+
 #include <cstdint>
 
 DEAL_II_NAMESPACE_OPEN
diff --git a/source/base/polynomial.cc b/source/base/polynomial.cc
index 0cb7326468..90c49db064 100644
--- a/source/base/polynomial.cc
+++ b/source/base/polynomial.cc
@@ -19,6 +19,7 @@
 #include <deal.II/base/polynomial.h>
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/base/thread_management.h>
+#include <deal.II/base/utilities.h>
 
 #include <algorithm>
 #include <cmath>
diff --git a/source/base/tensor.cc b/source/base/tensor.cc
index 6dc6f6e8a5..1bed209eab 100644
--- a/source/base/tensor.cc
+++ b/source/base/tensor.cc
@@ -18,6 +18,8 @@
 #include <deal.II/lac/exceptions.h>
 #include <deal.II/lac/lapack_templates.h>
 
+#include <array>
+
 DEAL_II_NAMESPACE_OPEN
 
 namespace
diff --git a/source/numerics/cell_data_transfer.cc b/source/numerics/cell_data_transfer.cc
index aacbbbb598..d8e1cba7cb 100644
--- a/source/numerics/cell_data_transfer.cc
+++ b/source/numerics/cell_data_transfer.cc
@@ -13,6 +13,8 @@
 //
 // ---------------------------------------------------------------------
 
+#include <deal.II/lac/vector.h>
+
 #include <deal.II/numerics/cell_data_transfer.templates.h>
 
 DEAL_II_NAMESPACE_OPEN
-- 
2.39.5