From: kronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 4 Mar 2009 22:15:32 +0000 (+0000)
Subject: Also update all the tests that use the ConstraintMatrix to the new file name.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16bdb4a6d7e47d753d9d767b92c97f2ebfec1379;p=dealii-svn.git

Also update all the tests that use the ConstraintMatrix to the new file name.

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

diff --git a/tests/benchmarks/spec2006-447.dealII.cc b/tests/benchmarks/spec2006-447.dealII.cc
index 617b60d228..248002472a 100644
--- a/tests/benchmarks/spec2006-447.dealII.cc
+++ b/tests/benchmarks/spec2006-447.dealII.cc
@@ -33,7 +33,7 @@
 #include <grid/tria_boundary_lib.h>
 #include <grid/intergrid_map.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
diff --git a/tests/bits/block_sparse_matrix_iterator_01.cc b/tests/bits/block_sparse_matrix_iterator_01.cc
index 43c537e3a7..46e09566c6 100644
--- a/tests/bits/block_sparse_matrix_iterator_01.cc
+++ b/tests/bits/block_sparse_matrix_iterator_01.cc
@@ -26,7 +26,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/block_sparse_matrix_iterator_02.cc b/tests/bits/block_sparse_matrix_iterator_02.cc
index 57cdfaaff1..c6db5a8b2e 100644
--- a/tests/bits/block_sparse_matrix_iterator_02.cc
+++ b/tests/bits/block_sparse_matrix_iterator_02.cc
@@ -27,7 +27,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/block_sparse_matrix_iterator_03.cc b/tests/bits/block_sparse_matrix_iterator_03.cc
index d7a7752a7b..6f050a00eb 100644
--- a/tests/bits/block_sparse_matrix_iterator_03.cc
+++ b/tests/bits/block_sparse_matrix_iterator_03.cc
@@ -26,7 +26,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/christian_1.cc b/tests/bits/christian_1.cc
index a3c302f12c..7ad8c9896d 100644
--- a/tests/bits/christian_1.cc
+++ b/tests/bits/christian_1.cc
@@ -21,7 +21,7 @@
 #include <fe/fe.h>
 #include <fe/fe_q.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 #include <numerics/data_out.h>
 #include <numerics/vectors.h>
diff --git a/tests/bits/data_out_curved_cells.cc b/tests/bits/data_out_curved_cells.cc
index 8ca9847374..38f9b79b25 100644
--- a/tests/bits/data_out_curved_cells.cc
+++ b/tests/bits/data_out_curved_cells.cc
@@ -38,7 +38,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/mapping_q1.h>
 #include <fe/mapping_q_eulerian.h>
 #include <fe/fe_q.h>
diff --git a/tests/bits/dof_constraints_01.cc b/tests/bits/dof_constraints_01.cc
index b4ccce0774..87e9a05a00 100644
--- a/tests/bits/dof_constraints_01.cc
+++ b/tests/bits/dof_constraints_01.cc
@@ -26,7 +26,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_02.cc b/tests/bits/dof_constraints_02.cc
index cf2ac65334..e47a9bf17e 100644
--- a/tests/bits/dof_constraints_02.cc
+++ b/tests/bits/dof_constraints_02.cc
@@ -24,7 +24,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_03.cc b/tests/bits/dof_constraints_03.cc
index c4a86f164c..83426064da 100644
--- a/tests/bits/dof_constraints_03.cc
+++ b/tests/bits/dof_constraints_03.cc
@@ -29,7 +29,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_04.cc b/tests/bits/dof_constraints_04.cc
index 601329517b..a4fd47cc97 100644
--- a/tests/bits/dof_constraints_04.cc
+++ b/tests/bits/dof_constraints_04.cc
@@ -27,7 +27,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_05.cc b/tests/bits/dof_constraints_05.cc
index 6372fc5fc6..ff8c021836 100644
--- a/tests/bits/dof_constraints_05.cc
+++ b/tests/bits/dof_constraints_05.cc
@@ -27,7 +27,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_06.cc b/tests/bits/dof_constraints_06.cc
index 77160bff3f..2dc684827d 100644
--- a/tests/bits/dof_constraints_06.cc
+++ b/tests/bits/dof_constraints_06.cc
@@ -25,7 +25,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_06_x.cc b/tests/bits/dof_constraints_06_x.cc
index 4912ed384b..02bcdbc305 100644
--- a/tests/bits/dof_constraints_06_x.cc
+++ b/tests/bits/dof_constraints_06_x.cc
@@ -25,7 +25,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_07.cc b/tests/bits/dof_constraints_07.cc
index 59ec1ecb5c..b022275a39 100644
--- a/tests/bits/dof_constraints_07.cc
+++ b/tests/bits/dof_constraints_07.cc
@@ -28,7 +28,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_08.cc b/tests/bits/dof_constraints_08.cc
index 0b0ee88914..f0620a1587 100644
--- a/tests/bits/dof_constraints_08.cc
+++ b/tests/bits/dof_constraints_08.cc
@@ -28,7 +28,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_09.cc b/tests/bits/dof_constraints_09.cc
index f28d5666ef..dd0f028413 100644
--- a/tests/bits/dof_constraints_09.cc
+++ b/tests/bits/dof_constraints_09.cc
@@ -29,7 +29,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_10.cc b/tests/bits/dof_constraints_10.cc
index d1767bd937..42c6797687 100644
--- a/tests/bits/dof_constraints_10.cc
+++ b/tests/bits/dof_constraints_10.cc
@@ -27,7 +27,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_10_x.cc b/tests/bits/dof_constraints_10_x.cc
index 51d7395c3d..0b2717f598 100644
--- a/tests/bits/dof_constraints_10_x.cc
+++ b/tests/bits/dof_constraints_10_x.cc
@@ -27,7 +27,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_11.cc b/tests/bits/dof_constraints_11.cc
index b51f5eb4a8..e9d88a4faf 100644
--- a/tests/bits/dof_constraints_11.cc
+++ b/tests/bits/dof_constraints_11.cc
@@ -28,7 +28,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_constraints_11_x.cc b/tests/bits/dof_constraints_11_x.cc
index 2983bae80a..ccc1fbda0c 100644
--- a/tests/bits/dof_constraints_11_x.cc
+++ b/tests/bits/dof_constraints_11_x.cc
@@ -28,7 +28,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fstream>
 #include <iomanip>
diff --git a/tests/bits/dof_tools_03.cc b/tests/bits/dof_tools_03.cc
index fee3c0aede..81f225354a 100644
--- a/tests/bits/dof_tools_03.cc
+++ b/tests/bits/dof_tools_03.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include "dof_tools_common.cc"
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <lac/vector.h>
 
 // check
