From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Mon, 19 Jan 2015 19:23:46 +0000 (+0100)
Subject: Testsuite: Fix includes
X-Git-Tag: v8.3.0-rc1~525^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a3b9eae0c971ae242a746256b049a7dfe33e38a;p=dealii.git

Testsuite: Fix includes

One of the previous changes removed [...]/deal.II from the list of include
directories. Consequently, it is now mandatory to prefix all deal.II
includes with deal.II/
---

diff --git a/tests/base/threads_02.cc b/tests/base/threads_02.cc
index 64b39edadb..17a04c62d6 100644
--- a/tests/base/threads_02.cc
+++ b/tests/base/threads_02.cc
@@ -14,8 +14,8 @@
 // ---------------------------------------------------------------------
 
 #include "../tests.h"
-#include <base/thread_management.h>
-#include <base/logstream.h>
+#include <deal.II/base/thread_management.h>
+#include <deal.II/base/logstream.h>
 #include <fstream>
 #include <iostream>
 template <int> struct X {};
diff --git a/tests/bits/find_cell_10.cc b/tests/bits/find_cell_10.cc
index 350763ec8c..c97ef83657 100644
--- a/tests/bits/find_cell_10.cc
+++ b/tests/bits/find_cell_10.cc
@@ -48,19 +48,19 @@
 #include <stdio.h>
 #include <cstdlib>
 
-#include <base/quadrature_lib.h>
-#include <fe/mapping_q.h>
-#include <base/function.h>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_accessor.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_tools.h>
-#include <dofs/dof_handler.h>
-#include <fe/fe_q.h>
-#include <fe/fe_values.h>
-#include <grid/grid_in.h>
+#include <deal.II/base/quadrature_lib.h>
+#include <deal.II/fe/mapping_q.h>
+#include <deal.II/base/function.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_tools.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/fe/fe_q.h>
+#include <deal.II/fe/fe_values.h>
+#include <deal.II/grid/grid_in.h>
 
 
 #include <iostream>
diff --git a/tests/bits/find_cell_10a.cc b/tests/bits/find_cell_10a.cc
index 1852480c23..6289b76715 100644
--- a/tests/bits/find_cell_10a.cc
+++ b/tests/bits/find_cell_10a.cc
@@ -26,19 +26,19 @@
 #include <stdio.h>
 #include <cstdlib>
 
-#include <base/quadrature_lib.h>
-#include <fe/mapping_q.h>
-#include <base/function.h>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_accessor.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_tools.h>
-#include <dofs/dof_handler.h>
-#include <fe/fe_q.h>
-#include <fe/fe_values.h>
-#include <grid/grid_in.h>
+#include <deal.II/base/quadrature_lib.h>
+#include <deal.II/fe/mapping_q.h>
+#include <deal.II/base/function.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_tools.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/fe/fe_q.h>
+#include <deal.II/fe/fe_values.h>
+#include <deal.II/grid/grid_in.h>
 
 
 #include <iostream>
diff --git a/tests/bits/find_cell_11.cc b/tests/bits/find_cell_11.cc
index 08c394b8ee..b9efcfadbb 100644
--- a/tests/bits/find_cell_11.cc
+++ b/tests/bits/find_cell_11.cc
@@ -23,19 +23,19 @@
 #include <stdio.h>
 #include <cstdlib>
 
-#include <base/quadrature_lib.h>
-#include <fe/mapping_q.h>
-#include <base/function.h>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_accessor.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_tools.h>
-#include <dofs/dof_handler.h>
-#include <fe/fe_q.h>
-#include <fe/fe_values.h>
-#include <grid/grid_in.h>
+#include <deal.II/base/quadrature_lib.h>
+#include <deal.II/fe/mapping_q.h>
+#include <deal.II/base/function.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_tools.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/fe/fe_q.h>
+#include <deal.II/fe/fe_values.h>
+#include <deal.II/grid/grid_in.h>
 
 
 #include <iostream>
