From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 24 May 2007 04:16:35 +0000 (+0000)
Subject: Move files relating to hp into their own directories. This also required a number... 
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d01666fe5dc2fc5d7d35fe7a1175c04ec6b811d;p=dealii-svn.git

Move files relating to hp into their own directories. This also required a number of changes to deal.II/Makefile, since we now have a number of file names that appear more than once, though in different directories.

git-svn-id: https://svn.dealii.org/trunk@14699 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/tests/bits/step-10.cc b/tests/bits/step-10.cc
index 185b0887d9..d33e860ae3 100644
--- a/tests/bits/step-10.cc
+++ b/tests/bits/step-10.cc
@@ -29,10 +29,10 @@ std::ofstream logfile("step-10/output");
 #include <grid/tria_boundary_lib.h>
 #include <grid/tria.h>
 #include <grid/grid_out.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 
 #include <fe/mapping_q.h>
 
diff --git a/tests/bits/step-2.cc b/tests/bits/step-2.cc
index 76a9466b35..00c5e3bc08 100644
--- a/tests/bits/step-2.cc
+++ b/tests/bits/step-2.cc
@@ -22,7 +22,7 @@
 #include <grid/grid_generator.h>
 #include <grid/tria_boundary_lib.h>
 
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 
 #include <fe/fe_q.h>
 #include <dofs/dof_tools.h>
diff --git a/tests/bits/step-3.cc b/tests/bits/step-3.cc
index db89a68eb4..9b55c59af4 100644
--- a/tests/bits/step-3.cc
+++ b/tests/bits/step-3.cc
@@ -29,7 +29,7 @@
 
 #include <dofs/dof_tools.h>
 
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <base/quadrature_lib.h>
 
 #include <base/function.h>
diff --git a/tests/bits/step-4.cc b/tests/bits/step-4.cc
index ed9eb95d15..d879adf51a 100644
--- a/tests/bits/step-4.cc
+++ b/tests/bits/step-4.cc
@@ -22,14 +22,14 @@ std::ofstream logfile("step-4/output");
 
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
 #include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <base/quadrature_lib.h>
 #include <base/function.h>
 #include <numerics/vectors.h>
diff --git a/tests/bits/step-5.cc b/tests/bits/step-5.cc
index abaa6c6a3b..426a8061f7 100644
--- a/tests/bits/step-5.cc
+++ b/tests/bits/step-5.cc
@@ -31,13 +31,13 @@ std::ofstream logfile("step-5/output");
 #include <lac/solver_cg.h>
 #include <lac/precondition.h>
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/bits/step-6.cc b/tests/bits/step-6.cc
index 8dc7b17dd1..67a80a0c33 100644
--- a/tests/bits/step-6.cc
+++ b/tests/bits/step-6.cc
@@ -31,14 +31,14 @@ std::ofstream logfile("step-6/output");
 #include <lac/solver_cg.h>
 #include <lac/precondition.h>
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/bits/step-7.cc b/tests/bits/step-7.cc
index 8566f7e368..52131097eb 100644
--- a/tests/bits/step-7.cc
+++ b/tests/bits/step-7.cc
@@ -36,7 +36,7 @@ std::ofstream logfile("step-7/output");
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
@@ -49,7 +49,7 @@ std::ofstream logfile("step-7/output");
 #include <base/smartpointer.h>
 #include <numerics/vectors.h>
 #include <base/convergence_table.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 
 #include <typeinfo>
 #include <fstream>