diff --git a/tests/bits/dof_tools_19.cc b/tests/bits/dof_tools_19.cc
index 48bc7fc487..52b7691ea9 100644
--- a/tests/bits/dof_tools_19.cc
+++ b/tests/bits/dof_tools_19.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include "dof_tools_common.cc"
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <base/function.h>
 #include <base/quadrature_lib.h>
 #include <numerics/vectors.h>
diff --git a/tests/bits/face_orientation_and_fe_nedelec_01.cc b/tests/bits/face_orientation_and_fe_nedelec_01.cc
index 51e5f56051..68282b2d48 100644
--- a/tests/bits/face_orientation_and_fe_nedelec_01.cc
+++ b/tests/bits/face_orientation_and_fe_nedelec_01.cc
@@ -28,7 +28,7 @@ char logname[] = "face_orientation_and_fe_nedelec_01/output";
 
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/bits/face_orientation_and_fe_q_01.cc b/tests/bits/face_orientation_and_fe_q_01.cc
index abbfa1f2d2..926de02de6 100644
--- a/tests/bits/face_orientation_and_fe_q_01.cc
+++ b/tests/bits/face_orientation_and_fe_q_01.cc
@@ -31,7 +31,7 @@ char logname[] = "face_orientation_and_fe_q_01/output";
 
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/bits/face_orientation_and_fe_q_02.cc b/tests/bits/face_orientation_and_fe_q_02.cc
index c0b8fc0d64..41033f59bf 100644
--- a/tests/bits/face_orientation_and_fe_q_02.cc
+++ b/tests/bits/face_orientation_and_fe_q_02.cc
@@ -28,7 +28,7 @@ char logname[] = "face_orientation_and_fe_q_02/output";
 
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/bits/face_orientation_crash.cc b/tests/bits/face_orientation_crash.cc
index 2bbd697799..a6eec5e18f 100644
--- a/tests/bits/face_orientation_crash.cc
+++ b/tests/bits/face_orientation_crash.cc
@@ -27,7 +27,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/mapping_q.h>
 #include <numerics/vectors.h>
diff --git a/tests/bits/fe_q_constraints.cc b/tests/bits/fe_q_constraints.cc
index 2acd831430..6ab305dd24 100644
--- a/tests/bits/fe_q_constraints.cc
+++ b/tests/bits/fe_q_constraints.cc
@@ -31,7 +31,7 @@
 
 #include <numerics/vectors.h>
 
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
diff --git a/tests/bits/fe_tools_common.cc b/tests/bits/fe_tools_common.cc
index d2d5325d8c..ad82322b4c 100644
--- a/tests/bits/fe_tools_common.cc
+++ b/tests/bits/fe_tools_common.cc
@@ -22,7 +22,7 @@
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <lac/vector.h>
 #include <fe/fe_q.h>
 #include <fe/fe_dgq.h>
diff --git a/tests/bits/joa_1.cc b/tests/bits/joa_1.cc
index d97f5fa126..23348a12b1 100644
--- a/tests/bits/joa_1.cc
+++ b/tests/bits/joa_1.cc
@@ -78,7 +78,7 @@
 				 // following file contains a class
 				 // which is used to handle these
 				 // constraints:
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 
 				 // In order to refine our grids
 				 // locally, we need a function from
diff --git a/tests/bits/rt_2.cc b/tests/bits/rt_2.cc
index 6841d605be..555db2c030 100644
--- a/tests/bits/rt_2.cc
+++ b/tests/bits/rt_2.cc
@@ -35,7 +35,7 @@
 #include <lac/vector.h>
 #include <base/function.h>
 #include <base/quadrature_lib.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 
 #include <fe/fe_system.h>
diff --git a/tests/bits/step-11.cc b/tests/bits/step-11.cc
index c71267acc0..d545bc77ee 100644
--- a/tests/bits/step-11.cc
+++ b/tests/bits/step-11.cc
@@ -35,7 +35,7 @@ std::ofstream logfile("step-11/output");
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
diff --git a/tests/bits/step-13.cc b/tests/bits/step-13.cc
index cf75596fd6..9bc6809010 100644
--- a/tests/bits/step-13.cc
+++ b/tests/bits/step-13.cc
@@ -38,7 +38,7 @@ std::ofstream logfile("step-13/output");
 #include <grid/tria_iterator.h>
 #include <grid/grid_refinement.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
diff --git a/tests/bits/step-14.cc b/tests/bits/step-14.cc
index c188700973..c31e700eff 100644
--- a/tests/bits/step-14.cc
+++ b/tests/bits/step-14.cc
@@ -38,7 +38,7 @@ std::ofstream logfile("step-14/output");
 #include <grid/tria_iterator.h>
 #include <grid/grid_refinement.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
diff --git a/tests/bits/step-15.cc b/tests/bits/step-15.cc
index b47f47c29b..d9761a95d6 100644
--- a/tests/bits/step-15.cc
+++ b/tests/bits/step-15.cc
@@ -37,7 +37,7 @@ std::ofstream logfile("step-15/output");
 #include <grid/tria_boundary_lib.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
 #include <fe/fe_values.h>
diff --git a/tests/bits/step-6.cc b/tests/bits/step-6.cc
index 671ca9cb2e..2815a27c29 100644
--- a/tests/bits/step-6.cc
+++ b/tests/bits/step-6.cc
@@ -50,7 +50,7 @@ std::ofstream logfile("step-6/output");
 #include <grid/grid_out.h>
 
 
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 
 #include <grid/grid_refinement.h>
 
diff --git a/tests/bits/step-7.cc b/tests/bits/step-7.cc
index 3d4e74197d..3336c0b02d 100644
--- a/tests/bits/step-7.cc
+++ b/tests/bits/step-7.cc
@@ -37,7 +37,7 @@ std::ofstream logfile("step-7/output");
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
diff --git a/tests/bits/step-8.cc b/tests/bits/step-8.cc
index b37844af91..03758a5782 100644
--- a/tests/bits/step-8.cc
+++ b/tests/bits/step-8.cc
@@ -43,7 +43,7 @@ std::ofstream logfile("step-8/output");
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <numerics/error_estimator.h>
 
 #include <fe/fe_system.h>
diff --git a/tests/bits/step-9.cc b/tests/bits/step-9.cc
index 1f0a8fc55e..f1db09e3ad 100644
--- a/tests/bits/step-9.cc
+++ b/tests/bits/step-9.cc
@@ -39,7 +39,7 @@ std::ofstream logfile("step-9/output");
 #include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
