From: Martin Kronbichler <kronbichler@lnm.mw.tum.de>
Date: Thu, 16 Apr 2020 06:32:20 +0000 (+0200)
Subject: Do not include fe_q.h in mapping_q_generic.h
X-Git-Tag: v9.2.0-rc1~216^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a65c719595b77bec577a2d9be354bcbeee1dc26e;p=dealii.git

Do not include fe_q.h in mapping_q_generic.h
---

diff --git a/examples/step-10/step-10.cc b/examples/step-10/step-10.cc
index deaa2f5e57..c68e70d7f4 100644
--- a/examples/step-10/step-10.cc
+++ b/examples/step-10/step-10.cc
@@ -333,8 +333,8 @@ namespace Step10
         Triangulation<dim> triangulation;
         GridGenerator::hyper_ball(triangulation);
 
-        const MappingQ<dim> mapping(degree);
-        const FE_Q<dim>     fe(1);
+        const MappingQ<dim>   mapping(degree);
+        const FE_Nothing<dim> fe;
 
         DoFHandler<dim> dof_handler(triangulation);
 
diff --git a/examples/step-38/step-38.cc b/examples/step-38/step-38.cc
index bc2644d047..0427b2e089 100644
--- a/examples/step-38/step-38.cc
+++ b/examples/step-38/step-38.cc
@@ -41,6 +41,7 @@
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/dofs/dof_tools.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_values.h>
 #include <deal.II/fe/mapping_q.h>
 
diff --git a/examples/step-69/step-69.cc b/examples/step-69/step-69.cc
index 6c6b1300ed..adbbf7d2d3 100644
--- a/examples/step-69/step-69.cc
+++ b/examples/step-69/step-69.cc
@@ -53,6 +53,7 @@
 #include <deal.II/dofs/dof_tools.h>
 
 #include <deal.II/fe/fe.h>
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_values.h>
 #include <deal.II/fe/mapping.h>
 #include <deal.II/fe/mapping_q.h>
diff --git a/include/deal.II/fe/mapping_q_generic.h b/include/deal.II/fe/mapping_q_generic.h
index d5863b432e..c954a79df2 100644
--- a/include/deal.II/fe/mapping_q_generic.h
+++ b/include/deal.II/fe/mapping_q_generic.h
@@ -24,7 +24,6 @@
 #include <deal.II/base/table.h>
 #include <deal.II/base/vectorization.h>
 
-#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/mapping.h>
 
 #include <deal.II/grid/tria_iterator.h>
diff --git a/source/meshworker/scratch_data.cc b/source/meshworker/scratch_data.cc
index c55c72e77e..200791ed24 100644
--- a/source/meshworker/scratch_data.cc
+++ b/source/meshworker/scratch_data.cc
@@ -13,6 +13,8 @@
 //
 // ---------------------------------------------------------------------
 
+#include <deal.II/base/std_cxx14/memory.h>
+
 #include <deal.II/meshworker/scratch_data.h>
 
 DEAL_II_NAMESPACE_OPEN
diff --git a/tests/algorithms/newton_02.cc b/tests/algorithms/newton_02.cc
index c69aca3e97..3dd788d7c2 100644
--- a/tests/algorithms/newton_02.cc
+++ b/tests/algorithms/newton_02.cc
@@ -17,6 +17,8 @@
 #include <deal.II/algorithms/newton.h>
 #include <deal.II/algorithms/operator.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_generator.h>
 
 #include <deal.II/numerics/vector_tools.h>
diff --git a/tests/base/cell_data_storage_01.cc b/tests/base/cell_data_storage_01.cc
index 1ea31614ce..f6b2a82f17 100644
--- a/tests/base/cell_data_storage_01.cc
+++ b/tests/base/cell_data_storage_01.cc
@@ -25,6 +25,7 @@
 
 #include <deal.II/distributed/tria.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_tools.h>
 #include <deal.II/fe/fe_values.h>
 
diff --git a/tests/base/cell_data_storage_02.cc b/tests/base/cell_data_storage_02.cc
index 190b9d7ade..360f7503a4 100644
--- a/tests/base/cell_data_storage_02.cc
+++ b/tests/base/cell_data_storage_02.cc
@@ -22,6 +22,7 @@
 #include <deal.II/base/tensor.h>
 #include <deal.II/base/utilities.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_tools.h>
 #include <deal.II/fe/fe_values.h>
 