diff --git a/tests/bits/find_cell_12.cc b/tests/bits/find_cell_12.cc
index ba09e84667..112d68beb0 100644
--- a/tests/bits/find_cell_12.cc
+++ b/tests/bits/find_cell_12.cc
@@ -23,19 +23,19 @@
 #include <stdio.h>
 #include <cstdlib>
 
-#include <base/quadrature_lib.h>
-#include <fe/mapping_q.h>
-#include <base/function.h>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_accessor.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_tools.h>
-#include <dofs/dof_handler.h>
-#include <fe/fe_q.h>
-#include <fe/fe_values.h>
-#include <grid/grid_in.h>
+#include <deal.II/base/quadrature_lib.h>
+#include <deal.II/fe/mapping_q.h>
+#include <deal.II/base/function.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_tools.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/fe/fe_q.h>
+#include <deal.II/fe/fe_values.h>
+#include <deal.II/grid/grid_in.h>
 
 
 #include <iostream>
diff --git a/tests/codim_one/mesh_bug.cc b/tests/codim_one/mesh_bug.cc
index cf21ffc2b5..0d351b95af 100644
--- a/tests/codim_one/mesh_bug.cc
+++ b/tests/codim_one/mesh_bug.cc
@@ -19,18 +19,18 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 // all include files you need here
 
 
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/grid_in.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/grid_in.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 
 int main ()
diff --git a/tests/deal.II/block_list.h b/tests/deal.II/block_list.h
index 9c2b9f081f..95bd3a3835 100644
--- a/tests/deal.II/block_list.h
+++ b/tests/deal.II/block_list.h
@@ -18,7 +18,7 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/dofs/dof_accessor.h>
-#include <dofs/dof_tools.h>
+#include <deal.II/dofs/dof_tools.h>
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_dgq.h>
 #include <deal.II/fe/fe_raviart_thomas.h>
diff --git a/tests/deal.II/constraints_block_01.cc b/tests/deal.II/constraints_block_01.cc
index e02cd34536..399077badb 100644
--- a/tests/deal.II/constraints_block_01.cc
+++ b/tests/deal.II/constraints_block_01.cc
@@ -23,43 +23,43 @@
 // testcase by Jason Sheldon
 
 #include "../tests.h"
-#include <base/logstream.h>
-#include <base/utilities.h>
-#include <base/quadrature_lib.h>
-
-#include <numerics/vector_tools.h>
-#include <numerics/matrix_tools.h>
-#include <numerics/data_out.h>
-
-#include <lac/vector.h>
-#include <lac/sparse_direct.h>
-#include <lac/full_matrix.h>
-#include <lac/compressed_sparsity_pattern.h>
-#include <lac/sparse_matrix.h>
-#include <lac/constraint_matrix.h>
-
-#include <dofs/dof_accessor.h>
-#include <lac/constraint_matrix.h>
-#include <dofs/dof_renumbering.h>
-#include <dofs/dof_handler.h>
-#include <dofs/dof_tools.h>
-
-#include <hp/dof_handler.h>
-#include <hp/q_collection.h>
-#include <hp/fe_collection.h>
-#include <hp/fe_values.h>
-
-#include <fe/fe.h>
-#include <fe/fe_tools.h>
-#include <fe/fe_q.h>
-#include <fe/fe_nothing.h>
-#include <fe/fe_system.h>
-#include <fe/fe_values.h>
-
-#include <grid/grid_generator.h>
-#include <grid/tria_iterator.h>
-#include <grid/tria_boundary_lib.h>
-#include <grid/tria.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/base/utilities.h>
+#include <deal.II/base/quadrature_lib.h>
+
+#include <deal.II/numerics/vector_tools.h>
+#include <deal.II/numerics/matrix_tools.h>
+#include <deal.II/numerics/data_out.h>
+
+#include <deal.II/lac/vector.h>
+#include <deal.II/lac/sparse_direct.h>
+#include <deal.II/lac/full_matrix.h>
+#include <deal.II/lac/compressed_sparsity_pattern.h>
+#include <deal.II/lac/sparse_matrix.h>
+#include <deal.II/lac/constraint_matrix.h>
+
+#include <deal.II/dofs/dof_accessor.h>
+#include <deal.II/lac/constraint_matrix.h>
+#include <deal.II/dofs/dof_renumbering.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/dofs/dof_tools.h>
+
+#include <deal.II/hp/dof_handler.h>
+#include <deal.II/hp/q_collection.h>
+#include <deal.II/hp/fe_collection.h>
+#include <deal.II/hp/fe_values.h>
+
+#include <deal.II/fe/fe.h>
+#include <deal.II/fe/fe_tools.h>
+#include <deal.II/fe/fe_q.h>
+#include <deal.II/fe/fe_nothing.h>
+#include <deal.II/fe/fe_system.h>
+#include <deal.II/fe/fe_values.h>
+
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/tria.h>
 
 #include <fstream>
 #include <cmath>