diff --git a/tests/codim_one/gradients.cc b/tests/codim_one/gradients.cc
index a05ab7f71c..95557f3be4 100644
--- a/tests/codim_one/gradients.cc
+++ b/tests/codim_one/gradients.cc
@@ -30,7 +30,7 @@
 #include <base/quadrature_lib.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/mapping.h>
 #include <fe/mapping_q1.h>
 #include <fe/fe_dgq.h>
diff --git a/tests/codim_one/projection.cc b/tests/codim_one/projection.cc
index 6810489a60..8fd2fe5053 100644
--- a/tests/codim_one/projection.cc
+++ b/tests/codim_one/projection.cc
@@ -30,7 +30,7 @@
 #include <base/quadrature_lib.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <numerics/vectors.h>
 #include <numerics/data_out.h>
 #include <base/function.h>
diff --git a/tests/codim_one/projection_dgp.cc b/tests/codim_one/projection_dgp.cc
index a2d9051d79..f39963761a 100644
--- a/tests/codim_one/projection_dgp.cc
+++ b/tests/codim_one/projection_dgp.cc
@@ -31,7 +31,7 @@
 #include <base/quadrature_lib.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <numerics/vectors.h>
 #include <numerics/data_out.h>
 #include <base/function.h>
diff --git a/tests/deal.II/constraint_graph.cc b/tests/deal.II/constraint_graph.cc
index b42968fbd6..6ba330e877 100644
--- a/tests/deal.II/constraint_graph.cc
+++ b/tests/deal.II/constraint_graph.cc
@@ -25,7 +25,7 @@
 #include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 
 #include <fstream>
diff --git a/tests/deal.II/constraint_graph_zero.cc b/tests/deal.II/constraint_graph_zero.cc
index 42785391e6..f0ac546192 100644
--- a/tests/deal.II/constraint_graph_zero.cc
+++ b/tests/deal.II/constraint_graph_zero.cc
@@ -23,7 +23,7 @@
 
 #include "../tests.h"
 #include <base/logstream.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 
 #include <fstream>
 
diff --git a/tests/deal.II/constraints.cc b/tests/deal.II/constraints.cc
index f254ebdba1..5190fb37a8 100644
--- a/tests/deal.II/constraints.cc
+++ b/tests/deal.II/constraints.cc
@@ -25,7 +25,7 @@
 #include <lac/sparse_matrix.h>
 #include <base/parameter_handler.h>
 #include <dofs/dof_accessor.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 #include <grid/grid_out.h>
 #include <base/logstream.h>
diff --git a/tests/deal.II/constraints_zero.cc b/tests/deal.II/constraints_zero.cc
index efda48faf8..e8dd6d7e53 100644
--- a/tests/deal.II/constraints_zero.cc
+++ b/tests/deal.II/constraints_zero.cc
@@ -23,7 +23,7 @@
 
 #include "../tests.h"
 #include <base/logstream.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 
 #include <fstream>
 
diff --git a/tests/deal.II/constraints_zero_condense.cc b/tests/deal.II/constraints_zero_condense.cc
index a51f272001..594bdceef8 100644
--- a/tests/deal.II/constraints_zero_condense.cc
+++ b/tests/deal.II/constraints_zero_condense.cc
@@ -20,7 +20,7 @@
 
 #include "../tests.h"
 #include <base/logstream.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <lac/sparse_matrix.h>
 
 #include <fstream>
diff --git a/tests/deal.II/constraints_zero_merge.cc b/tests/deal.II/constraints_zero_merge.cc
index a0fe8a4667..69f427561a 100644
--- a/tests/deal.II/constraints_zero_merge.cc
+++ b/tests/deal.II/constraints_zero_merge.cc
@@ -20,7 +20,7 @@
 
 #include "../tests.h"
 #include <base/logstream.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 
 #include <fstream>
 
diff --git a/tests/deal.II/create_laplace_matrix_01.cc b/tests/deal.II/create_laplace_matrix_01.cc
index 01eb24db10..ce2cf4d623 100644
--- a/tests/deal.II/create_laplace_matrix_01.cc
+++ b/tests/deal.II/create_laplace_matrix_01.cc
@@ -37,7 +37,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_laplace_matrix_01b.cc b/tests/deal.II/create_laplace_matrix_01b.cc
index ffbbdc4925..996db84cd7 100644
--- a/tests/deal.II/create_laplace_matrix_01b.cc
+++ b/tests/deal.II/create_laplace_matrix_01b.cc
@@ -38,7 +38,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_laplace_matrix_02.cc b/tests/deal.II/create_laplace_matrix_02.cc
index cf41f482a5..b4fbfc726d 100644
--- a/tests/deal.II/create_laplace_matrix_02.cc
+++ b/tests/deal.II/create_laplace_matrix_02.cc
@@ -37,7 +37,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_laplace_matrix_02b.cc b/tests/deal.II/create_laplace_matrix_02b.cc
index 07017394b4..37321c8582 100644
--- a/tests/deal.II/create_laplace_matrix_02b.cc
+++ b/tests/deal.II/create_laplace_matrix_02b.cc
@@ -38,7 +38,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_laplace_matrix_03.cc b/tests/deal.II/create_laplace_matrix_03.cc
index 2b3a7b33a2..c60aa5ce6d 100644
--- a/tests/deal.II/create_laplace_matrix_03.cc
+++ b/tests/deal.II/create_laplace_matrix_03.cc
@@ -37,7 +37,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_laplace_matrix_03b.cc b/tests/deal.II/create_laplace_matrix_03b.cc
index 8d6117d080..b24347ae1b 100644
--- a/tests/deal.II/create_laplace_matrix_03b.cc
+++ b/tests/deal.II/create_laplace_matrix_03b.cc
@@ -38,7 +38,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_laplace_matrix_04.cc b/tests/deal.II/create_laplace_matrix_04.cc
index ffcee29b9d..2f275d41ad 100644
--- a/tests/deal.II/create_laplace_matrix_04.cc
+++ b/tests/deal.II/create_laplace_matrix_04.cc
@@ -37,7 +37,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_laplace_matrix_04b.cc b/tests/deal.II/create_laplace_matrix_04b.cc
index 0c72f6da8e..f7a6bf7c7d 100644
--- a/tests/deal.II/create_laplace_matrix_04b.cc
+++ b/tests/deal.II/create_laplace_matrix_04b.cc
@@ -38,7 +38,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_mass_matrix_01.cc b/tests/deal.II/create_mass_matrix_01.cc
index e054cc6adc..1b6103db40 100644
--- a/tests/deal.II/create_mass_matrix_01.cc
+++ b/tests/deal.II/create_mass_matrix_01.cc
@@ -35,7 +35,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_mass_matrix_02.cc b/tests/deal.II/create_mass_matrix_02.cc
index be691e8ed4..c124c56b50 100644
--- a/tests/deal.II/create_mass_matrix_02.cc
+++ b/tests/deal.II/create_mass_matrix_02.cc
@@ -35,7 +35,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_mass_matrix_03.cc b/tests/deal.II/create_mass_matrix_03.cc
index e0c48103ce..2f84580a04 100644
--- a/tests/deal.II/create_mass_matrix_03.cc
+++ b/tests/deal.II/create_mass_matrix_03.cc
@@ -35,7 +35,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_mass_matrix_04.cc b/tests/deal.II/create_mass_matrix_04.cc
index 8826102230..33a7ea4566 100644
--- a/tests/deal.II/create_mass_matrix_04.cc
+++ b/tests/deal.II/create_mass_matrix_04.cc
@@ -35,7 +35,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/create_mass_matrix_05.cc b/tests/deal.II/create_mass_matrix_05.cc
index 2a33a5b4d4..45f639d467 100644
--- a/tests/deal.II/create_mass_matrix_05.cc
+++ b/tests/deal.II/create_mass_matrix_05.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/derivatives.cc b/tests/deal.II/derivatives.cc
index 7d151f9ef3..73dbcedcde 100644
--- a/tests/deal.II/derivatives.cc
+++ b/tests/deal.II/derivatives.cc
@@ -36,7 +36,7 @@ const bool errors = false;
 #include <grid/tria_iterator.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <fe/fe_q.h>
 #include <fe/fe_dgq.h>