diff --git a/tests/bits/step-8.cc b/tests/bits/step-8.cc
index ba8dd88408..605640362d 100644
--- a/tests/bits/step-8.cc
+++ b/tests/bits/step-8.cc
@@ -36,10 +36,10 @@ std::ofstream logfile("step-8/output");
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/bits/step-9.cc b/tests/bits/step-9.cc
index 63f8741c28..9b5dfba670 100644
--- a/tests/bits/step-9.cc
+++ b/tests/bits/step-9.cc
@@ -36,11 +36,11 @@ std::ofstream logfile("step-9/output");
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/deal.II/constraint_graph.cc b/tests/deal.II/constraint_graph.cc
index 02bc292a0d..8127829616 100644
--- a/tests/deal.II/constraint_graph.cc
+++ b/tests/deal.II/constraint_graph.cc
@@ -22,7 +22,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
diff --git a/tests/deal.II/get_finest_common_cells_01.cc b/tests/deal.II/get_finest_common_cells_01.cc
index 21c04e1b86..3ae0bd8fd5 100644
--- a/tests/deal.II/get_finest_common_cells_01.cc
+++ b/tests/deal.II/get_finest_common_cells_01.cc
@@ -18,7 +18,7 @@
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <multigrid/mg_dof_handler.h>
 #include <grid/tria_accessor.h>
 
diff --git a/tests/deal.II/get_finest_common_cells_02.cc b/tests/deal.II/get_finest_common_cells_02.cc
index 2b812154aa..9760b0c25e 100644
--- a/tests/deal.II/get_finest_common_cells_02.cc
+++ b/tests/deal.II/get_finest_common_cells_02.cc
@@ -18,7 +18,7 @@
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <multigrid/mg_dof_handler.h>
 #include <dofs/dof_accessor.h>
 
diff --git a/tests/deal.II/get_finest_common_cells_03.cc b/tests/deal.II/get_finest_common_cells_03.cc
index f1c984e52e..2558c8ed24 100644
--- a/tests/deal.II/get_finest_common_cells_03.cc
+++ b/tests/deal.II/get_finest_common_cells_03.cc
@@ -18,7 +18,7 @@
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <multigrid/mg_dof_handler.h>
 #include <dofs/dof_accessor.h>
 
diff --git a/tests/deal.II/get_finest_common_cells_04.cc b/tests/deal.II/get_finest_common_cells_04.cc
index 37bf99fac6..2424518bb5 100644
--- a/tests/deal.II/get_finest_common_cells_04.cc
+++ b/tests/deal.II/get_finest_common_cells_04.cc
@@ -18,7 +18,7 @@
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <multigrid/mg_dof_handler.h>
 #include <multigrid/mg_dof_accessor.h>
 
diff --git a/tests/deal.II/have_same_coarse_mesh_01.cc b/tests/deal.II/have_same_coarse_mesh_01.cc
index a4d763ae62..f18848c3c8 100644
--- a/tests/deal.II/have_same_coarse_mesh_01.cc
+++ b/tests/deal.II/have_same_coarse_mesh_01.cc
@@ -18,7 +18,7 @@
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <multigrid/mg_dof_handler.h>
 
 #include <fstream>
diff --git a/tests/deal.II/have_same_coarse_mesh_02.cc b/tests/deal.II/have_same_coarse_mesh_02.cc
index c29102aac5..9277b66e54 100644
--- a/tests/deal.II/have_same_coarse_mesh_02.cc
+++ b/tests/deal.II/have_same_coarse_mesh_02.cc
@@ -18,7 +18,7 @@
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <multigrid/mg_dof_handler.h>
 
 #include <fstream>
diff --git a/tests/deal.II/have_same_coarse_mesh_03.cc b/tests/deal.II/have_same_coarse_mesh_03.cc
index ca92005be4..e7438125ae 100644
--- a/tests/deal.II/have_same_coarse_mesh_03.cc
+++ b/tests/deal.II/have_same_coarse_mesh_03.cc
@@ -18,7 +18,7 @@
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <multigrid/mg_dof_handler.h>
 
 #include <fstream>
diff --git a/tests/deal.II/have_same_coarse_mesh_04.cc b/tests/deal.II/have_same_coarse_mesh_04.cc
index 28bed581f7..57c308af93 100644
--- a/tests/deal.II/have_same_coarse_mesh_04.cc
+++ b/tests/deal.II/have_same_coarse_mesh_04.cc
@@ -18,7 +18,7 @@
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <multigrid/mg_dof_handler.h>
 
 #include <fstream>