diff --git a/tests/deal.II/fe_values_view_tensor_01.cc b/tests/deal.II/fe_values_view_tensor_01.cc
index a23249f0b3..893a4c7c35 100644
--- a/tests/deal.II/fe_values_view_tensor_01.cc
+++ b/tests/deal.II/fe_values_view_tensor_01.cc
@@ -18,28 +18,28 @@
 // a complete testcase by Denis Davydov for FEValuesExtractors::Tensor
 
 #include "../tests.h"
-#include <base/quadrature_lib.h>
-#include <base/logstream.h>
-#include <base/function.h>
-#include <lac/block_vector.h>
-#include <lac/full_matrix.h>
-#include <lac/block_sparse_matrix.h>
-#include <lac/solver_cg.h>
-#include <lac/precondition.h>
-#include <grid/tria.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_accessor.h>
-#include <grid/tria_iterator.h>
-#include <dofs/dof_handler.h>
-#include <dofs/dof_renumbering.h>
-#include <dofs/dof_accessor.h>
-#include <dofs/dof_tools.h>
-#include <fe/fe_system.h>
-#include <fe/fe_values.h>
-#include <numerics/vector_tools.h>
-#include <numerics/matrix_tools.h>
-#include <numerics/data_out.h>
-#include <fe/fe_q.h>
+#include <deal.II/base/quadrature_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/base/function.h>
+#include <deal.II/lac/block_vector.h>
+#include <deal.II/lac/full_matrix.h>
+#include <deal.II/lac/block_sparse_matrix.h>
+#include <deal.II/lac/solver_cg.h>
+#include <deal.II/lac/precondition.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/dofs/dof_renumbering.h>
+#include <deal.II/dofs/dof_accessor.h>
+#include <deal.II/dofs/dof_tools.h>
+#include <deal.II/fe/fe_system.h>
+#include <deal.II/fe/fe_values.h>
+#include <deal.II/numerics/vector_tools.h>
+#include <deal.II/numerics/matrix_tools.h>
+#include <deal.II/numerics/data_out.h>
+#include <deal.II/fe/fe_q.h>
 
 #include <fstream>
 
diff --git a/tests/deal.II/no_flux_10.cc b/tests/deal.II/no_flux_10.cc
index 78b5362d49..1f0dd56e7a 100644
--- a/tests/deal.II/no_flux_10.cc
+++ b/tests/deal.II/no_flux_10.cc
@@ -31,17 +31,17 @@
 
 #include "../tests.h"
 
-#include <grid/tria.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
-#include <grid/grid_out.h>
-#include <dofs/dof_handler.h>
-#include <fe/fe_system.h>
-#include <fe/mapping_q.h>
-#include <numerics/vector_tools.h>
-#include <numerics/data_out.h>
-#include <base/exceptions.h>
-#include <base/function.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/fe/fe_system.h>
+#include <deal.II/fe/mapping_q.h>
+#include <deal.II/numerics/vector_tools.h>
+#include <deal.II/numerics/data_out.h>
+#include <deal.II/base/exceptions.h>
+#include <deal.II/base/function.h>
 
 
 void