diff --git a/tests/deal.II/dof_test.cc b/tests/deal.II/dof_test.cc
index 01169ff884..eae24f4dd7 100644
--- a/tests/deal.II/dof_test.cc
+++ b/tests/deal.II/dof_test.cc
@@ -21,7 +21,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <lac/sparse_matrix.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_renumbering.h>
 #include <dofs/dof_tools.h>
diff --git a/tests/deal.II/inhomogeneous_constraints.cc b/tests/deal.II/inhomogeneous_constraints.cc
index d0d58c7474..2345adc30e 100644
--- a/tests/deal.II/inhomogeneous_constraints.cc
+++ b/tests/deal.II/inhomogeneous_constraints.cc
@@ -37,7 +37,7 @@
 #include <grid/grid_refinement.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
diff --git a/tests/deal.II/inhomogeneous_constraints_block.cc b/tests/deal.II/inhomogeneous_constraints_block.cc
index f5c1dbc0d8..c1acbc970d 100644
--- a/tests/deal.II/inhomogeneous_constraints_block.cc
+++ b/tests/deal.II/inhomogeneous_constraints_block.cc
@@ -31,7 +31,7 @@
 #include <grid/grid_refinement.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_system.h>
 #include <fe/fe_values.h>
 #include <numerics/vectors.h>
diff --git a/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc b/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc
index 58635109dd..ff8f0afdf0 100644
--- a/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc
+++ b/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc
@@ -30,7 +30,7 @@
 #include <grid/grid_refinement.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_values.h>
 #include <numerics/vectors.h>
diff --git a/tests/deal.II/intergrid_constraints.cc b/tests/deal.II/intergrid_constraints.cc
index 95d74ef802..baf2062516 100644
--- a/tests/deal.II/intergrid_constraints.cc
+++ b/tests/deal.II/intergrid_constraints.cc
@@ -8,7 +8,7 @@
 #include <base/logstream.h>
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 #include <dofs/dof_renumbering.h>
 #include <grid/grid_generator.h>
diff --git a/tests/deal.II/interpolate_dgq_02.cc b/tests/deal.II/interpolate_dgq_02.cc
index 1d0755af06..0f7416580d 100644
--- a/tests/deal.II/interpolate_dgq_02.cc
+++ b/tests/deal.II/interpolate_dgq_02.cc
@@ -24,7 +24,7 @@
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/deal.II/interpolate_q_02.cc b/tests/deal.II/interpolate_q_02.cc
index ada8014229..7237af2930 100644
--- a/tests/deal.II/interpolate_q_02.cc
+++ b/tests/deal.II/interpolate_q_02.cc
@@ -24,7 +24,7 @@
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/deal.II/interpolate_q_system_02.cc b/tests/deal.II/interpolate_q_system_02.cc
index 4eed9cb3d5..dd4d8ea522 100644
--- a/tests/deal.II/interpolate_q_system_02.cc
+++ b/tests/deal.II/interpolate_q_system_02.cc
@@ -24,7 +24,7 @@
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/deal.II/matrices.cc b/tests/deal.II/matrices.cc
index b13be4c086..7af500d039 100644
--- a/tests/deal.II/matrices.cc
+++ b/tests/deal.II/matrices.cc
@@ -28,7 +28,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q.h>
diff --git a/tests/deal.II/no_flux_01.cc b/tests/deal.II/no_flux_01.cc
index baf60a7875..2279718e1a 100644
--- a/tests/deal.II/no_flux_01.cc
+++ b/tests/deal.II/no_flux_01.cc
@@ -23,7 +23,7 @@
 #include <lac/vector.h>
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q1.h>
diff --git a/tests/deal.II/no_flux_02.cc b/tests/deal.II/no_flux_02.cc
index 1f1094f3b0..a1456734e5 100644
--- a/tests/deal.II/no_flux_02.cc
+++ b/tests/deal.II/no_flux_02.cc
@@ -24,7 +24,7 @@
 #include <lac/vector.h>
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q1.h>
diff --git a/tests/deal.II/no_flux_03.cc b/tests/deal.II/no_flux_03.cc
index 74fef84764..9e00434ec0 100644
--- a/tests/deal.II/no_flux_03.cc
+++ b/tests/deal.II/no_flux_03.cc
@@ -26,7 +26,7 @@
 #include <grid/grid_generator.h>
 #include <grid/tria_boundary_lib.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q1.h>
diff --git a/tests/deal.II/no_flux_04.cc b/tests/deal.II/no_flux_04.cc
index fea281aaed..f6ed152f6d 100644
--- a/tests/deal.II/no_flux_04.cc
+++ b/tests/deal.II/no_flux_04.cc
@@ -27,7 +27,7 @@
 #include <grid/grid_generator.h>
 #include <grid/tria_boundary_lib.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <fe/mapping_q1.h>
