Remove inclusion of additional headers

diff --git a/include/deal.II/matrix_free/dof_info.h b/include/deal.II/matrix_free/dof_info.h
index 65f37a734e9d012e376cef4c8939cfab03a8657c..9efe87266f01bd1e63a22e0c3fe5379da62d4230 100644 (file)
--- a/include/deal.II/matrix_free/dof_info.h
+++ b/include/deal.II/matrix_free/dof_info.h
@@ -24,11 +24,6 @@
 #include <deal.II/base/partitioner.h>
 #include <deal.II/base/vectorization.h>
 
-#include <deal.II/dofs/dof_handler.h>
-
-#include <deal.II/lac/affine_constraints.h>
-#include <deal.II/lac/dynamic_sparsity_pattern.h>
-
 #include <deal.II/matrix_free/face_info.h>
 #include <deal.II/matrix_free/shape_info.h>
 #include <deal.II/matrix_free/task_info.h>
@@ -41,6 +36,9 @@
 DEAL_II_NAMESPACE_OPEN
 
 #ifndef DOXYGEN
+
+// forward declarations
+
 namespace internal
 {
   namespace MatrixFreeFunctions
@@ -52,6 +50,18 @@ namespace internal
     struct FPArrayComparator;
   } // namespace MatrixFreeFunctions
 } // namespace internal
+
+template <typename>
+class AffineConstraints;
+
+class DynamicSparsityPattern;
+
+template <typename>
+class TriaIterator;
+
+template <int, int, bool>
+class DoFCellAccessor;
+
 #endif
 
 namespace internal

diff --git a/include/deal.II/matrix_free/dof_info.templates.h b/include/deal.II/matrix_free/dof_info.templates.h
index af5cc63571dcc34aaa64406d6fb6bd70a6dcfabf..65d27043e504704ec27ea981b44a147aacce6dc6 100644 (file)
--- a/include/deal.II/matrix_free/dof_info.templates.h
+++ b/include/deal.II/matrix_free/dof_info.templates.h
@@ -24,6 +24,7 @@
 #include <deal.II/base/parallel.h>
 #include <deal.II/base/thread_management.h>
 
+#include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/dynamic_sparsity_pattern.h>
 #include <deal.II/lac/sparsity_pattern.h>
 

diff --git a/include/deal.II/matrix_free/evaluation_kernels.h b/include/deal.II/matrix_free/evaluation_kernels.h
index e01e4955c80b63cea4c02c727436a39462928220..ff05bbc5a0b6e3122738029c404ceede7e3f97a3 100644 (file)
--- a/include/deal.II/matrix_free/evaluation_kernels.h
+++ b/include/deal.II/matrix_free/evaluation_kernels.h
@@ -19,12 +19,11 @@
 
 #include <deal.II/base/config.h>
 
+#include <deal.II/base/geometry_info.h>
 #include <deal.II/base/ndarray.h>
 #include <deal.II/base/utilities.h>
 #include <deal.II/base/vectorization.h>
 
-#include <deal.II/fe/fe_q.h>
-
 #include <deal.II/matrix_free/dof_info.h>
 #include <deal.II/matrix_free/evaluation_flags.h>
 #include <deal.II/matrix_free/fe_evaluation_data.h>

diff --git a/include/deal.II/matrix_free/fe_evaluation_data.h b/include/deal.II/matrix_free/fe_evaluation_data.h
index 92a2589b73eb90759b63c2f8436adb845b072448..f4cbf4fdc21d6c6943be4dbf2528c695050f95c9 100644 (file)
--- a/include/deal.II/matrix_free/fe_evaluation_data.h
+++ b/include/deal.II/matrix_free/fe_evaluation_data.h
@@ -22,7 +22,9 @@
 
 #include <deal.II/base/array_view.h>
 #include <deal.II/base/exceptions.h>
+#include <deal.II/base/geometry_info.h>
 #include <deal.II/base/smartpointer.h>
+#include <deal.II/base/std_cxx20/iota_view.h>
 #include <deal.II/base/symmetric_tensor.h>
 #include <deal.II/base/template_constraints.h>
 #include <deal.II/base/tensor.h>

diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h
index ef1aa8bcdef1c3151b2d50c41a2771117890659b..6d2391d3e0f2163617720b14849f00f7be0c414e 100644 (file)
--- a/include/deal.II/matrix_free/matrix_free.templates.h
+++ b/include/deal.II/matrix_free/matrix_free.templates.h
@@ -38,6 +38,8 @@
 
 #include <deal.II/hp/q_collection.h>
 
+#include <deal.II/lac/dynamic_sparsity_pattern.h>
+
 #include <deal.II/matrix_free/face_info.h>
 #include <deal.II/matrix_free/face_setup_internal.h>
 #include <deal.II/matrix_free/hanging_nodes_internal.h>