diff --git a/tests/base/function_cutoff_01.cc b/tests/base/function_cutoff_01.cc
index 2757d5bcf8..6dd0ffafbf 100644
--- a/tests/base/function_cutoff_01.cc
+++ b/tests/base/function_cutoff_01.cc
@@ -19,6 +19,8 @@
 #include <deal.II/base/point.h>
 #include <deal.II/base/utilities.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria.h>
 
diff --git a/tests/base/function_cutoff_02.cc b/tests/base/function_cutoff_02.cc
index d2997c14d6..a368b30216 100644
--- a/tests/base/function_cutoff_02.cc
+++ b/tests/base/function_cutoff_02.cc
@@ -19,6 +19,8 @@
 #include <deal.II/base/point.h>
 #include <deal.II/base/utilities.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria.h>
 
diff --git a/tests/base/quadrature_point_data.cc b/tests/base/quadrature_point_data.cc
index bc04a8bb78..9eff9c9719 100644
--- a/tests/base/quadrature_point_data.cc
+++ b/tests/base/quadrature_point_data.cc
@@ -27,6 +27,7 @@
 
 #include <deal.II/distributed/tria.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_tools.h>
 #include <deal.II/fe/fe_values.h>
 
diff --git a/tests/base/quadrature_point_data_02.cc b/tests/base/quadrature_point_data_02.cc
index e4c42c09a7..0ce68de90f 100644
--- a/tests/base/quadrature_point_data_02.cc
+++ b/tests/base/quadrature_point_data_02.cc
@@ -28,6 +28,7 @@
 
 #include <deal.II/distributed/tria.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_tools.h>
 #include <deal.II/fe/fe_values.h>
 
diff --git a/tests/base/quadrature_point_data_03.cc b/tests/base/quadrature_point_data_03.cc
index bb444b5db6..ab1d115f96 100644
--- a/tests/base/quadrature_point_data_03.cc
+++ b/tests/base/quadrature_point_data_03.cc
@@ -25,6 +25,7 @@
 
 #include <deal.II/distributed/tria.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_tools.h>
 #include <deal.II/fe/fe_values.h>
 
diff --git a/tests/codim_one/extract_boundary_mesh_07.cc b/tests/codim_one/extract_boundary_mesh_07.cc
index 1336546dcd..0ddc97484f 100644
--- a/tests/codim_one/extract_boundary_mesh_07.cc
+++ b/tests/codim_one/extract_boundary_mesh_07.cc
@@ -24,6 +24,7 @@
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_tools.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/fe_values.h>
 #include <deal.II/fe/mapping_q_eulerian.h>
diff --git a/tests/fe/fe_subface_values_01.cc b/tests/fe/fe_subface_values_01.cc
index b881f54f31..9c8fa35d8a 100644
--- a/tests/fe/fe_subface_values_01.cc
+++ b/tests/fe/fe_subface_values_01.cc
@@ -69,7 +69,7 @@ run(unsigned int degree, unsigned int n_q_points)
   GridOut grid_out;
   grid_out.write_mesh_per_processor_as_vtu(tria, "mesh");
 
-  FE_Q<dim>              fe(degree);                       // dummy
+  FE_DGQ<dim>            fe(degree);                       // dummy
   QGaussLobatto<dim - 1> quad(n_q_points);                 // dummy
   UpdateFlags            flags = update_quadrature_points; // dummy
 
diff --git a/tests/fe/fe_values_view_28.cc b/tests/fe/fe_values_view_28.cc
index 73416c79e2..b8828f130b 100644
--- a/tests/fe/fe_values_view_28.cc
+++ b/tests/fe/fe_values_view_28.cc
@@ -23,7 +23,7 @@
 
 #include <deal.II/dofs/dof_handler.h>
 
-#include <deal.II/fe/fe_nedelec.h>
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/fe_values.h>
 