diff --git a/tests/deal.II/project_01.cc b/tests/deal.II/project_01.cc
index 276cbe7852..55f9a811f8 100644
--- a/tests/deal.II/project_01.cc
+++ b/tests/deal.II/project_01.cc
@@ -23,7 +23,7 @@
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <numerics/vectors.h>
 #include <dofs/dof_accessor.h>
diff --git a/tests/deal.II/project_02.cc b/tests/deal.II/project_02.cc
index 4580c8baf9..1cef17af70 100644
--- a/tests/deal.II/project_02.cc
+++ b/tests/deal.II/project_02.cc
@@ -23,7 +23,7 @@
 #include <grid/grid_tools.h>
 #include <dofs/dof_handler.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <numerics/vectors.h>
 #include <dofs/dof_accessor.h>
diff --git a/tests/deal.II/project_common.cc b/tests/deal.II/project_common.cc
index 6ad5ad3d73..2df2f4ce3d 100644
--- a/tests/deal.II/project_common.cc
+++ b/tests/deal.II/project_common.cc
@@ -23,7 +23,7 @@
 
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/deal.II/sparsity_pattern.cc b/tests/deal.II/sparsity_pattern.cc
index 54ec5721cb..8e551ce043 100644
--- a/tests/deal.II/sparsity_pattern.cc
+++ b/tests/deal.II/sparsity_pattern.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 
diff --git a/tests/deal.II/sparsity_pattern_01.cc b/tests/deal.II/sparsity_pattern_01.cc
index f37af63b31..a52d09d44f 100644
--- a/tests/deal.II/sparsity_pattern_01.cc
+++ b/tests/deal.II/sparsity_pattern_01.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 
diff --git a/tests/deal.II/sparsity_pattern_01_x.cc b/tests/deal.II/sparsity_pattern_01_x.cc
index aeef424550..af081997ed 100644
--- a/tests/deal.II/sparsity_pattern_01_x.cc
+++ b/tests/deal.II/sparsity_pattern_01_x.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 
diff --git a/tests/deal.II/sparsity_pattern_02.cc b/tests/deal.II/sparsity_pattern_02.cc
index 7d490acfcb..f93d5aae17 100644
--- a/tests/deal.II/sparsity_pattern_02.cc
+++ b/tests/deal.II/sparsity_pattern_02.cc
@@ -28,7 +28,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 
diff --git a/tests/deal.II/sparsity_pattern_03.cc b/tests/deal.II/sparsity_pattern_03.cc
index 8a24b1159e..e979a852b1 100644
--- a/tests/deal.II/sparsity_pattern_03.cc
+++ b/tests/deal.II/sparsity_pattern_03.cc
@@ -30,7 +30,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_dgq.h>
 #include <fe/fe_system.h>
diff --git a/tests/deal.II/sparsity_pattern_04.cc b/tests/deal.II/sparsity_pattern_04.cc
index 0dc38f581f..ea4ff7cb1b 100644
--- a/tests/deal.II/sparsity_pattern_04.cc
+++ b/tests/deal.II/sparsity_pattern_04.cc
@@ -31,7 +31,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_dgq.h>
 #include <fe/fe_system.h>
diff --git a/tests/deal.II/sparsity_pattern_05.cc b/tests/deal.II/sparsity_pattern_05.cc
index 98b533dfbe..1167dd3d42 100644
--- a/tests/deal.II/sparsity_pattern_05.cc
+++ b/tests/deal.II/sparsity_pattern_05.cc
@@ -28,7 +28,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 
diff --git a/tests/deal.II/sparsity_pattern_05_x.cc b/tests/deal.II/sparsity_pattern_05_x.cc
index b6cc981756..cef84e4a86 100644
--- a/tests/deal.II/sparsity_pattern_05_x.cc
+++ b/tests/deal.II/sparsity_pattern_05_x.cc
@@ -28,7 +28,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 
diff --git a/tests/deal.II/sparsity_pattern_x.cc b/tests/deal.II/sparsity_pattern_x.cc
index 2b29eb916c..afe07a04ad 100644
--- a/tests/deal.II/sparsity_pattern_x.cc
+++ b/tests/deal.II/sparsity_pattern_x.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 
diff --git a/tests/deal.II/vectors_boundary_rhs_01.cc b/tests/deal.II/vectors_boundary_rhs_01.cc
index 23a58191ba..c1c9cf45bc 100644
--- a/tests/deal.II/vectors_boundary_rhs_01.cc
+++ b/tests/deal.II/vectors_boundary_rhs_01.cc
@@ -27,7 +27,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/deal.II/vectors_boundary_rhs_02.cc b/tests/deal.II/vectors_boundary_rhs_02.cc
index b639b8bb15..767a165a23 100644
--- a/tests/deal.II/vectors_boundary_rhs_02.cc
+++ b/tests/deal.II/vectors_boundary_rhs_02.cc
@@ -28,7 +28,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/deal.II/vectors_boundary_rhs_03.cc b/tests/deal.II/vectors_boundary_rhs_03.cc
index 922204969f..7275fdb4c5 100644
--- a/tests/deal.II/vectors_boundary_rhs_03.cc
+++ b/tests/deal.II/vectors_boundary_rhs_03.cc
@@ -28,7 +28,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/deal.II/vectors_point_source_01.cc b/tests/deal.II/vectors_point_source_01.cc
index 909739fc4c..3d12078b3a 100644
--- a/tests/deal.II/vectors_point_source_01.cc
+++ b/tests/deal.II/vectors_point_source_01.cc
@@ -28,7 +28,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/deal.II/vectors_rhs_01.cc b/tests/deal.II/vectors_rhs_01.cc
index 7e270a2a0d..2f1a1c52f8 100644
--- a/tests/deal.II/vectors_rhs_01.cc
+++ b/tests/deal.II/vectors_rhs_01.cc
@@ -27,7 +27,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/deal.II/vectors_rhs_03.cc b/tests/deal.II/vectors_rhs_03.cc
index 339e76dfa2..c1cf9f2e5b 100644
--- a/tests/deal.II/vectors_rhs_03.cc
+++ b/tests/deal.II/vectors_rhs_03.cc
@@ -28,7 +28,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/fail/abf_approximation_01.cc b/tests/fail/abf_approximation_01.cc
index 0dfd312b8d..0247ad3848 100644
--- a/tests/fail/abf_approximation_01.cc
+++ b/tests/fail/abf_approximation_01.cc
@@ -51,7 +51,7 @@ char buf[1000];
 
 #include <base/function.h>
 #include <base/quadrature_lib.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 
 #include <fe/fe_system.h>