diff --git a/tests/deal.II/no_flux_11.cc b/tests/deal.II/no_flux_11.cc
index 6831165d8e..376192fd98 100644
--- a/tests/deal.II/no_flux_11.cc
+++ b/tests/deal.II/no_flux_11.cc
@@ -22,17 +22,17 @@
 
 #include "../tests.h"
 
-#include <grid/tria.h>
-#include <grid/grid_in.h>
-#include <grid/tria_boundary_lib.h>
-#include <grid/grid_out.h>
-#include <dofs/dof_handler.h>
-#include <fe/fe_system.h>
-#include <fe/mapping_q.h>
-#include <numerics/vector_tools.h>
-#include <numerics/data_out.h>
-#include <base/exceptions.h>
-#include <base/function.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/grid_in.h>
+#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/fe/fe_system.h>
+#include <deal.II/fe/mapping_q.h>
+#include <deal.II/numerics/vector_tools.h>
+#include <deal.II/numerics/data_out.h>
+#include <deal.II/base/exceptions.h>
+#include <deal.II/base/function.h>
 
 
 
diff --git a/tests/deal.II/no_flux_12.cc b/tests/deal.II/no_flux_12.cc
index e552790371..8a4610ce55 100644
--- a/tests/deal.II/no_flux_12.cc
+++ b/tests/deal.II/no_flux_12.cc
@@ -53,17 +53,17 @@
 
 #include "../tests.h"
 
-#include <grid/tria.h>
-#include <grid/tria_boundary_lib.h>
-#include <grid/grid_out.h>
-#include <grid/grid_generator.h>
-#include <dofs/dof_handler.h>
-#include <fe/fe_system.h>
-#include <fe/mapping_q.h>
-#include <numerics/vector_tools.h>
-#include <numerics/data_out.h>
-#include <base/exceptions.h>
-#include <base/function.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/fe/fe_system.h>
+#include <deal.II/fe/mapping_q.h>
+#include <deal.II/numerics/vector_tools.h>
+#include <deal.II/numerics/data_out.h>
+#include <deal.II/base/exceptions.h>
+#include <deal.II/base/function.h>
 
 
 template <int dim>
diff --git a/tests/integrators/assembler_simple_matrix_04.cc b/tests/integrators/assembler_simple_matrix_04.cc
index 9d470c9df3..e39727c1d5 100644
--- a/tests/integrators/assembler_simple_matrix_04.cc
+++ b/tests/integrators/assembler_simple_matrix_04.cc
@@ -22,7 +22,7 @@
 #include "../tests.h"
 #include <deal.II/base/logstream.h>
 #include <deal.II/lac/full_matrix.h>
-#include <lac/sparse_matrix.h>
+#include <deal.II/lac/sparse_matrix.h>
 #include <deal.II/lac/block_indices.h>
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/grid_generator.h>
diff --git a/tests/manifold/copy_boundary_to_manifold_id_01.cc b/tests/manifold/copy_boundary_to_manifold_id_01.cc
index e45e7230b7..92c746dd34 100644
--- a/tests/manifold/copy_boundary_to_manifold_id_01.cc
+++ b/tests/manifold/copy_boundary_to_manifold_id_01.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/copy_material_to_manifold_id_01.cc b/tests/manifold/copy_material_to_manifold_id_01.cc
index ec654bccf9..8be4dbb560 100644
--- a/tests/manifold/copy_material_to_manifold_id_01.cc
+++ b/tests/manifold/copy_material_to_manifold_id_01.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/cylindrical_manifold_01.cc b/tests/manifold/cylindrical_manifold_01.cc
index 5313e7b6a3..1074d0bad1 100644
--- a/tests/manifold/cylindrical_manifold_01.cc
+++ b/tests/manifold/cylindrical_manifold_01.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/cylindrical_manifold_02.cc b/tests/manifold/cylindrical_manifold_02.cc
index 7e6f1bb48d..2a3bbd65c1 100644
--- a/tests/manifold/cylindrical_manifold_02.cc
+++ b/tests/manifold/cylindrical_manifold_02.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/flat_manifold_01.cc b/tests/manifold/flat_manifold_01.cc
index 30805ac610..a80d7d8bee 100644
--- a/tests/manifold/flat_manifold_01.cc
+++ b/tests/manifold/flat_manifold_01.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/flat_manifold_02.cc b/tests/manifold/flat_manifold_02.cc
index 7249f626f4..ccf95b0659 100644
--- a/tests/manifold/flat_manifold_02.cc
+++ b/tests/manifold/flat_manifold_02.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/flat_manifold_03.cc b/tests/manifold/flat_manifold_03.cc
index 3b4e6d9052..63f04b58f1 100644
--- a/tests/manifold/flat_manifold_03.cc
+++ b/tests/manifold/flat_manifold_03.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/flat_manifold_04.cc b/tests/manifold/flat_manifold_04.cc
index 38a36fb1ea..31464c56c4 100644
--- a/tests/manifold/flat_manifold_04.cc
+++ b/tests/manifold/flat_manifold_04.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_values.h>
 