diff --git a/include/deal.II/matrix_free/task_info.h b/include/deal.II/matrix_free/task_info.h
index 56f0ba86a56725dd87e6a8f3af05d2419a413606..bb0851818e22655fd63233fd28eea03fadc7f33c 100644 (file)
--- a/include/deal.II/matrix_free/task_info.h
+++ b/include/deal.II/matrix_free/task_info.h
@@ -28,12 +28,15 @@
 #include <deal.II/base/utilities.h>
 #include <deal.II/base/vectorization.h>
 
-#include <deal.II/lac/dynamic_sparsity_pattern.h>
-
 
 DEAL_II_NAMESPACE_OPEN
 
 
+// forward declaration
+#ifndef DOXYGEN
+class DynamicSparsityPattern;
+#endif
+
 
 namespace internal
 {

diff --git a/include/deal.II/numerics/vector_tools_project.templates.h b/include/deal.II/numerics/vector_tools_project.templates.h
index 719a20fc12b477ddab08641b4cac8f973f84f945..bd8497e8b699398ac30074860278a92ab7c1effb 100644 (file)
--- a/include/deal.II/numerics/vector_tools_project.templates.h
+++ b/include/deal.II/numerics/vector_tools_project.templates.h
@@ -21,6 +21,7 @@
 #include <deal.II/fe/fe_simplex_p_bubbles.h>
 
 #include <deal.II/lac/block_vector.h>
+#include <deal.II/lac/dynamic_sparsity_pattern.h>
 #include <deal.II/lac/la_parallel_block_vector.h>
 #include <deal.II/lac/la_parallel_vector.h>
 #include <deal.II/lac/la_vector.h>

diff --git a/source/matrix_free/task_info.cc b/source/matrix_free/task_info.cc
index fafaff1e971211437a5d611d62e0e26cc1527836..5a851e8ddc9041d68641ce24571062d3ddad2111 100644 (file)
--- a/source/matrix_free/task_info.cc
+++ b/source/matrix_free/task_info.cc
@@ -21,6 +21,8 @@
 #include <deal.II/base/parallel.h>
 #include <deal.II/base/utilities.h>
 
+#include <deal.II/lac/dynamic_sparsity_pattern.h>
+
 #include <deal.II/matrix_free/task_info.h>
 
 

diff --git a/tests/matrix_free/matrix_vector_large_degree_02.cc b/tests/matrix_free/matrix_vector_large_degree_02.cc
index f52a8d475512997091ef3eb1883f7abd166e87c4..b815c42aedca1f0f578162893a8db87279db212d 100644 (file)
--- a/tests/matrix_free/matrix_vector_large_degree_02.cc
+++ b/tests/matrix_free/matrix_vector_large_degree_02.cc
@@ -33,6 +33,7 @@
 #include <deal.II/grid/manifold_lib.h>
 
 #include <deal.II/lac/affine_constraints.h>
+#include <deal.II/lac/dynamic_sparsity_pattern.h>
 #include <deal.II/lac/sparse_matrix.h>
 #include <deal.II/lac/sparsity_pattern.h>
 

diff --git a/tests/matrix_free/matrix_vector_stokes_onedof.cc b/tests/matrix_free/matrix_vector_stokes_onedof.cc
index f81cf746dc20192c71258ce6a79a580efd123a2c..e294b5117df74a8a1a86fad3879a343f3d1648e6 100644 (file)
--- a/tests/matrix_free/matrix_vector_stokes_onedof.cc
+++ b/tests/matrix_free/matrix_vector_stokes_onedof.cc
@@ -38,6 +38,7 @@
 #include <deal.II/grid/tria.h>
 
 #include <deal.II/lac/affine_constraints.h>
+#include <deal.II/lac/dynamic_sparsity_pattern.h>
 #include <deal.II/lac/sparse_matrix.h>
 #include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/vector.h>

diff --git a/tests/simplex/matrix_free_01.cc b/tests/simplex/matrix_free_01.cc
index 522cf5b0525beea9a875c50b45b0c1e7e86451cd..004c4464dd1647de3f6e92af5183c31d5e18ac81 100644 (file)
--- a/tests/simplex/matrix_free_01.cc
+++ b/tests/simplex/matrix_free_01.cc
@@ -33,6 +33,7 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria.h>
 
+#include <deal.II/lac/dynamic_sparsity_pattern.h>
 #include <deal.II/lac/la_parallel_vector.h>
 #include <deal.II/lac/precondition.h>
 #include <deal.II/lac/solver_cg.h>

diff --git a/tests/simplex/matrix_free_02.cc b/tests/simplex/matrix_free_02.cc
index b631599c3ff2317a581e28a7d291c07218a90d80..e5a522e654c481d63bc13d6d1da655dd9ffce77e 100644 (file)
--- a/tests/simplex/matrix_free_02.cc
+++ b/tests/simplex/matrix_free_02.cc
@@ -35,6 +35,7 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria.h>
 
+#include <deal.II/lac/dynamic_sparsity_pattern.h>
 #include <deal.II/lac/la_parallel_vector.h>
 #include <deal.II/lac/precondition.h>
 #include <deal.II/lac/solver_cg.h>