diff --git a/tests/fail/circular_01.cc b/tests/fail/circular_01.cc
index 75454632a1..71ce22a3c6 100644
--- a/tests/fail/circular_01.cc
+++ b/tests/fail/circular_01.cc
@@ -49,7 +49,7 @@ char logname[] = "circular_01/output";
 
 #include <fe/fe_q.h>
 #include <grid/grid_out.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_refinement.h>
 #include <numerics/error_estimator.h>
 
diff --git a/tests/fail/hp-step-14.cc b/tests/fail/hp-step-14.cc
index 4da6402666..d310552290 100644
--- a/tests/fail/hp-step-14.cc
+++ b/tests/fail/hp-step-14.cc
@@ -38,7 +38,7 @@ std::ofstream logfile("step-14/output");
 #include <grid/tria_iterator.h>
 #include <grid/grid_refinement.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
diff --git a/tests/fail/hp-step-15.cc b/tests/fail/hp-step-15.cc
index 5f8fb814d4..d379f3f1b2 100644
--- a/tests/fail/hp-step-15.cc
+++ b/tests/fail/hp-step-15.cc
@@ -37,7 +37,7 @@ std::ofstream logfile("step-15/output");
 #include <grid/tria_boundary_lib.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
 #include <hp/fe_values.h>
diff --git a/tests/fail/rt_crash_01.cc b/tests/fail/rt_crash_01.cc
index 2a55da34d7..da18668e7b 100644
--- a/tests/fail/rt_crash_01.cc
+++ b/tests/fail/rt_crash_01.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include "../bits/dof_tools_common.cc"
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <base/function.h>
 #include <base/quadrature_lib.h>
 #include <numerics/vectors.h>
diff --git a/tests/fail/rt_distorted_01.cc b/tests/fail/rt_distorted_01.cc
index dda7766df3..afe16a6178 100644
--- a/tests/fail/rt_distorted_01.cc
+++ b/tests/fail/rt_distorted_01.cc
@@ -46,7 +46,7 @@ std::ofstream logfile ("rt_distorted_01/output");
 
 #include <base/function.h>
 #include <base/quadrature_lib.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 
 #include <fe/fe_system.h>
diff --git a/tests/fail/rt_distorted_02.cc b/tests/fail/rt_distorted_02.cc
index c3b6228d33..c2262bce84 100644
--- a/tests/fail/rt_distorted_02.cc
+++ b/tests/fail/rt_distorted_02.cc
@@ -48,7 +48,7 @@ char buf[1000];
 
 #include <base/function.h>
 #include <base/quadrature_lib.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 
 #include <fe/fe_system.h>
diff --git a/tests/fail/vectors_boundary_rhs_hp_02.cc b/tests/fail/vectors_boundary_rhs_hp_02.cc
index 569c8e3943..2492421ba9 100644
--- a/tests/fail/vectors_boundary_rhs_hp_02.cc
+++ b/tests/fail/vectors_boundary_rhs_hp_02.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/fail/vectors_rhs_hp_02.cc b/tests/fail/vectors_rhs_hp_02.cc
index 57d7ab4ac1..0e7ce56e81 100644
--- a/tests/fail/vectors_rhs_hp_02.cc
+++ b/tests/fail/vectors_rhs_hp_02.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/fe/abf_01.cc b/tests/fe/abf_01.cc
index e8026c7546..8b6bdbbc4c 100644
--- a/tests/fe/abf_01.cc
+++ b/tests/fe/abf_01.cc
@@ -42,7 +42,7 @@
 
 #include <base/function.h>
 #include <base/quadrature_lib.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 
 #include <fe/fe_system.h>
diff --git a/tests/fe/fe_tools_test.cc b/tests/fe/fe_tools_test.cc
index ac91eae285..ac262f6576 100644
--- a/tests/fe/fe_tools_test.cc
+++ b/tests/fe/fe_tools_test.cc
@@ -28,7 +28,7 @@
 #include <fe/fe_tools.h>
 #include <fe/mapping_q1.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <numerics/vectors.h>
 #include <numerics/data_out.h>
 
diff --git a/tests/fe/nedelec_2.cc b/tests/fe/nedelec_2.cc
index c2b1e2dd3d..eb089f25de 100644
--- a/tests/fe/nedelec_2.cc
+++ b/tests/fe/nedelec_2.cc
@@ -12,7 +12,7 @@
 #include <grid/tria.h>
 #include <grid/tria_iterator.h>
 #include <dofs/dof_accessor.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
diff --git a/tests/fe/nedelec_3.cc b/tests/fe/nedelec_3.cc
index 9fa541be89..0b0fc9fc81 100644
--- a/tests/fe/nedelec_3.cc
+++ b/tests/fe/nedelec_3.cc
@@ -11,7 +11,7 @@
 #include <grid/tria.h>
 #include <grid/tria_iterator.h>
 #include <dofs/dof_accessor.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_tools.h>
diff --git a/tests/fe/non_primitive_2.cc b/tests/fe/non_primitive_2.cc
index 7c02c4fec4..67bd90b928 100644
--- a/tests/fe/non_primitive_2.cc
+++ b/tests/fe/non_primitive_2.cc
@@ -29,7 +29,7 @@
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_nedelec.h>
 #include <fe/fe_system.h>
diff --git a/tests/fe/rt_approximation_01.cc b/tests/fe/rt_approximation_01.cc
index 0560bdf599..e0344cd025 100644
--- a/tests/fe/rt_approximation_01.cc
+++ b/tests/fe/rt_approximation_01.cc
@@ -51,7 +51,7 @@ char buf[1000];
 
 #include <base/function.h>
 #include <base/quadrature_lib.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 
 #include <fe/fe_system.h>
diff --git a/tests/fe/rt_normal_02.cc b/tests/fe/rt_normal_02.cc
index dae083e7f1..c7a575c3ca 100644
--- a/tests/fe/rt_normal_02.cc
+++ b/tests/fe/rt_normal_02.cc
@@ -36,7 +36,7 @@
 #include <base/function.h>
 #include <base/quadrature.h>
 #include <base/quadrature_lib.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_tools.h>
 
 #include <fe/fe_system.h>
diff --git a/tests/hp/crash_06.cc b/tests/hp/crash_06.cc
index c3e56aa852..7b57254875 100644
--- a/tests/hp/crash_06.cc
+++ b/tests/hp/crash_06.cc
@@ -26,7 +26,7 @@ char logname[] = "crash_06/output";
 
 #include <grid/tria.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/crash_07.cc b/tests/hp/crash_07.cc