diff --git a/tests/manifold/function_manifold_01.cc b/tests/manifold/function_manifold_01.cc
index 9d7903b13b..a9660befaf 100644
--- a/tests/manifold/function_manifold_01.cc
+++ b/tests/manifold/function_manifold_01.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/function_manifold_02.cc b/tests/manifold/function_manifold_02.cc
index 3a60736473..81f15d56b0 100644
--- a/tests/manifold/function_manifold_02.cc
+++ b/tests/manifold/function_manifold_02.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/manifold_id_01.cc b/tests/manifold/manifold_id_01.cc
index 54a38adc76..2c26b35fb2 100644
--- a/tests/manifold/manifold_id_01.cc
+++ b/tests/manifold/manifold_id_01.cc
@@ -14,7 +14,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/manifold_id_02.cc b/tests/manifold/manifold_id_02.cc
index 4382ea0e4c..6a5d0eacda 100644
--- a/tests/manifold/manifold_id_02.cc
+++ b/tests/manifold/manifold_id_02.cc
@@ -15,7 +15,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/manifold_id_03.cc b/tests/manifold/manifold_id_03.cc
index 2578d3e594..44433ab583 100644
--- a/tests/manifold/manifold_id_03.cc
+++ b/tests/manifold/manifold_id_03.cc
@@ -17,7 +17,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/manifold_id_04.cc b/tests/manifold/manifold_id_04.cc
index eaf165c358..01b84680b9 100644
--- a/tests/manifold/manifold_id_04.cc
+++ b/tests/manifold/manifold_id_04.cc
@@ -14,7 +14,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/manifold_id_05.cc b/tests/manifold/manifold_id_05.cc
index 8e6e1694b1..1c11273013 100644
--- a/tests/manifold/manifold_id_05.cc
+++ b/tests/manifold/manifold_id_05.cc
@@ -14,7 +14,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/manifold_id_06.cc b/tests/manifold/manifold_id_06.cc
index 86ba0aef8f..1e539209e2 100644
--- a/tests/manifold/manifold_id_06.cc
+++ b/tests/manifold/manifold_id_06.cc
@@ -14,7 +14,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/manifold_id_07.cc b/tests/manifold/manifold_id_07.cc
index 0f6dafa631..21a4e5c696 100644
--- a/tests/manifold/manifold_id_07.cc
+++ b/tests/manifold/manifold_id_07.cc
@@ -16,7 +16,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/set_all_manifold_ids_01.cc b/tests/manifold/set_all_manifold_ids_01.cc
index a8a7c85957..af554f6837 100644
--- a/tests/manifold/set_all_manifold_ids_01.cc
+++ b/tests/manifold/set_all_manifold_ids_01.cc
@@ -11,7 +11,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/set_all_manifold_ids_02.cc b/tests/manifold/set_all_manifold_ids_02.cc
index 7d0130b2ef..80259c0e47 100644
--- a/tests/manifold/set_all_manifold_ids_02.cc
+++ b/tests/manifold/set_all_manifold_ids_02.cc
@@ -11,7 +11,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/spherical_manifold_01.cc b/tests/manifold/spherical_manifold_01.cc
index 130f2f4ae8..523eb48cf7 100644
--- a/tests/manifold/spherical_manifold_01.cc
+++ b/tests/manifold/spherical_manifold_01.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/spherical_manifold_02.cc b/tests/manifold/spherical_manifold_02.cc
index 86eae62fe2..35080b54ea 100644
--- a/tests/manifold/spherical_manifold_02.cc
+++ b/tests/manifold/spherical_manifold_02.cc
@@ -14,7 +14,7 @@
 #include "../tests.h"
 
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/spherical_manifold_03.cc b/tests/manifold/spherical_manifold_03.cc
index bd5f637aeb..dd9f2980b8 100644
--- a/tests/manifold/spherical_manifold_03.cc
+++ b/tests/manifold/spherical_manifold_03.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/spherical_manifold_04.cc b/tests/manifold/spherical_manifold_04.cc
index b3e33f474b..59ca40086d 100644
--- a/tests/manifold/spherical_manifold_04.cc
+++ b/tests/manifold/spherical_manifold_04.cc
@@ -14,7 +14,7 @@
 #include "../tests.h"
 
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/spherical_manifold_05.cc b/tests/manifold/spherical_manifold_05.cc
index 9f5bf4034e..83c6d5c490 100644
--- a/tests/manifold/spherical_manifold_05.cc
+++ b/tests/manifold/spherical_manifold_05.cc
@@ -14,7 +14,7 @@
 #include "../tests.h"
 
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/tria_accessor_point_01.cc b/tests/manifold/tria_accessor_point_01.cc
index 4e2cab854c..855d044f7f 100644
--- a/tests/manifold/tria_accessor_point_01.cc
+++ b/tests/manifold/tria_accessor_point_01.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/tria_accessor_point_02.cc b/tests/manifold/tria_accessor_point_02.cc
index b7ef668899..ad0ab14056 100644
--- a/tests/manifold/tria_accessor_point_02.cc
+++ b/tests/manifold/tria_accessor_point_02.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/manifold/tria_accessor_point_03.cc b/tests/manifold/tria_accessor_point_03.cc
index b7ef668899..ad0ab14056 100644
--- a/tests/manifold/tria_accessor_point_03.cc
+++ b/tests/manifold/tria_accessor_point_03.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 
 // all include files you need here