diff --git a/tests/feinterface/face_orientation_01.cc b/tests/feinterface/face_orientation_01.cc
index e982e8ccfd..cac70613c0 100644
--- a/tests/feinterface/face_orientation_01.cc
+++ b/tests/feinterface/face_orientation_01.cc
@@ -25,8 +25,8 @@
 
 #include <deal.II/base/quadrature_lib.h>
 
-#include <deal.II/fe/fe_dgq.h>
 #include <deal.II/fe/fe_interface_values.h>
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/mapping_q.h>
 
 #include <deal.II/grid/grid_generator.h>
diff --git a/tests/feinterface/fe_interface_values_06.cc b/tests/feinterface/fe_interface_values_06.cc
index 5406079d96..fabb793b60 100644
--- a/tests/feinterface/fe_interface_values_06.cc
+++ b/tests/feinterface/fe_interface_values_06.cc
@@ -21,6 +21,7 @@
 
 #include <deal.II/fe/fe_dgq.h>
 #include <deal.II/fe/fe_interface_values.h>
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/mapping_q.h>
 
 #include <deal.II/grid/grid_generator.h>
diff --git a/tests/feinterface/fe_interface_values_07.cc b/tests/feinterface/fe_interface_values_07.cc
index 02817b5e1b..9656c9f4e5 100644
--- a/tests/feinterface/fe_interface_values_07.cc
+++ b/tests/feinterface/fe_interface_values_07.cc
@@ -21,6 +21,7 @@
 
 #include <deal.II/fe/fe_dgq.h>
 #include <deal.II/fe/fe_interface_values.h>
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/mapping_q.h>
 
 #include <deal.II/grid/grid_generator.h>
diff --git a/tests/feinterface/fe_interface_values_08.cc b/tests/feinterface/fe_interface_values_08.cc
index 1972fa9d1d..71a5ad32a2 100644
--- a/tests/feinterface/fe_interface_values_08.cc
+++ b/tests/feinterface/fe_interface_values_08.cc
@@ -20,6 +20,7 @@
 
 #include <deal.II/fe/fe_dgq.h>
 #include <deal.II/fe/fe_interface_values.h>
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/mapping_q.h>
 
 #include <deal.II/grid/grid_generator.h>
diff --git a/tests/feinterface/fe_interface_values_09.cc b/tests/feinterface/fe_interface_values_09.cc
index 55766fbcf4..7a4aeab2f5 100644
--- a/tests/feinterface/fe_interface_values_09.cc
+++ b/tests/feinterface/fe_interface_values_09.cc
@@ -20,6 +20,7 @@
 
 #include <deal.II/fe/fe_dgq.h>
 #include <deal.II/fe/fe_interface_values.h>
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/mapping_q.h>
 
 #include <deal.II/grid/grid_generator.h>
diff --git a/tests/grid/get_dof_to_support_patch_map_01.cc b/tests/grid/get_dof_to_support_patch_map_01.cc
index ff27c0b9c2..02b0166b8c 100644
--- a/tests/grid/get_dof_to_support_patch_map_01.cc
+++ b/tests/grid/get_dof_to_support_patch_map_01.cc
@@ -28,6 +28,8 @@
 
 #include <deal.II/dofs/dof_handler.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/tria.h>
diff --git a/tests/lac/inhomogeneous_constraints_block.cc b/tests/lac/inhomogeneous_constraints_block.cc
index f74d6b49b7..61d3f0cec8 100644
--- a/tests/lac/inhomogeneous_constraints_block.cc
+++ b/tests/lac/inhomogeneous_constraints_block.cc
@@ -27,6 +27,7 @@
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/dofs/dof_tools.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/fe_values.h>
 
diff --git a/tests/manifold/spherical_manifold_02.cc b/tests/manifold/spherical_manifold_02.cc
index a29e8472da..c10b5b4bc9 100644
--- a/tests/manifold/spherical_manifold_02.cc
+++ b/tests/manifold/spherical_manifold_02.cc
@@ -24,7 +24,7 @@
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_tools.h>
 
-#include <deal.II/fe/fe_dgq.h>
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/fe_values.h>
 #include <deal.II/fe/mapping_manifold.h>