index 25aa0b4abb..9dfcd17aff 100644
--- a/tests/hp/crash_07.cc
+++ b/tests/hp/crash_07.cc
@@ -26,7 +26,7 @@ char logname[] = "crash_07/output";
 
 #include <grid/tria.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/crash_08.cc b/tests/hp/crash_08.cc
index aff8ae8069..788461a874 100644
--- a/tests/hp/crash_08.cc
+++ b/tests/hp/crash_08.cc
@@ -27,7 +27,7 @@ char logname[] = "crash_08/output";
 
 #include <grid/tria.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/crash_09.cc b/tests/hp/crash_09.cc
index 7215506802..73433862d1 100644
--- a/tests/hp/crash_09.cc
+++ b/tests/hp/crash_09.cc
@@ -26,7 +26,7 @@ char logname[] = "crash_09/output";
 
 #include <grid/tria.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/crash_10.cc b/tests/hp/crash_10.cc
index 41465ffd92..3ff4c0f51f 100644
--- a/tests/hp/crash_10.cc
+++ b/tests/hp/crash_10.cc
@@ -19,7 +19,7 @@
 #include <base/logstream.h>
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/crash_11.cc b/tests/hp/crash_11.cc
index 9aabed1c61..c647b031df 100644
--- a/tests/hp/crash_11.cc
+++ b/tests/hp/crash_11.cc
@@ -26,7 +26,7 @@ char logname[] = "crash_11/output";
 
 #include <grid/tria.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/crash_12.cc b/tests/hp/crash_12.cc
index 0f39933cc0..f02c981bf5 100644
--- a/tests/hp/crash_12.cc
+++ b/tests/hp/crash_12.cc
@@ -34,7 +34,7 @@ char logname[] = "crash_12/output";
 
 #include <grid/tria.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/crash_16.cc b/tests/hp/crash_16.cc
index 7d7b41e2ed..f51324acc6 100644
--- a/tests/hp/crash_16.cc
+++ b/tests/hp/crash_16.cc
@@ -27,7 +27,7 @@ char logname[] = "crash_16/output";
 
 #include <grid/tria.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/crash_17.cc b/tests/hp/crash_17.cc
index c3a7bf0519..2725693b6a 100644
--- a/tests/hp/crash_17.cc
+++ b/tests/hp/crash_17.cc
@@ -49,7 +49,7 @@ char logname[] = "crash_17/output";
 
 #include <fe/fe_q.h>
 #include <grid/grid_out.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_refinement.h>
 #include <numerics/error_estimator.h>
 
diff --git a/tests/hp/crash_17_compressed_set_sparsity.cc b/tests/hp/crash_17_compressed_set_sparsity.cc
index 3e7016fa72..0d98839d82 100644
--- a/tests/hp/crash_17_compressed_set_sparsity.cc
+++ b/tests/hp/crash_17_compressed_set_sparsity.cc
@@ -51,7 +51,7 @@ char logname[] = "crash_17_compressed_set_sparsity/output";
 
 #include <fe/fe_q.h>
 #include <grid/grid_out.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_refinement.h>
 #include <numerics/error_estimator.h>
 
diff --git a/tests/hp/crash_18.cc b/tests/hp/crash_18.cc
index 4036eb79f0..86040c8150 100644
--- a/tests/hp/crash_18.cc
+++ b/tests/hp/crash_18.cc
@@ -52,7 +52,7 @@ char logname[] = "crash_18/output";
 
 #include <fe/fe_q.h>
 #include <grid/grid_out.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_refinement.h>
 #include <numerics/error_estimator.h>
 
diff --git a/tests/hp/crash_18_compressed_set_sparsity.cc b/tests/hp/crash_18_compressed_set_sparsity.cc
index 22452f4836..db902cd0e7 100644
--- a/tests/hp/crash_18_compressed_set_sparsity.cc
+++ b/tests/hp/crash_18_compressed_set_sparsity.cc
@@ -55,7 +55,7 @@ char logname[] = "crash_18_compressed_set_sparsity/output";
 
 #include <fe/fe_q.h>
 #include <grid/grid_out.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_refinement.h>
 #include <numerics/error_estimator.h>
 
diff --git a/tests/hp/hp_hanging_nodes_01.cc b/tests/hp/hp_hanging_nodes_01.cc
index 7ea1417e92..b27d5fb543 100644
--- a/tests/hp/hp_hanging_nodes_01.cc
+++ b/tests/hp/hp_hanging_nodes_01.cc
@@ -23,7 +23,7 @@
 #include <fe/fe_q.h>
 
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 
 #include <fe/fe_values.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/hp_hanging_nodes_02.cc b/tests/hp/hp_hanging_nodes_02.cc
index 17bba2d118..a723d336bd 100644
--- a/tests/hp/hp_hanging_nodes_02.cc
+++ b/tests/hp/hp_hanging_nodes_02.cc
@@ -20,7 +20,7 @@
 #include <base/logstream.h>
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/interpolate_dgq_02.cc b/tests/hp/interpolate_dgq_02.cc
index 0b856ad7e7..08283129ce 100644
--- a/tests/hp/interpolate_dgq_02.cc
+++ b/tests/hp/interpolate_dgq_02.cc
@@ -24,7 +24,7 @@
 #include <grid/tria.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.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 01c99574b7..9ed7a2f161 100644
--- a/tests/hp/interpolate_q_02.cc
+++ b/tests/hp/interpolate_q_02.cc
@@ -24,7 +24,7 @@
 #include <grid/tria.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.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 736eb228a1..cd2671817c 100644
--- a/tests/hp/interpolate_q_system_02.cc
+++ b/tests/hp/interpolate_q_system_02.cc
@@ -24,7 +24,7 @@
 #include <grid/tria.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 #include <grid/grid_refinement.h>
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/matrices.cc b/tests/hp/matrices.cc
index 2a4aed3395..c210f775a4 100644
--- a/tests/hp/matrices.cc
+++ b/tests/hp/matrices.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/matrices_hp.cc b/tests/hp/matrices_hp.cc
index 29e71dbf43..68d1121c8f 100644
--- a/tests/hp/matrices_hp.cc
+++ b/tests/hp/matrices_hp.cc
@@ -27,7 +27,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/step-11.cc b/tests/hp/step-11.cc
index bd9bbc6263..3633765c54 100644
--- a/tests/hp/step-11.cc
+++ b/tests/hp/step-11.cc
@@ -35,7 +35,7 @@ std::ofstream logfile("step-11/output");
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/step-11_compressed_set_sparsity.cc b/tests/hp/step-11_compressed_set_sparsity.cc
index d39935a5d1..e931c2a99a 100644
--- a/tests/hp/step-11_compressed_set_sparsity.cc
+++ b/tests/hp/step-11_compressed_set_sparsity.cc
@@ -38,7 +38,7 @@ std::ofstream logfile("step-11_compressed_set_sparsity/output");
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/step-13.cc b/tests/hp/step-13.cc
index 9e49408fb3..a5c5915eb6 100644
--- a/tests/hp/step-13.cc
+++ b/tests/hp/step-13.cc
@@ -37,7 +37,7 @@ std::ofstream logfile("step-13/output");
 #include <grid/tria_iterator.h>
 #include <grid/grid_refinement.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/step-3a.cc b/tests/hp/step-3a.cc
