Be more conservative with #includes.

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

diff --git a/deal.II/include/deal.II/fe/fe.h b/deal.II/include/deal.II/fe/fe.h
index 761a1c4a0af9a0c67c3fc87e8aaafd584d3b1c3d..84604ffc7e63f299dd5620d8f89538e0417de41f 100644 (file)
--- a/deal.II/include/deal.II/fe/fe.h
+++ b/deal.II/include/deal.II/fe/fe.h
@@ -23,7 +23,7 @@
 #include <deal.II/fe/fe_values_extractors.h>
 #include <deal.II/fe/component_mask.h>
 #include <deal.II/fe/block_mask.h>
-
+#include <deal.II/fe/mapping.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/include/deal.II/fe/fe_base.h b/deal.II/include/deal.II/fe/fe_base.h
index 35e7dae1af82e65fafe233c924fa72af8b7f1339..6622706e59ad1b2c27a5b004caf9fdd1177b93e2 100644 (file)
--- a/deal.II/include/deal.II/fe/fe_base.h
+++ b/deal.II/include/deal.II/fe/fe_base.h
@@ -26,8 +26,8 @@
 #include <deal.II/base/vector_slice.h>
 #include <deal.II/base/geometry_info.h>
 #include <deal.II/lac/full_matrix.h>
+#include <deal.II/lac/block_indices.h>
 #include <deal.II/fe/fe_update_flags.h>
-#include <deal.II/fe/mapping.h>
 
 #include <string>
 #include <vector>

diff --git a/deal.II/include/deal.II/fe/mapping.h b/deal.II/include/deal.II/fe/mapping.h
index 15c88ba36d930568ff0d3ba859712efcc32814f6..95eb1d3056565c62c69fdb7c5667e564a0235ce4 100644 (file)
--- a/deal.II/include/deal.II/fe/mapping.h
+++ b/deal.II/include/deal.II/fe/mapping.h
@@ -22,7 +22,6 @@
 #include <deal.II/base/derivative_form.h>
 #include <deal.II/base/vector_slice.h>
 #include <deal.II/grid/tria.h>
-#include <deal.II/dofs/dof_handler.h>
 #include <deal.II/fe/fe_update_flags.h>
 
 #include <cmath>