diff --git a/tests/deal.II/project_01.cc b/tests/deal.II/project_01.cc
index f8492b404d..276cbe7852 100644
--- a/tests/deal.II/project_01.cc
+++ b/tests/deal.II/project_01.cc
@@ -22,7 +22,7 @@
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <numerics/vectors.h>
diff --git a/tests/deal.II/project_02.cc b/tests/deal.II/project_02.cc
index bc65c3c240..4580c8baf9 100644
--- a/tests/deal.II/project_02.cc
+++ b/tests/deal.II/project_02.cc
@@ -22,7 +22,7 @@
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <numerics/vectors.h>
diff --git a/tests/fail/hp-crash_17.cc b/tests/fail/hp-crash_17.cc
index dfe6c5d03b..e9b1056ec2 100644
--- a/tests/fail/hp-crash_17.cc
+++ b/tests/fail/hp-crash_17.cc
@@ -32,14 +32,14 @@ char logname[] = "hp-crash_17/output";
 #include <lac/solver_cg.h>
 #include <lac/precondition.h>
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/fail/hp-crash_18.cc b/tests/fail/hp-crash_18.cc
index 8282ce3266..088aad4daf 100644
--- a/tests/fail/hp-crash_18.cc
+++ b/tests/fail/hp-crash_18.cc
@@ -35,14 +35,14 @@ char logname[] = "hp-crash_18/output";
 #include <lac/solver_cg.h>
 #include <lac/precondition.h>
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/fail/hp-step-14.cc b/tests/fail/hp-step-14.cc
index e20dd0c39a..b25a099529 100644
--- a/tests/fail/hp-step-14.cc
+++ b/tests/fail/hp-step-14.cc
@@ -37,12 +37,12 @@ std::ofstream logfile("step-14/output");
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/grid_refinement.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/fe_tools.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
diff --git a/tests/fail/hp-step-15.cc b/tests/fail/hp-step-15.cc
index 4b526446d5..a28ee8bd5d 100644
--- a/tests/fail/hp-step-15.cc
+++ b/tests/fail/hp-step-15.cc
@@ -40,7 +40,7 @@ std::ofstream logfile("step-15/output");
 #include <dofs/dof_constraints.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/q_collection.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
diff --git a/tests/fail/kelly_crash_01.cc b/tests/fail/kelly_crash_01.cc
index 4d76e3a129..2fb639b993 100644
--- a/tests/fail/kelly_crash_01.cc
+++ b/tests/fail/kelly_crash_01.cc
@@ -32,14 +32,14 @@ char logname[] = "kelly_crash_01/output";
 #include <lac/solver_cg.h>
 #include <lac/precondition.h>
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/fail/vectors_boundary_rhs_hp_02.cc b/tests/fail/vectors_boundary_rhs_hp_02.cc
index 67d79bb96f..7775ea2d19 100644
--- a/tests/fail/vectors_boundary_rhs_hp_02.cc
+++ b/tests/fail/vectors_boundary_rhs_hp_02.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_raviart_thomas.h>
diff --git a/tests/fail/vectors_rhs_hp_02.cc b/tests/fail/vectors_rhs_hp_02.cc
index 5e94096d34..817edec225 100644
--- a/tests/fail/vectors_rhs_hp_02.cc
+++ b/tests/fail/vectors_rhs_hp_02.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_raviart_thomas.h>
diff --git a/tests/hp/continuous_1d_01.cc b/tests/hp/continuous_1d_01.cc
index 533a983b82..598a12d565 100644
--- a/tests/hp/continuous_1d_01.cc
+++ b/tests/hp/continuous_1d_01.cc
@@ -23,7 +23,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
 