index 1ad8bab932..e742e9614b 100644
--- a/tests/hp/step-3a.cc
+++ b/tests/hp/step-3a.cc
@@ -21,7 +21,7 @@
 #include <base/logstream.h>
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/step-3b.cc b/tests/hp/step-3b.cc
index e77ae463d9..c28e052f1a 100644
--- a/tests/hp/step-3b.cc
+++ b/tests/hp/step-3b.cc
@@ -21,7 +21,7 @@
 #include <base/logstream.h>
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/step-3c.cc b/tests/hp/step-3c.cc
index bfcde55bdd..2783cf0222 100644
--- a/tests/hp/step-3c.cc
+++ b/tests/hp/step-3c.cc
@@ -20,7 +20,7 @@
 #include <base/logstream.h>
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <grid/grid_generator.h>
 
 #include <grid/tria_accessor.h>
diff --git a/tests/hp/step-6.cc b/tests/hp/step-6.cc
index 1e0fb3c6fd..ead4eed476 100644
--- a/tests/hp/step-6.cc
+++ b/tests/hp/step-6.cc
@@ -49,7 +49,7 @@ std::ofstream logfile("step-6/output");
 #include <grid/grid_out.h>
 
 
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 
 #include <grid/grid_refinement.h>
 
diff --git a/tests/hp/step-7.cc b/tests/hp/step-7.cc
index 1f81597a63..9085ab590e 100644
--- a/tests/hp/step-7.cc
+++ b/tests/hp/step-7.cc
@@ -36,7 +36,7 @@ std::ofstream logfile("step-7/output");
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
 #include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
diff --git a/tests/hp/step-8.cc b/tests/hp/step-8.cc
index 2a94fba713..fc28e387e1 100644
--- a/tests/hp/step-8.cc
+++ b/tests/hp/step-8.cc
@@ -42,7 +42,7 @@ std::ofstream logfile("step-8/output");
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <numerics/error_estimator.h>
 
 #include <fe/fe_system.h>
diff --git a/tests/hp/step-9.cc b/tests/hp/step-9.cc
index 30076dfa2b..683cfa4fd6 100644
--- a/tests/hp/step-9.cc
+++ b/tests/hp/step-9.cc
@@ -38,7 +38,7 @@ std::ofstream logfile("step-9/output");
 #include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
diff --git a/tests/hp/vectors_boundary_rhs_01.cc b/tests/hp/vectors_boundary_rhs_01.cc
index c15c0e276b..ad547d3ca0 100644
--- a/tests/hp/vectors_boundary_rhs_01.cc
+++ b/tests/hp/vectors_boundary_rhs_01.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/vectors_boundary_rhs_02.cc b/tests/hp/vectors_boundary_rhs_02.cc
index 1da1264dc9..9702f1d0cd 100644
--- a/tests/hp/vectors_boundary_rhs_02.cc
+++ b/tests/hp/vectors_boundary_rhs_02.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/vectors_boundary_rhs_03.cc b/tests/hp/vectors_boundary_rhs_03.cc
index 614dbf4866..4aa2471e68 100644
--- a/tests/hp/vectors_boundary_rhs_03.cc
+++ b/tests/hp/vectors_boundary_rhs_03.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/vectors_boundary_rhs_hp_01.cc b/tests/hp/vectors_boundary_rhs_hp_01.cc
index c6e14f91b8..fa556894c4 100644
--- a/tests/hp/vectors_boundary_rhs_hp_01.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_01.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/vectors_boundary_rhs_hp_03.cc b/tests/hp/vectors_boundary_rhs_hp_03.cc
index 959efe618f..4b6b06677f 100644
--- a/tests/hp/vectors_boundary_rhs_hp_03.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_03.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/vectors_point_source_01.cc b/tests/hp/vectors_point_source_01.cc
index 90ab6063d5..9c9c5aa1d1 100644
--- a/tests/hp/vectors_point_source_01.cc
+++ b/tests/hp/vectors_point_source_01.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/vectors_point_source_hp_01.cc b/tests/hp/vectors_point_source_hp_01.cc
index e99f6817e1..9e9cbd7ed5 100644
--- a/tests/hp/vectors_point_source_hp_01.cc
+++ b/tests/hp/vectors_point_source_hp_01.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/vectors_rhs_01.cc b/tests/hp/vectors_rhs_01.cc
index fc8b7340a7..0754c7dfbe 100644
--- a/tests/hp/vectors_rhs_01.cc
+++ b/tests/hp/vectors_rhs_01.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/vectors_rhs_02.cc b/tests/hp/vectors_rhs_02.cc
index 406ece3eb5..9af6fc6899 100644
--- a/tests/hp/vectors_rhs_02.cc
+++ b/tests/hp/vectors_rhs_02.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/vectors_rhs_03.cc b/tests/hp/vectors_rhs_03.cc
index b0d70350fa..3c13a3695f 100644
--- a/tests/hp/vectors_rhs_03.cc
+++ b/tests/hp/vectors_rhs_03.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/vectors_rhs_hp_01.cc b/tests/hp/vectors_rhs_hp_01.cc
index b03d5f7f98..666cd83281 100644
--- a/tests/hp/vectors_rhs_hp_01.cc
+++ b/tests/hp/vectors_rhs_hp_01.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>
diff --git a/tests/hp/vectors_rhs_hp_03.cc b/tests/hp/vectors_rhs_hp_03.cc
index 7e34cecfa5..06762ddd74 100644
--- a/tests/hp/vectors_rhs_hp_03.cc
+++ b/tests/hp/vectors_rhs_hp_03.cc
@@ -29,7 +29,7 @@
 #include <grid/grid_generator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 #include <hp/fe_collection.h>