diff --git a/tests/mappings/mapping_fe_field_08.cc b/tests/mappings/mapping_fe_field_08.cc
index 21c71d8844..ba05bf4adb 100644
--- a/tests/mappings/mapping_fe_field_08.cc
+++ b/tests/mappings/mapping_fe_field_08.cc
@@ -19,6 +19,7 @@
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/utilities.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/mapping_fe_field.h>
 #include <deal.II/fe/mapping_q.h>
diff --git a/tests/mappings/mapping_manifold_06.cc b/tests/mappings/mapping_manifold_06.cc
index 1e9bf4ea13..a34ac41790 100644
--- a/tests/mappings/mapping_manifold_06.cc
+++ b/tests/mappings/mapping_manifold_06.cc
@@ -19,6 +19,7 @@
 
 #include <deal.II/base/utilities.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_values.h>
 #include <deal.II/fe/mapping_manifold.h>
 #include <deal.II/fe/mapping_q_generic.h>
diff --git a/tests/mappings/mapping_manifold_07.cc b/tests/mappings/mapping_manifold_07.cc
index fc9eebcf6a..ea10d341f0 100644
--- a/tests/mappings/mapping_manifold_07.cc
+++ b/tests/mappings/mapping_manifold_07.cc
@@ -17,6 +17,7 @@
 
 #include <deal.II/base/utilities.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_values.h>
 #include <deal.II/fe/mapping_manifold.h>
 #include <deal.II/fe/mapping_q_generic.h>
diff --git a/tests/mappings/mapping_q_manifold_01.cc b/tests/mappings/mapping_q_manifold_01.cc
index a79b07a11d..21c30dfab8 100644
--- a/tests/mappings/mapping_q_manifold_01.cc
+++ b/tests/mappings/mapping_q_manifold_01.cc
@@ -22,6 +22,7 @@
 #include <deal.II/dofs/dof_tools.h>
 
 #include <deal.II/fe/fe_nedelec.h>
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_raviart_thomas.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/mapping_q.h>
diff --git a/tests/matrix_free/cell_categorization_02.cc b/tests/matrix_free/cell_categorization_02.cc
index c368c3b289..d0416ea031 100644
--- a/tests/matrix_free/cell_categorization_02.cc
+++ b/tests/matrix_free/cell_categorization_02.cc
@@ -24,7 +24,7 @@
 
 #include <deal.II/dofs/dof_tools.h>
 
-#include <deal.II/fe/fe_dgq.h>
+#include <deal.II/fe/fe_q.h>
 
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_tools.h>
diff --git a/tests/matrix_free/face_setup_01.cc b/tests/matrix_free/face_setup_01.cc
index cea8fde80c..8e78fc2826 100644
--- a/tests/matrix_free/face_setup_01.cc
+++ b/tests/matrix_free/face_setup_01.cc
@@ -26,6 +26,8 @@
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_tools.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_generator.h>
 
 #include <deal.II/lac/la_parallel_vector.h>
diff --git a/tests/matrix_free/matrix_vector_large_degree_01.cc b/tests/matrix_free/matrix_vector_large_degree_01.cc
index fccad8f2eb..eac682b6cf 100644
--- a/tests/matrix_free/matrix_vector_large_degree_01.cc
+++ b/tests/matrix_free/matrix_vector_large_degree_01.cc
@@ -27,6 +27,8 @@
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_tools.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria.h>
diff --git a/tests/matrix_free/matrix_vector_large_degree_03.cc b/tests/matrix_free/matrix_vector_large_degree_03.cc
index 7353d31619..be2aec8352 100644
--- a/tests/matrix_free/matrix_vector_large_degree_03.cc
+++ b/tests/matrix_free/matrix_vector_large_degree_03.cc
@@ -25,6 +25,8 @@
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_tools.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria.h>
diff --git a/tests/meshworker/mesh_loop_04.cc b/tests/meshworker/mesh_loop_04.cc
index 7decee699b..89e4fbf492 100644
--- a/tests/meshworker/mesh_loop_04.cc
+++ b/tests/meshworker/mesh_loop_04.cc
@@ -19,6 +19,8 @@
 
 #include <deal.II/base/iterator_range.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/tria_accessor.h>