diff --git a/tests/hp/continuous_2d_01.cc b/tests/hp/continuous_2d_01.cc
index 1b148c6ade..614c46c700 100644
--- a/tests/hp/continuous_2d_01.cc
+++ b/tests/hp/continuous_2d_01.cc
@@ -23,7 +23,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
 
diff --git a/tests/hp/continuous_3d_01.cc b/tests/hp/continuous_3d_01.cc
index 7c758cf2da..9646cf81ac 100644
--- a/tests/hp/continuous_3d_01.cc
+++ b/tests/hp/continuous_3d_01.cc
@@ -23,7 +23,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
 
diff --git a/tests/hp/crash_01.cc b/tests/hp/crash_01.cc
index 8df8843440..30cd772b27 100644
--- a/tests/hp/crash_01.cc
+++ b/tests/hp/crash_01.cc
@@ -22,7 +22,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_dgq.h>
 
diff --git a/tests/hp/crash_02.cc b/tests/hp/crash_02.cc
index e9f8c1e4c2..b07b1bc3c6 100644
--- a/tests/hp/crash_02.cc
+++ b/tests/hp/crash_02.cc
@@ -24,7 +24,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_dgq.h>
 
diff --git a/tests/hp/crash_03.cc b/tests/hp/crash_03.cc
index ae91f50c31..a262926fe3 100644
--- a/tests/hp/crash_03.cc
+++ b/tests/hp/crash_03.cc
@@ -22,7 +22,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_dgq.h>
 
diff --git a/tests/hp/crash_04.cc b/tests/hp/crash_04.cc
index 8330eb0903..f982c527a6 100644
--- a/tests/hp/crash_04.cc
+++ b/tests/hp/crash_04.cc
@@ -21,7 +21,7 @@
 #include <grid/tria.h>
 #include <grid/grid_generator.h>
 #include <grid/tria_accessor.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <fe/fe_dgq.h>
 #include <numerics/derivative_approximation.h>
 
diff --git a/tests/hp/crash_05.cc b/tests/hp/crash_05.cc
index 5ebae816c3..ccc15371d7 100644
--- a/tests/hp/crash_05.cc
+++ b/tests/hp/crash_05.cc
@@ -22,7 +22,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
 
diff --git a/tests/hp/crash_06.cc b/tests/hp/crash_06.cc
index a68005c4ab..090e14d5a4 100644
--- a/tests/hp/crash_06.cc
+++ b/tests/hp/crash_06.cc
@@ -25,7 +25,7 @@ char logname[] = "crash_06/output";
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
diff --git a/tests/hp/crash_07.cc b/tests/hp/crash_07.cc
index fb91c85ff3..5c26fbc516 100644
--- a/tests/hp/crash_07.cc
+++ b/tests/hp/crash_07.cc
@@ -25,7 +25,7 @@ char logname[] = "crash_07/output";
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
diff --git a/tests/hp/crash_08.cc b/tests/hp/crash_08.cc
index a7df9124e5..0b44406bf4 100644
--- a/tests/hp/crash_08.cc
+++ b/tests/hp/crash_08.cc
@@ -26,7 +26,7 @@ char logname[] = "crash_08/output";
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
diff --git a/tests/hp/crash_09.cc b/tests/hp/crash_09.cc
index 5bfd8fae61..e8fd9ec38f 100644
--- a/tests/hp/crash_09.cc
+++ b/tests/hp/crash_09.cc
@@ -25,7 +25,7 @@ char logname[] = "crash_09/output";
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
diff --git a/tests/hp/crash_11.cc b/tests/hp/crash_11.cc
index 5d0020f290..cea0e2bf3b 100644
--- a/tests/hp/crash_11.cc
+++ b/tests/hp/crash_11.cc
@@ -25,7 +25,7 @@ char logname[] = "crash_11/output";
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
diff --git a/tests/hp/crash_12.cc b/tests/hp/crash_12.cc
index a836d4c4e6..d913cb9646 100644
--- a/tests/hp/crash_12.cc
+++ b/tests/hp/crash_12.cc
@@ -33,7 +33,7 @@ char logname[] = "crash_12/output";
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
diff --git a/tests/hp/crash_14.cc b/tests/hp/crash_14.cc
index 52cb1728fc..6b962080c8 100644
--- a/tests/hp/crash_14.cc
+++ b/tests/hp/crash_14.cc
@@ -24,7 +24,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
 #include <fe/fe_dgq.h>