diff --git a/tests/opencascade/arclength_boundary_01.cc b/tests/opencascade/arclength_boundary_01.cc
index c51d86ebe1..0e2f96bb0c 100644
--- a/tests/opencascade/arclength_boundary_01.cc
+++ b/tests/opencascade/arclength_boundary_01.cc
@@ -11,7 +11,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <deal.II/opencascade/boundary_lib.h>
diff --git a/tests/opencascade/arclength_boundary_02.cc b/tests/opencascade/arclength_boundary_02.cc
index 474d7a8949..f67cf8a191 100644
--- a/tests/opencascade/arclength_boundary_02.cc
+++ b/tests/opencascade/arclength_boundary_02.cc
@@ -17,13 +17,13 @@
 #include <deal.II/opencascade/boundary_lib.h>
 
 #include <fstream>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
diff --git a/tests/opencascade/axis_boundary_02.cc b/tests/opencascade/axis_boundary_02.cc
index ff64572386..df055221a7 100644
--- a/tests/opencascade/axis_boundary_02.cc
+++ b/tests/opencascade/axis_boundary_02.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <deal.II/opencascade/boundary_lib.h>
diff --git a/tests/opencascade/circle_normal_projection.cc b/tests/opencascade/circle_normal_projection.cc
index 9e7bee5459..505dd4e030 100644
--- a/tests/opencascade/circle_normal_projection.cc
+++ b/tests/opencascade/circle_normal_projection.cc
@@ -17,13 +17,13 @@
 #include <deal.II/opencascade/boundary_lib.h>
 
 #include <fstream>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
