From 6fd2c57410251ea59a2aad4e49b67a822cb42e67 Mon Sep 17 00:00:00 2001
From: David Wells <wellsd2@rpi.edu>
Date: Wed, 26 Jul 2017 22:43:38 -0400
Subject: [PATCH] Clean up headers and forward declarations for ArrayView.

---
 include/deal.II/fe/mapping.h   | 2 +-
 source/fe/fe_poly_tensor.cc    | 1 +
 source/fe/mapping_cartesian.cc | 1 +
 source/fe/mapping_fe_field.cc  | 5 +++--
 source/fe/mapping_manifold.cc  | 1 +
 source/fe/mapping_q.cc         | 3 ++-
 source/fe/mapping_q_generic.cc | 1 +
 7 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/deal.II/fe/mapping.h b/include/deal.II/fe/mapping.h
index 5f8c882e9f..8e0bc22708 100644
--- a/include/deal.II/fe/mapping.h
+++ b/include/deal.II/fe/mapping.h
@@ -19,7 +19,6 @@
 
 #include <deal.II/base/config.h>
 #include <deal.II/base/derivative_form.h>
-#include <deal.II/base/array_view.h>
 #include <deal.II/grid/tria.h>
 #include <deal.II/fe/fe_update_flags.h>
 
@@ -28,6 +27,7 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+template <typename ElementType> class ArrayView;
 template <int dim> class Quadrature;
 template <int dim, int spacedim> class FEValues;
 template <int dim, int spacedim> class FEValuesBase;
diff --git a/source/fe/fe_poly_tensor.cc b/source/fe/fe_poly_tensor.cc
index d3d9626b44..eee6893cef 100644
--- a/source/fe/fe_poly_tensor.cc
+++ b/source/fe/fe_poly_tensor.cc
@@ -14,6 +14,7 @@
 // ---------------------------------------------------------------------
 
 
+#include <deal.II/base/array_view.h>
 #include <deal.II/base/derivative_form.h>
 #include <deal.II/base/qprojector.h>
 #include <deal.II/base/polynomials_bdm.h>
diff --git a/source/fe/mapping_cartesian.cc b/source/fe/mapping_cartesian.cc
index a8b4236af7..9b42228ad2 100644
--- a/source/fe/mapping_cartesian.cc
+++ b/source/fe/mapping_cartesian.cc
@@ -14,6 +14,7 @@
 // ---------------------------------------------------------------------
 
 
+#include <deal.II/base/array_view.h>
 #include <deal.II/base/tensor.h>
 #include <deal.II/base/quadrature.h>
 #include <deal.II/base/qprojector.h>
diff --git a/source/fe/mapping_fe_field.cc b/source/fe/mapping_fe_field.cc
index e4cad13d82..decdef0fe6 100644
--- a/source/fe/mapping_fe_field.cc
+++ b/source/fe/mapping_fe_field.cc
@@ -13,13 +13,14 @@
 //
 // ---------------------------------------------------------------------
 
-#include <deal.II/base/utilities.h>
+#include <deal.II/base/array_view.h>
+#include <deal.II/base/tensor_product_polynomials.h>
 #include <deal.II/base/polynomial.h>
 #include <deal.II/base/quadrature.h>
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/base/qprojector.h>
 #include <deal.II/base/memory_consumption.h>
-#include <deal.II/base/tensor_product_polynomials.h>
+#include <deal.II/base/utilities.h>
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 #include <deal.II/lac/block_vector.h>
diff --git a/source/fe/mapping_manifold.cc b/source/fe/mapping_manifold.cc
index 8949115094..2b98672b4f 100644
--- a/source/fe/mapping_manifold.cc
+++ b/source/fe/mapping_manifold.cc
@@ -14,6 +14,7 @@
 // ---------------------------------------------------------------------
 
 
+#include <deal.II/base/array_view.h>
 #include <deal.II/base/derivative_form.h>
 #include <deal.II/base/quadrature.h>
 #include <deal.II/base/qprojector.h>
diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc
index 340f7ba76c..043711d1a6 100644
--- a/source/fe/mapping_q.cc
+++ b/source/fe/mapping_q.cc
@@ -13,12 +13,13 @@
 //
 // ---------------------------------------------------------------------
 
-#include <deal.II/base/utilities.h>
+#include <deal.II/base/array_view.h>
 #include <deal.II/base/polynomial.h>
 #include <deal.II/base/quadrature.h>
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/tensor_product_polynomials.h>
+#include <deal.II/base/utilities.h>
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/dofs/dof_accessor.h>
diff --git a/source/fe/mapping_q_generic.cc b/source/fe/mapping_q_generic.cc
index 5c3feeed41..3b1e4962fd 100644
--- a/source/fe/mapping_q_generic.cc
+++ b/source/fe/mapping_q_generic.cc
@@ -14,6 +14,7 @@
 // ---------------------------------------------------------------------
 
 
+#include <deal.II/base/array_view.h>
 #include <deal.II/base/derivative_form.h>
 #include <deal.II/base/quadrature.h>
 #include <deal.II/base/qprojector.h>
-- 
2.39.5