diff --git a/tests/hp/crash_15.cc b/tests/hp/crash_15.cc
index 30f4cc0608..691432929c 100644
--- a/tests/hp/crash_15.cc
+++ b/tests/hp/crash_15.cc
@@ -29,7 +29,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
 #include <fe/fe_dgq.h>
diff --git a/tests/hp/crash_16.cc b/tests/hp/crash_16.cc
index aa976e3fd7..d39cbe1ea5 100644
--- a/tests/hp/crash_16.cc
+++ b/tests/hp/crash_16.cc
@@ -26,7 +26,7 @@ char logname[] = "crash_16/output";
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
diff --git a/tests/hp/hp_constraints_common.h b/tests/hp/hp_constraints_common.h
index 08c13dd366..0b1a4a3d92 100644
--- a/tests/hp/hp_constraints_common.h
+++ b/tests/hp/hp_constraints_common.h
@@ -22,7 +22,7 @@
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
diff --git a/tests/hp/hp_dof_handler.cc b/tests/hp/hp_dof_handler.cc
index 3747c74432..6aa0c68a01 100644
--- a/tests/hp/hp_dof_handler.cc
+++ b/tests/hp/hp_dof_handler.cc
@@ -22,7 +22,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <fe/fe_dgq.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 
 #include <fstream>
 
diff --git a/tests/hp/hp_hanging_nodes_01.cc b/tests/hp/hp_hanging_nodes_01.cc
index c69398e450..9bd89f44ba 100644
--- a/tests/hp/hp_hanging_nodes_01.cc
+++ b/tests/hp/hp_hanging_nodes_01.cc
@@ -12,7 +12,7 @@
 #include "../tests.h"
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_out.h>
 
diff --git a/tests/hp/hp_hanging_nodes_02.cc b/tests/hp/hp_hanging_nodes_02.cc
index 27847fd3be..17bba2d118 100644
--- a/tests/hp/hp_hanging_nodes_02.cc
+++ b/tests/hp/hp_hanging_nodes_02.cc
@@ -31,7 +31,7 @@
 
 #include <dofs/dof_tools.h>
 
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <base/quadrature_lib.h>
 
 #include <base/function.h>
diff --git a/tests/hp/integrate_difference.cc b/tests/hp/integrate_difference.cc
index 0c3c03651d..9ea2e7059a 100644
--- a/tests/hp/integrate_difference.cc
+++ b/tests/hp/integrate_difference.cc
@@ -26,7 +26,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_collection.h>
 #include <fe/q_collection.h>