diff --git a/tests/meshworker/mesh_loop_05.cc b/tests/meshworker/mesh_loop_05.cc
index d251046114..ede120e0a4 100644
--- a/tests/meshworker/mesh_loop_05.cc
+++ b/tests/meshworker/mesh_loop_05.cc
@@ -22,6 +22,8 @@
 
 #include <deal.II/distributed/tria.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/filtered_iterator.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria_accessor.h>
diff --git a/tests/meshworker/mesh_loop_06.cc b/tests/meshworker/mesh_loop_06.cc
index 3fb235e5a3..a0e98a9a16 100644
--- a/tests/meshworker/mesh_loop_06.cc
+++ b/tests/meshworker/mesh_loop_06.cc
@@ -20,6 +20,8 @@
 
 #include <deal.II/base/iterator_range.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/filtered_iterator.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria.h>
diff --git a/tests/meshworker/scratch_data_01.cc b/tests/meshworker/scratch_data_01.cc
index 52dec18793..c86406a8ce 100644
--- a/tests/meshworker/scratch_data_01.cc
+++ b/tests/meshworker/scratch_data_01.cc
@@ -16,6 +16,8 @@
 
 // Test ScratchData on simple volume computation
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/tria_accessor.h>
diff --git a/tests/meshworker/scratch_data_02.cc b/tests/meshworker/scratch_data_02.cc
index 31dba8c74c..562aafe78a 100644
--- a/tests/meshworker/scratch_data_02.cc
+++ b/tests/meshworker/scratch_data_02.cc
@@ -22,7 +22,7 @@
 
 #include <deal.II/dofs/dof_tools.h>
 
-#include <deal.II/fe/fe_dgq.h>
+#include <deal.II/fe/fe_q.h>
 
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_out.h>
diff --git a/tests/mpi/interpolate_to_different_mesh_02.cc b/tests/mpi/interpolate_to_different_mesh_02.cc
index 21977fe851..74b7d79582 100644
--- a/tests/mpi/interpolate_to_different_mesh_02.cc
+++ b/tests/mpi/interpolate_to_different_mesh_02.cc
@@ -22,7 +22,7 @@
 
 #include <deal.II/dofs/dof_tools.h>
 
-#include <deal.II/fe/fe_dgq.h>
+#include <deal.II/fe/fe_q.h>
 
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_out.h>
diff --git a/tests/mpi/periodicity_05.cc b/tests/mpi/periodicity_05.cc
index e86b0daa4e..68b88ffb21 100644
--- a/tests/mpi/periodicity_05.cc
+++ b/tests/mpi/periodicity_05.cc
@@ -21,6 +21,8 @@
 
 #include <deal.II/distributed/tria.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_in.h>
 #include <deal.II/grid/grid_tools.h>
 
diff --git a/tests/mpi/solution_transfer_05.cc b/tests/mpi/solution_transfer_05.cc
index 0c4d7d4c72..e866ee5707 100644
--- a/tests/mpi/solution_transfer_05.cc
+++ b/tests/mpi/solution_transfer_05.cc
@@ -56,7 +56,7 @@ test()
   const unsigned int    max_degree = 6 - dim;
   hp::FECollection<dim> fe_dgq;
   for (unsigned int deg = 1; deg <= max_degree; ++deg)
-    fe_dgq.push_back(FE_Q<dim>(deg));
+    fe_dgq.push_back(FE_DGQ<dim>(deg));
 
   hp::DoFHandler<dim> dgq_dof_handler(tria);
 
diff --git a/tests/multigrid/constrained_dofs_05.cc b/tests/multigrid/constrained_dofs_05.cc
index 3c6be20004..cd338351ac 100644
--- a/tests/multigrid/constrained_dofs_05.cc
+++ b/tests/multigrid/constrained_dofs_05.cc
@@ -17,6 +17,8 @@
 
 #include <deal.II/dofs/dof_handler.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/tria.h>
diff --git a/tests/multigrid/mg_data_out_04.cc b/tests/multigrid/mg_data_out_04.cc
index d51ac4f8d2..3378e79f0d 100644
--- a/tests/multigrid/mg_data_out_04.cc
+++ b/tests/multigrid/mg_data_out_04.cc
@@ -19,6 +19,8 @@
 
 #include <deal.II/distributed/tria.h>
 