diff --git a/tests/opencascade/closest_point_to_shape.cc b/tests/opencascade/closest_point_to_shape.cc
index f816294478..c40090a238 100644
--- a/tests/opencascade/closest_point_to_shape.cc
+++ b/tests/opencascade/closest_point_to_shape.cc
@@ -16,13 +16,13 @@
 
 #include <deal.II/opencascade/utilities.h>
 
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
diff --git a/tests/opencascade/create_tria_00.cc b/tests/opencascade/create_tria_00.cc
index 077bc0ba66..d96b4a8ce4 100644
--- a/tests/opencascade/create_tria_00.cc
+++ b/tests/opencascade/create_tria_00.cc
@@ -17,13 +17,13 @@
 #include <deal.II/opencascade/boundary_lib.h>
 
 #include <fstream>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
diff --git a/tests/opencascade/create_tria_01.cc b/tests/opencascade/create_tria_01.cc
index 92d5f2e4c1..ff272267f0 100644
--- a/tests/opencascade/create_tria_01.cc
+++ b/tests/opencascade/create_tria_01.cc
@@ -18,13 +18,13 @@
 #include <deal.II/opencascade/boundary_lib.h>
 
 #include <fstream>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
diff --git a/tests/opencascade/directional_boundary_01.cc b/tests/opencascade/directional_boundary_01.cc
index e06d1f2133..0c6ba759db 100644
--- a/tests/opencascade/directional_boundary_01.cc
+++ b/tests/opencascade/directional_boundary_01.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <deal.II/opencascade/boundary_lib.h>
diff --git a/tests/opencascade/iges_create.cc b/tests/opencascade/iges_create.cc
index 182f737c45..acba08fe12 100644
--- a/tests/opencascade/iges_create.cc
+++ b/tests/opencascade/iges_create.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <TopTools.hxx>
diff --git a/tests/opencascade/iges_describe.cc b/tests/opencascade/iges_describe.cc
index f2f181d878..9224620f73 100644
--- a/tests/opencascade/iges_describe.cc
+++ b/tests/opencascade/iges_describe.cc
@@ -14,7 +14,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <TopTools.hxx>
diff --git a/tests/opencascade/iges_describe_02.cc b/tests/opencascade/iges_describe_02.cc
index 14c3800f48..1f2936976e 100644
--- a/tests/opencascade/iges_describe_02.cc
+++ b/tests/opencascade/iges_describe_02.cc
@@ -14,7 +14,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <TopTools.hxx>
diff --git a/tests/opencascade/iges_write.cc b/tests/opencascade/iges_write.cc
index 9f67ea5543..309f00f615 100644
--- a/tests/opencascade/iges_write.cc
+++ b/tests/opencascade/iges_write.cc
@@ -14,7 +14,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <TopTools.hxx>
diff --git a/tests/opencascade/interpolation_curve_boundary.cc b/tests/opencascade/interpolation_curve_boundary.cc
index b4342ea2f9..654a0d7fdc 100644
--- a/tests/opencascade/interpolation_curve_boundary.cc
+++ b/tests/opencascade/interpolation_curve_boundary.cc
@@ -17,13 +17,13 @@
 #include <deal.II/opencascade/boundary_lib.h>
 
 #include <fstream>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
diff --git a/tests/opencascade/normal_projection_01.cc b/tests/opencascade/normal_projection_01.cc
index bdc5e73e04..ac48e807dd 100644
--- a/tests/opencascade/normal_projection_01.cc
+++ b/tests/opencascade/normal_projection_01.cc
@@ -17,13 +17,13 @@
 #include <deal.II/opencascade/boundary_lib.h>
 
 #include <fstream>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