diff --git a/tests/hp/interpolate_dgq_01.cc b/tests/hp/interpolate_dgq_01.cc
index e02bee9098..8ec8b0d820 100644
--- a/tests/hp/interpolate_dgq_01.cc
+++ b/tests/hp/interpolate_dgq_01.cc
@@ -22,7 +22,7 @@
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/interpolate_dgq_02.cc b/tests/hp/interpolate_dgq_02.cc
index 418703417e..d4aef7f6e3 100644
--- a/tests/hp/interpolate_dgq_02.cc
+++ b/tests/hp/interpolate_dgq_02.cc
@@ -22,7 +22,7 @@
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
diff --git a/tests/hp/interpolate_q_01.cc b/tests/hp/interpolate_q_01.cc
index 3911655ce7..fd48b4dd11 100644
--- a/tests/hp/interpolate_q_01.cc
+++ b/tests/hp/interpolate_q_01.cc
@@ -22,7 +22,7 @@
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/interpolate_q_02.cc b/tests/hp/interpolate_q_02.cc
index af6f4d53a7..5cc66aa2eb 100644
--- a/tests/hp/interpolate_q_02.cc
+++ b/tests/hp/interpolate_q_02.cc
@@ -22,7 +22,7 @@
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
diff --git a/tests/hp/interpolate_q_system_01.cc b/tests/hp/interpolate_q_system_01.cc
index a747a1d8cb..996d4c023c 100644
--- a/tests/hp/interpolate_q_system_01.cc
+++ b/tests/hp/interpolate_q_system_01.cc
@@ -22,7 +22,7 @@
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/interpolate_q_system_02.cc b/tests/hp/interpolate_q_system_02.cc
index a5797fd29f..5d7e352154 100644
--- a/tests/hp/interpolate_q_system_02.cc
+++ b/tests/hp/interpolate_q_system_02.cc
@@ -22,7 +22,7 @@
 #include <lac/vector.h>
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
diff --git a/tests/hp/matrices.cc b/tests/hp/matrices.cc
index f0e133f070..977ea2b831 100644
--- a/tests/hp/matrices.cc
+++ b/tests/hp/matrices.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/matrices_hp.cc b/tests/hp/matrices_hp.cc
index c574e8f5c6..1292b33b25 100644
--- a/tests/hp/matrices_hp.cc
+++ b/tests/hp/matrices_hp.cc
@@ -25,7 +25,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/n_active_fe_indices.cc b/tests/hp/n_active_fe_indices.cc
index 56754633c2..acb108b5f8 100644
--- a/tests/hp/n_active_fe_indices.cc
+++ b/tests/hp/n_active_fe_indices.cc
@@ -23,7 +23,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
 
diff --git a/tests/hp/n_dofs.cc b/tests/hp/n_dofs.cc
index 5cc104bf69..d0bd8303fd 100644
--- a/tests/hp/n_dofs.cc
+++ b/tests/hp/n_dofs.cc
@@ -24,7 +24,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
 #include <fe/fe_dgq.h>
diff --git a/tests/hp/random.cc b/tests/hp/random.cc
index a9354163c0..9445f27589 100644
--- a/tests/hp/random.cc
+++ b/tests/hp/random.cc
@@ -23,7 +23,7 @@
 #include <grid/tria_accessor.h>
 #include <grid/grid_out.h>
 #include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
 
diff --git a/tests/hp/step-10.cc b/tests/hp/step-10.cc
index 2df1686e42..782890bb34 100644
--- a/tests/hp/step-10.cc
+++ b/tests/hp/step-10.cc
@@ -29,10 +29,10 @@ std::ofstream logfile("step-10/output");
 #include <grid/tria_boundary_lib.h>
 #include <grid/tria.h>
 #include <grid/grid_out.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 
 #include <fe/mapping_q.h>
 
diff --git a/tests/hp/step-11.cc b/tests/hp/step-11.cc
index 258ea26508..bec4a2ec49 100644
--- a/tests/hp/step-11.cc
+++ b/tests/hp/step-11.cc
@@ -39,7 +39,7 @@ std::ofstream logfile("step-11/output");
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/mapping_q.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
diff --git a/tests/hp/step-12.cc b/tests/hp/step-12.cc
index 525d9ac9cf..8a82fce615 100644
--- a/tests/hp/step-12.cc
+++ b/tests/hp/step-12.cc
@@ -30,7 +30,7 @@ std::ofstream logfile("step-12/output");
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
diff --git a/tests/hp/step-13.cc b/tests/hp/step-13.cc
index b20d3616fb..337f6fedcb 100644
--- a/tests/hp/step-13.cc
+++ b/tests/hp/step-13.cc
@@ -41,7 +41,7 @@ std::ofstream logfile("step-13/output");
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/hp/step-2.cc b/tests/hp/step-2.cc
index 5c620e80fa..df5f2a11c1 100644
--- a/tests/hp/step-2.cc
+++ b/tests/hp/step-2.cc
@@ -22,7 +22,7 @@
 #include <grid/grid_generator.h>
 #include <grid/tria_boundary_lib.h>
 
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 
 #include <fe/fe_q.h>
 #include <dofs/dof_tools.h>