+#include <deal.II/fe/fe_q.h>
+
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
diff --git a/tests/numerics/no_flux_08.cc b/tests/numerics/no_flux_08.cc
index 304354f458..e31506a7ee 100644
--- a/tests/numerics/no_flux_08.cc
+++ b/tests/numerics/no_flux_08.cc
@@ -35,6 +35,7 @@
 // this was fixed with r24044 together with the no_flux_07 test that
 // reduces it to its essence
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/mapping_q.h>
 
diff --git a/tests/numerics/no_flux_09.cc b/tests/numerics/no_flux_09.cc
index 03ed30b42b..a179144937 100644
--- a/tests/numerics/no_flux_09.cc
+++ b/tests/numerics/no_flux_09.cc
@@ -32,6 +32,7 @@
 //(none)
 
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/mapping_q.h>
 
diff --git a/tests/numerics/no_flux_10.cc b/tests/numerics/no_flux_10.cc
index 5baeebc65f..a8c089473d 100644
--- a/tests/numerics/no_flux_10.cc
+++ b/tests/numerics/no_flux_10.cc
@@ -35,6 +35,7 @@
 
 #include <deal.II/dofs/dof_handler.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/mapping_q.h>
 
diff --git a/tests/numerics/no_flux_11.cc b/tests/numerics/no_flux_11.cc
index b6e73b02a4..0d53170294 100644
--- a/tests/numerics/no_flux_11.cc
+++ b/tests/numerics/no_flux_11.cc
@@ -25,6 +25,7 @@
 
 #include <deal.II/dofs/dof_handler.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/mapping_q.h>
 
diff --git a/tests/numerics/no_flux_12.cc b/tests/numerics/no_flux_12.cc
index 484323b7c5..5618d9efda 100644
--- a/tests/numerics/no_flux_12.cc
+++ b/tests/numerics/no_flux_12.cc
@@ -60,6 +60,7 @@ exception was: 5:     ExcNotImplemented()
 
 #include <deal.II/dofs/dof_handler.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/mapping_q.h>
 
diff --git a/tests/numerics/no_flux_14.cc b/tests/numerics/no_flux_14.cc
index 1bc0d2da82..80d3561c9c 100644
--- a/tests/numerics/no_flux_14.cc
+++ b/tests/numerics/no_flux_14.cc
@@ -21,6 +21,7 @@
 // vertices.
 
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/mapping_q.h>
 
diff --git a/tests/numerics/no_flux_15.cc b/tests/numerics/no_flux_15.cc
index 5fac01af57..484572a1e7 100644
--- a/tests/numerics/no_flux_15.cc
+++ b/tests/numerics/no_flux_15.cc
@@ -24,6 +24,7 @@
 
 #include <deal.II/dofs/dof_handler.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/mapping_q.h>
 
diff --git a/tests/numerics/project_bv_div_conf_03.cc b/tests/numerics/project_bv_div_conf_03.cc
index ced4d5c21b..b2db1b9c25 100644
--- a/tests/numerics/project_bv_div_conf_03.cc
+++ b/tests/numerics/project_bv_div_conf_03.cc
@@ -22,7 +22,7 @@
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_tools.h>
 
-#include <deal.II/fe/fe_dgq.h>
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_raviart_thomas.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/mapping_cartesian.h>
diff --git a/tests/vector_tools/integrate_difference_05.cc b/tests/vector_tools/integrate_difference_05.cc
index 6c4d477eac..d1d50f610c 100644
--- a/tests/vector_tools/integrate_difference_05.cc
+++ b/tests/vector_tools/integrate_difference_05.cc
@@ -25,6 +25,7 @@
 
 #include <deal.II/dofs/dof_tools.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 
 #include <deal.II/grid/grid_generator.h>
diff --git a/tests/vector_tools/interpolate_with_material_id_02.cc b/tests/vector_tools/interpolate_with_material_id_02.cc
index dba6b49280..ecad1a7a7c 100644
--- a/tests/vector_tools/interpolate_with_material_id_02.cc
+++ b/tests/vector_tools/interpolate_with_material_id_02.cc
@@ -25,6 +25,7 @@
 
 #include <deal.II/dofs/dof_handler.h>
 
+#include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/mapping_q.h>
 
 #include <deal.II/grid/filtered_iterator.h>