diff --git a/tests/opencascade/normal_to_mesh_projection_01.cc b/tests/opencascade/normal_to_mesh_projection_01.cc
index 45dd25600d..12cffd5d86 100644
--- a/tests/opencascade/normal_to_mesh_projection_01.cc
+++ b/tests/opencascade/normal_to_mesh_projection_01.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <deal.II/opencascade/boundary_lib.h>
diff --git a/tests/opencascade/normal_to_mesh_projection_02.cc b/tests/opencascade/normal_to_mesh_projection_02.cc
index 254b315874..544bb3b186 100644
--- a/tests/opencascade/normal_to_mesh_projection_02.cc
+++ b/tests/opencascade/normal_to_mesh_projection_02.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <deal.II/opencascade/boundary_lib.h>
diff --git a/tests/opencascade/plane_intersection_01.cc b/tests/opencascade/plane_intersection_01.cc
index 3aa5210477..359e2edba9 100644
--- a/tests/opencascade/plane_intersection_01.cc
+++ b/tests/opencascade/plane_intersection_01.cc
@@ -18,13 +18,13 @@
 #include <deal.II/opencascade/boundary_lib.h>
 
 #include <fstream>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
diff --git a/tests/opencascade/project_center_cell_01.cc b/tests/opencascade/project_center_cell_01.cc
index 4f36c07bca..6e54370e32 100644
--- a/tests/opencascade/project_center_cell_01.cc
+++ b/tests/opencascade/project_center_cell_01.cc
@@ -18,13 +18,13 @@
 #include <deal.II/opencascade/boundary_lib.h>
 
 #include <fstream>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
diff --git a/tests/opencascade/project_center_cell_02.cc b/tests/opencascade/project_center_cell_02.cc
index 7e581fef01..b3808c8d75 100644
--- a/tests/opencascade/project_center_cell_02.cc
+++ b/tests/opencascade/project_center_cell_02.cc
@@ -18,13 +18,13 @@
 #include <deal.II/opencascade/boundary_lib.h>
 
 #include <fstream>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
diff --git a/tests/opencascade/project_center_cell_03.cc b/tests/opencascade/project_center_cell_03.cc
index d06fafd1ac..bbeb3f7b1a 100644
--- a/tests/opencascade/project_center_cell_03.cc
+++ b/tests/opencascade/project_center_cell_03.cc
@@ -18,13 +18,13 @@
 #include <deal.II/opencascade/boundary_lib.h>
 
 #include <fstream>
-#include <base/logstream.h>
-#include <grid/tria.h>
-#include <grid/tria_accessor.h>
-#include <grid/grid_out.h>
-#include <grid/tria_iterator.h>
-#include <grid/grid_generator.h>
-#include <grid/tria_boundary_lib.h>
+#include <deal.II/base/logstream.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
diff --git a/tests/opencascade/step_create.cc b/tests/opencascade/step_create.cc
index 1e83f504b5..eaf5a4ea43 100644
--- a/tests/opencascade/step_create.cc
+++ b/tests/opencascade/step_create.cc
@@ -13,7 +13,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <TopTools.hxx>
diff --git a/tests/opencascade/step_describe.cc b/tests/opencascade/step_describe.cc
index 4ed0faea98..6b5e421a32 100644
--- a/tests/opencascade/step_describe.cc
+++ b/tests/opencascade/step_describe.cc
@@ -14,7 +14,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <TopTools.hxx>
diff --git a/tests/opencascade/step_describe_02.cc b/tests/opencascade/step_describe_02.cc
index 1fc34979e2..b6f453d506 100644
--- a/tests/opencascade/step_describe_02.cc
+++ b/tests/opencascade/step_describe_02.cc
@@ -14,7 +14,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <TopTools.hxx>
diff --git a/tests/opencascade/step_write.cc b/tests/opencascade/step_write.cc
index 3b1abaf2d8..1904cedcb6 100644
--- a/tests/opencascade/step_write.cc
+++ b/tests/opencascade/step_write.cc
@@ -14,7 +14,7 @@
 
 #include "../tests.h"
 #include <fstream>
-#include <base/logstream.h>
+#include <deal.II/base/logstream.h>
 
 #include <deal.II/opencascade/utilities.h>
 #include <TopTools.hxx>