diff --git a/tests/hp/step-3.cc b/tests/hp/step-3.cc
index 4d244c5f2b..41ee12ae86 100644
--- a/tests/hp/step-3.cc
+++ b/tests/hp/step-3.cc
@@ -29,7 +29,7 @@
 
 #include <dofs/dof_tools.h>
 
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <base/quadrature_lib.h>
 
 #include <base/function.h>
diff --git a/tests/hp/step-3a.cc b/tests/hp/step-3a.cc
index 34a6792424..2c9523f23e 100644
--- a/tests/hp/step-3a.cc
+++ b/tests/hp/step-3a.cc
@@ -32,7 +32,7 @@
 
 #include <dofs/dof_tools.h>
 
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <base/quadrature_lib.h>
 
 #include <base/function.h>
diff --git a/tests/hp/step-3b.cc b/tests/hp/step-3b.cc
index aaff7dd103..d0b436849f 100644
--- a/tests/hp/step-3b.cc
+++ b/tests/hp/step-3b.cc
@@ -32,7 +32,7 @@
 
 #include <dofs/dof_tools.h>
 
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <base/quadrature_lib.h>
 
 #include <base/function.h>
diff --git a/tests/hp/step-3c.cc b/tests/hp/step-3c.cc
index a7bebd3992..452fe0cb1e 100644
--- a/tests/hp/step-3c.cc
+++ b/tests/hp/step-3c.cc
@@ -31,7 +31,7 @@
 
 #include <dofs/dof_tools.h>
 
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <base/quadrature_lib.h>
 
 #include <base/function.h>
diff --git a/tests/hp/step-4.cc b/tests/hp/step-4.cc
index eae51093ba..74f6d8d125 100644
--- a/tests/hp/step-4.cc
+++ b/tests/hp/step-4.cc
@@ -22,14 +22,14 @@ std::ofstream logfile("step-4/output");
 
 
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <dofs/dof_accessor.h>
 #include <fe/fe_q.h>
 #include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <base/quadrature_lib.h>
 #include <base/function.h>
 #include <numerics/vectors.h>
diff --git a/tests/hp/step-5.cc b/tests/hp/step-5.cc
index 958252eadf..aab179974b 100644
--- a/tests/hp/step-5.cc
+++ b/tests/hp/step-5.cc
@@ -30,13 +30,13 @@ std::ofstream logfile("step-5/output");
 #include <lac/solver_cg.h>
 #include <lac/precondition.h>
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/hp/step-6.cc b/tests/hp/step-6.cc
index bac8358462..03a38af605 100644
--- a/tests/hp/step-6.cc
+++ b/tests/hp/step-6.cc
@@ -30,14 +30,14 @@ std::ofstream logfile("step-6/output");
 #include <lac/solver_cg.h>
 #include <lac/precondition.h>
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/hp/step-7.cc b/tests/hp/step-7.cc
index 4fd2a9f361..ae17514638 100644
--- a/tests/hp/step-7.cc
+++ b/tests/hp/step-7.cc
@@ -35,7 +35,7 @@ std::ofstream logfile("step-7/output");
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
@@ -48,7 +48,7 @@ std::ofstream logfile("step-7/output");
 #include <base/smartpointer.h>
 #include <numerics/vectors.h>
 #include <base/convergence_table.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 
 #include <typeinfo>
 #include <fstream>
diff --git a/tests/hp/step-8.cc b/tests/hp/step-8.cc
index 9c6529f174..27ccae5ae8 100644
--- a/tests/hp/step-8.cc
+++ b/tests/hp/step-8.cc
@@ -35,10 +35,10 @@ std::ofstream logfile("step-8/output");
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/hp/step-9.cc b/tests/hp/step-9.cc
index caf2825a78..f3cc16aae5 100644
--- a/tests/hp/step-9.cc
+++ b/tests/hp/step-9.cc
@@ -35,11 +35,11 @@ std::ofstream logfile("step-9/output");
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
diff --git a/tests/hp/vectors_boundary_rhs_01.cc b/tests/hp/vectors_boundary_rhs_01.cc
index 29b6980f56..0279039bee 100644
--- a/tests/hp/vectors_boundary_rhs_01.cc
+++ b/tests/hp/vectors_boundary_rhs_01.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/vectors_boundary_rhs_02.cc b/tests/hp/vectors_boundary_rhs_02.cc
index a3f5fb43ef..4065a92472 100644
--- a/tests/hp/vectors_boundary_rhs_02.cc
+++ b/tests/hp/vectors_boundary_rhs_02.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_raviart_thomas.h>
diff --git a/tests/hp/vectors_boundary_rhs_03.cc b/tests/hp/vectors_boundary_rhs_03.cc
index 7d576ca549..6713c3ca07 100644
--- a/tests/hp/vectors_boundary_rhs_03.cc
+++ b/tests/hp/vectors_boundary_rhs_03.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/vectors_boundary_rhs_hp_01.cc b/tests/hp/vectors_boundary_rhs_hp_01.cc
index 9aad85ff3a..87e716e422 100644
--- a/tests/hp/vectors_boundary_rhs_hp_01.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_01.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/vectors_boundary_rhs_hp_03.cc b/tests/hp/vectors_boundary_rhs_hp_03.cc
index f9d858094b..e5e01b2b00 100644
--- a/tests/hp/vectors_boundary_rhs_hp_03.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_03.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/vectors_point_source_01.cc b/tests/hp/vectors_point_source_01.cc
index c65bea915d..f779821199 100644
--- a/tests/hp/vectors_point_source_01.cc
+++ b/tests/hp/vectors_point_source_01.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/vectors_point_source_hp_01.cc b/tests/hp/vectors_point_source_hp_01.cc
index f55aea763f..e0b0037161 100644
--- a/tests/hp/vectors_point_source_hp_01.cc
+++ b/tests/hp/vectors_point_source_hp_01.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/vectors_rhs_01.cc b/tests/hp/vectors_rhs_01.cc
index bb48315080..824dfdd7b4 100644
--- a/tests/hp/vectors_rhs_01.cc
+++ b/tests/hp/vectors_rhs_01.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/vectors_rhs_02.cc b/tests/hp/vectors_rhs_02.cc
index 19730e17d0..b8ca612b31 100644
--- a/tests/hp/vectors_rhs_02.cc
+++ b/tests/hp/vectors_rhs_02.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_raviart_thomas.h>
diff --git a/tests/hp/vectors_rhs_03.cc b/tests/hp/vectors_rhs_03.cc
index 4dfebdfe35..cc0cfe6072 100644
--- a/tests/hp/vectors_rhs_03.cc
+++ b/tests/hp/vectors_rhs_03.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/vectors_rhs_hp_01.cc b/tests/hp/vectors_rhs_hp_01.cc
index d37934e573..845b22edb8 100644
--- a/tests/hp/vectors_rhs_hp_01.cc
+++ b/tests/hp/vectors_rhs_hp_01.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/vectors_rhs_hp_03.cc b/tests/hp/vectors_rhs_hp_03.cc
index 92b5b3721a..e465f51086 100644
--- a/tests/hp/vectors_rhs_hp_03.cc
+++ b/tests/hp/vectors_rhs_hp_03.cc
@@ -27,7 +27,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>