From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Wed, 28 Jun 2017 01:38:45 +0000 (-0600)
Subject: Make coding style more uniform.
X-Git-Tag: v9.0.0-rc1~1465^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4555%2Fhead;p=dealii.git

Make coding style more uniform.
---

diff --git a/examples/step-26/step-26.cc b/examples/step-26/step-26.cc
index a8aa054a29..41a9d30436 100644
--- a/examples/step-26/step-26.cc
+++ b/examples/step-26/step-26.cc
@@ -76,7 +76,7 @@ namespace Step26
   // that the <code>refine_mesh</code> function takes arguments for the
   // minimal and maximal mesh refinement level. The purpose of this is
   // discussed in the introduction.
-  template<int dim>
+  template <int dim>
   class HeatEquation
   {
   public:
@@ -122,7 +122,7 @@ namespace Step26
   // right hand side is chosen as discussed at the end of the
   // introduction. For boundary values, we choose zero values, but this is
   // easily changed below.
-  template<int dim>
+  template <int dim>
   class RightHandSide : public Function<dim>
   {
   public:
@@ -141,7 +141,7 @@ namespace Step26
 
 
 
-  template<int dim>
+  template <int dim>
   double RightHandSide<dim>::value (const Point<dim> &p,
                                     const unsigned int component) const
   {
@@ -172,7 +172,7 @@ namespace Step26
 
 
 
-  template<int dim>
+  template <int dim>
   class BoundaryValues : public Function<dim>
   {
   public:
@@ -182,7 +182,7 @@ namespace Step26
 
 
 
-  template<int dim>
+  template <int dim>
   double BoundaryValues<dim>::value (const Point<dim> &/*p*/,
                                      const unsigned int component) const
   {
@@ -201,7 +201,7 @@ namespace Step26
   // on the right hand side was set to 0.2 above, so we resolve each
   // period with 100 time steps) and chooses the Crank Nicolson method
   // by setting $\theta=1/2$.
-  template<int dim>
+  template <int dim>
   HeatEquation<dim>::HeatEquation ()
     :
     fe(1),
@@ -226,7 +226,7 @@ namespace Step26
   // that defaults to an empty object). This is because we are going to
   // condense the constraints in run() after combining the matrices for the
   // current time-step.
-  template<int dim>
+  template <int dim>
   void HeatEquation<dim>::setup_system()
   {
     dof_handler.distribute_dofs(fe);
@@ -273,7 +273,7 @@ namespace Step26
   //
   // The next function is the one that solves the actual linear system
   // for a single time step. There is nothing surprising here:
-  template<int dim>
+  template <int dim>
   void HeatEquation<dim>::solve_time_step()
   {
     SolverControl solver_control(1000, 1e-8 * system_rhs.l2_norm());
@@ -296,7 +296,7 @@ namespace Step26
   // @sect4{<code>HeatEquation::output_results</code>}
   //
   // Neither is there anything new in generating graphical output:
-  template<int dim>
+  template <int dim>
   void HeatEquation<dim>::output_results() const
   {
     DataOut<dim> data_out;
@@ -440,7 +440,7 @@ namespace Step26
   // as here. Instead of trying to justify the occurrence here,
   // let's first look at the code and we'll come back to the issue
   // at the end of function.
-  template<int dim>
+  template <int dim>
   void HeatEquation<dim>::run()
   {
     const unsigned int initial_global_refinement = 2;
diff --git a/examples/step-34/step-34.cc b/examples/step-34/step-34.cc
index af57be39f4..e6b66e28c5 100644
--- a/examples/step-34/step-34.cc
+++ b/examples/step-34/step-34.cc
@@ -869,7 +869,7 @@ namespace Step34
   // as an argument is the index of the unit support point where the
   // singularity is located.
 
-  template<>
+  template <>
   const Quadrature<2> &BEMProblem<3>::get_singular_quadrature(
     const DoFHandler<2,3>::active_cell_iterator &,
     const unsigned int index) const
@@ -887,7 +887,7 @@ namespace Step34
   }
 
 
-  template<>
+  template <>
   const Quadrature<1> &BEMProblem<2>::get_singular_quadrature(
     const DoFHandler<1,2>::active_cell_iterator &cell,
     const unsigned int index) const
diff --git a/include/deal.II/base/data_out_base.h b/include/deal.II/base/data_out_base.h
index 6feeee4741..b7a2aee1b2 100644
--- a/include/deal.II/base/data_out_base.h
+++ b/include/deal.II/base/data_out_base.h
@@ -375,7 +375,7 @@ namespace DataOutBase
    *
    * @ingroup output
    */
-  template<typename FlagsType>
+  template <typename FlagsType>
   struct OutputFlagsBase
   {
     /**
@@ -406,17 +406,17 @@ namespace DataOutBase
   };
 
 
-  template<typename FlagsType>
+  template <typename FlagsType>
   void OutputFlagsBase<FlagsType>::declare_parameters (ParameterHandler &)
   {}
 
 
-  template<typename FlagsType>
+  template <typename FlagsType>
   void OutputFlagsBase<FlagsType>::parse_parameters (const ParameterHandler &)
   {}
 
 
-  template<typename FlagsType>
+  template <typename FlagsType>
   std::size_t OutputFlagsBase<FlagsType>::memory_consumption () const
   {
     return sizeof(FlagsType);
@@ -1207,13 +1207,13 @@ namespace DataOutBase
      * the point already exists and we are filtering redundant values, the
      * provided index will internally refer to another recorded point.
      */
-    template<int dim>
+    template <int dim>
     void write_point(const unsigned int &index, const Point<dim> &p);
 
     /**
      * Record a deal.II cell in the internal reordered format.
      */
-    template<int dim>
+    template <int dim>
     void write_cell(unsigned int index, unsigned int start, unsigned int d1, unsigned int d2, unsigned int d3);
 
     /**
@@ -2482,7 +2482,7 @@ public:
    * Set the flags to be used for output. This method expects <tt>flags</tt>
    * to be a member of one of the child classes of <tt>OutputFlagsBase</tt>.
    */
-  template<typename FlagType>
+  template <typename FlagType>
   void set_flags (const FlagType &flags);
 
 
diff --git a/include/deal.II/base/function_lib.h b/include/deal.II/base/function_lib.h
index 0274ef1713..46859929ff 100644
--- a/include/deal.II/base/function_lib.h
+++ b/include/deal.II/base/function_lib.h
@@ -48,7 +48,7 @@ namespace Functions
    * @ingroup functions
    * @author: Guido Kanschat, 1999
    */
-  template<int dim>
+  template <int dim>
   class SquareFunction : public Function<dim>
   {
   public:
@@ -82,7 +82,7 @@ namespace Functions
    * @ingroup functions
    * @author: Guido Kanschat, 2000
    */
-  template<int dim>
+  template <int dim>
   class Q1WedgeFunction : public Function<dim>
   {
   public:
@@ -137,7 +137,7 @@ namespace Functions
    * @ingroup functions
    * @author: Guido Kanschat, 1999
    */
-  template<int dim>
+  template <int dim>
   class PillowFunction : public Function<dim>
   {
   public:
@@ -199,7 +199,7 @@ namespace Functions
    * @ingroup functions
    * @author Guido Kanschat, 1999
    */
-  template<int dim>
+  template <int dim>
   class CosineFunction : public Function<dim>
   {
   public:
@@ -260,7 +260,7 @@ namespace Functions
    * @ingroup functions
    * @author Guido Kanschat, 2010
    */
-  template<int dim>
+  template <int dim>
   class CosineGradFunction : public Function<dim>
   {
   public:
@@ -302,7 +302,7 @@ namespace Functions
    * @ingroup functions
    * @author Guido Kanschat, 1999
    */
-  template<int dim>
+  template <int dim>
   class ExpFunction : public Function<dim>
   {
   public:
@@ -527,7 +527,7 @@ namespace Functions
    * @ingroup functions
    * @author: Guido Kanschat, 2000
    */
-  template<int dim>
+  template <int dim>
   class JumpFunction : public Function<dim>
   {
   public:
@@ -888,7 +888,7 @@ namespace Functions
    * @ingroup functions
    * @author Guido Kanschat, 2001, 2002
    */
-  template<int dim>
+  template <int dim>
   class CutOffFunctionLinfty : public CutOffFunctionBase<dim>
   {
   public:
@@ -933,7 +933,7 @@ namespace Functions
    * @ingroup functions
    * @author Guido Kanschat, 2001, 2002
    */
-  template<int dim>
+  template <int dim>
   class CutOffFunctionW1 : public CutOffFunctionBase<dim>
   {
   public:
@@ -980,7 +980,7 @@ namespace Functions
    * @ingroup functions
    * @author Guido Kanschat, 2001, 2002
    */
-  template<int dim>
+  template <int dim>
   class CutOffFunctionCinfty : public CutOffFunctionBase<dim>
   {
   public:
diff --git a/include/deal.II/base/function_time.h b/include/deal.II/base/function_time.h
index 1c80ddd2ca..7829fde73f 100644
--- a/include/deal.II/base/function_time.h
+++ b/include/deal.II/base/function_time.h
@@ -111,7 +111,7 @@ private:
 
 #ifndef DOXYGEN
 
-template<typename Number>
+template <typename Number>
 inline Number
 FunctionTime<Number>::get_time () const
 {
diff --git a/include/deal.II/base/function_time.templates.h b/include/deal.II/base/function_time.templates.h
index 5ec72ad4c5..6c42d87f4f 100644
--- a/include/deal.II/base/function_time.templates.h
+++ b/include/deal.II/base/function_time.templates.h
@@ -21,7 +21,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template<typename Number>
+template <typename Number>
 FunctionTime<Number>::FunctionTime(const Number initial_time)
   :
   time(initial_time)
@@ -29,13 +29,13 @@ FunctionTime<Number>::FunctionTime(const Number initial_time)
 
 
 
-template<typename Number>
+template <typename Number>
 FunctionTime<Number>::~FunctionTime()
 {}
 
 
 
-template<typename Number>
+template <typename Number>
 void
 FunctionTime<Number>::set_time (const Number new_time)
 {
@@ -43,7 +43,7 @@ FunctionTime<Number>::set_time (const Number new_time)
 }
 
 
-template<typename Number>
+template <typename Number>
 void
 FunctionTime<Number>::advance_time (const Number delta_t)
 {
diff --git a/include/deal.II/base/memory_consumption.h b/include/deal.II/base/memory_consumption.h
index 94d3ee412c..e22d428a99 100644
--- a/include/deal.II/base/memory_consumption.h
+++ b/include/deal.II/base/memory_consumption.h
@@ -237,7 +237,7 @@ namespace MemoryConsumption
    * @note This returns the size of the pointer, not the size of the object
    * pointed to.
    */
-  template<typename T>
+  template <typename T>
   inline
   std::size_t
   memory_consumption (const T *const);
@@ -388,7 +388,7 @@ namespace MemoryConsumption
 
 
 
-  template<typename T>
+  template <typename T>
   inline
   std::size_t
   memory_consumption(const T *const)
diff --git a/include/deal.II/base/mg_level_object.h b/include/deal.II/base/mg_level_object.h
index 1f8d689af7..cf632d0a58 100644
--- a/include/deal.II/base/mg_level_object.h
+++ b/include/deal.II/base/mg_level_object.h
@@ -43,7 +43,7 @@ DEAL_II_NAMESPACE_OPEN
  * @ingroup data
  * @author Wolfgang Bangerth, Guido Kanschat, 1999, 2005, 2010
  */
-template<class Object>
+template <class Object>
 class MGLevelObject : public Subscriptor
 {
 public:
@@ -157,7 +157,7 @@ private:
 /* ------------------------------------------------------------------- */
 
 
-template<class Object>
+template <class Object>
 MGLevelObject<Object>::MGLevelObject(const unsigned int min,
                                      const unsigned int max)
   :
@@ -167,7 +167,7 @@ MGLevelObject<Object>::MGLevelObject(const unsigned int min,
 }
 
 
-template<class Object>
+template <class Object>
 Object &
 MGLevelObject<Object>::operator[] (const unsigned int i)
 {
@@ -177,7 +177,7 @@ MGLevelObject<Object>::operator[] (const unsigned int i)
 }
 
 
-template<class Object>
+template <class Object>
 const Object &
 MGLevelObject<Object>::operator[] (const unsigned int i) const
 {
@@ -187,7 +187,7 @@ MGLevelObject<Object>::operator[] (const unsigned int i) const
 }
 
 
-template<class Object>
+template <class Object>
 void
 MGLevelObject<Object>::resize (const unsigned int new_minlevel,
                                const unsigned int new_maxlevel)
@@ -205,7 +205,7 @@ MGLevelObject<Object>::resize (const unsigned int new_minlevel,
 }
 
 
-template<class Object>
+template <class Object>
 MGLevelObject<Object> &
 MGLevelObject<Object>::operator = (const double d)
 {
@@ -216,7 +216,7 @@ MGLevelObject<Object>::operator = (const double d)
 }
 
 
-template<class Object>
+template <class Object>
 void
 MGLevelObject<Object>::clear () // DEPRECATED
 {
@@ -225,7 +225,7 @@ MGLevelObject<Object>::clear () // DEPRECATED
 }
 
 
-template<class Object>
+template <class Object>
 void
 MGLevelObject<Object>::clear_elements ()
 {
@@ -235,7 +235,7 @@ MGLevelObject<Object>::clear_elements ()
 }
 
 
-template<class Object>
+template <class Object>
 unsigned int
 MGLevelObject<Object>::min_level () const
 {
@@ -243,7 +243,7 @@ MGLevelObject<Object>::min_level () const
 }
 
 
-template<class Object>
+template <class Object>
 unsigned int
 MGLevelObject<Object>::max_level () const
 {
@@ -251,7 +251,7 @@ MGLevelObject<Object>::max_level () const
 }
 
 
-template<class Object>
+template <class Object>
 std::size_t
 MGLevelObject<Object>::memory_consumption () const
 {
diff --git a/include/deal.II/base/point.h b/include/deal.II/base/point.h
index 8b20afef3b..2e96652a7b 100644
--- a/include/deal.II/base/point.h
+++ b/include/deal.II/base/point.h
@@ -430,7 +430,7 @@ Point<dim,Number>::operator - () const
 
 
 template <int dim, typename Number>
-template<typename OtherNumber>
+template <typename OtherNumber>
 inline
 Point<dim,typename ProductType<Number, typename EnableIfScalar<OtherNumber>::type>::type>
 Point<dim,Number>::operator * (const OtherNumber factor) const
@@ -444,7 +444,7 @@ Point<dim,Number>::operator * (const OtherNumber factor) const
 
 
 template <int dim, typename Number>
-template<typename OtherNumber>
+template <typename OtherNumber>
 inline
 Point<dim,typename ProductType<Number, typename EnableIfScalar<OtherNumber>::type>::type>
 Point<dim,Number>::operator / (const OtherNumber factor) const
diff --git a/include/deal.II/base/polynomial_space.h b/include/deal.II/base/polynomial_space.h
index a8964e8fbc..5ce23ebd8e 100644
--- a/include/deal.II/base/polynomial_space.h
+++ b/include/deal.II/base/polynomial_space.h
@@ -280,7 +280,7 @@ PolynomialSpace<dim>::PolynomialSpace (const std::vector<Pol> &pols)
 }
 
 
-template<int dim>
+template <int dim>
 inline
 unsigned int
 PolynomialSpace<dim>::n() const
@@ -290,7 +290,7 @@ PolynomialSpace<dim>::n() const
 
 
 
-template<int dim>
+template <int dim>
 inline
 unsigned int
 PolynomialSpace<dim>::degree() const
diff --git a/include/deal.II/base/quadrature.h b/include/deal.II/base/quadrature.h
index 46daf6715e..f1869b6c12 100644
--- a/include/deal.II/base/quadrature.h
+++ b/include/deal.II/base/quadrature.h
@@ -325,7 +325,7 @@ private:
 // -------------------  inline and template functions ----------------
 
 
-template<int dim>
+template <int dim>
 inline
 unsigned int
 Quadrature<dim>::size () const
diff --git a/include/deal.II/base/quadrature_point_data.h b/include/deal.II/base/quadrature_point_data.h
index cb1299d8e2..715150f097 100644
--- a/include/deal.II/base/quadrature_point_data.h
+++ b/include/deal.II/base/quadrature_point_data.h
@@ -86,7 +86,7 @@ public:
    * @pre The type @p T needs to either equal @p DataType, or be a class derived
    * from @p DataType. @p T needs to be default constructible.
    */
-  template<typename T=DataType>
+  template <typename T=DataType>
   void initialize(const CellIteratorType &cell,
                   const unsigned int number_of_data_points_per_cell);
 
@@ -95,7 +95,7 @@ public:
    * until, but not including, @p cell_end for all locally owned cells, i.e.
    * for which `cell->is_locally_owned()==true` .
    */
-  template<typename T=DataType>
+  template <typename T=DataType>
   void initialize(const CellIteratorType &cell_start,
                   const CellIteratorType &cell_end,
                   const unsigned int number_of_data_points_per_cell);
@@ -126,7 +126,7 @@ public:
    *
    * @pre The type @p T needs to match the class provided to initialize() .
    */
-  template<typename T=DataType>
+  template <typename T=DataType>
   std::vector<std::shared_ptr<T> > get_data(const CellIteratorType &cell);
 
   /**
@@ -139,7 +139,7 @@ public:
    *
    * @pre The type @p T needs to match the class provided to initialize() .
    */
-  template<typename T=DataType>
+  template <typename T=DataType>
   std::vector<std::shared_ptr<const T> > get_data(const CellIteratorType &cell) const;
 
 private:
@@ -496,7 +496,7 @@ CellDataStorage<CellIteratorType,DataType>::
 
 
 template <typename CellIteratorType, typename DataType>
-template<typename T>
+template <typename T>
 void CellDataStorage<CellIteratorType,DataType>::initialize(const CellIteratorType &cell,
                                                             const unsigned int n_q_points)
 {
@@ -517,7 +517,7 @@ void CellDataStorage<CellIteratorType,DataType>::initialize(const CellIteratorTy
 
 
 template <typename CellIteratorType, typename DataType>
-template<typename T>
+template <typename T>
 void CellDataStorage<CellIteratorType,DataType>::initialize(const CellIteratorType &cell_start,
                                                             const CellIteratorType &cell_end,
                                                             const unsigned int number)
@@ -623,7 +623,7 @@ CellDataStorage<CellIteratorType,DataType>::get_data(const CellIteratorType &cel
  * whereas the second index represents different values stored at each
  * quadrature point in the DataType class.
  */
-template<typename CellIteratorType, typename DataType>
+template <typename CellIteratorType, typename DataType>
 void pack_cell_data
 (const CellIteratorType &cell,
  const CellDataStorage<CellIteratorType,DataType> *data_storage,
@@ -656,7 +656,7 @@ void pack_cell_data
 /*
  * the opposite of the pack function above.
  */
-template<typename CellIteratorType, typename DataType>
+template <typename CellIteratorType, typename DataType>
 void unpack_to_cell_data
 (const CellIteratorType &cell,
  const FullMatrix<double> &values_at_qp,
@@ -688,7 +688,7 @@ namespace parallel
 {
   namespace distributed
   {
-    template<int dim, typename DataType>
+    template <int dim, typename DataType>
     ContinuousQuadratureDataTransfer<dim,DataType>::ContinuousQuadratureDataTransfer
     (const FiniteElement<dim> &projection_fe_,
      const Quadrature<dim> &lhs_quadrature,
@@ -720,13 +720,13 @@ namespace parallel
 
 
 
-    template<int dim, typename DataType>
+    template <int dim, typename DataType>
     ContinuousQuadratureDataTransfer<dim,DataType>::~ContinuousQuadratureDataTransfer()
     {}
 
 
 
-    template<int dim, typename DataType>
+    template <int dim, typename DataType>
     void ContinuousQuadratureDataTransfer<dim,DataType>::prepare_for_coarsening_and_refinement
     (parallel::distributed::Triangulation<dim> &tr_,
      CellDataStorage<CellIteratorType,DataType> &data_storage_)
@@ -767,7 +767,7 @@ namespace parallel
 
 
 
-    template<int dim, typename DataType>
+    template <int dim, typename DataType>
     void ContinuousQuadratureDataTransfer<dim,DataType>::interpolate ()
     {
       triangulation->notify_ready_to_unpack(offset,
@@ -784,7 +784,7 @@ namespace parallel
 
 
 
-    template<int dim, typename DataType>
+    template <int dim, typename DataType>
     void ContinuousQuadratureDataTransfer<dim,DataType>::pack_function
     (const typename parallel::distributed::Triangulation<dim,dim>::cell_iterator &cell,
      const typename parallel::distributed::Triangulation<dim,dim>::CellStatus /*status*/,
@@ -802,7 +802,7 @@ namespace parallel
 
 
 
-    template<int dim, typename DataType>
+    template <int dim, typename DataType>
     void ContinuousQuadratureDataTransfer<dim,DataType>::
     unpack_function (const typename parallel::distributed::Triangulation<dim,dim>::cell_iterator &cell,
                      const typename parallel::distributed::Triangulation<dim,dim>::CellStatus status,
diff --git a/include/deal.II/base/quadrature_selector.h b/include/deal.II/base/quadrature_selector.h
index 025dc07f14..3316963106 100644
--- a/include/deal.II/base/quadrature_selector.h
+++ b/include/deal.II/base/quadrature_selector.h
@@ -36,7 +36,7 @@ DEAL_II_NAMESPACE_OPEN
  * @ingroup Quadrature
  * @author Ralf Schulz, 2003
  */
-template<int dim>
+template <int dim>
 class QuadratureSelector : public Quadrature<dim>
 {
 public:
diff --git a/include/deal.II/base/smartpointer.h b/include/deal.II/base/smartpointer.h
index 4c8e5fadfa..4be387daad 100644
--- a/include/deal.II/base/smartpointer.h
+++ b/include/deal.II/base/smartpointer.h
@@ -59,7 +59,7 @@ DEAL_II_NAMESPACE_OPEN
  * @ingroup memory
  * @author Guido Kanschat, Wolfgang Bangerth, 1998 - 2009
  */
-template<typename T, typename P = void>
+template <typename T, typename P = void>
 class SmartPointer
 {
 public:
diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h
index 17289b48f2..f8fef1f735 100644
--- a/include/deal.II/base/table.h
+++ b/include/deal.II/base/table.h
@@ -471,7 +471,7 @@ public:
    * This function requires that the type <tt>T2</tt> is convertible to
    * <tt>T</tt>.
    */
-  template<typename T2>
+  template <typename T2>
   TableBase<N,T> &operator = (const TableBase<N,T2> &src);
 
   /**
diff --git a/include/deal.II/base/table_handler.h b/include/deal.II/base/table_handler.h
index cc79e2c0fa..79d68ae21a 100644
--- a/include/deal.II/base/table_handler.h
+++ b/include/deal.II/base/table_handler.h
@@ -600,7 +600,7 @@ protected:
      */
     template <class Archive>
     void save(Archive &ar, const unsigned int version) const;
-    template<class Archive>
+    template <class Archive>
     void load(Archive &ar, const unsigned int version);
     BOOST_SERIALIZATION_SPLIT_MEMBER()
 
@@ -908,7 +908,7 @@ TableHandler::Column::save(Archive &ar, const unsigned int /*version*/) const
 
 
 
-template<class Archive>
+template <class Archive>
 void
 TableHandler::Column::load(Archive &ar, const unsigned int /*version*/)
 {
diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h
index 58748bae72..a34599104e 100644
--- a/include/deal.II/base/tensor.h
+++ b/include/deal.II/base/tensor.h
@@ -181,25 +181,25 @@ public:
   /**
    * Test for equality of two tensors.
    */
-  template<typename OtherNumber>
+  template <typename OtherNumber>
   bool operator == (const Tensor<0,dim,OtherNumber> &rhs) const;
 
   /**
    * Test for inequality of two tensors.
    */
-  template<typename OtherNumber>
+  template <typename OtherNumber>
   bool operator != (const Tensor<0,dim,OtherNumber> &rhs) const;
 
   /**
    * Add another scalar
    */
-  template<typename OtherNumber>
+  template <typename OtherNumber>
   Tensor<0,dim,Number> &operator += (const Tensor<0,dim,OtherNumber> &rhs);
 
   /**
    * Subtract another scalar.
    */
-  template<typename OtherNumber>
+  template <typename OtherNumber>
   Tensor<0,dim,Number> &operator -= (const Tensor<0,dim,OtherNumber> &rhs);
 
   /**
@@ -207,13 +207,13 @@ public:
    *
    * @ingroup CUDAWrappers
    */
-  template<typename OtherNumber>
+  template <typename OtherNumber>
   DEAL_II_CUDA_HOST_DEV Tensor<0,dim,Number> &operator *= (const OtherNumber factor);
 
   /**
    * Divide the scalar by <tt>factor</tt>.
    */
-  template<typename OtherNumber>
+  template <typename OtherNumber>
   Tensor<0,dim,Number> &operator /= (const OtherNumber factor);
 
   /**
@@ -1619,9 +1619,9 @@ scalar_product (const Tensor<rank, dim, Number> &left,
  * @relates Tensor
  * @author Matthias Maier, 2015, Jean-Paul Pelteret 2017
  */
-template <template<int, int, typename> class TensorT1,
-          template<int, int, typename> class TensorT2,
-          template<int, int, typename> class TensorT3,
+template <template <int, int, typename> class TensorT1,
+          template <int, int, typename> class TensorT2,
+          template <int, int, typename> class TensorT3,
           int rank_1, int rank_2, int dim,
           typename T1, typename T2, typename T3>
 typename ProductType<T1, typename ProductType<T2, T3>::type>::type
diff --git a/include/deal.II/base/tensor_accessors.h b/include/deal.II/base/tensor_accessors.h
index 89720cb856..52c7ca7bf1 100644
--- a/include/deal.II/base/tensor_accessors.h
+++ b/include/deal.II/base/tensor_accessors.h
@@ -52,7 +52,7 @@ DEAL_II_NAMESPACE_OPEN
  * <code>operator[](unsigned int)</code> that returns a (const or non-const)
  * reference of <code>value_type</code>:
  * @code
- *   template<...>
+ *   template <...>
  *   class T
  *   {
  *     typedef ... value_type;
@@ -214,7 +214,7 @@ namespace TensorAccessors
    *
    * @author Matthias Maier, 2015
    */
-  template<int rank, typename T, typename ArrayType> typename
+  template <int rank, typename T, typename ArrayType> typename
   ReturnType<rank, T>::value_type &
   extract(T &t, const ArrayType &indices)
   {
@@ -331,7 +331,7 @@ namespace TensorAccessors
      * StoreIndex and ReorderedIndexView that return rvalues, we have to
      * return by value.
      */
-    template<typename T>
+    template <typename T>
     struct ReferenceType
     {
       typedef T &type;
@@ -538,10 +538,10 @@ namespace TensorAccessors
     // Straightforward recursion implemented by specializing ExtractHelper
     // for position == rank. We use the type trait ReturnType<rank, T> to
     // have an idea what the final type will be.
-    template<int position, int rank>
+    template <int position, int rank>
     struct ExtractHelper
     {
-      template<typename T, typename ArrayType>
+      template <typename T, typename ArrayType>
       inline
       static
       typename ReturnType<rank - position, T>::value_type &
@@ -556,10 +556,10 @@ namespace TensorAccessors
 
     // For position == rank there is nothing to extract, just return the
     // object.
-    template<int rank>
+    template <int rank>
     struct ExtractHelper<rank, rank>
     {
-      template<typename T, typename ArrayType>
+      template <typename T, typename ArrayType>
       inline
       static
       T &extract(T &t,
@@ -589,7 +589,7 @@ namespace TensorAccessors
     class Contract
     {
     public:
-      template<typename T1, typename T2, typename T3>
+      template <typename T1, typename T2, typename T3>
       inline DEAL_II_ALWAYS_INLINE static
       void contract(T1 &result, const T2 &left, const T3 &right)
       {
@@ -617,7 +617,7 @@ namespace TensorAccessors
     class Contract<no_contr, no_contr, rank_2, dim>
     {
     public:
-      template<typename T1, typename T2, typename T3>
+      template <typename T1, typename T2, typename T3>
       inline DEAL_II_ALWAYS_INLINE static
       void contract(T1 &result, const T2 &left, const T3 &right)
       {
@@ -645,7 +645,7 @@ namespace TensorAccessors
     class Contract<no_contr, no_contr, no_contr, dim>
     {
     public:
-      template<typename T1, typename T2, typename T3>
+      template <typename T1, typename T2, typename T3>
       inline DEAL_II_ALWAYS_INLINE static
       void contract(T1 &result, const T2 &left, const T3 &right)
       {
@@ -661,7 +661,7 @@ namespace TensorAccessors
     class Contract2
     {
     public:
-      template<typename T1, typename T2, typename T3>
+      template <typename T1, typename T2, typename T3>
       inline DEAL_II_ALWAYS_INLINE static
       T1 contract2(const T2 &left, const T3 &right)
       {
@@ -679,7 +679,7 @@ namespace TensorAccessors
     class Contract2<0, dim>
     {
     public:
-      template<typename T1, typename T2, typename T3>
+      template <typename T1, typename T2, typename T3>
       inline DEAL_II_ALWAYS_INLINE static
       T1 contract2(const T2 &left, const T3 &right)
       {
@@ -706,7 +706,7 @@ namespace TensorAccessors
     class Contract3
     {
     public:
-      template<typename T1, typename T2, typename T3, typename T4>
+      template <typename T1, typename T2, typename T3, typename T4>
       static inline
       T1 contract3(const T2 &left, const T3 &middle, const T4 &right)
       {
@@ -732,7 +732,7 @@ namespace TensorAccessors
     class Contract3<0, rank_2, dim>
     {
     public:
-      template<typename T1, typename T2, typename T3, typename T4>
+      template <typename T1, typename T2, typename T3, typename T4>
       static inline
       T1 contract3(const T2 &left, const T3 &middle, const T4 &right)
       {
@@ -750,7 +750,7 @@ namespace TensorAccessors
     class Contract3<0, 0, dim>
     {
     public:
-      template<typename T1, typename T2, typename T3, typename T4>
+      template <typename T1, typename T2, typename T3, typename T4>
       static inline
       T1 contract3(const T2 &left, const T3 &middle, const T4 &right)
       {
diff --git a/include/deal.II/base/utilities.h b/include/deal.II/base/utilities.h
index 867a75f78a..39a848324c 100644
--- a/include/deal.II/base/utilities.h
+++ b/include/deal.II/base/utilities.h
@@ -326,7 +326,7 @@ namespace Utilities
    * This function simply makes the assumption that the sequence is sorted,
    * and we simply don't do the additional check.
    */
-  template<typename Iterator, typename T>
+  template <typename Iterator, typename T>
   Iterator
   lower_bound (Iterator  first,
                Iterator  last,
@@ -338,7 +338,7 @@ namespace Utilities
    * compare individual elements of the sequence of objects pointed to by the
    * iterators.
    */
-  template<typename Iterator, typename T, typename Comp>
+  template <typename Iterator, typename T, typename Comp>
   Iterator
   lower_bound (Iterator   first,
                Iterator   last,
@@ -618,7 +618,7 @@ namespace Utilities
 
 
 
-  template<typename Iterator, typename T>
+  template <typename Iterator, typename T>
   inline
   Iterator
   lower_bound (Iterator  first,
@@ -631,7 +631,7 @@ namespace Utilities
 
 
 
-  template<typename Iterator, typename T, typename Comp>
+  template <typename Iterator, typename T, typename Comp>
   inline
   Iterator
   lower_bound (Iterator    first,
diff --git a/include/deal.II/base/vectorization.h b/include/deal.II/base/vectorization.h
index 96e2d941d5..96231eaf35 100644
--- a/include/deal.II/base/vectorization.h
+++ b/include/deal.II/base/vectorization.h
@@ -87,7 +87,7 @@ namespace internal
 // Enable the EnableIfScalar type trait for VectorizedArray<Number> such
 // that it can be used as a Number type in Tensor<rank,dim,Number>, etc.
 
-template<typename Number>
+template <typename Number>
 struct EnableIfScalar<VectorizedArray<Number> >
 {
   typedef VectorizedArray<typename EnableIfScalar<Number>::type> type;
@@ -877,7 +877,7 @@ vectorized_transpose_and_store(const bool                     add_into,
 /**
  * Specialization for float and AVX512.
  */
-template<>
+template <>
 class VectorizedArray<float>
 {
 public:
@@ -1648,7 +1648,7 @@ vectorized_transpose_and_store(const bool                     add_into,
 /**
  * Specialization for float and AVX.
  */
-template<>
+template <>
 class VectorizedArray<float>
 {
 public:
diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h
index 2fe9c739f6..1fb2741a08 100644
--- a/include/deal.II/dofs/dof_accessor.templates.h
+++ b/include/deal.II/dofs/dof_accessor.templates.h
@@ -687,7 +687,7 @@ namespace internal
       }
 
 
-      template<int dim, int spacedim>
+      template <int dim, int spacedim>
       static
       types::global_dof_index
       mg_vertex_dof_index (const dealii::DoFHandler<dim,spacedim> &dof_handler,
@@ -699,7 +699,7 @@ namespace internal
       }
 
 
-      template<int dim, int spacedim>
+      template <int dim, int spacedim>
       static
       types::global_dof_index
       mg_vertex_dof_index (const dealii::hp::DoFHandler<dim,spacedim> &,
@@ -712,7 +712,7 @@ namespace internal
       }
 
 
-      template<int dim, int spacedim>
+      template <int dim, int spacedim>
       static
       void
       set_mg_vertex_dof_index (dealii::DoFHandler<dim,spacedim> &dof_handler,
@@ -725,7 +725,7 @@ namespace internal
       }
 
 
-      template<int dim, int spacedim>
+      template <int dim, int spacedim>
       static
       void
       set_mg_vertex_dof_index (dealii::hp::DoFHandler<dim,spacedim> &,
@@ -1244,7 +1244,7 @@ namespace internal
       }
 
 
-      template<int dim, int spacedim>
+      template <int dim, int spacedim>
       static
       types::global_dof_index
       get_vertex_dof_index (const dealii::hp::DoFHandler<dim,spacedim> &dof_handler,
@@ -1302,7 +1302,7 @@ namespace internal
        * Return the number of different finite elements that are active on a
        * given vertex.
        */
-      template<int dim, int spacedim>
+      template <int dim, int spacedim>
       static
       unsigned int
       n_active_vertex_fe_indices (const dealii::hp::DoFHandler<dim,spacedim> &dof_handler,
@@ -1349,7 +1349,7 @@ namespace internal
        * Return the fe index of the n-th finite element active on a given
        * vertex.
        */
-      template<int dim, int spacedim>
+      template <int dim, int spacedim>
       static
       unsigned int
       nth_active_vertex_fe_index (const dealii::hp::DoFHandler<dim,spacedim> &dof_handler,
@@ -1406,7 +1406,7 @@ namespace internal
        * Return whether a particular finite element index is active on the
        * specified vertex.
        */
-      template<int dim, int spacedim>
+      template <int dim, int spacedim>
       static
       bool
       fe_is_active_on_vertex (const dealii::hp::DoFHandler<dim,spacedim> &dof_handler,
@@ -1456,7 +1456,7 @@ namespace internal
           }
       }
 
-      template<typename DoFHandlerType, bool level_dof_access>
+      template <typename DoFHandlerType, bool level_dof_access>
       static
       void set_mg_dof_indices (const dealii::DoFAccessor<1,DoFHandlerType,level_dof_access> &,
                                const int,
@@ -1468,7 +1468,7 @@ namespace internal
 
 
 
-      template<typename DoFHandlerType, bool level_dof_access>
+      template <typename DoFHandlerType, bool level_dof_access>
       static
       void set_mg_dof_indices (dealii::DoFAccessor<2, DoFHandlerType,level_dof_access> &accessor,
                                const int level,
@@ -1495,7 +1495,7 @@ namespace internal
 
 
 
-      template<typename DoFHandlerType, bool level_dof_access>
+      template <typename DoFHandlerType, bool level_dof_access>
       static
       void set_mg_dof_indices
       (const dealii::DoFAccessor<3, DoFHandlerType,level_dof_access>      &accessor,
@@ -1614,7 +1614,7 @@ DoFAccessor<dim,DoFHandlerType,level_dof_access>::dof_index (const unsigned int
 }
 
 
-template<int structdim, typename DoFHandlerType, bool level_dof_access>
+template <int structdim, typename DoFHandlerType, bool level_dof_access>
 inline
 types::global_dof_index
 DoFAccessor<structdim, DoFHandlerType,level_dof_access>::mg_dof_index (const int level,
@@ -1710,7 +1710,7 @@ DoFAccessor<structdim, DoFHandlerType,level_dof_access>::vertex_dof_index
 }
 
 
-template<int structdim, typename DoFHandlerType, bool level_dof_access>
+template <int structdim, typename DoFHandlerType, bool level_dof_access>
 inline
 types::global_dof_index
 DoFAccessor<structdim, DoFHandlerType,level_dof_access>::mg_vertex_dof_index (const int level,
@@ -1751,7 +1751,7 @@ DoFAccessor<structdim, DoFHandlerType,level_dof_access>::set_vertex_dof_index (c
 }
 
 
-template<int structdim, typename DoFHandlerType, bool level_dof_access>
+template <int structdim, typename DoFHandlerType, bool level_dof_access>
 inline
 void
 DoFAccessor<structdim, DoFHandlerType,level_dof_access>::set_mg_vertex_dof_index
@@ -1778,7 +1778,7 @@ DoFAccessor<structdim, DoFHandlerType,level_dof_access>::set_mg_vertex_dof_index
 }
 
 
-template<int structdim, typename DoFHandlerType, bool level_dof_access>
+template <int structdim, typename DoFHandlerType, bool level_dof_access>
 inline
 void
 DoFAccessor<structdim, DoFHandlerType,level_dof_access>::set_mg_dof_index
@@ -1942,7 +1942,7 @@ namespace internal
 
 
 
-    template<typename DoFHandlerType, bool level_dof_access>
+    template <typename DoFHandlerType, bool level_dof_access>
     void get_mg_dof_indices
     (const dealii::DoFAccessor<1, DoFHandlerType,level_dof_access> &accessor,
      const int                                                      level,
@@ -1967,7 +1967,7 @@ namespace internal
 
 
 
-    template<typename DoFHandlerType, bool level_dof_access>
+    template <typename DoFHandlerType, bool level_dof_access>
     void get_mg_dof_indices (const dealii::DoFAccessor<2, DoFHandlerType,level_dof_access> &accessor,
                              const int level,
                              std::vector<types::global_dof_index> &dof_indices,
@@ -1995,7 +1995,7 @@ namespace internal
 
 
 
-    template<typename DoFHandlerType, bool level_dof_access>
+    template <typename DoFHandlerType, bool level_dof_access>
     void get_mg_dof_indices
     (const dealii::DoFAccessor<3, DoFHandlerType,level_dof_access> &accessor,
      const int                                                      level,
@@ -2100,7 +2100,7 @@ DoFAccessor<structdim,DoFHandlerType,level_dof_access>::get_dof_indices
 
 
 
-template<int structdim, typename DoFHandlerType, bool level_dof_access>
+template <int structdim, typename DoFHandlerType, bool level_dof_access>
 inline
 void DoFAccessor<structdim, DoFHandlerType,level_dof_access>::get_mg_dof_indices
 (const int                             level,
@@ -2152,7 +2152,7 @@ void DoFAccessor<structdim, DoFHandlerType,level_dof_access>::get_mg_dof_indices
 }
 
 
-template<int structdim, typename DoFHandlerType, bool level_dof_access>
+template <int structdim, typename DoFHandlerType, bool level_dof_access>
 inline
 void DoFAccessor<structdim, DoFHandlerType,level_dof_access>::set_mg_dof_indices
 (const int                                   level,
@@ -2218,7 +2218,7 @@ namespace internal
     }
 
 
-    template<bool level_dof_access>
+    template <bool level_dof_access>
     inline
     typename dealii::internal::DoFHandler::Iterators<dealii::DoFHandler<2,2>, level_dof_access>::quad_iterator
     get_quad(const dealii::Triangulation<2,2> *,
@@ -2229,7 +2229,7 @@ namespace internal
       return typename dealii::internal::DoFHandler::Iterators<dealii::DoFHandler<2,2>, level_dof_access>::line_iterator();
     }
 
-    template<bool level_dof_access>
+    template <bool level_dof_access>
     inline
     typename dealii::internal::DoFHandler::Iterators<dealii::DoFHandler<2,3>, level_dof_access>::quad_iterator
     get_quad(const dealii::Triangulation<2,3> *,
@@ -2240,7 +2240,7 @@ namespace internal
       return typename dealii::internal::DoFHandler::Iterators<dealii::DoFHandler<2,3>, level_dof_access>::line_iterator();
     }
 
-    template<bool level_dof_access>
+    template <bool level_dof_access>
     inline
     typename dealii::internal::DoFHandler::Iterators<dealii::hp::DoFHandler<2,2>, level_dof_access>::quad_iterator
     get_quad(const dealii::Triangulation<2,2> *,
@@ -2251,7 +2251,7 @@ namespace internal
       return typename dealii::internal::DoFHandler::Iterators<dealii::hp::DoFHandler<2,2>, level_dof_access>::line_iterator();
     }
 
-    template<bool level_dof_access>
+    template <bool level_dof_access>
     inline
     typename dealii::internal::DoFHandler::Iterators<dealii::hp::DoFHandler<2,3>, level_dof_access>::quad_iterator
     get_quad(const dealii::Triangulation<2,3> *,
@@ -3585,7 +3585,7 @@ DoFCellAccessor<DoFHandlerType,level_dof_access>::get_dof_indices
 
 
 
-template<typename DoFHandlerType, bool level_dof_access>
+template <typename DoFHandlerType, bool level_dof_access>
 inline
 void DoFCellAccessor<DoFHandlerType,level_dof_access>::get_mg_dof_indices
 (std::vector<types::global_dof_index> &dof_indices) const
@@ -3595,7 +3595,7 @@ void DoFCellAccessor<DoFHandlerType,level_dof_access>::get_mg_dof_indices
 
 
 
-template<typename DoFHandlerType, bool level_dof_access>
+template <typename DoFHandlerType, bool level_dof_access>
 inline
 void DoFCellAccessor<DoFHandlerType,level_dof_access>::set_mg_dof_indices
 (const std::vector<types::global_dof_index> &dof_indices)
@@ -3605,7 +3605,7 @@ void DoFCellAccessor<DoFHandlerType,level_dof_access>::set_mg_dof_indices
 
 
 
-template<typename DoFHandlerType, bool level_dof_access>
+template <typename DoFHandlerType, bool level_dof_access>
 inline
 void DoFCellAccessor<DoFHandlerType,level_dof_access>::get_active_or_mg_dof_indices
 (std::vector<types::global_dof_index> &dof_indices) const
diff --git a/include/deal.II/dofs/dof_faces.h b/include/deal.II/dofs/dof_faces.h
index f4ea6b48f3..338fc51f59 100644
--- a/include/deal.II/dofs/dof_faces.h
+++ b/include/deal.II/dofs/dof_faces.h
@@ -64,7 +64,7 @@ namespace internal
      *
      * @author Tobias Leicht, 2006
      */
-    template<int dim>
+    template <int dim>
     class DoFFaces
     {
       /**
@@ -81,7 +81,7 @@ namespace internal
      *
      * @author Tobias Leicht, 2006
      */
-    template<>
+    template <>
     class DoFFaces<1>
     {
     public:
@@ -106,7 +106,7 @@ namespace internal
      *
      * @author Tobias Leicht, 2006
      */
-    template<>
+    template <>
     class DoFFaces<2>
     {
     public:
@@ -136,7 +136,7 @@ namespace internal
      *
      * @author Tobias Leicht, 2006
      */
-    template<>
+    template <>
     class DoFFaces<3>
     {
     public:
diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h
index c238e6f144..fbb876662d 100644
--- a/include/deal.II/dofs/dof_handler.h
+++ b/include/deal.II/dofs/dof_handler.h
@@ -736,7 +736,7 @@ public:
    *
    * The type of boundary_ids equals typename FunctionMap<spacedim,number>::type .
    */
-  template<typename number>
+  template <typename number>
   types::global_dof_index
   n_boundary_dofs (const std::map<types::boundary_id, const Function<spacedim,number>*> &boundary_ids) const;
 
@@ -1161,7 +1161,7 @@ DoFHandler<dim,spacedim>::n_dofs () const
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 inline
 types::global_dof_index DoFHandler<dim, spacedim>::n_dofs (const unsigned int level) const
 {
@@ -1289,7 +1289,7 @@ namespace internal
    *
    * Defined in dof_handler.cc.
    */
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   std::string policy_to_string(const dealii::internal::DoFHandler::Policy::PolicyBase<dim,spacedim> &policy);
 }
 
@@ -1375,7 +1375,7 @@ DoFHandler<dim, spacedim>::MGVertexDoFs::get_index (const unsigned int level,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 inline
 void
 DoFHandler<dim, spacedim>::MGVertexDoFs::set_index (const unsigned int level,
diff --git a/include/deal.II/dofs/dof_tools.h b/include/deal.II/dofs/dof_tools.h
index e098966ce4..184b825fe2 100644
--- a/include/deal.II/dofs/dof_tools.h
+++ b/include/deal.II/dofs/dof_tools.h
@@ -665,7 +665,7 @@ namespace DoFTools
    *
    * @ingroup constraints
    */
-  template<typename DoFHandlerType, typename SparsityPatternType>
+  template <typename DoFHandlerType, typename SparsityPatternType>
   void
   make_flux_sparsity_pattern (const DoFHandlerType &dof_handler,
                               SparsityPatternType  &sparsity_pattern);
@@ -678,7 +678,7 @@ namespace DoFTools
    *
    * @ingroup constraints
    */
-  template<typename DoFHandlerType, typename SparsityPatternType>
+  template <typename DoFHandlerType, typename SparsityPatternType>
   void
   make_flux_sparsity_pattern (const DoFHandlerType      &dof_handler,
                               SparsityPatternType       &sparsity_pattern,
@@ -1081,7 +1081,7 @@ namespace DoFTools
    *
    * @author Matthias Maier, 2012 - 2015
    */
-  template<typename FaceIterator>
+  template <typename FaceIterator>
   void
   make_periodicity_constraints
   (const FaceIterator                          &face_1,
@@ -1117,7 +1117,7 @@ namespace DoFTools
    *
    * @author Daniel Arndt, Matthias Maier, 2013 - 2015
    */
-  template<typename DoFHandlerType>
+  template <typename DoFHandlerType>
   void
   make_periodicity_constraints
   (const std::vector<GridTools::PeriodicFacePair<typename DoFHandlerType::cell_iterator> >
@@ -1158,7 +1158,7 @@ namespace DoFTools
    *
    * @author Matthias Maier, 2012
    */
-  template<typename DoFHandlerType>
+  template <typename DoFHandlerType>
   void
   make_periodicity_constraints
   (const DoFHandlerType     &dof_handler,
@@ -1194,7 +1194,7 @@ namespace DoFTools
    * @ref GlossPeriodicConstraints "Glossary entry on periodic boundary conditions"
    * for further information.
    */
-  template<typename DoFHandlerType>
+  template <typename DoFHandlerType>
   void
   make_periodicity_constraints
   (const DoFHandlerType     &dof_handler,
diff --git a/include/deal.II/dofs/function_map.h b/include/deal.II/dofs/function_map.h
index 5e8f2405fb..961116babb 100644
--- a/include/deal.II/dofs/function_map.h
+++ b/include/deal.II/dofs/function_map.h
@@ -70,7 +70,7 @@ template <int spacedim, typename Number> class Function;
  * @ingroup functions
  * @author Wolfgang Bangerth, Ralf Hartmann, 2001
  */
-template<int dim,typename Number=double>
+template <int dim,typename Number=double>
 struct FunctionMap
 {
   /**
diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h
index 37b9ffed1f..e111d4831b 100644
--- a/include/deal.II/fe/fe_tools.h
+++ b/include/deal.II/fe/fe_tools.h
@@ -143,7 +143,7 @@ namespace FETools
    * While the first vector is checked to have the correct size, the second
    * one is reinitialized for convenience.
    */
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void compute_component_wise(
     const FiniteElement<dim,spacedim>                &fe,
     std::vector<unsigned int>               &renumbering,
@@ -164,7 +164,7 @@ namespace FETools
    * indicates the index which this degree of freedom receives in a numbering
    * scheme, where the first block is numbered completely before the second.
    */
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void compute_block_renumbering (
     const FiniteElement<dim,spacedim>  &fe,
     std::vector<types::global_dof_index> &renumbering,
diff --git a/include/deal.II/fe/mapping_c1.h b/include/deal.II/fe/mapping_c1.h
index 8c6512ca31..82c95674a3 100644
--- a/include/deal.II/fe/mapping_c1.h
+++ b/include/deal.II/fe/mapping_c1.h
@@ -38,7 +38,7 @@ DEAL_II_NAMESPACE_OPEN
  *
  * @author Wolfgang Bangerth, 2001, 2015
  */
-template<int dim, int spacedim=dim>
+template <int dim, int spacedim=dim>
 class MappingC1 : public MappingQ<dim,spacedim>
 {
 public:
diff --git a/include/deal.II/fe/mapping_manifold.h b/include/deal.II/fe/mapping_manifold.h
index b75923ef36..9fd359330c 100644
--- a/include/deal.II/fe/mapping_manifold.h
+++ b/include/deal.II/fe/mapping_manifold.h
@@ -395,7 +395,7 @@ public:
 
 #ifndef DOXYGEN
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 inline
 void
 MappingManifold<dim,spacedim>::InternalData::store_vertices (const typename Triangulation<dim,spacedim>::cell_iterator &cell) const
diff --git a/include/deal.II/fe/mapping_q_generic.h b/include/deal.II/fe/mapping_q_generic.h
index 99e101e8d7..a98193885e 100644
--- a/include/deal.II/fe/mapping_q_generic.h
+++ b/include/deal.II/fe/mapping_q_generic.h
@@ -700,7 +700,7 @@ protected:
 
 #ifndef DOXYGEN
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 inline
 const double &
 MappingQGeneric<dim,spacedim>::InternalData::shape (const unsigned int qpoint,
@@ -714,7 +714,7 @@ MappingQGeneric<dim,spacedim>::InternalData::shape (const unsigned int qpoint,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 inline
 double &
 MappingQGeneric<dim,spacedim>::InternalData::shape (const unsigned int qpoint,
@@ -727,7 +727,7 @@ MappingQGeneric<dim,spacedim>::InternalData::shape (const unsigned int qpoint,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 inline
 const Tensor<1,dim> &
 MappingQGeneric<dim,spacedim>::InternalData::derivative (const unsigned int qpoint,
@@ -741,7 +741,7 @@ MappingQGeneric<dim,spacedim>::InternalData::derivative (const unsigned int qpoi
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 inline
 Tensor<1,dim> &
 MappingQGeneric<dim,spacedim>::InternalData::derivative (const unsigned int qpoint,
diff --git a/include/deal.II/grid/cell_id.h b/include/deal.II/grid/cell_id.h
index 2f18a8e86d..2016476ce1 100644
--- a/include/deal.II/grid/cell_id.h
+++ b/include/deal.II/grid/cell_id.h
@@ -113,13 +113,13 @@ public:
   /**
    * Return a compact and fast binary representation of this CellId.
    */
-  template<int dim>
+  template <int dim>
   binary_type to_binary() const;
 
   /**
    * Return a cell_iterator to the cell represented by this CellId.
    */
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   typename Triangulation<dim,spacedim>::cell_iterator
   to_cell(const Triangulation<dim,spacedim> &tria) const;
 
diff --git a/include/deal.II/grid/grid_generator.h b/include/deal.II/grid/grid_generator.h
index d2fa439c4a..a38169d271 100644
--- a/include/deal.II/grid/grid_generator.h
+++ b/include/deal.II/grid/grid_generator.h
@@ -884,7 +884,7 @@ namespace GridGenerator
    * and 6 in 3d). If @p colorize is set to false, then flat faces get the
    * number 0 and the hole gets number 1.
    */
-  template<int dim>
+  template <int dim>
   void hyper_cube_with_cylindrical_hole (
     Triangulation<dim> &triangulation,
     const double        inner_radius = .25,
diff --git a/include/deal.II/grid/grid_reordering.h b/include/deal.II/grid/grid_reordering.h
index aa09acb320..3d4ee4e9f7 100644
--- a/include/deal.II/grid/grid_reordering.h
+++ b/include/deal.II/grid/grid_reordering.h
@@ -672,17 +672,17 @@ public:
 
 
 // declaration of explicit specializations
-template<>
+template <>
 void
 GridReordering<2>::invert_all_cells_of_negative_grid(const std::vector<Point<2> > &all_vertices,
                                                      std::vector<CellData<2> >    &cells);
 
-template<>
+template <>
 void
 GridReordering<2,3>::invert_all_cells_of_negative_grid(const std::vector<Point<3> > &all_vertices,
                                                        std::vector<CellData<2> >    &cells);
 
-template<>
+template <>
 void
 GridReordering<3>::invert_all_cells_of_negative_grid(const std::vector<Point<3> > &all_vertices,
                                                      std::vector<CellData<3> >    &cells);
diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h
index 37198c9744..1a2532d306 100644
--- a/include/deal.II/grid/grid_tools.h
+++ b/include/deal.II/grid/grid_tools.h
@@ -50,14 +50,14 @@ class SparsityPattern;
 
 namespace internal
 {
-  template<int dim, int spacedim, class MeshType>
+  template <int dim, int spacedim, class MeshType>
   class ActiveCellIterator
   {
   public:
     typedef typename MeshType::active_cell_iterator type;
   };
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   class ActiveCellIterator<dim, spacedim, dealii::DoFHandler<dim, spacedim> >
   {
   public:
@@ -68,7 +68,7 @@ namespace internal
 #endif
   };
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   class ActiveCellIterator<dim, spacedim, dealii::hp::DoFHandler<dim, spacedim> >
   {
   public:
@@ -284,7 +284,7 @@ namespace GridTools
    *
    * @note Implemented for dim=1, 2, and 3.
    */
-  template<int dim>
+  template <int dim>
   void
   rotate (const double          angle,
           const unsigned int    axis,
@@ -424,7 +424,7 @@ namespace GridTools
    *
    * @author Mauro Bardelloni, Luca Heltai, Andrea Mola, 2016
    */
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   remove_hanging_nodes( Triangulation<dim,spacedim> &tria,
                         const bool isotropic = false,
@@ -455,7 +455,7 @@ namespace GridTools
    *
    * @author Mauro Bardelloni, Luca Heltai, Andrea Mola, 2016
    */
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   remove_anisotropy(  Triangulation<dim,spacedim> &tria,
                       const double max_ratio = 1.6180339887,
@@ -610,7 +610,7 @@ namespace GridTools
    * right thing with anisotropically refined meshes. It needs to be checked
    * for this case.
    */
-  template<int dim, template <int, int> class MeshType, int spacedim>
+  template <int dim, template <int, int> class MeshType, int spacedim>
 #ifndef _MSC_VER
   std::vector<typename MeshType<dim, spacedim>::active_cell_iterator>
 #else
@@ -736,7 +736,7 @@ namespace GridTools
    * evaluating the solution) may not be possible and you will have to decide
    * what to do in that case.
    */
-  template <int dim, template<int, int> class MeshType, int spacedim>
+  template <int dim, template <int, int> class MeshType, int spacedim>
 #ifndef _MSC_VER
   std::pair<typename MeshType<dim, spacedim>::active_cell_iterator, Point<dim> >
 #else
@@ -824,7 +824,7 @@ namespace GridTools
    * An example of a custom predicate is one that checks for a given material
    * id
    * @code
-   * template<int dim>
+   * template <int dim>
    * bool
    * pred_mat_id(const typename Triangulation<dim>::active_cell_iterator & cell)
    * {
@@ -1004,7 +1004,7 @@ namespace GridTools
    * For a description of how predicate works,
    * see compute_active_cell_halo_layer()
    */
-  template<class MeshType>
+  template <class MeshType>
   std::pair< Point<MeshType::space_dimension>, Point<MeshType::space_dimension> >
   compute_bounding_box
   ( const MeshType                                                                    &mesh,
@@ -1052,7 +1052,7 @@ namespace GridTools
    *
    * @author Mauro Bardelloni, Luca Heltai, Andrea Mola, 2016
    */
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   std::pair<unsigned int, double>
   get_longest_direction(typename Triangulation<dim, spacedim>::active_cell_iterator cell);
 
@@ -1565,7 +1565,7 @@ namespace GridTools
    * constraints and a periodic p4est forest with respect to two 'periodic'
    * cell faces.
    */
-  template<typename CellIterator>
+  template <typename CellIterator>
   struct PeriodicFacePair
   {
     /**
@@ -1667,7 +1667,7 @@ namespace GridTools
    *
    * @author Matthias Maier, 2012
    */
-  template<typename FaceIterator>
+  template <typename FaceIterator>
   bool
   orthogonal_equality (std::bitset<3>     &orientation,
                        const FaceIterator &face1,
@@ -1681,7 +1681,7 @@ namespace GridTools
   /**
    * Same function as above, but doesn't return the actual orientation
    */
-  template<typename FaceIterator>
+  template <typename FaceIterator>
   bool
   orthogonal_equality (const FaceIterator &face1,
                        const FaceIterator &face2,
diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
index ffcf1317da..80d8cbf20e 100644
--- a/include/deal.II/grid/tria.h
+++ b/include/deal.II/grid/tria.h
@@ -51,7 +51,7 @@ template <int dim, int spacedim> class Manifold;
 
 namespace GridTools
 {
-  template<typename CellIterator>  struct PeriodicFacePair;
+  template <typename CellIterator>  struct PeriodicFacePair;
 }
 
 template <int, int, int> class TriaAccessor;
@@ -2042,12 +2042,12 @@ public:
    * functions below. It takes an iterator range and returns the sum of
    * values.
    */
-  template<typename T>
+  template <typename T>
   struct CellWeightSum
   {
     typedef T result_type;
 
-    template<typename InputIterator>
+    template <typename InputIterator>
     T operator()(InputIterator first, InputIterator last) const
     {
       return std::accumulate (first, last, T());
diff --git a/include/deal.II/grid/tria_accessor.h b/include/deal.II/grid/tria_accessor.h
index f4ae231bed..0138bbb35d 100644
--- a/include/deal.II/grid/tria_accessor.h
+++ b/include/deal.II/grid/tria_accessor.h
@@ -1553,7 +1553,7 @@ private:
  * @ingroup Accessors
  * @author Bruno Turcksin, 2015
  */
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 class TriaAccessor<0, dim, spacedim>
 {
 public:
@@ -3207,7 +3207,7 @@ protected:
    * partial templates. we use this auxiliary function that is then called
    * from point_inside.
    */
-  template<int dim_,int spacedim_ >
+  template <int dim_,int spacedim_ >
   bool point_inside_codim(const Point<spacedim_> &p) const;
 
 
diff --git a/include/deal.II/grid/tria_faces.h b/include/deal.II/grid/tria_faces.h
index e199d56e7d..d0fae38ae8 100644
--- a/include/deal.II/grid/tria_faces.h
+++ b/include/deal.II/grid/tria_faces.h
@@ -45,7 +45,7 @@ namespace internal
      * @author Tobias Leicht, 2006
      */
 
-    template<int dim>
+    template <int dim>
     class TriaFaces
     {
     private:
@@ -64,7 +64,7 @@ namespace internal
      * <tt>dim@>=2</tt> the use of TriaFaces is reasonable, for <tt>dim=1</tt>
      * the class is empty.
      */
-    template<>
+    template <>
     class TriaFaces<1>
     {
 
@@ -87,7 +87,7 @@ namespace internal
     /**
      * In <tt>dim=2</tt> the cells are quads, the faces accordingly are lines.
      */
-    template<>
+    template <>
     class TriaFaces<2>
     {
     public:
@@ -116,7 +116,7 @@ namespace internal
      * In <tt>dim=3</tt> the cells are hexes, the faces accordingly are quads.
      * In addition to that we also have to enable the storage of lines.
      */
-    template<>
+    template <>
     class TriaFaces<3>
     {
     public:
diff --git a/include/deal.II/grid/tria_levels.h b/include/deal.II/grid/tria_levels.h
index 79d7ec592d..9cc6633ae7 100644
--- a/include/deal.II/grid/tria_levels.h
+++ b/include/deal.II/grid/tria_levels.h
@@ -212,7 +212,7 @@ namespace internal
      * instead of TriaObjects. Refer to the documentation of the general class
      * template for details.
      */
-    template<>
+    template <>
     class TriaLevel<3>
     {
     public:
diff --git a/include/deal.II/grid/tria_objects.h b/include/deal.II/grid/tria_objects.h
index 77de4e7f59..4ef29caa4e 100644
--- a/include/deal.II/grid/tria_objects.h
+++ b/include/deal.II/grid/tria_objects.h
@@ -601,7 +601,7 @@ namespace internal
     }
 
 
-    template<typename G>
+    template <typename G>
     inline
     bool
     TriaObjects<G>::
@@ -611,7 +611,7 @@ namespace internal
     }
 
 
-    template<typename G>
+    template <typename G>
     inline
     void *&
     TriaObjects<G>::user_pointer (const unsigned int i)
@@ -625,7 +625,7 @@ namespace internal
     }
 
 
-    template<typename G>
+    template <typename G>
     inline
     const void *
     TriaObjects<G>::user_pointer (const unsigned int i) const
@@ -639,7 +639,7 @@ namespace internal
     }
 
 
-    template<typename G>
+    template <typename G>
     inline
     unsigned int &
     TriaObjects<G>::user_index (const unsigned int i)
@@ -653,7 +653,7 @@ namespace internal
     }
 
 
-    template<typename G>
+    template <typename G>
     inline
     void
     TriaObjects<G>::clear_user_data (const unsigned int i)
@@ -674,7 +674,7 @@ namespace internal
     {}
 
 
-    template<typename G>
+    template <typename G>
     inline
     unsigned int TriaObjects<G>::user_index (const unsigned int i) const
     {
@@ -687,7 +687,7 @@ namespace internal
     }
 
 
-    template<typename G>
+    template <typename G>
     inline
     void TriaObjects<G>::clear_user_data ()
     {
@@ -697,7 +697,7 @@ namespace internal
     }
 
 
-    template<typename G>
+    template <typename G>
     inline
     void TriaObjects<G>::clear_user_flags ()
     {
@@ -705,7 +705,7 @@ namespace internal
     }
 
 
-    template<typename G>
+    template <typename G>
     template <class Archive>
     void
     TriaObjects<G>::UserData::serialize (Archive &ar,
@@ -862,7 +862,7 @@ namespace internal
 
 // declaration of explicit specializations
 
-    template<>
+    template <>
     void
     TriaObjects<TriaObject<2> >::monitor_memory (const unsigned int) const;
 
diff --git a/include/deal.II/hp/dof_faces.h b/include/deal.II/hp/dof_faces.h
index 93c179c0c0..d7bd3db04f 100644
--- a/include/deal.II/hp/dof_faces.h
+++ b/include/deal.II/hp/dof_faces.h
@@ -237,7 +237,7 @@ namespace internal
      * @ingroup dofs
      * @author Tobias Leicht, 2006
      */
-    template<int dim>
+    template <int dim>
     class DoFIndicesOnFaces;
 
 
@@ -248,7 +248,7 @@ namespace internal
      * @ingroup hp
      * @author Tobias Leicht, 2006
      */
-    template<>
+    template <>
     class DoFIndicesOnFaces<1>
     {
     public:
@@ -274,7 +274,7 @@ namespace internal
      * @ingroup hp
      * @author Tobias Leicht, 2006
      */
-    template<>
+    template <>
     class DoFIndicesOnFaces<2>
     {
     public:
@@ -305,7 +305,7 @@ namespace internal
      * @ingroup hp
      * @author Tobias Leicht, 2006
      */
-    template<>
+    template <>
     class DoFIndicesOnFaces<3>
     {
     public:
diff --git a/include/deal.II/hp/dof_handler.h b/include/deal.II/hp/dof_handler.h
index a8f0b05c1e..0a5b3bb5d0 100644
--- a/include/deal.II/hp/dof_handler.h
+++ b/include/deal.II/hp/dof_handler.h
@@ -1032,7 +1032,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   inline
   const hp::FECollection<dim,spacedim> &
   DoFHandler<dim,spacedim>::get_fe () const
@@ -1045,7 +1045,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   inline
   const Triangulation<dim,spacedim> &
   DoFHandler<dim,spacedim>::get_triangulation () const
diff --git a/include/deal.II/hp/mapping_collection.h b/include/deal.II/hp/mapping_collection.h
index 2ae9786947..881a2c1e9f 100644
--- a/include/deal.II/hp/mapping_collection.h
+++ b/include/deal.II/hp/mapping_collection.h
@@ -50,7 +50,7 @@ namespace hp
    *
    * @author Oliver Kayser-Herold, 2005
    */
-  template<int dim, int spacedim=dim>
+  template <int dim, int spacedim=dim>
   class MappingCollection : public Subscriptor
   {
   public:
@@ -133,7 +133,7 @@ namespace hp
    * collection can then be used in all of those places where such a
    * collection is needed.
    */
-  template<int dim, int spacedim=dim>
+  template <int dim, int spacedim=dim>
   struct StaticMappingQ1
   {
   public:
@@ -146,7 +146,7 @@ namespace hp
 
   /* --------------- inline functions ------------------- */
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   inline
   unsigned int
   MappingCollection<dim,spacedim>::size () const
@@ -156,7 +156,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   inline
   const Mapping<dim,spacedim> &
   MappingCollection<dim,spacedim>::operator[] (const unsigned int index) const
diff --git a/include/deal.II/integrators/advection.h b/include/deal.II/integrators/advection.h
index e77d09f3b0..fd07054459 100644
--- a/include/deal.II/integrators/advection.h
+++ b/include/deal.II/integrators/advection.h
@@ -71,7 +71,7 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2012
      */
-    template<int dim>
+    template <int dim>
     void cell_matrix (
       FullMatrix<double> &M,
       const FEValuesBase<dim> &fe,
diff --git a/include/deal.II/integrators/divergence.h b/include/deal.II/integrators/divergence.h
index 791b671973..7b1ad870be 100644
--- a/include/deal.II/integrators/divergence.h
+++ b/include/deal.II/integrators/divergence.h
@@ -266,7 +266,7 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2011
      */
-    template<int dim>
+    template <int dim>
     void
     u_dot_n_matrix (
       FullMatrix<double> &M,
@@ -303,7 +303,7 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2011
      */
-    template<int dim, typename number>
+    template <int dim, typename number>
     void
     u_dot_n_residual (
       Vector<number> &result,
@@ -339,7 +339,7 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2013
      */
-    template<int dim, typename number>
+    template <int dim, typename number>
     void
     u_times_n_residual (
       Vector<number> &result,
@@ -374,7 +374,7 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2011
      */
-    template<int dim>
+    template <int dim>
     void
     u_dot_n_matrix (
       FullMatrix<double> &M11,
@@ -473,7 +473,7 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2011
      */
-    template<int dim>
+    template <int dim>
     void
     u_dot_n_jump_matrix (
       FullMatrix<double> &M11,
diff --git a/include/deal.II/integrators/elasticity.h b/include/deal.II/integrators/elasticity.h
index f4a0d378fe..e7957e924a 100644
--- a/include/deal.II/integrators/elasticity.h
+++ b/include/deal.II/integrators/elasticity.h
@@ -471,7 +471,7 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2013
      */
-    template<int dim, typename number>
+    template <int dim, typename number>
     void
     ip_residual(
       Vector<number> &result1,
diff --git a/include/deal.II/integrators/grad_div.h b/include/deal.II/integrators/grad_div.h
index 58b8868fe8..ba42982996 100644
--- a/include/deal.II/integrators/grad_div.h
+++ b/include/deal.II/integrators/grad_div.h
@@ -290,7 +290,7 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2016
      */
-    template<int dim>
+    template <int dim>
     void
     ip_residual(
       Vector<double> &result1,
diff --git a/include/deal.II/integrators/laplace.h b/include/deal.II/integrators/laplace.h
index 8c9494689f..e1cfefd6a2 100644
--- a/include/deal.II/integrators/laplace.h
+++ b/include/deal.II/integrators/laplace.h
@@ -48,7 +48,7 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2008, 2009, 2010
      */
-    template<int dim>
+    template <int dim>
     void cell_matrix (
       FullMatrix<double> &M,
       const FEValuesBase<dim> &fe,
@@ -527,7 +527,7 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2012
      */
-    template<int dim>
+    template <int dim>
     void
     ip_residual(
       Vector<double> &result1,
@@ -594,7 +594,7 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2012
      */
-    template<int dim>
+    template <int dim>
     void
     ip_residual(
       Vector<double> &result1,
diff --git a/include/deal.II/lac/block_linear_operator.h b/include/deal.II/lac/block_linear_operator.h
index e62a3a4217..ec9f83c987 100644
--- a/include/deal.II/lac/block_linear_operator.h
+++ b/include/deal.II/lac/block_linear_operator.h
@@ -30,7 +30,7 @@ namespace internal
 {
   namespace BlockLinearOperator
   {
-    template<typename PayloadBlockType = internal::LinearOperator::EmptyPayload>
+    template <typename PayloadBlockType = internal::LinearOperator::EmptyPayload>
     class EmptyBlockPayload;
   }
 }
@@ -184,7 +184,7 @@ public:
    * an object @p op for which the conversion function
    * <code>block_operator</code> is defined.
    */
-  template<typename Op>
+  template <typename Op>
   BlockLinearOperator(const Op &op)
   {
     *this = block_operator<Range, Domain, BlockPayload, Op>(op);
@@ -195,7 +195,7 @@ public:
    * LinearOperator. This constructor calls the corresponding block_operator()
    * specialization.
    */
-  template<size_t m, size_t n>
+  template <size_t m, size_t n>
   BlockLinearOperator(const std::array<std::array<BlockType, n>, m> &ops)
   {
     *this = block_operator<m, n, Range, Domain, BlockPayload>(ops);
@@ -206,7 +206,7 @@ public:
    * @p ops of LinearOperator. This constructor calls the corresponding
    * block_operator() specialization.
    */
-  template<size_t m>
+  template <size_t m>
   BlockLinearOperator(const std::array<BlockType, m> &ops)
   {
     *this = block_diagonal_operator<m, Range, Domain, BlockPayload>(ops);
@@ -386,7 +386,7 @@ namespace internal
      *
      * @ingroup LAOperators
      */
-    template<typename PayloadBlockType>
+    template <typename PayloadBlockType>
     class EmptyBlockPayload
     {
     public:
diff --git a/include/deal.II/lac/block_matrix_array.h b/include/deal.II/lac/block_matrix_array.h
index 0e6da0137c..b57c27a182 100644
--- a/include/deal.II/lac/block_matrix_array.h
+++ b/include/deal.II/lac/block_matrix_array.h
@@ -272,7 +272,7 @@ protected:
      * Constructor initializing all data fields. A PointerMatrix object is
      * generated for <tt>matrix</tt>.
      */
-    template<typename MatrixType>
+    template <typename MatrixType>
     Entry (const MatrixType &matrix,
            size_type row,
            size_type col,
diff --git a/include/deal.II/lac/block_sparse_matrix_ez.h b/include/deal.II/lac/block_sparse_matrix_ez.h
index 8e4bf52fe3..0daf94c35e 100644
--- a/include/deal.II/lac/block_sparse_matrix_ez.h
+++ b/include/deal.II/lac/block_sparse_matrix_ez.h
@@ -48,7 +48,7 @@ template <typename Number> class BlockVector;
  * @ref GlossBlockLA "Block (linear algebra)"
  * @author Guido Kanschat, 2002, 2003
  */
-template<typename Number>
+template <typename Number>
 class BlockSparseMatrixEZ : public Subscriptor
 {
 public:
diff --git a/include/deal.II/lac/block_vector.h b/include/deal.II/lac/block_vector.h
index 1e8b6c29d9..c071886c06 100644
--- a/include/deal.II/lac/block_vector.h
+++ b/include/deal.II/lac/block_vector.h
@@ -485,7 +485,7 @@ namespace internal
      * A helper class used internally in linear_operator.h. Specialization for
      * BlockVector<number>.
      */
-    template<typename number>
+    template <typename number>
     class ReinitHelper<BlockVector<number> >
     {
     public:
diff --git a/include/deal.II/lac/chunk_sparse_matrix.h b/include/deal.II/lac/chunk_sparse_matrix.h
index 00ec01ebbb..12bbd24433 100644
--- a/include/deal.II/lac/chunk_sparse_matrix.h
+++ b/include/deal.II/lac/chunk_sparse_matrix.h
@@ -26,8 +26,8 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template<typename number> class Vector;
-template<typename number> class FullMatrix;
+template <typename number> class Vector;
+template <typename number> class FullMatrix;
 
 /*! @addtogroup Matrix1
  *@{
diff --git a/include/deal.II/lac/chunk_sparse_matrix.templates.h b/include/deal.II/lac/chunk_sparse_matrix.templates.h
index a210200b7b..61ffd3bbf2 100644
--- a/include/deal.II/lac/chunk_sparse_matrix.templates.h
+++ b/include/deal.II/lac/chunk_sparse_matrix.templates.h
@@ -371,7 +371,7 @@ namespace internal
 {
   namespace ChunkSparseMatrix
   {
-    template<typename T>
+    template <typename T>
     void zero_subrange (const unsigned int begin,
                         const unsigned int end,
                         T *dst)
diff --git a/include/deal.II/lac/constraint_matrix.h b/include/deal.II/lac/constraint_matrix.h
index 2aa28b4f3b..6c849277fe 100644
--- a/include/deal.II/lac/constraint_matrix.h
+++ b/include/deal.II/lac/constraint_matrix.h
@@ -33,7 +33,7 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template<int dim, class T> class Table;
+template <int dim, class T> class Table;
 template <typename> class FullMatrix;
 class SparsityPattern;
 class DynamicSparsityPattern;
@@ -595,7 +595,7 @@ public:
    * See the general documentation of this class for more detailed
    * information.
    */
-  template<typename number>
+  template <typename number>
   void condense (SparseMatrix<number> &matrix) const;
 
   /**
@@ -640,7 +640,7 @@ public:
    * See the general documentation of this class for more detailed
    * information.
    */
-  template<typename number, class VectorType>
+  template <typename number, class VectorType>
   void condense (SparseMatrix<number> &matrix,
                  VectorType           &vector) const;
 
diff --git a/include/deal.II/lac/constraint_matrix.templates.h b/include/deal.II/lac/constraint_matrix.templates.h
index 6ae5b7f256..2f973b755d 100644
--- a/include/deal.II/lac/constraint_matrix.templates.h
+++ b/include/deal.II/lac/constraint_matrix.templates.h
@@ -40,7 +40,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template<typename number>
+template <typename number>
 void
 ConstraintMatrix::condense (SparseMatrix<number> &uncondensed) const
 {
@@ -60,7 +60,7 @@ ConstraintMatrix::condense (BlockSparseMatrix<number> &uncondensed) const
 
 
 
-template<class VectorType>
+template <class VectorType>
 void
 ConstraintMatrix::condense (const VectorType &vec_ghosted,
                             VectorType       &vec) const
@@ -118,7 +118,7 @@ ConstraintMatrix::condense (VectorType &vec) const
 
 
 
-template<typename number, class VectorType>
+template <typename number, class VectorType>
 void
 ConstraintMatrix::condense (SparseMatrix<number> &uncondensed,
                             VectorType           &vec) const
@@ -513,7 +513,7 @@ namespace internal
     {
       typedef types::global_dof_index size_type;
 
-      template<class VEC>
+      template <class VEC>
       void set_zero_parallel(const std::vector<size_type> &cm, VEC &vec, size_type shift = 0)
       {
         Assert(!vec.has_ghost_elements(), ExcInternalError());
@@ -534,7 +534,7 @@ namespace internal
           }
       }
 
-      template<typename Number>
+      template <typename Number>
       void set_zero_parallel(const std::vector<size_type> &cm, LinearAlgebra::distributed::Vector<Number> &vec, size_type shift = 0)
       {
         for (typename std::vector<size_type>::const_iterator it = cm.begin();
@@ -554,14 +554,14 @@ namespace internal
         vec.zero_out_ghosts();
       }
 
-      template<class VEC>
+      template <class VEC>
       void set_zero_in_parallel(const std::vector<size_type> &cm, VEC &vec, internal::bool2type<false>)
       {
         set_zero_parallel(cm, vec, 0);
       }
 
       // in parallel for BlockVectors
-      template<class VEC>
+      template <class VEC>
       void set_zero_in_parallel(const std::vector<size_type> &cm, VEC &vec, internal::bool2type<true>)
       {
         size_type start_shift = 0;
@@ -572,7 +572,7 @@ namespace internal
           }
       }
 
-      template<class VEC>
+      template <class VEC>
       void set_zero_serial(const std::vector<size_type> &cm, VEC &vec)
       {
         for (typename std::vector<size_type>::const_iterator it = cm.begin();
@@ -580,7 +580,7 @@ namespace internal
           vec(*it) = 0.;
       }
 
-      template<class VEC>
+      template <class VEC>
       void set_zero_all(const std::vector<size_type> &cm, VEC &vec)
       {
         set_zero_in_parallel<VEC>(cm, vec, internal::bool2type<IsBlockVector<VEC>::value>());
@@ -588,13 +588,13 @@ namespace internal
       }
 
 
-      template<class T>
+      template <class T>
       void set_zero_all(const std::vector<size_type> &cm, dealii::Vector<T> &vec)
       {
         set_zero_serial(cm, vec);
       }
 
-      template<class T>
+      template <class T>
       void set_zero_all(const std::vector<size_type> &cm, dealii::BlockVector<T> &vec)
       {
         set_zero_serial(cm, vec);
@@ -1592,7 +1592,7 @@ namespace internals
   // resolves constraints of one column at the innermost loop. goes through
   // the origin of each global entry and finds out which data we need to
   // collect.
-  template<typename LocalType>
+  template <typename LocalType>
   static inline
   LocalType resolve_matrix_entry (const GlobalRowsFromLocal   &global_rows,
                                   const GlobalRowsFromLocal &global_cols,
@@ -2179,7 +2179,7 @@ make_sorted_row_list (const std::vector<size_type> &local_dof_indices,
 
 
 // Resolve the constraints from the vector and apply inhomogeneities.
-template< typename LocalType>
+template < typename LocalType>
 inline
 LocalType
 ConstraintMatrix::
diff --git a/include/deal.II/lac/filtered_matrix.h b/include/deal.II/lac/filtered_matrix.h
index a6b28604c2..b3fb569882 100644
--- a/include/deal.II/lac/filtered_matrix.h
+++ b/include/deal.II/lac/filtered_matrix.h
@@ -547,7 +547,7 @@ private:
 
 //--------------------------------Iterators--------------------------------------//
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 FilteredMatrix<VectorType>::Accessor::Accessor
 (const FilteredMatrix<VectorType> *matrix,
@@ -562,7 +562,7 @@ FilteredMatrix<VectorType>::Accessor::Accessor
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 types::global_dof_index
 FilteredMatrix<VectorType>::Accessor::row() const
@@ -572,7 +572,7 @@ FilteredMatrix<VectorType>::Accessor::row() const
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 types::global_dof_index
 FilteredMatrix<VectorType>::Accessor::column() const
@@ -582,7 +582,7 @@ FilteredMatrix<VectorType>::Accessor::column() const
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 double
 FilteredMatrix<VectorType>::Accessor::value() const
@@ -592,7 +592,7 @@ FilteredMatrix<VectorType>::Accessor::value() const
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 void
 FilteredMatrix<VectorType>::Accessor::advance()
@@ -604,7 +604,7 @@ FilteredMatrix<VectorType>::Accessor::advance()
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 FilteredMatrix<VectorType>::const_iterator::const_iterator
 (const FilteredMatrix<VectorType> *matrix,
@@ -615,7 +615,7 @@ FilteredMatrix<VectorType>::const_iterator::const_iterator
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 typename FilteredMatrix<VectorType>::const_iterator &
 FilteredMatrix<VectorType>::const_iterator::operator++ ()
diff --git a/include/deal.II/lac/householder.h b/include/deal.II/lac/householder.h
index 932c51db32..4cb65b815b 100644
--- a/include/deal.II/lac/householder.h
+++ b/include/deal.II/lac/householder.h
@@ -28,7 +28,7 @@ DEAL_II_NAMESPACE_OPEN
 
 
 // forward declarations
-template<typename number> class Vector;
+template <typename number> class Vector;
 
 
 /*! @addtogroup Matrix2
@@ -52,7 +52,7 @@ template<typename number> class Vector;
  *
  * @author Guido Kanschat, 2005
  */
-template<typename number>
+template <typename number>
 class Householder : private FullMatrix<number>
 {
 public:
@@ -69,13 +69,13 @@ public:
   /**
    * Create an object holding the QR-decomposition of a matrix.
    */
-  template<typename number2>
+  template <typename number2>
   Householder (const FullMatrix<number2> &);
 
   /**
    * Compute the QR-decomposition of another matrix.
    */
-  template<typename number2>
+  template <typename number2>
   void
   initialize (const FullMatrix<number2> &);
 
@@ -89,14 +89,14 @@ public:
    * problem. It will be changed during the algorithm and is unusable on
    * return.
    */
-  template<typename number2>
+  template <typename number2>
   double least_squares (Vector<number2> &dst,
                         const Vector<number2> &src) const;
 
   /**
    * This function does the same as the one for BlockVectors.
    */
-  template<typename number2>
+  template <typename number2>
   double least_squares (BlockVector<number2> &dst,
                         const BlockVector<number2> &src) const;
 
@@ -104,10 +104,10 @@ public:
    * A wrapper to least_squares(), implementing the standard MatrixType
    * interface.
    */
-  template<class VectorType>
+  template <class VectorType>
   void vmult (VectorType &dst, const VectorType &src) const;
 
-  template<class VectorType>
+  template <class VectorType>
   void Tvmult (VectorType &dst, const VectorType &src) const;
 
 
diff --git a/include/deal.II/lac/lapack_full_matrix.h b/include/deal.II/lac/lapack_full_matrix.h
index f1a015e0f4..f0963d8da2 100644
--- a/include/deal.II/lac/lapack_full_matrix.h
+++ b/include/deal.II/lac/lapack_full_matrix.h
@@ -30,10 +30,10 @@
 DEAL_II_NAMESPACE_OPEN
 
 // forward declarations
-template<typename number> class Vector;
-template<typename number> class BlockVector;
-template<typename number> class FullMatrix;
-template<typename number> class SparseMatrix;
+template <typename number> class Vector;
+template <typename number> class BlockVector;
+template <typename number> class FullMatrix;
+template <typename number> class SparseMatrix;
 
 
 /**
@@ -184,7 +184,7 @@ public:
    * The final two arguments allow to enter a multiple of the source or its
    * transpose.
    */
-  template<typename MatrixType>
+  template <typename MatrixType>
   void fill (const MatrixType &src,
              const size_type dst_offset_i = 0,
              const size_type dst_offset_j = 0,
diff --git a/include/deal.II/lac/lapack_templates.h b/include/deal.II/lac/lapack_templates.h
index a3d8896e85..f7d7ab064b 100644
--- a/include/deal.II/lac/lapack_templates.h
+++ b/include/deal.II/lac/lapack_templates.h
@@ -252,7 +252,7 @@ DEAL_II_NAMESPACE_OPEN
 
 
 /// Template wrapper for LAPACK functions daxpy and saxpy
-template<typename number1, typename number2, typename number3>
+template <typename number1, typename number2, typename number3>
 inline void
 axpy (const int *, const number1 *, const number2 *, const int *, number3 *, const int *)
 {
@@ -290,7 +290,7 @@ axpy (const int *, const float *, const float *, const int *, float *, const int
 
 
 /// Template wrapper for LAPACK functions dgemv and sgemv
-template<typename number1, typename number2, typename number3, typename number4, typename number5>
+template <typename number1, typename number2, typename number3, typename number4, typename number5>
 inline void
 gemv (const char *, const int *, const int *, const number1 *, const number2 *, const int *, const number3 *, const int *, const number4 *, number5 *, const int *)
 {
@@ -328,7 +328,7 @@ gemv (const char *, const int *, const int *, const float *, const float *, cons
 
 
 /// Template wrapper for LAPACK functions dgemm and sgemm
-template<typename number1, typename number2, typename number3, typename number4, typename number5>
+template <typename number1, typename number2, typename number3, typename number4, typename number5>
 inline void
 gemm (const char *, const char *, const int *, const int *, const int *, const number1 *, const number2 *, const int *, const number3 *, const int *, const number4 *, number5 *, const int *)
 {
@@ -366,7 +366,7 @@ gemm (const char *, const char *, const int *, const int *, const int *, const f
 
 
 /// Template wrapper for LAPACK functions dgetrf and sgetrf
-template<typename number1>
+template <typename number1>
 inline void
 getrf (const int *, const int *, number1 *, const int *, int *, int *)
 {
@@ -404,7 +404,7 @@ getrf (const int *, const int *, float *, const int *, int *, int *)
 
 
 /// Template wrapper for LAPACK functions dgetrs and sgetrs
-template<typename number1, typename number2>
+template <typename number1, typename number2>
 inline void
 getrs (const char *, const int *, const int *, const number1 *, const int *, const int *, number2 *, const int *, int *)
 {
@@ -442,7 +442,7 @@ getrs (const char *, const int *, const int *, const float *, const int *, const
 
 
 /// Template wrapper for LAPACK functions dgetri and sgetri
-template<typename number1, typename number2>
+template <typename number1, typename number2>
 inline void
 getri (const int *, number1 *, const int *, int *, number2 *, const int *, int *)
 {
@@ -480,7 +480,7 @@ getri (const int *, float *, const int *, int *, float *, const int *, int *)
 
 
 /// Template wrapper for LAPACK functions dgeqrf and sgeqrf
-template<typename number1, typename number2, typename number3>
+template <typename number1, typename number2, typename number3>
 inline void
 geqrf (const int *, const int *, number1 *, const int *, number2 *, number3 *, const int *, int *)
 {
@@ -518,7 +518,7 @@ geqrf (const int *, const int *, float *, const int *, float *, float *, const i
 
 
 /// Template wrapper for LAPACK functions dormqr and sormqr
-template<typename number1, typename number2, typename number3, typename number4>
+template <typename number1, typename number2, typename number3, typename number4>
 inline void
 ormqr (const char *, const char *, const int *, const int *, const int *, const number1 *, const int *, const number2 *, number3 *, const int *, number4 *, const int *, int *)
 {
@@ -556,7 +556,7 @@ ormqr (const char *, const char *, const int *, const int *, const int *, const
 
 
 /// Template wrapper for LAPACK functions dorgqr and sorgqr
-template<typename number1, typename number2, typename number3>
+template <typename number1, typename number2, typename number3>
 inline void
 orgqr (const int *, const int *, const int *, const number1 *, const int *, const number2 *, number3 *, const int *, int *)
 {
@@ -594,7 +594,7 @@ orgqr (const int *, const int *, const int *, const float *, const int *, const
 
 
 /// Template wrapper for LAPACK functions dtrtrs and strtrs
-template<typename number1, typename number2>
+template <typename number1, typename number2>
 inline void
 trtrs (const char *, const char *, const char *, const int *, const int *, const number1 *, const int *, number2 *, const int *, int *)
 {
@@ -632,7 +632,7 @@ trtrs (const char *, const char *, const char *, const int *, const int *, const
 
 
 /// Template wrapper for LAPACK functions dgeev and sgeev
-template<typename number1, typename number2, typename number3, typename number4, typename number5, typename number6>
+template <typename number1, typename number2, typename number3, typename number4, typename number5, typename number6>
 inline void
 geev (const char *, const char *, const int *, number1 *, const int *, number2 *, number3 *, number4 *, const int *, number5 *, const int *, number6 *, const int *, int *)
 {
@@ -670,7 +670,7 @@ geev (const char *, const char *, const int *, float *, const int *, float *, fl
 
 
 /// Template wrapper for LAPACK functions dgeevx and sgeevx
-template<typename number1, typename number2, typename number3, typename number4, typename number5, typename number6, typename number7, typename number8, typename number9, typename number10>
+template <typename number1, typename number2, typename number3, typename number4, typename number5, typename number6, typename number7, typename number8, typename number9, typename number10>
 inline void
 geevx (const char *, const char *, const char *, const char *, const int *, number1 *, const int *, number2 *, number3 *, number4 *, const int *, number5 *, const int *, int *, int *, number6 *, number7 *, number8 *, number9 *, number10 *, const int *, int *, int *)
 {
@@ -708,7 +708,7 @@ geevx (const char *, const char *, const char *, const char *, const int *, floa
 
 
 /// Template wrapper for LAPACK functions dsyev and ssyev
-template<typename number1, typename number2, typename number3>
+template <typename number1, typename number2, typename number3>
 inline void
 syev (const char *, const char *, const int *, number1 *, const int *, number2 *, number3 *, const int *, int *)
 {
@@ -746,7 +746,7 @@ syev (const char *, const char *, const int *, float *, const int *, float *, fl
 
 
 /// Template wrapper for LAPACK functions dsyevx and ssyevx
-template<typename number1, typename number2, typename number3, typename number4, typename number5, typename number6, typename number7>
+template <typename number1, typename number2, typename number3, typename number4, typename number5, typename number6, typename number7>
 inline void
 syevx (const char *, const char *, const char *, const int *, number1 *, const int *, const number2 *, const number3 *, const int *, const int *, const number4 *, int *, number5 *, number6 *, const int *, number7 *, const int *, int *, int *, int *)
 {
@@ -784,7 +784,7 @@ syevx (const char *, const char *, const char *, const int *, float *, const int
 
 
 /// Template wrapper for LAPACK functions dsygv and ssygv
-template<typename number1, typename number2, typename number3, typename number4>
+template <typename number1, typename number2, typename number3, typename number4>
 inline void
 sygv (const int *, const char *, const char *, const int *, number1 *, const int *, number2 *, const int *, number3 *, number4 *, const int *, int *)
 {
@@ -822,7 +822,7 @@ sygv (const int *, const char *, const char *, const int *, float *, const int *
 
 
 /// Template wrapper for LAPACK functions dsygvx and ssygvx
-template<typename number1, typename number2, typename number3, typename number4, typename number5, typename number6, typename number7, typename number8>
+template <typename number1, typename number2, typename number3, typename number4, typename number5, typename number6, typename number7, typename number8>
 inline void
 sygvx (const int *, const char *, const char *, const char *, const int *, number1 *, const int *, number2 *, const int *, const number3 *, const number4 *, const int *, const int *, const number5 *, int *, number6 *, number7 *, const int *, number8 *, const int *, int *, int *, int *)
 {
@@ -860,7 +860,7 @@ sygvx (const int *, const char *, const char *, const char *, const int *, float
 
 
 /// Template wrapper for LAPACK functions dgesdd and sgesdd
-template<typename number1, typename number2, typename number3, typename number4, typename number5>
+template <typename number1, typename number2, typename number3, typename number4, typename number5>
 inline void
 gesdd (const char *, const int *, const int *, number1 *, const int *, number2 *, number3 *, const int *, number4 *, const int *, number5 *, const int *, int *, int *)
 {
@@ -898,7 +898,7 @@ gesdd (const char *, const int *, const int *, float *, const int *, float *, fl
 
 
 /// Template wrapper for LAPACK functions dgesvd and sgesvd
-template<typename number1, typename number2, typename number3, typename number4, typename number5>
+template <typename number1, typename number2, typename number3, typename number4, typename number5>
 inline void
 gesvd (int *, int *, const int *, const int *, number1 *, const int *, number2 *, number3 *, const int *, number4 *, const int *, number5 *, const int *, int *)
 {
@@ -936,7 +936,7 @@ gesvd (int *, int *, const int *, const int *, float *, const int *, float *, fl
 
 
 /// Template wrapper for LAPACK functions dgelsd and sgelsd
-template<typename number1, typename number2, typename number3, typename number4, typename number5>
+template <typename number1, typename number2, typename number3, typename number4, typename number5>
 inline void
 gelsd (const int *, const int *, const int *, const number1 *, const int *, number2 *, const int *, number3 *, const number4 *, int *, number5 *, const int *, int *, int *)
 {
@@ -974,7 +974,7 @@ gelsd (const int *, const int *, const int *, const float *, const int *, float
 
 
 /// Template wrapper for LAPACK functions dstev and sstev
-template<typename number1, typename number2, typename number3, typename number4>
+template <typename number1, typename number2, typename number3, typename number4>
 inline void
 stev (const char *, const int *, number1 *, number2 *, number3 *, const int *, number4 *, int *)
 {
diff --git a/include/deal.II/lac/linear_operator.h b/include/deal.II/lac/linear_operator.h
index 108d1f32b4..22d37c2fbc 100644
--- a/include/deal.II/lac/linear_operator.h
+++ b/include/deal.II/lac/linear_operator.h
@@ -213,8 +213,8 @@ public:
    * object @p op for which the conversion function
    * <code>linear_operator</code> is defined.
    */
-  template<typename Op,
-           typename = typename std::enable_if<!std::is_base_of<LinearOperator<Range, Domain, Payload>, Op>::value>::type>
+  template <typename Op,
+            typename = typename std::enable_if<!std::is_base_of<LinearOperator<Range, Domain, Payload>, Op>::value>::type>
   LinearOperator (const Op &op)
   {
     *this = linear_operator<Range, Domain, Payload, Op>(op);
@@ -872,7 +872,7 @@ namespace internal
      * This class is specialized for more complicated data structures, such as
      * TrilinosWrappers::MPI::Vector, etc.
      */
-    template<typename Vector>
+    template <typename Vector>
     class ReinitHelper
     {
     public:
diff --git a/include/deal.II/lac/matrix_block.h b/include/deal.II/lac/matrix_block.h
index a03f437099..8142db84ed 100644
--- a/include/deal.II/lac/matrix_block.h
+++ b/include/deal.II/lac/matrix_block.h
@@ -236,7 +236,7 @@ public:
    * MatrixType. No index computations are done, thus, the vectors need to
    * have sizes matching #matrix.
    */
-  template<class VectorType>
+  template <class VectorType>
   void vmult (VectorType &w, const VectorType &v) const;
 
   /**
@@ -244,7 +244,7 @@ public:
    * MatrixType. No index computations are done, thus, the vectors need to
    * have sizes matching #matrix.
    */
-  template<class VectorType>
+  template <class VectorType>
   void vmult_add (VectorType &w, const VectorType &v) const;
 
   /**
@@ -252,7 +252,7 @@ public:
    * MatrixType. No index computations are done, thus, the vectors need to
    * have sizes matching #matrix.
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tvmult (VectorType &w, const VectorType &v) const;
 
   /**
@@ -260,7 +260,7 @@ public:
    * MatrixType. No index computations are done, thus, the vectors need to
    * have sizes matching #matrix.
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tvmult_add (VectorType &w, const VectorType &v) const;
 
   /**
diff --git a/include/deal.II/lac/matrix_lib.h b/include/deal.II/lac/matrix_lib.h
index 8fed803703..6c30b82fb3 100644
--- a/include/deal.II/lac/matrix_lib.h
+++ b/include/deal.II/lac/matrix_lib.h
@@ -23,9 +23,9 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template<typename number> class Vector;
-template<typename number> class BlockVector;
-template<typename number> class SparseMatrix;
+template <typename number> class Vector;
+template <typename number> class BlockVector;
+template <typename number> class SparseMatrix;
 
 /*! @addtogroup Matrix2
  *@{
diff --git a/include/deal.II/lac/petsc_parallel_block_vector.h b/include/deal.II/lac/petsc_parallel_block_vector.h
index d15537d4e9..8cd8057e61 100644
--- a/include/deal.II/lac/petsc_parallel_block_vector.h
+++ b/include/deal.II/lac/petsc_parallel_block_vector.h
@@ -523,7 +523,7 @@ namespace internal
      * A helper class used internally in linear_operator.h. Specialization for
      * PETScWrappers::MPI::BlockVector.
      */
-    template<>
+    template <>
     class ReinitHelper<PETScWrappers::MPI::BlockVector>
     {
     public:
diff --git a/include/deal.II/lac/petsc_parallel_vector.h b/include/deal.II/lac/petsc_parallel_vector.h
index 07fb0857e8..4b311c78f6 100644
--- a/include/deal.II/lac/petsc_parallel_vector.h
+++ b/include/deal.II/lac/petsc_parallel_vector.h
@@ -504,7 +504,7 @@ namespace internal
      * A helper class used internally in linear_operator.h. Specialization for
      * PETScWrappers::MPI::Vector.
      */
-    template<>
+    template <>
     class ReinitHelper<PETScWrappers::MPI::Vector>
     {
     public:
diff --git a/include/deal.II/lac/pointer_matrix.h b/include/deal.II/lac/pointer_matrix.h
index dd6016681c..a9b0e45522 100644
--- a/include/deal.II/lac/pointer_matrix.h
+++ b/include/deal.II/lac/pointer_matrix.h
@@ -23,7 +23,7 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template<typename VectorType> class VectorMemory;
+template <typename VectorType> class VectorMemory;
 
 class IdentityMatrix;
 template <typename number> class FullMatrix;
@@ -47,7 +47,7 @@ template <typename number, typename BlockVectorType> class BlockMatrixArray;
  *
  * @author Guido Kanschat, 2000, 2001, 2002
  */
-template<typename VectorType>
+template <typename VectorType>
 class PointerMatrixBase : public Subscriptor
 {
 public:
@@ -109,7 +109,7 @@ public:
  *
  * @author Guido Kanschat 2000, 2001, 2002
  */
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 class PointerMatrix : public PointerMatrixBase<VectorType>
 {
 public:
@@ -209,7 +209,7 @@ private:
  *
  * @author Guido Kanschat 2006
  */
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 class PointerMatrixAux : public PointerMatrixBase<VectorType>
 {
 public:
@@ -573,7 +573,7 @@ new_pointer_matrix_base(const TridiagonalMatrix<numberm> &matrix, const Vector<n
 /*@}*/
 //---------------------------------------------------------------------------
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 PointerMatrixBase<VectorType>::~PointerMatrixBase ()
 {}
@@ -583,26 +583,26 @@ PointerMatrixBase<VectorType>::~PointerMatrixBase ()
 //----------------------------------------------------------------------//
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 PointerMatrix<MatrixType, VectorType>::PointerMatrix (const MatrixType *M)
   : m(M, typeid(*this).name())
 {}
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 PointerMatrix<MatrixType, VectorType>::PointerMatrix (const char *name)
   : m(nullptr, name)
 {}
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 PointerMatrix<MatrixType, VectorType>::PointerMatrix (const MatrixType *M,
                                                       const char       *name)
   : m(M, name)
 {}
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline void
 PointerMatrix<MatrixType, VectorType>::clear ()
 {
@@ -610,7 +610,7 @@ PointerMatrix<MatrixType, VectorType>::clear ()
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline const PointerMatrix<MatrixType, VectorType> &
 PointerMatrix<MatrixType, VectorType>::operator= (const MatrixType *M)
 {
@@ -619,7 +619,7 @@ PointerMatrix<MatrixType, VectorType>::operator= (const MatrixType *M)
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline bool
 PointerMatrix<MatrixType, VectorType>::empty () const
 {
@@ -628,7 +628,7 @@ PointerMatrix<MatrixType, VectorType>::empty () const
   return m->empty();
 }
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline void
 PointerMatrix<MatrixType, VectorType>::vmult (VectorType       &dst,
                                               const VectorType &src) const
@@ -638,7 +638,7 @@ PointerMatrix<MatrixType, VectorType>::vmult (VectorType       &dst,
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline void
 PointerMatrix<MatrixType, VectorType>::Tvmult (VectorType       &dst,
                                                const VectorType &src) const
@@ -648,7 +648,7 @@ PointerMatrix<MatrixType, VectorType>::Tvmult (VectorType       &dst,
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline void
 PointerMatrix<MatrixType, VectorType>::vmult_add (VectorType       &dst,
                                                   const VectorType &src) const
@@ -658,7 +658,7 @@ PointerMatrix<MatrixType, VectorType>::vmult_add (VectorType       &dst,
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline void
 PointerMatrix<MatrixType, VectorType>::Tvmult_add (VectorType       &dst,
                                                    const VectorType &src) const
@@ -672,7 +672,7 @@ PointerMatrix<MatrixType, VectorType>::Tvmult_add (VectorType       &dst,
 //----------------------------------------------------------------------//
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 PointerMatrixAux<MatrixType, VectorType>::PointerMatrixAux (VectorMemory<VectorType> *mem,
                                                             const MatrixType *M)
   : mem(mem, typeid(*this).name()),
@@ -682,7 +682,7 @@ PointerMatrixAux<MatrixType, VectorType>::PointerMatrixAux (VectorMemory<VectorT
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 PointerMatrixAux<MatrixType, VectorType>::PointerMatrixAux (VectorMemory<VectorType> *mem,
                                                             const char               *name)
   : mem(mem, name),
@@ -692,7 +692,7 @@ PointerMatrixAux<MatrixType, VectorType>::PointerMatrixAux (VectorMemory<VectorT
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 PointerMatrixAux<MatrixType, VectorType>::PointerMatrixAux (VectorMemory<VectorType> *mem,
                                                             const MatrixType         *M,
                                                             const char               *name)
@@ -703,7 +703,7 @@ PointerMatrixAux<MatrixType, VectorType>::PointerMatrixAux (VectorMemory<VectorT
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline void
 PointerMatrixAux<MatrixType, VectorType>::clear ()
 {
@@ -711,7 +711,7 @@ PointerMatrixAux<MatrixType, VectorType>::clear ()
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline const PointerMatrixAux<MatrixType, VectorType> &
 PointerMatrixAux<MatrixType, VectorType>::operator= (const MatrixType *M)
 {
@@ -720,7 +720,7 @@ PointerMatrixAux<MatrixType, VectorType>::operator= (const MatrixType *M)
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline void
 PointerMatrixAux<MatrixType, VectorType>::set_memory(VectorMemory<VectorType> *M)
 {
@@ -730,7 +730,7 @@ PointerMatrixAux<MatrixType, VectorType>::set_memory(VectorMemory<VectorType> *M
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline bool
 PointerMatrixAux<MatrixType, VectorType>::empty () const
 {
@@ -739,7 +739,7 @@ PointerMatrixAux<MatrixType, VectorType>::empty () const
   return m->empty();
 }
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline void
 PointerMatrixAux<MatrixType, VectorType>::vmult (VectorType       &dst,
                                                  const VectorType &src) const
@@ -752,7 +752,7 @@ PointerMatrixAux<MatrixType, VectorType>::vmult (VectorType       &dst,
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline void
 PointerMatrixAux<MatrixType, VectorType>::Tvmult (VectorType       &dst,
                                                   const VectorType &src) const
@@ -765,7 +765,7 @@ PointerMatrixAux<MatrixType, VectorType>::Tvmult (VectorType       &dst,
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline void
 PointerMatrixAux<MatrixType, VectorType>::vmult_add (VectorType       &dst,
                                                      const VectorType &src) const
@@ -782,7 +782,7 @@ PointerMatrixAux<MatrixType, VectorType>::vmult_add (VectorType       &dst,
 }
 
 
-template<typename MatrixType, typename VectorType>
+template <typename MatrixType, typename VectorType>
 inline void
 PointerMatrixAux<MatrixType, VectorType>::Tvmult_add (VectorType       &dst,
                                                       const VectorType &src) const
@@ -802,26 +802,26 @@ PointerMatrixAux<MatrixType, VectorType>::Tvmult_add (VectorType       &dst,
 //----------------------------------------------------------------------//
 
 
-template<typename number>
+template <typename number>
 PointerMatrixVector<number>::PointerMatrixVector (const Vector<number> *M)
   : m(M, typeid(*this).name())
 {}
 
 
-template<typename number>
+template <typename number>
 PointerMatrixVector<number>::PointerMatrixVector (const char *name)
   : m(0, name)
 {}
 
 
-template<typename number>
+template <typename number>
 PointerMatrixVector<number>::PointerMatrixVector (const Vector<number> *M,
                                                   const char           *name)
   : m(M, name)
 {}
 
 
-template<typename number>
+template <typename number>
 inline void
 PointerMatrixVector<number>::clear ()
 {
@@ -829,7 +829,7 @@ PointerMatrixVector<number>::clear ()
 }
 
 
-template<typename number>
+template <typename number>
 inline const PointerMatrixVector<number> &
 PointerMatrixVector<number>::operator= (const Vector<number> *M)
 {
@@ -838,7 +838,7 @@ PointerMatrixVector<number>::operator= (const Vector<number> *M)
 }
 
 
-template<typename number>
+template <typename number>
 inline bool
 PointerMatrixVector<number>::empty () const
 {
@@ -847,7 +847,7 @@ PointerMatrixVector<number>::empty () const
   return m->empty();
 }
 
-template<typename number>
+template <typename number>
 inline void
 PointerMatrixVector<number>::vmult (Vector<number>       &dst,
                                     const Vector<number> &src) const
@@ -859,7 +859,7 @@ PointerMatrixVector<number>::vmult (Vector<number>       &dst,
 }
 
 
-template<typename number>
+template <typename number>
 inline void
 PointerMatrixVector<number>::Tvmult (Vector<number>       &dst,
                                      const Vector<number> &src) const
@@ -871,7 +871,7 @@ PointerMatrixVector<number>::Tvmult (Vector<number>       &dst,
 }
 
 
-template<typename number>
+template <typename number>
 inline void
 PointerMatrixVector<number>::vmult_add (Vector<number>       &dst,
                                         const Vector<number> &src) const
@@ -883,7 +883,7 @@ PointerMatrixVector<number>::vmult_add (Vector<number>       &dst,
 }
 
 
-template<typename number>
+template <typename number>
 inline void
 PointerMatrixVector<number>::Tvmult_add (Vector<number>       &dst,
                                          const Vector<number> &src) const
diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h
index bed1220a3e..e41602a9d1 100644
--- a/include/deal.II/lac/precondition.h
+++ b/include/deal.II/lac/precondition.h
@@ -106,27 +106,27 @@ public:
   /**
    * Apply preconditioner.
    */
-  template<class VectorType>
+  template <class VectorType>
   void vmult (VectorType &, const VectorType &) const;
 
   /**
    * Apply transpose preconditioner. Since this is the identity, this function
    * is the same as vmult().
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tvmult (VectorType &, const VectorType &) const;
 
   /**
    * Apply preconditioner, adding to the previous value.
    */
-  template<class VectorType>
+  template <class VectorType>
   void vmult_add (VectorType &, const VectorType &) const;
 
   /**
    * Apply transpose preconditioner, adding. Since this is the identity, this
    * function is the same as vmult_add().
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tvmult_add (VectorType &, const VectorType &) const;
 
   /**
@@ -229,26 +229,26 @@ public:
   /**
    * Apply preconditioner.
    */
-  template<class VectorType>
+  template <class VectorType>
   void vmult (VectorType &, const VectorType &) const;
 
   /**
    * Apply transpose preconditioner. Since this is the identity, this function
    * is the same as vmult().
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tvmult (VectorType &, const VectorType &) const;
   /**
    * Apply preconditioner, adding to the previous value.
    */
-  template<class VectorType>
+  template <class VectorType>
   void vmult_add (VectorType &, const VectorType &) const;
 
   /**
    * Apply transpose preconditioner, adding. Since this is the identity, this
    * function is the same as vmult_add().
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tvmult_add (VectorType &, const VectorType &) const;
 
   /**
@@ -334,7 +334,7 @@ private:
  *
  * @author Guido Kanschat, Wolfgang Bangerth, 1999
  */
-template<typename MatrixType = SparseMatrix<double>, class VectorType = Vector<double> >
+template <typename MatrixType = SparseMatrix<double>, class VectorType = Vector<double> >
 class PreconditionUseMatrix : public Subscriptor
 {
 public:
@@ -380,7 +380,7 @@ private:
  * @author Guido Kanschat, 2000; extension for full compatibility with
  * LinearOperator class: Jean-Paul Pelteret, 2015
  */
-template<typename MatrixType = SparseMatrix<double> >
+template <typename MatrixType = SparseMatrix<double> >
 class PreconditionRelaxation : public Subscriptor
 {
 public:
@@ -484,26 +484,26 @@ public:
   /**
    * Apply preconditioner.
    */
-  template<class VectorType>
+  template <class VectorType>
   void vmult (VectorType &, const VectorType &) const;
 
   /**
    * Apply transpose preconditioner. Since this is a symmetric preconditioner,
    * this function is the same as vmult().
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tvmult (VectorType &, const VectorType &) const;
 
   /**
    * Perform one step of the preconditioned Richardson iteration.
    */
-  template<class VectorType>
+  template <class VectorType>
   void step (VectorType &x, const VectorType &rhs) const;
 
   /**
    * Perform one transposed step of the preconditioned Richardson iteration.
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tstep (VectorType &x, const VectorType &rhs) const;
 };
 
@@ -566,25 +566,25 @@ public:
   /**
    * Apply preconditioner.
    */
-  template<class VectorType>
+  template <class VectorType>
   void vmult (VectorType &, const VectorType &) const;
 
   /**
    * Apply transpose preconditioner.
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tvmult (VectorType &, const VectorType &) const;
 
   /**
    * Perform one step of the preconditioned Richardson iteration.
    */
-  template<class VectorType>
+  template <class VectorType>
   void step (VectorType &x, const VectorType &rhs) const;
 
   /**
    * Perform one transposed step of the preconditioned Richardson iteration.
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tstep (VectorType &x, const VectorType &rhs) const;
 };
 
@@ -648,27 +648,27 @@ public:
   /**
    * Apply preconditioner.
    */
-  template<class VectorType>
+  template <class VectorType>
   void vmult (VectorType &, const VectorType &) const;
 
   /**
    * Apply transpose preconditioner. Since this is a symmetric preconditioner,
    * this function is the same as vmult().
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tvmult (VectorType &, const VectorType &) const;
 
 
   /**
    * Perform one step of the preconditioned Richardson iteration
    */
-  template<class VectorType>
+  template <class VectorType>
   void step (VectorType &x, const VectorType &rhs) const;
 
   /**
    * Perform one transposed step of the preconditioned Richardson iteration.
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tstep (VectorType &x, const VectorType &rhs) const;
 
 private:
@@ -789,13 +789,13 @@ public:
   /**
    * Apply preconditioner.
    */
-  template<class VectorType>
+  template <class VectorType>
   void vmult (VectorType &, const VectorType &) const;
 
   /**
    * Apply transpose preconditioner.
    */
-  template<class VectorType>
+  template <class VectorType>
   void Tvmult (VectorType &, const VectorType &) const;
 private:
   /**
@@ -1160,7 +1160,7 @@ PreconditionIdentity::initialize (const MatrixType &matrix,
 }
 
 
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionIdentity::vmult (VectorType &dst, const VectorType &src) const
 {
@@ -1169,14 +1169,14 @@ PreconditionIdentity::vmult (VectorType &dst, const VectorType &src) const
 
 
 
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionIdentity::Tvmult (VectorType &dst, const VectorType &src) const
 {
   dst = src;
 }
 
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionIdentity::vmult_add (VectorType &dst, const VectorType &src) const
 {
@@ -1185,7 +1185,7 @@ PreconditionIdentity::vmult_add (VectorType &dst, const VectorType &src) const
 
 
 
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionIdentity::Tvmult_add (VectorType &dst, const VectorType &src) const
 {
@@ -1250,7 +1250,7 @@ PreconditionRichardson::initialize
 
 
 
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionRichardson::vmult (VectorType &dst, const VectorType &src) const
 {
@@ -1263,7 +1263,7 @@ PreconditionRichardson::vmult (VectorType &dst, const VectorType &src) const
 
 
 
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionRichardson::Tvmult (VectorType &dst, const VectorType &src) const
 {
@@ -1274,7 +1274,7 @@ PreconditionRichardson::Tvmult (VectorType &dst, const VectorType &src) const
   dst.equ(relaxation,src);
 }
 
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionRichardson::vmult_add (VectorType &dst, const VectorType &src) const
 {
@@ -1287,7 +1287,7 @@ PreconditionRichardson::vmult_add (VectorType &dst, const VectorType &src) const
 
 
 
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionRichardson::Tvmult_add (VectorType &dst, const VectorType &src) const
 {
@@ -1350,7 +1350,7 @@ PreconditionRelaxation<MatrixType>::n () const
 //---------------------------------------------------------------------------
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionJacobi<MatrixType>::vmult (VectorType &dst, const VectorType &src) const
 {
@@ -1365,7 +1365,7 @@ PreconditionJacobi<MatrixType>::vmult (VectorType &dst, const VectorType &src) c
 
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionJacobi<MatrixType>::Tvmult (VectorType &dst, const VectorType &src) const
 {
@@ -1380,7 +1380,7 @@ PreconditionJacobi<MatrixType>::Tvmult (VectorType &dst, const VectorType &src)
 
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionJacobi<MatrixType>::step (VectorType &dst, const VectorType &src) const
 {
@@ -1395,7 +1395,7 @@ PreconditionJacobi<MatrixType>::step (VectorType &dst, const VectorType &src) co
 
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionJacobi<MatrixType>::Tstep (VectorType &dst, const VectorType &src) const
 {
@@ -1411,7 +1411,7 @@ PreconditionJacobi<MatrixType>::Tstep (VectorType &dst, const VectorType &src) c
 //---------------------------------------------------------------------------
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionSOR<MatrixType>::vmult (VectorType &dst, const VectorType &src) const
 {
@@ -1426,7 +1426,7 @@ PreconditionSOR<MatrixType>::vmult (VectorType &dst, const VectorType &src) cons
 
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionSOR<MatrixType>::Tvmult (VectorType &dst, const VectorType &src) const
 {
@@ -1441,7 +1441,7 @@ PreconditionSOR<MatrixType>::Tvmult (VectorType &dst, const VectorType &src) con
 
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionSOR<MatrixType>::step (VectorType &dst, const VectorType &src) const
 {
@@ -1456,7 +1456,7 @@ PreconditionSOR<MatrixType>::step (VectorType &dst, const VectorType &src) const
 
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionSOR<MatrixType>::Tstep (VectorType &dst, const VectorType &src) const
 {
@@ -1507,7 +1507,7 @@ PreconditionSSOR<MatrixType>::initialize (const MatrixType                     &
 
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionSSOR<MatrixType>::vmult (VectorType &dst, const VectorType &src) const
 {
@@ -1522,7 +1522,7 @@ PreconditionSSOR<MatrixType>::vmult (VectorType &dst, const VectorType &src) con
 
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionSSOR<MatrixType>::Tvmult (VectorType &dst, const VectorType &src) const
 {
@@ -1537,7 +1537,7 @@ PreconditionSSOR<MatrixType>::Tvmult (VectorType &dst, const VectorType &src) co
 
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionSSOR<MatrixType>::step (VectorType &dst, const VectorType &src) const
 {
@@ -1552,7 +1552,7 @@ PreconditionSSOR<MatrixType>::step (VectorType &dst, const VectorType &src) cons
 
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionSSOR<MatrixType>::Tstep (VectorType &dst, const VectorType &src) const
 {
@@ -1610,7 +1610,7 @@ PreconditionPSOR<MatrixType>::vmult (VectorType &dst, const VectorType &src) con
 
 
 template <typename MatrixType>
-template<class VectorType>
+template <class VectorType>
 inline void
 PreconditionPSOR<MatrixType>::Tvmult (VectorType &dst, const VectorType &src) const
 {
@@ -1640,7 +1640,7 @@ PreconditionPSOR<MatrixType>::AdditionalData::AdditionalData
 //---------------------------------------------------------------------------
 
 
-template<typename MatrixType, class VectorType>
+template <typename MatrixType, class VectorType>
 PreconditionUseMatrix<MatrixType,VectorType>::PreconditionUseMatrix(const MatrixType   &M,
     const function_ptr method)
   :
@@ -1649,7 +1649,7 @@ PreconditionUseMatrix<MatrixType,VectorType>::PreconditionUseMatrix(const Matrix
 
 
 
-template<typename MatrixType, class VectorType>
+template <typename MatrixType, class VectorType>
 void
 PreconditionUseMatrix<MatrixType,VectorType>::vmult (VectorType       &dst,
                                                      const VectorType &src) const
@@ -1659,7 +1659,7 @@ PreconditionUseMatrix<MatrixType,VectorType>::vmult (VectorType       &dst,
 
 //---------------------------------------------------------------------------
 
-template<typename MatrixType>
+template <typename MatrixType>
 inline
 PreconditionRelaxation<MatrixType>::AdditionalData::
 AdditionalData (const double relaxation)
@@ -1790,7 +1790,7 @@ namespace internal
       mutable Number *dst;
     };
 
-    template<typename Number>
+    template <typename Number>
     struct VectorUpdatesRange : public parallel::ParallelForInteger
     {
       VectorUpdatesRange(const VectorUpdater<Number> &updater,
diff --git a/include/deal.II/lac/precondition_block.h b/include/deal.II/lac/precondition_block.h
index 8aab5b675b..4d8cd31b0e 100644
--- a/include/deal.II/lac/precondition_block.h
+++ b/include/deal.II/lac/precondition_block.h
@@ -77,7 +77,7 @@ DEAL_II_NAMESPACE_OPEN
  * @author Ralf Hartmann, Guido Kanschat
  * @date 1999, 2000, 2010
  */
-template<typename MatrixType, typename inverse_type = typename MatrixType::value_type>
+template <typename MatrixType, typename inverse_type = typename MatrixType::value_type>
 class PreconditionBlock
   : public virtual Subscriptor,
     protected PreconditionBlockBase<inverse_type>
@@ -363,7 +363,7 @@ protected:
  *
  * @author Ralf Hartmann, Guido Kanschat, 1999, 2000, 2003
  */
-template<typename MatrixType, typename inverse_type = typename MatrixType::value_type>
+template <typename MatrixType, typename inverse_type = typename MatrixType::value_type>
 class PreconditionBlockJacobi : public virtual Subscriptor,
   private PreconditionBlock<MatrixType, inverse_type>
 {
@@ -629,7 +629,7 @@ private:
  *
  * @author Ralf Hartmann, Guido Kanschat, 1999, 2000, 2001, 2002, 2003
  */
-template<typename MatrixType, typename inverse_type = typename MatrixType::value_type>
+template <typename MatrixType, typename inverse_type = typename MatrixType::value_type>
 class PreconditionBlockSOR : public virtual Subscriptor,
   protected PreconditionBlock<MatrixType, inverse_type>
 {
@@ -787,7 +787,7 @@ protected:
  *
  * @author Ralf Hartmann, Guido Kanschat, 1999, 2000
  */
-template<typename MatrixType, typename inverse_type = typename MatrixType::value_type>
+template <typename MatrixType, typename inverse_type = typename MatrixType::value_type>
 class PreconditionBlockSSOR : public virtual Subscriptor,
   private PreconditionBlockSOR<MatrixType, inverse_type>
 {
@@ -864,7 +864,7 @@ public:
 
 #ifndef DOXYGEN
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline bool
 PreconditionBlock<MatrixType, inverse_type>::empty () const
 {
@@ -874,7 +874,7 @@ PreconditionBlock<MatrixType, inverse_type>::empty () const
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline inverse_type
 PreconditionBlock<MatrixType, inverse_type>::el (
   size_type i,
@@ -898,7 +898,7 @@ PreconditionBlock<MatrixType, inverse_type>::el (
 
 //---------------------------------------------------------------------------
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::Accessor::
 Accessor (const PreconditionBlockJacobi<MatrixType, inverse_type> *matrix,
@@ -926,7 +926,7 @@ Accessor (const PreconditionBlockJacobi<MatrixType, inverse_type> *matrix,
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 typename PreconditionBlockJacobi<MatrixType, inverse_type>::size_type
 PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::Accessor::row() const
@@ -938,7 +938,7 @@ PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::Accessor::row
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 typename PreconditionBlockJacobi<MatrixType, inverse_type>::size_type
 PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::Accessor::column() const
@@ -950,7 +950,7 @@ PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::Accessor::col
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 inverse_type
 PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::Accessor::value() const
@@ -962,7 +962,7 @@ PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::Accessor::val
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::
 const_iterator(const PreconditionBlockJacobi<MatrixType, inverse_type> *matrix,
@@ -972,7 +972,7 @@ const_iterator(const PreconditionBlockJacobi<MatrixType, inverse_type> *matrix,
 {}
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 typename PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator &
 PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::operator++ ()
@@ -994,7 +994,7 @@ PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::operator++ ()
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 const typename PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::Accessor &
 PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::operator* () const
@@ -1003,7 +1003,7 @@ PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::operator* ()
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 const typename PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::Accessor *
 PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::operator-> () const
@@ -1012,7 +1012,7 @@ PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::operator-> ()
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 bool
 PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::
@@ -1030,7 +1030,7 @@ operator == (const const_iterator &other) const
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 bool
 PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::
@@ -1040,7 +1040,7 @@ operator != (const const_iterator &other) const
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 bool
 PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator::
@@ -1052,7 +1052,7 @@ operator < (const const_iterator &other) const
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 typename PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator
 PreconditionBlockJacobi<MatrixType, inverse_type>::begin () const
@@ -1061,7 +1061,7 @@ PreconditionBlockJacobi<MatrixType, inverse_type>::begin () const
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 typename PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator
 PreconditionBlockJacobi<MatrixType, inverse_type>::end () const
@@ -1070,7 +1070,7 @@ PreconditionBlockJacobi<MatrixType, inverse_type>::end () const
 }
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 typename PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator
 PreconditionBlockJacobi<MatrixType, inverse_type>::begin (
@@ -1082,7 +1082,7 @@ PreconditionBlockJacobi<MatrixType, inverse_type>::begin (
 
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 inline
 typename PreconditionBlockJacobi<MatrixType, inverse_type>::const_iterator
 PreconditionBlockJacobi<MatrixType, inverse_type>::end (
diff --git a/include/deal.II/lac/precondition_block.templates.h b/include/deal.II/lac/precondition_block.templates.h
index 789e87ccc4..0ee3d4864e 100644
--- a/include/deal.II/lac/precondition_block.templates.h
+++ b/include/deal.II/lac/precondition_block.templates.h
@@ -29,7 +29,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template<typename MatrixType, typename inverse_type>
+template <typename MatrixType, typename inverse_type>
 PreconditionBlock<MatrixType, inverse_type>::AdditionalData::
 AdditionalData (const size_type block_size,
                 const double    relaxation,
diff --git a/include/deal.II/lac/relaxation_block.h b/include/deal.II/lac/relaxation_block.h
index 2292f67b5a..b4941b6bb2 100644
--- a/include/deal.II/lac/relaxation_block.h
+++ b/include/deal.II/lac/relaxation_block.h
@@ -273,9 +273,9 @@ private:
  * @author Guido Kanschat
  * @date 2010
  */
-template<typename MatrixType,
-         typename InverseNumberType = typename MatrixType::value_type,
-         typename VectorType = Vector<double> >
+template <typename MatrixType,
+          typename InverseNumberType = typename MatrixType::value_type,
+          typename VectorType = Vector<double> >
 class RelaxationBlockJacobi : public virtual Subscriptor,
   protected RelaxationBlock<MatrixType, InverseNumberType, VectorType>
 {
@@ -373,9 +373,9 @@ public:
  * @author Guido Kanschat
  * @date 2010
  */
-template<typename MatrixType,
-         typename InverseNumberType = typename MatrixType::value_type,
-         typename VectorType = Vector<double> >
+template <typename MatrixType,
+          typename InverseNumberType = typename MatrixType::value_type,
+          typename VectorType = Vector<double> >
 class RelaxationBlockSOR : public virtual Subscriptor,
   protected RelaxationBlock<MatrixType, InverseNumberType, VectorType>
 {
@@ -468,9 +468,9 @@ public:
  * @author Guido Kanschat
  * @date 2010
  */
-template<typename MatrixType,
-         typename InverseNumberType = typename MatrixType::value_type,
-         typename VectorType = Vector<double> >
+template <typename MatrixType,
+          typename InverseNumberType = typename MatrixType::value_type,
+          typename VectorType = Vector<double> >
 class RelaxationBlockSSOR : public virtual Subscriptor,
   protected RelaxationBlock<MatrixType, InverseNumberType, VectorType>
 {
diff --git a/include/deal.II/lac/solver.h b/include/deal.II/lac/solver.h
index 7cb88f15a2..5f83bb5d53 100644
--- a/include/deal.II/lac/solver.h
+++ b/include/deal.II/lac/solver.h
@@ -493,7 +493,7 @@ Solver<VectorType>::StateCombiner::operator ()(const Iterator begin,
 }
 
 
-template<class VectorType>
+template <class VectorType>
 inline
 Solver<VectorType>::Solver (SolverControl        &solver_control,
                             VectorMemory<VectorType> &vector_memory)
@@ -512,7 +512,7 @@ Solver<VectorType>::Solver (SolverControl        &solver_control,
 
 
 
-template<class VectorType>
+template <class VectorType>
 inline
 Solver<VectorType>::Solver (SolverControl &solver_control)
   :
@@ -531,7 +531,7 @@ Solver<VectorType>::Solver (SolverControl &solver_control)
 
 
 
-template<class VectorType>
+template <class VectorType>
 inline
 boost::signals2::connection
 Solver<VectorType>::
diff --git a/include/deal.II/lac/solver_bicgstab.h b/include/deal.II/lac/solver_bicgstab.h
index df2d5ca800..73db13787b 100644
--- a/include/deal.II/lac/solver_bicgstab.h
+++ b/include/deal.II/lac/solver_bicgstab.h
@@ -129,7 +129,7 @@ public:
   /**
    * Solve primal problem only.
    */
-  template<typename MatrixType, typename PreconditionerType>
+  template <typename MatrixType, typename PreconditionerType>
   void
   solve (const MatrixType         &A,
          VectorType               &x,
@@ -254,7 +254,7 @@ private:
    * The iteration loop itself. The function returns a structure indicating
    * what happened in this function.
    */
-  template<typename MatrixType, typename PreconditionerType>
+  template <typename MatrixType, typename PreconditionerType>
   IterationResult
   iterate(const MatrixType         &A,
           const PreconditionerType &precondition);
@@ -266,7 +266,7 @@ private:
 #ifndef DOXYGEN
 
 
-template<typename VectorType>
+template <typename VectorType>
 SolverBicgstab<VectorType>::IterationResult::IterationResult
 (const bool                 breakdown,
  const SolverControl::State state,
@@ -280,7 +280,7 @@ SolverBicgstab<VectorType>::IterationResult::IterationResult
 {}
 
 
-template<typename VectorType>
+template <typename VectorType>
 SolverBicgstab<VectorType>::SolverBicgstab (SolverControl            &cn,
                                             VectorMemory<VectorType> &mem,
                                             const AdditionalData     &data)
@@ -291,7 +291,7 @@ SolverBicgstab<VectorType>::SolverBicgstab (SolverControl            &cn,
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 SolverBicgstab<VectorType>::SolverBicgstab (SolverControl        &cn,
                                             const AdditionalData &data)
   :
@@ -317,7 +317,7 @@ SolverBicgstab<VectorType>::SolverBicgstab (SolverControl        &cn,
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 SolverBicgstab<VectorType>::~SolverBicgstab ()
 {}
 
@@ -353,7 +353,7 @@ SolverBicgstab<VectorType>::start (const MatrixType &A)
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 void
 SolverBicgstab<VectorType>::print_vectors(const unsigned int,
                                           const VectorType &,
@@ -363,8 +363,8 @@ SolverBicgstab<VectorType>::print_vectors(const unsigned int,
 
 
 
-template<typename VectorType>
-template<typename MatrixType, typename PreconditionerType>
+template <typename VectorType>
+template <typename MatrixType, typename PreconditionerType>
 typename SolverBicgstab<VectorType>::IterationResult
 SolverBicgstab<VectorType>::iterate(const MatrixType         &A,
                                     const PreconditionerType &precondition)
@@ -450,8 +450,8 @@ SolverBicgstab<VectorType>::iterate(const MatrixType         &A,
 }
 
 
-template<typename VectorType>
-template<typename MatrixType, typename PreconditionerType>
+template <typename VectorType>
+template <typename MatrixType, typename PreconditionerType>
 void
 SolverBicgstab<VectorType>::solve(const MatrixType         &A,
                                   VectorType               &x,
diff --git a/include/deal.II/lac/solver_cg.h b/include/deal.II/lac/solver_cg.h
index 87a690154b..7ec47b4467 100644
--- a/include/deal.II/lac/solver_cg.h
+++ b/include/deal.II/lac/solver_cg.h
@@ -486,7 +486,7 @@ SolverCG<VectorType>::solve (const MatrixType         &A,
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 boost::signals2::connection
 SolverCG<VectorType>::connect_coefficients_slot
 (const std::function<void(double,double)> &slot)
@@ -496,7 +496,7 @@ SolverCG<VectorType>::connect_coefficients_slot
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 boost::signals2::connection
 SolverCG<VectorType>::connect_condition_number_slot
 (const std::function<void(double)> &slot,
@@ -514,7 +514,7 @@ SolverCG<VectorType>::connect_condition_number_slot
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 boost::signals2::connection
 SolverCG<VectorType>::connect_eigenvalues_slot
 (const std::function<void (const std::vector<double> &)> &slot,
diff --git a/include/deal.II/lac/solver_gmres.h b/include/deal.II/lac/solver_gmres.h
index 87b9118bce..dc8701adf8 100644
--- a/include/deal.II/lac/solver_gmres.h
+++ b/include/deal.II/lac/solver_gmres.h
@@ -245,7 +245,7 @@ public:
   /**
    * Solve the linear system $Ax=b$ for x.
    */
-  template<typename MatrixType, typename PreconditionerType>
+  template <typename MatrixType, typename PreconditionerType>
   void
   solve (const MatrixType         &A,
          VectorType               &x,
@@ -476,7 +476,7 @@ public:
   /**
    * Solve the linear system $Ax=b$ for x.
    */
-  template<typename MatrixType, typename PreconditionerType>
+  template <typename MatrixType, typename PreconditionerType>
   void
   solve (const MatrixType         &A,
          VectorType               &x,
@@ -708,7 +708,7 @@ SolverGMRES<VectorType>::modified_gram_schmidt
 
 
 
-template<class VectorType>
+template <class VectorType>
 inline void
 SolverGMRES<VectorType>::compute_eigs_and_cond
 (const FullMatrix<double>                     &H_orig,
@@ -754,8 +754,8 @@ SolverGMRES<VectorType>::compute_eigs_and_cond
 
 
 
-template<class VectorType>
-template<typename MatrixType, typename PreconditionerType>
+template <class VectorType>
+template <typename MatrixType, typename PreconditionerType>
 void
 SolverGMRES<VectorType>::solve (const MatrixType         &A,
                                 VectorType               &x,
@@ -1056,7 +1056,7 @@ SolverGMRES<VectorType>::solve (const MatrixType         &A,
 
 
 
-template<class VectorType>
+template <class VectorType>
 boost::signals2::connection
 SolverGMRES<VectorType>::connect_condition_number_slot
 (const std::function<void(double)> &slot,
@@ -1074,7 +1074,7 @@ SolverGMRES<VectorType>::connect_condition_number_slot
 
 
 
-template<class VectorType>
+template <class VectorType>
 boost::signals2::connection
 SolverGMRES<VectorType>::connect_eigenvalues_slot
 (const std::function<void (const std::vector<std::complex<double> > &)> &slot,
@@ -1092,7 +1092,7 @@ SolverGMRES<VectorType>::connect_eigenvalues_slot
 
 
 
-template<class VectorType>
+template <class VectorType>
 boost::signals2::connection
 SolverGMRES<VectorType>::connect_hessenberg_slot
 (const std::function<void (const FullMatrix<double> &)> &slot,
@@ -1110,7 +1110,7 @@ SolverGMRES<VectorType>::connect_hessenberg_slot
 
 
 
-template<class VectorType>
+template <class VectorType>
 boost::signals2::connection
 SolverGMRES<VectorType>::connect_krylov_space_slot
 (const std::function<void (const internal::SolverGMRES::TmpVectors<VectorType> &)> &slot)
@@ -1120,7 +1120,7 @@ SolverGMRES<VectorType>::connect_krylov_space_slot
 
 
 
-template<class VectorType>
+template <class VectorType>
 double
 SolverGMRES<VectorType>::criterion ()
 {
@@ -1154,8 +1154,8 @@ SolverFGMRES<VectorType>::SolverFGMRES (SolverControl        &cn,
 
 
 
-template<class VectorType>
-template<typename MatrixType, typename PreconditionerType>
+template <class VectorType>
+template <typename MatrixType, typename PreconditionerType>
 void
 SolverFGMRES<VectorType>::solve (const MatrixType         &A,
                                  VectorType               &x,
diff --git a/include/deal.II/lac/solver_minres.h b/include/deal.II/lac/solver_minres.h
index 72f407422a..a4150e69e7 100644
--- a/include/deal.II/lac/solver_minres.h
+++ b/include/deal.II/lac/solver_minres.h
@@ -99,7 +99,7 @@ public:
   /**
    * Solve the linear system $Ax=b$ for x.
    */
-  template<typename MatrixType, typename PreconditionerType>
+  template <typename MatrixType, typename PreconditionerType>
   void
   solve (const MatrixType         &A,
          VectorType               &x,
@@ -154,7 +154,7 @@ protected:
 
 #ifndef DOXYGEN
 
-template<class VectorType>
+template <class VectorType>
 SolverMinRes<VectorType>::SolverMinRes (SolverControl            &cn,
                                         VectorMemory<VectorType> &mem,
                                         const AdditionalData &)
@@ -164,7 +164,7 @@ SolverMinRes<VectorType>::SolverMinRes (SolverControl            &cn,
 
 
 
-template<class VectorType>
+template <class VectorType>
 SolverMinRes<VectorType>::SolverMinRes (SolverControl        &cn,
                                         const AdditionalData &)
   :
@@ -180,13 +180,13 @@ SolverMinRes<VectorType>::SolverMinRes (SolverControl        &cn,
 {}
 
 
-template<class VectorType>
+template <class VectorType>
 SolverMinRes<VectorType>::~SolverMinRes ()
 {}
 
 
 
-template<class VectorType>
+template <class VectorType>
 double
 SolverMinRes<VectorType>::criterion()
 {
@@ -194,7 +194,7 @@ SolverMinRes<VectorType>::criterion()
 }
 
 
-template<class VectorType>
+template <class VectorType>
 void
 SolverMinRes<VectorType>::print_vectors(const unsigned int,
                                         const VectorType &,
@@ -204,8 +204,8 @@ SolverMinRes<VectorType>::print_vectors(const unsigned int,
 
 
 
-template<class VectorType>
-template<typename MatrixType, typename PreconditionerType>
+template <class VectorType>
+template <typename MatrixType, typename PreconditionerType>
 void
 SolverMinRes<VectorType>::solve (const MatrixType         &A,
                                  VectorType               &x,
diff --git a/include/deal.II/lac/solver_qmrs.h b/include/deal.II/lac/solver_qmrs.h
index 60e0073b4c..08bf9066af 100644
--- a/include/deal.II/lac/solver_qmrs.h
+++ b/include/deal.II/lac/solver_qmrs.h
@@ -125,7 +125,7 @@ public:
   /**
    * Solve the linear system $Ax=b$ for x.
    */
-  template<typename MatrixType, typename PreconditionerType>
+  template <typename MatrixType, typename PreconditionerType>
   void
   solve (const MatrixType         &A,
          VectorType               &x,
@@ -198,7 +198,7 @@ private:
    * The iteration loop itself. The function returns a structure indicating
    * what happened in this function.
    */
-  template<typename MatrixType, typename PreconditionerType>
+  template <typename MatrixType, typename PreconditionerType>
   IterationResult
   iterate (const MatrixType         &A,
            const PreconditionerType &precondition);
@@ -214,7 +214,7 @@ private:
 
 #ifndef DOXYGEN
 
-template<class VectorType>
+template <class VectorType>
 SolverQMRS<VectorType>::IterationResult::IterationResult (const SolverControl::State state,
                                                           const double               last_residual)
   :
@@ -223,7 +223,7 @@ SolverQMRS<VectorType>::IterationResult::IterationResult (const SolverControl::S
 {}
 
 
-template<class VectorType>
+template <class VectorType>
 SolverQMRS<VectorType>::SolverQMRS (SolverControl            &cn,
                                     VectorMemory<VectorType> &mem,
                                     const AdditionalData     &data)
@@ -234,7 +234,7 @@ SolverQMRS<VectorType>::SolverQMRS (SolverControl            &cn,
 
 
 
-template<class VectorType>
+template <class VectorType>
 SolverQMRS<VectorType>::SolverQMRS(SolverControl        &cn,
                                    const AdditionalData &data)
   :
@@ -244,7 +244,7 @@ SolverQMRS<VectorType>::SolverQMRS(SolverControl        &cn,
 
 
 
-template<class VectorType>
+template <class VectorType>
 double
 SolverQMRS<VectorType>::criterion()
 {
@@ -253,7 +253,7 @@ SolverQMRS<VectorType>::criterion()
 
 
 
-template<class VectorType>
+template <class VectorType>
 void
 SolverQMRS<VectorType>::print_vectors(const unsigned int,
                                       const VectorType &,
@@ -263,8 +263,8 @@ SolverQMRS<VectorType>::print_vectors(const unsigned int,
 
 
 
-template<class VectorType>
-template<typename MatrixType, typename PreconditionerType>
+template <class VectorType>
+template <typename MatrixType, typename PreconditionerType>
 void
 SolverQMRS<VectorType>::solve (const MatrixType         &A,
                                VectorType               &x,
@@ -321,8 +321,8 @@ SolverQMRS<VectorType>::solve (const MatrixType         &A,
 
 
 
-template<class VectorType>
-template<typename MatrixType, typename PreconditionerType>
+template <class VectorType>
+template <typename MatrixType, typename PreconditionerType>
 typename SolverQMRS<VectorType>::IterationResult
 SolverQMRS<VectorType>::iterate(const MatrixType         &A,
                                 const PreconditionerType &precondition)
diff --git a/include/deal.II/lac/solver_relaxation.h b/include/deal.II/lac/solver_relaxation.h
index fad56a269b..67df65cde8 100644
--- a/include/deal.II/lac/solver_relaxation.h
+++ b/include/deal.II/lac/solver_relaxation.h
@@ -79,7 +79,7 @@ public:
    * R(x_k,b)$. The matrix <i>A</i> itself is only used to compute the
    * residual.
    */
-  template<typename MatrixType, class RelaxationType>
+  template <typename MatrixType, class RelaxationType>
   void
   solve (const MatrixType     &A,
          VectorType           &x,
diff --git a/include/deal.II/lac/solver_richardson.h b/include/deal.II/lac/solver_richardson.h
index f387cfcbbd..834a91dca5 100644
--- a/include/deal.II/lac/solver_richardson.h
+++ b/include/deal.II/lac/solver_richardson.h
@@ -108,7 +108,7 @@ public:
   /**
    * Solve the linear system $Ax=b$ for x.
    */
-  template<typename MatrixType, typename PreconditionerType>
+  template <typename MatrixType, typename PreconditionerType>
   void
   solve (const MatrixType         &A,
          VectorType               &x,
@@ -118,7 +118,7 @@ public:
   /**
    * Solve $A^Tx=b$ for $x$.
    */
-  template<typename MatrixType, typename PreconditionerType>
+  template <typename MatrixType, typename PreconditionerType>
   void
   Tsolve (const MatrixType         &A,
           VectorType               &x,
diff --git a/include/deal.II/lac/solver_selector.h b/include/deal.II/lac/solver_selector.h
index 0c78fc44c7..9412e5cdcd 100644
--- a/include/deal.II/lac/solver_selector.h
+++ b/include/deal.II/lac/solver_selector.h
@@ -118,7 +118,7 @@ public:
    * SolverName was specified in the constructor.
    *
    */
-  template<class Matrix, class Preconditioner>
+  template <class Matrix, class Preconditioner>
   void solve (const Matrix         &A,
               VectorType           &x,
               const VectorType     &b,
@@ -256,7 +256,7 @@ SolverSelector<VectorType>::select(const std::string &name)
 
 
 template <typename VectorType>
-template<class Matrix, class Preconditioner>
+template <class Matrix, class Preconditioner>
 void
 SolverSelector<VectorType>::solve (const Matrix         &A,
                                    VectorType           &x,
diff --git a/include/deal.II/lac/sparse_decomposition.h b/include/deal.II/lac/sparse_decomposition.h
index b22b38b063..7009208ba7 100644
--- a/include/deal.II/lac/sparse_decomposition.h
+++ b/include/deal.II/lac/sparse_decomposition.h
@@ -278,7 +278,7 @@ protected:
    * Copies the passed SparseMatrix onto this object. This object's sparsity
    * pattern remains unchanged.
    */
-  template<typename somenumber>
+  template <typename somenumber>
   void copy_from (const SparseMatrix<somenumber> &matrix);
 
   /**
diff --git a/include/deal.II/lac/sparse_decomposition.templates.h b/include/deal.II/lac/sparse_decomposition.templates.h
index a4154c43f4..b5827863f9 100644
--- a/include/deal.II/lac/sparse_decomposition.templates.h
+++ b/include/deal.II/lac/sparse_decomposition.templates.h
@@ -27,7 +27,7 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template<typename number>
+template <typename number>
 SparseLUDecomposition<number>::SparseLUDecomposition()
   :
   SparseMatrix<number>(),
@@ -37,14 +37,14 @@ SparseLUDecomposition<number>::SparseLUDecomposition()
 
 
 
-template<typename number>
+template <typename number>
 SparseLUDecomposition<number>::~SparseLUDecomposition()
 {
   clear();
 }
 
 
-template<typename number>
+template <typename number>
 void SparseLUDecomposition<number>::clear()
 {
   std::vector<const size_type *> tmp;
@@ -61,7 +61,7 @@ void SparseLUDecomposition<number>::clear()
 
 
 
-template<typename number>
+template <typename number>
 template <typename somenumber>
 void SparseLUDecomposition<number>::initialize (
   const SparseMatrix<somenumber> &matrix,
@@ -130,7 +130,7 @@ void SparseLUDecomposition<number>::initialize (
 
 
 
-template<typename number>
+template <typename number>
 void
 SparseLUDecomposition<number>::prebuild_lower_bound()
 {
diff --git a/include/deal.II/lac/sparse_matrix.templates.h b/include/deal.II/lac/sparse_matrix.templates.h
index bd1d517d9f..17fe90d137 100644
--- a/include/deal.II/lac/sparse_matrix.templates.h
+++ b/include/deal.II/lac/sparse_matrix.templates.h
@@ -167,7 +167,7 @@ namespace internal
   {
     typedef types::global_dof_index size_type;
 
-    template<typename T>
+    template <typename T>
     void zero_subrange (const size_type begin,
                         const size_type end,
                         T *dst)
diff --git a/include/deal.II/lac/sparse_matrix_ez.h b/include/deal.II/lac/sparse_matrix_ez.h
index 66276cd398..5f4d45637f 100644
--- a/include/deal.II/lac/sparse_matrix_ez.h
+++ b/include/deal.II/lac/sparse_matrix_ez.h
@@ -26,8 +26,8 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template<typename number> class Vector;
-template<typename number> class FullMatrix;
+template <typename number> class Vector;
+template <typename number> class FullMatrix;
 
 /**
  * @addtogroup Matrix1
@@ -1392,7 +1392,7 @@ SparseMatrixEZ<number>::end (const size_type r) const
   return result;
 }
 
-template<typename number>
+template <typename number>
 template <typename MatrixType>
 inline
 SparseMatrixEZ<number> &
@@ -1417,7 +1417,7 @@ SparseMatrixEZ<number>::copy_from (const MatrixType &M, const bool elide_zero_va
   return *this;
 }
 
-template<typename number>
+template <typename number>
 template <typename MatrixType>
 inline
 void
@@ -1445,7 +1445,7 @@ SparseMatrixEZ<number>::add (const number      factor,
 
 
 
-template<typename number>
+template <typename number>
 template <typename MatrixTypeA, typename MatrixTypeB>
 inline void
 SparseMatrixEZ<number>::conjugate_add (const MatrixTypeA &A,
diff --git a/include/deal.II/lac/sparse_vanka.h b/include/deal.II/lac/sparse_vanka.h
index 73f813b2fb..b73c34a7df 100644
--- a/include/deal.II/lac/sparse_vanka.h
+++ b/include/deal.II/lac/sparse_vanka.h
@@ -127,7 +127,7 @@ template <typename number> class SparseBlockVanka;
  * @author Guido Kanschat, Wolfgang Bangerth; 1999, 2000; extension for full
  * compatibility with LinearOperator class: Jean-Paul Pelteret, 2015
  */
-template<typename number>
+template <typename number>
 class SparseVanka
 {
 public:
@@ -227,7 +227,7 @@ public:
    * Do the preconditioning. This function takes the residual in @p src and
    * returns the resulting update vector in @p dst.
    */
-  template<typename number2>
+  template <typename number2>
   void vmult (Vector<number2>       &dst,
               const Vector<number2> &src) const;
 
@@ -235,7 +235,7 @@ public:
    * Apply transpose preconditioner. This function takes the residual in @p
    * src  and returns the resulting update vector in @p dst.
    */
-  template<typename number2>
+  template <typename number2>
   void Tvmult (Vector<number2>       &dst,
                const Vector<number2> &src) const;
 
@@ -279,7 +279,7 @@ protected:
    * The @p vmult of this class of course calls this function with a null
    * pointer
    */
-  template<typename number2>
+  template <typename number2>
   void apply_preconditioner (Vector<number2>         &dst,
                              const Vector<number2>   &src,
                              const std::vector<bool> *const dof_mask = nullptr) const;
@@ -502,7 +502,7 @@ private:
  *
  * @author Wolfgang Bangerth, 2000
  */
-template<typename number>
+template <typename number>
 class SparseBlockVanka : public SparseVanka<number>
 {
 public:
@@ -540,7 +540,7 @@ public:
   /**
    * Apply the preconditioner.
    */
-  template<typename number2>
+  template <typename number2>
   void vmult (Vector<number2>       &dst,
               const Vector<number2> &src) const;
 
@@ -579,7 +579,7 @@ private:
 
 #ifndef DOXYGEN
 
-template<typename number>
+template <typename number>
 inline typename SparseVanka<number>::size_type
 SparseVanka<number>::m () const
 {
@@ -587,7 +587,7 @@ SparseVanka<number>::m () const
   return _m;
 }
 
-template<typename number>
+template <typename number>
 inline typename SparseVanka<number>::size_type
 SparseVanka<number>::n () const
 {
@@ -595,8 +595,8 @@ SparseVanka<number>::n () const
   return _n;
 }
 
-template<typename number>
-template<typename number2>
+template <typename number>
+template <typename number2>
 inline void
 SparseVanka<number>::Tvmult (Vector<number2>       &/*dst*/,
                              const Vector<number2> &/*src*/) const
diff --git a/include/deal.II/lac/sparse_vanka.templates.h b/include/deal.II/lac/sparse_vanka.templates.h
index 31da7a5cc0..835e883ef8 100644
--- a/include/deal.II/lac/sparse_vanka.templates.h
+++ b/include/deal.II/lac/sparse_vanka.templates.h
@@ -29,7 +29,7 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template<typename number>
+template <typename number>
 SparseVanka<number>::SparseVanka()
   :
   matrix (),
@@ -43,7 +43,7 @@ SparseVanka<number>::SparseVanka()
 
 }
 
-template<typename number>
+template <typename number>
 SparseVanka<number>::SparseVanka(const SparseMatrix<number> &M,
                                  const std::vector<bool>    &selected_dofs,
                                  const bool                  conserve_mem,
@@ -65,7 +65,7 @@ SparseVanka<number>::SparseVanka(const SparseMatrix<number> &M,
 }
 
 
-template<typename number>
+template <typename number>
 SparseVanka<number>::~SparseVanka()
 {
   typename std::vector<SmartPointer<FullMatrix<float>,SparseVanka<number> > >::iterator i;
@@ -78,7 +78,7 @@ SparseVanka<number>::~SparseVanka()
 }
 
 
-template<typename number>
+template <typename number>
 void
 SparseVanka<number>::initialize(const SparseMatrix<number> &M,
                                 const AdditionalData       &additional_data)
@@ -220,8 +220,8 @@ SparseVanka<number>::compute_inverse (const size_type         row,
 }
 
 
-template<typename number>
-template<typename number2>
+template <typename number>
+template <typename number2>
 void
 SparseVanka<number>::vmult (Vector<number2>       &dst,
                             const Vector<number2> &src) const
@@ -237,8 +237,8 @@ SparseVanka<number>::vmult (Vector<number2>       &dst,
 }
 
 
-template<typename number>
-template<typename number2>
+template <typename number>
+template <typename number2>
 void
 SparseVanka<number>::apply_preconditioner (Vector<number2>         &dst,
                                            const Vector<number2>   &src,
diff --git a/include/deal.II/lac/tridiagonal_matrix.h b/include/deal.II/lac/tridiagonal_matrix.h
index ffc1c1a600..28836a1f82 100644
--- a/include/deal.II/lac/tridiagonal_matrix.h
+++ b/include/deal.II/lac/tridiagonal_matrix.h
@@ -26,7 +26,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 // forward declarations
-template<typename number> class Vector;
+template <typename number> class Vector;
 
 
 /*! @addtogroup Matrix1
@@ -45,7 +45,7 @@ template<typename number> class Vector;
  * @ingroup Matrix1
  * @author Guido Kanschat, 2005, 2006
  */
-template<typename number>
+template <typename number>
 class TridiagonalMatrix
 {
 public:
@@ -295,7 +295,7 @@ private:
 //---------------------------------------------------------------------------
 #ifndef DOXYGEN
 
-template<typename number>
+template <typename number>
 types::global_dof_index
 TridiagonalMatrix<number>::m() const
 {
@@ -304,7 +304,7 @@ TridiagonalMatrix<number>::m() const
 
 
 
-template<typename number>
+template <typename number>
 types::global_dof_index
 TridiagonalMatrix<number>::n() const
 {
@@ -312,7 +312,7 @@ TridiagonalMatrix<number>::n() const
 }
 
 
-template<typename number>
+template <typename number>
 inline
 number
 TridiagonalMatrix<number>::operator()(size_type i, size_type j) const
@@ -340,7 +340,7 @@ TridiagonalMatrix<number>::operator()(size_type i, size_type j) const
 }
 
 
-template<typename number>
+template <typename number>
 inline
 number &
 TridiagonalMatrix<number>::operator()(size_type i, size_type j)
diff --git a/include/deal.II/lac/trilinos_block_sparse_matrix.h b/include/deal.II/lac/trilinos_block_sparse_matrix.h
index 6fdf7a3769..ef92198db6 100644
--- a/include/deal.II/lac/trilinos_block_sparse_matrix.h
+++ b/include/deal.II/lac/trilinos_block_sparse_matrix.h
@@ -595,7 +595,7 @@ namespace TrilinosWrappers
        *
        * @ingroup TrilinosWrappers
        */
-      template<typename PayloadBlockType>
+      template <typename PayloadBlockType>
       class TrilinosBlockPayload
       {
       public:
diff --git a/include/deal.II/lac/trilinos_linear_operator.h b/include/deal.II/lac/trilinos_linear_operator.h
index d2b8d8fd87..01039bce7a 100644
--- a/include/deal.II/lac/trilinos_linear_operator.h
+++ b/include/deal.II/lac/trilinos_linear_operator.h
@@ -42,7 +42,7 @@ namespace TrilinosWrappers
 
     namespace BlockLinearOperator
     {
-      template<typename PayloadBlockType>
+      template <typename PayloadBlockType>
       class TrilinosBlockPayload;
     }
   }
diff --git a/include/deal.II/lac/trilinos_parallel_block_vector.h b/include/deal.II/lac/trilinos_parallel_block_vector.h
index f184567c64..9a6f4c34c3 100644
--- a/include/deal.II/lac/trilinos_parallel_block_vector.h
+++ b/include/deal.II/lac/trilinos_parallel_block_vector.h
@@ -431,7 +431,7 @@ namespace internal
      * A helper class used internally in linear_operator.h. Specialization for
      * TrilinosWrappers::MPI::BlockVector.
      */
-    template<>
+    template <>
     class ReinitHelper<TrilinosWrappers::MPI::BlockVector>
     {
     public:
diff --git a/include/deal.II/lac/trilinos_solver.h b/include/deal.II/lac/trilinos_solver.h
index 10c34bb7a0..e22f3289cf 100644
--- a/include/deal.II/lac/trilinos_solver.h
+++ b/include/deal.II/lac/trilinos_solver.h
@@ -308,13 +308,13 @@ namespace TrilinosWrappers
      * The solve function is used to set properly the Epetra_LinearProblem,
      * once it is done this function solves the linear problem.
      */
-    template<typename Preconditioner>
+    template <typename Preconditioner>
     void do_solve(const Preconditioner &preconditioner);
 
     /**
      * A function that sets the preconditioner that the solver will apply
      */
-    template<typename Preconditioner>
+    template <typename Preconditioner>
     void set_preconditioner (AztecOO              &solver,
                              const Preconditioner &preconditioner);
 
diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h
index f6fe4e919c..8c90ee992b 100644
--- a/include/deal.II/lac/trilinos_sparse_matrix.h
+++ b/include/deal.II/lac/trilinos_sparse_matrix.h
@@ -204,7 +204,7 @@ namespace TrilinosWrappers
     /**
      * The specialization for a const Accessor.
      */
-    template<>
+    template <>
     class Accessor<true> : public AccessorBase
     {
     public:
@@ -244,7 +244,7 @@ namespace TrilinosWrappers
     /**
      * The specialization for a mutable Accessor.
      */
-    template<>
+    template <>
     class Accessor<false> : public AccessorBase
     {
       class Reference
@@ -587,7 +587,7 @@ namespace TrilinosWrappers
      * This is a collective operation that needs to be called on all
      * processors in order to avoid a dead lock.
      */
-    template<typename SparsityPatternType>
+    template <typename SparsityPatternType>
     void reinit (const SparsityPatternType &sparsity_pattern);
 
     /**
@@ -749,7 +749,7 @@ namespace TrilinosWrappers
      *
      * @deprecated Use the respective method with IndexSet argument instead.
      */
-    template<typename SparsityPatternType>
+    template <typename SparsityPatternType>
     void reinit (const Epetra_Map          &parallel_partitioning,
                  const SparsityPatternType &sparsity_pattern,
                  const bool                 exchange_data = false) DEAL_II_DEPRECATED;
@@ -768,7 +768,7 @@ namespace TrilinosWrappers
      *
      * @deprecated Use the respective method with IndexSet argument instead.
      */
-    template<typename SparsityPatternType>
+    template <typename SparsityPatternType>
     void reinit (const Epetra_Map          &row_parallel_partitioning,
                  const Epetra_Map          &col_parallel_partitioning,
                  const SparsityPatternType &sparsity_pattern,
@@ -911,7 +911,7 @@ namespace TrilinosWrappers
      * This is a collective operation that needs to be called on all
      * processors in order to avoid a dead lock.
      */
-    template<typename SparsityPatternType>
+    template <typename SparsityPatternType>
     void reinit (const IndexSet            &parallel_partitioning,
                  const SparsityPatternType &sparsity_pattern,
                  const MPI_Comm            &communicator  = MPI_COMM_WORLD,
@@ -929,7 +929,7 @@ namespace TrilinosWrappers
      * This is a collective operation that needs to be called on all
      * processors in order to avoid a dead lock.
      */
-    template<typename SparsityPatternType>
+    template <typename SparsityPatternType>
     void reinit (const IndexSet            &row_parallel_partitioning,
                  const IndexSet            &col_parallel_partitioning,
                  const SparsityPatternType &sparsity_pattern,
@@ -1488,7 +1488,7 @@ namespace TrilinosWrappers
      * running on one processor, since the matrix object is inherently
      * distributed. Otherwise, an exception will be thrown.
      */
-    template<typename VectorType>
+    template <typename VectorType>
     void vmult (VectorType       &dst,
                 const VectorType &src) const;
 
@@ -1538,7 +1538,7 @@ namespace TrilinosWrappers
      * distributed. Otherwise, an exception will be thrown.
      *
      */
-    template<typename VectorType>
+    template <typename VectorType>
     void vmult_add (VectorType       &dst,
                     const VectorType &src) const;
 
diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h
index f37f9b477f..476f4ed144 100644
--- a/include/deal.II/lac/trilinos_sparsity_pattern.h
+++ b/include/deal.II/lac/trilinos_sparsity_pattern.h
@@ -368,7 +368,7 @@ namespace TrilinosWrappers
      * parallel, this function uses an ad-hoc partitioning of the rows and
      * columns.
      */
-    template<typename SparsityPatternType>
+    template <typename SparsityPatternType>
     void
     copy_from (const SparsityPatternType &nontrilinos_sparsity_pattern);
 
@@ -563,7 +563,7 @@ namespace TrilinosWrappers
      *
      * @deprecated Use the respective method with IndexSet argument instead.
      */
-    template<typename SparsityPatternType>
+    template <typename SparsityPatternType>
     void
     reinit (const Epetra_Map          &row_parallel_partitioning,
             const Epetra_Map          &col_parallel_partitioning,
@@ -580,7 +580,7 @@ namespace TrilinosWrappers
      *
      * @deprecated Use the respective method with IndexSet argument instead.
      */
-    template<typename SparsityPatternType>
+    template <typename SparsityPatternType>
     void
     reinit (const Epetra_Map          &parallel_partitioning,
             const SparsityPatternType &nontrilinos_sparsity_pattern,
@@ -795,7 +795,7 @@ namespace TrilinosWrappers
      * constructed. This feature is only implemented for input sparsity
      * patterns of type DynamicSparsityPattern.
      */
-    template<typename SparsityPatternType>
+    template <typename SparsityPatternType>
     void
     reinit (const IndexSet            &row_parallel_partitioning,
             const IndexSet            &col_parallel_partitioning,
@@ -811,7 +811,7 @@ namespace TrilinosWrappers
      * that is not fully constructed. This feature is only implemented for
      * input sparsity patterns of type DynamicSparsityPattern.
      */
-    template<typename SparsityPatternType>
+    template <typename SparsityPatternType>
     void
     reinit (const IndexSet            &parallel_partitioning,
             const SparsityPatternType &nontrilinos_sparsity_pattern,
diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h
index 0b149d1642..a2bfbd686c 100644
--- a/include/deal.II/lac/trilinos_vector.h
+++ b/include/deal.II/lac/trilinos_vector.h
@@ -2166,7 +2166,7 @@ namespace internal
      * A helper class used internally in linear_operator.h. Specialization for
      * TrilinosWrappers::MPI::Vector.
      */
-    template<>
+    template <>
     class ReinitHelper<TrilinosWrappers::MPI::Vector>
     {
     public:
diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h
index 9c42d43339..d81bb464ef 100644
--- a/include/deal.II/lac/vector.h
+++ b/include/deal.II/lac/vector.h
@@ -59,7 +59,7 @@ namespace TrilinosWrappers
 }
 #endif
 
-template<typename number> class LAPACKFullMatrix;
+template <typename number> class LAPACKFullMatrix;
 
 template <typename> class BlockVector;
 
diff --git a/include/deal.II/lac/vector_memory.h b/include/deal.II/lac/vector_memory.h
index 9968a50b96..1fb196db01 100644
--- a/include/deal.II/lac/vector_memory.h
+++ b/include/deal.II/lac/vector_memory.h
@@ -67,7 +67,7 @@ DEAL_II_NAMESPACE_OPEN
  *
  * @author Guido Kanschat, 1998-2003
  */
-template<typename VectorType = dealii::Vector<double> >
+template <typename VectorType = dealii::Vector<double> >
 class VectorMemory : public Subscriptor
 {
 public:
@@ -169,7 +169,7 @@ public:
  * This class allocates and deletes vectors as needed from the global heap,
  * i.e. performs no specially adapted actions for memory management.
  */
-template<typename VectorType = dealii::Vector<double> >
+template <typename VectorType = dealii::Vector<double> >
 class PrimitiveVectorMemory : public VectorMemory<VectorType>
 {
 public:
@@ -232,7 +232,7 @@ public:
  *
  * @author Guido Kanschat, 1999, 2007
  */
-template<typename VectorType = dealii::Vector<double> >
+template <typename VectorType = dealii::Vector<double> >
 class GrowingVectorMemory : public VectorMemory<VectorType>
 {
 public:
diff --git a/include/deal.II/lac/vector_memory.templates.h b/include/deal.II/lac/vector_memory.templates.h
index 03a2a043de..5a700c7850 100644
--- a/include/deal.II/lac/vector_memory.templates.h
+++ b/include/deal.II/lac/vector_memory.templates.h
@@ -93,7 +93,7 @@ GrowingVectorMemory<VectorType>::GrowingVectorMemory (const size_type initial_si
 }
 
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 GrowingVectorMemory<VectorType>::~GrowingVectorMemory()
 {
@@ -110,7 +110,7 @@ GrowingVectorMemory<VectorType>::~GrowingVectorMemory()
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 VectorType *
 GrowingVectorMemory<VectorType>::alloc ()
@@ -140,7 +140,7 @@ GrowingVectorMemory<VectorType>::alloc ()
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 void
 GrowingVectorMemory<VectorType>::free(const VectorType *const v)
@@ -161,7 +161,7 @@ GrowingVectorMemory<VectorType>::free(const VectorType *const v)
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 void
 GrowingVectorMemory<VectorType>::release_unused_memory ()
@@ -187,7 +187,7 @@ GrowingVectorMemory<VectorType>::release_unused_memory ()
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 inline
 std::size_t
 GrowingVectorMemory<VectorType>::memory_consumption () const
diff --git a/include/deal.II/lac/vector_type_traits.h b/include/deal.II/lac/vector_type_traits.h
index 18a455a144..660cc2f420 100644
--- a/include/deal.II/lac/vector_type_traits.h
+++ b/include/deal.II/lac/vector_type_traits.h
@@ -43,7 +43,7 @@ DEAL_II_NAMESPACE_OPEN
  *
  * @author Uwe Koecher, 2017
  */
-template<typename T>
+template <typename T>
 struct is_serial_vector;
 
 
diff --git a/include/deal.II/lac/vector_view.h b/include/deal.II/lac/vector_view.h
index 4095238c78..1c968fef0e 100644
--- a/include/deal.II/lac/vector_view.h
+++ b/include/deal.II/lac/vector_view.h
@@ -127,7 +127,7 @@ DEAL_II_NAMESPACE_OPEN
  *
  * @author Luca Heltai, 2009
  */
-template<typename Number>
+template <typename Number>
 class VectorView : public Vector<Number>
 {
 public:
@@ -232,7 +232,7 @@ public:
 
 #ifndef DOXYGEN
 
-template<typename Number>
+template <typename Number>
 inline
 VectorView<Number>::VectorView(const size_type new_size, Number *ptr)
 {
@@ -243,7 +243,7 @@ VectorView<Number>::VectorView(const size_type new_size, Number *ptr)
 
 
 
-template<typename Number>
+template <typename Number>
 inline
 VectorView<Number>::VectorView(const size_type new_size, const Number *ptr)
 {
@@ -254,7 +254,7 @@ VectorView<Number>::VectorView(const size_type new_size, const Number *ptr)
 
 
 
-template<typename Number>
+template <typename Number>
 inline
 VectorView<Number>::~VectorView()
 {
@@ -266,7 +266,7 @@ VectorView<Number>::~VectorView()
 }
 
 
-template<typename Number>
+template <typename Number>
 inline
 void VectorView<Number>::reinit(const size_type N,
                                 const bool omit_zeroing_entries)
@@ -278,7 +278,7 @@ void VectorView<Number>::reinit(const size_type N,
 }
 
 
-template<typename Number>
+template <typename Number>
 inline
 void VectorView<Number>::reinit(const size_type new_size, Number *ptr)
 {
@@ -288,7 +288,7 @@ void VectorView<Number>::reinit(const size_type new_size, Number *ptr)
 }
 
 
-template<typename Number>
+template <typename Number>
 inline
 void VectorView<Number>::reinit(const size_type new_size, const Number *ptr)
 {
@@ -298,7 +298,7 @@ void VectorView<Number>::reinit(const size_type new_size, const Number *ptr)
 }
 
 
-template<typename Number>
+template <typename Number>
 inline
 void VectorView<Number>::swap(Vector<Number> &)
 {
diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h
index 5487791c40..3058fb2891 100644
--- a/include/deal.II/matrix_free/fe_evaluation.h
+++ b/include/deal.II/matrix_free/fe_evaluation.h
@@ -259,7 +259,7 @@ public:
    * writes to @p n_components blocks of the block vector starting at the
    * index @p first_index. For non-block vectors, @p first_index is ignored.
    */
-  template<typename VectorType>
+  template <typename VectorType>
   void distribute_local_to_global (VectorType        &dst,
                                    const unsigned int first_index = 0) const;
 
@@ -289,7 +289,7 @@ public:
    * writes to @p n_components blocks of the block vector starting at the
    * index @p first_index. For non-block vectors, @p first_index is ignored.
    */
-  template<typename VectorType>
+  template <typename VectorType>
   void set_dof_values (VectorType        &dst,
                        const unsigned int first_index = 0) const;
 
@@ -678,7 +678,7 @@ protected:
    * @p distribute_local_to_global, and @p set_dof_values. It performs the
    * operation for several vectors at a time.
    */
-  template<typename VectorType, typename VectorOperation>
+  template <typename VectorType, typename VectorOperation>
   void read_write_operation (const VectorOperation &operation,
                              VectorType            *vectors[]) const;
 
@@ -689,7 +689,7 @@ protected:
    * function DoFAccessor::read_dof_values. Note that if vectorization is
    * enabled, the DoF values for several cells are set.
    */
-  template<typename VectorType>
+  template <typename VectorType>
   void read_dof_values_plain (const VectorType *src_data[]);
 
   /**
@@ -2958,7 +2958,7 @@ namespace internal
 
 
 template <int dim, int n_components_, typename Number>
-template<typename VectorType, typename VectorOperation>
+template <typename VectorType, typename VectorOperation>
 inline
 void
 FEEvaluationBase<dim,n_components_,Number>
@@ -3303,7 +3303,7 @@ FEEvaluationBase<dim,n_components_,Number>
 
 
 template <int dim, int n_components_, typename Number>
-template<typename VectorType>
+template <typename VectorType>
 inline
 void
 FEEvaluationBase<dim,n_components_,Number>
@@ -3328,7 +3328,7 @@ FEEvaluationBase<dim,n_components_,Number>
 
 
 template <int dim, int n_components_, typename Number>
-template<typename VectorType>
+template <typename VectorType>
 inline
 void
 FEEvaluationBase<dim,n_components_,Number>
@@ -3348,7 +3348,7 @@ FEEvaluationBase<dim,n_components_,Number>
 
 
 template <int dim, int n_components_, typename Number>
-template<typename VectorType>
+template <typename VectorType>
 inline
 void
 FEEvaluationBase<dim,n_components_,Number>
@@ -3372,7 +3372,7 @@ FEEvaluationBase<dim,n_components_,Number>
 
 
 template <int dim, int n_components_, typename Number>
-template<typename VectorType>
+template <typename VectorType>
 inline
 void
 FEEvaluationBase<dim,n_components_,Number>
@@ -3396,7 +3396,7 @@ FEEvaluationBase<dim,n_components_,Number>
 
 
 template <int dim, int n_components_, typename Number>
-template<typename VectorType>
+template <typename VectorType>
 inline
 void
 FEEvaluationBase<dim,n_components_,Number>
diff --git a/include/deal.II/matrix_free/helper_functions.h b/include/deal.II/matrix_free/helper_functions.h
index 99ce08adaf..ebaf152bc7 100644
--- a/include/deal.II/matrix_free/helper_functions.h
+++ b/include/deal.II/matrix_free/helper_functions.h
@@ -169,7 +169,7 @@ namespace internal
      * in the use cases for this class, but be careful when using it in other
      * contexts.
      */
-    template<typename Number>
+    template <typename Number>
     struct FPArrayComparator
     {
       FPArrayComparator (const Number scaling);
diff --git a/include/deal.II/matrix_free/mapping_info.templates.h b/include/deal.II/matrix_free/mapping_info.templates.h
index f68c9f72fb..97163d1662 100644
--- a/include/deal.II/matrix_free/mapping_info.templates.h
+++ b/include/deal.II/matrix_free/mapping_info.templates.h
@@ -603,7 +603,7 @@ namespace internal
 
 
 
-    template<int dim, typename Number>
+    template <int dim, typename Number>
     void
     MappingInfo<dim,Number>::evaluate_on_cell (const dealii::Triangulation<dim> &tria,
                                                const std::pair<unsigned int,unsigned int> *cells,
diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h
index a95d6bb4ad..8a9d79b752 100644
--- a/include/deal.II/matrix_free/matrix_free.h
+++ b/include/deal.II/matrix_free/matrix_free.h
@@ -1761,47 +1761,47 @@ reinit(const Mapping<dim>                                    &mapping,
 // helper functions to select the blocks and template magic.
 namespace internal
 {
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   bool update_ghost_values_start_block (const VectorStruct &vec,
                                         const unsigned int channel,
                                         internal::bool2type<true>);
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   void reset_ghost_values_block (const VectorStruct &vec,
                                  const bool          zero_out_ghosts,
                                  internal::bool2type<true>);
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   void update_ghost_values_finish_block (const VectorStruct &vec,
                                          internal::bool2type<true>);
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   void compress_start_block (const VectorStruct &vec,
                              const unsigned int channel,
                              internal::bool2type<true>);
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   void compress_finish_block (const VectorStruct &vec,
                               internal::bool2type<true>);
 
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   bool update_ghost_values_start_block (const VectorStruct &,
                                         const unsigned int,
                                         internal::bool2type<false>)
   {
     return false;
   }
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   void reset_ghost_values_block (const VectorStruct &,
                                  const bool,
                                  internal::bool2type<false>)
   {}
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   void update_ghost_values_finish_block (const VectorStruct &,
                                          internal::bool2type<false>)
   {}
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   void compress_start_block (const VectorStruct &,
                              const unsigned int,
                              internal::bool2type<false>)
   {}
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   void compress_finish_block (const VectorStruct &,
                               internal::bool2type<false>)
   {}
@@ -1810,7 +1810,7 @@ namespace internal
 
   // returns true if the vector was in a state without ghost values before,
   // i.e., we need to zero out ghosts in the very end
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   inline
   bool update_ghost_values_start (const VectorStruct &vec,
                                   const unsigned int channel = 0)
@@ -1822,7 +1822,7 @@ namespace internal
 
 
 
-  template<typename Number>
+  template <typename Number>
   inline
   bool update_ghost_values_start (const LinearAlgebra::distributed::Vector<Number> &vec,
                                   const unsigned int                  channel = 0)
@@ -1858,7 +1858,7 @@ namespace internal
 
 
 
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   inline
   bool update_ghost_values_start_block (const VectorStruct &vec,
                                         const unsigned int channel,
@@ -1875,7 +1875,7 @@ namespace internal
   // if the input vector did not have ghosts imported, clear them here again
   // in order to avoid subsequent operations e.g. in linear solvers to work
   // with ghosts all the time
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   inline
   void reset_ghost_values (const VectorStruct &vec,
                            const bool          zero_out_ghosts)
@@ -1886,7 +1886,7 @@ namespace internal
 
 
 
-  template<typename Number>
+  template <typename Number>
   inline
   void reset_ghost_values (const LinearAlgebra::distributed::Vector<Number> &vec,
                            const bool zero_out_ghosts)
@@ -1919,7 +1919,7 @@ namespace internal
 
 
 
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   inline
   void reset_ghost_values_block (const VectorStruct &vec,
                                  const bool          zero_out_ghosts,
@@ -2091,7 +2091,7 @@ namespace internal
 
   namespace partition
   {
-    template<typename Worker>
+    template <typename Worker>
     class CellWork : public tbb::task
     {
     public:
@@ -2128,7 +2128,7 @@ namespace internal
 
 
 
-    template<typename Worker>
+    template <typename Worker>
     class PartitionWork : public tbb::task
     {
     public:
@@ -2256,7 +2256,7 @@ namespace internal
     };
 
 
-    template<typename Worker>
+    template <typename Worker>
     class PartitionWork : public tbb::task
     {
     public:
@@ -2294,7 +2294,7 @@ namespace internal
   } // end of namespace color
 
 
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   class MPIComDistribute : public tbb::task
   {
   public:
@@ -2315,7 +2315,7 @@ namespace internal
 
 
 
-  template<typename VectorStruct>
+  template <typename VectorStruct>
   class MPIComCompress : public tbb::task
   {
   public:
diff --git a/include/deal.II/matrix_free/operators.h b/include/deal.II/matrix_free/operators.h
index f1d1d199a7..e386e1a5ad 100644
--- a/include/deal.II/matrix_free/operators.h
+++ b/include/deal.II/matrix_free/operators.h
@@ -1655,7 +1655,7 @@ namespace MatrixFreeOperators
 
   namespace
   {
-    template<typename Number>
+    template <typename Number>
     bool
     non_negative(const VectorizedArray<Number> &n)
     {
diff --git a/include/deal.II/meshworker/assembler.h b/include/deal.II/meshworker/assembler.h
index d3501c627f..00b933efda 100644
--- a/include/deal.II/meshworker/assembler.h
+++ b/include/deal.II/meshworker/assembler.h
@@ -130,13 +130,13 @@ namespace MeshWorker
       /**
        * Assemble the local residuals into the global residuals.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info);
 
       /**
        * Assemble both local residuals into the global residuals.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info1,
                     const DOFINFO &info2);
     private:
@@ -227,13 +227,13 @@ namespace MeshWorker
       /**
        * Assemble the local matrices into the global matrices.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info);
 
       /**
        * Assemble all local matrices into the global matrices.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info1,
                     const DOFINFO &info2);
 
@@ -351,13 +351,13 @@ namespace MeshWorker
       /**
        * Assemble the local matrices into the global matrices.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info);
 
       /**
        * Assemble all local matrices into the global matrices.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info1,
                     const DOFINFO &info2);
 
diff --git a/include/deal.II/meshworker/dof_info.h b/include/deal.II/meshworker/dof_info.h
index 3e62ea3515..cfb96729bb 100644
--- a/include/deal.II/meshworker/dof_info.h
+++ b/include/deal.II/meshworker/dof_info.h
@@ -65,7 +65,7 @@ namespace MeshWorker
    * @ingroup MeshWorker
    * @author Guido Kanschat, 2009
    */
-  template<int dim, int spacedim = dim, typename number = double>
+  template <int dim, int spacedim = dim, typename number = double>
   class DoFInfo : public LocalResults<number>
   {
   public:
@@ -330,7 +330,7 @@ namespace MeshWorker
   }
 
 
-  template<int dim, int spacedim, typename number>
+  template <int dim, int spacedim, typename number>
   template <class DHFaceIterator>
   inline void
   DoFInfo<dim,spacedim,number>::set_face(
@@ -343,7 +343,7 @@ namespace MeshWorker
   }
 
 
-  template<int dim, int spacedim, typename number>
+  template <int dim, int spacedim, typename number>
   template <class DHCellIterator, class DHFaceIterator>
   inline void
   DoFInfo<dim,spacedim,number>::reinit(
@@ -366,7 +366,7 @@ namespace MeshWorker
   }
 
 
-  template<int dim, int spacedim, typename number>
+  template <int dim, int spacedim, typename number>
   template <class DHFaceIterator>
   inline void
   DoFInfo<dim,spacedim,number>::set_subface(
@@ -380,7 +380,7 @@ namespace MeshWorker
   }
 
 
-  template<int dim, int spacedim, typename number>
+  template <int dim, int spacedim, typename number>
   template <class DHCellIterator, class DHFaceIterator>
   inline void
   DoFInfo<dim,spacedim,number>::reinit(
@@ -404,7 +404,7 @@ namespace MeshWorker
   }
 
 
-  template<int dim, int spacedim, typename number>
+  template <int dim, int spacedim, typename number>
   inline const BlockIndices &
   DoFInfo<dim,spacedim,number>::local_indices() const
   {
diff --git a/include/deal.II/meshworker/functional.h b/include/deal.II/meshworker/functional.h
index 3dfd76b8b0..b122c9312c 100644
--- a/include/deal.II/meshworker/functional.h
+++ b/include/deal.II/meshworker/functional.h
@@ -62,13 +62,13 @@ namespace MeshWorker
       /**
        * Assemble the local values into the global vectors.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info);
 
       /**
        * Assemble both local values into the global vectors.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info1,
                     const DOFINFO &info2);
 
@@ -131,13 +131,13 @@ namespace MeshWorker
       /**
        * Assemble the local values into the global vectors.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info);
 
       /**
        * Assemble both local values into the global vectors.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info1,
                     const DOFINFO &info2);
 
diff --git a/include/deal.II/meshworker/integration_info.h b/include/deal.II/meshworker/integration_info.h
index e75848a4ed..6aa329dee1 100644
--- a/include/deal.II/meshworker/integration_info.h
+++ b/include/deal.II/meshworker/integration_info.h
@@ -70,7 +70,7 @@ namespace MeshWorker
    * @ingroup MeshWorker
    * @author Guido Kanschat, 2009
    */
-  template<int dim, int spacedim = dim>
+  template <int dim, int spacedim = dim>
   class IntegrationInfo
   {
   private:
@@ -188,7 +188,7 @@ namespace MeshWorker
      * Use the finite element functions in #global_data and fill the vectors
      * #values, #gradients and #hessians.
      */
-    template<typename number>
+    template <typename number>
     void fill_local_data(const DoFInfo<dim, spacedim, number> &info, bool split_fevalues);
 
     /**
@@ -551,7 +551,7 @@ namespace MeshWorker
 
 //----------------------------------------------------------------------//
 
-  template<int dim, int sdim>
+  template <int dim, int sdim>
   inline
   IntegrationInfo<dim,sdim>::IntegrationInfo()
     :
@@ -562,7 +562,7 @@ namespace MeshWorker
   {}
 
 
-  template<int dim, int sdim>
+  template <int dim, int sdim>
   inline
   IntegrationInfo<dim,sdim>::IntegrationInfo(const IntegrationInfo<dim,sdim> &other)
     :
@@ -599,7 +599,7 @@ namespace MeshWorker
 
 
 
-  template<int dim, int sdim>
+  template <int dim, int sdim>
   template <class FEVALUES>
   inline void
   IntegrationInfo<dim,sdim>::initialize(
diff --git a/include/deal.II/meshworker/integration_info.templates.h b/include/deal.II/meshworker/integration_info.templates.h
index 49338483e2..111789adfa 100644
--- a/include/deal.II/meshworker/integration_info.templates.h
+++ b/include/deal.II/meshworker/integration_info.templates.h
@@ -26,7 +26,7 @@ DEAL_II_NAMESPACE_OPEN
 
 namespace MeshWorker
 {
-  template<int dim, int sdim>
+  template <int dim, int sdim>
   void
   IntegrationInfo<dim,sdim>::initialize_data(
     const std::shared_ptr<VectorDataBase<dim,sdim> > &data)
@@ -75,7 +75,7 @@ namespace MeshWorker
   }
 
 
-  template<int dim, int sdim>
+  template <int dim, int sdim>
   void
   IntegrationInfo<dim,sdim>::clear()
   {
@@ -84,7 +84,7 @@ namespace MeshWorker
 
 
 
-  template<int dim, int sdim>
+  template <int dim, int sdim>
   template <typename number>
   void
   IntegrationInfo<dim,sdim>::fill_local_data(const DoFInfo<dim, sdim, number> &info, bool split_fevalues)
@@ -124,7 +124,7 @@ namespace MeshWorker
   }
 
 
-  template<int dim, int sdim>
+  template <int dim, int sdim>
   std::size_t
   IntegrationInfo<dim,sdim>::memory_consumption () const
   {
@@ -138,7 +138,7 @@ namespace MeshWorker
 
 //----------------------------------------------------------------------//
 
-  template<int dim, int sdim>
+  template <int dim, int sdim>
   IntegrationInfoBox<dim,sdim>::IntegrationInfoBox()
   {
     cell_flags = update_default;
@@ -148,7 +148,7 @@ namespace MeshWorker
   }
 
 
-  template<int dim, int sdim>
+  template <int dim, int sdim>
   void
   IntegrationInfoBox<dim,sdim>::initialize_update_flags (bool neighbor_geometry)
   {
@@ -193,7 +193,7 @@ namespace MeshWorker
   }
 
 
-  template<int dim, int sdim>
+  template <int dim, int sdim>
   std::size_t
   IntegrationInfoBox<dim,sdim>::memory_consumption () const
   {
diff --git a/include/deal.II/meshworker/loop.h b/include/deal.II/meshworker/loop.h
index 7e025aae40..355b50abb3 100644
--- a/include/deal.II/meshworker/loop.h
+++ b/include/deal.II/meshworker/loop.h
@@ -57,7 +57,7 @@ namespace internal
     return true;
   }
 
-  template<int dim, class DOFINFO, class A>
+  template <int dim, class DOFINFO, class A>
   void assemble(const MeshWorker::DoFInfoBox<dim, DOFINFO> &dinfo, A *assembler)
   {
     dinfo.assemble(*assembler);
@@ -171,7 +171,7 @@ namespace MeshWorker
    * @author Guido Kanschat
    * @date 2010
    */
-  template<class INFOBOX, class DOFINFO, int dim, int spacedim, class ITERATOR>
+  template <class INFOBOX, class DOFINFO, int dim, int spacedim, class ITERATOR>
   void cell_action(
     ITERATOR cell,
     DoFInfoBox<dim, DOFINFO> &dof_info,
@@ -379,7 +379,7 @@ namespace MeshWorker
    * @ingroup MeshWorker
    * @author Guido Kanschat, 2009
    */
-  template<int dim, int spacedim, class DOFINFO, class INFOBOX, class ASSEMBLER, class ITERATOR>
+  template <int dim, int spacedim, class DOFINFO, class INFOBOX, class ASSEMBLER, class ITERATOR>
   void loop(ITERATOR begin,
             typename identity<ITERATOR>::type end,
             DOFINFO &dinfo,
@@ -429,7 +429,7 @@ namespace MeshWorker
    * @ingroup MeshWorker
    * @author Guido Kanschat, 2009
    */
-  template<int dim, int spacedim, class ITERATOR, class ASSEMBLER>
+  template <int dim, int spacedim, class ITERATOR, class ASSEMBLER>
   void integration_loop(ITERATOR begin,
                         typename identity<ITERATOR>::type end,
                         DoFInfo<dim, spacedim> &dof_info,
diff --git a/include/deal.II/meshworker/output.h b/include/deal.II/meshworker/output.h
index 06fae5fe74..30eb1ae1ed 100644
--- a/include/deal.II/meshworker/output.h
+++ b/include/deal.II/meshworker/output.h
@@ -93,13 +93,13 @@ namespace MeshWorker
       /**
        * Write the patch to the output stream.
        */
-      template<int dim>
+      template <int dim>
       void assemble(const DoFInfo<dim> &info);
 
       /**
        * @warning Not implemented yet
        */
-      template<int dim>
+      template <int dim>
       void assemble(const DoFInfo<dim> &info1,
                     const DoFInfo<dim> &info2);
 
@@ -108,7 +108,7 @@ namespace MeshWorker
        * Write the object T either to the stream #os, if initialize_stream()
        * has been called, or to @p deallog if no pointer has been set.
        */
-      template<typename T>
+      template <typename T>
       void write(const T &t) const;
 
       /**
diff --git a/include/deal.II/meshworker/simple.h b/include/deal.II/meshworker/simple.h
index 0dba648c89..b0cdd62c19 100644
--- a/include/deal.II/meshworker/simple.h
+++ b/include/deal.II/meshworker/simple.h
@@ -104,7 +104,7 @@ namespace MeshWorker
       /**
        * Assemble both local residuals into the global residuals.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info1,
                     const DOFINFO &info2);
     protected:
@@ -194,14 +194,14 @@ namespace MeshWorker
        * Assemble the local matrices associated with a single cell into the
        * global matrix.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info);
 
       /**
        * Assemble all local matrices associated with an interior face in the
        * info objects into the global matrix.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info1,
                     const DOFINFO &info2);
     protected:
@@ -291,14 +291,14 @@ namespace MeshWorker
       /**
        * Assemble the matrix DoFInfo::M1[0] into the global matrix.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info);
 
       /**
        * Assemble both local matrices in the info objects into the global
        * matrices.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info1,
                     const DOFINFO &info2);
     private:
@@ -449,14 +449,14 @@ namespace MeshWorker
       /**
        * Assemble the matrix DoFInfo::M1[0] into the global matrix.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info);
 
       /**
        * Assemble both local matrices in the info objects into the global
        * matrix.
        */
-      template<class DOFINFO>
+      template <class DOFINFO>
       void assemble(const DOFINFO &info1,
                     const DOFINFO &info2);
 
diff --git a/include/deal.II/meshworker/vector_selector.h b/include/deal.II/meshworker/vector_selector.h
index d0100eba5d..308c112418 100644
--- a/include/deal.II/meshworker/vector_selector.h
+++ b/include/deal.II/meshworker/vector_selector.h
@@ -24,7 +24,7 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template<int,int> class FEValuesBase;
+template <int,int> class FEValuesBase;
 
 namespace MeshWorker
 {
diff --git a/include/deal.II/multigrid/mg_coarse.h b/include/deal.II/multigrid/mg_coarse.h
index 0fc198aac0..41d4afadd0 100644
--- a/include/deal.II/multigrid/mg_coarse.h
+++ b/include/deal.II/multigrid/mg_coarse.h
@@ -33,7 +33,7 @@ DEAL_II_NAMESPACE_OPEN
  *
  * @author Denis Davydov, 2016.
  */
-template<class VectorType = Vector<double> >
+template <class VectorType = Vector<double> >
 class MGCoarseGridApplySmoother :  public MGCoarseGridBase<VectorType>
 {
 public:
@@ -85,7 +85,7 @@ private:
  *
  * @author Guido Kanschat, 1999, Ralf Hartmann, 2002.
  */
-template<typename SolverType, class VectorType = Vector<double> >
+template <typename SolverType, class VectorType = Vector<double> >
 class MGCoarseGridLACIteration :  public MGCoarseGridBase<VectorType>
 {
 public:
@@ -98,7 +98,7 @@ public:
    * Constructor. Store solver, matrix and preconditioning method for later
    * use.
    */
-  template<typename MatrixType, typename PreconditionerType>
+  template <typename MatrixType, typename PreconditionerType>
   MGCoarseGridLACIteration (SolverType &,
                             const MatrixType &,
                             const PreconditionerType &);
@@ -111,7 +111,7 @@ public:
   /**
    * Initialize new data.
    */
-  template<typename MatrixType, typename PreconditionerType>
+  template <typename MatrixType, typename PreconditionerType>
   void initialize (SolverType &,
                    const MatrixType &,
                    const PreconditionerType &);
@@ -162,10 +162,10 @@ private:
  * This class provides a wrapper for a deal.II iterative solver with a given
  * matrix and preconditioner as a coarse grid operator.
  */
-template<class VectorType,
-         class SolverType,
-         class MatrixType,
-         class PreconditionerType>
+template <class VectorType,
+          class SolverType,
+          class MatrixType,
+          class PreconditionerType>
 class MGCoarseGridIterativeSolver :  public MGCoarseGridBase<VectorType>
 {
 public:
@@ -243,7 +243,7 @@ private:
  *
  * @author Guido Kanschat, 2003, 2012
  */
-template<typename number = double, class VectorType = Vector<number> >
+template <typename number = double, class VectorType = Vector<number> >
 class MGCoarseGridHouseholder : public MGCoarseGridBase<VectorType>
 {
 public:
@@ -276,7 +276,7 @@ private:
  *
  * @author Guido Kanschat, 2003, 2012
  */
-template<typename number = double, class VectorType = Vector<number> >
+template <typename number = double, class VectorType = Vector<number> >
 class MGCoarseGridSVD : public MGCoarseGridBase<VectorType>
 {
 public:
@@ -311,13 +311,13 @@ private:
 
 #ifndef DOXYGEN
 /* ------------------ Functions for MGCoarseGridApplySmoother -----------*/
-template<class VectorType>
+template <class VectorType>
 MGCoarseGridApplySmoother<VectorType>::MGCoarseGridApplySmoother ()
   : coarse_smooth(nullptr)
 {
 }
 
-template<class VectorType>
+template <class VectorType>
 MGCoarseGridApplySmoother<VectorType>::MGCoarseGridApplySmoother (const MGSmootherBase<VectorType> &coarse_smooth)
   : coarse_smooth(nullptr)
 {
@@ -325,7 +325,7 @@ MGCoarseGridApplySmoother<VectorType>::MGCoarseGridApplySmoother (const MGSmooth
 }
 
 
-template<class VectorType>
+template <class VectorType>
 void
 MGCoarseGridApplySmoother<VectorType>::initialize (const MGSmootherBase<VectorType> &coarse_smooth_)
 {
@@ -335,7 +335,7 @@ MGCoarseGridApplySmoother<VectorType>::initialize (const MGSmootherBase<VectorTy
 }
 
 
-template<class VectorType>
+template <class VectorType>
 void
 MGCoarseGridApplySmoother<VectorType>::clear()
 {
@@ -343,7 +343,7 @@ MGCoarseGridApplySmoother<VectorType>::clear()
 }
 
 
-template<class VectorType>
+template <class VectorType>
 void
 MGCoarseGridApplySmoother<VectorType>::operator() (const unsigned int level,
                                                    VectorType         &dst,
@@ -356,7 +356,7 @@ MGCoarseGridApplySmoother<VectorType>::operator() (const unsigned int level,
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 
-template<typename SolverType, class VectorType>
+template <typename SolverType, class VectorType>
 MGCoarseGridLACIteration<SolverType, VectorType>
 ::MGCoarseGridLACIteration()
   :
@@ -366,8 +366,8 @@ MGCoarseGridLACIteration<SolverType, VectorType>
 {}
 
 
-template<typename SolverType, class VectorType>
-template<typename MatrixType, typename PreconditionerType>
+template <typename SolverType, class VectorType>
+template <typename MatrixType, typename PreconditionerType>
 MGCoarseGridLACIteration<SolverType, VectorType>
 ::MGCoarseGridLACIteration (SolverType               &s,
                             const MatrixType         &m,
@@ -380,7 +380,7 @@ MGCoarseGridLACIteration<SolverType, VectorType>
 }
 
 
-template<typename SolverType, class VectorType>
+template <typename SolverType, class VectorType>
 MGCoarseGridLACIteration<SolverType, VectorType>
 ::~MGCoarseGridLACIteration()
 {
@@ -388,8 +388,8 @@ MGCoarseGridLACIteration<SolverType, VectorType>
 }
 
 
-template<typename SolverType, class VectorType>
-template<typename MatrixType, typename PreconditionerType>
+template <typename SolverType, class VectorType>
+template <typename MatrixType, typename PreconditionerType>
 void
 MGCoarseGridLACIteration<SolverType, VectorType>
 ::initialize (SolverType               &s,
@@ -406,7 +406,7 @@ MGCoarseGridLACIteration<SolverType, VectorType>
 }
 
 
-template<typename SolverType, class VectorType>
+template <typename SolverType, class VectorType>
 void
 MGCoarseGridLACIteration<SolverType, VectorType>
 ::clear()
@@ -421,7 +421,7 @@ MGCoarseGridLACIteration<SolverType, VectorType>
 }
 
 
-template<typename SolverType, class VectorType>
+template <typename SolverType, class VectorType>
 void
 MGCoarseGridLACIteration<SolverType, VectorType>
 ::operator() (const unsigned int /* level */,
@@ -435,8 +435,8 @@ MGCoarseGridLACIteration<SolverType, VectorType>
 }
 
 
-template<typename SolverType, class VectorType>
-template<typename MatrixType>
+template <typename SolverType, class VectorType>
+template <typename MatrixType>
 void
 MGCoarseGridLACIteration<SolverType, VectorType>
 ::set_matrix(const MatrixType &m)
@@ -534,7 +534,7 @@ MGCoarseGridIterativeSolver<VectorType, SolverType, MatrixType, PreconditionerTy
 
 /* ------------------ Functions for MGCoarseGridHouseholder ------------ */
 
-template<typename number, class VectorType>
+template <typename number, class VectorType>
 MGCoarseGridHouseholder<number, VectorType>::MGCoarseGridHouseholder
 (const FullMatrix<number> *A)
 {
@@ -543,7 +543,7 @@ MGCoarseGridHouseholder<number, VectorType>::MGCoarseGridHouseholder
 
 
 
-template<typename number, class VectorType>
+template <typename number, class VectorType>
 void
 MGCoarseGridHouseholder<number, VectorType>::initialize(const FullMatrix<number> &A)
 {
@@ -552,7 +552,7 @@ MGCoarseGridHouseholder<number, VectorType>::initialize(const FullMatrix<number>
 
 
 
-template<typename number, class VectorType>
+template <typename number, class VectorType>
 void
 MGCoarseGridHouseholder<number, VectorType>::operator() (const unsigned int /*level*/,
                                                          VectorType         &dst,
@@ -565,7 +565,7 @@ MGCoarseGridHouseholder<number, VectorType>::operator() (const unsigned int /*le
 
 
 
-template<typename number, class VectorType>
+template <typename number, class VectorType>
 void
 MGCoarseGridSVD<number, VectorType>::initialize (const FullMatrix<number> &A,
                                                  double                    threshold)
@@ -576,7 +576,7 @@ MGCoarseGridSVD<number, VectorType>::initialize (const FullMatrix<number> &A,
 }
 
 
-template<typename number, class VectorType>
+template <typename number, class VectorType>
 void
 MGCoarseGridSVD<number, VectorType>::operator() (
   const unsigned int /*level*/,
@@ -587,7 +587,7 @@ MGCoarseGridSVD<number, VectorType>::operator() (
 }
 
 
-template<typename number, class VectorType>
+template <typename number, class VectorType>
 void
 MGCoarseGridSVD<number, VectorType>::log() const
 {
diff --git a/include/deal.II/multigrid/mg_smoother.h b/include/deal.II/multigrid/mg_smoother.h
index 0c00827513..fbb7bd685d 100644
--- a/include/deal.II/multigrid/mg_smoother.h
+++ b/include/deal.II/multigrid/mg_smoother.h
@@ -177,7 +177,7 @@ namespace mg
    * @author Guido Kanschat,
    * @date 2003, 2009, 2010
    */
-  template<class RelaxationType, typename VectorType>
+  template <class RelaxationType, typename VectorType>
   class SmootherRelaxation : public MGLevelObject<RelaxationType>, public MGSmoother<VectorType>
   {
   public:
@@ -282,7 +282,7 @@ namespace mg
  *
  * @author Guido Kanschat, 2003
  */
-template<typename MatrixType, class RelaxationType, typename VectorType>
+template <typename MatrixType, class RelaxationType, typename VectorType>
 class MGSmootherRelaxation : public MGSmoother<VectorType>
 {
 public:
@@ -431,7 +431,7 @@ private:
  *
  * @author Guido Kanschat, 2009
  */
-template<typename MatrixType, typename PreconditionerType, typename VectorType>
+template <typename MatrixType, typename PreconditionerType, typename VectorType>
 class MGSmootherPrecondition : public MGSmoother<VectorType>
 {
 public:
diff --git a/include/deal.II/multigrid/mg_transfer_block.h b/include/deal.II/multigrid/mg_transfer_block.h
index 677ed652df..7e57874db7 100644
--- a/include/deal.II/multigrid/mg_transfer_block.h
+++ b/include/deal.II/multigrid/mg_transfer_block.h
@@ -214,7 +214,7 @@ public:
    * This function is a front-end for the same function in
    * MGTransferBlockBase.
    */
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void build_matrices (const DoFHandler<dim,spacedim> &dof,
                        const DoFHandler<dim,spacedim> &mg_dof,
                        const std::vector<bool> &selected);
@@ -336,7 +336,7 @@ public:
    * @arg mg_selected: Number of the component for which the transfer matrices
    * should be built.
    */
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void build_matrices (const DoFHandler<dim,spacedim> &dof,
                        const DoFHandler<dim,spacedim> &mg_dof,
                        unsigned int selected);
diff --git a/include/deal.II/multigrid/multigrid.h b/include/deal.II/multigrid/multigrid.h
index 8f072ff8cd..a8e13d7b25 100644
--- a/include/deal.II/multigrid/multigrid.h
+++ b/include/deal.II/multigrid/multigrid.h
@@ -338,7 +338,7 @@ private:
    */
   unsigned int debug;
 
-  template<int dim, class OtherVectorType, class TRANSFER> friend class PreconditionMG;
+  template <int dim, class OtherVectorType, class TRANSFER> friend class PreconditionMG;
 };
 
 
@@ -354,7 +354,7 @@ private:
  *
  * @author Guido Kanschat, 1999, 2000, 2001, 2002
  */
-template<int dim, typename VectorType, class TRANSFER>
+template <int dim, typename VectorType, class TRANSFER>
 class PreconditionMG : public Subscriptor
 {
 public:
@@ -377,7 +377,7 @@ public:
    *
    * This is the operator used by LAC iterative solvers.
    */
-  template<class OtherVectorType>
+  template <class OtherVectorType>
   void vmult (OtherVectorType       &dst,
               const OtherVectorType &src) const;
 
@@ -385,7 +385,7 @@ public:
    * Preconditioning operator. Calls the @p vcycle function of the @p MG
    * object passed to the constructor.
    */
-  template<class OtherVectorType>
+  template <class OtherVectorType>
   void vmult_add (OtherVectorType       &dst,
                   const OtherVectorType &src) const;
 
@@ -394,7 +394,7 @@ public:
    *
    * Not implemented, but the definition may be needed.
    */
-  template<class OtherVectorType>
+  template <class OtherVectorType>
   void Tvmult (OtherVectorType       &dst,
                const OtherVectorType &src) const;
 
@@ -403,7 +403,7 @@ public:
    *
    * Not implemented, but the definition may be needed.
    */
-  template<class OtherVectorType>
+  template <class OtherVectorType>
   void Tvmult_add (OtherVectorType       &dst,
                    const OtherVectorType &src) const;
 
@@ -533,7 +533,7 @@ Multigrid<VectorType>::get_minlevel () const
 /* --------------------------- inline functions --------------------- */
 
 
-template<int dim, typename VectorType, class TRANSFER>
+template <int dim, typename VectorType, class TRANSFER>
 PreconditionMG<dim, VectorType, TRANSFER>
 ::PreconditionMG(const DoFHandler<dim>  &dof_handler,
                  Multigrid<VectorType>  &mg,
@@ -544,15 +544,15 @@ PreconditionMG<dim, VectorType, TRANSFER>
   transfer(&transfer)
 {}
 
-template<int dim, typename VectorType, class TRANSFER>
+template <int dim, typename VectorType, class TRANSFER>
 inline bool
 PreconditionMG<dim, VectorType, TRANSFER>::empty () const
 {
   return false;
 }
 
-template<int dim, typename VectorType, class TRANSFER>
-template<class OtherVectorType>
+template <int dim, typename VectorType, class TRANSFER>
+template <class OtherVectorType>
 void
 PreconditionMG<dim, VectorType, TRANSFER>::vmult
 (OtherVectorType       &dst,
@@ -569,7 +569,7 @@ PreconditionMG<dim, VectorType, TRANSFER>::vmult
 }
 
 
-template<int dim, typename VectorType, class TRANSFER>
+template <int dim, typename VectorType, class TRANSFER>
 IndexSet
 PreconditionMG<dim, VectorType, TRANSFER>::locally_owned_range_indices() const
 {
@@ -577,7 +577,7 @@ PreconditionMG<dim, VectorType, TRANSFER>::locally_owned_range_indices() const
 }
 
 
-template<int dim, typename VectorType, class TRANSFER>
+template <int dim, typename VectorType, class TRANSFER>
 IndexSet
 PreconditionMG<dim, VectorType, TRANSFER>::locally_owned_domain_indices() const
 {
@@ -585,7 +585,7 @@ PreconditionMG<dim, VectorType, TRANSFER>::locally_owned_domain_indices() const
 }
 
 
-template<int dim, typename VectorType, class TRANSFER>
+template <int dim, typename VectorType, class TRANSFER>
 MPI_Comm
 PreconditionMG<dim, VectorType, TRANSFER>::get_mpi_communicator() const
 {
@@ -598,8 +598,8 @@ PreconditionMG<dim, VectorType, TRANSFER>::get_mpi_communicator() const
 }
 
 
-template<int dim, typename VectorType, class TRANSFER>
-template<class OtherVectorType>
+template <int dim, typename VectorType, class TRANSFER>
+template <class OtherVectorType>
 void
 PreconditionMG<dim, VectorType, TRANSFER>::vmult_add
 (OtherVectorType       &dst,
@@ -615,8 +615,8 @@ PreconditionMG<dim, VectorType, TRANSFER>::vmult_add
 }
 
 
-template<int dim, typename VectorType, class TRANSFER>
-template<class OtherVectorType>
+template <int dim, typename VectorType, class TRANSFER>
+template <class OtherVectorType>
 void
 PreconditionMG<dim, VectorType, TRANSFER>::Tvmult
 (OtherVectorType &,
@@ -626,8 +626,8 @@ PreconditionMG<dim, VectorType, TRANSFER>::Tvmult
 }
 
 
-template<int dim, typename VectorType, class TRANSFER>
-template<class OtherVectorType>
+template <int dim, typename VectorType, class TRANSFER>
+template <class OtherVectorType>
 void
 PreconditionMG<dim, VectorType, TRANSFER>::Tvmult_add
 (OtherVectorType &,
diff --git a/include/deal.II/numerics/dof_print_solver_step.h b/include/deal.II/numerics/dof_print_solver_step.h
index 3ed3c435d7..62ee0a1c07 100644
--- a/include/deal.II/numerics/dof_print_solver_step.h
+++ b/include/deal.II/numerics/dof_print_solver_step.h
@@ -49,7 +49,7 @@ DEAL_II_NAMESPACE_OPEN
  * @ingroup output
  * @author Guido Kanschat, 2000
  */
-template<int dim, typename SolverType, class VectorType = Vector<double> >
+template <int dim, typename SolverType, class VectorType = Vector<double> >
 class DoFPrintSolverStep : public SolverType
 {
 public:
@@ -87,7 +87,7 @@ private:
 
 /* ----------------------- template functions --------------- */
 
-template<int dim, typename SolverType, class VectorType>
+template <int dim, typename SolverType, class VectorType>
 DoFPrintSolverStep<dim, SolverType, VectorType>::DoFPrintSolverStep
 (SolverControl            &control,
  VectorMemory<VectorType> &mem,
@@ -99,7 +99,7 @@ DoFPrintSolverStep<dim, SolverType, VectorType>::DoFPrintSolverStep
 {}
 
 
-template<int dim, typename SolverType, class VectorType>
+template <int dim, typename SolverType, class VectorType>
 void
 DoFPrintSolverStep<dim, SolverType, VectorType>::print_vectors
 (const unsigned int  step,
diff --git a/include/deal.II/numerics/matrix_tools.h b/include/deal.II/numerics/matrix_tools.h
index 7d9d3b8773..a2377cbd4a 100644
--- a/include/deal.II/numerics/matrix_tools.h
+++ b/include/deal.II/numerics/matrix_tools.h
@@ -37,9 +37,9 @@ DEAL_II_NAMESPACE_OPEN
 template <int dim> class Quadrature;
 
 
-template<typename number> class Vector;
-template<typename number> class FullMatrix;
-template<typename number> class SparseMatrix;
+template <typename number> class Vector;
+template <typename number> class FullMatrix;
+template <typename number> class SparseMatrix;
 
 template <typename number> class BlockSparseMatrix;
 template <typename Number> class BlockVector;
diff --git a/include/deal.II/numerics/solution_transfer.h b/include/deal.II/numerics/solution_transfer.h
index b0549b9ec1..a0f976eac1 100644
--- a/include/deal.II/numerics/solution_transfer.h
+++ b/include/deal.II/numerics/solution_transfer.h
@@ -288,9 +288,9 @@ DEAL_II_NAMESPACE_OPEN
  * @author Ralf Hartmann, 1999, Oliver Kayser-Herold and Wolfgang Bangerth,
  * 2006, Wolfgang Bangerth 2014
  */
-template<int dim,
-         typename VectorType = Vector<double>,
-         typename DoFHandlerType = DoFHandler<dim> >
+template <int dim,
+          typename VectorType = Vector<double>,
+          typename DoFHandlerType = DoFHandler<dim> >
 class SolutionTransfer
 {
 #ifndef DEAL_II_MSVC
diff --git a/include/deal.II/numerics/vector_tools.h b/include/deal.II/numerics/vector_tools.h
index 61f9611a95..7f37701f31 100644
--- a/include/deal.II/numerics/vector_tools.h
+++ b/include/deal.II/numerics/vector_tools.h
@@ -1598,7 +1598,7 @@ namespace VectorTools
    * @see
    * @ref GlossBoundaryIndicator "Glossary entry on boundary indicators"
    */
-  template<int dim>
+  template <int dim>
   void project_boundary_values_div_conforming
   (const DoFHandler<dim>      &dof_handler,
    const unsigned int          first_vector_component,
@@ -1615,7 +1615,7 @@ namespace VectorTools
    * @see
    * @ref GlossBoundaryIndicator "Glossary entry on boundary indicators"
    */
-  template<int dim>
+  template <int dim>
   void project_boundary_values_div_conforming
   (const hp::DoFHandler<dim>             &dof_handler,
    const unsigned int                     first_vector_component,
diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h
index e1ae90362b..97843c8279 100644
--- a/include/deal.II/numerics/vector_tools.templates.h
+++ b/include/deal.II/numerics/vector_tools.templates.h
@@ -368,8 +368,8 @@ namespace VectorTools
   }
 
 
-  template<int dim, int spacedim, typename VectorType,
-           template <int,int> class DoFHandlerType>
+  template <int dim, int spacedim, typename VectorType,
+            template <int,int> class DoFHandlerType>
   void
   interpolate_based_on_material_id
   (const Mapping<dim,spacedim>        &mapping,
@@ -3539,7 +3539,7 @@ namespace VectorTools
     // This function computes the
     // projection of the boundary
     // function on edges for 3D.
-    template<typename cell_iterator>
+    template <typename cell_iterator>
     void
     compute_edge_projection (const cell_iterator &cell,
                              const unsigned int   face,
@@ -3685,7 +3685,7 @@ namespace VectorTools
     // dummy implementation of above
     // function for all other
     // dimensions
-    template<int dim, typename cell_iterator>
+    template <int dim, typename cell_iterator>
     void
     compute_edge_projection (const cell_iterator &,
                              const unsigned int,
@@ -3703,7 +3703,7 @@ namespace VectorTools
     // projection of the boundary
     // function on the interior of
     // faces.
-    template<int dim, typename cell_iterator>
+    template <int dim, typename cell_iterator>
     void
     compute_face_projection_curl_conforming (const cell_iterator &cell,
                                              const unsigned int   face,
@@ -4494,7 +4494,7 @@ namespace VectorTools
 
   namespace internals
   {
-    template<typename cell_iterator>
+    template <typename cell_iterator>
     void
     compute_edge_projection_l2 (const cell_iterator &cell,
                                 const unsigned int   face,
@@ -4722,7 +4722,7 @@ namespace VectorTools
     }
 
 
-    template<int dim, typename cell_iterator>
+    template <int dim, typename cell_iterator>
     void
     compute_edge_projection_l2 (const cell_iterator &,
                                 const unsigned int,
@@ -4738,7 +4738,7 @@ namespace VectorTools
       Assert (false, ExcInternalError ());
     }
 
-    template<int dim, typename cell_iterator>
+    template <int dim, typename cell_iterator>
     void
     compute_face_projection_curl_conforming_l2
     (const cell_iterator   &cell,
@@ -5471,7 +5471,7 @@ namespace VectorTools
     }
 
     // dummy implementation of above function for all other dimensions
-    template<int dim, typename cell_iterator>
+    template <int dim, typename cell_iterator>
     void
     compute_face_projection_div_conforming (const cell_iterator &,
                                             const unsigned int,
@@ -5486,7 +5486,7 @@ namespace VectorTools
 
     // This function computes the projection of the boundary function on the
     // boundary in 3d.
-    template<typename cell_iterator>
+    template <typename cell_iterator>
     void
     compute_face_projection_div_conforming
     (const cell_iterator                       &cell,
@@ -5565,7 +5565,7 @@ namespace VectorTools
     // dummy implementation of above
     // function for all other
     // dimensions
-    template<int dim, typename cell_iterator>
+    template <int dim, typename cell_iterator>
     void
     compute_face_projection_div_conforming (const cell_iterator &,
                                             const unsigned int,
@@ -6779,13 +6779,13 @@ namespace VectorTools
 
     namespace
     {
-      template<typename number>
+      template <typename number>
       double mean_to_double(const number &mean_value)
       {
         return mean_value;
       }
 
-      template<typename number>
+      template <typename number>
       double mean_to_double(const std::complex<number> &mean_value)
       {
         // we need to return double as a norm, but mean value is a complex
@@ -7918,8 +7918,8 @@ namespace VectorTools
   }
 
 
-  template<int dim, int spacedim, template <int,int> class DoFHandlerType,
-           typename VectorType>
+  template <int dim, int spacedim, template <int,int> class DoFHandlerType,
+            typename VectorType>
   void get_position_vector(const DoFHandlerType<dim,spacedim> &dh,
                            VectorType                         &vector,
                            const ComponentMask                &mask)
diff --git a/include/deal.II/physics/transformations.h b/include/deal.II/physics/transformations.h
index 93ab0ab6e8..246fd36d03 100644
--- a/include/deal.II/physics/transformations.h
+++ b/include/deal.II/physics/transformations.h
@@ -57,7 +57,7 @@ namespace Physics
        *
        * @param[in] angle The rotation angle (about the z-axis) in radians
        */
-      template<typename Number>
+      template <typename Number>
       Tensor<2,2,Number>
       rotation_matrix_2d (const Number &angle);
 
@@ -90,7 +90,7 @@ namespace Physics
        * @param[in] axis  A unit vector that defines the axis of rotation
        * @param[in] angle The rotation angle in radians
        */
-      template<typename Number>
+      template <typename Number>
       Tensor<2,3,Number>
       rotation_matrix_3d (const Point<3,Number> &axis,
                           const Number          &angle);
@@ -780,7 +780,7 @@ namespace Physics
      *
      * @dealiiHolzapfelA{75,2.55} @dealiiWriggersA{23,3.11}
      */
-    template<int dim, typename Number>
+    template <int dim, typename Number>
     Tensor<1,dim,Number>
     nansons_formula (const Tensor<1,dim,Number> &N,
                      const Tensor<2,dim,Number> &F);
@@ -908,7 +908,7 @@ namespace internal
 
 
 
-template<typename Number>
+template <typename Number>
 Tensor<2,2,Number>
 Physics::Transformations::Rotations::rotation_matrix_2d (const Number &angle)
 {
@@ -925,7 +925,7 @@ Physics::Transformations::Rotations::rotation_matrix_2d (const Number &angle)
 
 
 
-template<typename Number>
+template <typename Number>
 Tensor<2,3,Number>
 Physics::Transformations::Rotations::rotation_matrix_3d (const Point<3,Number> &axis,
                                                          const Number          &angle)
@@ -1287,7 +1287,7 @@ Physics::Transformations::Piola::pull_back (const SymmetricTensor<4,dim,Number>
 
 
 
-template<int dim, typename Number>
+template <int dim, typename Number>
 inline Tensor<1,dim,Number>
 Physics::Transformations::nansons_formula (const Tensor<1,dim,Number> &N,
                                            const Tensor<2,dim,Number> &F)
diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc
index 36cc260b59..4d2a2af337 100644
--- a/source/base/data_out_base.cc
+++ b/source/base/data_out_base.cc
@@ -459,7 +459,7 @@ namespace DataOutBase
 // DataOutFilter class member functions
 //----------------------------------------------------------------------//
 
-template<int dim>
+template <int dim>
 void DataOutBase::DataOutFilter::write_point(const unsigned int &index, const Point<dim> &p)
 {
   Map3DPoint::const_iterator  it;
@@ -514,7 +514,7 @@ void DataOutBase::DataOutFilter::fill_cell_data(const unsigned int &local_node_o
     }
 }
 
-template<int dim>
+template <int dim>
 void
 DataOutBase::DataOutFilter::write_cell(
   unsigned int index,
@@ -679,7 +679,7 @@ namespace
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   static
   void
   compute_sizes(const std::vector<DataOutBase::Patch<dim, spacedim> > &patches,
@@ -701,7 +701,7 @@ namespace
    *
    * @ingroup output
    */
-  template<typename FlagsType>
+  template <typename FlagsType>
   class StreamBase
   {
   public:
@@ -836,7 +836,7 @@ namespace
      * some output formats require
      * this number to be printed.
      */
-    template<typename data>
+    template <typename data>
     void write_dataset (const unsigned int       index,
                         const std::vector<data> &values);
   };
@@ -956,7 +956,7 @@ namespace
      * some output formats require
      * this number to be printed.
      */
-    template<typename data>
+    template <typename data>
     void write_dataset (const unsigned int       index,
                         const std::vector<data> &values);
   };
@@ -1071,7 +1071,7 @@ namespace
   {}
 
 
-  template<int dim>
+  template <int dim>
   void
   DXStream::write_point (const unsigned int,
                          const Point<dim> &p)
@@ -1094,7 +1094,7 @@ namespace
 
 
 
-  template<int dim>
+  template <int dim>
   void
   DXStream::write_cell (unsigned int,
                         unsigned int start,
@@ -1134,7 +1134,7 @@ namespace
 
 
 
-  template<typename data>
+  template <typename data>
   inline
   void
   DXStream::write_dataset (const unsigned int,
@@ -1164,7 +1164,7 @@ namespace
   {}
 
 
-  template<int dim>
+  template <int dim>
   void
   GmvStream::write_point (const unsigned int,
                           const Point<dim> &p)
@@ -1176,7 +1176,7 @@ namespace
 
 
 
-  template<int dim>
+  template <int dim>
   void
   GmvStream::write_cell (unsigned int,
                          unsigned int s,
@@ -1215,7 +1215,7 @@ namespace
   {}
 
 
-  template<int dim>
+  template <int dim>
   void
   TecplotStream::write_point (const unsigned int,
                               const Point<dim> &p)
@@ -1227,7 +1227,7 @@ namespace
 
 
 
-  template<int dim>
+  template <int dim>
   void
   TecplotStream::write_cell (unsigned int,
                              unsigned int s,
@@ -1263,7 +1263,7 @@ namespace
   {}
 
 
-  template<int dim>
+  template <int dim>
   void
   UcdStream::write_point (const unsigned int index,
                           const Point<dim> &p)
@@ -1281,7 +1281,7 @@ namespace
 
 
 
-  template<int dim>
+  template <int dim>
   void
   UcdStream::write_cell (unsigned int index,
                          unsigned int start,
@@ -1319,7 +1319,7 @@ namespace
 
 
 
-  template<typename data>
+  template <typename data>
   inline
   void
   UcdStream::write_dataset (const unsigned int index,
@@ -1342,7 +1342,7 @@ namespace
   {}
 
 
-  template<int dim>
+  template <int dim>
   void
   VtkStream::write_point (const unsigned int,
                           const Point<dim> &p)
@@ -1357,7 +1357,7 @@ namespace
 
 
 
-  template<int dim>
+  template <int dim>
   void
   VtkStream::write_cell (unsigned int,
                          unsigned int start,
@@ -1392,7 +1392,7 @@ namespace
   {}
 
 
-  template<int dim>
+  template <int dim>
   void
   VtuStream::write_point (const unsigned int,
                           const Point<dim> &p)
@@ -1429,7 +1429,7 @@ namespace
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   VtuStream::write_cell (unsigned int,
                          unsigned int start,
diff --git a/source/base/flow_function.cc b/source/base/flow_function.cc
index 7b43271d00..6a91d6daec 100644
--- a/source/base/flow_function.cc
+++ b/source/base/flow_function.cc
@@ -27,7 +27,7 @@ DEAL_II_NAMESPACE_OPEN
 namespace Functions
 {
 
-  template<int dim>
+  template <int dim>
   FlowFunction<dim>::FlowFunction()
     :
     Function<dim>(dim+1),
@@ -37,12 +37,12 @@ namespace Functions
   {}
 
 
-  template<int dim>
+  template <int dim>
   FlowFunction<dim>::~FlowFunction()
   {}
 
 
-  template<int dim>
+  template <int dim>
   void
   FlowFunction<dim>::pressure_adjustment(double p)
   {
@@ -50,7 +50,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void FlowFunction<dim>::vector_value_list (
     const std::vector<Point<dim> > &points,
     std::vector<Vector<double> >   &values) const
@@ -75,7 +75,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void FlowFunction<dim>::vector_value (
     const Point<dim> &point,
     Vector<double> &value) const
@@ -99,7 +99,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   double FlowFunction<dim>::value (
     const Point<dim> &point,
     const unsigned int comp) const
@@ -121,7 +121,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void FlowFunction<dim>::vector_gradient_list (
     const std::vector<Point<dim> > &points,
     std::vector<std::vector<Tensor<1,dim> > > &values) const
@@ -146,7 +146,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void FlowFunction<dim>::vector_laplacian_list (
     const std::vector<Point<dim> > &points,
     std::vector<Vector<double> > &values) const
@@ -171,7 +171,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   std::size_t
   FlowFunction<dim>::memory_consumption () const
   {
@@ -182,7 +182,7 @@ namespace Functions
 
 //----------------------------------------------------------------------//
 
-  template<int dim>
+  template <int dim>
   PoisseuilleFlow<dim>::PoisseuilleFlow(const double r,
                                         const double Re)
     :
@@ -192,12 +192,12 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   PoisseuilleFlow<dim>::~PoisseuilleFlow()
   {}
 
 
-  template<int dim>
+  template <int dim>
   void PoisseuilleFlow<dim>::vector_values (
     const std::vector<Point<dim> > &points,
     std::vector<std::vector<double> > &values) const
@@ -232,7 +232,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   void PoisseuilleFlow<dim>::vector_gradients (
     const std::vector<Point<dim> > &points,
     std::vector<std::vector<Tensor<1,dim> > > &values) const
@@ -263,7 +263,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   void PoisseuilleFlow<dim>::vector_laplacians (
     const std::vector<Point<dim> > &points,
     std::vector<std::vector<double> > &values) const
@@ -281,19 +281,19 @@ namespace Functions
 
 //----------------------------------------------------------------------//
 
-  template<int dim>
+  template <int dim>
   StokesCosine<dim>::StokesCosine(const double nu, const double r)
     :
     viscosity(nu), reaction(r)
   {}
 
 
-  template<int dim>
+  template <int dim>
   StokesCosine<dim>::~StokesCosine()
   {}
 
 
-  template<int dim>
+  template <int dim>
   void
   StokesCosine<dim>::set_parameters(const double nu, const double r)
   {
@@ -302,7 +302,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void StokesCosine<dim>::vector_values (
     const std::vector<Point<dim> > &points,
     std::vector<std::vector<double> > &values) const
@@ -349,7 +349,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   void StokesCosine<dim>::vector_gradients (
     const std::vector<Point<dim> > &points,
     std::vector<std::vector<Tensor<1,dim> > > &values) const
@@ -413,7 +413,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   void StokesCosine<dim>::vector_laplacians (
     const std::vector<Point<dim> > &points,
     std::vector<std::vector<double> > &values) const
diff --git a/source/base/function_lib.cc b/source/base/function_lib.cc
index 804cfbf817..41d0eedb02 100644
--- a/source/base/function_lib.cc
+++ b/source/base/function_lib.cc
@@ -29,7 +29,7 @@ namespace Functions
 {
 
 
-  template<int dim>
+  template <int dim>
   double
   SquareFunction<dim>::value (const Point<dim>   &p,
                               const unsigned int) const
@@ -38,7 +38,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   SquareFunction<dim>::vector_value (const Point<dim>   &p,
                                      Vector<double>     &values) const
@@ -48,7 +48,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   SquareFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                    std::vector<double>            &values,
@@ -65,7 +65,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   double
   SquareFunction<dim>::laplacian (const Point<dim> &,
                                   const unsigned int) const
@@ -74,7 +74,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   SquareFunction<dim>::laplacian_list (const std::vector<Point<dim> > &points,
                                        std::vector<double>            &values,
@@ -89,7 +89,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   Tensor<1,dim>
   SquareFunction<dim>::gradient (const Point<dim>   &p,
                                  const unsigned int) const
@@ -98,7 +98,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   SquareFunction<dim>::vector_gradient (
     const Point<dim> &p,
@@ -110,7 +110,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   void
   SquareFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
                                       std::vector<Tensor<1,dim> >    &gradients,
@@ -127,7 +127,7 @@ namespace Functions
 //////////////////////////////////////////////////////////////////////
 
 
-  template<int dim>
+  template <int dim>
   double
   Q1WedgeFunction<dim>::value (const Point<dim>   &p,
                                const unsigned int) const
@@ -138,7 +138,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   void
   Q1WedgeFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                     std::vector<double>            &values,
@@ -156,7 +156,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   Q1WedgeFunction<dim>::vector_value_list (
     const std::vector<Point<dim> > &points,
@@ -175,7 +175,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   double
   Q1WedgeFunction<dim>::laplacian (const Point<dim> &,
                                    const unsigned int) const
@@ -185,7 +185,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   Q1WedgeFunction<dim>::laplacian_list (const std::vector<Point<dim> > &points,
                                         std::vector<double>            &values,
@@ -201,7 +201,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   Tensor<1,dim>
   Q1WedgeFunction<dim>::gradient (const Point<dim>   &p,
                                   const unsigned int) const
@@ -215,7 +215,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   void
   Q1WedgeFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
                                        std::vector<Tensor<1,dim> >    &gradients,
@@ -233,7 +233,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   Q1WedgeFunction<dim>::vector_gradient_list (
     const std::vector<Point<dim> > &points,
@@ -256,14 +256,14 @@ namespace Functions
 //////////////////////////////////////////////////////////////////////
 
 
-  template<int dim>
+  template <int dim>
   PillowFunction<dim>::PillowFunction (const double offset)
     :
     offset(offset)
   {}
 
 
-  template<int dim>
+  template <int dim>
   double
   PillowFunction<dim>::value (const Point<dim>   &p,
                               const unsigned int) const
@@ -282,7 +282,7 @@ namespace Functions
     return 0.;
   }
 
-  template<int dim>
+  template <int dim>
   void
   PillowFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                    std::vector<double>            &values,
@@ -313,7 +313,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   double
   PillowFunction<dim>::laplacian (const Point<dim>   &p,
                                   const unsigned int) const
@@ -334,7 +334,7 @@ namespace Functions
     return 0.;
   }
 
-  template<int dim>
+  template <int dim>
   void
   PillowFunction<dim>::laplacian_list (const std::vector<Point<dim> > &points,
                                        std::vector<double>            &values,
@@ -365,7 +365,7 @@ namespace Functions
       }
   }
 
-  template<int dim>
+  template <int dim>
   Tensor<1,dim>
   PillowFunction<dim>::gradient (const Point<dim>   &p,
                                  const unsigned int) const
@@ -391,7 +391,7 @@ namespace Functions
     return result;
   }
 
-  template<int dim>
+  template <int dim>
   void
   PillowFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
                                       std::vector<Tensor<1,dim> >    &gradients,
@@ -433,7 +433,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   double
   CosineFunction<dim>::value (const Point<dim>   &p,
                               const unsigned int) const
@@ -452,7 +452,7 @@ namespace Functions
     return 0.;
   }
 
-  template<int dim>
+  template <int dim>
   void
   CosineFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                    std::vector<double>            &values,
@@ -466,7 +466,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CosineFunction<dim>::vector_value_list (
     const std::vector<Point<dim> > &points,
@@ -484,7 +484,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   double
   CosineFunction<dim>::laplacian (const Point<dim>   &p,
                                   const unsigned int) const
@@ -503,7 +503,7 @@ namespace Functions
     return 0.;
   }
 
-  template<int dim>
+  template <int dim>
   void
   CosineFunction<dim>::laplacian_list (const std::vector<Point<dim> > &points,
                                        std::vector<double>            &values,
@@ -516,7 +516,7 @@ namespace Functions
       values[i] = laplacian(points[i]);
   }
 
-  template<int dim>
+  template <int dim>
   Tensor<1,dim>
   CosineFunction<dim>::gradient (const Point<dim>   &p,
                                  const unsigned int) const
@@ -542,7 +542,7 @@ namespace Functions
     return result;
   }
 
-  template<int dim>
+  template <int dim>
   void
   CosineFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
                                       std::vector<Tensor<1,dim> >    &gradients,
@@ -574,7 +574,7 @@ namespace Functions
       }
   }
 
-  template<int dim>
+  template <int dim>
   SymmetricTensor<2,dim>
   CosineFunction<dim>::hessian (const Point<dim>   &p,
                                 const unsigned int) const
@@ -621,7 +621,7 @@ namespace Functions
     return result;
   }
 
-  template<int dim>
+  template <int dim>
   void
   CosineFunction<dim>::hessian_list (const std::vector<Point<dim> >       &points,
                                      std::vector<SymmetricTensor<2,dim> > &hessians,
@@ -683,7 +683,7 @@ namespace Functions
   {}
 
 
-  template<int dim>
+  template <int dim>
   double
   CosineGradFunction<dim>::value (
     const Point<dim>   &p,
@@ -707,7 +707,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CosineGradFunction<dim>::vector_value (
     const Point<dim> &p,
@@ -734,7 +734,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CosineGradFunction<dim>::value_list (
     const std::vector<Point<dim> > &points,
@@ -768,7 +768,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CosineGradFunction<dim>::vector_value_list (
     const std::vector<Point<dim> > &points,
@@ -801,7 +801,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   double
   CosineGradFunction<dim>::laplacian (
     const Point<dim>   &p,
@@ -811,7 +811,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   Tensor<1,dim>
   CosineGradFunction<dim>::gradient (
     const Point<dim> &p,
@@ -844,7 +844,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CosineGradFunction<dim>::gradient_list (
     const std::vector<Point<dim> > &points,
@@ -884,7 +884,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CosineGradFunction<dim>::vector_gradient_list (
     const std::vector<Point<dim> > &points,
@@ -940,7 +940,7 @@ namespace Functions
 
 //////////////////////////////////////////////////////////////////////
 
-  template<int dim>
+  template <int dim>
   double
   ExpFunction<dim>::value (const Point<dim>   &p,
                            const unsigned int) const
@@ -959,7 +959,7 @@ namespace Functions
     return 0.;
   }
 
-  template<int dim>
+  template <int dim>
   void
   ExpFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                 std::vector<double>            &values,
@@ -988,7 +988,7 @@ namespace Functions
       }
   }
 
-  template<int dim>
+  template <int dim>
   double
   ExpFunction<dim>::laplacian (const Point<dim>   &p,
                                const unsigned int) const
@@ -1007,7 +1007,7 @@ namespace Functions
     return 0.;
   }
 
-  template<int dim>
+  template <int dim>
   void
   ExpFunction<dim>::laplacian_list (const std::vector<Point<dim> > &points,
                                     std::vector<double>            &values,
@@ -1036,7 +1036,7 @@ namespace Functions
       }
   }
 
-  template<int dim>
+  template <int dim>
   Tensor<1,dim>
   ExpFunction<dim>::gradient (const Point<dim>   &p,
                               const unsigned int) const
@@ -1062,7 +1062,7 @@ namespace Functions
     return result;
   }
 
-  template<int dim>
+  template <int dim>
   void
   ExpFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
                                    std::vector<Tensor<1,dim> >    &gradients,
@@ -1687,7 +1687,7 @@ namespace Functions
 
 //////////////////////////////////////////////////////////////////////
 
-  template<int dim>
+  template <int dim>
   JumpFunction<dim>::JumpFunction(const Point<dim> &direction,
                                   const double      steepness)
     :
@@ -1711,7 +1711,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   double
   JumpFunction<dim>::value (const Point<dim>   &p,
                             const unsigned int) const
@@ -1722,7 +1722,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   void
   JumpFunction<dim>::value_list (const std::vector<Point<dim> > &p,
                                  std::vector<double>          &values,
@@ -1739,7 +1739,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   double
   JumpFunction<dim>::laplacian (const Point<dim>   &p,
                                 const unsigned int) const
@@ -1750,7 +1750,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   JumpFunction<dim>::laplacian_list (const std::vector<Point<dim> > &p,
                                      std::vector<double>          &values,
@@ -1771,7 +1771,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   Tensor<1,dim>
   JumpFunction<dim>::gradient (const Point<dim>   &p,
                                const unsigned int) const
@@ -1786,7 +1786,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   void
   JumpFunction<dim>::gradient_list (const std::vector<Point<dim> > &p,
                                     std::vector<Tensor<1,dim> >  &gradients,
@@ -2163,7 +2163,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   void
   Monomial<dim>::value_list (const std::vector<Point<dim> > &points,
                              std::vector<double>            &values,
diff --git a/source/base/function_lib_cutoff.cc b/source/base/function_lib_cutoff.cc
index 1cc4738cf9..3f3aa2dfcb 100644
--- a/source/base/function_lib_cutoff.cc
+++ b/source/base/function_lib_cutoff.cc
@@ -25,7 +25,7 @@ DEAL_II_NAMESPACE_OPEN
 
 namespace Functions
 {
-  template<int dim>
+  template <int dim>
   CutOffFunctionBase<dim>::CutOffFunctionBase (const double r,
                                                const Point<dim> p,
                                                const unsigned int n_components,
@@ -38,7 +38,7 @@ namespace Functions
   {}
 
 
-  template<int dim>
+  template <int dim>
   void
   CutOffFunctionBase<dim>::new_center (const Point<dim> &p)
   {
@@ -46,7 +46,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CutOffFunctionBase<dim>::new_radius (const double r)
   {
@@ -55,7 +55,7 @@ namespace Functions
 
 //////////////////////////////////////////////////////////////////////
 
-  template<int dim>
+  template <int dim>
   CutOffFunctionLinfty<dim>::CutOffFunctionLinfty (const double r,
                                                    const Point<dim> p,
                                                    const unsigned int n_components,
@@ -65,7 +65,7 @@ namespace Functions
   {}
 
 
-  template<int dim>
+  template <int dim>
   double
   CutOffFunctionLinfty<dim>::value (const Point<dim>   &p,
                                     const unsigned int component) const
@@ -78,7 +78,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CutOffFunctionLinfty<dim>::value_list (const std::vector<Point<dim> > &points,
                                          std::vector<double>            &values,
@@ -100,7 +100,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CutOffFunctionLinfty<dim>::vector_value_list (
     const std::vector<Point<dim> > &points,
@@ -124,7 +124,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   CutOffFunctionW1<dim>::CutOffFunctionW1 (const double     r,
                                            const Point<dim> p,
                                            const unsigned int n_components,
@@ -134,7 +134,7 @@ namespace Functions
   {}
 
 
-  template<int dim>
+  template <int dim>
   double
   CutOffFunctionW1<dim>::value (const Point<dim>   &p,
                                 const unsigned int component) const
@@ -150,7 +150,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CutOffFunctionW1<dim>::value_list (const std::vector<Point<dim> > &points,
                                      std::vector<double>            &values,
@@ -173,7 +173,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   void
   CutOffFunctionW1<dim>::vector_value_list (
     const std::vector<Point<dim> > &points,
@@ -198,7 +198,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   CutOffFunctionCinfty<dim>::CutOffFunctionCinfty (const double     r,
                                                    const Point<dim> p,
                                                    const unsigned int n_components,
@@ -208,7 +208,7 @@ namespace Functions
   {}
 
 
-  template<int dim>
+  template <int dim>
   double
   CutOffFunctionCinfty<dim>::value (const Point<dim>   &p,
                                     const unsigned int component) const
@@ -228,7 +228,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CutOffFunctionCinfty<dim>::value_list (const std::vector<Point<dim> > &points,
                                          std::vector<double>            &values,
@@ -260,7 +260,7 @@ namespace Functions
   }
 
 
-  template<int dim>
+  template <int dim>
   void
   CutOffFunctionCinfty<dim>::vector_value_list (
     const std::vector<Point<dim> > &points,
@@ -293,7 +293,7 @@ namespace Functions
 
 
 
-  template<int dim>
+  template <int dim>
   Tensor<1,dim>
   CutOffFunctionCinfty<dim>::gradient (const Point<dim>   &p,
                                        const unsigned int) const
diff --git a/source/base/geometry_info.cc b/source/base/geometry_info.cc
index 919b5669a0..3160005b8e 100644
--- a/source/base/geometry_info.cc
+++ b/source/base/geometry_info.cc
@@ -223,7 +223,7 @@ const unsigned int GeometryInfo<4>::vertex_to_face
 };
 
 
-template<int dim>
+template <int dim>
 unsigned int
 GeometryInfo<dim>::n_children(const RefinementCase<dim> &ref_case)
 {
@@ -234,7 +234,7 @@ GeometryInfo<dim>::n_children(const RefinementCase<dim> &ref_case)
 }
 
 
-template<>
+template <>
 unsigned int
 GeometryInfo<1>::n_subfaces(const internal::SubfaceCase<1> &)
 {
@@ -244,7 +244,7 @@ GeometryInfo<1>::n_subfaces(const internal::SubfaceCase<1> &)
 
 
 
-template<>
+template <>
 unsigned int
 GeometryInfo<2>::n_subfaces(const internal::SubfaceCase<2> &subface_case)
 {
@@ -253,7 +253,7 @@ GeometryInfo<2>::n_subfaces(const internal::SubfaceCase<2> &subface_case)
 
 
 
-template<>
+template <>
 unsigned int
 GeometryInfo<3>::n_subfaces(const internal::SubfaceCase<3> &subface_case)
 {
@@ -263,7 +263,7 @@ GeometryInfo<3>::n_subfaces(const internal::SubfaceCase<3> &subface_case)
 }
 
 
-template<>
+template <>
 double
 GeometryInfo<1>::subface_ratio(const internal::SubfaceCase<1> &,
                                const unsigned int)
@@ -272,7 +272,7 @@ GeometryInfo<1>::subface_ratio(const internal::SubfaceCase<1> &,
 }
 
 
-template<>
+template <>
 double
 GeometryInfo<2>::subface_ratio(const internal::SubfaceCase<2> &subface_case,
                                const unsigned int)
@@ -314,7 +314,7 @@ GeometryInfo<2>::subface_ratio(const internal::SubfaceCase<2> &subface_case,
 }
 
 
-template<>
+template <>
 double
 GeometryInfo<3>::subface_ratio(const internal::SubfaceCase<3> &subface_case,
                                const unsigned int subface_no)
@@ -374,7 +374,7 @@ GeometryInfo<3>::subface_ratio(const internal::SubfaceCase<3> &subface_case,
 
 
 
-template<>
+template <>
 RefinementCase<0>
 GeometryInfo<1>::face_refinement_case(const RefinementCase<1> &,
                                       const unsigned int,
@@ -388,7 +388,7 @@ GeometryInfo<1>::face_refinement_case(const RefinementCase<1> &,
 }
 
 
-template<>
+template <>
 RefinementCase<1>
 GeometryInfo<2>::face_refinement_case(const RefinementCase<2> &cell_refinement_case,
                                       const unsigned int face_no,
@@ -430,7 +430,7 @@ GeometryInfo<2>::face_refinement_case(const RefinementCase<2> &cell_refinement_c
 }
 
 
-template<>
+template <>
 RefinementCase<2>
 GeometryInfo<3>::face_refinement_case(const RefinementCase<3> &cell_refinement_case,
                                       const unsigned int face_no,
@@ -523,7 +523,7 @@ GeometryInfo<3>::face_refinement_case(const RefinementCase<3> &cell_refinement_c
 
 
 
-template<>
+template <>
 RefinementCase<1>
 GeometryInfo<1>::line_refinement_case(const RefinementCase<1> &cell_refinement_case,
                                       const unsigned int line_no)
@@ -540,7 +540,7 @@ GeometryInfo<1>::line_refinement_case(const RefinementCase<1> &cell_refinement_c
 }
 
 
-template<>
+template <>
 RefinementCase<1>
 GeometryInfo<2>::line_refinement_case(const RefinementCase<2> &cell_refinement_case,
                                       const unsigned int line_no)
@@ -550,7 +550,7 @@ GeometryInfo<2>::line_refinement_case(const RefinementCase<2> &cell_refinement_c
 }
 
 
-template<>
+template <>
 RefinementCase<1>
 GeometryInfo<3>::line_refinement_case(const RefinementCase<3> &cell_refinement_case,
                                       const unsigned int line_no)
@@ -586,7 +586,7 @@ GeometryInfo<3>::line_refinement_case(const RefinementCase<3> &cell_refinement_c
 
 
 
-template<>
+template <>
 RefinementCase<1>
 GeometryInfo<1>::min_cell_refinement_case_for_face_refinement(const RefinementCase<0> &,
     const unsigned int,
@@ -601,7 +601,7 @@ GeometryInfo<1>::min_cell_refinement_case_for_face_refinement(const RefinementCa
 }
 
 
-template<>
+template <>
 RefinementCase<2>
 GeometryInfo<2>::min_cell_refinement_case_for_face_refinement(const RefinementCase<1> &face_refinement_case,
     const unsigned int face_no,
@@ -622,7 +622,7 @@ GeometryInfo<2>::min_cell_refinement_case_for_face_refinement(const RefinementCa
 }
 
 
-template<>
+template <>
 RefinementCase<3>
 GeometryInfo<3>::min_cell_refinement_case_for_face_refinement(const RefinementCase<2> &face_refinement_case,
     const unsigned int face_no,
@@ -688,7 +688,7 @@ GeometryInfo<3>::min_cell_refinement_case_for_face_refinement(const RefinementCa
 
 
 
-template<>
+template <>
 RefinementCase<1>
 GeometryInfo<1>::min_cell_refinement_case_for_line_refinement(const unsigned int line_no)
 {
@@ -699,7 +699,7 @@ GeometryInfo<1>::min_cell_refinement_case_for_line_refinement(const unsigned int
 }
 
 
-template<>
+template <>
 RefinementCase<2>
 GeometryInfo<2>::min_cell_refinement_case_for_line_refinement(const unsigned int line_no)
 {
@@ -712,7 +712,7 @@ GeometryInfo<2>::min_cell_refinement_case_for_line_refinement(const unsigned int
 }
 
 
-template<>
+template <>
 RefinementCase<3>
 GeometryInfo<3>::min_cell_refinement_case_for_line_refinement(const unsigned int line_no)
 {
@@ -1471,7 +1471,7 @@ GeometryInfo<3>::face_to_cell_lines (const unsigned int face,
 
 
 
-template<int dim>
+template <int dim>
 unsigned int
 GeometryInfo<dim>::face_to_cell_lines (const unsigned int,
                                        const unsigned int,
diff --git a/source/base/polynomials_nedelec.cc b/source/base/polynomials_nedelec.cc
index ea52665cab..194c513e69 100644
--- a/source/base/polynomials_nedelec.cc
+++ b/source/base/polynomials_nedelec.cc
@@ -23,14 +23,14 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template<int dim>
+template <int dim>
 PolynomialsNedelec<dim>::PolynomialsNedelec (const unsigned int k) :
   my_degree (k), polynomial_space (create_polynomials (k)),
   n_pols (compute_n_pols (k))
 {
 }
 
-template<int dim>
+template <int dim>
 std::vector<std::vector< Polynomials::Polynomial<double> > >
 PolynomialsNedelec<dim>::create_polynomials (const unsigned int k)
 {
@@ -48,7 +48,7 @@ PolynomialsNedelec<dim>::create_polynomials (const unsigned int k)
 // Compute the values, gradients
 // and double gradients of the
 // polynomial at the given point.
-template<int dim>
+template <int dim>
 void
 PolynomialsNedelec<dim>::compute (const Point<dim> &unit_point,
                                   std::vector<Tensor<1,dim> > &values,
@@ -1383,7 +1383,7 @@ PolynomialsNedelec<dim>::compute (const Point<dim> &unit_point,
 }
 
 
-template<int dim>
+template <int dim>
 unsigned int
 PolynomialsNedelec<dim>::compute_n_pols (unsigned int k)
 {
diff --git a/source/base/quadrature.cc b/source/base/quadrature.cc
index cfb1768689..159899cf65 100644
--- a/source/base/quadrature.cc
+++ b/source/base/quadrature.cc
@@ -285,7 +285,7 @@ Quadrature<dim>::memory_consumption () const
 
 
 //---------------------------------------------------------------------------
-template<int dim>
+template <int dim>
 QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &qx)
   : Quadrature<dim>(qx.size())
 {
@@ -301,7 +301,7 @@ QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &qx)
 
 
 
-template<int dim>
+template <int dim>
 QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &qx,
                                 const Quadrature<1> &qy)
   : Quadrature<dim>(qx.size()
@@ -321,7 +321,7 @@ QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &qx,
 
 
 
-template<int dim>
+template <int dim>
 QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &qx,
                                 const Quadrature<1> &qy,
                                 const Quadrature<1> &qz)
@@ -1526,7 +1526,7 @@ QIterated<1>::uses_both_endpoints (const Quadrature<1> &base_quadrature)
 }
 
 
-// template<>
+// template <>
 // void
 // QIterated<1>::fill(Quadrature<1>& dst,
 //                 const Quadrature<1> &base_quadrature,
diff --git a/source/base/quadrature_lib.cc b/source/base/quadrature_lib.cc
index 0b8fcb4fb3..de6dfef917 100644
--- a/source/base/quadrature_lib.cc
+++ b/source/base/quadrature_lib.cc
@@ -693,7 +693,7 @@ QGaussLog<1>::get_quadrature_weights(const unsigned int n)
 }
 
 
-template<>
+template <>
 QGaussLogR<1>::QGaussLogR(const unsigned int n,
                           const Point<1> origin,
                           const double alpha,
@@ -765,7 +765,7 @@ QGaussLogR<1>::QGaussLogR(const unsigned int n,
 }
 
 
-template<>
+template <>
 unsigned int QGaussOneOverR<2>::quad_size(const Point<2> singularity,
                                           const unsigned int n)
 {
@@ -784,7 +784,7 @@ unsigned int QGaussOneOverR<2>::quad_size(const Point<2> singularity,
   return (8*n*n);
 }
 
-template<>
+template <>
 QGaussOneOverR<2>::QGaussOneOverR(const unsigned int n,
                                   const Point<2> singularity,
                                   const bool factor_out_singularity) :
@@ -834,7 +834,7 @@ QGaussOneOverR<2>::QGaussOneOverR(const unsigned int n,
 }
 
 
-template<>
+template <>
 QGaussOneOverR<2>::QGaussOneOverR(const unsigned int n,
                                   const unsigned int vertex_index,
                                   const bool factor_out_singularity) :
diff --git a/source/base/tensor_product_polynomials.cc b/source/base/tensor_product_polynomials.cc
index 424a72c7b9..8c7a96c3d1 100644
--- a/source/base/tensor_product_polynomials.cc
+++ b/source/base/tensor_product_polynomials.cc
@@ -698,7 +698,7 @@ compute (const Point<dim>            &p,
 
 
 
-template<int dim>
+template <int dim>
 unsigned int
 AnisotropicPolynomials<dim>::n() const
 {
diff --git a/source/distributed/solution_transfer.cc b/source/distributed/solution_transfer.cc
index 285f4217c5..ca1e80bab5 100644
--- a/source/distributed/solution_transfer.cc
+++ b/source/distributed/solution_transfer.cc
@@ -43,7 +43,7 @@ namespace parallel
   namespace distributed
   {
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     SolutionTransfer<dim, VectorType, DoFHandlerType>::SolutionTransfer (const DoFHandlerType &dof)
       :
       dof_handler(&dof, typeid(*this).name()),
@@ -56,13 +56,13 @@ namespace parallel
 
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     SolutionTransfer<dim, VectorType, DoFHandlerType>::~SolutionTransfer ()
     {}
 
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     void
     SolutionTransfer<dim, VectorType, DoFHandlerType>::
     prepare_for_coarsening_and_refinement (const std::vector<const VectorType *> &all_in)
@@ -73,7 +73,7 @@ namespace parallel
 
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     void
     SolutionTransfer<dim, VectorType, DoFHandlerType>::register_data_attach (const std::size_t size)
     {
@@ -99,7 +99,7 @@ namespace parallel
 
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     void
     SolutionTransfer<dim, VectorType, DoFHandlerType>::
     prepare_for_coarsening_and_refinement (const VectorType &in)
@@ -110,7 +110,7 @@ namespace parallel
 
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     void
     SolutionTransfer<dim, VectorType, DoFHandlerType>::prepare_serialization (const VectorType &in)
     {
@@ -120,7 +120,7 @@ namespace parallel
 
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     void
     SolutionTransfer<dim, VectorType, DoFHandlerType>::prepare_serialization
     (const std::vector<const VectorType *> &all_in)
@@ -130,7 +130,7 @@ namespace parallel
 
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     void
     SolutionTransfer<dim, VectorType, DoFHandlerType>::deserialize (VectorType &in)
     {
@@ -140,7 +140,7 @@ namespace parallel
 
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     void
     SolutionTransfer<dim, VectorType, DoFHandlerType>::deserialize (std::vector<VectorType *> &all_in)
     {
@@ -153,7 +153,7 @@ namespace parallel
     }
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     void
     SolutionTransfer<dim, VectorType, DoFHandlerType>::interpolate (std::vector<VectorType *> &all_out)
     {
@@ -187,7 +187,7 @@ namespace parallel
 
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     void
     SolutionTransfer<dim, VectorType, DoFHandlerType>::interpolate (VectorType &out)
     {
@@ -197,7 +197,7 @@ namespace parallel
 
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     unsigned int
     SolutionTransfer<dim, VectorType, DoFHandlerType>::get_data_size() const
     {
@@ -205,7 +205,7 @@ namespace parallel
     }
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     void
     SolutionTransfer<dim, VectorType, DoFHandlerType>::
     pack_callback(const typename Triangulation<dim,DoFHandlerType::space_dimension>::cell_iterator &cell_,
@@ -229,7 +229,7 @@ namespace parallel
     }
 
 
-    template<int dim, typename VectorType, typename DoFHandlerType>
+    template <int dim, typename VectorType, typename DoFHandlerType>
     void
     SolutionTransfer<dim, VectorType, DoFHandlerType>::unpack_callback
     (const typename Triangulation<dim,DoFHandlerType::space_dimension>::cell_iterator &cell_,
diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc
index 76634f4d62..5aa1a4107f 100644
--- a/source/distributed/tria.cc
+++ b/source/distributed/tria.cc
@@ -3465,7 +3465,7 @@ namespace parallel
 
 
 
-    template<int dim, int spacedim>
+    template <int dim, int spacedim>
     std::vector<bool>
     Triangulation<dim,spacedim>
     ::mark_locally_active_vertices_on_level (const int level) const
@@ -3520,7 +3520,7 @@ namespace parallel
 
 
 
-    template<int dim, int spacedim>
+    template <int dim, int spacedim>
     void
     Triangulation<dim,spacedim>::add_periodicity
     (const std::vector<GridTools::PeriodicFacePair<cell_iterator> > &
diff --git a/source/dofs/dof_handler.cc b/source/dofs/dof_handler.cc
index 3cce7dc7b1..db82856bec 100644
--- a/source/dofs/dof_handler.cc
+++ b/source/dofs/dof_handler.cc
@@ -34,10 +34,10 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 const unsigned int DoFHandler<dim,spacedim>::dimension;
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 const unsigned int DoFHandler<dim,spacedim>::space_dimension;
 
 template <int dim, int spacedim>
@@ -62,7 +62,7 @@ namespace internal
 
 namespace internal
 {
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   std::string policy_to_string(const dealii::internal::DoFHandler::Policy::PolicyBase<dim,spacedim> &policy)
   {
     std::string policy_name;
@@ -366,7 +366,7 @@ namespace internal
           }
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       void reserve_space_mg (DoFHandler<1, spacedim> &dof_handler)
       {
@@ -422,7 +422,7 @@ namespace internal
             }
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       void reserve_space_mg (DoFHandler<2, spacedim> &dof_handler)
       {
@@ -481,7 +481,7 @@ namespace internal
             }
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       void reserve_space_mg (DoFHandler<3, spacedim> &dof_handler)
       {
@@ -543,7 +543,7 @@ namespace internal
 
 
 
-      template<int spacedim>
+      template <int spacedim>
       static
       types::global_dof_index
       get_dof_index (
@@ -558,7 +558,7 @@ namespace internal
         return mg_level.dof_object.get_dof_index (dof_handler, obj_index, fe_index, local_index);
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       types::global_dof_index
       get_dof_index (const DoFHandler<2, spacedim> &dof_handler, internal::DoFHandler::DoFLevel<2> &, internal::DoFHandler::DoFFaces<2> &mg_faces, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const int2type<1>)
@@ -566,7 +566,7 @@ namespace internal
         return mg_faces.lines.get_dof_index (dof_handler, obj_index, fe_index, local_index);
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       types::global_dof_index
       get_dof_index (const DoFHandler<2, spacedim> &dof_handler, internal::DoFHandler::DoFLevel<2> &mg_level, internal::DoFHandler::DoFFaces<2> &, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const int2type<2>)
@@ -574,7 +574,7 @@ namespace internal
         return mg_level.dof_object.get_dof_index (dof_handler, obj_index, fe_index, local_index);
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       types::global_dof_index
       get_dof_index (const DoFHandler<3, spacedim> &dof_handler, internal::DoFHandler::DoFLevel<3> &, internal::DoFHandler::DoFFaces<3> &mg_faces, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const int2type<1>)
@@ -582,7 +582,7 @@ namespace internal
         return mg_faces.lines.get_dof_index (dof_handler, obj_index, fe_index, local_index);
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       types::global_dof_index
       get_dof_index (const DoFHandler<3, spacedim> &dof_handler, internal::DoFHandler::DoFLevel<3> &, internal::DoFHandler::DoFFaces<3> &mg_faces, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const int2type<2>)
@@ -590,7 +590,7 @@ namespace internal
         return mg_faces.quads.get_dof_index (dof_handler, obj_index, fe_index, local_index);
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       types::global_dof_index
       get_dof_index (const DoFHandler<3, spacedim> &dof_handler, internal::DoFHandler::DoFLevel<3> &mg_level, internal::DoFHandler::DoFFaces<3> &, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const int2type<3>)
@@ -598,42 +598,42 @@ namespace internal
         return mg_level.dof_object.get_dof_index (dof_handler, obj_index, fe_index, local_index);
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       void set_dof_index (const DoFHandler<1, spacedim> &dof_handler, internal::DoFHandler::DoFLevel<1> &mg_level, internal::DoFHandler::DoFFaces<1> &, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const types::global_dof_index global_index, const int2type<1>)
       {
         mg_level.dof_object.set_dof_index (dof_handler, obj_index, fe_index, local_index, global_index);
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       void set_dof_index (const DoFHandler<2, spacedim> &dof_handler, internal::DoFHandler::DoFLevel<2> &, internal::DoFHandler::DoFFaces<2> &mg_faces, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const types::global_dof_index global_index, const int2type<1>)
       {
         mg_faces.lines.set_dof_index (dof_handler, obj_index, fe_index, local_index, global_index);
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       void set_dof_index (const DoFHandler<2, spacedim> &dof_handler, internal::DoFHandler::DoFLevel<2> &mg_level, internal::DoFHandler::DoFFaces<2> &, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const types::global_dof_index global_index, const int2type<2>)
       {
         mg_level.dof_object.set_dof_index (dof_handler, obj_index, fe_index, local_index, global_index);
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       void set_dof_index (const DoFHandler<3, spacedim> &dof_handler, internal::DoFHandler::DoFLevel<3> &, internal::DoFHandler::DoFFaces<3> &mg_faces, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const types::global_dof_index global_index, const int2type<1>)
       {
         mg_faces.lines.set_dof_index (dof_handler, obj_index, fe_index, local_index, global_index);
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       void set_dof_index (const DoFHandler<3, spacedim> &dof_handler, internal::DoFHandler::DoFLevel<3> &, internal::DoFHandler::DoFFaces<3> &mg_faces, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const types::global_dof_index global_index, const int2type<2>)
       {
         mg_faces.quads.set_dof_index (dof_handler, obj_index, fe_index, local_index, global_index);
       }
 
-      template<int spacedim>
+      template <int spacedim>
       static
       void set_dof_index (const DoFHandler<3, spacedim> &dof_handler, internal::DoFHandler::DoFLevel<3> &mg_level, internal::DoFHandler::DoFFaces<3> &, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const types::global_dof_index global_index, const int2type<3>)
       {
@@ -645,7 +645,7 @@ namespace internal
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 DoFHandler<dim,spacedim>::DoFHandler (const Triangulation<dim,spacedim> &tria)
   :
   tria(&tria, typeid(*this).name()),
@@ -669,7 +669,7 @@ DoFHandler<dim,spacedim>::DoFHandler (const Triangulation<dim,spacedim> &tria)
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 DoFHandler<dim,spacedim>::DoFHandler ()
   :
   tria(nullptr, typeid(*this).name()),
@@ -690,7 +690,7 @@ DoFHandler<dim,spacedim>::~DoFHandler ()
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 DoFHandler<dim,spacedim>::
 initialize(const Triangulation<dim,spacedim> &t,
@@ -969,7 +969,7 @@ types::global_dof_index DoFHandler<1,2>::n_boundary_dofs (const std::set<types::
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 types::global_dof_index DoFHandler<dim,spacedim>::n_boundary_dofs () const
 {
   std::set<int> boundary_dofs;
@@ -1043,7 +1043,7 @@ DoFHandler<dim,spacedim>::n_boundary_dofs (const std::set<types::boundary_id> &b
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 std::size_t
 DoFHandler<dim,spacedim>::memory_consumption () const
 {
@@ -1073,7 +1073,7 @@ DoFHandler<dim,spacedim>::memory_consumption () const
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void DoFHandler<dim,spacedim>::distribute_dofs (const FiniteElement<dim,spacedim> &ff)
 {
   selected_fe = &ff;
@@ -1109,7 +1109,7 @@ void DoFHandler<dim,spacedim>::distribute_dofs (const FiniteElement<dim,spacedim
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void DoFHandler<dim, spacedim>::distribute_mg_dofs (const FiniteElement<dim, spacedim> &fe)
 {
   (void)fe;
@@ -1138,7 +1138,7 @@ void DoFHandler<dim, spacedim>::distribute_mg_dofs (const FiniteElement<dim, spa
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void DoFHandler<dim, spacedim>::reserve_space ()
 {
   //TODO: move this to distribute_mg_dofs and remove function
@@ -1146,7 +1146,7 @@ void DoFHandler<dim, spacedim>::reserve_space ()
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void DoFHandler<dim, spacedim>::clear_mg_space ()
 {
   mg_levels.clear ();
@@ -1160,7 +1160,7 @@ void DoFHandler<dim, spacedim>::clear_mg_space ()
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void DoFHandler<dim,spacedim>::initialize_local_block_info ()
 {
   block_info_object.initialize_local(*this);
@@ -1168,7 +1168,7 @@ void DoFHandler<dim,spacedim>::initialize_local_block_info ()
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void DoFHandler<dim,spacedim>::clear ()
 {
   // release lock to old fe
@@ -1228,7 +1228,7 @@ DoFHandler<dim,spacedim>::renumber_dofs (const unsigned int,
 }
 
 
-template<>
+template <>
 void DoFHandler<1>::renumber_dofs (const unsigned int level,
                                    const std::vector<types::global_dof_index> &new_numbers)
 {
@@ -1264,7 +1264,7 @@ void DoFHandler<1>::renumber_dofs (const unsigned int level,
 
 
 
-template<>
+template <>
 void DoFHandler<2>::renumber_dofs (const unsigned int  level,
                                    const std::vector<types::global_dof_index>  &new_numbers)
 {
@@ -1324,7 +1324,7 @@ void DoFHandler<2>::renumber_dofs (const unsigned int  level,
 
 
 
-template<>
+template <>
 void DoFHandler<3>::renumber_dofs (const unsigned int  level,
                                    const std::vector<types::global_dof_index>  &new_numbers)
 {
@@ -1466,7 +1466,7 @@ DoFHandler<dim,spacedim>::max_couplings_between_boundary_dofs () const
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void DoFHandler<dim,spacedim>::clear_space ()
 {
   levels.clear ();
@@ -1480,8 +1480,8 @@ void DoFHandler<dim,spacedim>::clear_space ()
 
 
 
-template<int dim, int spacedim>
-template<int structdim>
+template <int dim, int spacedim>
+template <int structdim>
 types::global_dof_index
 DoFHandler<dim, spacedim>::get_dof_index (const unsigned int obj_level,
                                           const unsigned int obj_index,
@@ -1496,8 +1496,8 @@ DoFHandler<dim, spacedim>::get_dof_index (const unsigned int obj_level,
 
 
 
-template<int dim, int spacedim>
-template<int structdim>
+template <int dim, int spacedim>
+template <int structdim>
 void DoFHandler<dim, spacedim>::set_dof_index (const unsigned int obj_level,
                                                const unsigned int obj_index,
                                                const unsigned int fe_index,
@@ -1516,7 +1516,7 @@ void DoFHandler<dim, spacedim>::set_dof_index (const unsigned int obj_level,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 DoFHandler<dim, spacedim>::MGVertexDoFs::MGVertexDoFs ()
   :
   coarsest_level (numbers::invalid_unsigned_int),
@@ -1527,7 +1527,7 @@ DoFHandler<dim, spacedim>::MGVertexDoFs::MGVertexDoFs ()
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 DoFHandler<dim, spacedim>::MGVertexDoFs::~MGVertexDoFs ()
 {
   delete[] indices;
@@ -1536,7 +1536,7 @@ DoFHandler<dim, spacedim>::MGVertexDoFs::~MGVertexDoFs ()
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void DoFHandler<dim, spacedim>::MGVertexDoFs::init (const unsigned int cl,
                                                     const unsigned int fl,
                                                     const unsigned int dofs_per_vertex)
@@ -1572,7 +1572,7 @@ void DoFHandler<dim, spacedim>::MGVertexDoFs::init (const unsigned int cl,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 unsigned int DoFHandler<dim, spacedim>::MGVertexDoFs::get_coarsest_level () const
 {
   return coarsest_level;
@@ -1580,7 +1580,7 @@ unsigned int DoFHandler<dim, spacedim>::MGVertexDoFs::get_coarsest_level () cons
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 unsigned int DoFHandler<dim, spacedim>::MGVertexDoFs::get_finest_level () const
 {
   return finest_level;
diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc
index 6c03ad4e01..6b9633a109 100644
--- a/source/dofs/dof_tools.cc
+++ b/source/dofs/dof_tools.cc
@@ -484,7 +484,7 @@ namespace DoFTools
 
 
 
-  template<typename DoFHandlerType>
+  template <typename DoFHandlerType>
   void
   extract_level_dofs (const unsigned int    level,
                       const DoFHandlerType &dof,
@@ -536,7 +536,7 @@ namespace DoFTools
 
 
 
-  template<typename DoFHandlerType>
+  template <typename DoFHandlerType>
   void
   extract_level_dofs (const unsigned int    level,
                       const DoFHandlerType &dof,
@@ -2081,7 +2081,7 @@ namespace DoFTools
   }
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   map_dofs_to_support_points(const hp::MappingCollection<dim, spacedim> &mapping,
                              const hp::DoFHandler<dim, spacedim>        &dof_handler,
@@ -2121,7 +2121,7 @@ namespace DoFTools
   }
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   map_dofs_to_support_points(const hp::MappingCollection<dim, spacedim> &mapping,
                              const hp::DoFHandler<dim, spacedim>        &dof_handler,
@@ -2181,7 +2181,7 @@ namespace DoFTools
   }
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   convert_couplings_to_blocks
   (const DoFHandler<dim,spacedim>  &dof_handler,
@@ -2207,7 +2207,7 @@ namespace DoFTools
   }
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   convert_couplings_to_blocks (const hp::DoFHandler<dim,spacedim> &dof_handler,
                                const Table<2, Coupling>           &table,
diff --git a/source/dofs/dof_tools_constraints.cc b/source/dofs/dof_tools_constraints.cc
index 2c8347ea57..1deb21d6ed 100644
--- a/source/dofs/dof_tools_constraints.cc
+++ b/source/dofs/dof_tools_constraints.cc
@@ -2066,7 +2066,7 @@ namespace DoFTools
     // Build up a (possibly rotated) interpolation matrix that is used in
     // set_periodicity_constraints with the help of user supplied matrix
     // and first_vector_components.
-    template<int dim, int spacedim>
+    template <int dim, int spacedim>
     FullMatrix<double> compute_transformation(
       const FiniteElement<dim, spacedim> &fe,
       const FullMatrix<double>           &matrix,
@@ -2382,7 +2382,7 @@ namespace DoFTools
 
 
 
-  template<typename DoFHandlerType>
+  template <typename DoFHandlerType>
   void
   make_periodicity_constraints
   (const std::vector<GridTools::PeriodicFacePair<typename DoFHandlerType::cell_iterator> >
@@ -2428,7 +2428,7 @@ namespace DoFTools
   // High level interface variants:
 
 
-  template<typename DoFHandlerType>
+  template <typename DoFHandlerType>
   void
   make_periodicity_constraints (const DoFHandlerType     &dof_handler,
                                 const types::boundary_id  b_id1,
@@ -2459,7 +2459,7 @@ namespace DoFTools
 
 
 
-  template<typename DoFHandlerType>
+  template <typename DoFHandlerType>
   void
   make_periodicity_constraints (const DoFHandlerType            &dof_handler,
                                 const types::boundary_id         b_id,
diff --git a/source/fe/fe_data.cc b/source/fe/fe_data.cc
index 7eae662dda..2127f9a59a 100644
--- a/source/fe/fe_data.cc
+++ b/source/fe/fe_data.cc
@@ -68,7 +68,7 @@ FiniteElementData (const std::vector<unsigned int> &dofs_per_object,
 
 
 
-template<int dim>
+template <int dim>
 bool FiniteElementData<dim>::operator== (const FiniteElementData<dim> &f) const
 {
   return ((dofs_per_vertex == f.dofs_per_vertex) &&
diff --git a/source/fe/fe_dgp_monomial.cc b/source/fe/fe_dgp_monomial.cc
index 0eeaaeb437..27316601e1 100644
--- a/source/fe/fe_dgp_monomial.cc
+++ b/source/fe/fe_dgp_monomial.cc
@@ -66,7 +66,7 @@ namespace
   };
 
 
-  template<int dim>
+  template <int dim>
   void generate_unit_points (const unsigned int,
                              std::vector<Point<dim> > &);
 
diff --git a/source/fe/fe_tools.cc b/source/fe/fe_tools.cc
index 7a10f5db89..d5a640f305 100644
--- a/source/fe/fe_tools.cc
+++ b/source/fe/fe_tools.cc
@@ -1321,7 +1321,7 @@ namespace FETools
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void compute_component_wise(
     const FiniteElement<dim,spacedim> &element,
     std::vector<unsigned int> &renumbering,
@@ -1363,7 +1363,7 @@ namespace FETools
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void compute_block_renumbering (
     const FiniteElement<dim,spacedim> &element,
     std::vector<types::global_dof_index> &renumbering,
@@ -1611,7 +1611,7 @@ namespace FETools
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   FullMatrix<double>
   compute_node_matrix(const FiniteElement<dim,spacedim> &fe)
   {
@@ -1666,7 +1666,7 @@ namespace FETools
 
 
   /*
-    template<>
+    template <>
     void
     compute_embedding_matrices(const FiniteElement<1,2> &,
                                std::vector<std::vector<FullMatrix<double> > > &,
@@ -1676,7 +1676,7 @@ namespace FETools
     }
 
 
-    template<>
+    template <>
     void
     compute_embedding_matrices(const FiniteElement<1,3> &,
                                std::vector<std::vector<FullMatrix<double> > > &,
@@ -1687,7 +1687,7 @@ namespace FETools
 
 
 
-    template<>
+    template <>
     void
     compute_embedding_matrices(const FiniteElement<2,3>&,
                                std::vector<std::vector<FullMatrix<double> > >&,
@@ -1700,7 +1700,7 @@ namespace FETools
 
   namespace
   {
-    template<int dim, typename number, int spacedim>
+    template <int dim, typename number, int spacedim>
     void
     compute_embedding_for_shape_function (
       const unsigned int i,
@@ -1758,7 +1758,7 @@ namespace FETools
 
 
 
-    template<int dim, typename number, int spacedim>
+    template <int dim, typename number, int spacedim>
     void
     compute_embedding_matrices_for_refinement_case (
       const FiniteElement<dim, spacedim> &fe,
diff --git a/source/fe/mapping.cc b/source/fe/mapping.cc
index ff16ef76b0..425e986487 100644
--- a/source/fe/mapping.cc
+++ b/source/fe/mapping.cc
@@ -39,7 +39,7 @@ Mapping<dim, spacedim>::get_vertices (
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Point<dim-1>
 Mapping<dim,spacedim>::
 project_real_point_to_unit_point_on_face (
diff --git a/source/fe/mapping_c1.cc b/source/fe/mapping_c1.cc
index d16141702d..216d11aeb2 100644
--- a/source/fe/mapping_c1.cc
+++ b/source/fe/mapping_c1.cc
@@ -160,7 +160,7 @@ MappingC1<2>::MappingC1Generic::add_line_support_points (const Triangulation<2>:
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingC1<dim,spacedim>::MappingC1Generic::add_line_support_points (const typename Triangulation<dim>::cell_iterator &,
     std::vector<Point<dim> > &) const
@@ -194,7 +194,7 @@ MappingC1<2>::MappingC1Generic::add_quad_support_points (const Triangulation<2>:
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingC1<dim,spacedim>::MappingC1Generic::add_quad_support_points (const typename Triangulation<dim>::cell_iterator &,
     std::vector<Point<dim> > &) const
@@ -204,7 +204,7 @@ MappingC1<dim,spacedim>::MappingC1Generic::add_quad_support_points (const typena
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Mapping<dim, spacedim> *
 MappingC1<dim,spacedim>::clone () const
 {
diff --git a/source/fe/mapping_cartesian.cc b/source/fe/mapping_cartesian.cc
index 09f7ade5c3..a8b4236af7 100644
--- a/source/fe/mapping_cartesian.cc
+++ b/source/fe/mapping_cartesian.cc
@@ -33,12 +33,12 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 const unsigned int MappingCartesian<dim,spacedim>::invalid_face_number;
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingCartesian<dim, spacedim>::InternalData::InternalData (const Quadrature<dim> &q)
   :
   cell_extents (numbers::signaling_nan<Tensor<1,dim> >()),
@@ -48,7 +48,7 @@ MappingCartesian<dim, spacedim>::InternalData::InternalData (const Quadrature<di
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 std::size_t
 MappingCartesian<dim, spacedim>::InternalData::memory_consumption () const
 {
@@ -69,7 +69,7 @@ MappingCartesian<dim,spacedim>::preserves_vertex_locations () const
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 UpdateFlags
 MappingCartesian<dim, spacedim>::requires_update_flags (const UpdateFlags in) const
 {
@@ -87,7 +87,7 @@ MappingCartesian<dim, spacedim>::requires_update_flags (const UpdateFlags in) co
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename Mapping<dim, spacedim>::InternalDataBase *
 MappingCartesian<dim, spacedim>::get_data (const UpdateFlags      update_flags,
                                            const Quadrature<dim> &q) const
@@ -104,7 +104,7 @@ MappingCartesian<dim, spacedim>::get_data (const UpdateFlags      update_flags,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename Mapping<dim, spacedim>::InternalDataBase *
 MappingCartesian<dim, spacedim>::get_face_data (const UpdateFlags update_flags,
                                                 const Quadrature<dim-1>& quadrature) const
@@ -126,7 +126,7 @@ MappingCartesian<dim, spacedim>::get_face_data (const UpdateFlags update_flags,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename Mapping<dim, spacedim>::InternalDataBase *
 MappingCartesian<dim, spacedim>::get_subface_data (const UpdateFlags update_flags,
                                                    const Quadrature<dim-1> &quadrature) const
@@ -149,7 +149,7 @@ MappingCartesian<dim, spacedim>::get_subface_data (const UpdateFlags update_flag
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingCartesian<dim, spacedim>::compute_fill (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                                                const unsigned int        face_no,
@@ -333,7 +333,7 @@ MappingCartesian<dim, spacedim>::compute_fill (const typename Triangulation<dim,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 CellSimilarity::Similarity
 MappingCartesian<dim, spacedim>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -427,7 +427,7 @@ fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingCartesian<dim, spacedim>::
 fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -516,7 +516,7 @@ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingCartesian<dim, spacedim>::
 fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -613,7 +613,7 @@ fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterato
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingCartesian<dim,spacedim>::
 transform (const ArrayView<const Tensor<1,dim> >                  &input,
@@ -668,7 +668,7 @@ transform (const ArrayView<const Tensor<1,dim> >                  &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingCartesian<dim,spacedim>::
 transform (const ArrayView<const DerivativeForm<1, dim,spacedim> > &input,
@@ -769,7 +769,7 @@ transform (const ArrayView<const DerivativeForm<1, dim,spacedim> > &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingCartesian<dim,spacedim>::
 transform (const ArrayView<const Tensor<2, dim> >                 &input,
@@ -870,7 +870,7 @@ transform (const ArrayView<const Tensor<2, dim> >                 &input,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingCartesian<dim,spacedim>::
 transform (const ArrayView<const  DerivativeForm<2, dim, spacedim> > &input,
@@ -908,7 +908,7 @@ transform (const ArrayView<const  DerivativeForm<2, dim, spacedim> > &input,
 
 }
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingCartesian<dim,spacedim>::
 transform (const ArrayView<const  Tensor<3,dim> >                 &input,
@@ -1028,7 +1028,7 @@ MappingCartesian<dim, spacedim>::transform_unit_to_real_cell (
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Point<dim>
 MappingCartesian<dim, spacedim>::transform_real_to_unit_cell (
   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -1062,7 +1062,7 @@ MappingCartesian<dim, spacedim>::transform_real_to_unit_cell (
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Mapping<dim, spacedim> *
 MappingCartesian<dim, spacedim>::clone () const
 {
diff --git a/source/fe/mapping_fe_field.cc b/source/fe/mapping_fe_field.cc
index 57af759726..a91a96b861 100644
--- a/source/fe/mapping_fe_field.cc
+++ b/source/fe/mapping_fe_field.cc
@@ -54,7 +54,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::InternalData::InternalData
 (const FiniteElement<dim,spacedim> &fe,
  const ComponentMask                mask)
@@ -67,7 +67,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::InternalData::InternalDa
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 std::size_t
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::InternalData::memory_consumption () const
 {
@@ -77,7 +77,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::InternalData::memory_con
 
 
 
-template<int dim, int spacedim, typename DoFHandlerType, typename VectorType>
+template <int dim, int spacedim, typename DoFHandlerType, typename VectorType>
 double &
 MappingFEField<dim,spacedim,DoFHandlerType,VectorType>::InternalData::shape
 (const unsigned int qpoint,
@@ -90,7 +90,7 @@ MappingFEField<dim,spacedim,DoFHandlerType,VectorType>::InternalData::shape
 }
 
 
-template<int dim, int spacedim, typename DoFHandlerType, typename VectorType>
+template <int dim, int spacedim, typename DoFHandlerType, typename VectorType>
 const Tensor<1,dim> &
 MappingFEField<dim,spacedim,DoFHandlerType,VectorType>::InternalData::derivative
 (const unsigned int qpoint,
@@ -104,7 +104,7 @@ MappingFEField<dim,spacedim,DoFHandlerType,VectorType>::InternalData::derivative
 
 
 
-template<int dim, int spacedim, typename DoFHandlerType, typename VectorType>
+template <int dim, int spacedim, typename DoFHandlerType, typename VectorType>
 Tensor<1,dim> &
 MappingFEField<dim,spacedim,DoFHandlerType,VectorType>::InternalData::derivative
 (const unsigned int qpoint,
@@ -199,7 +199,7 @@ MappingFEField<dim,spacedim,DoFHandlerType,VectorType>::InternalData::fourth_der
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::MappingFEField
 (const DoFHandlerType            &euler_dof_handler,
  const VectorType    &euler_vector,
@@ -222,7 +222,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::MappingFEField
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::MappingFEField
 (const MappingFEField<dim,spacedim,VectorType,DoFHandlerType> &mapping)
   :
@@ -235,7 +235,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::MappingFEField
 
 
 
-template<int dim, int spacedim, typename DoFHandlerType, typename VectorType>
+template <int dim, int spacedim, typename DoFHandlerType, typename VectorType>
 inline
 const double &
 MappingFEField<dim,spacedim,DoFHandlerType,VectorType>::InternalData::shape
@@ -259,7 +259,7 @@ MappingFEField<dim,spacedim,DoFHandlerType,VectorType>::preserves_vertex_locatio
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 compute_shapes_virtual (const std::vector<Point<dim> >                    &unit_points,
@@ -292,7 +292,7 @@ compute_shapes_virtual (const std::vector<Point<dim> >                    &unit_
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 UpdateFlags
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::requires_update_flags (const UpdateFlags in) const
 {
@@ -351,7 +351,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::requires_update_flags (c
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::compute_data
 (const UpdateFlags      update_flags,
@@ -403,7 +403,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::compute_data
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::compute_face_data
 (const UpdateFlags      update_flags,
@@ -473,7 +473,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::compute_face_data
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 typename
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::InternalData *
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::get_data (const UpdateFlags      update_flags,
@@ -487,7 +487,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::get_data (const UpdateFl
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 typename Mapping<dim,spacedim>::InternalDataBase *
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::get_face_data
 (const UpdateFlags        update_flags,
@@ -502,7 +502,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::get_face_data
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 typename Mapping<dim,spacedim>::InternalDataBase *
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::get_subface_data
 (const UpdateFlags        update_flags,
@@ -1215,7 +1215,7 @@ namespace internal
    * 'data_set' to differentiate whether we will work on a face (and if so,
    * which one) or subface.
    */
-  template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+  template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
   void
   do_fill_fe_face_values (const dealii::Mapping<dim,spacedim>                               &mapping,
                           const typename dealii::Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -1294,7 +1294,7 @@ namespace internal
 
 // Note that the CellSimilarity flag is modifiable, since MappingFEField can need to
 // recalculate data even when cells are similar.
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 CellSimilarity::Similarity
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -1474,7 +1474,7 @@ fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -1507,7 +1507,7 @@ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -1544,7 +1544,7 @@ fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterato
 
 namespace
 {
-  template<int dim, int spacedim, int rank, typename VectorType, typename DoFHandlerType>
+  template <int dim, int spacedim, int rank, typename VectorType, typename DoFHandlerType>
   void
   transform_fields(const ArrayView<const Tensor<rank,dim> >                &input,
                    const MappingType                                        mapping_type,
@@ -1606,7 +1606,7 @@ namespace
   }
 
 
-  template<int dim, int spacedim, int rank, typename VectorType, typename DoFHandlerType>
+  template <int dim, int spacedim, int rank, typename VectorType, typename DoFHandlerType>
   void
   transform_differential_forms
   (const ArrayView<const DerivativeForm<rank, dim,spacedim> >  &input,
@@ -1642,7 +1642,7 @@ namespace
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 transform (const ArrayView<const Tensor<1,dim> >                  &input,
@@ -1657,7 +1657,7 @@ transform (const ArrayView<const Tensor<1,dim> >                  &input,
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 transform (const ArrayView<const DerivativeForm<1, dim, spacedim> > &input,
@@ -1672,7 +1672,7 @@ transform (const ArrayView<const DerivativeForm<1, dim, spacedim> > &input,
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 transform (const ArrayView<const Tensor<2, dim> >                 &input,
@@ -1690,7 +1690,7 @@ transform (const ArrayView<const Tensor<2, dim> >                 &input,
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 transform (const ArrayView<const DerivativeForm<2, dim, spacedim> >  &input,
@@ -1739,7 +1739,7 @@ transform (const ArrayView<const DerivativeForm<2, dim, spacedim> >  &input,
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 transform (const ArrayView<const Tensor<3,dim> >                  &input,
@@ -1759,7 +1759,7 @@ transform (const ArrayView<const Tensor<3,dim> >                  &input,
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 Point<spacedim>
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 transform_unit_to_real_cell (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -1778,7 +1778,7 @@ transform_unit_to_real_cell (const typename Triangulation<dim,spacedim>::cell_it
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 Point<spacedim>
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 do_transform_unit_to_real_cell (const InternalData &data) const
@@ -1797,7 +1797,7 @@ do_transform_unit_to_real_cell (const InternalData &data) const
 
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 Point<dim>
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 transform_real_to_unit_cell (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -1840,7 +1840,7 @@ transform_real_to_unit_cell (const typename Triangulation<dim,spacedim>::cell_it
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 Point<dim>
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 do_transform_real_to_unit_cell
@@ -1948,7 +1948,7 @@ failure:
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 unsigned int
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::get_degree() const
 {
@@ -1956,7 +1956,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::get_degree() const
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 ComponentMask
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::get_component_mask() const
 {
@@ -1964,7 +1964,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::get_component_mask() con
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 Mapping<dim,spacedim> *
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::clone () const
 {
@@ -1972,7 +1972,7 @@ MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::clone () const
 }
 
 
-template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
+template <int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::update_internal_dofs
 (const typename Triangulation<dim,spacedim>::cell_iterator  &cell,
diff --git a/source/fe/mapping_manifold.cc b/source/fe/mapping_manifold.cc
index 39d0b99c49..2c8297ca8c 100644
--- a/source/fe/mapping_manifold.cc
+++ b/source/fe/mapping_manifold.cc
@@ -41,12 +41,12 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingManifold<dim,spacedim>::InternalData::InternalData ()
 {}
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 std::size_t
 MappingManifold<dim,spacedim>::InternalData::memory_consumption () const
 {
@@ -173,19 +173,19 @@ initialize_face (const UpdateFlags      update_flags,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingManifold<dim,spacedim>::MappingManifold ()
 {}
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingManifold<dim,spacedim>::MappingManifold (const MappingManifold<dim,spacedim> &)
 {}
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Mapping<dim,spacedim> *
 MappingManifold<dim,spacedim>::clone () const
 {
@@ -194,7 +194,7 @@ MappingManifold<dim,spacedim>::clone () const
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Point<dim>
 MappingManifold<dim,spacedim>::
 transform_real_to_unit_cell (const typename Triangulation<dim,spacedim>::cell_iterator &,
@@ -206,7 +206,7 @@ transform_real_to_unit_cell (const typename Triangulation<dim,spacedim>::cell_it
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Point<spacedim>
 MappingManifold<dim,spacedim>::
 transform_unit_to_real_cell (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -237,7 +237,7 @@ class MappingManifold<3,4>
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 UpdateFlags
 MappingManifold<dim,spacedim>::requires_update_flags (const UpdateFlags in) const
 {
@@ -304,7 +304,7 @@ MappingManifold<dim,spacedim>::requires_update_flags (const UpdateFlags in) cons
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename MappingManifold<dim,spacedim>::InternalData *
 MappingManifold<dim,spacedim>::get_data (const UpdateFlags update_flags,
                                          const Quadrature<dim> &q) const
@@ -317,7 +317,7 @@ MappingManifold<dim,spacedim>::get_data (const UpdateFlags update_flags,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename MappingManifold<dim,spacedim>::InternalData *
 MappingManifold<dim,spacedim>::get_face_data (const UpdateFlags        update_flags,
                                               const Quadrature<dim-1> &quadrature) const
@@ -332,7 +332,7 @@ MappingManifold<dim,spacedim>::get_face_data (const UpdateFlags        update_fl
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename MappingManifold<dim,spacedim>::InternalData *
 MappingManifold<dim,spacedim>::get_subface_data (const UpdateFlags update_flags,
                                                  const Quadrature<dim-1>& quadrature) const
@@ -356,7 +356,7 @@ namespace internal
      * are no Manifolds associated to faces. The mapping argument is
      * only used to help the compiler infer dim and spacedim.
      */
-    template<int spacedim>
+    template <int spacedim>
     const dealii::Manifold<1, spacedim> &
     get_face_manifold(const MappingManifold<1,spacedim> &,
                       const typename dealii::Triangulation<1,spacedim>::cell_iterator &cell,
@@ -371,7 +371,7 @@ namespace internal
      * Some specialization for face Manifolds. The mapping argument is
      * only used to help the compiler infer dim and spacedim.
      */
-    template<int dim, int spacedim>
+    template <int dim, int spacedim>
     const dealii::Manifold<dim,spacedim> &
     get_face_manifold(const MappingManifold<dim,spacedim> &,
                       const typename dealii::Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -501,7 +501,7 @@ namespace internal
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 CellSimilarity::Similarity
 MappingManifold<dim,spacedim>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -809,7 +809,7 @@ namespace internal
      * using the 'data_set' to differentiate whether we will
      * work on a face (and if so, which one) or subface.
      */
-    template<int dim, int spacedim>
+    template <int dim, int spacedim>
     void
     do_fill_fe_face_values (const dealii::MappingManifold<dim,spacedim>                       &mapping,
                             const typename dealii::Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -840,7 +840,7 @@ namespace internal
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingManifold<dim,spacedim>::
 fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -869,7 +869,7 @@ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingManifold<dim,spacedim>::
 fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -1188,7 +1188,7 @@ namespace
 
 
 
-  template<int dim, int spacedim, int rank>
+  template <int dim, int spacedim, int rank>
   void
   transform_differential_forms(const ArrayView<const DerivativeForm<rank, dim,spacedim> >   &input,
                                const MappingType                                             mapping_type,
@@ -1221,7 +1221,7 @@ namespace
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingManifold<dim,spacedim>::
 transform (const ArrayView<const Tensor<1, dim> >                  &input,
@@ -1234,7 +1234,7 @@ transform (const ArrayView<const Tensor<1, dim> >                  &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingManifold<dim,spacedim>::
 transform (const ArrayView<const DerivativeForm<1, dim,spacedim> >  &input,
@@ -1247,7 +1247,7 @@ transform (const ArrayView<const DerivativeForm<1, dim,spacedim> >  &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingManifold<dim,spacedim>::
 transform (const ArrayView<const Tensor<2, dim> >                  &input,
@@ -1273,7 +1273,7 @@ transform (const ArrayView<const Tensor<2, dim> >                  &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingManifold<dim,spacedim>::
 transform (const ArrayView<const  DerivativeForm<2, dim, spacedim> > &input,
@@ -1322,7 +1322,7 @@ transform (const ArrayView<const  DerivativeForm<2, dim, spacedim> > &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingManifold<dim,spacedim>::
 transform (const ArrayView<const  Tensor<3,dim> >                  &input,
diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc
index dadfad5fe8..340f7ba76c 100644
--- a/source/fe/mapping_q.cc
+++ b/source/fe/mapping_q.cc
@@ -32,7 +32,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingQ<dim,spacedim>::InternalData::InternalData ()
   :
   use_mapping_q1_on_current_cell(false)
@@ -40,7 +40,7 @@ MappingQ<dim,spacedim>::InternalData::InternalData ()
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 std::size_t
 MappingQ<dim,spacedim>::InternalData::memory_consumption () const
 {
@@ -52,7 +52,7 @@ MappingQ<dim,spacedim>::InternalData::memory_consumption () const
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingQ<dim,spacedim>::MappingQ (const unsigned int degree,
                                   const bool use_mapping_q_on_all_cells)
   :
@@ -83,7 +83,7 @@ MappingQ<dim,spacedim>::MappingQ (const unsigned int degree,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingQ<dim,spacedim>::MappingQ (const MappingQ<dim,spacedim> &mapping)
   :
   polynomial_degree (mapping.polynomial_degree),
@@ -102,7 +102,7 @@ MappingQ<dim,spacedim>::MappingQ (const MappingQ<dim,spacedim> &mapping)
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 unsigned int
 MappingQ<dim,spacedim>::get_degree() const
 {
@@ -121,7 +121,7 @@ MappingQ<dim,spacedim>::preserves_vertex_locations () const
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 UpdateFlags
 MappingQ<dim,spacedim>::requires_update_flags (const UpdateFlags in) const
 {
@@ -132,7 +132,7 @@ MappingQ<dim,spacedim>::requires_update_flags (const UpdateFlags in) const
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename MappingQ<dim,spacedim>::InternalData *
 MappingQ<dim,spacedim>::get_data (const UpdateFlags update_flags,
                                   const Quadrature<dim> &quadrature) const
@@ -156,7 +156,7 @@ MappingQ<dim,spacedim>::get_data (const UpdateFlags update_flags,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename MappingQ<dim,spacedim>::InternalData *
 MappingQ<dim,spacedim>::get_face_data (const UpdateFlags update_flags,
                                        const Quadrature<dim-1>& quadrature) const
@@ -180,7 +180,7 @@ MappingQ<dim,spacedim>::get_face_data (const UpdateFlags update_flags,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename MappingQ<dim,spacedim>::InternalData *
 MappingQ<dim,spacedim>::get_subface_data (const UpdateFlags update_flags,
                                           const Quadrature<dim-1>& quadrature) const
@@ -205,7 +205,7 @@ MappingQ<dim,spacedim>::get_subface_data (const UpdateFlags update_flags,
 
 // Note that the CellSimilarity flag is modifiable, since MappingQ can need to
 // recalculate data even when cells are similar.
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 CellSimilarity::Similarity
 MappingQ<dim,spacedim>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -260,7 +260,7 @@ fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQ<dim,spacedim>::
 fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -301,7 +301,7 @@ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQ<dim,spacedim>::
 fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -346,7 +346,7 @@ fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterato
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQ<dim,spacedim>::
 transform (const ArrayView<const Tensor<1,dim> >                  &input,
@@ -370,7 +370,7 @@ transform (const ArrayView<const Tensor<1,dim> >                  &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQ<dim,spacedim>::
 transform (const ArrayView<const DerivativeForm<1, dim, spacedim> >  &input,
@@ -394,7 +394,7 @@ transform (const ArrayView<const DerivativeForm<1, dim, spacedim> >  &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQ<dim,spacedim>::
 transform (const ArrayView<const Tensor<2, dim> >                 &input,
@@ -418,7 +418,7 @@ transform (const ArrayView<const Tensor<2, dim> >                 &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQ<dim,spacedim>::
 transform (const ArrayView<const DerivativeForm<2, dim,spacedim> >  &input,
@@ -442,7 +442,7 @@ transform (const ArrayView<const DerivativeForm<2, dim,spacedim> >  &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void MappingQ<dim,spacedim>::
 transform (const ArrayView<const Tensor<3, dim> >                 &input,
            const MappingType                                       mapping_type,
@@ -465,7 +465,7 @@ transform (const ArrayView<const Tensor<3, dim> >                 &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Point<spacedim>
 MappingQ<dim,spacedim>::
 transform_unit_to_real_cell (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -482,7 +482,7 @@ transform_unit_to_real_cell (const typename Triangulation<dim,spacedim>::cell_it
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Point<dim>
 MappingQ<dim,spacedim>::
 transform_real_to_unit_cell (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -500,7 +500,7 @@ transform_real_to_unit_cell (const typename Triangulation<dim,spacedim>::cell_it
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Mapping<dim,spacedim> *
 MappingQ<dim,spacedim>::clone () const
 {
diff --git a/source/fe/mapping_q1.cc b/source/fe/mapping_q1.cc
index b8cd975c96..8484d8bfa4 100644
--- a/source/fe/mapping_q1.cc
+++ b/source/fe/mapping_q1.cc
@@ -40,7 +40,7 @@ DEAL_II_NAMESPACE_OPEN
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingQ1<dim,spacedim>::MappingQ1 ()
   :
   MappingQGeneric<dim,spacedim> (1)
@@ -48,7 +48,7 @@ MappingQ1<dim,spacedim>::MappingQ1 ()
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingQ1<dim,spacedim> *
 MappingQ1<dim,spacedim>::clone () const
 {
@@ -58,7 +58,7 @@ MappingQ1<dim,spacedim>::clone () const
 //---------------------------------------------------------------------------
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingQGeneric<dim,spacedim>
 StaticMappingQ1<dim,spacedim>::mapping = MappingQGeneric<dim,spacedim>(1);
 
diff --git a/source/fe/mapping_q1_eulerian.cc b/source/fe/mapping_q1_eulerian.cc
index 9360e8ae50..b8c9f1c0a3 100644
--- a/source/fe/mapping_q1_eulerian.cc
+++ b/source/fe/mapping_q1_eulerian.cc
@@ -96,7 +96,7 @@ get_vertices
 
 
 
-template<int dim, class VectorType, int spacedim>
+template <int dim, class VectorType, int spacedim>
 std::vector<Point<spacedim> >
 MappingQ1Eulerian<dim,VectorType,spacedim>::
 compute_mapping_support_points(const typename Triangulation<dim,spacedim>::cell_iterator &cell) const
@@ -124,7 +124,7 @@ MappingQ1Eulerian<dim, VectorType, spacedim>::clone () const
 
 
 
-template<int dim, class VectorType, int spacedim>
+template <int dim, class VectorType, int spacedim>
 CellSimilarity::Similarity
 MappingQ1Eulerian<dim,VectorType,spacedim>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
diff --git a/source/fe/mapping_q_eulerian.cc b/source/fe/mapping_q_eulerian.cc
index 39250e5d7a..defebfd2f2 100644
--- a/source/fe/mapping_q_eulerian.cc
+++ b/source/fe/mapping_q_eulerian.cc
@@ -227,7 +227,7 @@ compute_mapping_support_points (const typename Triangulation<dim,spacedim>::cell
 
 
 
-template<int dim, class VectorType, int spacedim>
+template <int dim, class VectorType, int spacedim>
 CellSimilarity::Similarity
 MappingQEulerian<dim,VectorType,spacedim>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
diff --git a/source/fe/mapping_q_generic.cc b/source/fe/mapping_q_generic.cc
index aea160c369..97f3d31512 100644
--- a/source/fe/mapping_q_generic.cc
+++ b/source/fe/mapping_q_generic.cc
@@ -67,7 +67,7 @@ namespace internal
       // expanded before the compiler eliminates code due to the 'if (dim ==
       // spacedim)' statement (see the body of the general
       // transform_real_to_unit_cell).
-      template<int spacedim>
+      template <int spacedim>
       Point<1>
       transform_real_to_unit_cell
       (const std::array<Point<spacedim>, GeometryInfo<1>::vertices_per_cell> &vertices,
@@ -79,7 +79,7 @@ namespace internal
 
 
 
-      template<int spacedim>
+      template <int spacedim>
       Point<2>
       transform_real_to_unit_cell
       (const std::array<Point<spacedim>, GeometryInfo<2>::vertices_per_cell> &vertices,
@@ -175,7 +175,7 @@ namespace internal
 
 
 
-      template<int spacedim>
+      template <int spacedim>
       Point<3>
       transform_real_to_unit_cell
       (const std::array<Point<spacedim>, GeometryInfo<3>::vertices_per_cell> &/*vertices*/,
@@ -590,7 +590,7 @@ namespace internal
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingQGeneric<dim,spacedim>::InternalData::InternalData (const unsigned int polynomial_degree)
   :
   polynomial_degree (polynomial_degree),
@@ -600,7 +600,7 @@ MappingQGeneric<dim,spacedim>::InternalData::InternalData (const unsigned int po
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 std::size_t
 MappingQGeneric<dim,spacedim>::InternalData::memory_consumption () const
 {
@@ -764,7 +764,7 @@ initialize_face (const UpdateFlags      update_flags,
 
 
 
-template<>
+template <>
 void
 MappingQGeneric<1,1>::InternalData::
 compute_shape_function_values (const std::vector<Point<1> > &unit_points)
@@ -782,7 +782,7 @@ compute_shape_function_values (const std::vector<Point<1> > &unit_points)
     }
 }
 
-template<>
+template <>
 void
 MappingQGeneric<2,2>::InternalData::
 compute_shape_function_values (const std::vector<Point<2> > &unit_points)
@@ -800,7 +800,7 @@ compute_shape_function_values (const std::vector<Point<2> > &unit_points)
     }
 }
 
-template<>
+template <>
 void
 MappingQGeneric<3,3>::InternalData::
 compute_shape_function_values (const std::vector<Point<3> > &unit_points)
@@ -818,7 +818,7 @@ compute_shape_function_values (const std::vector<Point<3> > &unit_points)
     }
 }
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQGeneric<dim,spacedim>::InternalData::
 compute_shape_function_values (const std::vector<Point<dim> > &unit_points)
@@ -841,7 +841,7 @@ namespace
    * For the definition of the <tt>support_point_weights_on_quad(hex)</tt> please
    * refer to equation (8) of the `mapping' report.
    */
-  template<int dim>
+  template <int dim>
   Table<2,double>
   compute_laplace_vector(const unsigned int polynomial_degree)
   {
@@ -1092,7 +1092,7 @@ namespace
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingQGeneric<dim,spacedim>::MappingQGeneric (const unsigned int p)
   :
   polynomial_degree(p),
@@ -1107,7 +1107,7 @@ MappingQGeneric<dim,spacedim>::MappingQGeneric (const unsigned int p)
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 MappingQGeneric<dim,spacedim>::MappingQGeneric (const MappingQGeneric<dim,spacedim> &mapping)
   :
   polynomial_degree(mapping.polynomial_degree),
@@ -1120,7 +1120,7 @@ MappingQGeneric<dim,spacedim>::MappingQGeneric (const MappingQGeneric<dim,spaced
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Mapping<dim,spacedim> *
 MappingQGeneric<dim,spacedim>::clone () const
 {
@@ -1130,7 +1130,7 @@ MappingQGeneric<dim,spacedim>::clone () const
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 unsigned int
 MappingQGeneric<dim,spacedim>::get_degree() const
 {
@@ -1139,7 +1139,7 @@ MappingQGeneric<dim,spacedim>::get_degree() const
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Point<spacedim>
 MappingQGeneric<dim,spacedim>::
 transform_unit_to_real_cell (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -1189,7 +1189,7 @@ namespace
    * support points (stored in data.mapping_support_points), compute
    * the mapped location of that point in real space.
    */
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   Point<spacedim>
   compute_mapped_location_of_point (const typename MappingQGeneric<dim,spacedim>::InternalData &data)
   {
@@ -1508,7 +1508,7 @@ namespace
 // use template specialization to make sure we pick up the right function to
 // call:
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Point<dim>
 MappingQGeneric<dim,spacedim>::
 transform_real_to_unit_cell_internal
@@ -1521,7 +1521,7 @@ transform_real_to_unit_cell_internal
   return Point<dim>();
 }
 
-template<>
+template <>
 Point<1>
 MappingQGeneric<1,1>::
 transform_real_to_unit_cell_internal
@@ -1547,7 +1547,7 @@ transform_real_to_unit_cell_internal
   return do_transform_real_to_unit_cell_internal<1>(cell, p, initial_p_unit, *mdata);
 }
 
-template<>
+template <>
 Point<2>
 MappingQGeneric<2, 2>::
 transform_real_to_unit_cell_internal
@@ -1573,7 +1573,7 @@ transform_real_to_unit_cell_internal
   return do_transform_real_to_unit_cell_internal<2>(cell, p, initial_p_unit, *mdata);
 }
 
-template<>
+template <>
 Point<3>
 MappingQGeneric<3, 3>::
 transform_real_to_unit_cell_internal
@@ -1599,7 +1599,7 @@ transform_real_to_unit_cell_internal
   return do_transform_real_to_unit_cell_internal<3>(cell, p, initial_p_unit, *mdata);
 }
 
-template<>
+template <>
 Point<1>
 MappingQGeneric<1, 2>::
 transform_real_to_unit_cell_internal
@@ -1625,7 +1625,7 @@ transform_real_to_unit_cell_internal
   return do_transform_real_to_unit_cell_internal_codim1<1>(cell, p, initial_p_unit, *mdata);
 }
 
-template<>
+template <>
 Point<2>
 MappingQGeneric<2, 3>::
 transform_real_to_unit_cell_internal
@@ -1651,7 +1651,7 @@ transform_real_to_unit_cell_internal
   return do_transform_real_to_unit_cell_internal_codim1<2>(cell, p, initial_p_unit, *mdata);
 }
 
-template<>
+template <>
 Point<1>
 MappingQGeneric<1, 3>::
 transform_real_to_unit_cell_internal
@@ -1665,7 +1665,7 @@ transform_real_to_unit_cell_internal
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Point<dim>
 MappingQGeneric<dim,spacedim>::
 transform_real_to_unit_cell (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -1797,7 +1797,7 @@ transform_real_to_unit_cell (const typename Triangulation<dim,spacedim>::cell_it
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 UpdateFlags
 MappingQGeneric<dim,spacedim>::requires_update_flags (const UpdateFlags in) const
 {
@@ -1857,7 +1857,7 @@ MappingQGeneric<dim,spacedim>::requires_update_flags (const UpdateFlags in) cons
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename MappingQGeneric<dim,spacedim>::InternalData *
 MappingQGeneric<dim,spacedim>::get_data (const UpdateFlags update_flags,
                                          const Quadrature<dim> &q) const
@@ -1870,7 +1870,7 @@ MappingQGeneric<dim,spacedim>::get_data (const UpdateFlags update_flags,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename MappingQGeneric<dim,spacedim>::InternalData *
 MappingQGeneric<dim,spacedim>::get_face_data (const UpdateFlags        update_flags,
                                               const Quadrature<dim-1> &quadrature) const
@@ -1885,7 +1885,7 @@ MappingQGeneric<dim,spacedim>::get_face_data (const UpdateFlags        update_fl
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 typename MappingQGeneric<dim,spacedim>::InternalData *
 MappingQGeneric<dim,spacedim>::get_subface_data (const UpdateFlags update_flags,
                                                  const Quadrature<dim-1>& quadrature) const
@@ -2445,7 +2445,7 @@ namespace internal
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 CellSimilarity::Similarity
 MappingQGeneric<dim,spacedim>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -2801,7 +2801,7 @@ namespace internal
      * using the 'data_set' to differentiate whether we will
      * work on a face (and if so, which one) or subface.
      */
-    template<int dim, int spacedim>
+    template <int dim, int spacedim>
     void
     do_fill_fe_face_values (const dealii::MappingQGeneric<dim,spacedim>                             &mapping,
                             const typename dealii::Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -2853,7 +2853,7 @@ namespace internal
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQGeneric<dim,spacedim>::
 fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -2897,7 +2897,7 @@ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQGeneric<dim,spacedim>::
 fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
@@ -3231,7 +3231,7 @@ namespace
 
 
 
-  template<int dim, int spacedim, int rank>
+  template <int dim, int spacedim, int rank>
   void
   transform_differential_forms(const ArrayView<const DerivativeForm<rank, dim,spacedim> >   &input,
                                const MappingType                                             mapping_type,
@@ -3264,7 +3264,7 @@ namespace
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQGeneric<dim,spacedim>::
 transform (const ArrayView<const Tensor<1, dim> >                  &input,
@@ -3277,7 +3277,7 @@ transform (const ArrayView<const Tensor<1, dim> >                  &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQGeneric<dim,spacedim>::
 transform (const ArrayView<const DerivativeForm<1, dim,spacedim> >  &input,
@@ -3290,7 +3290,7 @@ transform (const ArrayView<const DerivativeForm<1, dim,spacedim> >  &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQGeneric<dim,spacedim>::
 transform (const ArrayView<const Tensor<2, dim> >                  &input,
@@ -3316,7 +3316,7 @@ transform (const ArrayView<const Tensor<2, dim> >                  &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQGeneric<dim,spacedim>::
 transform (const ArrayView<const  DerivativeForm<2, dim, spacedim> > &input,
@@ -3365,7 +3365,7 @@ transform (const ArrayView<const  DerivativeForm<2, dim, spacedim> > &input,
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 MappingQGeneric<dim,spacedim>::
 transform (const ArrayView<const  Tensor<3,dim> >                  &input,
@@ -3615,7 +3615,7 @@ add_quad_support_points(const typename Triangulation<dim,spacedim>::cell_iterato
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 std::vector<Point<spacedim> >
 MappingQGeneric<dim,spacedim>::
 compute_mapping_support_points(const typename Triangulation<dim,spacedim>::cell_iterator &cell) const
diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc
index 2f148fa098..40356f743f 100644
--- a/source/grid/grid_generator.cc
+++ b/source/grid/grid_generator.cc
@@ -84,7 +84,7 @@ namespace GridGenerator
 
 
 
-    template<int spacedim>
+    template <int spacedim>
     void
     colorize_subdivided_hyper_rectangle (Triangulation<1,spacedim> &tria,
                                          const Point<spacedim> &,
@@ -584,7 +584,7 @@ namespace GridGenerator
 
 
 
-  template<>
+  template <>
   void
   torus<2,3> (Triangulation<2,3>  &tria,
               const double R,
@@ -722,7 +722,7 @@ namespace GridGenerator
     tria.set_all_manifold_ids(0);
   }
 
-  template<>
+  template <>
   void
   torus<3,3> (Triangulation<3,3>  &tria,
               const double R,
@@ -776,7 +776,7 @@ namespace GridGenerator
 
 
 
-  template<>
+  template <>
   void
   parallelogram (Triangulation<3> &,
                  const Point<3>   ( &/*corners*/)[3],
@@ -785,7 +785,7 @@ namespace GridGenerator
     Assert (false, ExcNotImplemented());
   }
 
-  template<>
+  template <>
   void
   parallelogram (Triangulation<1> &,
                  const Point<1>   ( &/*corners*/)[1],
@@ -795,7 +795,7 @@ namespace GridGenerator
   }
 
 // Implementation for 2D only
-  template<>
+  template <>
   void
   parallelogram (Triangulation<2>  &tria,
                  const Point<2> (&corners)[2],
@@ -811,7 +811,7 @@ namespace GridGenerator
 
 
 
-  template<int dim>
+  template <int dim>
   void
   parallelepiped (Triangulation<dim>  &tria,
                   const Point<dim>   (&corners) [dim],
@@ -827,7 +827,7 @@ namespace GridGenerator
                                colorize);
   }
 
-  template<int dim>
+  template <int dim>
   void
   subdivided_parallelepiped (Triangulation<dim>  &tria,
                              const unsigned int      n_subdivisions,
@@ -846,7 +846,7 @@ namespace GridGenerator
                                colorize);
   }
 
-  template<int dim>
+  template <int dim>
   void
   subdivided_parallelepiped (Triangulation<dim>  &tria,
 #ifndef _MSC_VER
diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc
index 67535e8c57..7a12b1fe0e 100644
--- a/source/grid/grid_in.cc
+++ b/source/grid/grid_in.cc
@@ -94,7 +94,7 @@ void GridIn<dim, spacedim>::attach_triangulation (Triangulation<dim, spacedim> &
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void GridIn<dim, spacedim>::read_vtk(std::istream &in)
 {
   Assert((dim == 2)||(dim == 3), ExcNotImplemented());
@@ -381,7 +381,7 @@ void GridIn<dim, spacedim>::read_vtk(std::istream &in)
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void GridIn<dim, spacedim>::read_unv(std::istream &in)
 {
   Assert(tria != nullptr, ExcNoTriangulationSelected());
diff --git a/source/grid/grid_reordering.cc b/source/grid/grid_reordering.cc
index e1f9f0338b..1aff505e35 100644
--- a/source/grid/grid_reordering.cc
+++ b/source/grid/grid_reordering.cc
@@ -1100,7 +1100,7 @@ GridReordering<dim,spacedim>::reorder_cells (std::vector<CellData<dim> > &cells,
 
 
 
-template<>
+template <>
 void
 GridReordering<1>::invert_all_cells_of_negative_grid(const std::vector<Point<1> > &,
                                                      std::vector<CellData<1> > &)
@@ -1110,7 +1110,7 @@ GridReordering<1>::invert_all_cells_of_negative_grid(const std::vector<Point<1>
 
 
 
-template<>
+template <>
 void
 GridReordering<1,2>::invert_all_cells_of_negative_grid(const std::vector<Point<2> > &,
                                                        std::vector<CellData<1> > &)
@@ -1120,7 +1120,7 @@ GridReordering<1,2>::invert_all_cells_of_negative_grid(const std::vector<Point<2
 
 
 
-template<>
+template <>
 void
 GridReordering<1,3>::invert_all_cells_of_negative_grid(const std::vector<Point<3> > &,
                                                        std::vector<CellData<1> > &)
@@ -1129,7 +1129,7 @@ GridReordering<1,3>::invert_all_cells_of_negative_grid(const std::vector<Point<3
 }
 
 
-template<>
+template <>
 void
 GridReordering<2>::invert_all_cells_of_negative_grid(const std::vector<Point<2> > &all_vertices,
                                                      std::vector<CellData<2> >    &cells)
@@ -1185,7 +1185,7 @@ GridReordering<2>::invert_all_cells_of_negative_grid(const std::vector<Point<2>
 
 
 
-template<>
+template <>
 void
 GridReordering<2,3>::invert_all_cells_of_negative_grid(const std::vector<Point<3> > &,
                                                        std::vector<CellData<2> > &)
@@ -1195,7 +1195,7 @@ GridReordering<2,3>::invert_all_cells_of_negative_grid(const std::vector<Point<3
 
 
 
-template<>
+template <>
 void
 GridReordering<3>::invert_all_cells_of_negative_grid(const std::vector<Point<3> > &all_vertices,
                                                      std::vector<CellData<3> > &cells)
diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 46d4a95b1c..7cca5a7bb5 100644
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -638,7 +638,7 @@ namespace GridTools
     transform (Rotate2d(angle), triangulation);
   }
 
-  template<int dim>
+  template <int dim>
   void
   rotate (const double      angle,
           const unsigned int axis,
@@ -1122,7 +1122,7 @@ namespace GridTools
   }
 
 
-  template<int dim, template<int, int> class MeshType, int spacedim>
+  template <int dim, template <int, int> class MeshType, int spacedim>
 #ifndef _MSC_VER
   std::vector<typename MeshType<dim, spacedim>::active_cell_iterator>
 #else
@@ -1264,7 +1264,7 @@ next_cell:
 
   namespace
   {
-    template <int dim, template<int, int> class MeshType, int spacedim>
+    template <int dim, template <int, int> class MeshType, int spacedim>
     void find_active_cell_around_point_internal
     (const MeshType<dim,spacedim> &mesh,
 #ifndef _MSC_VER
@@ -1320,7 +1320,7 @@ next_cell:
     }
   }
 
-  template <int dim, template<int, int> class MeshType, int spacedim>
+  template <int dim, template <int, int> class MeshType, int spacedim>
 #ifndef _MSC_VER
   typename MeshType<dim, spacedim>::active_cell_iterator
 #else
@@ -1586,7 +1586,7 @@ next_cell:
   namespace
   {
 
-    template<class MeshType>
+    template <class MeshType>
     bool
     contains_locally_owned_cells (const std::vector<typename MeshType::active_cell_iterator> &cells)
     {
@@ -1599,7 +1599,7 @@ next_cell:
       return false;
     }
 
-    template<class MeshType>
+    template <class MeshType>
     bool
     contains_artificial_cells (const std::vector<typename MeshType::active_cell_iterator> &cells)
     {
@@ -1871,7 +1871,7 @@ next_cell:
 
 
 
-  template< class MeshType>
+  template < class MeshType>
   std::pair< Point<MeshType::space_dimension>, Point<MeshType::space_dimension> >
   compute_bounding_box
   ( const MeshType                                                                    &mesh,
@@ -3906,7 +3906,7 @@ next_cell:
    *   matrix.point1 + offset - point2
    * is parallel to the unit vector in <direction>
    */
-  template<int spacedim>
+  template <int spacedim>
   inline bool orthogonal_equality (const Point<spacedim>    &point1,
                                    const Point<spacedim>    &point2,
                                    const int                 direction,
@@ -3953,9 +3953,9 @@ next_cell:
    * documentation of make_periodicity_constraints and
    * collect_periodic_faces for details
    */
-  template<int dim> struct OrientationLookupTable {};
+  template <int dim> struct OrientationLookupTable {};
 
-  template<> struct OrientationLookupTable<1>
+  template <> struct OrientationLookupTable<1>
   {
     typedef std::array<unsigned int, GeometryInfo<1>::vertices_per_face> MATCH_T;
     static inline std::bitset<3> lookup (const MATCH_T &)
@@ -3965,7 +3965,7 @@ next_cell:
     }
   };
 
-  template<> struct OrientationLookupTable<2>
+  template <> struct OrientationLookupTable<2>
   {
     typedef std::array<unsigned int, GeometryInfo<2>::vertices_per_face> MATCH_T;
     static inline std::bitset<3> lookup (const MATCH_T &matching)
@@ -3986,7 +3986,7 @@ next_cell:
     }
   };
 
-  template<> struct OrientationLookupTable<3>
+  template <> struct OrientationLookupTable<3>
   {
     typedef std::array<unsigned int, GeometryInfo<3>::vertices_per_face> MATCH_T;
     static inline std::bitset<3> lookup (const MATCH_T &matching)
@@ -4021,7 +4021,7 @@ next_cell:
 
 
 
-  template<typename FaceIterator>
+  template <typename FaceIterator>
   inline bool
   orthogonal_equality (std::bitset<3>     &orientation,
                        const FaceIterator &face1,
@@ -4069,7 +4069,7 @@ next_cell:
 
 
 
-  template<typename FaceIterator>
+  template <typename FaceIterator>
   inline bool
   orthogonal_equality (const FaceIterator &face1,
                        const FaceIterator &face2,
@@ -4087,7 +4087,7 @@ next_cell:
   /*
    * Internally used in collect_periodic_faces
    */
-  template<typename CellIterator>
+  template <typename CellIterator>
   void
   match_periodic_face_pairs
   (std::set<std::pair<CellIterator, unsigned int> > &pairs1,
@@ -4150,7 +4150,7 @@ next_cell:
 
 
 
-  template<typename MeshType>
+  template <typename MeshType>
   void
   collect_periodic_faces
   (const MeshType                        &mesh,
@@ -4211,7 +4211,7 @@ next_cell:
 
 
 
-  template<typename MeshType>
+  template <typename MeshType>
   void
   collect_periodic_faces
   (const MeshType                        &mesh,
@@ -4357,7 +4357,7 @@ next_cell:
       }
   }
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   std::pair<unsigned int, double>
   get_longest_direction(typename Triangulation<dim, spacedim>::active_cell_iterator cell)
   {
@@ -4387,7 +4387,7 @@ next_cell:
   }
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   remove_hanging_nodes( Triangulation<dim,spacedim> &tria,
                         const bool isotropic,
@@ -4422,7 +4422,7 @@ next_cell:
       }
   }
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   remove_anisotropy(  Triangulation<dim,spacedim> &tria,
                       const double max_ratio,
@@ -4453,7 +4453,7 @@ next_cell:
   }
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void regularize_corner_cells (Triangulation<dim,spacedim> &tria,
                                 const double limit_angle_fraction)
   {
diff --git a/source/grid/manifold.cc b/source/grid/manifold.cc
index 1de1e07e8c..da34a01a1c 100644
--- a/source/grid/manifold.cc
+++ b/source/grid/manifold.cc
@@ -187,7 +187,7 @@ normal_vector (const Triangulation<2, 2>::face_iterator &face,
 
 
 
-template<>
+template <>
 Tensor<1,3>
 Manifold<3, 3>::
 normal_vector (const Triangulation<3, 3>::face_iterator &face,
diff --git a/source/grid/tria.cc b/source/grid/tria.cc
index 85a1c2b502..9b22a89875 100644
--- a/source/grid/tria.cc
+++ b/source/grid/tria.cc
@@ -11991,7 +11991,7 @@ Triangulation<dim,spacedim>::update_periodic_face_map ()
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void
 Triangulation<dim, spacedim>::clear_despite_subscriptions()
 {
@@ -13553,7 +13553,7 @@ Triangulation<dim, spacedim>::memory_consumption () const
 
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 Triangulation<dim, spacedim>::DistortedCellList::~DistortedCellList () noexcept
 {
   // don't do anything here. the compiler will automatically convert
diff --git a/source/grid/tria_accessor.cc b/source/grid/tria_accessor.cc
index 5ec673b029..59f3f1fa23 100644
--- a/source/grid/tria_accessor.cc
+++ b/source/grid/tria_accessor.cc
@@ -1511,8 +1511,8 @@ bool CellAccessor<3>::point_inside (const Point<3> &p) const
 // 1) project point onto manifold and
 // 2) transform to the unit cell with a Q1 mapping
 // 3) then check if inside unit cell
-template<int dim, int spacedim>
-template<int dim_,int spacedim_ >
+template <int dim, int spacedim>
+template <int dim_,int spacedim_ >
 bool CellAccessor<dim,spacedim>::
 point_inside_codim(const Point<spacedim_> &p) const
 {
diff --git a/source/grid/tria_boundary_lib.cc b/source/grid/tria_boundary_lib.cc
index b5d3e57f06..b7b1d36c0c 100644
--- a/source/grid/tria_boundary_lib.cc
+++ b/source/grid/tria_boundary_lib.cc
@@ -90,7 +90,7 @@ get_new_point_on_line (const typename Triangulation<dim,spacedim>::line_iterator
 
 
 
-template<>
+template <>
 Point<3>
 CylinderBoundary<3>::
 get_new_point_on_quad (const Triangulation<3>::quad_iterator &quad) const
@@ -110,7 +110,7 @@ get_new_point_on_quad (const Triangulation<3>::quad_iterator &quad) const
                     point_on_axis);
 }
 
-template<>
+template <>
 Point<3>
 CylinderBoundary<2,3>::
 get_new_point_on_quad (const Triangulation<2,3>::quad_iterator &quad) const
@@ -271,7 +271,7 @@ CylinderBoundary<dim,spacedim>::get_radius () const
 
 //======================================================================//
 
-template<int dim>
+template <int dim>
 ConeBoundary<dim>::ConeBoundary (const double radius_0,
                                  const double radius_1,
                                  const Point<dim> x_0,
@@ -285,7 +285,7 @@ ConeBoundary<dim>::ConeBoundary (const double radius_0,
 
 
 
-template<int dim>
+template <int dim>
 double ConeBoundary<dim>::get_radius (Point<dim> x) const
 {
   for (unsigned int i = 0; i < dim; ++i)
@@ -297,7 +297,7 @@ double ConeBoundary<dim>::get_radius (Point<dim> x) const
 
 
 
-template<int dim>
+template <int dim>
 void
 ConeBoundary<dim>::
 get_intermediate_points_between_points (const Point<dim> &p0,
@@ -327,7 +327,7 @@ get_intermediate_points_between_points (const Point<dim> &p0,
     }
 }
 
-template<int dim>
+template <int dim>
 Point<dim>
 ConeBoundary<dim>::
 get_new_point_on_line (const typename Triangulation<dim>::line_iterator &line) const
@@ -366,7 +366,7 @@ get_new_point_on_quad (const Triangulation<3>::quad_iterator &quad) const
 
 
 
-template<int dim>
+template <int dim>
 Point<dim>
 ConeBoundary<dim>::
 get_new_point_on_quad (const typename Triangulation<dim>::quad_iterator &) const
@@ -378,7 +378,7 @@ get_new_point_on_quad (const typename Triangulation<dim>::quad_iterator &) const
 
 
 
-template<int dim>
+template <int dim>
 void
 ConeBoundary<dim>::
 get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &line,
@@ -393,7 +393,7 @@ get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterato
 
 
 
-template<>
+template <>
 void
 ConeBoundary<3>::
 get_intermediate_points_on_quad (const Triangulation<3>::quad_iterator &quad,
@@ -441,7 +441,7 @@ get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterato
 
 
 
-template<>
+template <>
 void
 ConeBoundary<1>::
 get_normals_at_vertices (const Triangulation<1>::face_iterator &,
@@ -452,7 +452,7 @@ get_normals_at_vertices (const Triangulation<1>::face_iterator &,
 
 
 
-template<int dim>
+template <int dim>
 void
 ConeBoundary<dim>::
 get_normals_at_vertices (const typename Triangulation<dim>::face_iterator &face,
@@ -1400,7 +1400,7 @@ TorusBoundary<2,3>::get_surf_norm(const Point<3> &p) const
 
 
 
-template<>
+template <>
 void
 TorusBoundary<2,3>::
 get_intermediate_points_on_line (const Triangulation<2, 3>::line_iterator   &line,
@@ -1451,7 +1451,7 @@ get_intermediate_points_on_line (const Triangulation<2, 3>::line_iterator   &lin
 
 
 
-template<>
+template <>
 void
 TorusBoundary<2,3>::
 get_intermediate_points_on_quad (const Triangulation< 2, 3 >::quad_iterator &quad,
@@ -1511,7 +1511,7 @@ get_intermediate_points_on_quad (const Triangulation< 2, 3 >::quad_iterator &qua
 
 
 
-template<>
+template <>
 void
 TorusBoundary<2,3>::
 get_normals_at_vertices (const Triangulation<2,3 >::face_iterator &face,
diff --git a/source/grid/tria_objects.cc b/source/grid/tria_objects.cc
index e5f768fce7..8be5359d55 100644
--- a/source/grid/tria_objects.cc
+++ b/source/grid/tria_objects.cc
@@ -30,7 +30,7 @@ namespace internal
 {
   namespace Triangulation
   {
-    template<class G>
+    template <class G>
     void
     TriaObjects<G>::reserve_space (const unsigned int new_objects_in_pairs,
                                    const unsigned int new_objects_single)
@@ -307,7 +307,7 @@ namespace internal
     }
 
 
-    template<>
+    template <>
     void
     TriaObjects<TriaObject<1> >::monitor_memory (const unsigned int) const
     {
@@ -326,7 +326,7 @@ namespace internal
     }
 
 
-    template<>
+    template <>
     void
     TriaObjects<TriaObject<2> >::monitor_memory (const unsigned int) const
     {
@@ -426,7 +426,7 @@ namespace internal
     }
 
 
-    template<typename G>
+    template <typename G>
     std::size_t
     TriaObjects<G>::memory_consumption () const
     {
diff --git a/source/hp/dof_handler.cc b/source/hp/dof_handler.cc
index e9fa9c081b..e68dc9d3fc 100644
--- a/source/hp/dof_handler.cc
+++ b/source/hp/dof_handler.cc
@@ -225,7 +225,7 @@ namespace internal
          * same in all space
          * dimensions.
          */
-        template<int dim, int spacedim>
+        template <int dim, int spacedim>
         static
         void
         reserve_space_vertices (DoFHandler<dim,spacedim> &dof_handler)
@@ -1648,18 +1648,18 @@ namespace internal
 
 namespace hp
 {
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   const unsigned int DoFHandler<dim,spacedim>::dimension;
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   const types::global_dof_index DoFHandler<dim,spacedim>::invalid_dof_index;
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   const unsigned int DoFHandler<dim,spacedim>::default_fe_index;
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   DoFHandler<dim,spacedim>::DoFHandler (const Triangulation<dim,spacedim> &tria)
     :
     tria(&tria, typeid(*this).name()),
@@ -1688,7 +1688,7 @@ namespace hp
   }
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   DoFHandler<dim,spacedim>::~DoFHandler ()
   {
     // unsubscribe as a listener to refinement
@@ -1959,7 +1959,7 @@ namespace hp
   }
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   types::global_dof_index DoFHandler<dim,spacedim>::n_boundary_dofs () const
   {
     Assert (finite_elements != nullptr, ExcNoFESelected());
@@ -1997,7 +1997,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   types::global_dof_index
   DoFHandler<dim,spacedim>::n_boundary_dofs (const std::set<types::boundary_id> &boundary_ids) const
   {
@@ -2061,7 +2061,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   std::size_t
   DoFHandler<dim,spacedim>::memory_consumption () const
   {
@@ -2083,7 +2083,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   DoFHandler<dim,spacedim>::
   compute_vertex_dof_identities (std::vector<types::global_dof_index> &new_dof_indices) const
@@ -2217,7 +2217,7 @@ namespace hp
   {}
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   DoFHandler<dim,spacedim>::
   compute_line_dof_identities (std::vector<types::global_dof_index> &new_dof_indices) const
@@ -2569,7 +2569,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void DoFHandler<dim,spacedim>::distribute_dofs (const hp::FECollection<dim,spacedim> &ff)
   {
     Assert (tria->n_levels() > 0, ExcInvalidTriangulation());
@@ -2731,7 +2731,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void DoFHandler<dim,spacedim>::clear ()
   {
     // release lock to old fe
@@ -2743,7 +2743,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void DoFHandler<dim,spacedim>::renumber_dofs (const std::vector<types::global_dof_index> &new_numbers)
   {
     Assert (new_numbers.size() == n_dofs(), ExcRenumberingIncomplete());
@@ -2792,7 +2792,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   DoFHandler<dim,spacedim>::
   renumber_dofs_internal (const std::vector<types::global_dof_index> &new_numbers,
@@ -2834,7 +2834,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   DoFHandler<dim,spacedim>::
   renumber_dofs_internal (const std::vector<types::global_dof_index> &new_numbers,
@@ -2884,7 +2884,7 @@ namespace hp
 
 
 //TODO: Merge the following three functions -- they are identical
-  template<>
+  template <>
   void
   DoFHandler<2,2>::
   renumber_dofs_internal (const std::vector<types::global_dof_index> &new_numbers,
@@ -2936,7 +2936,7 @@ namespace hp
 
 
 
-  template<>
+  template <>
   void
   DoFHandler<2,3>::
   renumber_dofs_internal (const std::vector<types::global_dof_index> &new_numbers,
@@ -2987,7 +2987,7 @@ namespace hp
   }
 
 
-  template<>
+  template <>
   void
   DoFHandler<3,3>::
   renumber_dofs_internal (const std::vector<types::global_dof_index> &new_numbers,
@@ -3038,7 +3038,7 @@ namespace hp
   }
 
 
-  template<>
+  template <>
   void
   DoFHandler<3,3>::
   renumber_dofs_internal (const std::vector<types::global_dof_index> &new_numbers,
@@ -3142,7 +3142,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void DoFHandler<dim,spacedim>::create_active_fe_table ()
   {
     // Create sufficiently many
@@ -3225,7 +3225,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   DoFHandler<dim,spacedim>::post_refinement_action ()
   {
@@ -3335,7 +3335,7 @@ namespace hp
   }
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void DoFHandler<dim,spacedim>::clear_space ()
   {
     levels.clear ();
diff --git a/source/hp/mapping_collection.cc b/source/hp/mapping_collection.cc
index 4a2db5abe3..a0a6865f29 100644
--- a/source/hp/mapping_collection.cc
+++ b/source/hp/mapping_collection.cc
@@ -23,13 +23,13 @@ DEAL_II_NAMESPACE_OPEN
 namespace hp
 {
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   MappingCollection<dim,spacedim>::MappingCollection ()
   {}
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   MappingCollection<dim,spacedim>::
   MappingCollection (const Mapping<dim,spacedim> &mapping)
   {
@@ -39,7 +39,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   MappingCollection<dim,spacedim>::
   MappingCollection (const MappingCollection<dim,spacedim> &mapping_collection)
     :
@@ -60,7 +60,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   std::size_t
   MappingCollection<dim,spacedim>::memory_consumption () const
   {
@@ -70,7 +70,7 @@ namespace hp
 
 
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   void
   MappingCollection<dim,spacedim>::push_back (const Mapping<dim,spacedim> &new_mapping)
   {
@@ -92,7 +92,7 @@ namespace hp
      * reference to a static object that will be constructed the first time
      * this function is called.
      */
-    template<int dim, int spacedim>
+    template <int dim, int spacedim>
     MappingQGeneric<dim,spacedim> &
     get_static_mapping_q1()
     {
@@ -101,7 +101,7 @@ namespace hp
     }
   }
 
-  template<int dim, int spacedim>
+  template <int dim, int spacedim>
   MappingCollection<dim,spacedim>
   StaticMappingQ1<dim,spacedim>::mapping_collection
     = MappingCollection<dim,spacedim>(get_static_mapping_q1<dim,spacedim>());
diff --git a/source/lac/constraint_matrix.cc b/source/lac/constraint_matrix.cc
index f5e9f7731a..bd084adf8e 100644
--- a/source/lac/constraint_matrix.cc
+++ b/source/lac/constraint_matrix.cc
@@ -1446,7 +1446,7 @@ namespace internals
 {
 #define SCRATCH_INITIALIZER(Number,Name)                                \
   ConstraintMatrixData<Number>::ScratchData scratch_data_initializer_##Name; \
-  template<> Threads::ThreadLocalStorage<ConstraintMatrixData<Number>::ScratchData> \
+  template <> Threads::ThreadLocalStorage<ConstraintMatrixData<Number>::ScratchData> \
   ConstraintMatrixData<Number>::scratch_data(scratch_data_initializer_##Name)
 
   SCRATCH_INITIALIZER(double,double);
diff --git a/source/lac/tridiagonal_matrix.cc b/source/lac/tridiagonal_matrix.cc
index b131585a77..f2865134c5 100644
--- a/source/lac/tridiagonal_matrix.cc
+++ b/source/lac/tridiagonal_matrix.cc
@@ -22,7 +22,7 @@ DEAL_II_NAMESPACE_OPEN
 
 using namespace LAPACKSupport;
 
-template<typename number>
+template <typename number>
 TridiagonalMatrix<number>::TridiagonalMatrix(
   size_type size,
   bool symmetric)
@@ -35,7 +35,7 @@ TridiagonalMatrix<number>::TridiagonalMatrix(
 {}
 
 
-template<typename number>
+template <typename number>
 void
 TridiagonalMatrix<number>::reinit(
   size_type size,
@@ -49,7 +49,7 @@ TridiagonalMatrix<number>::reinit(
 }
 
 
-template<typename number>
+template <typename number>
 bool
 TridiagonalMatrix<number>::all_zero() const
 {
@@ -73,7 +73,7 @@ TridiagonalMatrix<number>::all_zero() const
 }
 
 
-template<typename number>
+template <typename number>
 void
 TridiagonalMatrix<number>::vmult (
   Vector<number>       &w,
@@ -127,7 +127,7 @@ TridiagonalMatrix<number>::vmult (
 }
 
 
-template<typename number>
+template <typename number>
 void
 TridiagonalMatrix<number>::vmult_add (
   Vector<number>       &w,
@@ -137,7 +137,7 @@ TridiagonalMatrix<number>::vmult_add (
 }
 
 
-template<typename number>
+template <typename number>
 void
 TridiagonalMatrix<number>::Tvmult (
   Vector<number>       &w,
@@ -181,7 +181,7 @@ TridiagonalMatrix<number>::Tvmult (
 }
 
 
-template<typename number>
+template <typename number>
 void
 TridiagonalMatrix<number>::Tvmult_add (
   Vector<number>       &w,
@@ -191,7 +191,7 @@ TridiagonalMatrix<number>::Tvmult_add (
 }
 
 
-template<typename number>
+template <typename number>
 number
 TridiagonalMatrix<number>::matrix_scalar_product(
   const Vector<number> &w,
@@ -218,7 +218,7 @@ TridiagonalMatrix<number>::matrix_scalar_product(
 }
 
 
-template<typename number>
+template <typename number>
 number
 TridiagonalMatrix<number>::matrix_norm_square(
   const Vector<number> &v) const
@@ -227,7 +227,7 @@ TridiagonalMatrix<number>::matrix_norm_square(
 }
 
 
-template<>
+template <>
 void
 TridiagonalMatrix<double>::compute_eigenvalues()
 {
@@ -247,7 +247,7 @@ TridiagonalMatrix<double>::compute_eigenvalues()
 }
 
 
-template<typename number>
+template <typename number>
 number
 TridiagonalMatrix<number>::eigenvalue(const size_type i) const
 {
@@ -258,7 +258,7 @@ TridiagonalMatrix<number>::eigenvalue(const size_type i) const
 
 
 /*
-template<typename number>
+template <typename number>
 TridiagonalMatrix<number>::
 {
 }
diff --git a/source/lac/trilinos_solver.cc b/source/lac/trilinos_solver.cc
index 27577bb9b6..15b11271d1 100644
--- a/source/lac/trilinos_solver.cc
+++ b/source/lac/trilinos_solver.cc
@@ -433,7 +433,7 @@ namespace TrilinosWrappers
   }
 
 
-  template<typename Preconditioner>
+  template <typename Preconditioner>
   void
   SolverBase::do_solve(const Preconditioner &preconditioner)
   {
@@ -568,7 +568,7 @@ namespace TrilinosWrappers
 
 
 
-  template<>
+  template <>
   void
   SolverBase::set_preconditioner(AztecOO                &solver,
                                  const PreconditionBase &preconditioner)
@@ -586,7 +586,7 @@ namespace TrilinosWrappers
   }
 
 
-  template<>
+  template <>
   void
   SolverBase::set_preconditioner(AztecOO               &solver,
                                  const Epetra_Operator &preconditioner)
diff --git a/source/lac/trilinos_sparsity_pattern.cc b/source/lac/trilinos_sparsity_pattern.cc
index fe3876889d..0776cd0b92 100644
--- a/source/lac/trilinos_sparsity_pattern.cc
+++ b/source/lac/trilinos_sparsity_pattern.cc
@@ -585,7 +585,7 @@ namespace TrilinosWrappers
 
 
 
-  template<typename SparsityPatternType>
+  template <typename SparsityPatternType>
   void
   SparsityPattern::reinit (const IndexSet            &row_parallel_partitioning,
                            const IndexSet            &col_parallel_partitioning,
@@ -603,7 +603,7 @@ namespace TrilinosWrappers
 
 
 
-  template<typename SparsityPatternType>
+  template <typename SparsityPatternType>
   void
   SparsityPattern::reinit (const IndexSet            &parallel_partitioning,
                            const SparsityPatternType &nontrilinos_sparsity_pattern,
diff --git a/source/multigrid/mg_transfer_matrix_free.cc b/source/multigrid/mg_transfer_matrix_free.cc
index 2b9c79851a..877c41e258 100644
--- a/source/multigrid/mg_transfer_matrix_free.cc
+++ b/source/multigrid/mg_transfer_matrix_free.cc
@@ -34,7 +34,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template<int dim, typename Number>
+template <int dim, typename Number>
 MGTransferMatrixFree<dim,Number>::MGTransferMatrixFree ()
   :
   fe_degree(0),
@@ -45,7 +45,7 @@ MGTransferMatrixFree<dim,Number>::MGTransferMatrixFree ()
 
 
 
-template<int dim, typename Number>
+template <int dim, typename Number>
 MGTransferMatrixFree<dim,Number>::MGTransferMatrixFree (const MGConstrainedDoFs &mg_c)
   :
   fe_degree(0),
diff --git a/source/multigrid/mg_transfer_prebuilt.cc b/source/multigrid/mg_transfer_prebuilt.cc
index 69e7f14b94..a432aeabcd 100644
--- a/source/multigrid/mg_transfer_prebuilt.cc
+++ b/source/multigrid/mg_transfer_prebuilt.cc
@@ -40,13 +40,13 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template<typename VectorType>
+template <typename VectorType>
 MGTransferPrebuilt<VectorType>::MGTransferPrebuilt ()
 {}
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 MGTransferPrebuilt<VectorType>::MGTransferPrebuilt (const MGConstrainedDoFs &mg_c)
 {
   this->mg_constrained_dofs = &mg_c;
@@ -54,7 +54,7 @@ MGTransferPrebuilt<VectorType>::MGTransferPrebuilt (const MGConstrainedDoFs &mg_
 
 
 
-template<typename VectorType>
+template <typename VectorType>
 MGTransferPrebuilt<VectorType>::MGTransferPrebuilt (const ConstraintMatrix &/*c*/, const MGConstrainedDoFs &mg_c)
 {
   this->mg_constrained_dofs = &mg_c;
diff --git a/source/multigrid/multigrid.cc b/source/multigrid/multigrid.cc
index 9a4ab4c21b..b85f72e930 100644
--- a/source/multigrid/multigrid.cc
+++ b/source/multigrid/multigrid.cc
@@ -198,7 +198,7 @@ MGTransferBlockBase::memory_consumption () const
 
 //----------------------------------------------------------------------//
 
-template<typename number>
+template <typename number>
 MGTransferSelect<number>::MGTransferSelect ()
   :
   selected_component (0),
@@ -206,7 +206,7 @@ MGTransferSelect<number>::MGTransferSelect ()
 {}
 
 
-template<typename number>
+template <typename number>
 MGTransferSelect<number>::MGTransferSelect (const ConstraintMatrix &c)
   :
   selected_component (0),
diff --git a/source/numerics/solution_transfer.cc b/source/numerics/solution_transfer.cc
index fdcc6c2984..8f6b8add53 100644
--- a/source/numerics/solution_transfer.cc
+++ b/source/numerics/solution_transfer.cc
@@ -35,7 +35,7 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template<int dim, typename VectorType, typename DoFHandlerType>
+template <int dim, typename VectorType, typename DoFHandlerType>
 SolutionTransfer<dim, VectorType, DoFHandlerType>::
 SolutionTransfer(const DoFHandlerType &dof)
   :
@@ -55,7 +55,7 @@ SolutionTransfer(const DoFHandlerType &dof)
 
 
 
-template<int dim, typename VectorType, typename DoFHandlerType>
+template <int dim, typename VectorType, typename DoFHandlerType>
 SolutionTransfer<dim, VectorType, DoFHandlerType>::~SolutionTransfer()
 {
   clear ();
@@ -63,7 +63,7 @@ SolutionTransfer<dim, VectorType, DoFHandlerType>::~SolutionTransfer()
 
 
 
-template<int dim, typename VectorType, typename DoFHandlerType>
+template <int dim, typename VectorType, typename DoFHandlerType>
 void SolutionTransfer<dim, VectorType, DoFHandlerType>::clear ()
 {
   indices_on_cell.clear();
@@ -75,7 +75,7 @@ void SolutionTransfer<dim, VectorType, DoFHandlerType>::clear ()
 
 
 
-template<int dim, typename VectorType, typename DoFHandlerType>
+template <int dim, typename VectorType, typename DoFHandlerType>
 void SolutionTransfer<dim, VectorType, DoFHandlerType>::prepare_for_pure_refinement()
 {
   Assert(prepared_for!=pure_refinement, ExcAlreadyPrepForRef());
@@ -112,7 +112,7 @@ void SolutionTransfer<dim, VectorType, DoFHandlerType>::prepare_for_pure_refinem
 
 
 
-template<int dim, typename VectorType, typename DoFHandlerType>
+template <int dim, typename VectorType, typename DoFHandlerType>
 void
 SolutionTransfer<dim, VectorType, DoFHandlerType>::refine_interpolate
 (const VectorType &in,
@@ -239,7 +239,7 @@ namespace internal
 
 
 
-template<int dim, typename VectorType, typename DoFHandlerType>
+template <int dim, typename VectorType, typename DoFHandlerType>
 void
 SolutionTransfer<dim, VectorType, DoFHandlerType>::
 prepare_for_coarsening_and_refinement(const std::vector<VectorType> &all_in)
@@ -392,7 +392,7 @@ prepare_for_coarsening_and_refinement(const std::vector<VectorType> &all_in)
 
 
 
-template<int dim, typename VectorType, typename DoFHandlerType>
+template <int dim, typename VectorType, typename DoFHandlerType>
 void
 SolutionTransfer<dim, VectorType, DoFHandlerType>::prepare_for_coarsening_and_refinement
 (const VectorType &in)
@@ -403,7 +403,7 @@ SolutionTransfer<dim, VectorType, DoFHandlerType>::prepare_for_coarsening_and_re
 
 
 
-template<int dim, typename VectorType, typename DoFHandlerType>
+template <int dim, typename VectorType, typename DoFHandlerType>
 void SolutionTransfer<dim, VectorType, DoFHandlerType>::
 interpolate (const std::vector<VectorType> &all_in,
              std::vector<VectorType>       &all_out) const
@@ -534,7 +534,7 @@ interpolate (const std::vector<VectorType> &all_in,
 
 
 
-template<int dim, typename VectorType, typename DoFHandlerType>
+template <int dim, typename VectorType, typename DoFHandlerType>
 void SolutionTransfer<dim, VectorType, DoFHandlerType>::interpolate
 (const VectorType &in,
  VectorType       &out) const
@@ -555,7 +555,7 @@ void SolutionTransfer<dim, VectorType, DoFHandlerType>::interpolate
 
 
 
-template<int dim, typename VectorType, typename DoFHandlerType>
+template <int dim, typename VectorType, typename DoFHandlerType>
 std::size_t
 SolutionTransfer<dim, VectorType, DoFHandlerType>::memory_consumption () const
 {
@@ -572,7 +572,7 @@ SolutionTransfer<dim, VectorType, DoFHandlerType>::memory_consumption () const
 
 
 
-template<int dim, typename VectorType, typename DoFHandlerType>
+template <int dim, typename VectorType, typename DoFHandlerType>
 std::size_t
 SolutionTransfer<dim, VectorType, DoFHandlerType>::Pointerstruct::memory_consumption () const
 {
diff --git a/source/opencascade/boundary_lib.cc b/source/opencascade/boundary_lib.cc
index 2dac7d1716..98284f8326 100644
--- a/source/opencascade/boundary_lib.cc
+++ b/source/opencascade/boundary_lib.cc
@@ -286,7 +286,7 @@ namespace OpenCASCADE
     tolerance(tolerance)
   {}
 
-  template<>
+  template <>
   Point<2>
   NURBSPatchManifold<2, 3>::
   pull_back(const Point<3> &space_point) const
@@ -302,7 +302,7 @@ namespace OpenCASCADE
     return Point<2>(u,v);
   }
 
-  template<>
+  template <>
   Point<3>
   NURBSPatchManifold<2, 3>::
   push_forward(const Point<2> &chart_point) const
@@ -310,7 +310,7 @@ namespace OpenCASCADE
     return ::dealii::OpenCASCADE::push_forward(face, chart_point[0], chart_point[1]);
   }
 
-  template<>
+  template <>
   DerivativeForm<1,2,3>
   NURBSPatchManifold<2, 3>::
   push_forward_gradient(const Point<2> &chart_point) const
@@ -332,7 +332,7 @@ namespace OpenCASCADE
     return DX;
   }
 
-  template<>
+  template <>
   std::tuple<double, double, double, double>
   NURBSPatchManifold<2, 3>::
   get_uv_bounds() const
diff --git a/tests/aniso/fe_tools.cc b/tests/aniso/fe_tools.cc
index 92c950fd3b..e5e1336151 100644
--- a/tests/aniso/fe_tools.cc
+++ b/tests/aniso/fe_tools.cc
@@ -56,7 +56,7 @@ void print_formatted (const FullMatrix<number> &A,
 
 
 
-template<int dim>
+template <int dim>
 void test_embedding (const FiniteElement<dim> &fe)
 {
   const std::string refine_case_names[8]=
@@ -98,7 +98,7 @@ void test_embedding (const FiniteElement<dim> &fe)
 }
 
 
-template<int dim>
+template <int dim>
 void test_projection (const FiniteElement<dim> &fe1,
                       const FiniteElement<dim> &fe2,
                       std::ostream &out)
@@ -120,7 +120,7 @@ void test_projection (const FiniteElement<dim> &fe1,
 }
 
 
-template<int dim>
+template <int dim>
 void test_projection (std::ostream &out)
 {
   FE_DGQ<dim> q0(0);
diff --git a/tests/aniso/solution_transfer.cc b/tests/aniso/solution_transfer.cc
index e17cb7b720..2ac4be1952 100644
--- a/tests/aniso/solution_transfer.cc
+++ b/tests/aniso/solution_transfer.cc
@@ -38,7 +38,7 @@
 #include <vector>
 
 
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
diff --git a/tests/base/anisotropic_1.cc b/tests/base/anisotropic_1.cc
index afd8728fe9..d7a4e70f94 100644
--- a/tests/base/anisotropic_1.cc
+++ b/tests/base/anisotropic_1.cc
@@ -32,7 +32,7 @@
 using namespace Polynomials;
 
 
-template<int dim, class PolynomialType1, class PolynomialType2>
+template <int dim, class PolynomialType1, class PolynomialType2>
 void check_poly(const Point<dim>      &x,
                 const PolynomialType1 &p,
                 const PolynomialType2 &q)
diff --git a/tests/base/cell_data_storage_01.cc b/tests/base/cell_data_storage_01.cc
index 3b97d750ac..f320f3416a 100644
--- a/tests/base/cell_data_storage_01.cc
+++ b/tests/base/cell_data_storage_01.cc
@@ -38,7 +38,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
@@ -75,7 +75,7 @@ DeclException3 (ExcWrongValue,
 /**
  * Loop over quadrature points and check that value is the same as given by the function.
  */
-template<int dim,typename DATA>
+template <int dim,typename DATA>
 void check_qph(Triangulation<dim> &tr,
                const CellDataStorage<typename Triangulation<dim,dim>::cell_iterator,DATA> &manager,
                const Quadrature<dim> &rhs_quadrature,
@@ -106,7 +106,7 @@ void check_qph(Triangulation<dim> &tr,
   dof_handler.clear();
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   const MyFunction<dim> my_func;
diff --git a/tests/base/cell_data_storage_02.cc b/tests/base/cell_data_storage_02.cc
index 60b9e87a01..b1f72a7151 100644
--- a/tests/base/cell_data_storage_02.cc
+++ b/tests/base/cell_data_storage_02.cc
@@ -37,7 +37,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
@@ -72,7 +72,7 @@ DeclException3 (ExcWrongValue,
                 << arg1 <<" != "<< arg2 << " with delta = " << arg3 );
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   const MyFunction<dim> my_func;
diff --git a/tests/base/data_out_base.cc b/tests/base/data_out_base.cc
index fe4e03fe4d..47d01d85b6 100644
--- a/tests/base/data_out_base.cc
+++ b/tests/base/data_out_base.cc
@@ -63,7 +63,7 @@ write_patches(const std::vector<DataOutBase::Patch<dim,spacedim> > &patches,
 //    WRITE(eps);
 }
 
-template<int dim>
+template <int dim>
 struct PatchInfo
 {
   static double vertices[GeometryInfo<dim>::vertices_per_cell][3];
@@ -198,7 +198,7 @@ create_patches(std::vector<DataOutBase::Patch<dim,spacedim> > &patches)
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test(std::ostream &out)
 {
   std::vector<DataOutBase::Patch<dim, spacedim> > patches;
diff --git a/tests/base/data_out_base_dx.cc b/tests/base/data_out_base_dx.cc
index d5b7aee545..e3523882c5 100644
--- a/tests/base/data_out_base_dx.cc
+++ b/tests/base/data_out_base_dx.cc
@@ -73,7 +73,7 @@ void check_cont(unsigned int ncells,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_eps.cc b/tests/base/data_out_base_eps.cc
index 7ead9c17f2..393d0f85bf 100644
--- a/tests/base/data_out_base_eps.cc
+++ b/tests/base/data_out_base_eps.cc
@@ -71,7 +71,7 @@ void check_cont(unsigned int ncells,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_gmv.cc b/tests/base/data_out_base_gmv.cc
index 9479f0cf66..6391f43cec 100644
--- a/tests/base/data_out_base_gmv.cc
+++ b/tests/base/data_out_base_gmv.cc
@@ -53,7 +53,7 @@ void check(DataOutBase::GmvFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_gnuplot.cc b/tests/base/data_out_base_gnuplot.cc
index 88bb86d16e..fffc0abce1 100644
--- a/tests/base/data_out_base_gnuplot.cc
+++ b/tests/base/data_out_base_gnuplot.cc
@@ -52,7 +52,7 @@ void check(DataOutBase::GnuplotFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_gnuplot_labels.cc b/tests/base/data_out_base_gnuplot_labels.cc
index f82745fc3a..6a5518ca62 100644
--- a/tests/base/data_out_base_gnuplot_labels.cc
+++ b/tests/base/data_out_base_gnuplot_labels.cc
@@ -57,7 +57,7 @@ void check(DataOutBase::GnuplotFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_gnuplot_labels_02.cc b/tests/base/data_out_base_gnuplot_labels_02.cc
index be16b72752..61d23f55fd 100644
--- a/tests/base/data_out_base_gnuplot_labels_02.cc
+++ b/tests/base/data_out_base_gnuplot_labels_02.cc
@@ -91,7 +91,7 @@ void check(DataOutBase::GnuplotFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_povray.cc b/tests/base/data_out_base_povray.cc
index b357b234cd..094b8d781f 100644
--- a/tests/base/data_out_base_povray.cc
+++ b/tests/base/data_out_base_povray.cc
@@ -71,7 +71,7 @@ void check_cont(unsigned int ncells,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_tecplot.cc b/tests/base/data_out_base_tecplot.cc
index 9cf01272c8..f0dcc591e1 100644
--- a/tests/base/data_out_base_tecplot.cc
+++ b/tests/base/data_out_base_tecplot.cc
@@ -53,7 +53,7 @@ void check(DataOutBase::TecplotFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_tecplot_bin.cc b/tests/base/data_out_base_tecplot_bin.cc
index 83a25f1efc..b2fc629b6f 100644
--- a/tests/base/data_out_base_tecplot_bin.cc
+++ b/tests/base/data_out_base_tecplot_bin.cc
@@ -50,7 +50,7 @@ void check(DataOutBase::TecplotFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all()
 {
   char name[100];
diff --git a/tests/base/data_out_base_vtk.cc b/tests/base/data_out_base_vtk.cc
index 75b8904045..da259abd5d 100644
--- a/tests/base/data_out_base_vtk.cc
+++ b/tests/base/data_out_base_vtk.cc
@@ -53,7 +53,7 @@ void check(DataOutBase::VtkFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_vtk_cycle.cc b/tests/base/data_out_base_vtk_cycle.cc
index 25bb64cf37..247474555b 100644
--- a/tests/base/data_out_base_vtk_cycle.cc
+++ b/tests/base/data_out_base_vtk_cycle.cc
@@ -56,7 +56,7 @@ void check(DataOutBase::VtkFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_vtk_time.cc b/tests/base/data_out_base_vtk_time.cc
index a2989f7b29..fac2b60218 100644
--- a/tests/base/data_out_base_vtk_time.cc
+++ b/tests/base/data_out_base_vtk_time.cc
@@ -56,7 +56,7 @@ void check(DataOutBase::VtkFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_vtk_time_and_cycle.cc b/tests/base/data_out_base_vtk_time_and_cycle.cc
index 99bd333bd0..2ae8c18da1 100644
--- a/tests/base/data_out_base_vtk_time_and_cycle.cc
+++ b/tests/base/data_out_base_vtk_time_and_cycle.cc
@@ -56,7 +56,7 @@ void check(DataOutBase::VtkFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_vtu.cc b/tests/base/data_out_base_vtu.cc
index 52f4e64aa8..80556a0219 100644
--- a/tests/base/data_out_base_vtu.cc
+++ b/tests/base/data_out_base_vtu.cc
@@ -53,7 +53,7 @@ void check(DataOutBase::VtkFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_vtu_compression_levels.cc b/tests/base/data_out_base_vtu_compression_levels.cc
index c2cd7a9546..0fe95c9af8 100644
--- a/tests/base/data_out_base_vtu_compression_levels.cc
+++ b/tests/base/data_out_base_vtu_compression_levels.cc
@@ -47,7 +47,7 @@ void check(DataOutBase::VtkFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
   for (unsigned int i = 0; i < 4; ++i)
diff --git a/tests/base/data_out_base_vtu_cycle.cc b/tests/base/data_out_base_vtu_cycle.cc
index d0ff491e86..33543bea53 100644
--- a/tests/base/data_out_base_vtu_cycle.cc
+++ b/tests/base/data_out_base_vtu_cycle.cc
@@ -55,7 +55,7 @@ void check(DataOutBase::VtkFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_vtu_time.cc b/tests/base/data_out_base_vtu_time.cc
index f46e7232f3..6f7fb0dab4 100644
--- a/tests/base/data_out_base_vtu_time.cc
+++ b/tests/base/data_out_base_vtu_time.cc
@@ -55,7 +55,7 @@ void check(DataOutBase::VtkFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/data_out_base_vtu_time_and_cycle.cc b/tests/base/data_out_base_vtu_time_and_cycle.cc
index b481874a90..b02630c0c7 100644
--- a/tests/base/data_out_base_vtu_time_and_cycle.cc
+++ b/tests/base/data_out_base_vtu_time_and_cycle.cc
@@ -56,7 +56,7 @@ void check(DataOutBase::VtkFlags flags,
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
 #if SEPARATE_FILES == 0
diff --git a/tests/base/derivative_forms_01.cc b/tests/base/derivative_forms_01.cc
index 125903b233..d932d6c0cb 100644
--- a/tests/base/derivative_forms_01.cc
+++ b/tests/base/derivative_forms_01.cc
@@ -26,7 +26,7 @@
 typedef typename Sacado::Fad::DFad<double> Sdouble;
 typedef typename Sacado::Fad::DFad<Sdouble> SSdouble;
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   Tensor<1,dim,SSdouble> x;
diff --git a/tests/base/derivative_forms_02.cc b/tests/base/derivative_forms_02.cc
index edd6cd52c5..48b1549c73 100644
--- a/tests/base/derivative_forms_02.cc
+++ b/tests/base/derivative_forms_02.cc
@@ -20,7 +20,7 @@
 #include <deal.II/base/derivative_form.h>
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   DerivativeForm<1,dim,spacedim> dF;
diff --git a/tests/base/derivative_forms_03.cc b/tests/base/derivative_forms_03.cc
index 8bb3741556..2458772f4e 100644
--- a/tests/base/derivative_forms_03.cc
+++ b/tests/base/derivative_forms_03.cc
@@ -20,7 +20,7 @@
 #include <deal.II/base/derivative_form.h>
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   DerivativeForm<1,dim,spacedim,std::complex<double> > dF;
diff --git a/tests/base/derivative_forms_04.cc b/tests/base/derivative_forms_04.cc
index 88a674b34d..e6733ede95 100644
--- a/tests/base/derivative_forms_04.cc
+++ b/tests/base/derivative_forms_04.cc
@@ -20,7 +20,7 @@
 #include <deal.II/base/derivative_form.h>
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   DerivativeForm<1,dim,spacedim,std::complex<double> > dF;
diff --git a/tests/base/function_derivative.cc b/tests/base/function_derivative.cc
index 2b10618fb0..85b2276805 100644
--- a/tests/base/function_derivative.cc
+++ b/tests/base/function_derivative.cc
@@ -30,7 +30,7 @@
 #include <string>
 
 
-template<int dim>
+template <int dim>
 void
 check_derivative_order(const std::vector<Tensor<1,dim> > &gradients,
                        FunctionDerivative<dim> &df,
@@ -67,7 +67,7 @@ check_derivative_order(const std::vector<Tensor<1,dim> > &gradients,
 }
 
 
-template<int dim>
+template <int dim>
 void
 check_hessian_order(const std::vector<double> &values,
                     FunctionDerivative<dim> &df,
@@ -113,7 +113,7 @@ check_hessian_order(const std::vector<double> &values,
 }
 
 
-template<int dim>
+template <int dim>
 void
 check_sine(unsigned int nquad)
 {
diff --git a/tests/base/functions.h b/tests/base/functions.h
index 580d632d38..1f11f17ab7 100644
--- a/tests/base/functions.h
+++ b/tests/base/functions.h
@@ -23,7 +23,7 @@
 // quadrature points in each direction, and the threshold above which
 // we consider values unequal
 
-template<int dim>
+template <int dim>
 void
 check_function_value_consistency(
   const Function<dim> &f,
@@ -60,7 +60,7 @@ check_function_value_consistency(
 }
 
 // Same for gradients
-template<int dim>
+template <int dim>
 void
 check_function_gradient_consistency(
   const Function<dim> &f,
@@ -148,7 +148,7 @@ DerivativeTestFunction<dim>::vector_value_list (
 }
 
 
-template<int dim>
+template <int dim>
 void DerivativeTestFunction<dim>::vector_value (
   const Point<dim> &point,
   Vector<double> &value) const
@@ -157,7 +157,7 @@ void DerivativeTestFunction<dim>::vector_value (
 }
 
 
-template<int dim>
+template <int dim>
 double DerivativeTestFunction<dim>::value (
   const Point<dim> &point,
   const unsigned int comp) const
@@ -169,7 +169,7 @@ double DerivativeTestFunction<dim>::value (
 
 
 // Check whether the difference quotients converge to the gradient
-template<int dim>
+template <int dim>
 void
 check_gradient(
   const Function<dim> &f,
diff --git a/tests/base/functions_04.cc b/tests/base/functions_04.cc
index c93d0a1ac1..533eeab600 100644
--- a/tests/base/functions_04.cc
+++ b/tests/base/functions_04.cc
@@ -33,7 +33,7 @@
 
 #include "functions.h"
 
-template<int dim>
+template <int dim>
 void
 check_function(const Functions::FlowFunction<dim> &f,
                unsigned int sub,
diff --git a/tests/base/functions_09.cc b/tests/base/functions_09.cc
index 46d4cef10d..b31affd490 100644
--- a/tests/base/functions_09.cc
+++ b/tests/base/functions_09.cc
@@ -22,7 +22,7 @@
 
 
 // Fill a tensor with values:
-template<int rank, int dim>
+template <int rank, int dim>
 struct FillTensor
 {
   static void fill_tensor(Tensor<rank, dim> &tensor, int base)
@@ -32,7 +32,7 @@ struct FillTensor
   }
 };
 
-template<int dim>
+template <int dim>
 struct FillTensor<1, dim>
 {
   static void fill_tensor(Tensor<1, dim> &tensor, int base)
@@ -45,7 +45,7 @@ struct FillTensor<1, dim>
 
 
 // Print a tensor of arbitrary rank to the console:
-template<int rank, int dim>
+template <int rank, int dim>
 struct PrintTensor
 {
   static void print_tensor(const Tensor<rank, dim> &tensor)
@@ -58,7 +58,7 @@ struct PrintTensor
   }
 };
 
-template<int dim>
+template <int dim>
 struct PrintTensor<1, dim>
 {
   static void print_tensor(const Tensor<1, dim> &tensor)
diff --git a/tests/base/functions_constant_function_00.cc b/tests/base/functions_constant_function_00.cc
index ac0def3811..386c59933a 100644
--- a/tests/base/functions_constant_function_00.cc
+++ b/tests/base/functions_constant_function_00.cc
@@ -171,7 +171,7 @@ void test_constructor(const unsigned int n_component,
 }
 
 // test different number of vector components
-template<int dim, typename Number>
+template <int dim, typename Number>
 void test_n_components(const std::vector<NUMBER> &component_data)
 {
 #define N_COMPONENT_CASE 3
diff --git a/tests/base/functions_singularity.cc b/tests/base/functions_singularity.cc
index bc0cc8698a..db120eec2d 100644
--- a/tests/base/functions_singularity.cc
+++ b/tests/base/functions_singularity.cc
@@ -33,7 +33,7 @@
 #include <fstream>
 #include <string>
 
-template<int dim>
+template <int dim>
 void
 check_function_consistency(
   const Function<dim> &f,
@@ -73,7 +73,7 @@ check_function_consistency(
 }
 
 
-template<int dim>
+template <int dim>
 void
 check_function_derivative(const Functions::FlowFunction<dim> &f,
                           unsigned int sub,
diff --git a/tests/base/functions_spherical_01.cc b/tests/base/functions_spherical_01.cc
index a258d02270..759b25f8ad 100644
--- a/tests/base/functions_spherical_01.cc
+++ b/tests/base/functions_spherical_01.cc
@@ -24,7 +24,7 @@
 
 
 // reference function f(x) = exp (-Z*r)
-template<int dim>
+template <int dim>
 class ExpFunc : public Function<dim>
 {
 public:
@@ -75,7 +75,7 @@ private:
 
 
 // same as above but using Functions::Spherical
-template<int dim>
+template <int dim>
 class ExpFunc2 : public Functions::Spherical<dim>
 {
 public:
diff --git a/tests/base/functions_spherical_02.cc b/tests/base/functions_spherical_02.cc
index e4f43e3027..6d7b475ca3 100644
--- a/tests/base/functions_spherical_02.cc
+++ b/tests/base/functions_spherical_02.cc
@@ -46,7 +46,7 @@ ddf2: (subst(srule2,expand(ddf)));
 
 
 
-template<int dim>
+template <int dim>
 class RefFunc : public Function<dim>
 {
 public:
@@ -119,7 +119,7 @@ private:
 
 
 // same as above but using Functions::Spherical
-template<int dim>
+template <int dim>
 class SphFunc : public Functions::Spherical<dim>
 {
 public:
diff --git a/tests/base/geometry_info_8.cc b/tests/base/geometry_info_8.cc
index 8d9573bb1d..f02ce31e01 100644
--- a/tests/base/geometry_info_8.cc
+++ b/tests/base/geometry_info_8.cc
@@ -29,7 +29,7 @@ using namespace dealii;
 //
 
 
-template<int dim>
+template <int dim>
 void test_vertices()
 {
   deallog << dim << "D:" << std::endl;
@@ -60,7 +60,7 @@ void test_vertices()
 }
 
 
-template<int dim>
+template <int dim>
 void test_lines()
 {
   deallog << dim << "D:" << std::endl;
diff --git a/tests/base/memory_consumption_02.cc b/tests/base/memory_consumption_02.cc
index b85187110d..b970c4bdac 100644
--- a/tests/base/memory_consumption_02.cc
+++ b/tests/base/memory_consumption_02.cc
@@ -17,7 +17,7 @@
 
 using namespace dealii;
 
-template<typename T>
+template <typename T>
 struct EqualityWithSizeofTest
 {
   EqualityWithSizeofTest()
@@ -34,7 +34,7 @@ struct EqualityWithSizeofTest
 };
 
 
-template<typename T>
+template <typename T>
 struct EqualityWithSizeofTest<T *>
 {
   EqualityWithSizeofTest()
diff --git a/tests/base/polynomial_test.cc b/tests/base/polynomial_test.cc
index 8f19773151..e75583f773 100644
--- a/tests/base/polynomial_test.cc
+++ b/tests/base/polynomial_test.cc
@@ -33,7 +33,7 @@
 using namespace Polynomials;
 
 
-template<int dim, class PolynomialType>
+template <int dim, class PolynomialType>
 void check_poly(const Point<dim>     &x,
                 const PolynomialType &p)
 {
diff --git a/tests/base/polynomials_tensor.cc b/tests/base/polynomials_tensor.cc
index 1afbbd6e8b..05c55b61b2 100644
--- a/tests/base/polynomials_tensor.cc
+++ b/tests/base/polynomials_tensor.cc
@@ -30,7 +30,7 @@
 
 using namespace std;
 
-template<int dim, class PolynomialType>
+template <int dim, class PolynomialType>
 void check_point (const Point<dim>     &x,
                   const PolynomialType &p)
 {
@@ -58,7 +58,7 @@ void check_point (const Point<dim>     &x,
 }
 
 
-template<int dim>
+template <int dim>
 void check_bdm ()
 {
   Point<dim> x;
@@ -79,7 +79,7 @@ void check_bdm ()
   check_point(x, p4);
 }
 
-template<int dim>
+template <int dim>
 void check_rt ()
 {
   Point<dim> x;
diff --git a/tests/base/qprojector.cc b/tests/base/qprojector.cc
index 035e1b3894..ea2c92fda9 100644
--- a/tests/base/qprojector.cc
+++ b/tests/base/qprojector.cc
@@ -26,7 +26,7 @@
 #include <deal.II/base/geometry_info.h>
 #include <cmath>
 
-template<int dim>
+template <int dim>
 void check_line(Quadrature<1> &quadrature)
 {
   Point<dim> p1;
@@ -54,7 +54,7 @@ void check_line(Quadrature<1> &quadrature)
   deallog << "length: " << s << std::endl;
 }
 
-template<int dim>
+template <int dim>
 void check_face(Quadrature<1> &q1)
 {
   deallog << "Checking dim " << dim
@@ -86,7 +86,7 @@ void check_face(Quadrature<1> &q1)
       }
 }
 
-template<int dim>
+template <int dim>
 void check_faces (Quadrature<1> &q1)
 {
   const unsigned int nq = q1.size();
diff --git a/tests/base/quadrature_chebyshev.cc b/tests/base/quadrature_chebyshev.cc
index 8beef1adbf..acc2d87865 100644
--- a/tests/base/quadrature_chebyshev.cc
+++ b/tests/base/quadrature_chebyshev.cc
@@ -31,7 +31,7 @@
 using namespace dealii;
 
 
-template<typename quadrature_type, unsigned short startn>
+template <typename quadrature_type, unsigned short startn>
 void check_quadrature (double *);
 void check_GRC_right(double *);
 
@@ -95,7 +95,7 @@ int main()
 }
 
 
-template<typename quadrature_type,unsigned short startn>
+template <typename quadrature_type,unsigned short startn>
 void check_quadrature(double *exact_monomials)
 {
 
diff --git a/tests/base/quadrature_point_data.cc b/tests/base/quadrature_point_data.cc
index bb9cdea24a..0a59b0e27b 100644
--- a/tests/base/quadrature_point_data.cc
+++ b/tests/base/quadrature_point_data.cc
@@ -43,7 +43,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
@@ -97,7 +97,7 @@ DeclException3 (ExcWrongValue,
 /**
  * Loop over quadrature points and check that value is the same as given by the function.
  */
-template<int dim,typename DATA>
+template <int dim,typename DATA>
 void check_qph(parallel::distributed::Triangulation<dim> &tr,
                const CellDataStorage<typename Triangulation<dim,dim>::cell_iterator,DATA> &manager,
                const Quadrature<dim> &rhs_quadrature,
@@ -128,7 +128,7 @@ void check_qph(parallel::distributed::Triangulation<dim> &tr,
   dof_handler.clear();
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/base/quadrature_point_data_02.cc b/tests/base/quadrature_point_data_02.cc
index f60677db2b..a2c9187d01 100644
--- a/tests/base/quadrature_point_data_02.cc
+++ b/tests/base/quadrature_point_data_02.cc
@@ -42,7 +42,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
@@ -99,7 +99,7 @@ DeclException3 (ExcWrongValue,
 /**
  * Loop over quadrature points and check that value is the same as given by the function.
  */
-template<int dim,typename DATA>
+template <int dim,typename DATA>
 void check_qph(parallel::distributed::Triangulation<dim> &tr,
                const CellDataStorage<typename Triangulation<dim,dim>::cell_iterator,DATA> &manager,
                const Quadrature<dim> &rhs_quadrature,
@@ -134,7 +134,7 @@ void check_qph(parallel::distributed::Triangulation<dim> &tr,
   dof_handler.clear();
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/base/quadrature_point_data_03.cc b/tests/base/quadrature_point_data_03.cc
index 24cdab3426..c91e6d584b 100644
--- a/tests/base/quadrature_point_data_03.cc
+++ b/tests/base/quadrature_point_data_03.cc
@@ -38,7 +38,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
@@ -105,7 +105,7 @@ DeclException3 (ExcWrongValue,
 /**
  * Loop over quadrature points and check that value is the same as given by the function.
  */
-template<int dim>
+template <int dim>
 void check_qph(parallel::distributed::Triangulation<dim> &tr,
                const CellDataStorage<typename Triangulation<dim,dim>::cell_iterator,MyDataBase> &manager,
                const Quadrature<dim> &rhs_quadrature,
@@ -140,7 +140,7 @@ void check_qph(parallel::distributed::Triangulation<dim> &tr,
   dof_handler.clear();
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/base/symmetric_tensor_36.cc b/tests/base/symmetric_tensor_36.cc
index 6311f66feb..d60b0903d0 100644
--- a/tests/base/symmetric_tensor_36.cc
+++ b/tests/base/symmetric_tensor_36.cc
@@ -31,18 +31,18 @@
 // for example, complex numbers cannot be converted to primitive numbers
 // So in these cases we disable the test if NumberType1 cannot be constructed
 // from NumberType2
-template<int rank, int dim,
-         template<int,int,typename> class TensorType,
-         typename NumberType1,
-         typename NumberType2>
+template <int rank, int dim,
+          template <int,int,typename> class TensorType,
+          typename NumberType1,
+          typename NumberType2>
 typename std::enable_if<!std::is_constructible<NumberType1,NumberType2>::value,void>::type
 test_tensor_constructor (const std::string &, const std::string &)
 {}
 
-template<int rank, int dim,
-         template<int,int,typename> class TensorType,
-         typename NumberType1,
-         typename NumberType2>
+template <int rank, int dim,
+          template <int,int,typename> class TensorType,
+          typename NumberType1,
+          typename NumberType2>
 typename std::enable_if<std::is_constructible<NumberType1,NumberType2>::value,void>::type
 test_tensor_constructor (const std::string &type1, const std::string &type2)
 {
@@ -58,9 +58,9 @@ test_tensor_constructor (const std::string &type1, const std::string &type2)
   deallog << "OK" << std::endl;
 }
 
-template<int rank, int dim,
-         template<int,int,typename> class TensorType,
-         typename NumberType1>
+template <int rank, int dim,
+          template <int,int,typename> class TensorType,
+          typename NumberType1>
 void
 test_fixed_NT_2(const std::string &type1)
 {
@@ -70,8 +70,8 @@ test_fixed_NT_2(const std::string &type1)
   test_tensor_constructor<rank,dim,TensorType,NumberType1,std::complex<double> >(type1, "std::complex<double>");
 }
 
-template<int rank, int dim,
-         template<int,int,typename> class TensorType>
+template <int rank, int dim,
+          template <int,int,typename> class TensorType>
 void
 test_fixed_NT_1()
 {
@@ -81,7 +81,7 @@ test_fixed_NT_1()
   test_fixed_NT_2<rank,dim,TensorType,std::complex<double> >("std::complex<double>");
 }
 
-template<int rank, int dim>
+template <int rank, int dim>
 void
 test_fixed_TensorType()
 {
@@ -89,7 +89,7 @@ test_fixed_TensorType()
   test_fixed_NT_1<rank,dim,SymmetricTensor>();
 }
 
-template<int dim>
+template <int dim>
 void
 test_fixed_rank()
 {
diff --git a/tests/base/symmetric_tensor_37.cc b/tests/base/symmetric_tensor_37.cc
index 87766712da..1cc4216bd1 100644
--- a/tests/base/symmetric_tensor_37.cc
+++ b/tests/base/symmetric_tensor_37.cc
@@ -26,9 +26,9 @@
 
 // Although not strictly required, in this test it is expected that T1 or T3
 // (or both) are a symmetric tensor
-template<int rank1, int rank2, int rank3, int dim, typename number,
-         template<int,int,typename> class T1,
-         template<int,int,typename> class T3>
+template <int rank1, int rank2, int rank3, int dim, typename number,
+          template <int,int,typename> class T1,
+          template <int,int,typename> class T3>
 void test_symm_tensor_contract_3(const T1<rank1,dim,number>     &l,
                                  const Tensor<rank2,dim,number> &m,
                                  const T3<rank3,dim,number>     &r)
diff --git a/tests/base/table_05.cc b/tests/base/table_05.cc
index cedfef2a7e..cdb5989285 100644
--- a/tests/base/table_05.cc
+++ b/tests/base/table_05.cc
@@ -25,7 +25,7 @@
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/table.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   dealii::TableIndices<dim> new_size;
diff --git a/tests/base/work_stream_03.cc b/tests/base/work_stream_03.cc
index 300511b0dd..35cbd936d2 100644
--- a/tests/base/work_stream_03.cc
+++ b/tests/base/work_stream_03.cc
@@ -38,7 +38,7 @@
 #include <vector>
 
 
-template<int dim>
+template <int dim>
 double
 value(const Point<dim> &p)
 {
@@ -51,7 +51,7 @@ value(const Point<dim> &p)
 
 namespace
 {
-  template<int dim>
+  template <int dim>
   struct Scratch
   {
     Scratch(const FiniteElement<dim> &fe, const Quadrature<dim> &quadrature) :
@@ -100,7 +100,7 @@ zero_element(std::vector<double> &dst,
 }
 
 
-template<int dim>
+template <int dim>
 void
 mass_assembler(const typename Triangulation<dim>::active_cell_iterator &cell,
                Scratch<dim> &data, CopyData &copy_data)
diff --git a/tests/base/work_stream_03_graph.cc b/tests/base/work_stream_03_graph.cc
index 399c83300c..b229235097 100644
--- a/tests/base/work_stream_03_graph.cc
+++ b/tests/base/work_stream_03_graph.cc
@@ -35,7 +35,7 @@
 #include <vector>
 
 
-template<int dim>
+template <int dim>
 double
 value(const Point<dim> &p)
 {
@@ -48,7 +48,7 @@ value(const Point<dim> &p)
 
 namespace
 {
-  template<int dim>
+  template <int dim>
   struct Scratch
   {
     Scratch(const FiniteElement<dim> &fe, const Quadrature<dim> &quadrature) :
@@ -97,7 +97,7 @@ zero_element(std::vector<double> &dst,
 }
 
 
-template<int dim>
+template <int dim>
 void
 mass_assembler(const typename Triangulation<dim>::active_cell_iterator &cell,
                Scratch<dim> &data, CopyData &copy_data)
diff --git a/tests/bits/deal_solver_04.cc b/tests/bits/deal_solver_04.cc
index c559b42a24..ffd604e98f 100644
--- a/tests/bits/deal_solver_04.cc
+++ b/tests/bits/deal_solver_04.cc
@@ -37,7 +37,7 @@
 #include <deal.II/lac/precondition.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/bits/deal_solver_05.cc b/tests/bits/deal_solver_05.cc
index 51de7ea809..82633e0ac2 100644
--- a/tests/bits/deal_solver_05.cc
+++ b/tests/bits/deal_solver_05.cc
@@ -36,7 +36,7 @@
 #include <deal.II/lac/precondition.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/bits/error_estimator_01.cc b/tests/bits/error_estimator_01.cc
index 7eb924d6db..9886076d08 100644
--- a/tests/bits/error_estimator_01.cc
+++ b/tests/bits/error_estimator_01.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/error_estimator_02.cc b/tests/bits/error_estimator_02.cc
index 56aa933862..5e732cdbbf 100644
--- a/tests/bits/error_estimator_02.cc
+++ b/tests/bits/error_estimator_02.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/fe_field_function_04.cc b/tests/bits/fe_field_function_04.cc
index cfc81b9622..2c1f09da56 100644
--- a/tests/bits/fe_field_function_04.cc
+++ b/tests/bits/fe_field_function_04.cc
@@ -44,7 +44,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   const HyperBallBoundary<dim> boundary_description;
diff --git a/tests/bits/fe_field_function_04_vector.cc b/tests/bits/fe_field_function_04_vector.cc
index fed0179a4e..7da555a253 100644
--- a/tests/bits/fe_field_function_04_vector.cc
+++ b/tests/bits/fe_field_function_04_vector.cc
@@ -47,7 +47,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   const HyperBallBoundary<dim> boundary_description;
diff --git a/tests/bits/fe_field_function_05.cc b/tests/bits/fe_field_function_05.cc
index 57d01d0a3c..5a63afbc11 100644
--- a/tests/bits/fe_field_function_05.cc
+++ b/tests/bits/fe_field_function_05.cc
@@ -48,7 +48,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   const HyperBallBoundary<dim> boundary_description;
diff --git a/tests/bits/fe_field_function_05_vector.cc b/tests/bits/fe_field_function_05_vector.cc
index 11bf4d24de..32fe9be6d3 100644
--- a/tests/bits/fe_field_function_05_vector.cc
+++ b/tests/bits/fe_field_function_05_vector.cc
@@ -52,7 +52,7 @@ public:
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   const HyperBallBoundary<dim> boundary_description;
diff --git a/tests/bits/fe_field_function_06_vector.cc b/tests/bits/fe_field_function_06_vector.cc
index 287589f2ad..c547a98b4a 100644
--- a/tests/bits/fe_field_function_06_vector.cc
+++ b/tests/bits/fe_field_function_06_vector.cc
@@ -52,7 +52,7 @@ public:
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   const HyperBallBoundary<dim> boundary_description;
diff --git a/tests/bits/fe_field_function_07_vector.cc b/tests/bits/fe_field_function_07_vector.cc
index 3fb40176f4..2d255e5882 100644
--- a/tests/bits/fe_field_function_07_vector.cc
+++ b/tests/bits/fe_field_function_07_vector.cc
@@ -61,7 +61,7 @@ public:
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   const HyperBallBoundary<dim> boundary_description;
diff --git a/tests/bits/fe_field_function_08_vector.cc b/tests/bits/fe_field_function_08_vector.cc
index aab8bc5e4e..185d8f2495 100644
--- a/tests/bits/fe_field_function_08_vector.cc
+++ b/tests/bits/fe_field_function_08_vector.cc
@@ -61,7 +61,7 @@ public:
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   const HyperBallBoundary<dim> boundary_description;
diff --git a/tests/bits/fe_system.cc b/tests/bits/fe_system.cc
index c0e07ac0e4..ff69cbbd92 100644
--- a/tests/bits/fe_system.cc
+++ b/tests/bits/fe_system.cc
@@ -40,7 +40,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   // 0 components is not okay
diff --git a/tests/bits/point_difference_01.cc b/tests/bits/point_difference_01.cc
index aac82aead3..bd3d7a692c 100644
--- a/tests/bits/point_difference_01.cc
+++ b/tests/bits/point_difference_01.cc
@@ -37,7 +37,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
@@ -57,7 +57,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 class MyExpFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/point_difference_02.cc b/tests/bits/point_difference_02.cc
index 6b11ccd3b6..2c9258f2c4 100644
--- a/tests/bits/point_difference_02.cc
+++ b/tests/bits/point_difference_02.cc
@@ -41,7 +41,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
@@ -61,7 +61,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 class MyExpFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/point_gradient_01.cc b/tests/bits/point_gradient_01.cc
index 5c5dd04921..74661b81f8 100644
--- a/tests/bits/point_gradient_01.cc
+++ b/tests/bits/point_gradient_01.cc
@@ -36,7 +36,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
@@ -72,7 +72,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 class MyExpFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/point_gradient_02.cc b/tests/bits/point_gradient_02.cc
index bec0b660a6..74221772a7 100644
--- a/tests/bits/point_gradient_02.cc
+++ b/tests/bits/point_gradient_02.cc
@@ -37,7 +37,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
@@ -73,7 +73,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 class MyExpFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/point_gradient_hp_01.cc b/tests/bits/point_gradient_hp_01.cc
index 7f92eb07ce..ae5fc80d25 100644
--- a/tests/bits/point_gradient_hp_01.cc
+++ b/tests/bits/point_gradient_hp_01.cc
@@ -37,7 +37,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
@@ -73,7 +73,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 class MyExpFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/point_gradient_hp_02.cc b/tests/bits/point_gradient_hp_02.cc
index 8405ab7014..41c1f7fdf9 100644
--- a/tests/bits/point_gradient_hp_02.cc
+++ b/tests/bits/point_gradient_hp_02.cc
@@ -38,7 +38,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
@@ -74,7 +74,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 class MyExpFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/point_value_01.cc b/tests/bits/point_value_01.cc
index c3ab8a2ee5..4bf5485e4d 100644
--- a/tests/bits/point_value_01.cc
+++ b/tests/bits/point_value_01.cc
@@ -36,7 +36,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
@@ -56,7 +56,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 class MyExpFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/point_value_02.cc b/tests/bits/point_value_02.cc
index a5405471b5..7656cb761c 100644
--- a/tests/bits/point_value_02.cc
+++ b/tests/bits/point_value_02.cc
@@ -37,7 +37,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
@@ -57,7 +57,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 class MyExpFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/point_value_hp_01.cc b/tests/bits/point_value_hp_01.cc
index 6a7aea8c76..8fa5373946 100644
--- a/tests/bits/point_value_hp_01.cc
+++ b/tests/bits/point_value_hp_01.cc
@@ -37,7 +37,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
@@ -57,7 +57,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 class MyExpFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/point_value_hp_02.cc b/tests/bits/point_value_hp_02.cc
index e2898cb955..b444cae9a2 100644
--- a/tests/bits/point_value_hp_02.cc
+++ b/tests/bits/point_value_hp_02.cc
@@ -38,7 +38,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
@@ -58,7 +58,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 class MyExpFunction : public Function<dim>
 {
 public:
diff --git a/tests/bits/solution_transfer.cc b/tests/bits/solution_transfer.cc
index 598f102988..bdf97a8848 100644
--- a/tests/bits/solution_transfer.cc
+++ b/tests/bits/solution_transfer.cc
@@ -39,7 +39,7 @@
 #include <vector>
 
 
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
diff --git a/tests/codim_one/bem.cc b/tests/codim_one/bem.cc
index 2733a2dc53..3641aae9bc 100644
--- a/tests/codim_one/bem.cc
+++ b/tests/codim_one/bem.cc
@@ -54,7 +54,7 @@
 
 std::ofstream logfile("output");
 
-template<int spacedim>
+template <int spacedim>
 class BEM
 {
 
diff --git a/tests/codim_one/error_estimator_01.cc b/tests/codim_one/error_estimator_01.cc
index aef5dc3313..97399c9f8d 100644
--- a/tests/codim_one/error_estimator_01.cc
+++ b/tests/codim_one/error_estimator_01.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
@@ -67,7 +67,7 @@ get_q_face ()
   return q;
 }
 
-template<>
+template <>
 Quadrature<0> &
 get_q_face <1>()
 {
diff --git a/tests/codim_one/error_estimator_02.cc b/tests/codim_one/error_estimator_02.cc
index c08315fbdb..90ee742361 100644
--- a/tests/codim_one/error_estimator_02.cc
+++ b/tests/codim_one/error_estimator_02.cc
@@ -40,7 +40,7 @@
 
 
 // function is x^2+2xy
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
@@ -62,7 +62,7 @@ public:
 
 
 // normal derivative of function above is 0 except for x=1, y=1 with n=(0,1,0)
-template<int dim>
+template <int dim>
 class MyNormalDerivative : public Function<dim>
 {
 public:
@@ -97,7 +97,7 @@ get_q_face ()
   return q;
 }
 
-template<>
+template <>
 Quadrature<0> &
 get_q_face <1>()
 {
diff --git a/tests/codim_one/mapping_fe_field_01.cc b/tests/codim_one/mapping_fe_field_01.cc
index 0b5fedca95..80b48cc28e 100644
--- a/tests/codim_one/mapping_fe_field_01.cc
+++ b/tests/codim_one/mapping_fe_field_01.cc
@@ -43,7 +43,7 @@
 #include <deal.II/fe/mapping_q_eulerian.h>
 #include <deal.II/fe/mapping_fe_field.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test(const unsigned int refs,
           const unsigned int degree,
           const unsigned int subdivisions)
diff --git a/tests/distributed_grids/2d_coarse_grid_01.cc b/tests/distributed_grids/2d_coarse_grid_01.cc
index 3beff04908..1ddcdb70c7 100644
--- a/tests/distributed_grids/2d_coarse_grid_01.cc
+++ b/tests/distributed_grids/2d_coarse_grid_01.cc
@@ -29,7 +29,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   if (true)
diff --git a/tests/distributed_grids/2d_coarse_grid_02.cc b/tests/distributed_grids/2d_coarse_grid_02.cc
index 75165dd1b6..93032f8999 100644
--- a/tests/distributed_grids/2d_coarse_grid_02.cc
+++ b/tests/distributed_grids/2d_coarse_grid_02.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_coarse_grid_03.cc b/tests/distributed_grids/2d_coarse_grid_03.cc
index 24d8d81a11..742ae41cc8 100644
--- a/tests/distributed_grids/2d_coarse_grid_03.cc
+++ b/tests/distributed_grids/2d_coarse_grid_03.cc
@@ -29,7 +29,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_coarse_grid_04.cc b/tests/distributed_grids/2d_coarse_grid_04.cc
index 48ec887525..6cb85a5574 100644
--- a/tests/distributed_grids/2d_coarse_grid_04.cc
+++ b/tests/distributed_grids/2d_coarse_grid_04.cc
@@ -28,7 +28,7 @@
 #include <deal.II/grid/grid_in.h>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_coarse_grid_x_01.cc b/tests/distributed_grids/2d_coarse_grid_x_01.cc
index a328e16110..01369e96dc 100644
--- a/tests/distributed_grids/2d_coarse_grid_x_01.cc
+++ b/tests/distributed_grids/2d_coarse_grid_x_01.cc
@@ -30,7 +30,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   if (true)
diff --git a/tests/distributed_grids/2d_coarsening_01.cc b/tests/distributed_grids/2d_coarsening_01.cc
index 8888fadbe2..275d5e526f 100644
--- a/tests/distributed_grids/2d_coarsening_01.cc
+++ b/tests/distributed_grids/2d_coarsening_01.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_coarsening_02.cc b/tests/distributed_grids/2d_coarsening_02.cc
index 1353a1e2c4..12588f0228 100644
--- a/tests/distributed_grids/2d_coarsening_02.cc
+++ b/tests/distributed_grids/2d_coarsening_02.cc
@@ -47,7 +47,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_coarsening_03.cc b/tests/distributed_grids/2d_coarsening_03.cc
index 64fa4ba900..1a772c9887 100644
--- a/tests/distributed_grids/2d_coarsening_03.cc
+++ b/tests/distributed_grids/2d_coarsening_03.cc
@@ -34,7 +34,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_coarsening_05.cc b/tests/distributed_grids/2d_coarsening_05.cc
index 21c5c4b010..bc267f050c 100644
--- a/tests/distributed_grids/2d_coarsening_05.cc
+++ b/tests/distributed_grids/2d_coarsening_05.cc
@@ -37,7 +37,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_dofhandler_01.cc b/tests/distributed_grids/2d_dofhandler_01.cc
index a169d771a8..6b1a6d6654 100644
--- a/tests/distributed_grids/2d_dofhandler_01.cc
+++ b/tests/distributed_grids/2d_dofhandler_01.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   deallog << "hyper_cube" << std::endl;
diff --git a/tests/distributed_grids/2d_refinement_01.cc b/tests/distributed_grids/2d_refinement_01.cc
index bf23acd719..8643b296ac 100644
--- a/tests/distributed_grids/2d_refinement_01.cc
+++ b/tests/distributed_grids/2d_refinement_01.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_refinement_02.cc b/tests/distributed_grids/2d_refinement_02.cc
index 0c16f45324..d4001ccdc4 100644
--- a/tests/distributed_grids/2d_refinement_02.cc
+++ b/tests/distributed_grids/2d_refinement_02.cc
@@ -50,7 +50,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_refinement_03.cc b/tests/distributed_grids/2d_refinement_03.cc
index df522d3d44..2b6e19f994 100644
--- a/tests/distributed_grids/2d_refinement_03.cc
+++ b/tests/distributed_grids/2d_refinement_03.cc
@@ -34,7 +34,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_refinement_04.cc b/tests/distributed_grids/2d_refinement_04.cc
index 99a3ce1fd4..d3fd13ddd1 100644
--- a/tests/distributed_grids/2d_refinement_04.cc
+++ b/tests/distributed_grids/2d_refinement_04.cc
@@ -39,7 +39,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   for (unsigned int i=0; i<GeometryInfo<dim>::max_children_per_cell; ++i)
diff --git a/tests/distributed_grids/2d_refinement_05.cc b/tests/distributed_grids/2d_refinement_05.cc
index 5663696e1b..888d98e065 100644
--- a/tests/distributed_grids/2d_refinement_05.cc
+++ b/tests/distributed_grids/2d_refinement_05.cc
@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_refinement_06.cc b/tests/distributed_grids/2d_refinement_06.cc
index 7aaa457ce8..863c782727 100644
--- a/tests/distributed_grids/2d_refinement_06.cc
+++ b/tests/distributed_grids/2d_refinement_06.cc
@@ -34,7 +34,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   {
diff --git a/tests/distributed_grids/2d_refinement_07.cc b/tests/distributed_grids/2d_refinement_07.cc
index 6961e0387d..503c4253b7 100644
--- a/tests/distributed_grids/2d_refinement_07.cc
+++ b/tests/distributed_grids/2d_refinement_07.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/2d_refinement_10.cc b/tests/distributed_grids/2d_refinement_10.cc
index 0b19ca1d25..bdb9c2c820 100644
--- a/tests/distributed_grids/2d_refinement_10.cc
+++ b/tests/distributed_grids/2d_refinement_10.cc
@@ -46,9 +46,9 @@ using namespace dealii;
 // mesh, uncomment the following macro definition.
 // #define __WRITE_VTU__
 
-template<int dim> class Location;
+template <int dim> class Location;
 
-template<int dim>
+template <int dim>
 class TriaTest
 {
 private:
@@ -68,7 +68,7 @@ private:
 };
 
 // Equip class Point<dim> with operator < in order to sort the cell center coordinates.
-template<int dim>
+template <int dim>
 class Location: public Point<dim>
 {
 public:
@@ -172,7 +172,7 @@ int main (int argc, char *argv[])
   return (0);
 }
 
-template<int dim>
+template <int dim>
 TriaTest<dim>::TriaTest(const typename dealii::Triangulation<dim>::MeshSmoothing smoothing_option)
   :
   mpi_communicator(MPI_COMM_WORLD),
@@ -200,7 +200,7 @@ TriaTest<dim>::TriaTest(const typename dealii::Triangulation<dim>::MeshSmoothing
   // triangulation.refine_global(1);
 }
 
-template<int dim>
+template <int dim>
 void TriaTest<dim>::run(std::vector<unsigned int> &n_cell,
                         std::set<Location<dim> > &position_list)
 {
@@ -272,7 +272,7 @@ void TriaTest<dim>::run(std::vector<unsigned int> &n_cell,
   return;
 }
 
-template<int dim>
+template <int dim>
 void TriaTest<dim>::write_vtu(const unsigned int counter) const
 {
 #ifdef __WRITE_VTU__
diff --git a/tests/distributed_grids/3d_coarse_grid_01.cc b/tests/distributed_grids/3d_coarse_grid_01.cc
index c0b7efe740..d2578f64d0 100644
--- a/tests/distributed_grids/3d_coarse_grid_01.cc
+++ b/tests/distributed_grids/3d_coarse_grid_01.cc
@@ -29,7 +29,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   if (true)
diff --git a/tests/distributed_grids/3d_coarse_grid_02.cc b/tests/distributed_grids/3d_coarse_grid_02.cc
index 05fa88684a..887523b413 100644
--- a/tests/distributed_grids/3d_coarse_grid_02.cc
+++ b/tests/distributed_grids/3d_coarse_grid_02.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test(const char *filename)
 {
   const char *p = strrchr(filename,'/');
diff --git a/tests/distributed_grids/3d_coarse_grid_03.cc b/tests/distributed_grids/3d_coarse_grid_03.cc
index 7e0af4d3e9..e89a59a7b8 100644
--- a/tests/distributed_grids/3d_coarse_grid_03.cc
+++ b/tests/distributed_grids/3d_coarse_grid_03.cc
@@ -29,7 +29,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_coarse_grid_04.cc b/tests/distributed_grids/3d_coarse_grid_04.cc
index 213f33d20f..73af506941 100644
--- a/tests/distributed_grids/3d_coarse_grid_04.cc
+++ b/tests/distributed_grids/3d_coarse_grid_04.cc
@@ -28,7 +28,7 @@
 #include <deal.II/grid/grid_in.h>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_coarse_grid_05.cc b/tests/distributed_grids/3d_coarse_grid_05.cc
index 548362e84a..b05d8ab8a0 100644
--- a/tests/distributed_grids/3d_coarse_grid_05.cc
+++ b/tests/distributed_grids/3d_coarse_grid_05.cc
@@ -131,7 +131,7 @@ void create_disconnected_mesh (Triangulation<dim> &tria)
 
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_coarse_grid_06.cc b/tests/distributed_grids/3d_coarse_grid_06.cc
index 5b4288dcd6..fe48a3d3a0 100644
--- a/tests/distributed_grids/3d_coarse_grid_06.cc
+++ b/tests/distributed_grids/3d_coarse_grid_06.cc
@@ -29,7 +29,7 @@
 #include <deal.II/grid/grid_in.h>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_coarse_grid_x_01.cc b/tests/distributed_grids/3d_coarse_grid_x_01.cc
index 0838df6467..57a46ff061 100644
--- a/tests/distributed_grids/3d_coarse_grid_x_01.cc
+++ b/tests/distributed_grids/3d_coarse_grid_x_01.cc
@@ -30,7 +30,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   if (true)
diff --git a/tests/distributed_grids/3d_coarsening_01.cc b/tests/distributed_grids/3d_coarsening_01.cc
index 73e7e3ae7d..39744a66f6 100644
--- a/tests/distributed_grids/3d_coarsening_01.cc
+++ b/tests/distributed_grids/3d_coarsening_01.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_coarsening_02.cc b/tests/distributed_grids/3d_coarsening_02.cc
index 54e2b50cca..288a025ed6 100644
--- a/tests/distributed_grids/3d_coarsening_02.cc
+++ b/tests/distributed_grids/3d_coarsening_02.cc
@@ -47,7 +47,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_coarsening_03.cc b/tests/distributed_grids/3d_coarsening_03.cc
index 27f8e95a94..f5c3516c77 100644
--- a/tests/distributed_grids/3d_coarsening_03.cc
+++ b/tests/distributed_grids/3d_coarsening_03.cc
@@ -34,7 +34,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_coarsening_04.cc b/tests/distributed_grids/3d_coarsening_04.cc
index 779a9de6e8..7a4c707d34 100644
--- a/tests/distributed_grids/3d_coarsening_04.cc
+++ b/tests/distributed_grids/3d_coarsening_04.cc
@@ -34,7 +34,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_coarsening_05.cc b/tests/distributed_grids/3d_coarsening_05.cc
index 87efb526d4..3cb9a8202a 100644
--- a/tests/distributed_grids/3d_coarsening_05.cc
+++ b/tests/distributed_grids/3d_coarsening_05.cc
@@ -37,7 +37,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_refinement_01.cc b/tests/distributed_grids/3d_refinement_01.cc
index 9dd63fbf25..c59be66d80 100644
--- a/tests/distributed_grids/3d_refinement_01.cc
+++ b/tests/distributed_grids/3d_refinement_01.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_refinement_02.cc b/tests/distributed_grids/3d_refinement_02.cc
index ea514fbdf2..c5f61f16d9 100644
--- a/tests/distributed_grids/3d_refinement_02.cc
+++ b/tests/distributed_grids/3d_refinement_02.cc
@@ -50,7 +50,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_refinement_03.cc b/tests/distributed_grids/3d_refinement_03.cc
index e4e8f08487..2e59f2763a 100644
--- a/tests/distributed_grids/3d_refinement_03.cc
+++ b/tests/distributed_grids/3d_refinement_03.cc
@@ -34,7 +34,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_refinement_04.cc b/tests/distributed_grids/3d_refinement_04.cc
index 2dd476d422..b9bd1c1ce1 100644
--- a/tests/distributed_grids/3d_refinement_04.cc
+++ b/tests/distributed_grids/3d_refinement_04.cc
@@ -39,7 +39,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   for (unsigned int i=0; i<GeometryInfo<dim>::max_children_per_cell; ++i)
diff --git a/tests/distributed_grids/3d_refinement_05.cc b/tests/distributed_grids/3d_refinement_05.cc
index 8d9fbcec98..71ae56b8f5 100644
--- a/tests/distributed_grids/3d_refinement_05.cc
+++ b/tests/distributed_grids/3d_refinement_05.cc
@@ -37,7 +37,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_refinement_06.cc b/tests/distributed_grids/3d_refinement_06.cc
index 4ec6626876..2eb263a853 100644
--- a/tests/distributed_grids/3d_refinement_06.cc
+++ b/tests/distributed_grids/3d_refinement_06.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   {
diff --git a/tests/distributed_grids/3d_refinement_07.cc b/tests/distributed_grids/3d_refinement_07.cc
index 71b78b0889..9096604f76 100644
--- a/tests/distributed_grids/3d_refinement_07.cc
+++ b/tests/distributed_grids/3d_refinement_07.cc
@@ -34,7 +34,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   {
diff --git a/tests/distributed_grids/3d_refinement_08.cc b/tests/distributed_grids/3d_refinement_08.cc
index e6093750ac..9ccc48a8b3 100644
--- a/tests/distributed_grids/3d_refinement_08.cc
+++ b/tests/distributed_grids/3d_refinement_08.cc
@@ -34,7 +34,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_refinement_09.cc b/tests/distributed_grids/3d_refinement_09.cc
index 1d155f131e..eca91f3a6f 100644
--- a/tests/distributed_grids/3d_refinement_09.cc
+++ b/tests/distributed_grids/3d_refinement_09.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/3d_refinement_12.cc b/tests/distributed_grids/3d_refinement_12.cc
index 21dc444f8f..b0a7f18f47 100644
--- a/tests/distributed_grids/3d_refinement_12.cc
+++ b/tests/distributed_grids/3d_refinement_12.cc
@@ -46,9 +46,9 @@ using namespace dealii;
 // mesh, uncomment the following macro definition.
 // #define __WRITE_VTU__
 
-template<int dim> class Location;
+template <int dim> class Location;
 
-template<int dim>
+template <int dim>
 class TriaTest
 {
 private:
@@ -68,7 +68,7 @@ private:
 };
 
 // Equip class Point<dim> with operator < in order to sort the cell center coordinates.
-template<int dim>
+template <int dim>
 class Location: public Point<dim>
 {
 public:
@@ -172,7 +172,7 @@ int main (int argc, char *argv[])
   return (0);
 }
 
-template<int dim>
+template <int dim>
 TriaTest<dim>::TriaTest(const typename dealii::Triangulation<dim>::MeshSmoothing smoothing_option)
   :
   mpi_communicator(MPI_COMM_WORLD),
@@ -200,7 +200,7 @@ TriaTest<dim>::TriaTest(const typename dealii::Triangulation<dim>::MeshSmoothing
   // triangulation.refine_global(1);
 }
 
-template<int dim>
+template <int dim>
 void TriaTest<dim>::run(std::vector<unsigned int> &n_cell,
                         std::set<Location<dim> > &position_list)
 {
@@ -272,7 +272,7 @@ void TriaTest<dim>::run(std::vector<unsigned int> &n_cell,
   return;
 }
 
-template<int dim>
+template <int dim>
 void TriaTest<dim>::write_vtu(const unsigned int counter) const
 {
 #ifdef __WRITE_VTU__
diff --git a/tests/distributed_grids/anisotropic.cc b/tests/distributed_grids/anisotropic.cc
index 6a06bdcf86..d128e23c6f 100644
--- a/tests/distributed_grids/anisotropic.cc
+++ b/tests/distributed_grids/anisotropic.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/codim_01.cc b/tests/distributed_grids/codim_01.cc
index 9030d56636..9a0dea398b 100644
--- a/tests/distributed_grids/codim_01.cc
+++ b/tests/distributed_grids/codim_01.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim,spacedim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/copy_tria_01.cc b/tests/distributed_grids/copy_tria_01.cc
index af57676276..235d0818c6 100644
--- a/tests/distributed_grids/copy_tria_01.cc
+++ b/tests/distributed_grids/copy_tria_01.cc
@@ -23,7 +23,7 @@
 #include <deal.II/distributed/tria.h>
 #include <deal.II/grid/grid_generator.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tr1;
diff --git a/tests/distributed_grids/count_dofs_per_block_01.cc b/tests/distributed_grids/count_dofs_per_block_01.cc
index efde0b7d24..0f58b056ac 100644
--- a/tests/distributed_grids/count_dofs_per_block_01.cc
+++ b/tests/distributed_grids/count_dofs_per_block_01.cc
@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/distributed_grids/count_dofs_per_component_01.cc b/tests/distributed_grids/count_dofs_per_component_01.cc
index fab83eaf97..f94dbc7729 100644
--- a/tests/distributed_grids/count_dofs_per_component_01.cc
+++ b/tests/distributed_grids/count_dofs_per_component_01.cc
@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/distributed_grids/dof_handler_number_cache.cc b/tests/distributed_grids/dof_handler_number_cache.cc
index 1db11648e8..9e06c852b2 100644
--- a/tests/distributed_grids/dof_handler_number_cache.cc
+++ b/tests/distributed_grids/dof_handler_number_cache.cc
@@ -39,7 +39,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/distributed_grids/solution_transfer_01.cc b/tests/distributed_grids/solution_transfer_01.cc
index 53958b9a6b..966d413d87 100644
--- a/tests/distributed_grids/solution_transfer_01.cc
+++ b/tests/distributed_grids/solution_transfer_01.cc
@@ -37,7 +37,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/solution_transfer_02.cc b/tests/distributed_grids/solution_transfer_02.cc
index dcaef9d4db..3c84946e9b 100644
--- a/tests/distributed_grids/solution_transfer_02.cc
+++ b/tests/distributed_grids/solution_transfer_02.cc
@@ -40,7 +40,7 @@
 #include <fstream>
 #include <cstdlib>
 
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
@@ -58,7 +58,7 @@ public:
   };
 };
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   MyFunction<dim> func;
diff --git a/tests/distributed_grids/solution_transfer_03.cc b/tests/distributed_grids/solution_transfer_03.cc
index 36d211b5a5..2b3c41149b 100644
--- a/tests/distributed_grids/solution_transfer_03.cc
+++ b/tests/distributed_grids/solution_transfer_03.cc
@@ -43,7 +43,7 @@
 
 #include <deal.II/grid/grid_out.h>
 
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
@@ -61,7 +61,7 @@ public:
   };
 };
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   MyFunction<dim> func;
diff --git a/tests/distributed_grids/solution_transfer_04.cc b/tests/distributed_grids/solution_transfer_04.cc
index 3b5c2ccfaf..5c025ebe13 100644
--- a/tests/distributed_grids/solution_transfer_04.cc
+++ b/tests/distributed_grids/solution_transfer_04.cc
@@ -37,7 +37,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/distributed_grids/tria_settings_01.cc b/tests/distributed_grids/tria_settings_01.cc
index 10d231b7bd..9dc6542c25 100644
--- a/tests/distributed_grids/tria_settings_01.cc
+++ b/tests/distributed_grids/tria_settings_01.cc
@@ -34,7 +34,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void testit(parallel::distributed::Triangulation<dim> &tr)
 {
   GridGenerator::hyper_cube(tr);
@@ -55,7 +55,7 @@ void testit(parallel::distributed::Triangulation<dim> &tr)
 }
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream & /*out*/)
 {
   {
diff --git a/tests/distributed_grids/update_number_cache_01.cc b/tests/distributed_grids/update_number_cache_01.cc
index 5e9dfd923c..dc702559a0 100644
--- a/tests/distributed_grids/update_number_cache_01.cc
+++ b/tests/distributed_grids/update_number_cache_01.cc
@@ -33,7 +33,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr (MPI_COMM_WORLD);
diff --git a/tests/dofs/accessor_01.cc b/tests/dofs/accessor_01.cc
index 884990e5bc..37c7c9a824 100644
--- a/tests/dofs/accessor_01.cc
+++ b/tests/dofs/accessor_01.cc
@@ -51,7 +51,7 @@ void test_in_dim(const DoFHandlerType &d1, const DoFHandlerType &d2)
 }
 
 
-template<int dim>
+template <int dim>
 void init_tria (Triangulation<dim> &tr)
 {
   GridGenerator::hyper_cube(tr);
@@ -59,7 +59,7 @@ void init_tria (Triangulation<dim> &tr)
 }
 
 
-template<int dim>
+template <int dim>
 void init_dofs (DoFHandler<dim> &dof,
                 const Triangulation<dim> &tr,
                 const FiniteElement<dim> &fe)
diff --git a/tests/dofs/block_info.cc b/tests/dofs/block_info.cc
index 42e288e61b..d6bbf90c60 100644
--- a/tests/dofs/block_info.cc
+++ b/tests/dofs/block_info.cc
@@ -72,7 +72,7 @@ void test_grid(const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_fe (const FiniteElement<dim> &fe)
 {
   Triangulation<dim> tr(Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/dofs/block_info_02.cc b/tests/dofs/block_info_02.cc
index 11bd1f38dd..35155ab7cb 100644
--- a/tests/dofs/block_info_02.cc
+++ b/tests/dofs/block_info_02.cc
@@ -75,7 +75,7 @@ void test_grid(const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_fe (const FiniteElement<dim> &fe)
 {
   Triangulation<dim> tr(Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/dofs/count_dofs_on_patch.cc b/tests/dofs/count_dofs_on_patch.cc
index 562ee2988e..adc3e20c22 100644
--- a/tests/dofs/count_dofs_on_patch.cc
+++ b/tests/dofs/count_dofs_on_patch.cc
@@ -34,7 +34,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/dofs/dof_handler_number_cache.cc b/tests/dofs/dof_handler_number_cache.cc
index ca10c3343a..1977cb4230 100644
--- a/tests/dofs/dof_handler_number_cache.cc
+++ b/tests/dofs/dof_handler_number_cache.cc
@@ -37,7 +37,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/dofs/dof_handler_number_cache_02.cc b/tests/dofs/dof_handler_number_cache_02.cc
index 989ba3f27e..a3aab6ac67 100644
--- a/tests/dofs/dof_handler_number_cache_02.cc
+++ b/tests/dofs/dof_handler_number_cache_02.cc
@@ -35,7 +35,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/dofs/dof_tools_21_b.cc b/tests/dofs/dof_tools_21_b.cc
index 6fa19858dc..7a4e24c696 100644
--- a/tests/dofs/dof_tools_21_b.cc
+++ b/tests/dofs/dof_tools_21_b.cc
@@ -193,7 +193,7 @@ void generate_grid(Triangulation<3> &triangulation, int orientation)
  * Print out all face DoFs and support points as well as the actual
  * matching via make_periodicity_constraints
  */
-template<int dim>
+template <int dim>
 void print_matching(DoFHandler<dim> &dof_handler, bool constrain_only_velocity = false)
 {
   const FiniteElement<dim> &fe = dof_handler.get_fe();
diff --git a/tests/dofs/dof_tools_21_b_x.cc b/tests/dofs/dof_tools_21_b_x.cc
index 8f0a5e380b..7da7e6b4ed 100644
--- a/tests/dofs/dof_tools_21_b_x.cc
+++ b/tests/dofs/dof_tools_21_b_x.cc
@@ -114,7 +114,7 @@ void generate_grid(Triangulation<2> &triangulation)
  * Print out all face DoFs and support points as well as the actual
  * matching via make_periodicity_constraints
  */
-template<int dim>
+template <int dim>
 void print_matching(DoFHandler<dim> &dof_handler)
 {
   const FiniteElement<dim> &fe = dof_handler.get_fe();
diff --git a/tests/dofs/dof_tools_21_b_x_q3.cc b/tests/dofs/dof_tools_21_b_x_q3.cc
index 77f7c5cbf6..a3b91a8825 100644
--- a/tests/dofs/dof_tools_21_b_x_q3.cc
+++ b/tests/dofs/dof_tools_21_b_x_q3.cc
@@ -148,7 +148,7 @@ void generate_grid(Triangulation<2> &triangulation)
  * Print out all face DoFs and support points as well as the actual
  * matching via make_periodicity_constraints
  */
-template<int dim>
+template <int dim>
 void print_matching(DoFHandler<dim> &dof_handler)
 {
   const FiniteElement<dim> &fe = dof_handler.get_fe();
diff --git a/tests/dofs/dof_tools_21_b_y.cc b/tests/dofs/dof_tools_21_b_y.cc
index c901f628e6..6f19f41ef8 100644
--- a/tests/dofs/dof_tools_21_b_y.cc
+++ b/tests/dofs/dof_tools_21_b_y.cc
@@ -113,7 +113,7 @@ void generate_grid(Triangulation<2> &triangulation)
  * Print out all face DoFs and support points as well as the actual
  * matching via make_periodicity_constraints
  */
-template<int dim>
+template <int dim>
 void print_matching(DoFHandler<dim> &dof_handler)
 {
   const FiniteElement<dim> &fe = dof_handler.get_fe();
diff --git a/tests/dofs/dof_tools_21_c.cc b/tests/dofs/dof_tools_21_c.cc
index 0b947c3814..64c1657003 100644
--- a/tests/dofs/dof_tools_21_c.cc
+++ b/tests/dofs/dof_tools_21_c.cc
@@ -198,7 +198,7 @@ void generate_grid(Triangulation<3> &triangulation, int orientation)
  * Print out all face DoFs and support points as well as the actual
  * matching via make_periodicity_constraints
  */
-template<int dim>
+template <int dim>
 void print_matching(DoFHandler<dim> &dof_handler, bool constrain_only_velocity = false)
 {
   const FiniteElement<dim> &fe = dof_handler.get_fe();
diff --git a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_01.cc b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_01.cc
index d6109093e3..6a3e12c4be 100644
--- a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_01.cc
+++ b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_01.cc
@@ -36,7 +36,7 @@
 #include <cstdio>
 
 
-template<int dim>
+template <int dim>
 bool
 pred_d(const typename DoFHandler<dim>::active_cell_iterator &cell)
 {
diff --git a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_02.cc b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_02.cc
index c5aab334a4..185226a97e 100644
--- a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_02.cc
+++ b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_02.cc
@@ -41,7 +41,7 @@
 #include <cstdio>
 
 
-template<int dim>
+template <int dim>
 bool
 pred_d(const typename DoFHandler<dim>::active_cell_iterator &cell)
 {
diff --git a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_03.cc b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_03.cc
index 5a83f05a6b..c01e3d1cd8 100644
--- a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_03.cc
+++ b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_03.cc
@@ -37,14 +37,14 @@
 #include <cstdio>
 
 
-template<int dim>
+template <int dim>
 bool
 pred_left(const typename DoFHandler<dim>::active_cell_iterator &cell)
 {
   return (cell->center()(0) < 0.49);
 }
 
-template<int dim>
+template <int dim>
 bool
 pred_right(const typename DoFHandler<dim>::active_cell_iterator &cell)
 {
@@ -52,7 +52,7 @@ pred_right(const typename DoFHandler<dim>::active_cell_iterator &cell)
 }
 
 
-template<int dim>
+template <int dim>
 bool
 pred_r(const typename Triangulation<dim>::active_cell_iterator &cell)
 {
diff --git a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_04.cc b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_04.cc
index 6c106e4605..9f34a9534e 100644
--- a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_04.cc
+++ b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_04.cc
@@ -51,14 +51,14 @@ std::string output_name(const unsigned int subdomain)
          ".vtu";
 }
 
-template<int dim>
+template <int dim>
 bool
 pred_d(const typename DoFHandler<dim>::active_cell_iterator &cell)
 {
   return (cell->center()(0) < 0.49);
 }
 
-template<int dim>
+template <int dim>
 bool
 pred_r(const typename Triangulation<dim>::active_cell_iterator &cell)
 {
diff --git a/tests/dofs/get_dofs_on_patch.cc b/tests/dofs/get_dofs_on_patch.cc
index d0b55c632b..d0101673ae 100644
--- a/tests/dofs/get_dofs_on_patch.cc
+++ b/tests/dofs/get_dofs_on_patch.cc
@@ -34,7 +34,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/dofs/locally_relevant_dofs_per_subdomain_01.cc b/tests/dofs/locally_relevant_dofs_per_subdomain_01.cc
index 0247a065ef..c109749dbf 100644
--- a/tests/dofs/locally_relevant_dofs_per_subdomain_01.cc
+++ b/tests/dofs/locally_relevant_dofs_per_subdomain_01.cc
@@ -58,7 +58,7 @@ void write_mesh (const parallel::shared::Triangulation<dim,spacedim> &tria,
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim>
diff --git a/tests/dofs/range_based_for_tria.cc b/tests/dofs/range_based_for_tria.cc
index 862272b8f9..b269e11b3a 100644
--- a/tests/dofs/range_based_for_tria.cc
+++ b/tests/dofs/range_based_for_tria.cc
@@ -29,7 +29,7 @@
 #include <string>
 
 
-template<int dim>
+template <int dim>
 void check()
 {
   Triangulation<dim> tr;
diff --git a/tests/fail/rt_4.cc b/tests/fail/rt_4.cc
index c1738a0fb3..3cd674f8bc 100644
--- a/tests/fail/rt_4.cc
+++ b/tests/fail/rt_4.cc
@@ -28,7 +28,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const unsigned int degree)
 {
diff --git a/tests/fail/vectors_boundary_rhs_hp_02.cc b/tests/fail/vectors_boundary_rhs_hp_02.cc
index 874cf518c4..0cc5e614d5 100644
--- a/tests/fail/vectors_boundary_rhs_hp_02.cc
+++ b/tests/fail/vectors_boundary_rhs_hp_02.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/fail/vectors_rhs_hp_02.cc b/tests/fail/vectors_rhs_hp_02.cc
index 11d36764ad..33712d147b 100644
--- a/tests/fail/vectors_rhs_hp_02.cc
+++ b/tests/fail/vectors_rhs_hp_02.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/fe/abf_03.cc b/tests/fe/abf_03.cc
index 34e0e4da89..c2e3aa35e2 100644
--- a/tests/fe/abf_03.cc
+++ b/tests/fe/abf_03.cc
@@ -25,7 +25,7 @@
 
 
 
-template<unsigned int dim>
+template <unsigned int dim>
 void test (const unsigned int degree)
 {
   FE_ABF<dim> fe(degree);
diff --git a/tests/fe/bdm_1.cc b/tests/fe/bdm_1.cc
index 09a2027984..445d516ced 100644
--- a/tests/fe/bdm_1.cc
+++ b/tests/fe/bdm_1.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_shape_functions(const unsigned int degree)
 {
diff --git a/tests/fe/bdm_10.cc b/tests/fe/bdm_10.cc
index c649efc5d2..69ab11dbd1 100644
--- a/tests/fe/bdm_10.cc
+++ b/tests/fe/bdm_10.cc
@@ -43,7 +43,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/bdm_11.cc b/tests/fe/bdm_11.cc
index e282f64deb..f09b116df4 100644
--- a/tests/fe/bdm_11.cc
+++ b/tests/fe/bdm_11.cc
@@ -49,7 +49,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/bdm_12.cc b/tests/fe/bdm_12.cc
index 6e2a3ba2e7..d2de4b23c2 100644
--- a/tests/fe/bdm_12.cc
+++ b/tests/fe/bdm_12.cc
@@ -42,7 +42,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/bdm_13.cc b/tests/fe/bdm_13.cc
index 05bde971ca..c583bcf6b6 100644
--- a/tests/fe/bdm_13.cc
+++ b/tests/fe/bdm_13.cc
@@ -47,7 +47,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/bdm_14.cc b/tests/fe/bdm_14.cc
index 2b1d50db01..dc122ef058 100644
--- a/tests/fe/bdm_14.cc
+++ b/tests/fe/bdm_14.cc
@@ -47,7 +47,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/bdm_15.cc b/tests/fe/bdm_15.cc
index f07bb57f9d..bf0adeecf0 100644
--- a/tests/fe/bdm_15.cc
+++ b/tests/fe/bdm_15.cc
@@ -47,7 +47,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/bdm_16.cc b/tests/fe/bdm_16.cc
index 5674ee3d8c..deb2bdb0ba 100644
--- a/tests/fe/bdm_16.cc
+++ b/tests/fe/bdm_16.cc
@@ -33,7 +33,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/bdm_2.cc b/tests/fe/bdm_2.cc
index 375c9e7e3d..170f7ab394 100644
--- a/tests/fe/bdm_2.cc
+++ b/tests/fe/bdm_2.cc
@@ -92,7 +92,7 @@ transform_grid (Triangulation<2> &tria,
 
 
 
-template<int dim>
+template <int dim>
 void
 plot_shape_functions(const unsigned int degree)
 {
diff --git a/tests/fe/bdm_3.cc b/tests/fe/bdm_3.cc
index 1da2c9e3c2..a8a27e8a87 100644
--- a/tests/fe/bdm_3.cc
+++ b/tests/fe/bdm_3.cc
@@ -28,7 +28,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const unsigned int degree)
 {
diff --git a/tests/fe/bdm_5.cc b/tests/fe/bdm_5.cc
index 3c93f2d32b..4220ba1787 100644
--- a/tests/fe/bdm_5.cc
+++ b/tests/fe/bdm_5.cc
@@ -28,7 +28,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const unsigned int degree)
 {
diff --git a/tests/fe/bdm_8.cc b/tests/fe/bdm_8.cc
index aa1131f536..54dc91308e 100644
--- a/tests/fe/bdm_8.cc
+++ b/tests/fe/bdm_8.cc
@@ -41,7 +41,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/bdm_9.cc b/tests/fe/bdm_9.cc
index f4a06a2a0b..c4d3ecff21 100644
--- a/tests/fe/bdm_9.cc
+++ b/tests/fe/bdm_9.cc
@@ -43,7 +43,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/cell_similarity_01.cc b/tests/fe/cell_similarity_01.cc
index 5c9a356350..95989f98c5 100644
--- a/tests/fe/cell_similarity_01.cc
+++ b/tests/fe/cell_similarity_01.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_Q<dim> fe(1);
diff --git a/tests/fe/cell_similarity_02.cc b/tests/fe/cell_similarity_02.cc
index 8244c120f2..68f70f9e73 100644
--- a/tests/fe/cell_similarity_02.cc
+++ b/tests/fe/cell_similarity_02.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_Q<dim> fe(2);
diff --git a/tests/fe/cell_similarity_03.cc b/tests/fe/cell_similarity_03.cc
index 94950722b7..b74424214c 100644
--- a/tests/fe/cell_similarity_03.cc
+++ b/tests/fe/cell_similarity_03.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_Q<dim> fe(1);
diff --git a/tests/fe/cell_similarity_04.cc b/tests/fe/cell_similarity_04.cc
index 71c7c9246c..24e88aaf71 100644
--- a/tests/fe/cell_similarity_04.cc
+++ b/tests/fe/cell_similarity_04.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_Q<dim> fe(2);
diff --git a/tests/fe/cell_similarity_05.cc b/tests/fe/cell_similarity_05.cc
index 403a15ba32..765ae655b2 100644
--- a/tests/fe/cell_similarity_05.cc
+++ b/tests/fe/cell_similarity_05.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_Q<dim> fe(1);
diff --git a/tests/fe/cell_similarity_06.cc b/tests/fe/cell_similarity_06.cc
index 945d944a86..dfc0e69a1d 100644
--- a/tests/fe/cell_similarity_06.cc
+++ b/tests/fe/cell_similarity_06.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_Q<dim> fe(2);
diff --git a/tests/fe/cell_similarity_07.cc b/tests/fe/cell_similarity_07.cc
index 9265169226..6389bf7ac8 100644
--- a/tests/fe/cell_similarity_07.cc
+++ b/tests/fe/cell_similarity_07.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_Q<dim> fe(1);
diff --git a/tests/fe/cell_similarity_08.cc b/tests/fe/cell_similarity_08.cc
index af69548604..bedaf576ef 100644
--- a/tests/fe/cell_similarity_08.cc
+++ b/tests/fe/cell_similarity_08.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_Q<dim> fe(2);
diff --git a/tests/fe/cell_similarity_09.cc b/tests/fe/cell_similarity_09.cc
index a143b8de57..c1abedaf41 100644
--- a/tests/fe/cell_similarity_09.cc
+++ b/tests/fe/cell_similarity_09.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_Q<dim> fe(1);
diff --git a/tests/fe/cell_similarity_10.cc b/tests/fe/cell_similarity_10.cc
index 2a7dfe1f0d..1136f1022a 100644
--- a/tests/fe/cell_similarity_10.cc
+++ b/tests/fe/cell_similarity_10.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_Q<dim> fe(2);
diff --git a/tests/fe/cell_similarity_11.cc b/tests/fe/cell_similarity_11.cc
index b7ef996b9b..64158011d8 100644
--- a/tests/fe/cell_similarity_11.cc
+++ b/tests/fe/cell_similarity_11.cc
@@ -43,7 +43,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_Q<dim> fe(2);
diff --git a/tests/fe/cell_similarity_dgp_monomial_01.cc b/tests/fe/cell_similarity_dgp_monomial_01.cc
index d19b6d6110..1990d56cf9 100644
--- a/tests/fe/cell_similarity_dgp_monomial_01.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_01.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPMonomial<dim> fe(1);
diff --git a/tests/fe/cell_similarity_dgp_monomial_02.cc b/tests/fe/cell_similarity_dgp_monomial_02.cc
index 1d8ea99452..e52b3c7d72 100644
--- a/tests/fe/cell_similarity_dgp_monomial_02.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_02.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPMonomial<dim> fe(2);
diff --git a/tests/fe/cell_similarity_dgp_monomial_03.cc b/tests/fe/cell_similarity_dgp_monomial_03.cc
index 4a142e4df2..0ac87a2928 100644
--- a/tests/fe/cell_similarity_dgp_monomial_03.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_03.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPMonomial<dim> fe(1);
diff --git a/tests/fe/cell_similarity_dgp_monomial_04.cc b/tests/fe/cell_similarity_dgp_monomial_04.cc
index 3263a43552..7e03c6c571 100644
--- a/tests/fe/cell_similarity_dgp_monomial_04.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_04.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPMonomial<dim> fe(2);
diff --git a/tests/fe/cell_similarity_dgp_monomial_05.cc b/tests/fe/cell_similarity_dgp_monomial_05.cc
index 1f092d253e..524feae3f1 100644
--- a/tests/fe/cell_similarity_dgp_monomial_05.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_05.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPMonomial<dim> fe(1);
diff --git a/tests/fe/cell_similarity_dgp_monomial_06.cc b/tests/fe/cell_similarity_dgp_monomial_06.cc
index bc038451f6..cd2ece90ae 100644
--- a/tests/fe/cell_similarity_dgp_monomial_06.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_06.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPMonomial<dim> fe(2);
diff --git a/tests/fe/cell_similarity_dgp_monomial_07.cc b/tests/fe/cell_similarity_dgp_monomial_07.cc
index ae46af4355..24c2e2ff7b 100644
--- a/tests/fe/cell_similarity_dgp_monomial_07.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_07.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPMonomial<dim> fe(1);
diff --git a/tests/fe/cell_similarity_dgp_monomial_08.cc b/tests/fe/cell_similarity_dgp_monomial_08.cc
index 2a0824c762..a203b85830 100644
--- a/tests/fe/cell_similarity_dgp_monomial_08.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_08.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPMonomial<dim> fe(2);
diff --git a/tests/fe/cell_similarity_dgp_monomial_09.cc b/tests/fe/cell_similarity_dgp_monomial_09.cc
index 3bfc6ff48d..b4e711b275 100644
--- a/tests/fe/cell_similarity_dgp_monomial_09.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_09.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPMonomial<dim> fe(1);
diff --git a/tests/fe/cell_similarity_dgp_monomial_10.cc b/tests/fe/cell_similarity_dgp_monomial_10.cc
index bd2c38f4d7..c5551ce7fa 100644
--- a/tests/fe/cell_similarity_dgp_monomial_10.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_10.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPMonomial<dim> fe(2);
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_01.cc b/tests/fe/cell_similarity_dgp_nonparametric_01.cc
index c790e74dc3..8bfce6f9c4 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_01.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_01.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPNonparametric<dim> fe(1);
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_02.cc b/tests/fe/cell_similarity_dgp_nonparametric_02.cc
index bb0de6511f..f4091e577a 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_02.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_02.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPNonparametric<dim> fe(2);
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_03.cc b/tests/fe/cell_similarity_dgp_nonparametric_03.cc
index 0fddbf64ae..7095dbf3b7 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_03.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_03.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPNonparametric<dim> fe(1);
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_04.cc b/tests/fe/cell_similarity_dgp_nonparametric_04.cc
index 39f0412586..8d36e8adb9 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_04.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_04.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPNonparametric<dim> fe(2);
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_05.cc b/tests/fe/cell_similarity_dgp_nonparametric_05.cc
index 6125dfe8dd..9fe52710dc 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_05.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_05.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPNonparametric<dim> fe(1);
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_06.cc b/tests/fe/cell_similarity_dgp_nonparametric_06.cc
index 3f3674d235..6ea6f85d12 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_06.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_06.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPNonparametric<dim> fe(2);
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_07.cc b/tests/fe/cell_similarity_dgp_nonparametric_07.cc
index be99e576fb..90eb61c35a 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_07.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_07.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPNonparametric<dim> fe(1);
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_08.cc b/tests/fe/cell_similarity_dgp_nonparametric_08.cc
index 817850a4af..4926c09b9e 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_08.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_08.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPNonparametric<dim> fe(2);
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_09.cc b/tests/fe/cell_similarity_dgp_nonparametric_09.cc
index d01a563bca..a58c92a58a 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_09.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_09.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPNonparametric<dim> fe(1);
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_10.cc b/tests/fe/cell_similarity_dgp_nonparametric_10.cc
index cf412505d6..f0ff4fdef4 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_10.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_10.cc
@@ -61,7 +61,7 @@ bool equal (const FullMatrix<double> &m1,
 }
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr)
 {
   FE_DGPNonparametric<dim> fe(2);
diff --git a/tests/fe/copy_01.cc b/tests/fe/copy_01.cc
index 9b0c5795a7..a6a390f165 100644
--- a/tests/fe/copy_01.cc
+++ b/tests/fe/copy_01.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const unsigned int degree)
 {
diff --git a/tests/fe/curl_curl_01.cc b/tests/fe/curl_curl_01.cc
index 95d214df30..abfc415d03 100644
--- a/tests/fe/curl_curl_01.cc
+++ b/tests/fe/curl_curl_01.cc
@@ -94,7 +94,7 @@ private:
   ConvergenceTable     convergence_table;
 };
 // EXACT SOLUTION CLASS
-template<int dim>
+template <int dim>
 class ExactSolution : public Function<dim>
 {
 public:
@@ -130,7 +130,7 @@ private:
 template <int dim> const double RightHandSide<dim>::bc_constant = 0.1;
 
 // DEFINE EXACT SOLUTION MEMBERS
-template<int dim>
+template <int dim>
 double ExactSolution<dim>::value(const Point<dim> &p,
                                  const unsigned int component) const
 {
@@ -148,7 +148,7 @@ double ExactSolution<dim>::value(const Point<dim> &p,
   return val;
 
 }
-template<int dim>
+template <int dim>
 void ExactSolution<dim>::vector_value(const Point<dim> &p,
                                       Vector<double> &result) const
 {
@@ -237,7 +237,7 @@ MaxwellProblem<dim>::~MaxwellProblem ()
   dof_handler.clear ();
 }
 
-template<int dim>
+template <int dim>
 double MaxwellProblem<dim>::dotprod(const Tensor<1,dim> &A, const Tensor<1,dim> &B) const
 {
   double return_val = 0;
@@ -248,7 +248,7 @@ double MaxwellProblem<dim>::dotprod(const Tensor<1,dim> &A, const Tensor<1,dim>
   return return_val;
 }
 
-template<int dim>
+template <int dim>
 double MaxwellProblem<dim>::dotprod(const Tensor<1,dim> &A, const Vector<double> &B) const
 {
   double return_val = 0;
@@ -362,7 +362,7 @@ void MaxwellProblem<dim>::solve ()
   constraints.distribute (solution);
 
 }
-template<int dim>
+template <int dim>
 void MaxwellProblem<dim>::process_solution(const unsigned int cycle)
 {
   const ExactSolution<dim> exact_solution;
diff --git a/tests/fe/derivatives.cc b/tests/fe/derivatives.cc
index 131dd480fc..c1d5ac0b03 100644
--- a/tests/fe/derivatives.cc
+++ b/tests/fe/derivatives.cc
@@ -32,7 +32,7 @@
 #include <string>
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_derivatives(Mapping<dim> &mapping,
                  FiniteElement<dim> &finel,
@@ -78,7 +78,7 @@ plot_derivatives(Mapping<dim> &mapping,
 
 
 
-template<int dim>
+template <int dim>
 void plot_FE_Q_shape_functions()
 {
   MappingQGeneric<dim> m(1);
@@ -109,7 +109,7 @@ void plot_FE_Q_shape_functions()
 }
 
 
-template<int dim>
+template <int dim>
 void plot_FE_DGQ_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/derivatives_bernstein.cc b/tests/fe/derivatives_bernstein.cc
index 57a2d2ec2e..e347678871 100644
--- a/tests/fe/derivatives_bernstein.cc
+++ b/tests/fe/derivatives_bernstein.cc
@@ -32,7 +32,7 @@
 #include <deal.II/fe/fe_bernstein.h>
 //#include "../../include/fe_bernstein.h"
 
-template<int dim>
+template <int dim>
 inline void
 plot_derivatives(Mapping<dim> &mapping,
                  FiniteElement<dim> &finel,
@@ -78,7 +78,7 @@ plot_derivatives(Mapping<dim> &mapping,
 
 
 
-template<int dim>
+template <int dim>
 void plot_FE_Bernstein_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/derivatives_face.cc b/tests/fe/derivatives_face.cc
index b43b6c122d..84920a5882 100644
--- a/tests/fe/derivatives_face.cc
+++ b/tests/fe/derivatives_face.cc
@@ -32,7 +32,7 @@
 #include <string>
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_derivatives(Mapping<dim> &mapping,
                  FiniteElement<dim> &finel,
@@ -71,7 +71,7 @@ plot_derivatives(Mapping<dim> &mapping,
 
 
 
-template<int dim>
+template <int dim>
 void plot_FE_Q_shape_functions()
 {
   MappingQGeneric<dim> m(1);
@@ -87,7 +87,7 @@ void plot_FE_Q_shape_functions()
 }
 
 
-template<int dim>
+template <int dim>
 void plot_FE_DGQ_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/dgp_01.cc b/tests/fe/dgp_01.cc
index ed640e6549..17485f053d 100644
--- a/tests/fe/dgp_01.cc
+++ b/tests/fe/dgp_01.cc
@@ -35,7 +35,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const unsigned int degree)
 {
diff --git a/tests/fe/dgp_monomial_1.cc b/tests/fe/dgp_monomial_1.cc
index 0d18a73153..2eefa14720 100644
--- a/tests/fe/dgp_monomial_1.cc
+++ b/tests/fe/dgp_monomial_1.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const unsigned int degree)
 {
diff --git a/tests/fe/dgp_monomial_2.cc b/tests/fe/dgp_monomial_2.cc
index 3590b1417b..659e4c99da 100644
--- a/tests/fe/dgp_monomial_2.cc
+++ b/tests/fe/dgp_monomial_2.cc
@@ -32,7 +32,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const unsigned int degree1,
      const unsigned int degree2)
diff --git a/tests/fe/dgq_1.cc b/tests/fe/dgq_1.cc
index 83ec52cf58..52a5a839bf 100644
--- a/tests/fe/dgq_1.cc
+++ b/tests/fe/dgq_1.cc
@@ -32,7 +32,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const unsigned int degree1,
      const unsigned int degree2)
diff --git a/tests/fe/element_constant_modes.cc b/tests/fe/element_constant_modes.cc
index ed25585a38..d8ae9e6c3f 100644
--- a/tests/fe/element_constant_modes.cc
+++ b/tests/fe/element_constant_modes.cc
@@ -27,7 +27,7 @@
 #include <string>
 
 
-template<int dim>
+template <int dim>
 void print_constant_modes(const FiniteElement<dim> &fe)
 {
   deallog << "Testing " << fe.get_name() << std::endl;
@@ -43,7 +43,7 @@ void print_constant_modes(const FiniteElement<dim> &fe)
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   print_constant_modes(FE_Q<dim>(1));
diff --git a/tests/fe/face_to_cell_q1_2d.cc b/tests/fe/face_to_cell_q1_2d.cc
index cf65911659..1e1e77ecda 100644
--- a/tests/fe/face_to_cell_q1_2d.cc
+++ b/tests/fe/face_to_cell_q1_2d.cc
@@ -25,7 +25,7 @@
 #include <deal.II/base/logstream.h>
 #include <deal.II/fe/fe_q.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   FE_Q<dim> fe(1);
diff --git a/tests/fe/face_to_cell_q2_2d.cc b/tests/fe/face_to_cell_q2_2d.cc
index a25b438fd0..fae484d146 100644
--- a/tests/fe/face_to_cell_q2_2d.cc
+++ b/tests/fe/face_to_cell_q2_2d.cc
@@ -25,7 +25,7 @@
 #include <deal.II/base/logstream.h>
 #include <deal.II/fe/fe_q.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   FE_Q<dim> fe(2);
diff --git a/tests/fe/face_to_cell_q2xq2_2d.cc b/tests/fe/face_to_cell_q2xq2_2d.cc
index 50d2f250be..b3731ad67e 100644
--- a/tests/fe/face_to_cell_q2xq2_2d.cc
+++ b/tests/fe/face_to_cell_q2xq2_2d.cc
@@ -26,7 +26,7 @@
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   FESystem<dim> fe(FE_Q<dim>(2), 1,
diff --git a/tests/fe/face_to_cell_q3_2d.cc b/tests/fe/face_to_cell_q3_2d.cc
index 18a39863b2..04db34ea69 100644
--- a/tests/fe/face_to_cell_q3_2d.cc
+++ b/tests/fe/face_to_cell_q3_2d.cc
@@ -25,7 +25,7 @@
 #include <deal.II/base/logstream.h>
 #include <deal.II/fe/fe_q.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   FE_Q<dim> fe(3);
diff --git a/tests/fe/face_to_cell_q3xq4_2d.cc b/tests/fe/face_to_cell_q3xq4_2d.cc
index 7d2169e302..078e96d44c 100644
--- a/tests/fe/face_to_cell_q3xq4_2d.cc
+++ b/tests/fe/face_to_cell_q3xq4_2d.cc
@@ -26,7 +26,7 @@
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   FESystem<dim> fe(FE_Q<dim>(3), 1,
diff --git a/tests/fe/face_to_cell_q4_2d.cc b/tests/fe/face_to_cell_q4_2d.cc
index 941b7b8dc5..c8b30cdd89 100644
--- a/tests/fe/face_to_cell_q4_2d.cc
+++ b/tests/fe/face_to_cell_q4_2d.cc
@@ -25,7 +25,7 @@
 #include <deal.II/base/logstream.h>
 #include <deal.II/fe/fe_q.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   FE_Q<dim> fe(4);
diff --git a/tests/fe/fe_abf_gradient_divergence_theorem.cc b/tests/fe/fe_abf_gradient_divergence_theorem.cc
index b32dae074d..e46144ee04 100644
--- a/tests/fe/fe_abf_gradient_divergence_theorem.cc
+++ b/tests/fe/fe_abf_gradient_divergence_theorem.cc
@@ -40,7 +40,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -49,7 +49,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -138,7 +138,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_data_test.cc b/tests/fe/fe_data_test.cc
index ad3b589b27..7ff59b52e6 100644
--- a/tests/fe/fe_data_test.cc
+++ b/tests/fe/fe_data_test.cc
@@ -95,7 +95,7 @@ void test_2d_3d (std::vector<FiniteElement<1> *> &fe_datas)
 
 
 
-template<int dim>
+template <int dim>
 void test_fe_datas()
 {
   std::vector<FiniteElement<dim> *> fe_datas;
diff --git a/tests/fe/fe_dgp_3rd_derivative_divergence_theorem.cc b/tests/fe/fe_dgp_3rd_derivative_divergence_theorem.cc
index 9a9cb63b1b..079f2bcabc 100644
--- a/tests/fe/fe_dgp_3rd_derivative_divergence_theorem.cc
+++ b/tests/fe/fe_dgp_3rd_derivative_divergence_theorem.cc
@@ -38,7 +38,7 @@
 #include <sstream>
 #include <fstream>
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -47,7 +47,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -143,7 +143,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_ball(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_dgq_3rd_derivative_divergence_theorem.cc b/tests/fe/fe_dgq_3rd_derivative_divergence_theorem.cc
index 730c27ba91..5a8af7e6de 100644
--- a/tests/fe/fe_dgq_3rd_derivative_divergence_theorem.cc
+++ b/tests/fe/fe_dgq_3rd_derivative_divergence_theorem.cc
@@ -37,7 +37,7 @@
 #include <sstream>
 #include <fstream>
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -46,7 +46,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -142,7 +142,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_ball(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_dgq_gradient_divergence_theorem.cc b/tests/fe/fe_dgq_gradient_divergence_theorem.cc
index 861ccf0ced..228c43f255 100644
--- a/tests/fe/fe_dgq_gradient_divergence_theorem.cc
+++ b/tests/fe/fe_dgq_gradient_divergence_theorem.cc
@@ -39,7 +39,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -48,7 +48,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -137,7 +137,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_ball(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_dgq_hessian_divergence_theorem.cc b/tests/fe/fe_dgq_hessian_divergence_theorem.cc
index 7b28af5ad0..2611db3c01 100644
--- a/tests/fe/fe_dgq_hessian_divergence_theorem.cc
+++ b/tests/fe/fe_dgq_hessian_divergence_theorem.cc
@@ -39,7 +39,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -48,7 +48,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -138,7 +138,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_ball(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_enriched_01.cc b/tests/fe/fe_enriched_01.cc
index 9413d6fe4a..937b273fab 100644
--- a/tests/fe/fe_enriched_01.cc
+++ b/tests/fe/fe_enriched_01.cc
@@ -47,7 +47,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
@@ -72,7 +72,7 @@ public:
   }
 };
 
-template<int dim>
+template <int dim>
 void test_base()
 {
   deallog << "Test basic functions:"<<std::endl;
diff --git a/tests/fe/fe_enriched_02.cc b/tests/fe/fe_enriched_02.cc
index fb6ac2069e..c1b0a05ad8 100644
--- a/tests/fe/fe_enriched_02.cc
+++ b/tests/fe/fe_enriched_02.cc
@@ -55,7 +55,7 @@ using namespace dealii;
 // uncomment when debugging
 // #define DATA_OUT_FE_ENRICHED
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
@@ -80,7 +80,7 @@ public:
   }
 };
 
-template<int dim>
+template <int dim>
 void test1()
 {
   deallog << "FEValues.shape_value()"<<std::endl;
diff --git a/tests/fe/fe_enriched_03.cc b/tests/fe/fe_enriched_03.cc
index 73ec999994..ebfea6b846 100644
--- a/tests/fe/fe_enriched_03.cc
+++ b/tests/fe/fe_enriched_03.cc
@@ -47,7 +47,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
diff --git a/tests/fe/fe_enriched_04.cc b/tests/fe/fe_enriched_04.cc
index 2d3d921658..1c27b0b6ea 100644
--- a/tests/fe/fe_enriched_04.cc
+++ b/tests/fe/fe_enriched_04.cc
@@ -55,7 +55,7 @@ using namespace dealii;
 // uncomment when debugging
 // #define DATA_OUT_FE_ENRICHED
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
@@ -81,7 +81,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test3()
 {
   deallog << "FEValues.get_function_values()"<<std::endl;
diff --git a/tests/fe/fe_enriched_05.cc b/tests/fe/fe_enriched_05.cc
index 6a2a63ce30..6b15363ea3 100644
--- a/tests/fe/fe_enriched_05.cc
+++ b/tests/fe/fe_enriched_05.cc
@@ -55,7 +55,7 @@ using namespace dealii;
 // uncomment when debugging
 // #define DATA_OUT_FE_ENRICHED
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
diff --git a/tests/fe/fe_enriched_06.cc b/tests/fe/fe_enriched_06.cc
index 01b33e104e..e03e093d07 100644
--- a/tests/fe/fe_enriched_06.cc
+++ b/tests/fe/fe_enriched_06.cc
@@ -56,7 +56,7 @@ using namespace dealii;
 // uncomment when debugging
 // #define DATA_OUT_FE_ENRICHED
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
diff --git a/tests/fe/fe_enriched_07.cc b/tests/fe/fe_enriched_07.cc
index d0512022fe..f94c1a8b4d 100644
--- a/tests/fe/fe_enriched_07.cc
+++ b/tests/fe/fe_enriched_07.cc
@@ -55,7 +55,7 @@ using namespace dealii;
 // uncomment when debugging
 // #define DATA_OUT_FE_ENRICHED
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
diff --git a/tests/fe/fe_enriched_08.cc b/tests/fe/fe_enriched_08.cc
index c59363d6bc..55afd1d5c8 100644
--- a/tests/fe/fe_enriched_08.cc
+++ b/tests/fe/fe_enriched_08.cc
@@ -56,7 +56,7 @@ using namespace dealii;
 // uncomment when debugging
 // #define DATA_OUT_FE_ENRICHED
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
@@ -82,7 +82,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test2cells(const unsigned int p_feq=2,
                 const unsigned int p_feen=1)
 {
diff --git a/tests/fe/fe_enriched_08a.cc b/tests/fe/fe_enriched_08a.cc
index 23fd6dbdae..af96ae1b2a 100644
--- a/tests/fe/fe_enriched_08a.cc
+++ b/tests/fe/fe_enriched_08a.cc
@@ -49,7 +49,7 @@ const double eps = 1e-10;
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 void test2cellsFESystem(const unsigned int p_feq=2,
                         const unsigned int p_feen=1)
 {
diff --git a/tests/fe/fe_enriched_compare_to_fe_system.cc b/tests/fe/fe_enriched_compare_to_fe_system.cc
index 65cf687855..77e18220ac 100644
--- a/tests/fe/fe_enriched_compare_to_fe_system.cc
+++ b/tests/fe/fe_enriched_compare_to_fe_system.cc
@@ -60,7 +60,7 @@ const unsigned int patches = 10;
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
@@ -157,7 +157,7 @@ void check_consistency(const Point<dim>    &p,
                 ExcInternalError());
 }
 
-template<int dim>
+template <int dim>
 void test(const FiniteElement<dim> &fe1,
           const FiniteElement<dim> &fe2,
           const Quadrature<dim>    &volume_quad,
diff --git a/tests/fe/fe_enriched_compare_to_fe_system_2.cc b/tests/fe/fe_enriched_compare_to_fe_system_2.cc
index 083b92c8bc..552c740ba5 100644
--- a/tests/fe/fe_enriched_compare_to_fe_system_2.cc
+++ b/tests/fe/fe_enriched_compare_to_fe_system_2.cc
@@ -61,7 +61,7 @@ const unsigned int patches = 10;
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
@@ -194,7 +194,7 @@ void check_consistency(const Point<dim>    &p,
 /**
  * {fe_en1,1}, {fe_en2,2} => 3 functions
  */
-template<int dim>
+template <int dim>
 void test(const FiniteElement<dim> &fe_base,
           const FiniteElement<dim> &fe_en1,
           const FiniteElement<dim> &fe_en2,
diff --git a/tests/fe/fe_enriched_step-36.cc b/tests/fe/fe_enriched_step-36.cc
index 36d24a25ff..49ce06f498 100644
--- a/tests/fe/fe_enriched_step-36.cc
+++ b/tests/fe/fe_enriched_step-36.cc
@@ -61,7 +61,7 @@ using namespace dealii;
 /**
  * Coulomb potential
  */
-template<int dim>
+template <int dim>
 class PotentialFunction : public Function<dim>
 {
 public:
@@ -73,7 +73,7 @@ public:
                        const unsigned int component = 0 ) const;
 };
 
-template<int dim>
+template <int dim>
 double PotentialFunction<dim>::value(const Point<dim> &p,
                                      const unsigned int ) const
 {
@@ -82,7 +82,7 @@ double PotentialFunction<dim>::value(const Point<dim> &p,
   return -1.0 / std::sqrt(p.square());
 }
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
@@ -443,7 +443,7 @@ namespace Step36
     mass_matrix.compress (VectorOperation::add);
   }
 
-  template<int dim>
+  template <int dim>
   std::pair<unsigned int, double>
   EigenvalueProblem<dim>::solve()
   {
diff --git a/tests/fe/fe_enriched_step-36b.cc b/tests/fe/fe_enriched_step-36b.cc
index e966a23c02..ee46dfab91 100644
--- a/tests/fe/fe_enriched_step-36b.cc
+++ b/tests/fe/fe_enriched_step-36b.cc
@@ -65,7 +65,7 @@ using namespace dealii;
 /**
  * Coulomb potential
  */
-template<int dim>
+template <int dim>
 class PotentialFunction : public dealii::Function<dim>
 {
 public:
@@ -77,14 +77,14 @@ public:
                        const unsigned int component = 0 ) const;
 };
 
-template<int dim>
+template <int dim>
 double PotentialFunction<dim>::value(const dealii::Point<dim> &p,
                                      const unsigned int ) const
 {
   return -1.0 / std::sqrt(p.square());
 }
 
-template<int dim>
+template <int dim>
 class EnrichmentFunction : public Function<dim>
 {
 public:
@@ -615,7 +615,7 @@ namespace Step36
     mass_matrix.compress (dealii::VectorOperation::add);
   }
 
-  template<int dim>
+  template <int dim>
   std::pair<unsigned int, double>
   EigenvalueProblem<dim>::solve()
   {
diff --git a/tests/fe/fe_face_values_1d.cc b/tests/fe/fe_face_values_1d.cc
index fc321547b2..e5d6378155 100644
--- a/tests/fe/fe_face_values_1d.cc
+++ b/tests/fe/fe_face_values_1d.cc
@@ -43,7 +43,7 @@
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_faces(Mapping<dim> &mapping,
            FiniteElement<dim> &fe,
@@ -88,7 +88,7 @@ plot_faces(Mapping<dim> &mapping,
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_subfaces(Mapping<dim> &mapping,
               FiniteElement<dim> &fe,
@@ -138,7 +138,7 @@ plot_subfaces(Mapping<dim> &mapping,
 }
 
 
-template<int dim>
+template <int dim>
 void mapping_test()
 {
   deallog << "dim=" << dim << std::endl;
diff --git a/tests/fe/fe_nedelec_gradient_divergence_theorem.cc b/tests/fe/fe_nedelec_gradient_divergence_theorem.cc
index 188dee369e..d7a082043c 100644
--- a/tests/fe/fe_nedelec_gradient_divergence_theorem.cc
+++ b/tests/fe/fe_nedelec_gradient_divergence_theorem.cc
@@ -39,7 +39,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -48,7 +48,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -137,7 +137,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_ball(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_nedelec_hessian_divergence_theorem.cc b/tests/fe/fe_nedelec_hessian_divergence_theorem.cc
index 92a982bf75..bd7e51bfd5 100644
--- a/tests/fe/fe_nedelec_hessian_divergence_theorem.cc
+++ b/tests/fe/fe_nedelec_hessian_divergence_theorem.cc
@@ -44,7 +44,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -53,7 +53,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -138,7 +138,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_ball(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_nothing.cc b/tests/fe/fe_nothing.cc
index 43be9c2769..a5e309d4d4 100644
--- a/tests/fe/fe_nothing.cc
+++ b/tests/fe/fe_nothing.cc
@@ -20,7 +20,7 @@ const double eps = 1e-10;
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 void test2cells(const unsigned int p1=2,
                 const unsigned int p2=1)
 {
diff --git a/tests/fe/fe_project_2d.cc b/tests/fe/fe_project_2d.cc
index 1e94630fed..32a2a29ee6 100644
--- a/tests/fe/fe_project_2d.cc
+++ b/tests/fe/fe_project_2d.cc
@@ -92,7 +92,7 @@ static const Point<2> vertices_rectangular[] =
 static const unsigned n_vertices = sizeof(vertices_rectangular) / sizeof(vertices_rectangular[0]);
 static const unsigned n_cells = 4;
 
-template<int dim>
+template <int dim>
 class VectorFunction : public Function<dim>
 {
 public:
@@ -101,7 +101,7 @@ public:
   virtual void vector_value(const Point<dim> &p, Vector<double> &values) const;
 };
 
-template<>
+template <>
 double VectorFunction<2>::value(const Point<2> &p, const unsigned int component) const
 {
   Assert (component < 2,  ExcIndexRange (component, 0, 1));
@@ -120,7 +120,7 @@ double VectorFunction<2>::value(const Point<2> &p, const unsigned int component)
   return val;
 }
 
-template<int dim>
+template <int dim>
 void VectorFunction<dim>::vector_value(const Point<dim> &p, Vector<double> &values) const
 {
   for (int i = 0; i < dim; ++i)
diff --git a/tests/fe/fe_project_3d.cc b/tests/fe/fe_project_3d.cc
index c19a091aa2..ca82026c0e 100644
--- a/tests/fe/fe_project_3d.cc
+++ b/tests/fe/fe_project_3d.cc
@@ -163,7 +163,7 @@ static const Point<3> vertices_rectangular[] =
 static const unsigned n_vertices = sizeof(vertices_rectangular) / sizeof(vertices_rectangular[0]);
 static const unsigned n_cells = 8;
 
-template<int dim>
+template <int dim>
 class VectorFunction : public Function<dim>
 {
 public:
@@ -173,7 +173,7 @@ public:
   virtual Tensor< 1, dim >  gradient (const Point< dim > &p, const unsigned int component=0) const;
 };
 
-template<>
+template <>
 double VectorFunction<3>::value(const Point<3> &p, const unsigned int component) const
 {
   Assert (component < 3, ExcIndexRange (component, 0, 2));
@@ -195,14 +195,14 @@ double VectorFunction<3>::value(const Point<3> &p, const unsigned int component)
   return val;
 }
 
-template<int dim>
+template <int dim>
 void VectorFunction<dim>::vector_value(const Point<dim> &p, Vector<double> &values) const
 {
   for (int i = 0; i < dim; ++i)
     values(i) = value(p, i);
 }
 
-template<>
+template <>
 Tensor<1, 3> VectorFunction<3>::gradient(const Point<3> &p, const unsigned int component) const
 {
   const double PI = numbers::PI;
diff --git a/tests/fe/fe_q_3rd_derivative_divergence_theorem.cc b/tests/fe/fe_q_3rd_derivative_divergence_theorem.cc
index b1eafc42fb..cf3964190c 100644
--- a/tests/fe/fe_q_3rd_derivative_divergence_theorem.cc
+++ b/tests/fe/fe_q_3rd_derivative_divergence_theorem.cc
@@ -37,7 +37,7 @@
 #include <sstream>
 #include <fstream>
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -46,7 +46,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -142,7 +142,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_ball(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_q_dg0.cc b/tests/fe/fe_q_dg0.cc
index 610a42fd66..fee13130d8 100644
--- a/tests/fe/fe_q_dg0.cc
+++ b/tests/fe/fe_q_dg0.cc
@@ -878,7 +878,7 @@ namespace Step22
   }
 
   //squared l^2 norm of divergence of velocity
-  template<int dim>
+  template <int dim>
   void StokesProblem<dim>::divergence_velocity
   (const BlockVector<double> &calc_solution,
    Vector<double>         &output_vector,
diff --git a/tests/fe/fe_q_gradient_divergence_theorem.cc b/tests/fe/fe_q_gradient_divergence_theorem.cc
index 8b8088afcd..35299085e6 100644
--- a/tests/fe/fe_q_gradient_divergence_theorem.cc
+++ b/tests/fe/fe_q_gradient_divergence_theorem.cc
@@ -39,7 +39,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -48,7 +48,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -137,7 +137,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_ball(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_q_hessian_divergence_theorem.cc b/tests/fe/fe_q_hessian_divergence_theorem.cc
index c8a021322a..a14ee98d3a 100644
--- a/tests/fe/fe_q_hessian_divergence_theorem.cc
+++ b/tests/fe/fe_q_hessian_divergence_theorem.cc
@@ -39,7 +39,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -48,7 +48,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -138,7 +138,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_ball(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_q_hierarchical_3rd_derivative_divergence_theorem.cc b/tests/fe/fe_q_hierarchical_3rd_derivative_divergence_theorem.cc
index 6a38031e78..63b5218a1f 100644
--- a/tests/fe/fe_q_hierarchical_3rd_derivative_divergence_theorem.cc
+++ b/tests/fe/fe_q_hierarchical_3rd_derivative_divergence_theorem.cc
@@ -38,7 +38,7 @@
 #include <sstream>
 #include <fstream>
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -47,7 +47,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -143,7 +143,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_ball(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_rt_gradient_divergence_theorem.cc b/tests/fe/fe_rt_gradient_divergence_theorem.cc
index 2959eaaf19..e07fae929b 100644
--- a/tests/fe/fe_rt_gradient_divergence_theorem.cc
+++ b/tests/fe/fe_rt_gradient_divergence_theorem.cc
@@ -39,7 +39,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -48,7 +48,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -139,7 +139,7 @@ void test (const Triangulation<dim> &tr,
 
 // at the time of writing this test, RaviartThomas elements did not pass
 // the hyper_ball version of the test, perhaps due to issues on the boundary.
-template<int dim>
+template <int dim>
 void test_hyper_cube(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_rt_hessian_divergence_theorem.cc b/tests/fe/fe_rt_hessian_divergence_theorem.cc
index dd23466d34..e508d4e706 100644
--- a/tests/fe/fe_rt_hessian_divergence_theorem.cc
+++ b/tests/fe/fe_rt_hessian_divergence_theorem.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -47,7 +47,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -134,7 +134,7 @@ void test (const Triangulation<dim> &tr,
 
 // at the time of writing this test, RaviartThomas elements did not pass
 // the hyper_ball version of the test, perhaps due to issues on the boundary.
-template<int dim>
+template <int dim>
 void test_hyper_cube(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_series_02.cc b/tests/fe/fe_series_02.cc
index 4b6ede6f90..e9adefad02 100644
--- a/tests/fe/fe_series_02.cc
+++ b/tests/fe/fe_series_02.cc
@@ -39,7 +39,7 @@ using namespace dealii;
 /**
  * A 1D function given by input legendre coefficients
  */
-template<int dim>
+template <int dim>
 class LegendreFunction : public Function<dim>
 {
 public:
@@ -62,7 +62,7 @@ private:
   const std::vector<double> coefficients;
 };
 
-template<int dim>
+template <int dim>
 double LegendreFunction<dim>::value(const dealii::Point<dim> &point,
                                     const unsigned int ) const
 {
@@ -83,7 +83,7 @@ double LegendreFunction<dim>::value(const dealii::Point<dim> &point,
   return f;
 }
 
-template<int dim>
+template <int dim>
 void test(const LegendreFunction<dim> &func,
           const unsigned int poly_degree)
 {
diff --git a/tests/fe/fe_series_04.cc b/tests/fe/fe_series_04.cc
index 3a6cec13e0..ccc47bbadd 100644
--- a/tests/fe/fe_series_04.cc
+++ b/tests/fe/fe_series_04.cc
@@ -54,7 +54,7 @@ bfloat(C(3)), nouns;
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class LegendreFunction : public Function<dim>
 {
 public:
@@ -67,7 +67,7 @@ public:
                        const unsigned int component = 0 ) const;
 };
 
-template<int dim>
+template <int dim>
 double LegendreFunction<dim>::value(const Point<dim> &point,
                                     const unsigned int ) const
 {
@@ -79,7 +79,7 @@ double LegendreFunction<dim>::value(const Point<dim> &point,
 }
 
 
-template<int dim>
+template <int dim>
 void test(const LegendreFunction<dim> &func,
           const unsigned int poly_degree)
 {
diff --git a/tests/fe/fe_series_05.cc b/tests/fe/fe_series_05.cc
index e5fc151771..6e326ab5e4 100644
--- a/tests/fe/fe_series_05.cc
+++ b/tests/fe/fe_series_05.cc
@@ -36,7 +36,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class LegendreFunction : public Function<dim>
 {
 public:
@@ -77,7 +77,7 @@ double Lh(const Point<dim>  &x_q,
   return res;
 }
 
-template<>
+template <>
 double LegendreFunction<2>::value(const dealii::Point<2> &point,
                                   const unsigned int ) const
 {
@@ -90,7 +90,7 @@ double LegendreFunction<2>::value(const dealii::Point<2> &point,
   return f;
 }
 
-template<>
+template <>
 double LegendreFunction<3>::value(const dealii::Point<3> &point,
                                   const unsigned int ) const
 {
@@ -136,7 +136,7 @@ void resize(Table<3,double> &coeff, const unsigned int N)
 
 
 
-template<int dim>
+template <int dim>
 void test(const LegendreFunction<dim> &func,
           const unsigned int poly_degree)
 {
diff --git a/tests/fe/fe_system_3rd_derivative_divergence_theorem.cc b/tests/fe/fe_system_3rd_derivative_divergence_theorem.cc
index e5f81d8ab4..f9d3489678 100644
--- a/tests/fe/fe_system_3rd_derivative_divergence_theorem.cc
+++ b/tests/fe/fe_system_3rd_derivative_divergence_theorem.cc
@@ -37,7 +37,7 @@
 #include <sstream>
 #include <fstream>
 
-template<int dim>
+template <int dim>
 Tensor<1,dim> ones ()
 {
   Tensor<1,dim> result;
@@ -46,7 +46,7 @@ Tensor<1,dim> ones ()
   return result;
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const double tolerance)
@@ -142,7 +142,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_ball(const double tolerance)
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_tools.cc b/tests/fe/fe_tools.cc
index 21724f754f..64831fb9dc 100644
--- a/tests/fe/fe_tools.cc
+++ b/tests/fe/fe_tools.cc
@@ -55,7 +55,7 @@ void print_formatted (const FullMatrix<number> &A,
 
 
 
-template<int dim>
+template <int dim>
 void test_embedding (const FiniteElement<dim> &fe)
 {
   const unsigned int n = fe.dofs_per_cell;
@@ -85,7 +85,7 @@ void test_embedding (const FiniteElement<dim> &fe)
 }
 
 
-template<int dim>
+template <int dim>
 void test_projection (const FiniteElement<dim> &fe1,
                       const FiniteElement<dim> &fe2,
                       std::ostream &out)
@@ -107,7 +107,7 @@ void test_projection (const FiniteElement<dim> &fe1,
 }
 
 
-template<int dim>
+template <int dim>
 void test_projection (std::ostream &out)
 {
   FE_DGQ<dim> q0(0);
@@ -152,7 +152,7 @@ void test_projection (std::ostream &out)
 }
 
 
-template<int dim>
+template <int dim>
 void test_renumbering(const FiniteElement<dim> &fe)
 {
   std::vector<unsigned int> v(fe.dofs_per_cell);
@@ -175,7 +175,7 @@ void test_renumbering(const FiniteElement<dim> &fe)
 }
 
 
-template<int dim>
+template <int dim>
 void test_renumbering()
 {
   deallog.push("Renumber");
diff --git a/tests/fe/fe_tools_block_renumbering.cc b/tests/fe/fe_tools_block_renumbering.cc
index 97391bcf9c..5fef09f531 100644
--- a/tests/fe/fe_tools_block_renumbering.cc
+++ b/tests/fe/fe_tools_block_renumbering.cc
@@ -44,7 +44,7 @@ void logvec (const std::vector<types::global_dof_index> &v, const std::vector<ty
 }
 
 
-template<int dim>
+template <int dim>
 void test_renumbering(const FiniteElement<dim> &fe)
 {
   std::vector<types::global_dof_index> v(fe.dofs_per_cell);
@@ -59,7 +59,7 @@ void test_renumbering(const FiniteElement<dim> &fe)
 }
 
 
-template<int dim>
+template <int dim>
 void test_renumbering()
 {
   deallog.push("Renumber");
diff --git a/tests/fe/fe_tools_test.cc b/tests/fe/fe_tools_test.cc
index ae178631e8..f89048fff1 100644
--- a/tests/fe/fe_tools_test.cc
+++ b/tests/fe/fe_tools_test.cc
@@ -92,7 +92,7 @@ void make_grid (Triangulation<2> &triangulation)
 }
 
 
-template<int dim>
+template <int dim>
 void test(const Triangulation<dim> &tria,
           const Mapping<dim> &mapping,
           const FiniteElement<dim> &fe1,
diff --git a/tests/fe/fe_values_no_mapping.cc b/tests/fe/fe_values_no_mapping.cc
index a710f45127..d4f31e8be3 100644
--- a/tests/fe/fe_values_no_mapping.cc
+++ b/tests/fe/fe_values_no_mapping.cc
@@ -46,7 +46,7 @@ private:
   const unsigned int q;
 };
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tria;
diff --git a/tests/fe/fe_values_view_01.cc b/tests/fe/fe_values_view_01.cc
index 0b83f8ea2c..45c48f39b7 100644
--- a/tests/fe/fe_values_view_01.cc
+++ b/tests/fe/fe_values_view_01.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -88,7 +88,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_02.cc b/tests/fe/fe_values_view_02.cc
index 4b5f98a590..d96fb57f48 100644
--- a/tests/fe/fe_values_view_02.cc
+++ b/tests/fe/fe_values_view_02.cc
@@ -36,7 +36,7 @@
 #include <iostream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -113,7 +113,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_03.cc b/tests/fe/fe_values_view_03.cc
index 405899a094..3cb6cde8a2 100644
--- a/tests/fe/fe_values_view_03.cc
+++ b/tests/fe/fe_values_view_03.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -94,7 +94,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_04.cc b/tests/fe/fe_values_view_04.cc
index 9049791a8a..f29e22823b 100644
--- a/tests/fe/fe_values_view_04.cc
+++ b/tests/fe/fe_values_view_04.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -114,7 +114,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_05.cc b/tests/fe/fe_values_view_05.cc
index f3a018f017..6f0fdb55f9 100644
--- a/tests/fe/fe_values_view_05.cc
+++ b/tests/fe/fe_values_view_05.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -80,7 +80,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_06.cc b/tests/fe/fe_values_view_06.cc
index 3e708912af..64bff9782c 100644
--- a/tests/fe/fe_values_view_06.cc
+++ b/tests/fe/fe_values_view_06.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -81,7 +81,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_07.cc b/tests/fe/fe_values_view_07.cc
index 8458dffe47..1d22e98da9 100644
--- a/tests/fe/fe_values_view_07.cc
+++ b/tests/fe/fe_values_view_07.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -81,7 +81,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_08.cc b/tests/fe/fe_values_view_08.cc
index 3eec7bd7b7..bede0cb7f1 100644
--- a/tests/fe/fe_values_view_08.cc
+++ b/tests/fe/fe_values_view_08.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -82,7 +82,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_09.cc b/tests/fe/fe_values_view_09.cc
index 20123a2442..9cbecf8c93 100644
--- a/tests/fe/fe_values_view_09.cc
+++ b/tests/fe/fe_values_view_09.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -85,7 +85,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_10.cc b/tests/fe/fe_values_view_10.cc
index c74c404c55..cbeaa79c6b 100644
--- a/tests/fe/fe_values_view_10.cc
+++ b/tests/fe/fe_values_view_10.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -86,7 +86,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_10_single_01.cc b/tests/fe/fe_values_view_10_single_01.cc
index e3da9a6588..1e118e5942 100644
--- a/tests/fe/fe_values_view_10_single_01.cc
+++ b/tests/fe/fe_values_view_10_single_01.cc
@@ -41,7 +41,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -90,7 +90,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_10_single_02.cc b/tests/fe/fe_values_view_10_single_02.cc
index e5b39a7d3e..5c03fa40e9 100644
--- a/tests/fe/fe_values_view_10_single_02.cc
+++ b/tests/fe/fe_values_view_10_single_02.cc
@@ -41,7 +41,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -90,7 +90,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_10_single_03.cc b/tests/fe/fe_values_view_10_single_03.cc
index 53fc86edc1..de967cf1b5 100644
--- a/tests/fe/fe_values_view_10_single_03.cc
+++ b/tests/fe/fe_values_view_10_single_03.cc
@@ -41,7 +41,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -90,7 +90,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_11.cc b/tests/fe/fe_values_view_11.cc
index 204572abb9..d9ed08f53f 100644
--- a/tests/fe/fe_values_view_11.cc
+++ b/tests/fe/fe_values_view_11.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -86,7 +86,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_12.cc b/tests/fe/fe_values_view_12.cc
index 973cdd6764..d1ce30ceb2 100644
--- a/tests/fe/fe_values_view_12.cc
+++ b/tests/fe/fe_values_view_12.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -87,7 +87,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_13.cc b/tests/fe/fe_values_view_13.cc
index a2504a45dd..07b94c5583 100644
--- a/tests/fe/fe_values_view_13.cc
+++ b/tests/fe/fe_values_view_13.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -87,7 +87,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_14.cc b/tests/fe/fe_values_view_14.cc
index 2cfc7c7574..7e4dbde14e 100644
--- a/tests/fe/fe_values_view_14.cc
+++ b/tests/fe/fe_values_view_14.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -90,7 +90,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_15.cc b/tests/fe/fe_values_view_15.cc
index abca78f56a..6f6b08c1af 100644
--- a/tests/fe/fe_values_view_15.cc
+++ b/tests/fe/fe_values_view_15.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -91,7 +91,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_16.cc b/tests/fe/fe_values_view_16.cc
index f5e0c1253a..b2a7abb14a 100644
--- a/tests/fe/fe_values_view_16.cc
+++ b/tests/fe/fe_values_view_16.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -92,7 +92,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_17.cc b/tests/fe/fe_values_view_17.cc
index 10bf4c3fb3..2e78a4cafb 100644
--- a/tests/fe/fe_values_view_17.cc
+++ b/tests/fe/fe_values_view_17.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -91,7 +91,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_18.cc b/tests/fe/fe_values_view_18.cc
index 3f7132b2b0..4bdd334e26 100644
--- a/tests/fe/fe_values_view_18.cc
+++ b/tests/fe/fe_values_view_18.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -96,7 +96,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_19.cc b/tests/fe/fe_values_view_19.cc
index f20a6ea6c6..4679fbe3ba 100644
--- a/tests/fe/fe_values_view_19.cc
+++ b/tests/fe/fe_values_view_19.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -91,7 +91,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_20.cc b/tests/fe/fe_values_view_20.cc
index 86067285e5..1535b2d6d1 100644
--- a/tests/fe/fe_values_view_20.cc
+++ b/tests/fe/fe_values_view_20.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -95,7 +95,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_23.cc b/tests/fe/fe_values_view_23.cc
index dd9e65b0dd..507ef7aeb2 100644
--- a/tests/fe/fe_values_view_23.cc
+++ b/tests/fe/fe_values_view_23.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -84,7 +84,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_23_nonsymmetric.cc b/tests/fe/fe_values_view_23_nonsymmetric.cc
index 569e7950fe..17d5940685 100644
--- a/tests/fe/fe_values_view_23_nonsymmetric.cc
+++ b/tests/fe/fe_values_view_23_nonsymmetric.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -84,7 +84,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_24.cc b/tests/fe/fe_values_view_24.cc
index 96a4de6387..476dc2bd8d 100644
--- a/tests/fe/fe_values_view_24.cc
+++ b/tests/fe/fe_values_view_24.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -78,7 +78,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_24_nonsymmetric.cc b/tests/fe/fe_values_view_24_nonsymmetric.cc
index 911b65e6d3..7410534005 100644
--- a/tests/fe/fe_values_view_24_nonsymmetric.cc
+++ b/tests/fe/fe_values_view_24_nonsymmetric.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -78,7 +78,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_25.cc b/tests/fe/fe_values_view_25.cc
index 63715c3d69..c702d6b892 100644
--- a/tests/fe/fe_values_view_25.cc
+++ b/tests/fe/fe_values_view_25.cc
@@ -35,7 +35,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -78,7 +78,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_25_nonsymmetric.cc b/tests/fe/fe_values_view_25_nonsymmetric.cc
index ff53f3ccf6..5ae006a71b 100644
--- a/tests/fe/fe_values_view_25_nonsymmetric.cc
+++ b/tests/fe/fe_values_view_25_nonsymmetric.cc
@@ -35,7 +35,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -78,7 +78,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_26.cc b/tests/fe/fe_values_view_26.cc
index 3f711f6727..dacf91540c 100644
--- a/tests/fe/fe_values_view_26.cc
+++ b/tests/fe/fe_values_view_26.cc
@@ -50,7 +50,7 @@ Tensor<1,3> curl (const Tensor<2,3> &grads)
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -90,7 +90,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_27.cc b/tests/fe/fe_values_view_27.cc
index 3cc3d1688e..148251f2f3 100644
--- a/tests/fe/fe_values_view_27.cc
+++ b/tests/fe/fe_values_view_27.cc
@@ -50,7 +50,7 @@ Tensor<1,3> curl (const Tensor<2,3> &grads)
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -90,7 +90,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_28.cc b/tests/fe/fe_values_view_28.cc
index 517898885c..de0aaa86bd 100644
--- a/tests/fe/fe_values_view_28.cc
+++ b/tests/fe/fe_values_view_28.cc
@@ -65,7 +65,7 @@ Tensor<1,3> curl (const Tensor<2,3> &grads)
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -117,7 +117,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_29.cc b/tests/fe/fe_values_view_29.cc
index a1e8aed506..3faf0ae1fd 100644
--- a/tests/fe/fe_values_view_29.cc
+++ b/tests/fe/fe_values_view_29.cc
@@ -65,7 +65,7 @@ Tensor<1,3> curl (const Tensor<2,3> &grads)
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe,
            const unsigned int degree)
@@ -118,7 +118,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_30.cc b/tests/fe/fe_values_view_30.cc
index 4f3aa0fa33..f1dd0c8b65 100644
--- a/tests/fe/fe_values_view_30.cc
+++ b/tests/fe/fe_values_view_30.cc
@@ -38,7 +38,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 class VectorFunction : public Function<dim>
 {
 public:
@@ -47,7 +47,7 @@ public:
   virtual void vector_value(const Point<dim> &p, Vector<double> &values) const;
 };
 
-template<>
+template <>
 double VectorFunction<2>::value(const Point<2> &p, const unsigned int component) const
 {
   Assert (component < 2,  ExcIndexRange (component, 0, 1));
@@ -66,7 +66,7 @@ double VectorFunction<2>::value(const Point<2> &p, const unsigned int component)
   return val;
 }
 
-template<>
+template <>
 double VectorFunction<3>::value(const Point<3> &p, const unsigned int component) const
 {
   Assert (component < 3, ExcIndexRange (component, 0, 2));
@@ -88,14 +88,14 @@ double VectorFunction<3>::value(const Point<3> &p, const unsigned int component)
   return val;
 }
 
-template<int dim>
+template <int dim>
 void VectorFunction<dim>::vector_value(const Point<dim> &p, Vector<double> &values) const
 {
   for (int i = 0; i < dim; ++i)
     values(i) = value(p, i);
 }
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -158,7 +158,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_invalid_01.cc b/tests/fe/fe_values_view_invalid_01.cc
index d01ae89559..a6f1333b4c 100644
--- a/tests/fe/fe_values_view_invalid_01.cc
+++ b/tests/fe/fe_values_view_invalid_01.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -62,7 +62,7 @@ ok:
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_invalid_02.cc b/tests/fe/fe_values_view_invalid_02.cc
index 6670fed947..e908ef869e 100644
--- a/tests/fe/fe_values_view_invalid_02.cc
+++ b/tests/fe/fe_values_view_invalid_02.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -62,7 +62,7 @@ ok:
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_invalid_03.cc b/tests/fe/fe_values_view_invalid_03.cc
index 9607de7b05..5a8e5e2399 100644
--- a/tests/fe/fe_values_view_invalid_03.cc
+++ b/tests/fe/fe_values_view_invalid_03.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -62,7 +62,7 @@ ok:
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/fe_values_view_invalid_03_nonsymmetric.cc b/tests/fe/fe_values_view_invalid_03_nonsymmetric.cc
index 5176525b32..d7756300bf 100644
--- a/tests/fe/fe_values_view_invalid_03_nonsymmetric.cc
+++ b/tests/fe/fe_values_view_invalid_03_nonsymmetric.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -62,7 +62,7 @@ ok:
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/function.cc b/tests/fe/function.cc
index 6eeb31c0db..5fd2eaa4bc 100644
--- a/tests/fe/function.cc
+++ b/tests/fe/function.cc
@@ -37,7 +37,7 @@
 
 // Call this function with a system consisting of several copies of
 // the SAME element
-template<int dim>
+template <int dim>
 void vector_values(const FiniteElement<dim> &fe)
 {
   Assert(fe.n_base_elements() == 1, ExcNotImplemented());
@@ -85,7 +85,7 @@ void vector_values(const FiniteElement<dim> &fe)
   deallog.pop();
 }
 
-template<int dim>
+template <int dim>
 void test_vectors()
 {
   FE_Q<dim> q1(1);
diff --git a/tests/fe/interpolate_common.h b/tests/fe/interpolate_common.h
index d0e03b3bc6..89aaa7ad87 100644
--- a/tests/fe/interpolate_common.h
+++ b/tests/fe/interpolate_common.h
@@ -83,7 +83,7 @@ double vector_difference(
 // Local implementation for any dimension
 
 
-template<int dim, int degree, int COMP=1>
+template <int dim, int degree, int COMP=1>
 class
   Q1WedgeFunction : public Function<dim>
 {
diff --git a/tests/fe/jacobians.cc b/tests/fe/jacobians.cc
index 5e7460ec57..b45478d1dd 100644
--- a/tests/fe/jacobians.cc
+++ b/tests/fe/jacobians.cc
@@ -190,7 +190,7 @@ void do_test(const Triangulation<dim> &tria,
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tria;
diff --git a/tests/fe/jacobians_face.cc b/tests/fe/jacobians_face.cc
index 60816e5af0..8853ea5695 100644
--- a/tests/fe/jacobians_face.cc
+++ b/tests/fe/jacobians_face.cc
@@ -26,7 +26,7 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria_boundary_lib.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tria;
diff --git a/tests/fe/jacobians_face_cartesian.cc b/tests/fe/jacobians_face_cartesian.cc
index 9cac3e19c1..a033abcfe9 100644
--- a/tests/fe/jacobians_face_cartesian.cc
+++ b/tests/fe/jacobians_face_cartesian.cc
@@ -26,7 +26,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/grid_generator.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tria;
diff --git a/tests/fe/jacobians_face_fe_field.cc b/tests/fe/jacobians_face_fe_field.cc
index 8271cc3075..6bbef74d7d 100644
--- a/tests/fe/jacobians_face_fe_field.cc
+++ b/tests/fe/jacobians_face_fe_field.cc
@@ -32,7 +32,7 @@
 #include <deal.II/grid/tria_boundary_lib.h>
 #include <deal.II/numerics/vector_tools.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tria;
diff --git a/tests/fe/nedelec.cc b/tests/fe/nedelec.cc
index 203aab9afe..bd48ddb818 100644
--- a/tests/fe/nedelec.cc
+++ b/tests/fe/nedelec.cc
@@ -98,7 +98,7 @@ transform_grid (Triangulation<2> &tria,
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_shape_functions(const unsigned int degree)
 {
diff --git a/tests/fe/nedelec_2.cc b/tests/fe/nedelec_2.cc
index 5c9845aec2..46f095fb9c 100644
--- a/tests/fe/nedelec_2.cc
+++ b/tests/fe/nedelec_2.cc
@@ -175,7 +175,7 @@ plot (const Triangulation<dim> &tr, const unsigned int p)
 
 
 
-template<int dim>
+template <int dim>
 inline void
 check (const unsigned int p)
 {
diff --git a/tests/fe/nedelec_3.cc b/tests/fe/nedelec_3.cc
index dd34616ae2..46a75cba73 100644
--- a/tests/fe/nedelec_3.cc
+++ b/tests/fe/nedelec_3.cc
@@ -37,7 +37,7 @@
 
 
 
-template<int dim>
+template <int dim>
 inline void
 check (const unsigned int p)
 {
diff --git a/tests/fe/nedelec_non_rect_2d.cc b/tests/fe/nedelec_non_rect_2d.cc
index 4413b500d1..ace4e51f1a 100644
--- a/tests/fe/nedelec_non_rect_2d.cc
+++ b/tests/fe/nedelec_non_rect_2d.cc
@@ -73,7 +73,7 @@ using namespace dealii;
 
 namespace polytest
 {
-  template<int dim>
+  template <int dim>
   class SimplePolynomial : public Function<dim>
   {
   public:
@@ -85,7 +85,7 @@ namespace polytest
                          std::vector<Vector<double> >   &values) const;
 
   };
-  template<int dim>
+  template <int dim>
   void SimplePolynomial<dim>::vector_value_list (const std::vector<Point<dim> > &points,
                                                  std::vector<Vector<double> >   &values) const
   {
@@ -103,7 +103,7 @@ namespace polytest
 
   }
 
-  template<int dim>
+  template <int dim>
   void SimplePolynomial<dim>::rhs_value_list (const std::vector<Point<dim> > &points,
                                               std::vector<Vector<double> >   &values) const
   {
@@ -121,7 +121,7 @@ namespace polytest
 
   }
 
-  template<int dim>
+  template <int dim>
   class polytest
   {
   public:
@@ -151,7 +151,7 @@ namespace polytest
 
   };
 
-  template<int dim>
+  template <int dim>
   polytest<dim>::polytest (unsigned int degree)
     :
     p_order(degree),
@@ -166,7 +166,7 @@ namespace polytest
     dof_handler.clear ();
   }
 
-  template<int dim>
+  template <int dim>
   void polytest<dim>::setup_system()
   {
     dof_handler.distribute_dofs (fe);
@@ -192,7 +192,7 @@ namespace polytest
     system_matrix.reinit (sparsity_pattern);
   }
 
-  template<int dim>
+  template <int dim>
   void polytest<dim>::assemble_system()
   {
     const QGauss<dim> test_quad(quad_order);
@@ -266,7 +266,7 @@ namespace polytest
       }
   }
 
-  template<int dim>
+  template <int dim>
   void polytest<dim>::solve()
   {
     SparseDirectUMFPACK direct;
@@ -276,7 +276,7 @@ namespace polytest
     constraints.distribute (solution);
   }
 
-  template<int dim>
+  template <int dim>
   void polytest<dim>::output_error()
   {
     SimplePolynomial<dim> exact_solution;
@@ -288,7 +288,7 @@ namespace polytest
     deallog << "p=" << p_order << " L2_error: " << L2_error << std::endl;
   }
 
-  template<int dim>
+  template <int dim>
   void polytest<dim>::run()
   {
     GridGenerator::hyper_cube (tria, -1.2, 1.3);
diff --git a/tests/fe/nedelec_non_rect_face.cc b/tests/fe/nedelec_non_rect_face.cc
index d4dfa3ed8c..2160939eae 100644
--- a/tests/fe/nedelec_non_rect_face.cc
+++ b/tests/fe/nedelec_non_rect_face.cc
@@ -82,7 +82,7 @@ namespace Maxwell
   using namespace dealii;
 
   // Dirichlet BCs / exact solution:.
-  template<int dim>
+  template <int dim>
   class ExactSolution : public Function<dim>
   {
   public:
@@ -96,7 +96,7 @@ namespace Maxwell
                          std::vector<Vector<double> > &value_list);
   };
 
-  template<int dim>
+  template <int dim>
   ExactSolution<dim>::ExactSolution()
     :
     Function<dim> (dim)
@@ -191,7 +191,7 @@ namespace Maxwell
   {
     dof_handler.clear ();
   }
-  template<int dim>
+  template <int dim>
   double MaxwellProblem<dim>::calcErrorHcurlNorm()
   {
     QGauss<dim>  quadrature_formula(quad_order);
@@ -385,7 +385,7 @@ namespace Maxwell
     constraints.distribute (solution);
 
   }
-  template<int dim>
+  template <int dim>
   void MaxwellProblem<dim>::process_solution(const unsigned int cycle)
   {
 
diff --git a/tests/fe/p1nc_01.cc b/tests/fe/p1nc_01.cc
index 21dc20174f..527fa1d122 100644
--- a/tests/fe/p1nc_01.cc
+++ b/tests/fe/p1nc_01.cc
@@ -32,7 +32,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 check()
 {
diff --git a/tests/fe/p1nc_02.cc b/tests/fe/p1nc_02.cc
index fc506d383f..4882eaaf39 100644
--- a/tests/fe/p1nc_02.cc
+++ b/tests/fe/p1nc_02.cc
@@ -33,7 +33,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Point<dim> stretch (const Point<dim> &p)
 {
   Point<dim> q = p;
@@ -44,7 +44,7 @@ Point<dim> stretch (const Point<dim> &p)
 
 
 
-template<int dim>
+template <int dim>
 void
 check()
 {
diff --git a/tests/fe/p1nc_03.cc b/tests/fe/p1nc_03.cc
index d77119f3a4..ef05755016 100644
--- a/tests/fe/p1nc_03.cc
+++ b/tests/fe/p1nc_03.cc
@@ -33,7 +33,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Point<dim> affine (const Point<dim> &p)
 {
   Point<dim> q = p;
@@ -48,7 +48,7 @@ Point<dim> affine (const Point<dim> &p)
 
 
 
-template<int dim>
+template <int dim>
 void
 check()
 {
diff --git a/tests/fe/p1nc_04.cc b/tests/fe/p1nc_04.cc
index 6c4a78ba5d..c039cd4731 100644
--- a/tests/fe/p1nc_04.cc
+++ b/tests/fe/p1nc_04.cc
@@ -33,7 +33,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Point<dim> bilinear (const Point<dim> &p)
 {
   Point<dim> q = p;
@@ -48,7 +48,7 @@ Point<dim> bilinear (const Point<dim> &p)
 
 
 
-template<int dim>
+template <int dim>
 void
 check()
 {
diff --git a/tests/fe/p1nc_05.cc b/tests/fe/p1nc_05.cc
index 32b09a22ce..720bf7d075 100644
--- a/tests/fe/p1nc_05.cc
+++ b/tests/fe/p1nc_05.cc
@@ -32,7 +32,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 check()
 {
diff --git a/tests/fe/p1nc_06.cc b/tests/fe/p1nc_06.cc
index 81902b8223..887af36b96 100644
--- a/tests/fe/p1nc_06.cc
+++ b/tests/fe/p1nc_06.cc
@@ -33,7 +33,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Point<dim> stretch (const Point<dim> &p)
 {
   Point<dim> q = p;
@@ -44,7 +44,7 @@ Point<dim> stretch (const Point<dim> &p)
 
 
 
-template<int dim>
+template <int dim>
 void
 check()
 {
diff --git a/tests/fe/p1nc_07.cc b/tests/fe/p1nc_07.cc
index e582cfb42a..f68e72a8f8 100644
--- a/tests/fe/p1nc_07.cc
+++ b/tests/fe/p1nc_07.cc
@@ -33,7 +33,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Point<dim> affine (const Point<dim> &p)
 {
   Point<dim> q = p;
@@ -48,7 +48,7 @@ Point<dim> affine (const Point<dim> &p)
 
 
 
-template<int dim>
+template <int dim>
 void
 check()
 {
diff --git a/tests/fe/p1nc_08.cc b/tests/fe/p1nc_08.cc
index e229680a24..27a73ac2c2 100644
--- a/tests/fe/p1nc_08.cc
+++ b/tests/fe/p1nc_08.cc
@@ -33,7 +33,7 @@
 
 
 
-template<int dim>
+template <int dim>
 Point<dim> bilinear (const Point<dim> &p)
 {
   Point<dim> q = p;
@@ -48,7 +48,7 @@ Point<dim> bilinear (const Point<dim> &p)
 
 
 
-template<int dim>
+template <int dim>
 void
 check()
 {
diff --git a/tests/fe/q_1.cc b/tests/fe/q_1.cc
index b43cd94fb7..cb5cad89e7 100644
--- a/tests/fe/q_1.cc
+++ b/tests/fe/q_1.cc
@@ -32,7 +32,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const FE_Q<dim> &fe_q)
 {
diff --git a/tests/fe/q_2.cc b/tests/fe/q_2.cc
index 9cbf520e46..68128b2b4d 100644
--- a/tests/fe/q_2.cc
+++ b/tests/fe/q_2.cc
@@ -32,7 +32,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const FE_Q<dim> &fe_q)
 {
diff --git a/tests/fe/q_3.cc b/tests/fe/q_3.cc
index 880472bdb1..3b1200aea6 100644
--- a/tests/fe/q_3.cc
+++ b/tests/fe/q_3.cc
@@ -32,7 +32,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const FE_Q<dim> &fe_q)
 {
diff --git a/tests/fe/q_4.cc b/tests/fe/q_4.cc
index bda7c0d8aa..dd20b114fb 100644
--- a/tests/fe/q_4.cc
+++ b/tests/fe/q_4.cc
@@ -33,7 +33,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const FE_Q<dim> fe1,
      const FE_Q<dim> fe2)
diff --git a/tests/fe/rt_1.cc b/tests/fe/rt_1.cc
index cad59ce387..adb6f82fb1 100644
--- a/tests/fe/rt_1.cc
+++ b/tests/fe/rt_1.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_shape_functions(const unsigned int degree)
 {
diff --git a/tests/fe/rt_10.cc b/tests/fe/rt_10.cc
index 5b0e0b93ad..7f0229ec06 100644
--- a/tests/fe/rt_10.cc
+++ b/tests/fe/rt_10.cc
@@ -43,7 +43,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/rt_11.cc b/tests/fe/rt_11.cc
index 557463bb0e..434671ace6 100644
--- a/tests/fe/rt_11.cc
+++ b/tests/fe/rt_11.cc
@@ -49,7 +49,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/rt_12.cc b/tests/fe/rt_12.cc
index 7d209a78c9..46ffb3c1b6 100644
--- a/tests/fe/rt_12.cc
+++ b/tests/fe/rt_12.cc
@@ -42,7 +42,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/rt_13.cc b/tests/fe/rt_13.cc
index bdd3f06903..70227a88ff 100644
--- a/tests/fe/rt_13.cc
+++ b/tests/fe/rt_13.cc
@@ -47,7 +47,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/rt_14.cc b/tests/fe/rt_14.cc
index a28ba4daea..eda363db57 100644
--- a/tests/fe/rt_14.cc
+++ b/tests/fe/rt_14.cc
@@ -47,7 +47,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/rt_15.cc b/tests/fe/rt_15.cc
index e43ce73e90..4a3bea9390 100644
--- a/tests/fe/rt_15.cc
+++ b/tests/fe/rt_15.cc
@@ -47,7 +47,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/rt_2.cc b/tests/fe/rt_2.cc
index cb57d76ba8..d9552275b1 100644
--- a/tests/fe/rt_2.cc
+++ b/tests/fe/rt_2.cc
@@ -92,7 +92,7 @@ transform_grid (Triangulation<2> &tria,
 
 
 
-template<int dim>
+template <int dim>
 void
 plot_shape_functions(const unsigned int degree)
 {
diff --git a/tests/fe/rt_3.cc b/tests/fe/rt_3.cc
index c5231294eb..01cd69ee1c 100644
--- a/tests/fe/rt_3.cc
+++ b/tests/fe/rt_3.cc
@@ -28,7 +28,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const unsigned int degree)
 {
diff --git a/tests/fe/rt_5.cc b/tests/fe/rt_5.cc
index 704f99bfc3..9a60dc2dd3 100644
--- a/tests/fe/rt_5.cc
+++ b/tests/fe/rt_5.cc
@@ -28,7 +28,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 test(const unsigned int degree)
 {
diff --git a/tests/fe/rt_7.cc b/tests/fe/rt_7.cc
index 5cdd5cf33d..f978be0121 100644
--- a/tests/fe/rt_7.cc
+++ b/tests/fe/rt_7.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 plot_shape_functions(const unsigned int degree)
 {
diff --git a/tests/fe/rt_8.cc b/tests/fe/rt_8.cc
index a3026bd4ce..1dd49d790a 100644
--- a/tests/fe/rt_8.cc
+++ b/tests/fe/rt_8.cc
@@ -41,7 +41,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/rt_9.cc b/tests/fe/rt_9.cc
index bdcac8f7c3..474564ec91 100644
--- a/tests/fe/rt_9.cc
+++ b/tests/fe/rt_9.cc
@@ -43,7 +43,7 @@
 
 std::ofstream logfile ("output");
 
-template<int dim>
+template <int dim>
 void
 test (const unsigned int degree)
 {
diff --git a/tests/fe/rt_covariant.cc b/tests/fe/rt_covariant.cc
index 70e30f8ec3..f2549786f5 100644
--- a/tests/fe/rt_covariant.cc
+++ b/tests/fe/rt_covariant.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -59,7 +59,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/rt_hessian.cc b/tests/fe/rt_hessian.cc
index fc24f2b165..caac93d3cd 100644
--- a/tests/fe/rt_hessian.cc
+++ b/tests/fe/rt_hessian.cc
@@ -38,7 +38,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -67,7 +67,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/fe/rtdiff.cc b/tests/fe/rtdiff.cc
index ce28ca27b7..68ccc03713 100644
--- a/tests/fe/rtdiff.cc
+++ b/tests/fe/rtdiff.cc
@@ -129,7 +129,7 @@ compare_shapes (const FiniteElement<dim> &other,
 }
 
 
-template<int dim>
+template <int dim>
 void
 test (unsigned int degree)
 {
diff --git a/tests/fe/rtn_2.cc b/tests/fe/rtn_2.cc
index cf19a72038..e082f6d49d 100644
--- a/tests/fe/rtn_2.cc
+++ b/tests/fe/rtn_2.cc
@@ -37,7 +37,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 plot_shape_functions(const unsigned int degree)
 {
diff --git a/tests/fe/rtn_3.cc b/tests/fe/rtn_3.cc
index e32ad90dbe..b029b7161c 100644
--- a/tests/fe/rtn_3.cc
+++ b/tests/fe/rtn_3.cc
@@ -29,7 +29,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test ()
 {
   for (unsigned int degree=0; degree<9-2*dim; ++degree)
diff --git a/tests/fe/shapes.h b/tests/fe/shapes.h
index c81b99584c..1df0eedbd6 100644
--- a/tests/fe/shapes.h
+++ b/tests/fe/shapes.h
@@ -26,7 +26,7 @@ char fname[50];
 //
 // x (y) (z) value[0]+1 value[1]+1 ...
 ////////////////////////////////////////////////////////////////////////////
-template<int dim>
+template <int dim>
 inline void
 plot_shape_functions(Mapping<dim> &mapping,
                      FiniteElement<dim> &finel,
@@ -98,7 +98,7 @@ plot_shape_functions(Mapping<dim> &mapping,
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_face_shape_functions(
   Mapping<dim> &mapping,
@@ -270,7 +270,7 @@ plot_face_shape_functions(
 }
 
 
-template<>
+template <>
 void plot_face_shape_functions (Mapping<1> &, FiniteElement<1> &, const char *, UpdateFlags)
 {}
 
@@ -370,7 +370,7 @@ check_values_and_derivatives (const FiniteElement<dim> &fe,
 
 
 
-template<int dim>
+template <int dim>
 void test_compute_functions (const Mapping<dim> &mapping,
                              const FiniteElement<dim> &fe,
                              const char *)
diff --git a/tests/fe/shapes_bernstein.cc b/tests/fe/shapes_bernstein.cc
index b2ce1f66a5..65cb93572a 100644
--- a/tests/fe/shapes_bernstein.cc
+++ b/tests/fe/shapes_bernstein.cc
@@ -26,7 +26,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_Bernstein_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_dgp.cc b/tests/fe/shapes_dgp.cc
index a6e04d183f..e3c56aeac8 100644
--- a/tests/fe/shapes_dgp.cc
+++ b/tests/fe/shapes_dgp.cc
@@ -24,7 +24,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_DGP_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_dgp_monomial.cc b/tests/fe/shapes_dgp_monomial.cc
index e90262953f..e9839f7485 100644
--- a/tests/fe/shapes_dgp_monomial.cc
+++ b/tests/fe/shapes_dgp_monomial.cc
@@ -24,7 +24,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_DGPMonomial_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_dgp_nonparametric.cc b/tests/fe/shapes_dgp_nonparametric.cc
index 88dda636fd..1eeeb6a828 100644
--- a/tests/fe/shapes_dgp_nonparametric.cc
+++ b/tests/fe/shapes_dgp_nonparametric.cc
@@ -24,7 +24,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_DGPNonparametric_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_dgq.cc b/tests/fe/shapes_dgq.cc
index 9c323529f9..e9a644e923 100644
--- a/tests/fe/shapes_dgq.cc
+++ b/tests/fe/shapes_dgq.cc
@@ -24,7 +24,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_DGQ_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_faceq.cc b/tests/fe/shapes_faceq.cc
index eb14f392e0..c28579eac5 100644
--- a/tests/fe/shapes_faceq.cc
+++ b/tests/fe/shapes_faceq.cc
@@ -26,7 +26,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_FaceQ_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_nedelec.cc b/tests/fe/shapes_nedelec.cc
index be8cca0d62..2eafb0f8aa 100644
--- a/tests/fe/shapes_nedelec.cc
+++ b/tests/fe/shapes_nedelec.cc
@@ -24,7 +24,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_Nedelec_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_q.cc b/tests/fe/shapes_q.cc
index 59e1469212..6ed437de72 100644
--- a/tests/fe/shapes_q.cc
+++ b/tests/fe/shapes_q.cc
@@ -24,7 +24,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_Q_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_q_bubbles.cc b/tests/fe/shapes_q_bubbles.cc
index 2d4d637de3..6e53192e31 100644
--- a/tests/fe/shapes_q_bubbles.cc
+++ b/tests/fe/shapes_q_bubbles.cc
@@ -24,7 +24,7 @@
 #define PRECISION 7
 
 
-template<int dim>
+template <int dim>
 void plot_FE_Q_Bubbles_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_q_dg0.cc b/tests/fe/shapes_q_dg0.cc
index 27c119bc8c..5161dd9fef 100644
--- a/tests/fe/shapes_q_dg0.cc
+++ b/tests/fe/shapes_q_dg0.cc
@@ -24,7 +24,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_Q_DG0_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_q_hierarchical.cc b/tests/fe/shapes_q_hierarchical.cc
index 619a9bd705..03f5b5f590 100644
--- a/tests/fe/shapes_q_hierarchical.cc
+++ b/tests/fe/shapes_q_hierarchical.cc
@@ -24,7 +24,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_Q_Hierarchical_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_q_iso_q1.cc b/tests/fe/shapes_q_iso_q1.cc
index 18a3f4c957..8fc96eaec2 100644
--- a/tests/fe/shapes_q_iso_q1.cc
+++ b/tests/fe/shapes_q_iso_q1.cc
@@ -24,7 +24,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_Q_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_system.cc b/tests/fe/shapes_system.cc
index de454833d4..c3f25ed2c8 100644
--- a/tests/fe/shapes_system.cc
+++ b/tests/fe/shapes_system.cc
@@ -27,7 +27,7 @@
 
 #define PRECISION 8
 
-template<int dim>
+template <int dim>
 void plot_FE_System_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_system_02.cc b/tests/fe/shapes_system_02.cc
index a4569f4743..94099753b8 100644
--- a/tests/fe/shapes_system_02.cc
+++ b/tests/fe/shapes_system_02.cc
@@ -29,7 +29,7 @@
 
 #define PRECISION 8
 
-template<int dim>
+template <int dim>
 void plot_FE_System_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/shapes_traceq.cc b/tests/fe/shapes_traceq.cc
index 75195bb8f8..daf6213f25 100644
--- a/tests/fe/shapes_traceq.cc
+++ b/tests/fe/shapes_traceq.cc
@@ -25,7 +25,7 @@
 #define PRECISION 8
 
 
-template<int dim>
+template <int dim>
 void plot_FE_TraceQ_shape_functions()
 {
   MappingQGeneric<dim> m(1);
diff --git a/tests/fe/system_01.cc b/tests/fe/system_01.cc
index f648095802..f4589c3817 100644
--- a/tests/fe/system_01.cc
+++ b/tests/fe/system_01.cc
@@ -37,7 +37,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 check(const FiniteElement<dim> &fe1,
       const FiniteElement<dim> &fe2)
diff --git a/tests/fe/system_02.cc b/tests/fe/system_02.cc
index 3f11b0bb0f..845c99b1d8 100644
--- a/tests/fe/system_02.cc
+++ b/tests/fe/system_02.cc
@@ -32,7 +32,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 check(FESystem<dim> &fe)
 {
diff --git a/tests/fe/system_index.cc b/tests/fe/system_index.cc
index 29604abef2..fb8667739d 100644
--- a/tests/fe/system_index.cc
+++ b/tests/fe/system_index.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void
 check_fe(const FiniteElement<dim> &fe)
 {
@@ -123,7 +123,7 @@ check_fe(const FiniteElement<dim> &fe)
 
 
 
-template<int dim>
+template <int dim>
 void check()
 {
   FE_DGQ<dim> co(0);
diff --git a/tests/fe/transfer.cc b/tests/fe/transfer.cc
index 8a1ca9b3a3..fb14ff920c 100644
--- a/tests/fe/transfer.cc
+++ b/tests/fe/transfer.cc
@@ -38,7 +38,7 @@
     deallog << # el << '<' << dim << ">(" << deg << ')' << std::endl; \
     print_matrix(tr ## dim, l, fe, #el); }
 
-template<int dim>
+template <int dim>
 inline void
 print_matrix(Triangulation<dim> &tr,
              unsigned int level,
diff --git a/tests/grid/build_triangulation_from_patch_01.cc b/tests/grid/build_triangulation_from_patch_01.cc
index 7260481004..c2baf1ac78 100644
--- a/tests/grid/build_triangulation_from_patch_01.cc
+++ b/tests/grid/build_triangulation_from_patch_01.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/grid/build_triangulation_from_patch_02.cc b/tests/grid/build_triangulation_from_patch_02.cc
index d39383cd31..9fe8e1c9f3 100644
--- a/tests/grid/build_triangulation_from_patch_02.cc
+++ b/tests/grid/build_triangulation_from_patch_02.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/grid/build_triangulation_from_patch_03.cc b/tests/grid/build_triangulation_from_patch_03.cc
index d36372228b..ec3dcea420 100644
--- a/tests/grid/build_triangulation_from_patch_03.cc
+++ b/tests/grid/build_triangulation_from_patch_03.cc
@@ -33,7 +33,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/grid/build_triangulation_from_patch_04.cc b/tests/grid/build_triangulation_from_patch_04.cc
index 051672e512..6a675ad1c8 100644
--- a/tests/grid/build_triangulation_from_patch_04.cc
+++ b/tests/grid/build_triangulation_from_patch_04.cc
@@ -36,7 +36,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/grid/coarsening_02.cc b/tests/grid/coarsening_02.cc
index f87e4b481c..3dd9814a91 100644
--- a/tests/grid/coarsening_02.cc
+++ b/tests/grid/coarsening_02.cc
@@ -70,7 +70,7 @@ satisfies_level1_at_vertex_rule (const Triangulation<dim> &tr)
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/grid/coarsening_02_1d.cc b/tests/grid/coarsening_02_1d.cc
index 7582362e2c..156d1686a4 100644
--- a/tests/grid/coarsening_02_1d.cc
+++ b/tests/grid/coarsening_02_1d.cc
@@ -71,7 +71,7 @@ satisfies_level1_at_vertex_rule (const Triangulation<dim> &tr)
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/grid/coarsening_03.cc b/tests/grid/coarsening_03.cc
index 99a9d356f7..e5e2b0c202 100644
--- a/tests/grid/coarsening_03.cc
+++ b/tests/grid/coarsening_03.cc
@@ -67,7 +67,7 @@ satisfies_level1_at_vertex_rule (const Triangulation<dim> &tr)
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/grid/enclosing_sphere_01.cc b/tests/grid/enclosing_sphere_01.cc
index 36537c561c..8c0450abed 100644
--- a/tests/grid/enclosing_sphere_01.cc
+++ b/tests/grid/enclosing_sphere_01.cc
@@ -33,7 +33,7 @@
 #define PRECISION 5
 
 
-template<int dim>
+template <int dim>
 void create_triangulation(const unsigned int,
                           Triangulation<dim> &)
 {
@@ -41,7 +41,7 @@ void create_triangulation(const unsigned int,
 }
 
 
-template<>
+template <>
 void create_triangulation(const unsigned int case_no,
                           Triangulation<2> &tria)
 {
@@ -105,7 +105,7 @@ void create_triangulation(const unsigned int case_no,
 }
 
 
-template<>
+template <>
 void create_triangulation(const unsigned int case_no,
                           Triangulation<3> &tria)
 {
@@ -175,7 +175,7 @@ void create_triangulation(const unsigned int case_no,
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tria;
diff --git a/tests/grid/extent_in_direction.cc b/tests/grid/extent_in_direction.cc
index 6bbe54ccec..4073516cc2 100644
--- a/tests/grid/extent_in_direction.cc
+++ b/tests/grid/extent_in_direction.cc
@@ -89,7 +89,7 @@ void create_triangulation(const unsigned int case_no,
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tria;
diff --git a/tests/grid/filtered_iterator_05.cc b/tests/grid/filtered_iterator_05.cc
index ed5a04dc81..a2a34eeb0d 100644
--- a/tests/grid/filtered_iterator_05.cc
+++ b/tests/grid/filtered_iterator_05.cc
@@ -24,7 +24,7 @@
 #include <deal.II/dofs/dof_accessor.h>
 #include "../tests.h"
 
-template<int dim>
+template <int dim>
 void
 test()
 {
diff --git a/tests/grid/get_cells_at_coarsest_common_level_01.cc b/tests/grid/get_cells_at_coarsest_common_level_01.cc
index 011b012141..97ce2125c7 100644
--- a/tests/grid/get_cells_at_coarsest_common_level_01.cc
+++ b/tests/grid/get_cells_at_coarsest_common_level_01.cc
@@ -32,7 +32,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/grid/get_cells_at_coarsest_common_level_02.cc b/tests/grid/get_cells_at_coarsest_common_level_02.cc
index ea9392af37..e483e4d584 100644
--- a/tests/grid/get_cells_at_coarsest_common_level_02.cc
+++ b/tests/grid/get_cells_at_coarsest_common_level_02.cc
@@ -32,7 +32,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/grid/get_cells_at_coarsest_common_level_03.cc b/tests/grid/get_cells_at_coarsest_common_level_03.cc
index 84a48ee831..ebf6eb0459 100644
--- a/tests/grid/get_cells_at_coarsest_common_level_03.cc
+++ b/tests/grid/get_cells_at_coarsest_common_level_03.cc
@@ -34,7 +34,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/grid/get_dof_to_support_patch_map_01.cc b/tests/grid/get_dof_to_support_patch_map_01.cc
index adf0ca5c52..871c73cc52 100644
--- a/tests/grid/get_dof_to_support_patch_map_01.cc
+++ b/tests/grid/get_dof_to_support_patch_map_01.cc
@@ -40,7 +40,7 @@
 using namespace dealii;
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   using namespace dealii;
diff --git a/tests/grid/get_finest_common_cells_01.cc b/tests/grid/get_finest_common_cells_01.cc
index 1dd20986c5..8147480e6e 100644
--- a/tests/grid/get_finest_common_cells_01.cc
+++ b/tests/grid/get_finest_common_cells_01.cc
@@ -26,7 +26,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   // create 2 triangulations with the
diff --git a/tests/grid/get_finest_common_cells_02.cc b/tests/grid/get_finest_common_cells_02.cc
index fa4ec71ba0..56be146eac 100644
--- a/tests/grid/get_finest_common_cells_02.cc
+++ b/tests/grid/get_finest_common_cells_02.cc
@@ -26,7 +26,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   // create 2 triangulations with the
diff --git a/tests/grid/get_finest_common_cells_03.cc b/tests/grid/get_finest_common_cells_03.cc
index 9a839b2101..6467e0049f 100644
--- a/tests/grid/get_finest_common_cells_03.cc
+++ b/tests/grid/get_finest_common_cells_03.cc
@@ -26,7 +26,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   // create 2 triangulations with the
diff --git a/tests/grid/get_patch_around_cell_01.cc b/tests/grid/get_patch_around_cell_01.cc
index 20043e0bbd..b78aa0bebc 100644
--- a/tests/grid/get_patch_around_cell_01.cc
+++ b/tests/grid/get_patch_around_cell_01.cc
@@ -32,7 +32,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/grid/grid_generator_01.cc b/tests/grid/grid_generator_01.cc
index 8868b57a8c..27deccc0d9 100644
--- a/tests/grid/grid_generator_01.cc
+++ b/tests/grid/grid_generator_01.cc
@@ -28,7 +28,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream &out)
 {
   Point<dim> p1;
diff --git a/tests/grid/grid_generator_01a.cc b/tests/grid/grid_generator_01a.cc
index de457ca585..5446994813 100644
--- a/tests/grid/grid_generator_01a.cc
+++ b/tests/grid/grid_generator_01a.cc
@@ -30,7 +30,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream &out)
 {
   Point<dim> p1;
diff --git a/tests/grid/grid_generator_01b.cc b/tests/grid/grid_generator_01b.cc
index 7681f2701b..895db72031 100644
--- a/tests/grid/grid_generator_01b.cc
+++ b/tests/grid/grid_generator_01b.cc
@@ -30,7 +30,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream &out)
 {
   Point<dim> p1;
diff --git a/tests/grid/grid_generator_02.cc b/tests/grid/grid_generator_02.cc
index 70de9a9ecc..5ee2228e99 100644
--- a/tests/grid/grid_generator_02.cc
+++ b/tests/grid/grid_generator_02.cc
@@ -29,7 +29,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream &out)
 {
   Point<dim> p1;
diff --git a/tests/grid/grid_generator_03.cc b/tests/grid/grid_generator_03.cc
index 807a31eb86..44c0ef23fa 100644
--- a/tests/grid/grid_generator_03.cc
+++ b/tests/grid/grid_generator_03.cc
@@ -68,7 +68,7 @@ template <> Table<3,types::material_id> material_ids<3>()
 
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream &out)
 {
   Point<dim> p1;
diff --git a/tests/grid/grid_generator_04.cc b/tests/grid/grid_generator_04.cc
index 790718ff6a..9a58904c43 100644
--- a/tests/grid/grid_generator_04.cc
+++ b/tests/grid/grid_generator_04.cc
@@ -27,7 +27,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream &out)
 {
   GridOut go;
diff --git a/tests/grid/grid_generator_05.cc b/tests/grid/grid_generator_05.cc
index 5f57b400ca..07972330cb 100644
--- a/tests/grid/grid_generator_05.cc
+++ b/tests/grid/grid_generator_05.cc
@@ -29,7 +29,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream &out)
 {
   Point<dim> p1;
diff --git a/tests/grid/grid_generator_06.cc b/tests/grid/grid_generator_06.cc
index ecd2ab4f4f..53dbf1e9bb 100644
--- a/tests/grid/grid_generator_06.cc
+++ b/tests/grid/grid_generator_06.cc
@@ -29,7 +29,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream &out)
 {
   Triangulation<2> triangulation;
diff --git a/tests/grid/grid_generator_07.cc b/tests/grid/grid_generator_07.cc
index a6ddc0603f..cdad5d5bfb 100644
--- a/tests/grid/grid_generator_07.cc
+++ b/tests/grid/grid_generator_07.cc
@@ -29,7 +29,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream &out)
 {
   Triangulation<dim> triangulation;
diff --git a/tests/grid/grid_generator_08.cc b/tests/grid/grid_generator_08.cc
index e87abb4aab..7af586e385 100644
--- a/tests/grid/grid_generator_08.cc
+++ b/tests/grid/grid_generator_08.cc
@@ -28,7 +28,7 @@
 #include <iomanip>
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test(std::ostream &out)
 {
   Point<dim> p1;
diff --git a/tests/grid/grid_generator_09.cc b/tests/grid/grid_generator_09.cc
index 93cefe25e4..29cfa81961 100644
--- a/tests/grid/grid_generator_09.cc
+++ b/tests/grid/grid_generator_09.cc
@@ -32,7 +32,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_rect1 (unsigned int n, bool color, bool log)
 {
   Point<dim> left;
diff --git a/tests/grid/grid_generator_hyper_sphere.cc b/tests/grid/grid_generator_hyper_sphere.cc
index c5d783f757..0b601bb5f8 100644
--- a/tests/grid/grid_generator_hyper_sphere.cc
+++ b/tests/grid/grid_generator_hyper_sphere.cc
@@ -42,7 +42,7 @@
 #include <iomanip>
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test(std::ostream &out)
 {
   Triangulation<dim,spacedim>   triangulation;
diff --git a/tests/grid/grid_hyper_shell.cc b/tests/grid/grid_hyper_shell.cc
index b65910898b..f7b55bcd83 100644
--- a/tests/grid/grid_hyper_shell.cc
+++ b/tests/grid/grid_hyper_shell.cc
@@ -37,7 +37,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check (double r1, double r2, unsigned int n)
 {
   deallog << "dim=" << dim << std::endl;
diff --git a/tests/grid/grid_hyper_shell_02.cc b/tests/grid/grid_hyper_shell_02.cc
index d9dbb53f5b..d7770024bb 100644
--- a/tests/grid/grid_hyper_shell_02.cc
+++ b/tests/grid/grid_hyper_shell_02.cc
@@ -36,7 +36,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check (double r1, double r2, unsigned int n)
 {
   Point<dim> center;
diff --git a/tests/grid/grid_hyper_shell_03.cc b/tests/grid/grid_hyper_shell_03.cc
index b36dcdaee5..52a2f55737 100644
--- a/tests/grid/grid_hyper_shell_03.cc
+++ b/tests/grid/grid_hyper_shell_03.cc
@@ -36,7 +36,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check (double r1, double r2, unsigned int n)
 {
   Point<dim> center;
diff --git a/tests/grid/grid_hyper_shell_04.cc b/tests/grid/grid_hyper_shell_04.cc
index 1656c12151..c16c6dd3d0 100644
--- a/tests/grid/grid_hyper_shell_04.cc
+++ b/tests/grid/grid_hyper_shell_04.cc
@@ -36,7 +36,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check (double r1, double r2, unsigned int n)
 {
   Point<dim> center;
diff --git a/tests/grid/grid_hyper_shell_05.cc b/tests/grid/grid_hyper_shell_05.cc
index b6cd733281..dd74f38b0a 100644
--- a/tests/grid/grid_hyper_shell_05.cc
+++ b/tests/grid/grid_hyper_shell_05.cc
@@ -42,7 +42,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check (const unsigned int n)
 {
   deallog << "n=" << n << std::endl;
diff --git a/tests/grid/grid_hyper_shell_06.cc b/tests/grid/grid_hyper_shell_06.cc
index 3a3826e1b0..a227451746 100644
--- a/tests/grid/grid_hyper_shell_06.cc
+++ b/tests/grid/grid_hyper_shell_06.cc
@@ -38,7 +38,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check (double r1, double r2, unsigned int n)
 {
   Point<dim> center;
diff --git a/tests/grid/grid_in.cc b/tests/grid/grid_in.cc
index d1ba50ec74..54c9c2e24c 100644
--- a/tests/grid/grid_in.cc
+++ b/tests/grid/grid_in.cc
@@ -110,7 +110,7 @@ void test3 ()
 }
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_msh.cc b/tests/grid/grid_in_msh.cc
index dd51733122..a390f758ce 100644
--- a/tests/grid/grid_in_msh.cc
+++ b/tests/grid/grid_in_msh.cc
@@ -35,7 +35,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_msh_03.cc b/tests/grid/grid_in_msh_03.cc
index 4e367d370b..8557446066 100644
--- a/tests/grid/grid_in_msh_03.cc
+++ b/tests/grid/grid_in_msh_03.cc
@@ -37,7 +37,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_msh_version_1.cc b/tests/grid/grid_in_msh_version_1.cc
index c8a38f5dd9..3f9949aa9d 100644
--- a/tests/grid/grid_in_msh_version_1.cc
+++ b/tests/grid/grid_in_msh_version_1.cc
@@ -37,7 +37,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_msh_version_2.cc b/tests/grid/grid_in_msh_version_2.cc
index 64e95d23cc..cae63b38f9 100644
--- a/tests/grid/grid_in_msh_version_2.cc
+++ b/tests/grid/grid_in_msh_version_2.cc
@@ -36,7 +36,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_unv_2d.cc b/tests/grid/grid_in_unv_2d.cc
index 3a9918ab24..2bfc90fe1b 100644
--- a/tests/grid/grid_in_unv_2d.cc
+++ b/tests/grid/grid_in_unv_2d.cc
@@ -38,7 +38,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_unv_3d.cc b/tests/grid/grid_in_unv_3d.cc
index 9d573eef05..f2979ddc3a 100644
--- a/tests/grid/grid_in_unv_3d.cc
+++ b/tests/grid/grid_in_unv_3d.cc
@@ -38,7 +38,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_unv_3d_02.cc b/tests/grid/grid_in_unv_3d_02.cc
index 63a621b227..3070a8a22a 100644
--- a/tests/grid/grid_in_unv_3d_02.cc
+++ b/tests/grid/grid_in_unv_3d_02.cc
@@ -39,7 +39,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_vtk_2d.cc b/tests/grid/grid_in_vtk_2d.cc
index 6a316bdb7f..8b7abf7d32 100644
--- a/tests/grid/grid_in_vtk_2d.cc
+++ b/tests/grid/grid_in_vtk_2d.cc
@@ -35,7 +35,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_vtk_3d.cc b/tests/grid/grid_in_vtk_3d.cc
index 219d26c355..1c293674f2 100644
--- a/tests/grid/grid_in_vtk_3d.cc
+++ b/tests/grid/grid_in_vtk_3d.cc
@@ -35,7 +35,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_vtk_3d_02.cc b/tests/grid/grid_in_vtk_3d_02.cc
index c82de7f73e..cac1376c51 100644
--- a/tests/grid/grid_in_vtk_3d_02.cc
+++ b/tests/grid/grid_in_vtk_3d_02.cc
@@ -35,7 +35,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_vtk_3d_03.cc b/tests/grid/grid_in_vtk_3d_03.cc
index 72099181d8..be2017112b 100644
--- a/tests/grid/grid_in_vtk_3d_03.cc
+++ b/tests/grid/grid_in_vtk_3d_03.cc
@@ -35,7 +35,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_in_vtk_3d_04.cc b/tests/grid/grid_in_vtk_3d_04.cc
index 0bf58e7e66..54dac26c09 100644
--- a/tests/grid/grid_in_vtk_3d_04.cc
+++ b/tests/grid/grid_in_vtk_3d_04.cc
@@ -35,7 +35,7 @@
 std::ofstream logfile("output");
 
 
-template<int dim>
+template <int dim>
 void check_file (const std::string name,
                  typename GridIn<dim>::Format format)
 {
diff --git a/tests/grid/grid_out_per_processor_vtu_01.cc b/tests/grid/grid_out_per_processor_vtu_01.cc
index 5a505b0952..9764b8bbe3 100644
--- a/tests/grid/grid_out_per_processor_vtu_01.cc
+++ b/tests/grid/grid_out_per_processor_vtu_01.cc
@@ -36,7 +36,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void output(const parallel::distributed::Triangulation<dim> &tr,
             const std::string                               &filename,
             const bool                                      view_levels,
@@ -61,7 +61,7 @@ void output(const parallel::distributed::Triangulation<dim> &tr,
     AssertThrow(false, ExcNotImplemented());
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/grid/grid_out_per_processor_vtu_02.cc b/tests/grid/grid_out_per_processor_vtu_02.cc
index a49df58519..4f3029701d 100644
--- a/tests/grid/grid_out_per_processor_vtu_02.cc
+++ b/tests/grid/grid_out_per_processor_vtu_02.cc
@@ -37,7 +37,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void output(const parallel::shared::Triangulation<dim> &tr,
             const std::string                          &filename,
             const bool                                 view_levels,
@@ -60,7 +60,7 @@ void output(const parallel::shared::Triangulation<dim> &tr,
     AssertThrow(false, ExcNotImplemented());
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/grid/grid_out_vtk_02.cc b/tests/grid/grid_out_vtk_02.cc
index 2e6624f057..2a1ac909c4 100644
--- a/tests/grid/grid_out_vtk_02.cc
+++ b/tests/grid/grid_out_vtk_02.cc
@@ -36,14 +36,14 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void output(parallel::distributed::Triangulation<dim> &tr, std::ostream &stream)
 {
   GridOut out;
   out.write_vtk(tr, stream);
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/grid/grid_output_input.cc b/tests/grid/grid_output_input.cc
index 60235a56d3..798cf027fb 100644
--- a/tests/grid/grid_output_input.cc
+++ b/tests/grid/grid_output_input.cc
@@ -30,7 +30,7 @@
 #include <iomanip>
 
 
-template<int dim>
+template <int dim>
 void test(std::ostream &out)
 {
   GridOut go;
diff --git a/tests/grid/grid_parallelepiped.cc b/tests/grid/grid_parallelepiped.cc
index 8ddb15dcaa..6d34fabf5a 100644
--- a/tests/grid/grid_parallelepiped.cc
+++ b/tests/grid/grid_parallelepiped.cc
@@ -36,7 +36,7 @@ std::ofstream logfile ("output");
 
 // The simplest test case is to create a parallelepiped grid, output
 // the result, and hope for the best.
-template<int dim>
+template <int dim>
 void check_parallelepiped (bool colorize, bool log)
 {
   // Data structure defining dim coordinates that make up a
diff --git a/tests/grid/grid_parallelepiped_02.cc b/tests/grid/grid_parallelepiped_02.cc
index 56fe676543..6258f26a48 100644
--- a/tests/grid/grid_parallelepiped_02.cc
+++ b/tests/grid/grid_parallelepiped_02.cc
@@ -41,7 +41,7 @@ std::ofstream logfile ("output");
 // grid), this test is not entirely trivial.
 //
 // Here is the implementation in nd:
-template<int dim>
+template <int dim>
 void check_nd_parallelepiped_by_comparison (bool log)
 {
 
diff --git a/tests/grid/grid_parallelepiped_03.cc b/tests/grid/grid_parallelepiped_03.cc
index e76d0b8e14..e06dbd27ab 100644
--- a/tests/grid/grid_parallelepiped_03.cc
+++ b/tests/grid/grid_parallelepiped_03.cc
@@ -36,7 +36,7 @@ std::ofstream logfile ("output");
 
 // The simplest test case is to create a parallelepiped grid with a
 // number of subdivisions and output the result.
-template<int dim>
+template <int dim>
 void check_subdivided_parallelepiped (bool colorize, bool log)
 {
   // Data structure defining dim coordinates that make up a
diff --git a/tests/grid/grid_parallelepiped_04.cc b/tests/grid/grid_parallelepiped_04.cc
index b87069ad25..9c4115faa0 100644
--- a/tests/grid/grid_parallelepiped_04.cc
+++ b/tests/grid/grid_parallelepiped_04.cc
@@ -44,7 +44,7 @@
 #include <iomanip>
 #include <map>
 
-template<int dim>
+template <int dim>
 void check_parallelepiped (bool colorize, bool log, const unsigned int (&subd)[dim])
 {
   deallog << "* checking dim=" << dim
diff --git a/tests/grid/grid_parallelepiped_05.cc b/tests/grid/grid_parallelepiped_05.cc
index e0c7151d18..69de333d7d 100644
--- a/tests/grid/grid_parallelepiped_05.cc
+++ b/tests/grid/grid_parallelepiped_05.cc
@@ -45,7 +45,7 @@ Point<dim> point(double x=0, double y=0, double z=0)
 
 // The simplest test case is to create a parallelepiped grid with a
 // number of subdivisions and output the result.
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void check (bool subdivide)
 {
   deallog << "dim " << dim << " spacedim " << spacedim << std::endl;
diff --git a/tests/grid/grid_tools_05.cc b/tests/grid/grid_tools_05.cc
index 6442d0f978..3ce577124c 100644
--- a/tests/grid/grid_tools_05.cc
+++ b/tests/grid/grid_tools_05.cc
@@ -163,7 +163,7 @@ void generate_grid(Triangulation<3> &triangulation)
 /*
  * Print out the face vertices as well as the orientation of a match:
  */
-template<typename FaceIterator>
+template <typename FaceIterator>
 void print_match(const FaceIterator &face_1,
                  const FaceIterator &face_2,
                  const std::bitset<3> &orientation)
diff --git a/tests/grid/grid_tools_06.cc b/tests/grid/grid_tools_06.cc
index 8b658cd485..07e0dcadaa 100644
--- a/tests/grid/grid_tools_06.cc
+++ b/tests/grid/grid_tools_06.cc
@@ -180,7 +180,7 @@ void generate_grid(Triangulation<3> &triangulation, int orientation)
 /*
  * Print out the face vertices as well as the orientation of a match:
  */
-template<typename FaceIterator>
+template <typename FaceIterator>
 void print_match(const FaceIterator &face_1,
                  const FaceIterator &face_2,
                  const std::bitset<3> &orientation)
diff --git a/tests/grid/grid_tools_active_cell_layer_within_distance_01.cc b/tests/grid/grid_tools_active_cell_layer_within_distance_01.cc
index abfed2663c..439e58152a 100644
--- a/tests/grid/grid_tools_active_cell_layer_within_distance_01.cc
+++ b/tests/grid/grid_tools_active_cell_layer_within_distance_01.cc
@@ -27,7 +27,7 @@
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/grid_out.h>
 
-template<int dim>
+template <int dim>
 bool
 pred_mat_id(const typename Triangulation<dim>::active_cell_iterator &cell)
 {
diff --git a/tests/grid/grid_tools_active_cell_layer_within_distance_02.cc b/tests/grid/grid_tools_active_cell_layer_within_distance_02.cc
index c937957b62..03591a141d 100644
--- a/tests/grid/grid_tools_active_cell_layer_within_distance_02.cc
+++ b/tests/grid/grid_tools_active_cell_layer_within_distance_02.cc
@@ -35,7 +35,7 @@
 #include <vector>
 #include <cmath>
 
-template<int dim>
+template <int dim>
 bool
 pred_mat_id(const typename Triangulation<dim>::active_cell_iterator &cell)
 {
diff --git a/tests/grid/grid_tools_bounding_box_01.cc b/tests/grid/grid_tools_bounding_box_01.cc
index 3ea31e6934..540e289e8e 100644
--- a/tests/grid/grid_tools_bounding_box_01.cc
+++ b/tests/grid/grid_tools_bounding_box_01.cc
@@ -22,7 +22,7 @@
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/grid_out.h>
 
-template<int dim>
+template <int dim>
 bool
 pred_mat_id(const typename Triangulation<dim>::active_cell_iterator &cell)
 {
diff --git a/tests/grid/grid_tools_halo_layer_01.cc b/tests/grid/grid_tools_halo_layer_01.cc
index 8fb54f8187..0249c5bec4 100644
--- a/tests/grid/grid_tools_halo_layer_01.cc
+++ b/tests/grid/grid_tools_halo_layer_01.cc
@@ -22,7 +22,7 @@
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/grid_out.h>
 
-template<int dim>
+template <int dim>
 bool
 pred_mat_id(const typename Triangulation<dim>::active_cell_iterator &cell)
 {
diff --git a/tests/grid/grid_tools_transform_01.cc b/tests/grid/grid_tools_transform_01.cc
index c5be3e7209..efd55a8d9c 100644
--- a/tests/grid/grid_tools_transform_01.cc
+++ b/tests/grid/grid_tools_transform_01.cc
@@ -25,16 +25,16 @@
 #include <fstream>
 #include <iomanip>
 
-template<int dim>
+template <int dim>
 Point<dim> trans_func(Point<dim> &p);
 
-template<>
+template <>
 Point<2> trans_func(Point<2> &p)
 {
   Point<2> r(p(0)+p(1)*p(1),p(1));
   return r;
 }
-template<>
+template <>
 Point<3> trans_func(Point<3> &p)
 {
   Point<3> r(p(0)+p(1)*p(1),p(1),p(2));
diff --git a/tests/grid/have_same_coarse_mesh_01.cc b/tests/grid/have_same_coarse_mesh_01.cc
index ab3a8edf5f..e55614e743 100644
--- a/tests/grid/have_same_coarse_mesh_01.cc
+++ b/tests/grid/have_same_coarse_mesh_01.cc
@@ -25,7 +25,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   // create 3 triangulations
diff --git a/tests/grid/have_same_coarse_mesh_02.cc b/tests/grid/have_same_coarse_mesh_02.cc
index 5d591abf42..0e4b4f6854 100644
--- a/tests/grid/have_same_coarse_mesh_02.cc
+++ b/tests/grid/have_same_coarse_mesh_02.cc
@@ -25,7 +25,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   // create 3 triangulations
diff --git a/tests/grid/have_same_coarse_mesh_03.cc b/tests/grid/have_same_coarse_mesh_03.cc
index 6c5277aa5c..ac9a00505e 100644
--- a/tests/grid/have_same_coarse_mesh_03.cc
+++ b/tests/grid/have_same_coarse_mesh_03.cc
@@ -25,7 +25,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   // create 3 triangulations
diff --git a/tests/grid/measure_et_al.cc b/tests/grid/measure_et_al.cc
index 6a4dc12982..96369822ea 100644
--- a/tests/grid/measure_et_al.cc
+++ b/tests/grid/measure_et_al.cc
@@ -27,7 +27,7 @@
 #define PRECISION 5
 
 
-template<int dim>
+template <int dim>
 void create_triangulation(const unsigned int,
                           Triangulation<dim> &)
 {
@@ -35,7 +35,7 @@ void create_triangulation(const unsigned int,
 }
 
 
-template<>
+template <>
 void create_triangulation(const unsigned int case_no,
                           Triangulation<2> &tria)
 {
@@ -61,7 +61,7 @@ void create_triangulation(const unsigned int case_no,
 }
 
 
-template<>
+template <>
 void create_triangulation(const unsigned int case_no,
                           Triangulation<3> &tria)
 {
@@ -83,7 +83,7 @@ void create_triangulation(const unsigned int case_no,
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tria;
diff --git a/tests/grid/measure_et_al_02.cc b/tests/grid/measure_et_al_02.cc
index 2f961b4c1f..233c279563 100644
--- a/tests/grid/measure_et_al_02.cc
+++ b/tests/grid/measure_et_al_02.cc
@@ -27,7 +27,7 @@
 #define PRECISION 5
 
 
-template<int dim>
+template <int dim>
 void create_triangulation(const unsigned int,
                           Triangulation<dim> &)
 {
@@ -35,7 +35,7 @@ void create_triangulation(const unsigned int,
 }
 
 
-template<>
+template <>
 void create_triangulation(const unsigned int case_no,
                           Triangulation<2> &tria)
 {
@@ -66,7 +66,7 @@ void create_triangulation(const unsigned int case_no,
 }
 
 
-template<>
+template <>
 void create_triangulation(const unsigned int case_no,
                           Triangulation<3> &tria)
 {
@@ -89,7 +89,7 @@ void create_triangulation(const unsigned int case_no,
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tria;
diff --git a/tests/grid/merge_triangulations_02.cc b/tests/grid/merge_triangulations_02.cc
index f16bae648b..f372cfa92b 100644
--- a/tests/grid/merge_triangulations_02.cc
+++ b/tests/grid/merge_triangulations_02.cc
@@ -37,7 +37,7 @@
 
 std::ofstream logfile("output");
 
-template<int dim>
+template <int dim>
 void mesh_info(const Triangulation<dim> &tria)
 {
   deallog << "Mesh info:" << std::endl
diff --git a/tests/grid/merge_triangulations_03.cc b/tests/grid/merge_triangulations_03.cc
index 4c443fc2d5..ac83568df9 100644
--- a/tests/grid/merge_triangulations_03.cc
+++ b/tests/grid/merge_triangulations_03.cc
@@ -84,7 +84,7 @@ void flatten_triangulation( Triangulation<dim> &tria_in, Triangulation<dim> &tri
 // eps image of the mesh so we can see the nodes are at the right
 // place.
 
-template<int dim>
+template <int dim>
 void mesh_info(const Triangulation<dim> &tria,
                const std::string        &filename)
 {
diff --git a/tests/grid/recursively_set_material_id.cc b/tests/grid/recursively_set_material_id.cc
index 1d09dc900f..ad4bb49c2e 100644
--- a/tests/grid/recursively_set_material_id.cc
+++ b/tests/grid/recursively_set_material_id.cc
@@ -29,7 +29,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   for (unsigned int t=0; t<2; ++t)
diff --git a/tests/grid/tria_signals_01.cc b/tests/grid/tria_signals_01.cc
index 44d61efc4d..c3c4caccd5 100644
--- a/tests/grid/tria_signals_01.cc
+++ b/tests/grid/tria_signals_01.cc
@@ -47,21 +47,21 @@ void f_post_refinement ()
   return;
 }
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void f_pre_coarsening_on_cell (const typename Triangulation<dim, spacedim>::cell_iterator &)
 {
   ++signal_counter_pre_coarsening_on_cell;
   return;
 }
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void f_post_refinement_on_cell (const typename Triangulation<dim, spacedim>::cell_iterator &)
 {
   ++signal_counter_post_refinement_on_cell;
   return;
 }
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void f_copy (const Triangulation<dim, spacedim> &)
 {
   ++signal_counter_copy;
@@ -81,7 +81,7 @@ void f_any_change ()
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   signal_counter_create = 0;
diff --git a/tests/grid/twisted_parallelepiped_01.cc b/tests/grid/twisted_parallelepiped_01.cc
index d0bf2b4e07..7bd6bb1ada 100644
--- a/tests/grid/twisted_parallelepiped_01.cc
+++ b/tests/grid/twisted_parallelepiped_01.cc
@@ -31,7 +31,7 @@
  * when this function is called for invalid input.
  */
 
-template<int dim>
+template <int dim>
 void check_parallelepiped (std::ofstream &logfile)
 {
   // Data structure defining dim coordinates that make up a
diff --git a/tests/grid/twisted_parallelepiped_02.cc b/tests/grid/twisted_parallelepiped_02.cc
index 2f3ce273d3..bb94b4b8d8 100644
--- a/tests/grid/twisted_parallelepiped_02.cc
+++ b/tests/grid/twisted_parallelepiped_02.cc
@@ -31,7 +31,7 @@
  * this function is called for invalid input.
  */
 
-template<int dim>
+template <int dim>
 void check_parallelepiped (std::ofstream &logfile)
 {
   // Data structure defining dim coordinates that make up a
diff --git a/tests/grid/user_data_01.cc b/tests/grid/user_data_01.cc
index b18520f2ec..4bb3c93230 100644
--- a/tests/grid/user_data_01.cc
+++ b/tests/grid/user_data_01.cc
@@ -34,7 +34,7 @@
 /**
  * Check if user pointers are the same as entered below
  */
-template<int dim>
+template <int dim>
 void
 check_user_pointers(Triangulation<dim> &tr)
 {
@@ -83,7 +83,7 @@ check_user_pointers(Triangulation<dim> &tr)
 /**
  * Check if user indices are the same as entered below
  */
-template<int dim>
+template <int dim>
 void
 check_user_indices(Triangulation<dim> &tr)
 {
@@ -130,7 +130,7 @@ check_user_indices(Triangulation<dim> &tr)
 }
 
 
-template<int dim>
+template <int dim>
 void
 user_pointers(Triangulation<dim> &tr)
 {
@@ -192,7 +192,7 @@ user_pointers(Triangulation<dim> &tr)
 }
 
 
-template<int dim>
+template <int dim>
 void
 user_indices(Triangulation<dim> &tr)
 {
diff --git a/tests/hp/dof_handler_number_cache.cc b/tests/hp/dof_handler_number_cache.cc
index 01345a4556..f02e0b6f07 100644
--- a/tests/hp/dof_handler_number_cache.cc
+++ b/tests/hp/dof_handler_number_cache.cc
@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation (Triangulation<dim>::limit_level_difference_at_vertices);
diff --git a/tests/hp/hp_constraints_neither_dominate_01.cc b/tests/hp/hp_constraints_neither_dominate_01.cc
index 08248a594b..24d4d3097a 100644
--- a/tests/hp/hp_constraints_neither_dominate_01.cc
+++ b/tests/hp/hp_constraints_neither_dominate_01.cc
@@ -77,7 +77,7 @@ const double eps = 1e-10;
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 void test2cells(const unsigned int p1=2,
                 const unsigned int p2=1)
 {
diff --git a/tests/hp/hp_constraints_neither_dominate_02.cc b/tests/hp/hp_constraints_neither_dominate_02.cc
index 0790546d92..532a4896a1 100644
--- a/tests/hp/hp_constraints_neither_dominate_02.cc
+++ b/tests/hp/hp_constraints_neither_dominate_02.cc
@@ -102,7 +102,7 @@ struct less_than_key
 //  |-----| 2  |
 //  |1 |1 |    |
 //  ------------
-template<int dim>
+template <int dim>
 void test2cells(const FiniteElement<dim> &fe_0,
                 const FiniteElement<dim> &fe_1,
                 const FiniteElement<dim> &fe_2,
diff --git a/tests/hp/hp_q_hierarchical_constraints.cc b/tests/hp/hp_q_hierarchical_constraints.cc
index 4875357334..3e92b74446 100644
--- a/tests/hp/hp_q_hierarchical_constraints.cc
+++ b/tests/hp/hp_q_hierarchical_constraints.cc
@@ -28,7 +28,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 void test(const bool apply_constrains, const unsigned int hp)
 {
   Triangulation<dim>   triangulation;
diff --git a/tests/hp/matrices.cc b/tests/hp/matrices.cc
index a08b8ad043..5cbf78da21 100644
--- a/tests/hp/matrices.cc
+++ b/tests/hp/matrices.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/matrices_hp.cc b/tests/hp/matrices_hp.cc
index c1868c2d56..bdc832a329 100644
--- a/tests/hp/matrices_hp.cc
+++ b/tests/hp/matrices_hp.cc
@@ -42,7 +42,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/n_boundary_dofs.cc b/tests/hp/n_boundary_dofs.cc
index 88164c484d..c18639ee32 100644
--- a/tests/hp/n_boundary_dofs.cc
+++ b/tests/hp/n_boundary_dofs.cc
@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> triangulation;
diff --git a/tests/hp/project_01.cc b/tests/hp/project_01.cc
index 028dcde388..b769b9ef87 100644
--- a/tests/hp/project_01.cc
+++ b/tests/hp/project_01.cc
@@ -52,7 +52,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   // create 2 triangulations with the
diff --git a/tests/hp/project_01_curved_boundary.cc b/tests/hp/project_01_curved_boundary.cc
index 37cecfde20..e1a78a7d7f 100644
--- a/tests/hp/project_01_curved_boundary.cc
+++ b/tests/hp/project_01_curved_boundary.cc
@@ -61,7 +61,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   HyperBallBoundary<dim> boundary;
diff --git a/tests/hp/project_02.cc b/tests/hp/project_02.cc
index 2e89124158..c09a59ec0c 100644
--- a/tests/hp/project_02.cc
+++ b/tests/hp/project_02.cc
@@ -52,7 +52,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   // create 2 triangulations with the
diff --git a/tests/hp/solution_transfer.cc b/tests/hp/solution_transfer.cc
index e26239fd70..1426ba7677 100644
--- a/tests/hp/solution_transfer.cc
+++ b/tests/hp/solution_transfer.cc
@@ -42,7 +42,7 @@
 
 // a linear function that should be transferred exactly with Q1 and Q2
 // elements
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/solution_transfer_12.cc b/tests/hp/solution_transfer_12.cc
index 278c4fa0ff..4f1f71c25e 100644
--- a/tests/hp/solution_transfer_12.cc
+++ b/tests/hp/solution_transfer_12.cc
@@ -46,7 +46,7 @@
 // - FE_Q_Hierarchical
 // - manual interpolation as there is no general interpolation implemented
 //   for this FE currently, thus VectorTools::interpolate can't be used.
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/step-27.cc b/tests/hp/step-27.cc
index 3a701c9866..d59da4e57a 100644
--- a/tests/hp/step-27.cc
+++ b/tests/hp/step-27.cc
@@ -474,7 +474,7 @@ namespace Step27
   std::pair<bool,unsigned int>
   predicate_ind(const TableIndices<dim> &ind);
 
-  template<>
+  template <>
   std::pair<bool,unsigned int>
   predicate_ind<2>(const TableIndices<2> &ind)
   {
diff --git a/tests/hp/vectors_boundary_rhs_01.cc b/tests/hp/vectors_boundary_rhs_01.cc
index b725dcff25..b59aa7ddd9 100644
--- a/tests/hp/vectors_boundary_rhs_01.cc
+++ b/tests/hp/vectors_boundary_rhs_01.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/vectors_boundary_rhs_02.cc b/tests/hp/vectors_boundary_rhs_02.cc
index 40e630ba6f..24d3bccb9c 100644
--- a/tests/hp/vectors_boundary_rhs_02.cc
+++ b/tests/hp/vectors_boundary_rhs_02.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/vectors_boundary_rhs_03.cc b/tests/hp/vectors_boundary_rhs_03.cc
index d211a98587..b4de1c6e50 100644
--- a/tests/hp/vectors_boundary_rhs_03.cc
+++ b/tests/hp/vectors_boundary_rhs_03.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/vectors_boundary_rhs_hp_01.cc b/tests/hp/vectors_boundary_rhs_hp_01.cc
index 720c084ac1..8afb6cadb0 100644
--- a/tests/hp/vectors_boundary_rhs_hp_01.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_01.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/vectors_boundary_rhs_hp_03.cc b/tests/hp/vectors_boundary_rhs_hp_03.cc
index 3201de1c9b..1febfbd99e 100644
--- a/tests/hp/vectors_boundary_rhs_hp_03.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_03.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/vectors_rhs_01.cc b/tests/hp/vectors_rhs_01.cc
index 89315fe5a0..6fef7a5b5f 100644
--- a/tests/hp/vectors_rhs_01.cc
+++ b/tests/hp/vectors_rhs_01.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/vectors_rhs_02.cc b/tests/hp/vectors_rhs_02.cc
index 6ac3dace1a..3449713781 100644
--- a/tests/hp/vectors_rhs_02.cc
+++ b/tests/hp/vectors_rhs_02.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/vectors_rhs_03.cc b/tests/hp/vectors_rhs_03.cc
index 72edad087c..ad78fd930c 100644
--- a/tests/hp/vectors_rhs_03.cc
+++ b/tests/hp/vectors_rhs_03.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/vectors_rhs_hp_01.cc b/tests/hp/vectors_rhs_hp_01.cc
index d29ad8d73d..288f973be3 100644
--- a/tests/hp/vectors_rhs_hp_01.cc
+++ b/tests/hp/vectors_rhs_hp_01.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/hp/vectors_rhs_hp_03.cc b/tests/hp/vectors_rhs_hp_03.cc
index d1959ef2f6..00cad01c1b 100644
--- a/tests/hp/vectors_rhs_hp_03.cc
+++ b/tests/hp/vectors_rhs_hp_03.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/integrators/assembler_simple_system_inhom_01.cc b/tests/integrators/assembler_simple_system_inhom_01.cc
index b62aef9f2d..8b79c04439 100644
--- a/tests/integrators/assembler_simple_system_inhom_01.cc
+++ b/tests/integrators/assembler_simple_system_inhom_01.cc
@@ -441,7 +441,7 @@ void RHSIntegrator<dim>::face(MeshWorker::DoFInfo<dim> &,
 /*
  * Main class
  */
-template<int dim>
+template <int dim>
 class MeshWorkerConstraintMatrixTest
 {
 public:
@@ -476,7 +476,7 @@ private:
 };
 
 
-template<int dim>
+template <int dim>
 MeshWorkerConstraintMatrixTest<dim>::MeshWorkerConstraintMatrixTest(const FiniteElement<dim> &fe) :
   mapping(),
   dof_handler(triangulation),
@@ -499,7 +499,7 @@ MeshWorkerConstraintMatrixTest<dim>::~MeshWorkerConstraintMatrixTest ()
 }
 
 
-template<int dim>
+template <int dim>
 void MeshWorkerConstraintMatrixTest<dim>::setup_system()
 {
   dof_handler.distribute_dofs(fe);
@@ -534,7 +534,7 @@ void MeshWorkerConstraintMatrixTest<dim>::setup_system()
 /*
  * Assemble with SystemSimple
  */
-template<int dim>
+template <int dim>
 void MeshWorkerConstraintMatrixTest<dim>::assemble_system_MeshWorker()
 {
 
@@ -567,7 +567,7 @@ void MeshWorkerConstraintMatrixTest<dim>::assemble_system_MeshWorker()
 /*
  * Assemble matrix and vector seperately
  */
-template<int dim>
+template <int dim>
 void MeshWorkerConstraintMatrixTest<dim>::assemble_MeshWorker()
 {
 
@@ -634,7 +634,7 @@ void MeshWorkerConstraintMatrixTest<dim>::createInhomConstraints()
 }
 
 
-template<int dim>
+template <int dim>
 void MeshWorkerConstraintMatrixTest<dim>::run()
 {
   setup_system();
diff --git a/tests/integrators/cells_and_faces_01.cc b/tests/integrators/cells_and_faces_01.cc
index 8d8ce01cb7..184eabb4b7 100644
--- a/tests/integrators/cells_and_faces_01.cc
+++ b/tests/integrators/cells_and_faces_01.cc
@@ -156,7 +156,7 @@ test_mesh(DoFHandler<dim> &mgdofs)
 }
 
 
-template<int dim>
+template <int dim>
 void
 test(const FiniteElement<dim> &fe)
 {
diff --git a/tests/integrators/functional_01.cc b/tests/integrators/functional_01.cc
index 1a80d3cd5b..1df185a06e 100644
--- a/tests/integrators/functional_01.cc
+++ b/tests/integrators/functional_01.cc
@@ -129,7 +129,7 @@ test_mesh(DoFHandler<dim> &mgdofs)
 }
 
 
-template<int dim>
+template <int dim>
 void
 test(const FiniteElement<dim> &fe)
 {
diff --git a/tests/integrators/mesh_worker_01.cc b/tests/integrators/mesh_worker_01.cc
index ca82779f21..c002014627 100644
--- a/tests/integrators/mesh_worker_01.cc
+++ b/tests/integrators/mesh_worker_01.cc
@@ -165,7 +165,7 @@ test_simple(DoFHandler<dim> &mgdofs)
 }
 
 
-template<int dim>
+template <int dim>
 void
 test(const FiniteElement<dim> &fe)
 {
diff --git a/tests/integrators/mesh_worker_02.cc b/tests/integrators/mesh_worker_02.cc
index e96015d877..489dcf2a09 100644
--- a/tests/integrators/mesh_worker_02.cc
+++ b/tests/integrators/mesh_worker_02.cc
@@ -257,7 +257,7 @@ test_simple(DoFHandler<dim> &mgdofs)
 }
 
 
-template<int dim>
+template <int dim>
 void
 test(const FiniteElement<dim> &fe)
 {
diff --git a/tests/integrators/mesh_worker_03.cc b/tests/integrators/mesh_worker_03.cc
index 44d388f713..1b325dcc44 100644
--- a/tests/integrators/mesh_worker_03.cc
+++ b/tests/integrators/mesh_worker_03.cc
@@ -270,7 +270,7 @@ test_simple(DoFHandler<dim> &mgdofs)
 }
 
 
-template<int dim>
+template <int dim>
 void
 test(const FiniteElement<dim> &fe)
 {
diff --git a/tests/integrators/mesh_worker_matrix_01.cc b/tests/integrators/mesh_worker_matrix_01.cc
index 82cc1f00a8..806a9154cc 100644
--- a/tests/integrators/mesh_worker_matrix_01.cc
+++ b/tests/integrators/mesh_worker_matrix_01.cc
@@ -166,7 +166,7 @@ test_simple(DoFHandler<dim> &dofs, bool faces)
 }
 
 
-template<int dim>
+template <int dim>
 void
 test(const FiniteElement<dim> &fe)
 {
diff --git a/tests/lac/filtered_matrix.cc b/tests/lac/filtered_matrix.cc
index 1115012d6b..8d6a641254 100644
--- a/tests/lac/filtered_matrix.cc
+++ b/tests/lac/filtered_matrix.cc
@@ -26,7 +26,7 @@
 #include <fstream>
 
 
-template<typename VectorType>
+template <typename VectorType>
 void test (const FilteredMatrix<VectorType> &M)
 {
   deallog << "Iterator";
diff --git a/tests/lac/filtered_matrix_01.cc b/tests/lac/filtered_matrix_01.cc
index 169f076f61..7a14942909 100644
--- a/tests/lac/filtered_matrix_01.cc
+++ b/tests/lac/filtered_matrix_01.cc
@@ -20,7 +20,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkVmult(FullMatrix<number> &A, Vector<number> &V,
            bool expect_constrained_source = false)
diff --git a/tests/lac/filtered_matrix_02.cc b/tests/lac/filtered_matrix_02.cc
index 950a627cf7..75f3170622 100644
--- a/tests/lac/filtered_matrix_02.cc
+++ b/tests/lac/filtered_matrix_02.cc
@@ -20,7 +20,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkTvmult(FullMatrix<number> &A, Vector<number> &V,
             bool expect_constrained_source = false)
diff --git a/tests/lac/filtered_matrix_03.cc b/tests/lac/filtered_matrix_03.cc
index 9c6b31652c..63ab2755f5 100644
--- a/tests/lac/filtered_matrix_03.cc
+++ b/tests/lac/filtered_matrix_03.cc
@@ -20,7 +20,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkVmult_Add(FullMatrix<number> &A, Vector<number> &V,
                bool expect_constrained_source = false)
diff --git a/tests/lac/filtered_matrix_04.cc b/tests/lac/filtered_matrix_04.cc
index c152a83228..893b5fb921 100644
--- a/tests/lac/filtered_matrix_04.cc
+++ b/tests/lac/filtered_matrix_04.cc
@@ -20,7 +20,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkTvmult_Add(FullMatrix<number> &A, Vector<number> &V,
                 bool expect_constrained_source = false)
diff --git a/tests/lac/filtered_matrix_05.cc b/tests/lac/filtered_matrix_05.cc
index 0774719424..13c908d53d 100644
--- a/tests/lac/filtered_matrix_05.cc
+++ b/tests/lac/filtered_matrix_05.cc
@@ -20,7 +20,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkApply_Constraints(FullMatrix<number> &A, Vector<number> &V,
                        bool matrix_is_symmetric = false)
diff --git a/tests/lac/gmres_eigenvalues.cc b/tests/lac/gmres_eigenvalues.cc
index 6c29b79706..12dc74b716 100644
--- a/tests/lac/gmres_eigenvalues.cc
+++ b/tests/lac/gmres_eigenvalues.cc
@@ -22,7 +22,7 @@
 #include <deal.II/lac/solver_gmres.h>
 #include <deal.II/lac/precondition.h>
 
-template<class NUMBER>
+template <class NUMBER>
 void output_eigenvalues(const std::vector<NUMBER> &eigenvalues,const std::string &text)
 {
   deallog<< text;
diff --git a/tests/lac/identity_matrix_01.cc b/tests/lac/identity_matrix_01.cc
index 21b0797eec..0f72cbd157 100644
--- a/tests/lac/identity_matrix_01.cc
+++ b/tests/lac/identity_matrix_01.cc
@@ -26,7 +26,7 @@
 #include <iomanip>
 #include <cmath>
 
-template<typename number>
+template <typename number>
 void
 check_vmult()
 {
diff --git a/tests/lac/identity_matrix_02.cc b/tests/lac/identity_matrix_02.cc
index 5a24d1d792..6d84cf0eda 100644
--- a/tests/lac/identity_matrix_02.cc
+++ b/tests/lac/identity_matrix_02.cc
@@ -27,7 +27,7 @@
 #include <iomanip>
 #include <cmath>
 
-template<typename number>
+template <typename number>
 void
 check_vmult()
 {
diff --git a/tests/lac/identity_matrix_03.cc b/tests/lac/identity_matrix_03.cc
index 3d32092157..1480ae2379 100644
--- a/tests/lac/identity_matrix_03.cc
+++ b/tests/lac/identity_matrix_03.cc
@@ -27,7 +27,7 @@
 #include <iomanip>
 #include <cmath>
 
-template<typename number>
+template <typename number>
 void
 check_vmult()
 {
diff --git a/tests/lac/identity_matrix_04.cc b/tests/lac/identity_matrix_04.cc
index 707aaee836..075e8ac1da 100644
--- a/tests/lac/identity_matrix_04.cc
+++ b/tests/lac/identity_matrix_04.cc
@@ -27,7 +27,7 @@
 #include <iomanip>
 #include <cmath>
 
-template<typename number>
+template <typename number>
 void
 check_vmult()
 {
diff --git a/tests/lac/identity_matrix_05.cc b/tests/lac/identity_matrix_05.cc
index 45a082ca60..5cd2420d24 100644
--- a/tests/lac/identity_matrix_05.cc
+++ b/tests/lac/identity_matrix_05.cc
@@ -27,7 +27,7 @@
 #include <iomanip>
 #include <cmath>
 
-template<typename number>
+template <typename number>
 void
 check_vmult()
 {
diff --git a/tests/lac/identity_matrix_06.cc b/tests/lac/identity_matrix_06.cc
index 0cc70115ca..71ea2c5753 100644
--- a/tests/lac/identity_matrix_06.cc
+++ b/tests/lac/identity_matrix_06.cc
@@ -31,7 +31,7 @@
 #include <iomanip>
 #include <cmath>
 
-template<typename number>
+template <typename number>
 void
 check_vmult()
 {
diff --git a/tests/lac/linear_operator_05.cc b/tests/lac/linear_operator_05.cc
index 36787e1e17..47a0864182 100644
--- a/tests/lac/linear_operator_05.cc
+++ b/tests/lac/linear_operator_05.cc
@@ -90,25 +90,25 @@ public:
     return 1;
   };
 
-  template<typename OutVector, typename InVector>
+  template <typename OutVector, typename InVector>
   void vmult(OutVector &, const InVector &) const
   {
     deallog << "MyMatrix3::vmult" << std::endl;
   }
 
-  template<typename OutVector, typename InVector>
+  template <typename OutVector, typename InVector>
   void Tvmult(OutVector &, const InVector &) const
   {
     deallog << "MyMatrix3::Tvmult" << std::endl;
   }
 
-  template<typename OutVector, typename InVector>
+  template <typename OutVector, typename InVector>
   void vmult_add(OutVector &, const InVector &) const
   {
     deallog << "MyMatrix3::vmult_add" << std::endl;
   }
 
-  template<typename OutVector, typename InVector>
+  template <typename OutVector, typename InVector>
   void Tvmult_add(OutVector &, const InVector &) const
   {
     deallog << "MyMatrix3::Tvmult_add" << std::endl;
@@ -127,25 +127,25 @@ public:
     return 1;
   };
 
-  template<typename OutVector, typename InVector>
+  template <typename OutVector, typename InVector>
   void vmult(OutVector &, const InVector &, bool = true) const
   {
     deallog << "MyMatrix4::vmult" << std::endl;
   }
 
-  template<typename OutVector, typename InVector>
+  template <typename OutVector, typename InVector>
   void Tvmult(OutVector &, const InVector &, bool = true) const
   {
     deallog << "MyMatrix4::Tvmult" << std::endl;
   }
 
-  template<typename OutVector, typename InVector>
+  template <typename OutVector, typename InVector>
   void vmult_add(OutVector &, const InVector &, bool = true) const
   {
     deallog << "MyMatrix4::vmult_add" << std::endl;
   }
 
-  template<typename OutVector, typename InVector>
+  template <typename OutVector, typename InVector>
   void Tvmult_add(OutVector &, const InVector &, bool = true) const
   {
     deallog << "MyMatrix4::Tvmult_add" << std::endl;
@@ -164,25 +164,25 @@ public:
     return 1;
   };
 
-  template<typename number>
+  template <typename number>
   void vmult(Vector<number> &, const Vector<number> &, bool = true) const
   {
     deallog << "MyMatrix5::vmult" << std::endl;
   }
 
-  template<typename number>
+  template <typename number>
   void Tvmult(Vector<number> &, const Vector<number> &, bool = true) const
   {
     deallog << "MyMatrix5::Tvmult" << std::endl;
   }
 
-  template<typename number>
+  template <typename number>
   void vmult_add(Vector<number> &, const Vector<number> &, bool = true) const
   {
     deallog << "MyMatrix5::vmult_add" << std::endl;
   }
 
-  template<typename number>
+  template <typename number>
   void Tvmult_add(Vector<number> &, const Vector<number> &, bool = true) const
   {
     deallog << "MyMatrix5::Tvmult_add" << std::endl;
@@ -201,19 +201,19 @@ public:
     return 1;
   };
 
-  template<typename number, typename number2>
+  template <typename number, typename number2>
   void vmult(Vector<number> &, const Vector<number2> &, bool = true) const
   {
     deallog << "MyMatrix6::vmult" << std::endl;
   }
 
-  template<typename number, typename number2>
+  template <typename number, typename number2>
   void Tvmult(Vector<number> &, const Vector<number2> &, bool = true) const
   {
     deallog << "MyMatrix6::Tvmult" << std::endl;
   }
 
-  template<typename number, typename number2>
+  template <typename number, typename number2>
   void vmult_add(Vector<number> &, const Vector<number2> &, bool = true) const
   {
     deallog << "MyMatrix6::vmult_add" << std::endl;
diff --git a/tests/lac/linear_operator_08.cc b/tests/lac/linear_operator_08.cc
index 0a57a1c989..bc59c054bb 100644
--- a/tests/lac/linear_operator_08.cc
+++ b/tests/lac/linear_operator_08.cc
@@ -50,8 +50,8 @@
 using namespace dealii;
 
 
-template<class PRECONDITIONER, typename MatrixType, typename VectorType,
-         class ADDITIONAL_DATA = typename PRECONDITIONER::AdditionalData>
+template <class PRECONDITIONER, typename MatrixType, typename VectorType,
+          class ADDITIONAL_DATA = typename PRECONDITIONER::AdditionalData>
 void
 test_preconditioner_block (const MatrixType &A,
                            const VectorType &b,
@@ -88,7 +88,7 @@ test_preconditioner_block (const MatrixType &A,
 // For Vector <double>
 // Cannot use more generic function as Vector <double>
 // does not define vector_type
-template<class PRECONDITIONER>
+template <class PRECONDITIONER>
 void
 test_preconditioner (const SparseMatrix<double> &A,
                      const Vector<double> &b,
@@ -130,7 +130,7 @@ test_preconditioner (const SparseMatrix<double> &A,
   }
 }
 
-template<typename SolverType>
+template <typename SolverType>
 void
 test_solver (const SparseMatrix<double> &A,
              const Vector<double> &b)
@@ -194,14 +194,14 @@ public:
                               matrix.n_block_cols());
   }
 
-  template<typename VectorType>
+  template <typename VectorType>
   void
   vmult(VectorType &dst, const VectorType &src) const
   {
     dst = src;
   }
 
-  template<typename VectorType>
+  template <typename VectorType>
   void
   Tvmult(VectorType &dst, const VectorType &src) const
   {
diff --git a/tests/lac/linear_operator_10.cc b/tests/lac/linear_operator_10.cc
index 813a9c088f..007b5210aa 100644
--- a/tests/lac/linear_operator_10.cc
+++ b/tests/lac/linear_operator_10.cc
@@ -31,7 +31,7 @@
 
 using namespace dealii;
 
-template<typename VECTOR>
+template <typename VECTOR>
 void
 print (const VECTOR &vec)
 {
@@ -43,8 +43,8 @@ print (const VECTOR &vec)
 }
 
 
-template<class PRECONDITIONER, class MATRIX, class VECTOR,
-         class ADDITIONAL_DATA = typename PRECONDITIONER::AdditionalData>
+template <class PRECONDITIONER, class MATRIX, class VECTOR,
+          class ADDITIONAL_DATA = typename PRECONDITIONER::AdditionalData>
 void
 test_preconditioner (const MATRIX &A,
                      const VECTOR &b,
@@ -145,7 +145,7 @@ test_preconditioner (const MATRIX &A,
   deallog.pop();
 }
 
-template<class SOLVER, class MATRIX, class VECTOR>
+template <class SOLVER, class MATRIX, class VECTOR>
 void
 test_solver (const MATRIX &A,
              const VECTOR &b)
diff --git a/tests/lac/linear_operator_10a.cc b/tests/lac/linear_operator_10a.cc
index 9f5a403bf7..c482e6295c 100644
--- a/tests/lac/linear_operator_10a.cc
+++ b/tests/lac/linear_operator_10a.cc
@@ -37,7 +37,7 @@
 
 using namespace dealii;
 
-template<typename VECTOR>
+template <typename VECTOR>
 void
 print (const VECTOR &vec)
 {
@@ -49,8 +49,8 @@ print (const VECTOR &vec)
 }
 
 
-template<class PRECONDITIONER, class MATRIX, class VECTOR,
-         class ADDITIONAL_DATA = typename PRECONDITIONER::AdditionalData>
+template <class PRECONDITIONER, class MATRIX, class VECTOR,
+          class ADDITIONAL_DATA = typename PRECONDITIONER::AdditionalData>
 void
 test_preconditioner (const MATRIX &A,
                      const VECTOR &b,
@@ -151,7 +151,7 @@ test_preconditioner (const MATRIX &A,
   deallog.pop();
 }
 
-template<class SOLVER, class MATRIX, class VECTOR>
+template <class SOLVER, class MATRIX, class VECTOR>
 void
 test_solver (const MATRIX &A,
              const VECTOR &b)
diff --git a/tests/lac/linear_operator_13.cc b/tests/lac/linear_operator_13.cc
index e034b0e77e..c564cff57e 100644
--- a/tests/lac/linear_operator_13.cc
+++ b/tests/lac/linear_operator_13.cc
@@ -48,7 +48,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 void build_matrix_vector(TrilinosWrappers::BlockSparseMatrix &matrix,
                          TrilinosWrappers::MPI::BlockVector       &vector,
                          const FE_Q<dim>                     &fe_test,
diff --git a/tests/lac/linear_operator_14.cc b/tests/lac/linear_operator_14.cc
index 4b9c3394e9..2f670b7db3 100644
--- a/tests/lac/linear_operator_14.cc
+++ b/tests/lac/linear_operator_14.cc
@@ -50,7 +50,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 void build_matrix_vector(TrilinosWrappers::BlockSparseMatrix &matrix,
                          TrilinosWrappers::MPI::BlockVector  &vector,
                          const FE_Q<dim>                     &fe_test,
diff --git a/tests/lac/matrices_02.cc b/tests/lac/matrices_02.cc
index 1026d1d1fa..0d3aa85d3b 100644
--- a/tests/lac/matrices_02.cc
+++ b/tests/lac/matrices_02.cc
@@ -40,7 +40,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/lac/pointer_matrix_01.cc b/tests/lac/pointer_matrix_01.cc
index 460537aadb..713a7e1a73 100644
--- a/tests/lac/pointer_matrix_01.cc
+++ b/tests/lac/pointer_matrix_01.cc
@@ -21,7 +21,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkConstructor1()
 {
diff --git a/tests/lac/pointer_matrix_02.cc b/tests/lac/pointer_matrix_02.cc
index a8604dccb9..6c67b97da7 100644
--- a/tests/lac/pointer_matrix_02.cc
+++ b/tests/lac/pointer_matrix_02.cc
@@ -21,7 +21,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkConstructor2(FullMatrix<number> &A)
 {
diff --git a/tests/lac/pointer_matrix_03.cc b/tests/lac/pointer_matrix_03.cc
index 8484ac00cb..933cbf8294 100644
--- a/tests/lac/pointer_matrix_03.cc
+++ b/tests/lac/pointer_matrix_03.cc
@@ -21,7 +21,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkConstructor3(char *name)
 {
diff --git a/tests/lac/pointer_matrix_04.cc b/tests/lac/pointer_matrix_04.cc
index 085d9d2556..a341c2bddb 100644
--- a/tests/lac/pointer_matrix_04.cc
+++ b/tests/lac/pointer_matrix_04.cc
@@ -21,7 +21,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkConstructor4(const FullMatrix<number> &A, char *name)
 {
diff --git a/tests/lac/pointer_matrix_05.cc b/tests/lac/pointer_matrix_05.cc
index e26ce37a61..8ede99d41e 100644
--- a/tests/lac/pointer_matrix_05.cc
+++ b/tests/lac/pointer_matrix_05.cc
@@ -21,7 +21,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkVmult(FullMatrix<number> &A, Vector<number> &V, char *name =
              "Test Matrix")
diff --git a/tests/lac/pointer_matrix_06.cc b/tests/lac/pointer_matrix_06.cc
index 91845f6cea..656d222558 100644
--- a/tests/lac/pointer_matrix_06.cc
+++ b/tests/lac/pointer_matrix_06.cc
@@ -21,7 +21,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkTvmult(FullMatrix<number> &A, Vector<number> &V, char *name =
               "Test Matrix")
diff --git a/tests/lac/pointer_matrix_07.cc b/tests/lac/pointer_matrix_07.cc
index ee7ccd75dd..535665fba8 100644
--- a/tests/lac/pointer_matrix_07.cc
+++ b/tests/lac/pointer_matrix_07.cc
@@ -21,7 +21,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkTvmult_add(FullMatrix<number> &A, Vector<number> &V, char *name =
                   "Test Matrix")
diff --git a/tests/lac/pointer_matrix_08.cc b/tests/lac/pointer_matrix_08.cc
index dfcf40229f..fc934306cb 100644
--- a/tests/lac/pointer_matrix_08.cc
+++ b/tests/lac/pointer_matrix_08.cc
@@ -21,7 +21,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkVmult_add(FullMatrix<number> &A, Vector<number> &V, char *name =
                  "Test Matrix")
diff --git a/tests/lac/pointer_matrix_09.cc b/tests/lac/pointer_matrix_09.cc
index 0f318fc8d8..2f4c27eb3a 100644
--- a/tests/lac/pointer_matrix_09.cc
+++ b/tests/lac/pointer_matrix_09.cc
@@ -21,7 +21,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkClear(FullMatrix<number> &A)
 {
diff --git a/tests/lac/pointer_matrix_10.cc b/tests/lac/pointer_matrix_10.cc
index e4ba066174..c9d06124a1 100644
--- a/tests/lac/pointer_matrix_10.cc
+++ b/tests/lac/pointer_matrix_10.cc
@@ -21,7 +21,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 
-template<typename number>
+template <typename number>
 void
 checkAssign(FullMatrix<number> &A, FullMatrix<number> &B)
 {
diff --git a/tests/lac/quickmatrix.h b/tests/lac/quickmatrix.h
index a2da7f85fa..c3541390f2 100644
--- a/tests/lac/quickmatrix.h
+++ b/tests/lac/quickmatrix.h
@@ -7,7 +7,7 @@
  * The diagonal is scaled to 1, resulting in an effective mesh width of 1/2.
  */
 
-template<typename number>
+template <typename number>
 class QuickMatrix
 {
 public:
@@ -27,13 +27,13 @@ protected:
 };
 
 
-template<typename number>
+template <typename number>
 QuickMatrix<number>::QuickMatrix(unsigned int nx, unsigned int ny)
   :
   nx(nx), ny(ny)
 {}
 
-template<typename number>
+template <typename number>
 template <typename number2>
 void
 QuickMatrix<number>::vmult(Vector<number2> &d,
diff --git a/tests/lac/solver.cc b/tests/lac/solver.cc
index a1e64bebb5..582bc7a4a4 100644
--- a/tests/lac/solver.cc
+++ b/tests/lac/solver.cc
@@ -33,7 +33,7 @@
 #include <deal.II/lac/solver_qmrs.h>
 #include <deal.II/lac/precondition.h>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType         &solver,
              const MatrixType   &A,
@@ -53,7 +53,7 @@ check_solve (SolverType         &solver,
     }
 }
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_Tsolve (SolverType         &solver,
               const MatrixType   &A,
diff --git a/tests/lac/solver_02.cc b/tests/lac/solver_02.cc
index e56c313920..631cdea223 100644
--- a/tests/lac/solver_02.cc
+++ b/tests/lac/solver_02.cc
@@ -32,7 +32,7 @@
 #include <deal.II/lac/precondition.h>
 #include <deal.II/base/point.h>
 
-template<typename SolverType>
+template <typename SolverType>
 void test()
 {
   const unsigned int size = 3;
diff --git a/tests/lac/solver_control_01.cc b/tests/lac/solver_control_01.cc
index 42f765fac8..1154d8e013 100644
--- a/tests/lac/solver_control_01.cc
+++ b/tests/lac/solver_control_01.cc
@@ -33,7 +33,7 @@
 #include <deal.II/lac/solver_relaxation.h>
 #include <deal.II/lac/precondition.h>
 
-template<typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverControl       &solver_control,
              const MatrixType    &A,
diff --git a/tests/lac/solver_control_02.cc b/tests/lac/solver_control_02.cc
index 9686acfb77..962f1104fa 100644
--- a/tests/lac/solver_control_02.cc
+++ b/tests/lac/solver_control_02.cc
@@ -33,7 +33,7 @@
 #include <deal.II/lac/solver_relaxation.h>
 #include <deal.II/lac/precondition.h>
 
-template<typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverControl       &solver_control,
              const MatrixType    &A,
diff --git a/tests/lac/solver_control_03.cc b/tests/lac/solver_control_03.cc
index 85cb45dda0..c6afa9fbed 100644
--- a/tests/lac/solver_control_03.cc
+++ b/tests/lac/solver_control_03.cc
@@ -33,7 +33,7 @@
 #include <deal.II/lac/solver_relaxation.h>
 #include <deal.II/lac/precondition.h>
 
-template<typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverControl       &solver_control,
              const MatrixType    &A,
diff --git a/tests/lac/solver_control_04.cc b/tests/lac/solver_control_04.cc
index e710158f38..e2ce122fda 100644
--- a/tests/lac/solver_control_04.cc
+++ b/tests/lac/solver_control_04.cc
@@ -33,7 +33,7 @@
 #include <deal.II/lac/solver_relaxation.h>
 #include <deal.II/lac/precondition.h>
 
-template<typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverControl       &solver_control,
              const MatrixType    &A,
diff --git a/tests/lac/solver_memorytest.cc b/tests/lac/solver_memorytest.cc
index 2145fccbac..7492218186 100644
--- a/tests/lac/solver_memorytest.cc
+++ b/tests/lac/solver_memorytest.cc
@@ -39,7 +39,7 @@
 #include <deal.II/lac/solver_qmrs.h>
 #include <deal.II/lac/precondition.h>
 
-template<typename SolverType, typename MatrixType, typename VectorType>
+template <typename SolverType, typename MatrixType, typename VectorType>
 void
 check_solve (const MatrixType &A,
              VectorType       &u,
diff --git a/tests/lac/solver_monitor.cc b/tests/lac/solver_monitor.cc
index 6d216d6e5b..811681a790 100644
--- a/tests/lac/solver_monitor.cc
+++ b/tests/lac/solver_monitor.cc
@@ -56,7 +56,7 @@ SolverControl::State monitor_mean (const unsigned int    iteration,
 
 
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType         &solver,
              const MatrixType   &A,
diff --git a/tests/lac/solver_monitor_disconnect.cc b/tests/lac/solver_monitor_disconnect.cc
index c7e0cdbfda..4e596fc78c 100644
--- a/tests/lac/solver_monitor_disconnect.cc
+++ b/tests/lac/solver_monitor_disconnect.cc
@@ -57,7 +57,7 @@ SolverControl::State monitor_mean (const unsigned int    iteration,
 
 
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType         &solver,
              const MatrixType   &A,
diff --git a/tests/lac/solver_relaxation_01.cc b/tests/lac/solver_relaxation_01.cc
index 81b7ee8841..205a50da0a 100644
--- a/tests/lac/solver_relaxation_01.cc
+++ b/tests/lac/solver_relaxation_01.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/solver_relaxation.h>
 #include <deal.II/lac/precondition.h>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 double
 check_solve (SolverType         &solver,
              const MatrixType   &A,
diff --git a/tests/lac/solver_relaxation_02.cc b/tests/lac/solver_relaxation_02.cc
index 3883ce0689..e47da40007 100644
--- a/tests/lac/solver_relaxation_02.cc
+++ b/tests/lac/solver_relaxation_02.cc
@@ -32,7 +32,7 @@
 #include <deal.II/lac/precondition_block.h>
 #include <deal.II/lac/relaxation_block.h>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 double
 check_solve (SolverType         &solver,
              const MatrixType   &A,
diff --git a/tests/lac/solver_relaxation_03.cc b/tests/lac/solver_relaxation_03.cc
index a1f83fdd91..ce9a53104c 100644
--- a/tests/lac/solver_relaxation_03.cc
+++ b/tests/lac/solver_relaxation_03.cc
@@ -33,7 +33,7 @@
 #include <deal.II/lac/precondition_block.h>
 #include <deal.II/lac/relaxation_block.h>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 double
 check_solve (SolverType         &solver,
              const MatrixType   &A,
diff --git a/tests/lac/solver_relaxation_04.cc b/tests/lac/solver_relaxation_04.cc
index 52b63bd3c2..098bc4cc3a 100644
--- a/tests/lac/solver_relaxation_04.cc
+++ b/tests/lac/solver_relaxation_04.cc
@@ -32,7 +32,7 @@
 #include <iomanip>
 
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 double
 check_solve (SolverType         &solver,
              const MatrixType   &A,
diff --git a/tests/lac/solver_signals.cc b/tests/lac/solver_signals.cc
index 8b71d03eac..1e0bd1369e 100644
--- a/tests/lac/solver_signals.cc
+++ b/tests/lac/solver_signals.cc
@@ -45,7 +45,7 @@ void output_coefficients(double alpha,double beta)
   deallog<<"alpha: "<< alpha << " beta: "<< beta << std::endl;
 }
 
-template<class NUMBER>
+template <class NUMBER>
 void output_eigenvalues(const std::vector<NUMBER> &eigenvalues,const std::string &text)
 {
   deallog<< text;
@@ -56,7 +56,7 @@ void output_eigenvalues(const std::vector<NUMBER> &eigenvalues,const std::string
   deallog << std::endl;
 }
 
-template<class NUMBER>
+template <class NUMBER>
 void output_hessenberg_matrix(const FullMatrix<NUMBER> &H,const std::string &text)
 {
   deallog << text << std::endl;
@@ -68,7 +68,7 @@ void output_hessenberg_matrix(const FullMatrix<NUMBER> &H,const std::string &tex
     }
 }
 
-template<class NUMBER>
+template <class NUMBER>
 void output_arnoldi_vectors_norms(const internal::SolverGMRES::TmpVectors<Vector<NUMBER> > &tmp_vector,const std::string &text)
 {
   deallog << text << std::endl;
@@ -76,7 +76,7 @@ void output_arnoldi_vectors_norms(const internal::SolverGMRES::TmpVectors<Vector
     deallog << tmp_vector[i].l2_norm() << std::endl;
 }
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType         &solver,
             const MatrixType   &A,
diff --git a/tests/lac/sparse_matrices.cc b/tests/lac/sparse_matrices.cc
index 6277f49474..c4f3797a64 100644
--- a/tests/lac/sparse_matrices.cc
+++ b/tests/lac/sparse_matrices.cc
@@ -41,7 +41,7 @@
   deallog.pop(); \
   residuals.push_back(control.last_value())
 
-template<typename MatrixType>
+template <typename MatrixType>
 void
 check_vmult_quadratic (std::vector<double> &residuals,
                        const MatrixType    &A,
diff --git a/tests/lac/tridiagonal_matrix.cc b/tests/lac/tridiagonal_matrix.cc
index 83a8322ddb..642401685b 100644
--- a/tests/lac/tridiagonal_matrix.cc
+++ b/tests/lac/tridiagonal_matrix.cc
@@ -35,7 +35,7 @@
 
 
 // Symmetric matrix with constant diagonals [-1,2,-1]
-template<typename number>
+template <typename number>
 void
 matrix1(TridiagonalMatrix<number> &M)
 {
@@ -50,7 +50,7 @@ matrix1(TridiagonalMatrix<number> &M)
 
 
 // Nonsymmetric matrix with constant diagonals [-1,2,-3]
-template<typename number>
+template <typename number>
 void
 matrix2(TridiagonalMatrix<number> &M)
 {
@@ -65,7 +65,7 @@ matrix2(TridiagonalMatrix<number> &M)
 
 
 // Matrix with increasing diagonals and symmetric rows
-template<typename number>
+template <typename number>
 void
 matrix3(TridiagonalMatrix<number> &M)
 {
@@ -80,7 +80,7 @@ matrix3(TridiagonalMatrix<number> &M)
 
 
 // Symmetric matrix with increasing diagonals
-template<typename number>
+template <typename number>
 void
 matrix4(TridiagonalMatrix<number> &M)
 {
@@ -95,7 +95,7 @@ matrix4(TridiagonalMatrix<number> &M)
 
 
 // Nonsymmetric matrix with increasing diagonals
-template<typename number>
+template <typename number>
 void
 matrix5(TridiagonalMatrix<number> &M)
 {
@@ -109,7 +109,7 @@ matrix5(TridiagonalMatrix<number> &M)
 }
 
 
-template<typename number>
+template <typename number>
 void
 check_vmult(TridiagonalMatrix<number> &M)
 {
@@ -164,7 +164,7 @@ check_vmult(TridiagonalMatrix<number> &M)
 }
 
 
-template<typename number>
+template <typename number>
 void
 check(unsigned int size)
 {
diff --git a/tests/lac/tridiagonal_matrix_sym.cc b/tests/lac/tridiagonal_matrix_sym.cc
index 51239892d4..6a9f7d4d05 100644
--- a/tests/lac/tridiagonal_matrix_sym.cc
+++ b/tests/lac/tridiagonal_matrix_sym.cc
@@ -38,7 +38,7 @@
 
 
 // Symmetric matrix with constant diagonals [-1,2,-1]
-template<typename number>
+template <typename number>
 void
 matrix1(TridiagonalMatrix<number> &M)
 {
@@ -55,7 +55,7 @@ matrix1(TridiagonalMatrix<number> &M)
 
 
 // Symmetric matrix with increasing diagonals
-template<typename number>
+template <typename number>
 void
 matrix4(TridiagonalMatrix<number> &M)
 {
@@ -69,7 +69,7 @@ matrix4(TridiagonalMatrix<number> &M)
 }
 
 
-template<typename number>
+template <typename number>
 void
 check_vmult(TridiagonalMatrix<number> &M)
 {
@@ -124,7 +124,7 @@ check_vmult(TridiagonalMatrix<number> &M)
 }
 
 
-template<typename number>
+template <typename number>
 void
 check(unsigned int size)
 {
diff --git a/tests/lac/vector_memory.cc b/tests/lac/vector_memory.cc
index 5774106e43..2d924bf13e 100644
--- a/tests/lac/vector_memory.cc
+++ b/tests/lac/vector_memory.cc
@@ -24,7 +24,7 @@
 
 using namespace dealii;
 
-template<typename VectorType>
+template <typename VectorType>
 void
 test_leak()
 {
@@ -34,7 +34,7 @@ test_leak()
 }
 
 
-template<typename VectorType>
+template <typename VectorType>
 void
 test_stat()
 {
diff --git a/tests/lac/vector_view.cc b/tests/lac/vector_view.cc
index 8aff3b8429..56bc05c111 100644
--- a/tests/lac/vector_view.cc
+++ b/tests/lac/vector_view.cc
@@ -34,7 +34,7 @@ void print (const Vector<number> &v)
   deallog << std::endl;
 }
 
-template<typename T>
+template <typename T>
 void fill( T &a)
 {
   for (unsigned int i=0; i<a.size(); ++i)
diff --git a/tests/lac/vector_view_01.cc b/tests/lac/vector_view_01.cc
index 490fa6a544..708bf6ca78 100644
--- a/tests/lac/vector_view_01.cc
+++ b/tests/lac/vector_view_01.cc
@@ -23,7 +23,7 @@
 #include <fstream>
 #include <iomanip>
 
-template<typename number>
+template <typename number>
 void
 checkReadOnlyConstructor(const Vector<number> &V)
 {
diff --git a/tests/lac/vector_view_02.cc b/tests/lac/vector_view_02.cc
index 842cfe824d..65b6d5deca 100644
--- a/tests/lac/vector_view_02.cc
+++ b/tests/lac/vector_view_02.cc
@@ -23,7 +23,7 @@
 #include <fstream>
 #include <iomanip>
 
-template<typename number, typename size_type>
+template <typename number, typename size_type>
 void
 checkReinit1(const size_type N, const bool fast = false)
 {
diff --git a/tests/lac/vector_view_03.cc b/tests/lac/vector_view_03.cc
index 4963a1fbe7..b9f02dac85 100644
--- a/tests/lac/vector_view_03.cc
+++ b/tests/lac/vector_view_03.cc
@@ -23,7 +23,7 @@
 #include <fstream>
 #include <iomanip>
 
-template<typename number>
+template <typename number>
 void
 checkReinit3(const Vector<number> &V)
 {
diff --git a/tests/lac/vector_view_04.cc b/tests/lac/vector_view_04.cc
index 38f07b2bb7..4b249df0fd 100644
--- a/tests/lac/vector_view_04.cc
+++ b/tests/lac/vector_view_04.cc
@@ -23,7 +23,7 @@
 #include <fstream>
 #include <iomanip>
 
-template<typename number>
+template <typename number>
 void
 checkReinit2(Vector<number> &V)
 {
diff --git a/tests/lac/vector_view_05.cc b/tests/lac/vector_view_05.cc
index 00188ee092..4b5bb2c1cd 100644
--- a/tests/lac/vector_view_05.cc
+++ b/tests/lac/vector_view_05.cc
@@ -23,7 +23,7 @@
 #include <fstream>
 #include <iomanip>
 
-template<typename number>
+template <typename number>
 void
 checkReadWriteConstructor(Vector<number> &V)
 {
diff --git a/tests/lapack/solver_cg.cc b/tests/lapack/solver_cg.cc
index d84dc6e119..d83577b2dc 100644
--- a/tests/lapack/solver_cg.cc
+++ b/tests/lapack/solver_cg.cc
@@ -36,7 +36,7 @@ void output_double_number(double input,const std::string &text)
   deallog<<text<< input<<std::endl;
 }
 
-template<class NUMBER>
+template <class NUMBER>
 void output_eigenvalues(const std::vector<NUMBER> &eigenvalues,const std::string &text)
 {
   deallog<< text;
@@ -48,7 +48,7 @@ void output_eigenvalues(const std::vector<NUMBER> &eigenvalues,const std::string
 }
 
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType         &solver,
              const MatrixType   &A,
@@ -68,7 +68,7 @@ check_solve (SolverType         &solver,
     }
 }
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_Tsolve (SolverType         &solver,
               const MatrixType   &A,
diff --git a/tests/manifold/copy_boundary_to_manifold_id_01.cc b/tests/manifold/copy_boundary_to_manifold_id_01.cc
index bc1f4dd43d..be715e8e0c 100644
--- a/tests/manifold/copy_boundary_to_manifold_id_01.cc
+++ b/tests/manifold/copy_boundary_to_manifold_id_01.cc
@@ -25,7 +25,7 @@
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/grid_out.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void print_info(Triangulation<dim,spacedim> &tria)
 {
   typename Triangulation<dim,spacedim>::active_cell_iterator cell;
diff --git a/tests/manifold/copy_material_to_manifold_id_01.cc b/tests/manifold/copy_material_to_manifold_id_01.cc
index 1cf744c01d..028389690c 100644
--- a/tests/manifold/copy_material_to_manifold_id_01.cc
+++ b/tests/manifold/copy_material_to_manifold_id_01.cc
@@ -25,7 +25,7 @@
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/grid_out.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void print_info(Triangulation<dim,spacedim> &tria)
 {
   typename Triangulation<dim,spacedim>::active_cell_iterator cell;
diff --git a/tests/manifold/polar_manifold_06.cc b/tests/manifold/polar_manifold_06.cc
index 579bfb20ed..ed38f488ab 100644
--- a/tests/manifold/polar_manifold_06.cc
+++ b/tests/manifold/polar_manifold_06.cc
@@ -26,7 +26,7 @@
 
 #include <numeric>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/manifold/set_all_manifold_ids_01.cc b/tests/manifold/set_all_manifold_ids_01.cc
index b69d64b257..b6c20fe5a8 100644
--- a/tests/manifold/set_all_manifold_ids_01.cc
+++ b/tests/manifold/set_all_manifold_ids_01.cc
@@ -23,7 +23,7 @@
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/grid_out.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void print_info(Triangulation<dim,spacedim> &tria)
 {
   typename Triangulation<dim,spacedim>::active_cell_iterator cell;
diff --git a/tests/manifold/set_all_manifold_ids_02.cc b/tests/manifold/set_all_manifold_ids_02.cc
index 686cf85934..eb2d9be10f 100644
--- a/tests/manifold/set_all_manifold_ids_02.cc
+++ b/tests/manifold/set_all_manifold_ids_02.cc
@@ -23,7 +23,7 @@
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/grid_out.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void print_info(Triangulation<dim,spacedim> &tria)
 {
   typename Triangulation<dim,spacedim>::active_cell_iterator cell;
diff --git a/tests/mappings/fe_face_values_1d_mapping_cartesian.cc b/tests/mappings/fe_face_values_1d_mapping_cartesian.cc
index 908c112030..80b7cb7757 100644
--- a/tests/mappings/fe_face_values_1d_mapping_cartesian.cc
+++ b/tests/mappings/fe_face_values_1d_mapping_cartesian.cc
@@ -42,7 +42,7 @@
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_faces(Mapping<dim> &mapping,
            FiniteElement<dim> &fe,
@@ -87,7 +87,7 @@ plot_faces(Mapping<dim> &mapping,
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_subfaces(Mapping<dim> &mapping,
               FiniteElement<dim> &fe,
@@ -137,7 +137,7 @@ plot_subfaces(Mapping<dim> &mapping,
 }
 
 
-template<int dim>
+template <int dim>
 void mapping_test()
 {
   deallog << "dim=" << dim << std::endl;
diff --git a/tests/mappings/fe_face_values_1d_mapping_q2.cc b/tests/mappings/fe_face_values_1d_mapping_q2.cc
index 04632f5408..d45ca869c6 100644
--- a/tests/mappings/fe_face_values_1d_mapping_q2.cc
+++ b/tests/mappings/fe_face_values_1d_mapping_q2.cc
@@ -42,7 +42,7 @@
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_faces(Mapping<dim> &mapping,
            FiniteElement<dim> &fe,
@@ -87,7 +87,7 @@ plot_faces(Mapping<dim> &mapping,
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_subfaces(Mapping<dim> &mapping,
               FiniteElement<dim> &fe,
@@ -137,7 +137,7 @@ plot_subfaces(Mapping<dim> &mapping,
 }
 
 
-template<int dim>
+template <int dim>
 void mapping_test()
 {
   deallog << "dim=" << dim << std::endl;
diff --git a/tests/mappings/mapping.cc b/tests/mappings/mapping.cc
index 56a7d65ce7..bf6a33b76d 100644
--- a/tests/mappings/mapping.cc
+++ b/tests/mappings/mapping.cc
@@ -41,7 +41,7 @@
 #define PRECISION 2
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_transformation(Mapping<dim> &mapping,
                     FiniteElement<dim> &fe,
@@ -81,7 +81,7 @@ plot_transformation(Mapping<dim> &mapping,
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_faces(Mapping<dim> &mapping,
            FiniteElement<dim> &fe,
@@ -125,7 +125,7 @@ plot_faces(Mapping<dim> &mapping,
 
 
 
-template<int dim>
+template <int dim>
 inline void
 plot_subfaces(Mapping<dim> &mapping,
               FiniteElement<dim> &fe,
@@ -171,7 +171,7 @@ plot_subfaces(Mapping<dim> &mapping,
 
 
 
-template<>
+template <>
 inline void
 plot_faces(Mapping<1> &,
            FiniteElement<1> &,
@@ -181,7 +181,7 @@ plot_faces(Mapping<1> &,
 
 
 
-template<>
+template <>
 inline void
 plot_subfaces(Mapping<1> &,
               FiniteElement<1> &,
@@ -191,7 +191,7 @@ plot_subfaces(Mapping<1> &,
 
 
 
-template<int dim>
+template <int dim>
 inline void
 compute_area(Mapping<dim> &mapping,
              FiniteElement<dim> &fe,
@@ -210,7 +210,7 @@ compute_area(Mapping<dim> &mapping,
 }
 
 
-template<int dim>
+template <int dim>
 void create_triangulations(std::vector<Triangulation<dim> *> &,
                            std::vector<Boundary<dim> *> &,
                            std::vector<double> &)
@@ -224,7 +224,7 @@ std::vector<std::vector<unsigned int> > show;
 unsigned int mapping_size;
 
 
-template<>
+template <>
 void create_triangulations(std::vector<Triangulation<1> *> &tria_ptr,
                            std::vector<Boundary<1> *> &,
                            std::vector<double> &exact_areas)
@@ -241,7 +241,7 @@ void create_triangulations(std::vector<Triangulation<1> *> &tria_ptr,
 
 
 
-template<>
+template <>
 void create_triangulations(std::vector<Triangulation<2> *> &tria_ptr,
                            std::vector<Boundary<2> *> &boundary_ptr,
                            std::vector<double> &exact_areas)
@@ -355,7 +355,7 @@ void create_triangulations(std::vector<Triangulation<2> *> &tria_ptr,
 
 
 
-template<>
+template <>
 void create_triangulations(std::vector<Triangulation<3> *> &tria_ptr,
                            std::vector<Boundary<3> *> &boundary_ptr,
                            std::vector<double> &exact_areas)
@@ -424,7 +424,7 @@ void create_triangulations(std::vector<Triangulation<3> *> &tria_ptr,
 }
 
 
-template<int dim>
+template <int dim>
 void mapping_test()
 {
   deallog << "dim=" << dim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_01.cc b/tests/mappings/mapping_fe_field_01.cc
index e3a2d9d111..953d7e30df 100644
--- a/tests/mappings/mapping_fe_field_01.cc
+++ b/tests/mappings/mapping_fe_field_01.cc
@@ -42,7 +42,7 @@
 
 #define PRECISION 2
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test(const unsigned int degree)
 {
   deallog << "dim = " << dim << ", spacedim = " << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_b1.cc b/tests/mappings/mapping_fe_field_real_to_unit_b1.cc
index d60c40f700..1740eada93 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_b1.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_b1.cc
@@ -37,7 +37,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_b2_curved.cc b/tests/mappings/mapping_fe_field_real_to_unit_b2_curved.cc
index 7c483e3fe7..c028f06236 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_b2_curved.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_b2_curved.cc
@@ -43,7 +43,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_b2_mask.cc b/tests/mappings/mapping_fe_field_real_to_unit_b2_mask.cc
index b21a357751..04e117b2c7 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_b2_mask.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_b2_mask.cc
@@ -39,7 +39,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_b3_curved.cc b/tests/mappings/mapping_fe_field_real_to_unit_b3_curved.cc
index 97a8c5f038..a9d4f22d79 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_b3_curved.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_b3_curved.cc
@@ -43,7 +43,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_b4_curved.cc b/tests/mappings/mapping_fe_field_real_to_unit_b4_curved.cc
index 6fe4464ca1..b09bf04d6c 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_b4_curved.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_b4_curved.cc
@@ -43,7 +43,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_b5_curved.cc b/tests/mappings/mapping_fe_field_real_to_unit_b5_curved.cc
index 1a85378d43..3c308efe86 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_b5_curved.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_b5_curved.cc
@@ -43,7 +43,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_q1.cc b/tests/mappings/mapping_fe_field_real_to_unit_q1.cc
index e3d18f8c09..720041a80b 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_q1.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_q1.cc
@@ -36,7 +36,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_q2_curved.cc b/tests/mappings/mapping_fe_field_real_to_unit_q2_curved.cc
index 33de2b4926..7e81e046d8 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_q2_curved.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_q2_curved.cc
@@ -45,7 +45,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_q2_mask.cc b/tests/mappings/mapping_fe_field_real_to_unit_q2_mask.cc
index 639e9825c4..cc09ecee40 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_q2_mask.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_q2_mask.cc
@@ -36,7 +36,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_q3_curved.cc b/tests/mappings/mapping_fe_field_real_to_unit_q3_curved.cc
index ac77aa310c..b61e0581da 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_q3_curved.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_q3_curved.cc
@@ -45,7 +45,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_q4_curved.cc b/tests/mappings/mapping_fe_field_real_to_unit_q4_curved.cc
index a13d9e4d43..5edc20ea2e 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_q4_curved.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_q4_curved.cc
@@ -42,7 +42,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_fe_field_real_to_unit_q5_curved.cc b/tests/mappings/mapping_fe_field_real_to_unit_q5_curved.cc
index 7292ada14e..6f4b00c62a 100644
--- a/tests/mappings/mapping_fe_field_real_to_unit_q5_curved.cc
+++ b/tests/mappings/mapping_fe_field_real_to_unit_q5_curved.cc
@@ -42,7 +42,7 @@
 using namespace dealii;
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_manifold_01.cc b/tests/mappings/mapping_manifold_01.cc
index 430154f53b..48e39f4cf9 100644
--- a/tests/mappings/mapping_manifold_01.cc
+++ b/tests/mappings/mapping_manifold_01.cc
@@ -25,7 +25,7 @@
 #include <deal.II/fe/mapping_manifold.h>
 #include <deal.II/grid/manifold_lib.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_manifold_02.cc b/tests/mappings/mapping_manifold_02.cc
index be22112226..d7b3e07b0b 100644
--- a/tests/mappings/mapping_manifold_02.cc
+++ b/tests/mappings/mapping_manifold_02.cc
@@ -30,7 +30,7 @@
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_values.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_manifold_03.cc b/tests/mappings/mapping_manifold_03.cc
index 8d91e0703a..838882a8b7 100644
--- a/tests/mappings/mapping_manifold_03.cc
+++ b/tests/mappings/mapping_manifold_03.cc
@@ -29,7 +29,7 @@
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_values.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_manifold_04.cc b/tests/mappings/mapping_manifold_04.cc
index 7c13d7c8af..fcde9ca351 100644
--- a/tests/mappings/mapping_manifold_04.cc
+++ b/tests/mappings/mapping_manifold_04.cc
@@ -30,7 +30,7 @@
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_values.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_manifold_05.cc b/tests/mappings/mapping_manifold_05.cc
index 7192055991..00bea664e0 100644
--- a/tests/mappings/mapping_manifold_05.cc
+++ b/tests/mappings/mapping_manifold_05.cc
@@ -31,7 +31,7 @@
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_values.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_manifold_06.cc b/tests/mappings/mapping_manifold_06.cc
index 21e21ca565..aea044f21d 100644
--- a/tests/mappings/mapping_manifold_06.cc
+++ b/tests/mappings/mapping_manifold_06.cc
@@ -27,7 +27,7 @@
 #include <deal.II/fe/fe_values.h>
 #include <deal.II/grid/manifold_lib.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   std::ostream &out = deallog.get_file_stream();
diff --git a/tests/mappings/mapping_manifold_07.cc b/tests/mappings/mapping_manifold_07.cc
index 0f0555def3..d1030554c5 100644
--- a/tests/mappings/mapping_manifold_07.cc
+++ b/tests/mappings/mapping_manifold_07.cc
@@ -25,7 +25,7 @@
 #include <deal.II/fe/fe_values.h>
 #include <deal.II/grid/manifold_lib.h>
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   std::ostream &out = deallog.get_file_stream();
diff --git a/tests/mappings/mapping_q1_eulerian.cc b/tests/mappings/mapping_q1_eulerian.cc
index 6e0e4739e5..df97f16ea4 100644
--- a/tests/mappings/mapping_q1_eulerian.cc
+++ b/tests/mappings/mapping_q1_eulerian.cc
@@ -31,7 +31,7 @@
 
 
 
-template<int dim>
+template <int dim>
 inline void
 show_values(FiniteElement<dim> &fe,
             const char *name)
@@ -87,7 +87,7 @@ show_values(FiniteElement<dim> &fe,
 
 
 
-template<int dim>
+template <int dim>
 void show_values()
 {
   FE_Q<dim> q1(1);
diff --git a/tests/mappings/mapping_q_convergence.cc b/tests/mappings/mapping_q_convergence.cc
index 751e690743..067f1d69e4 100644
--- a/tests/mappings/mapping_q_convergence.cc
+++ b/tests/mappings/mapping_q_convergence.cc
@@ -100,7 +100,7 @@ double zvalue (const double x, const double y)
   return (xh * exp(-xh*xh - yh*yh)) / 10.;
 }
 
-template<int dim>
+template <int dim>
 class Geometry: public ChartManifold<dim>
 {
 public:
@@ -108,7 +108,7 @@ public:
   virtual Point<dim> push_forward(const Point<dim> &chart_point) const;
 };
 
-template<int dim>
+template <int dim>
 Point<dim> Geometry<dim>::pull_back(const Point<dim> &space_point) const
 {
   const double d = space_point[dim - 1];
@@ -128,7 +128,7 @@ Point<dim> Geometry<dim>::pull_back(const Point<dim> &space_point) const
   return p;
 }
 
-template<int dim>
+template <int dim>
 Point<dim> Geometry<dim>::push_forward(const Point<dim> &chart_point) const
 {
   const double d_hat = chart_point[dim - 1];
@@ -150,7 +150,7 @@ Point<dim> Geometry<dim>::push_forward(const Point<dim> &chart_point) const
 
 
 
-template<int dim>
+template <int dim>
 class TranscendentalManufacturedSolution : public Function<dim>
 {
 public:
diff --git a/tests/mappings/mapping_q_manifold_01.cc b/tests/mappings/mapping_q_manifold_01.cc
index 8a49a78fe0..21d7ae5916 100644
--- a/tests/mappings/mapping_q_manifold_01.cc
+++ b/tests/mappings/mapping_q_manifold_01.cc
@@ -44,7 +44,7 @@ double zvalue (const double x, const double y)
   return (xh * exp(-xh*xh - yh*yh)) / 10.;
 }
 
-template<int dim>
+template <int dim>
 class Geometry: public ChartManifold<dim>
 {
 public:
@@ -52,7 +52,7 @@ public:
   virtual Point<dim> push_forward(const Point<dim> &chart_point) const;
 };
 
-template<int dim>
+template <int dim>
 Point<dim> Geometry<dim>::pull_back(const Point<dim> &space_point) const
 {
   const double d = space_point[dim - 1];
@@ -72,7 +72,7 @@ Point<dim> Geometry<dim>::pull_back(const Point<dim> &space_point) const
   return p;
 }
 
-template<int dim>
+template <int dim>
 Point<dim> Geometry<dim>::push_forward(const Point<dim> &chart_point) const
 {
   const double d_hat = chart_point[dim - 1];
@@ -92,7 +92,7 @@ Point<dim> Geometry<dim>::push_forward(const Point<dim> &chart_point) const
   return p;
 }
 
-template<int dim>
+template <int dim>
 class VectorFunction : public Function<dim>
 {
 public:
@@ -104,26 +104,26 @@ public:
   virtual void vector_value(const Point<dim> &p, Vector<double> &values) const;
 };
 
-template<>
+template <>
 double VectorFunction<3>::value(const Point<3> &p, const unsigned int component) const
 {
   return (1 - p(0)*p(0)) * (1 - p(1)*p(1)) * (1 - p(2)*p(2));
 }
 
-template<>
+template <>
 double VectorFunction<2>::value(const Point<2> &p, const unsigned int component) const
 {
   return (1 - p(0)*p(0)) * (1 - p(1)*p(1));
 }
 
-template<int dim>
+template <int dim>
 void VectorFunction<dim>::value(const Point<dim> &p, Vector<double> &values) const
 {
   for (unsigned i = 0; i < values.size(); ++i)
     values[i] = value(p, i);
 }
 
-template<int dim>
+template <int dim>
 void VectorFunction<dim>::vector_value(const Point<dim> &p, Vector<double> &values) const
 {
   for (int i = 0; i < dim; ++i)
diff --git a/tests/mappings/mapping_q_manifold_02.cc b/tests/mappings/mapping_q_manifold_02.cc
index 76447d0980..de1fa58fc1 100644
--- a/tests/mappings/mapping_q_manifold_02.cc
+++ b/tests/mappings/mapping_q_manifold_02.cc
@@ -66,7 +66,7 @@ double f_x(double x_m)
   return y_m;
 }
 
-template<int dim>
+template <int dim>
 class PushForward : public Function<dim>
 {
 public:
@@ -98,7 +98,7 @@ private:
 };
 
 
-template<int dim>
+template <int dim>
 double PushForward<dim>::value(const Point<dim> &p,const unsigned int component) const
 {
   double result = 0;
@@ -124,7 +124,7 @@ double PushForward<dim>::value(const Point<dim> &p,const unsigned int component)
   return result;
 }
 
-template<int dim>
+template <int dim>
 class PullBack : public Function<dim>
 {
 public:
@@ -152,7 +152,7 @@ private:
   const double y_FoR;
 };
 
-template<int dim>
+template <int dim>
 double PullBack<dim>::value(const Point<dim> &p,const unsigned int component) const
 {
   double result = 0;
diff --git a/tests/mappings/mapping_real_to_unit_02.cc b/tests/mappings/mapping_real_to_unit_02.cc
index b64719f800..22c41d7a72 100644
--- a/tests/mappings/mapping_real_to_unit_02.cc
+++ b/tests/mappings/mapping_real_to_unit_02.cc
@@ -33,7 +33,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test2()
 {
   const HyperBallBoundary<dim> boundary_description;
diff --git a/tests/mappings/mapping_real_to_unit_q1.cc b/tests/mappings/mapping_real_to_unit_q1.cc
index 1a045e514d..8e28110d49 100644
--- a/tests/mappings/mapping_real_to_unit_q1.cc
+++ b/tests/mappings/mapping_real_to_unit_q1.cc
@@ -28,7 +28,7 @@
 #include <deal.II/fe/mapping_q1.h>
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_real_to_unit_q1_singular.cc b/tests/mappings/mapping_real_to_unit_q1_singular.cc
index 717a3c4d06..8ec302554c 100644
--- a/tests/mappings/mapping_real_to_unit_q1_singular.cc
+++ b/tests/mappings/mapping_real_to_unit_q1_singular.cc
@@ -26,7 +26,7 @@
 #include <deal.II/fe/mapping_q1.h>
 
 
-template<int dim>
+template <int dim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << std::endl;
diff --git a/tests/mappings/mapping_real_to_unit_q4_curved.cc b/tests/mappings/mapping_real_to_unit_q4_curved.cc
index 481173e896..93e38951be 100644
--- a/tests/mappings/mapping_real_to_unit_q4_curved.cc
+++ b/tests/mappings/mapping_real_to_unit_q4_curved.cc
@@ -33,7 +33,7 @@
 #include <deal.II/fe/mapping_q.h>
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_real_to_unit_q4_curved_codim.cc b/tests/mappings/mapping_real_to_unit_q4_curved_codim.cc
index bf4349fb55..691add225b 100644
--- a/tests/mappings/mapping_real_to_unit_q4_curved_codim.cc
+++ b/tests/mappings/mapping_real_to_unit_q4_curved_codim.cc
@@ -33,7 +33,7 @@
 #include <deal.II/fe/mapping_q.h>
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/mappings/mapping_real_to_unit_q4_straight.cc b/tests/mappings/mapping_real_to_unit_q4_straight.cc
index a2edb4c7d5..2922a64a5c 100644
--- a/tests/mappings/mapping_real_to_unit_q4_straight.cc
+++ b/tests/mappings/mapping_real_to_unit_q4_straight.cc
@@ -33,7 +33,7 @@
 #include <deal.II/fe/mapping_q.h>
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test_real_to_unit_cell()
 {
   deallog << "dim=" << dim << ", spacedim=" << spacedim << std::endl;
diff --git a/tests/matrix_free/parallel_multigrid.cc b/tests/matrix_free/parallel_multigrid.cc
index 8907a89734..5ed3f9388a 100644
--- a/tests/matrix_free/parallel_multigrid.cc
+++ b/tests/matrix_free/parallel_multigrid.cc
@@ -277,7 +277,7 @@ private:
 
 
 
-template<typename MatrixType, typename Number>
+template <typename MatrixType, typename Number>
 class MGCoarseIterative : public MGCoarseGridBase<LinearAlgebra::distributed::Vector<Number> >
 {
 public:
diff --git a/tests/matrix_free/parallel_multigrid_02.cc b/tests/matrix_free/parallel_multigrid_02.cc
index 13f2547b19..b949877670 100644
--- a/tests/matrix_free/parallel_multigrid_02.cc
+++ b/tests/matrix_free/parallel_multigrid_02.cc
@@ -48,7 +48,7 @@ std::ofstream logfile("output");
 
 
 
-template<typename MatrixType, typename Number>
+template <typename MatrixType, typename Number>
 class MGCoarseIterative : public MGCoarseGridBase<LinearAlgebra::distributed::Vector<Number> >
 {
 public:
diff --git a/tests/matrix_free/parallel_multigrid_adaptive_01.cc b/tests/matrix_free/parallel_multigrid_adaptive_01.cc
index a41c7e6737..2a45efa54c 100644
--- a/tests/matrix_free/parallel_multigrid_adaptive_01.cc
+++ b/tests/matrix_free/parallel_multigrid_adaptive_01.cc
@@ -404,7 +404,7 @@ private:
 
 
 
-template<typename MatrixType, typename Number>
+template <typename MatrixType, typename Number>
 class MGCoarseIterative : public MGCoarseGridBase<LinearAlgebra::distributed::Vector<Number> >
 {
 public:
diff --git a/tests/matrix_free/parallel_multigrid_adaptive_02.cc b/tests/matrix_free/parallel_multigrid_adaptive_02.cc
index b6ee95fc60..c3041b9058 100644
--- a/tests/matrix_free/parallel_multigrid_adaptive_02.cc
+++ b/tests/matrix_free/parallel_multigrid_adaptive_02.cc
@@ -85,7 +85,7 @@ private:
 
 
 
-template<typename MatrixType, typename Number>
+template <typename MatrixType, typename Number>
 class MGCoarseIterative : public MGCoarseGridBase<LinearAlgebra::distributed::Vector<Number> >
 {
 public:
diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.cc b/tests/matrix_free/parallel_multigrid_adaptive_03.cc
index 59de7964f3..0bba8bc319 100644
--- a/tests/matrix_free/parallel_multigrid_adaptive_03.cc
+++ b/tests/matrix_free/parallel_multigrid_adaptive_03.cc
@@ -409,7 +409,7 @@ private:
 
 
 
-template<typename MatrixType, typename Number>
+template <typename MatrixType, typename Number>
 class MGCoarseIterative : public MGCoarseGridBase<LinearAlgebra::distributed::Vector<Number> >
 {
 public:
diff --git a/tests/matrix_free/parallel_multigrid_adaptive_04.cc b/tests/matrix_free/parallel_multigrid_adaptive_04.cc
index 690842f2cb..5dd707ccaa 100644
--- a/tests/matrix_free/parallel_multigrid_adaptive_04.cc
+++ b/tests/matrix_free/parallel_multigrid_adaptive_04.cc
@@ -85,7 +85,7 @@ private:
 
 
 
-template<typename MatrixType, typename Number>
+template <typename MatrixType, typename Number>
 class MGCoarseIterative : public MGCoarseGridBase<LinearAlgebra::distributed::Vector<Number> >
 {
 public:
diff --git a/tests/matrix_free/parallel_multigrid_adaptive_05.cc b/tests/matrix_free/parallel_multigrid_adaptive_05.cc
index 8355c969bc..7a1071dc1d 100644
--- a/tests/matrix_free/parallel_multigrid_adaptive_05.cc
+++ b/tests/matrix_free/parallel_multigrid_adaptive_05.cc
@@ -406,7 +406,7 @@ private:
 
 
 
-template<typename MatrixType, typename Number>
+template <typename MatrixType, typename Number>
 class MGCoarseIterative : public MGCoarseGridBase<LinearAlgebra::distributed::Vector<Number> >
 {
 public:
diff --git a/tests/matrix_free/parallel_multigrid_mf.cc b/tests/matrix_free/parallel_multigrid_mf.cc
index 3d79899b27..60f54c5e76 100644
--- a/tests/matrix_free/parallel_multigrid_mf.cc
+++ b/tests/matrix_free/parallel_multigrid_mf.cc
@@ -278,7 +278,7 @@ private:
 
 
 
-template<typename MatrixType, typename Number>
+template <typename MatrixType, typename Number>
 class MGCoarseIterative : public MGCoarseGridBase<LinearAlgebra::distributed::Vector<Number> >
 {
 public:
diff --git a/tests/meshworker/codim_01.cc b/tests/meshworker/codim_01.cc
index 5f4e786d51..fb0e4eff72 100644
--- a/tests/meshworker/codim_01.cc
+++ b/tests/meshworker/codim_01.cc
@@ -37,7 +37,7 @@
 
 using namespace dealii;
 
-template<int dim,int spacedim>
+template <int dim,int spacedim>
 class TestIntegrator : public MeshWorker::LocalIntegrator<dim,spacedim>
 {
 public:
@@ -59,7 +59,7 @@ public:
   {};
 };
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   MappingQ1<dim,spacedim> mapping;
diff --git a/tests/mpi/attach_data_01.cc b/tests/mpi/attach_data_01.cc
index 372004bd4c..8e657332ea 100644
--- a/tests/mpi/attach_data_01.cc
+++ b/tests/mpi/attach_data_01.cc
@@ -31,7 +31,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void pack_function (const typename parallel::distributed::Triangulation<dim,dim>::cell_iterator &cell,
                     const typename parallel::distributed::Triangulation<dim,dim>::CellStatus status,
                     void *data)
@@ -61,7 +61,7 @@ void pack_function (const typename parallel::distributed::Triangulation<dim,dim>
   ++some_number;
 }
 
-template<int dim>
+template <int dim>
 void unpack_function (const typename parallel::distributed::Triangulation<dim,dim>::cell_iterator &cell,
                       const typename parallel::distributed::Triangulation<dim,dim>::CellStatus status,
                       const void *data)
@@ -88,7 +88,7 @@ void unpack_function (const typename parallel::distributed::Triangulation<dim,di
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/cell_weights_01.cc b/tests/mpi/cell_weights_01.cc
index f24945893d..852c4eeb0f 100644
--- a/tests/mpi/cell_weights_01.cc
+++ b/tests/mpi/cell_weights_01.cc
@@ -33,7 +33,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/cell_weights_01_back_and_forth_01.cc b/tests/mpi/cell_weights_01_back_and_forth_01.cc
index 0746275ee5..e9fd3eb861 100644
--- a/tests/mpi/cell_weights_01_back_and_forth_01.cc
+++ b/tests/mpi/cell_weights_01_back_and_forth_01.cc
@@ -53,7 +53,7 @@ cell_weight_2(const typename parallel::distributed::Triangulation<dim>::cell_ite
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/cell_weights_01_back_and_forth_02.cc b/tests/mpi/cell_weights_01_back_and_forth_02.cc
index 40e43b07f9..d021783b76 100644
--- a/tests/mpi/cell_weights_01_back_and_forth_02.cc
+++ b/tests/mpi/cell_weights_01_back_and_forth_02.cc
@@ -43,7 +43,7 @@ cell_weight_1(const typename parallel::distributed::Triangulation<dim>::cell_ite
   return current_cell_weight++;
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/cell_weights_02.cc b/tests/mpi/cell_weights_02.cc
index 810de1b0bd..d645e726ff 100644
--- a/tests/mpi/cell_weights_02.cc
+++ b/tests/mpi/cell_weights_02.cc
@@ -41,7 +41,7 @@ cell_weight(const typename parallel::distributed::Triangulation<dim>::cell_itera
   return 100;
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/cell_weights_03.cc b/tests/mpi/cell_weights_03.cc
index 3cc22d4940..04bab205c0 100644
--- a/tests/mpi/cell_weights_03.cc
+++ b/tests/mpi/cell_weights_03.cc
@@ -49,7 +49,7 @@ cell_weight(const typename parallel::distributed::Triangulation<dim>::cell_itera
   return cell_weight;
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/cell_weights_04.cc b/tests/mpi/cell_weights_04.cc
index baea133563..f133a6d607 100644
--- a/tests/mpi/cell_weights_04.cc
+++ b/tests/mpi/cell_weights_04.cc
@@ -47,7 +47,7 @@ cell_weight(const typename parallel::distributed::Triangulation<dim>::cell_itera
   return cell_weight;
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/cell_weights_05.cc b/tests/mpi/cell_weights_05.cc
index 62c99ca05b..7966d9a30d 100644
--- a/tests/mpi/cell_weights_05.cc
+++ b/tests/mpi/cell_weights_05.cc
@@ -63,7 +63,7 @@ cell_weight(const typename parallel::distributed::Triangulation<dim>::cell_itera
            0);
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/cell_weights_06.cc b/tests/mpi/cell_weights_06.cc
index 40ddbb47b3..4a1a747da3 100644
--- a/tests/mpi/cell_weights_06.cc
+++ b/tests/mpi/cell_weights_06.cc
@@ -62,7 +62,7 @@ cell_weight(const typename parallel::distributed::Triangulation<dim>::cell_itera
            0);
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/codim_01.cc b/tests/mpi/codim_01.cc
index 34ff612f19..455f4972f5 100644
--- a/tests/mpi/codim_01.cc
+++ b/tests/mpi/codim_01.cc
@@ -58,7 +58,7 @@ void write_vtk (const parallel::distributed::Triangulation<dim,spacedim> &tria,
 
 }
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test(std::ostream & /*out*/)
 {
   parallel::distributed::Triangulation<dim,spacedim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/communicate_moved_vertices_01.cc b/tests/mpi/communicate_moved_vertices_01.cc
index f8995dd00a..9219e05c56 100644
--- a/tests/mpi/communicate_moved_vertices_01.cc
+++ b/tests/mpi/communicate_moved_vertices_01.cc
@@ -33,7 +33,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   const unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/communicate_moved_vertices_02.cc b/tests/mpi/communicate_moved_vertices_02.cc
index 0249c8bc71..f144277b41 100644
--- a/tests/mpi/communicate_moved_vertices_02.cc
+++ b/tests/mpi/communicate_moved_vertices_02.cc
@@ -34,7 +34,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   const unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/compute_mean_value.cc b/tests/mpi/compute_mean_value.cc
index 43140d4b4d..c48c9b9d45 100644
--- a/tests/mpi/compute_mean_value.cc
+++ b/tests/mpi/compute_mean_value.cc
@@ -54,7 +54,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/condense_01.cc b/tests/mpi/condense_01.cc
index 9f24dc4b70..b758392563 100644
--- a/tests/mpi/condense_01.cc
+++ b/tests/mpi/condense_01.cc
@@ -35,7 +35,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   const unsigned int myid = Utilities::MPI::this_mpi_process(MPI_COMM_WORLD);
diff --git a/tests/mpi/constraint_matrix_trilinos_bug.cc b/tests/mpi/constraint_matrix_trilinos_bug.cc
index 6ddd7ed03d..f2969e2f25 100644
--- a/tests/mpi/constraint_matrix_trilinos_bug.cc
+++ b/tests/mpi/constraint_matrix_trilinos_bug.cc
@@ -49,7 +49,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/count_dofs_per_block_01.cc b/tests/mpi/count_dofs_per_block_01.cc
index d786583e54..ce6fd702c1 100644
--- a/tests/mpi/count_dofs_per_block_01.cc
+++ b/tests/mpi/count_dofs_per_block_01.cc
@@ -38,7 +38,7 @@
 #include <numeric>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/mpi/count_dofs_per_block_02.cc b/tests/mpi/count_dofs_per_block_02.cc
index ac01afd2df..66ea6d97a0 100644
--- a/tests/mpi/count_dofs_per_block_02.cc
+++ b/tests/mpi/count_dofs_per_block_02.cc
@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/mpi/count_dofs_per_component_01.cc b/tests/mpi/count_dofs_per_component_01.cc
index d92b185710..60e35bcdef 100644
--- a/tests/mpi/count_dofs_per_component_01.cc
+++ b/tests/mpi/count_dofs_per_component_01.cc
@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/mpi/crash_01.cc b/tests/mpi/crash_01.cc
index 8d85d9f7bf..98125ff931 100644
--- a/tests/mpi/crash_01.cc
+++ b/tests/mpi/crash_01.cc
@@ -37,7 +37,7 @@
 #include <numeric>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/mpi/crash_02.cc b/tests/mpi/crash_02.cc
index 91913dab8e..4e903ae94a 100644
--- a/tests/mpi/crash_02.cc
+++ b/tests/mpi/crash_02.cc
@@ -37,7 +37,7 @@
 #include <numeric>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/mpi/crash_03.cc b/tests/mpi/crash_03.cc
index a7434a8487..951ff0b98e 100644
--- a/tests/mpi/crash_03.cc
+++ b/tests/mpi/crash_03.cc
@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/mpi/crash_04.cc b/tests/mpi/crash_04.cc
index 5e813f0a21..f2c3164845 100644
--- a/tests/mpi/crash_04.cc
+++ b/tests/mpi/crash_04.cc
@@ -39,7 +39,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/mpi/crash_05.cc b/tests/mpi/crash_05.cc
index 443eb527c3..f9f5c301e4 100644
--- a/tests/mpi/crash_05.cc
+++ b/tests/mpi/crash_05.cc
@@ -50,7 +50,7 @@
 #include <numeric>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> triangulation(MPI_COMM_WORLD);
diff --git a/tests/mpi/crash_06.cc b/tests/mpi/crash_06.cc
index 935c558f33..8a8ba66a3d 100644
--- a/tests/mpi/crash_06.cc
+++ b/tests/mpi/crash_06.cc
@@ -41,7 +41,7 @@
 #include <numeric>
 
 
-template<int dim>
+template <int dim>
 void test(FiniteElement<dim> &fe)
 {
   deallog << "dim=" << dim << std::endl;
diff --git a/tests/mpi/cuthill_mckee_01.cc b/tests/mpi/cuthill_mckee_01.cc
index ab83a2a315..50385187ca 100644
--- a/tests/mpi/cuthill_mckee_01.cc
+++ b/tests/mpi/cuthill_mckee_01.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 
 using namespace dealii;
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation < dim > tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/distribute_flux_sparsity_pattern.cc b/tests/mpi/distribute_flux_sparsity_pattern.cc
index 45519d5cb3..a80de494fb 100644
--- a/tests/mpi/distribute_flux_sparsity_pattern.cc
+++ b/tests/mpi/distribute_flux_sparsity_pattern.cc
@@ -52,7 +52,7 @@ namespace LinearAdvectionTest
 {
   using namespace dealii;
 
-  template<int dim>
+  template <int dim>
   class AdvectionProblem
   {
   public:
@@ -84,7 +84,7 @@ namespace LinearAdvectionTest
 
 
 
-  template<int dim>
+  template <int dim>
   AdvectionProblem<dim>::AdvectionProblem()
     : triangulation(MPI_COMM_WORLD),
       fe(1),
@@ -100,7 +100,7 @@ namespace LinearAdvectionTest
                                               p0, p1);
   }
 
-  template<int dim>
+  template <int dim>
   void AdvectionProblem<dim>::setup_system()
   {
     dof_handler.distribute_dofs(fe);
@@ -133,7 +133,7 @@ namespace LinearAdvectionTest
 
 
 
-  template<int dim>
+  template <int dim>
   void AdvectionProblem<dim>::calculate_flux_terms
   (const TriaActiveIterator<DoFCellAccessor<DoFHandler<dim>, false> > &current_cell,
    FEFaceValues<dim> &current_face_values,
@@ -197,7 +197,7 @@ namespace LinearAdvectionTest
 
 
 
-  template<int dim>
+  template <int dim>
   void AdvectionProblem<dim>::assemble_system()
   {
     const unsigned int dofs_per_cell = fe.dofs_per_cell;
@@ -300,7 +300,7 @@ namespace LinearAdvectionTest
 
 
 
-  template<int dim>
+  template <int dim>
   void AdvectionProblem<dim>::run()
   {
     setup_system();
diff --git a/tests/mpi/dof_handler_number_cache.cc b/tests/mpi/dof_handler_number_cache.cc
index 808bb5ad00..e41b2bb9eb 100644
--- a/tests/mpi/dof_handler_number_cache.cc
+++ b/tests/mpi/dof_handler_number_cache.cc
@@ -40,7 +40,7 @@
 #include <numeric>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/mpi/extract_boundary_dofs.cc b/tests/mpi/extract_boundary_dofs.cc
index c745ee65a1..2e65dec68f 100644
--- a/tests/mpi/extract_boundary_dofs.cc
+++ b/tests/mpi/extract_boundary_dofs.cc
@@ -28,7 +28,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/extract_constant_modes_01.cc b/tests/mpi/extract_constant_modes_01.cc
index 3ee85fc528..58ba72167f 100644
--- a/tests/mpi/extract_constant_modes_01.cc
+++ b/tests/mpi/extract_constant_modes_01.cc
@@ -39,7 +39,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/extract_constant_modes_02.cc b/tests/mpi/extract_constant_modes_02.cc
index dde7814394..926af78cf9 100644
--- a/tests/mpi/extract_constant_modes_02.cc
+++ b/tests/mpi/extract_constant_modes_02.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/extract_locally_active_dofs.cc b/tests/mpi/extract_locally_active_dofs.cc
index c5575293e7..01d61837ee 100644
--- a/tests/mpi/extract_locally_active_dofs.cc
+++ b/tests/mpi/extract_locally_active_dofs.cc
@@ -38,7 +38,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/fe_field_function_01.cc b/tests/mpi/fe_field_function_01.cc
index 9845fcd1e3..14e2b002fb 100644
--- a/tests/mpi/fe_field_function_01.cc
+++ b/tests/mpi/fe_field_function_01.cc
@@ -55,7 +55,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/fe_field_function_02.cc b/tests/mpi/fe_field_function_02.cc
index c58c1c55e6..1a8fb95c22 100644
--- a/tests/mpi/fe_field_function_02.cc
+++ b/tests/mpi/fe_field_function_02.cc
@@ -60,7 +60,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/fe_field_function_03.cc b/tests/mpi/fe_field_function_03.cc
index 6f2510fe3e..442f536110 100644
--- a/tests/mpi/fe_field_function_03.cc
+++ b/tests/mpi/fe_field_function_03.cc
@@ -66,7 +66,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/find_active_cell_around_point_01.cc b/tests/mpi/find_active_cell_around_point_01.cc
index ab4b714a35..10515bc35a 100644
--- a/tests/mpi/find_active_cell_around_point_01.cc
+++ b/tests/mpi/find_active_cell_around_point_01.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/has_active_dofs_01.cc b/tests/mpi/has_active_dofs_01.cc
index 47853bf769..50ae6a5e31 100644
--- a/tests/mpi/has_active_dofs_01.cc
+++ b/tests/mpi/has_active_dofs_01.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/has_active_dofs_02.cc b/tests/mpi/has_active_dofs_02.cc
index 5706af46dc..9cb72e4798 100644
--- a/tests/mpi/has_active_dofs_02.cc
+++ b/tests/mpi/has_active_dofs_02.cc
@@ -34,7 +34,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/has_hanging_nodes.cc b/tests/mpi/has_hanging_nodes.cc
index 14d87ab431..e9188e1810 100644
--- a/tests/mpi/has_hanging_nodes.cc
+++ b/tests/mpi/has_hanging_nodes.cc
@@ -68,7 +68,7 @@ using namespace dealii;
 
 //#define DISTRIBUTED
 
-template<int dim>
+template <int dim>
 void test_int(const unsigned int n_global = 0,
               const unsigned int n_local = 0)
 {
diff --git a/tests/mpi/integrate_difference.cc b/tests/mpi/integrate_difference.cc
index 67eab07ddf..02459ac686 100644
--- a/tests/mpi/integrate_difference.cc
+++ b/tests/mpi/integrate_difference.cc
@@ -52,7 +52,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/interpolate_01.cc b/tests/mpi/interpolate_01.cc
index d0a9050166..f64941d423 100644
--- a/tests/mpi/interpolate_01.cc
+++ b/tests/mpi/interpolate_01.cc
@@ -48,7 +48,7 @@
 #include <sstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/interpolate_02.cc b/tests/mpi/interpolate_02.cc
index 6be2dd05aa..995813dffe 100644
--- a/tests/mpi/interpolate_02.cc
+++ b/tests/mpi/interpolate_02.cc
@@ -49,7 +49,7 @@
 #include <sstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/interpolate_03.cc b/tests/mpi/interpolate_03.cc
index c201526d3d..7283d979c2 100644
--- a/tests/mpi/interpolate_03.cc
+++ b/tests/mpi/interpolate_03.cc
@@ -55,7 +55,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/interpolate_04.cc b/tests/mpi/interpolate_04.cc
index 1daefe95c3..b166387eb1 100644
--- a/tests/mpi/interpolate_04.cc
+++ b/tests/mpi/interpolate_04.cc
@@ -44,7 +44,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/interpolate_to_different_mesh_01.cc b/tests/mpi/interpolate_to_different_mesh_01.cc
index 1117921b93..d8e31f020b 100644
--- a/tests/mpi/interpolate_to_different_mesh_01.cc
+++ b/tests/mpi/interpolate_to_different_mesh_01.cc
@@ -38,7 +38,7 @@ public:
   }
 };
 
-template<int dim>
+template <int dim>
 void setup(DoFHandler<dim> &dh,
            FE_Q<dim> &fe,
            LA::MPI::Vector &vec,
@@ -51,7 +51,7 @@ void setup(DoFHandler<dim> &dh,
   lr_vec.reinit(locally_relevant, MPI_COMM_WORLD);
 }
 
-template<int dim>
+template <int dim>
 void output(DoFHandler<dim> &dh, LA::MPI::Vector &v, unsigned int loop, const std::string filename_)
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
@@ -86,7 +86,7 @@ void output(DoFHandler<dim> &dh, LA::MPI::Vector &v, unsigned int loop, const st
     }
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/is_locally_owned.cc b/tests/mpi/is_locally_owned.cc
index 1e9f363d5d..60a80caadb 100644
--- a/tests/mpi/is_locally_owned.cc
+++ b/tests/mpi/is_locally_owned.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/make_zero_boundary_values.cc b/tests/mpi/make_zero_boundary_values.cc
index 19e296c4b8..82603b8c51 100644
--- a/tests/mpi/make_zero_boundary_values.cc
+++ b/tests/mpi/make_zero_boundary_values.cc
@@ -28,7 +28,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/map_dofs_to_support_points.cc b/tests/mpi/map_dofs_to_support_points.cc
index 7f34f124bd..22309dbe3f 100644
--- a/tests/mpi/map_dofs_to_support_points.cc
+++ b/tests/mpi/map_dofs_to_support_points.cc
@@ -29,7 +29,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/mesh_worker_01.cc b/tests/mpi/mesh_worker_01.cc
index a32300856f..07f6c8291e 100644
--- a/tests/mpi/mesh_worker_01.cc
+++ b/tests/mpi/mesh_worker_01.cc
@@ -79,9 +79,9 @@ class DoNothingAssembler
 public:
   template <class DOFINFO>
   void initialize_info(DOFINFO &info, bool face) const {}
-  template<class DOFINFO>
+  template <class DOFINFO>
   void assemble(const DOFINFO &info) {}
-  template<class DOFINFO>
+  template <class DOFINFO>
   void assemble(const DOFINFO &info1,
                 const DOFINFO &info2) {}
 
@@ -129,7 +129,7 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //     lctrl);
 }
 
-template<int dim>
+template <int dim>
 void test_loop(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 {
   deallog << "* own_cells=" << lctrl.own_cells
@@ -140,7 +140,7 @@ void test_loop(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
   test_simple(dofs, lctrl);
 }
 
-template<int dim>
+template <int dim>
 void
 test()
 {
diff --git a/tests/mpi/mesh_worker_02.cc b/tests/mpi/mesh_worker_02.cc
index 6c5a2c4bea..efb2cb580d 100644
--- a/tests/mpi/mesh_worker_02.cc
+++ b/tests/mpi/mesh_worker_02.cc
@@ -79,9 +79,9 @@ class DoNothingAssembler
 public:
   template <class DOFINFO>
   void initialize_info(DOFINFO &info, bool face) const {}
-  template<class DOFINFO>
+  template <class DOFINFO>
   void assemble(const DOFINFO &info) {}
-  template<class DOFINFO>
+  template <class DOFINFO>
   void assemble(const DOFINFO &info1,
                 const DOFINFO &info2) {}
 
@@ -128,7 +128,7 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //     lctrl);
 }
 
-template<int dim>
+template <int dim>
 void test_loop(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 {
   deallog << "* own_cells=" << lctrl.own_cells
@@ -139,7 +139,7 @@ void test_loop(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
   test_simple(dofs, lctrl);
 }
 
-template<int dim>
+template <int dim>
 void
 test()
 {
diff --git a/tests/mpi/mesh_worker_03.cc b/tests/mpi/mesh_worker_03.cc
index 7b0fc2a9ca..24488ec45b 100644
--- a/tests/mpi/mesh_worker_03.cc
+++ b/tests/mpi/mesh_worker_03.cc
@@ -79,9 +79,9 @@ class DoNothingAssembler
 public:
   template <class DOFINFO>
   void initialize_info(DOFINFO &info, bool face) const {}
-  template<class DOFINFO>
+  template <class DOFINFO>
   void assemble(const DOFINFO &info) {}
-  template<class DOFINFO>
+  template <class DOFINFO>
   void assemble(const DOFINFO &info1,
                 const DOFINFO &info2) {}
 
@@ -128,7 +128,7 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //     lctrl);
 }
 
-template<int dim>
+template <int dim>
 void test_loop(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 {
   deallog << "* own_cells=" << lctrl.own_cells
@@ -139,7 +139,7 @@ void test_loop(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
   test_simple(dofs, lctrl);
 }
 
-template<int dim>
+template <int dim>
 void
 test()
 {
diff --git a/tests/mpi/mesh_worker_04.cc b/tests/mpi/mesh_worker_04.cc
index c830290bed..28e14f2b42 100644
--- a/tests/mpi/mesh_worker_04.cc
+++ b/tests/mpi/mesh_worker_04.cc
@@ -80,9 +80,9 @@ class DoNothingAssembler
 public:
   template <class DOFINFO>
   void initialize_info(DOFINFO &info, bool face) const {}
-  template<class DOFINFO>
+  template <class DOFINFO>
   void assemble(const DOFINFO &info) {}
-  template<class DOFINFO>
+  template <class DOFINFO>
   void assemble(const DOFINFO &info1,
                 const DOFINFO &info2) {}
 
@@ -129,7 +129,7 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //     lctrl);
 }
 
-template<int dim>
+template <int dim>
 void test_loop(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 {
   deallog << "* own_cells=" << lctrl.own_cells
@@ -140,7 +140,7 @@ void test_loop(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
   test_simple(dofs, lctrl);
 }
 
-template<int dim>
+template <int dim>
 void
 test()
 {
diff --git a/tests/mpi/mesh_worker_05.cc b/tests/mpi/mesh_worker_05.cc
index 9246bc174e..46fc93b35e 100644
--- a/tests/mpi/mesh_worker_05.cc
+++ b/tests/mpi/mesh_worker_05.cc
@@ -80,9 +80,9 @@ class DoNothingAssembler
 public:
   template <class DOFINFO>
   void initialize_info(DOFINFO &info, bool face) const {}
-  template<class DOFINFO>
+  template <class DOFINFO>
   void assemble(const DOFINFO &info) {}
-  template<class DOFINFO>
+  template <class DOFINFO>
   void assemble(const DOFINFO &info1,
                 const DOFINFO &info2) {}
 
@@ -130,7 +130,7 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //     lctrl);
 }
 
-template<int dim>
+template <int dim>
 void test_loop(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 {
   deallog << "* own_cells=" << lctrl.own_cells
@@ -141,7 +141,7 @@ void test_loop(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
   test_simple(dofs, lctrl);
 }
 
-template<int dim>
+template <int dim>
 void
 test()
 {
diff --git a/tests/mpi/mesh_worker_matrix_01.cc b/tests/mpi/mesh_worker_matrix_01.cc
index d89ccd02ba..93927048a9 100644
--- a/tests/mpi/mesh_worker_matrix_01.cc
+++ b/tests/mpi/mesh_worker_matrix_01.cc
@@ -172,7 +172,7 @@ test_simple(DoFHandler<dim> &dofs, bool faces)
 }
 
 
-template<int dim>
+template <int dim>
 void
 test(const FiniteElement<dim> &fe)
 {
diff --git a/tests/mpi/mg_01.cc b/tests/mpi/mg_01.cc
index 1e482a47fd..c86dfeedee 100644
--- a/tests/mpi/mg_01.cc
+++ b/tests/mpi/mg_01.cc
@@ -36,7 +36,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void output(parallel::distributed::Triangulation<dim> &tr)
 {
   const std::string filename = ("mesh." +
@@ -53,7 +53,7 @@ void output(parallel::distributed::Triangulation<dim> &tr)
   out.write_xfig(tr, stream);
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/mg_02.cc b/tests/mpi/mg_02.cc
index a3385c9b3f..b9b084df26 100644
--- a/tests/mpi/mg_02.cc
+++ b/tests/mpi/mg_02.cc
@@ -38,7 +38,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/mg_03.cc b/tests/mpi/mg_03.cc
index 80b6f2b997..2a4ed6d307 100644
--- a/tests/mpi/mg_03.cc
+++ b/tests/mpi/mg_03.cc
@@ -51,7 +51,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void output(parallel::distributed::Triangulation<dim> &tr)
 {
   const std::string filename = ("mesh." +
@@ -62,7 +62,7 @@ void output(parallel::distributed::Triangulation<dim> &tr)
 
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/mg_04.cc b/tests/mpi/mg_04.cc
index e7fddc1aca..17f73bfce1 100644
--- a/tests/mpi/mg_04.cc
+++ b/tests/mpi/mg_04.cc
@@ -48,7 +48,7 @@ Additional Information:
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void output(parallel::distributed::Triangulation<dim> &tr)
 {
   const std::string filename = ("mesh." +
@@ -59,7 +59,7 @@ void output(parallel::distributed::Triangulation<dim> &tr)
 
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/mg_05.cc b/tests/mpi/mg_05.cc
index b511f2cc91..d2b3e0aaad 100644
--- a/tests/mpi/mg_05.cc
+++ b/tests/mpi/mg_05.cc
@@ -48,7 +48,7 @@ Additional Information:
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void output(parallel::distributed::Triangulation<dim> &tr)
 {
   const std::string filename = ("mesh." +
@@ -81,7 +81,7 @@ void output(parallel::distributed::Triangulation<dim> &tr)
 
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/mg_06.cc b/tests/mpi/mg_06.cc
index 3b8006362b..12be2cc6be 100644
--- a/tests/mpi/mg_06.cc
+++ b/tests/mpi/mg_06.cc
@@ -48,7 +48,7 @@ Additional Information:
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void output(parallel::distributed::Triangulation<dim> &tr)
 {
   const std::string filename = ("mg_06/mesh." +
@@ -81,7 +81,7 @@ void output(parallel::distributed::Triangulation<dim> &tr)
 
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/no_flux_constraints.cc b/tests/mpi/no_flux_constraints.cc
index f31371cdf8..7570f230c1 100644
--- a/tests/mpi/no_flux_constraints.cc
+++ b/tests/mpi/no_flux_constraints.cc
@@ -39,7 +39,7 @@
 #include <fstream>
 #include <sstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   Assert (dim == 3, ExcNotImplemented());
diff --git a/tests/mpi/no_flux_constraints_02.cc b/tests/mpi/no_flux_constraints_02.cc
index 101aad39e1..5e3958d06d 100644
--- a/tests/mpi/no_flux_constraints_02.cc
+++ b/tests/mpi/no_flux_constraints_02.cc
@@ -41,7 +41,7 @@
 #include <fstream>
 #include <sstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   Assert (dim == 3, ExcNotImplemented());
diff --git a/tests/mpi/no_flux_constraints_03.cc b/tests/mpi/no_flux_constraints_03.cc
index bd441ca19b..e1c472dbe3 100644
--- a/tests/mpi/no_flux_constraints_03.cc
+++ b/tests/mpi/no_flux_constraints_03.cc
@@ -40,7 +40,7 @@
 #include <fstream>
 #include <sstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   Assert (dim == 3, ExcNotImplemented());
diff --git a/tests/mpi/normal_flux_constraints.cc b/tests/mpi/normal_flux_constraints.cc
index 633bd35c7c..f973249a2b 100644
--- a/tests/mpi/normal_flux_constraints.cc
+++ b/tests/mpi/normal_flux_constraints.cc
@@ -39,7 +39,7 @@
 #include <fstream>
 #include <sstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   Assert (dim == 3, ExcNotImplemented());
diff --git a/tests/mpi/p4est_2d_coarse_01.cc b/tests/mpi/p4est_2d_coarse_01.cc
index a89c85ed38..b7e4cad6da 100644
--- a/tests/mpi/p4est_2d_coarse_01.cc
+++ b/tests/mpi/p4est_2d_coarse_01.cc
@@ -33,7 +33,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_constraintmatrix_01.cc b/tests/mpi/p4est_2d_constraintmatrix_01.cc
index 465813ef07..4f25e9f1a4 100644
--- a/tests/mpi/p4est_2d_constraintmatrix_01.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_01.cc
@@ -38,7 +38,7 @@
 #include <fstream>
 #include <sstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_constraintmatrix_02.cc b/tests/mpi/p4est_2d_constraintmatrix_02.cc
index d5e68c540f..2cac26cb1e 100644
--- a/tests/mpi/p4est_2d_constraintmatrix_02.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_02.cc
@@ -38,7 +38,7 @@
 #include <fstream>
 #include <sstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc
index c1b2406948..9b55d14c07 100644
--- a/tests/mpi/p4est_2d_constraintmatrix_03.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc
@@ -47,7 +47,7 @@
 #include <sstream>
 
 
-template<int dim>
+template <int dim>
 class FilteredDataOut : public DataOut<dim>
 {
 public:
@@ -92,7 +92,7 @@ private:
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc
index e88bd0d2ab..8e43ccc15d 100644
--- a/tests/mpi/p4est_2d_constraintmatrix_04.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc
@@ -54,7 +54,7 @@ const double T1 = 2.0;
 
 
 
-template<int dim>
+template <int dim>
 class FilteredDataOut : public DataOut<dim>
 {
 public:
@@ -130,7 +130,7 @@ TemperatureInitialValues<dim>::vector_value (const Point<dim> &p,
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_constraintmatrix_05.cc b/tests/mpi/p4est_2d_constraintmatrix_05.cc
index b62ed09cb3..f19ab36b3b 100644
--- a/tests/mpi/p4est_2d_constraintmatrix_05.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_05.cc
@@ -33,7 +33,7 @@
 #include <deal.II/fe/fe_q.h>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_dofhandler_01.cc b/tests/mpi/p4est_2d_dofhandler_01.cc
index e308232936..40056fbb6c 100644
--- a/tests/mpi/p4est_2d_dofhandler_01.cc
+++ b/tests/mpi/p4est_2d_dofhandler_01.cc
@@ -36,7 +36,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_dofhandler_02.cc b/tests/mpi/p4est_2d_dofhandler_02.cc
index 5d62bacb6f..e1a16ff20d 100644
--- a/tests/mpi/p4est_2d_dofhandler_02.cc
+++ b/tests/mpi/p4est_2d_dofhandler_02.cc
@@ -36,7 +36,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_dofhandler_03.cc b/tests/mpi/p4est_2d_dofhandler_03.cc
index 081b0b803d..5b3f87e179 100644
--- a/tests/mpi/p4est_2d_dofhandler_03.cc
+++ b/tests/mpi/p4est_2d_dofhandler_03.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_dofhandler_04.cc b/tests/mpi/p4est_2d_dofhandler_04.cc
index c176301ccf..16ff05c05c 100644
--- a/tests/mpi/p4est_2d_dofhandler_04.cc
+++ b/tests/mpi/p4est_2d_dofhandler_04.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_dofhandler_05.cc b/tests/mpi/p4est_2d_dofhandler_05.cc
index e8d716c508..c6dc686d63 100644
--- a/tests/mpi/p4est_2d_dofhandler_05.cc
+++ b/tests/mpi/p4est_2d_dofhandler_05.cc
@@ -38,7 +38,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_ghost_01.cc b/tests/mpi/p4est_2d_ghost_01.cc
index d3c3ad2cff..ebeb6157c9 100644
--- a/tests/mpi/p4est_2d_ghost_01.cc
+++ b/tests/mpi/p4est_2d_ghost_01.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_ghost_02.cc b/tests/mpi/p4est_2d_ghost_02.cc
index 4c0402db1b..e7e59fbb4b 100644
--- a/tests/mpi/p4est_2d_ghost_02.cc
+++ b/tests/mpi/p4est_2d_ghost_02.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_refine_01.cc b/tests/mpi/p4est_2d_refine_01.cc
index b6683d6c1e..5392e89de2 100644
--- a/tests/mpi/p4est_2d_refine_01.cc
+++ b/tests/mpi/p4est_2d_refine_01.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_refine_02.cc b/tests/mpi/p4est_2d_refine_02.cc
index 0d8cdf9d7c..6961e0f56a 100644
--- a/tests/mpi/p4est_2d_refine_02.cc
+++ b/tests/mpi/p4est_2d_refine_02.cc
@@ -49,7 +49,7 @@ void check (TRIA &tr)
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_refine_03.cc b/tests/mpi/p4est_2d_refine_03.cc
index e5787f45bf..841959c3bc 100644
--- a/tests/mpi/p4est_2d_refine_03.cc
+++ b/tests/mpi/p4est_2d_refine_03.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 #include <ostream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_renumber_01.cc b/tests/mpi/p4est_2d_renumber_01.cc
index b28c7f68bd..9b7a9d4cad 100644
--- a/tests/mpi/p4est_2d_renumber_01.cc
+++ b/tests/mpi/p4est_2d_renumber_01.cc
@@ -40,7 +40,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_renumber_02.cc b/tests/mpi/p4est_2d_renumber_02.cc
index 132f3dbbb1..55ccfd3e68 100644
--- a/tests/mpi/p4est_2d_renumber_02.cc
+++ b/tests/mpi/p4est_2d_renumber_02.cc
@@ -43,7 +43,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_2d_simple.cc b/tests/mpi/p4est_2d_simple.cc
index 3fb66c0bb9..52c1d0b1bd 100644
--- a/tests/mpi/p4est_2d_simple.cc
+++ b/tests/mpi/p4est_2d_simple.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_3d_constraintmatrix_01.cc b/tests/mpi/p4est_3d_constraintmatrix_01.cc
index 4755167a35..b9e85b575a 100644
--- a/tests/mpi/p4est_3d_constraintmatrix_01.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_01.cc
@@ -38,7 +38,7 @@
 #include <fstream>
 #include <sstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_3d_constraintmatrix_02.cc b/tests/mpi/p4est_3d_constraintmatrix_02.cc
index 1e06f7a71b..356bf58980 100644
--- a/tests/mpi/p4est_3d_constraintmatrix_02.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_02.cc
@@ -38,7 +38,7 @@
 #include <fstream>
 #include <sstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_3d_constraintmatrix_03.cc b/tests/mpi/p4est_3d_constraintmatrix_03.cc
index a9b7606509..33dff14557 100644
--- a/tests/mpi/p4est_3d_constraintmatrix_03.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc
@@ -53,7 +53,7 @@ const double T1 = 2.0;
 
 
 
-template<int dim>
+template <int dim>
 class FilteredDataOut : public DataOut<dim>
 {
 public:
@@ -129,7 +129,7 @@ TemperatureInitialValues<dim>::vector_value (const Point<dim> &p,
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_3d_ghost_01.cc b/tests/mpi/p4est_3d_ghost_01.cc
index 6e63dcff8c..ea980301ca 100644
--- a/tests/mpi/p4est_3d_ghost_01.cc
+++ b/tests/mpi/p4est_3d_ghost_01.cc
@@ -33,7 +33,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_3d_refine_01.cc b/tests/mpi/p4est_3d_refine_01.cc
index e897814000..e1e2e87769 100644
--- a/tests/mpi/p4est_3d_refine_01.cc
+++ b/tests/mpi/p4est_3d_refine_01.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 #include <ostream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_3d_refine_02.cc b/tests/mpi/p4est_3d_refine_02.cc
index 8f94846add..302995e980 100644
--- a/tests/mpi/p4est_3d_refine_02.cc
+++ b/tests/mpi/p4est_3d_refine_02.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 #include <ostream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_3d_refine_03.cc b/tests/mpi/p4est_3d_refine_03.cc
index 9da268da24..3d8650add8 100644
--- a/tests/mpi/p4est_3d_refine_03.cc
+++ b/tests/mpi/p4est_3d_refine_03.cc
@@ -49,7 +49,7 @@
 #include <fstream>
 #include <ostream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_3d_refine_04.cc b/tests/mpi/p4est_3d_refine_04.cc
index d1c0b8d43e..68d55246be 100644
--- a/tests/mpi/p4est_3d_refine_04.cc
+++ b/tests/mpi/p4est_3d_refine_04.cc
@@ -37,7 +37,7 @@
 #include <ostream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_data_out_01.cc b/tests/mpi/p4est_data_out_01.cc
index f1992ca8ac..f569c794f6 100644
--- a/tests/mpi/p4est_data_out_01.cc
+++ b/tests/mpi/p4est_data_out_01.cc
@@ -44,7 +44,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_get_subdomain_association.cc b/tests/mpi/p4est_get_subdomain_association.cc
index a8622dbd98..b057d4bd07 100644
--- a/tests/mpi/p4est_get_subdomain_association.cc
+++ b/tests/mpi/p4est_get_subdomain_association.cc
@@ -40,7 +40,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_max_refine.cc b/tests/mpi/p4est_max_refine.cc
index bf4e14c9d6..01febacc76 100644
--- a/tests/mpi/p4est_max_refine.cc
+++ b/tests/mpi/p4est_max_refine.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 #include <ostream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_save_01.cc b/tests/mpi/p4est_save_01.cc
index af4f861911..9359ccda3d 100644
--- a/tests/mpi/p4est_save_01.cc
+++ b/tests/mpi/p4est_save_01.cc
@@ -41,7 +41,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_save_02.cc b/tests/mpi/p4est_save_02.cc
index b492582e7e..f3683f3524 100644
--- a/tests/mpi/p4est_save_02.cc
+++ b/tests/mpi/p4est_save_02.cc
@@ -41,7 +41,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_save_03.cc b/tests/mpi/p4est_save_03.cc
index 02cf47a568..97b9471dfd 100644
--- a/tests/mpi/p4est_save_03.cc
+++ b/tests/mpi/p4est_save_03.cc
@@ -42,7 +42,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/p4est_save_04.cc b/tests/mpi/p4est_save_04.cc
index c18005a8d7..e7a302a7da 100644
--- a/tests/mpi/p4est_save_04.cc
+++ b/tests/mpi/p4est_save_04.cc
@@ -41,7 +41,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/parallel_vtu_01.cc b/tests/mpi/parallel_vtu_01.cc
index 4ae30fa71a..95eef18010 100644
--- a/tests/mpi/parallel_vtu_01.cc
+++ b/tests/mpi/parallel_vtu_01.cc
@@ -39,7 +39,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/periodicity_04.cc b/tests/mpi/periodicity_04.cc
index 82d477b070..6935ccf5f2 100644
--- a/tests/mpi/periodicity_04.cc
+++ b/tests/mpi/periodicity_04.cc
@@ -163,7 +163,7 @@ void generate_grid(parallel::distributed::Triangulation<3> &triangulation, int o
   triangulation.create_triangulation(vertices, cells, SubCellData());
 }
 
-template<int dim>
+template <int dim>
 void check
 (const unsigned int  orientation,
  bool                reverse)
diff --git a/tests/mpi/petsc_03.cc b/tests/mpi/petsc_03.cc
index 9a184fd235..ff59d82ce0 100644
--- a/tests/mpi/petsc_03.cc
+++ b/tests/mpi/petsc_03.cc
@@ -30,7 +30,7 @@
 #include <fstream>
 //#include <mpi.h>
 
-template<class v>
+template <class v>
 void testit()
 {
   GrowingVectorMemory<v> m;
diff --git a/tests/mpi/point_value_01.cc b/tests/mpi/point_value_01.cc
index 6ce696507f..60ecc488fd 100644
--- a/tests/mpi/point_value_01.cc
+++ b/tests/mpi/point_value_01.cc
@@ -43,7 +43,7 @@
 #include <fstream>
 #include <iostream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim> triangulation(MPI_COMM_WORLD);
diff --git a/tests/mpi/renumber_cuthill_mckee.cc b/tests/mpi/renumber_cuthill_mckee.cc
index 64883205a9..9e66f36876 100644
--- a/tests/mpi/renumber_cuthill_mckee.cc
+++ b/tests/mpi/renumber_cuthill_mckee.cc
@@ -34,7 +34,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/renumber_cuthill_mckee_02.cc b/tests/mpi/renumber_cuthill_mckee_02.cc
index 3e8a493b7a..3b9ee95278 100644
--- a/tests/mpi/renumber_cuthill_mckee_02.cc
+++ b/tests/mpi/renumber_cuthill_mckee_02.cc
@@ -34,7 +34,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/renumber_z_order_01.cc b/tests/mpi/renumber_z_order_01.cc
index 77192a882c..06293ced7b 100644
--- a/tests/mpi/renumber_z_order_01.cc
+++ b/tests/mpi/renumber_z_order_01.cc
@@ -44,7 +44,7 @@
 #include <boost/concept_check.hpp>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/renumber_z_order_02.cc b/tests/mpi/renumber_z_order_02.cc
index 8b8906bdcf..b2d0a21170 100644
--- a/tests/mpi/renumber_z_order_02.cc
+++ b/tests/mpi/renumber_z_order_02.cc
@@ -43,7 +43,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/repartition_01.cc b/tests/mpi/repartition_01.cc
index 7561803586..f85df62704 100644
--- a/tests/mpi/repartition_01.cc
+++ b/tests/mpi/repartition_01.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/repartition_02.cc b/tests/mpi/repartition_02.cc
index a03c8a7e34..376cc67a1f 100644
--- a/tests/mpi/repartition_02.cc
+++ b/tests/mpi/repartition_02.cc
@@ -31,7 +31,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void pack_function (const typename parallel::distributed::Triangulation<dim,dim>::cell_iterator &cell,
                     const typename parallel::distributed::Triangulation<dim,dim>::CellStatus status,
                     void *data)
@@ -61,7 +61,7 @@ void pack_function (const typename parallel::distributed::Triangulation<dim,dim>
   ++some_number;
 }
 
-template<int dim>
+template <int dim>
 void unpack_function (const typename parallel::distributed::Triangulation<dim,dim>::cell_iterator &cell,
                       const typename parallel::distributed::Triangulation<dim,dim>::CellStatus status,
                       const void *data)
@@ -87,7 +87,7 @@ void unpack_function (const typename parallel::distributed::Triangulation<dim,di
     }
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/repartition_03.cc b/tests/mpi/repartition_03.cc
index 88deae9b90..91ee268bbe 100644
--- a/tests/mpi/repartition_03.cc
+++ b/tests/mpi/repartition_03.cc
@@ -31,7 +31,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void print_cells(parallel::distributed::Triangulation<dim> &tr)
 {
   for (typename Triangulation<dim>::active_cell_iterator
@@ -41,7 +41,7 @@ void print_cells(parallel::distributed::Triangulation<dim> &tr)
       deallog << cell->id() << std::endl;
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/solution_transfer_01.cc b/tests/mpi/solution_transfer_01.cc
index 5ba7f62436..88663976ab 100644
--- a/tests/mpi/solution_transfer_01.cc
+++ b/tests/mpi/solution_transfer_01.cc
@@ -47,7 +47,7 @@
 #include <sstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<2> tria(MPI_COMM_WORLD,
diff --git a/tests/mpi/tria_01.cc b/tests/mpi/tria_01.cc
index 8d39914e81..1babcd341b 100644
--- a/tests/mpi/tria_01.cc
+++ b/tests/mpi/tria_01.cc
@@ -34,7 +34,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/tria_copy_triangulation.cc b/tests/mpi/tria_copy_triangulation.cc
index d98e55cba6..37f51b847c 100644
--- a/tests/mpi/tria_copy_triangulation.cc
+++ b/tests/mpi/tria_copy_triangulation.cc
@@ -46,7 +46,7 @@
 #include <cstdlib>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
diff --git a/tests/mpi/tria_signals_01.cc b/tests/mpi/tria_signals_01.cc
index b4ae7b6351..2c070f6a71 100644
--- a/tests/mpi/tria_signals_01.cc
+++ b/tests/mpi/tria_signals_01.cc
@@ -50,21 +50,21 @@ void f_post_refinement ()
   return;
 }
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void f_pre_coarsening_on_cell (const typename Triangulation<dim, spacedim>::cell_iterator &)
 {
   ++signal_counter_pre_coarsening_on_cell;
   return;
 }
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void f_post_refinement_on_cell (const typename Triangulation<dim, spacedim>::cell_iterator &)
 {
   ++signal_counter_post_refinement_on_cell;
   return;
 }
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void f_copy (const Triangulation<dim, spacedim> &)
 {
   ++signal_counter_copy;
@@ -84,7 +84,7 @@ void f_any_change ()
 }
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   signal_counter_create = 0;
diff --git a/tests/mpi/tria_signals_02.cc b/tests/mpi/tria_signals_02.cc
index 85c807957b..217c97739f 100644
--- a/tests/mpi/tria_signals_02.cc
+++ b/tests/mpi/tria_signals_02.cc
@@ -29,7 +29,7 @@
 // calls and then compare the result against n_active_cells reported by Tria
 // object. Absolute value change in n_active_cells is not concerned in this test.
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 class SignalListener
 {
 public:
@@ -77,7 +77,7 @@ private:
 };
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   typedef parallel::distributed::Triangulation<dim, spacedim> TriaType;
diff --git a/tests/mpi/tria_signals_03.cc b/tests/mpi/tria_signals_03.cc
index ba7b98da95..5250e66849 100644
--- a/tests/mpi/tria_signals_03.cc
+++ b/tests/mpi/tria_signals_03.cc
@@ -32,7 +32,7 @@
 // This test is based on tria_signals_02. The difference is here we have random
 // and mix refinement and coarsening.
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 class SignalListener
 {
 public:
@@ -80,7 +80,7 @@ private:
 };
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   typedef parallel::distributed::Triangulation<dim, spacedim> TriaType;
diff --git a/tests/mpi/tria_signals_04.cc b/tests/mpi/tria_signals_04.cc
index 10754067e3..3b32c298e2 100644
--- a/tests/mpi/tria_signals_04.cc
+++ b/tests/mpi/tria_signals_04.cc
@@ -33,7 +33,7 @@
 // smoothing flags enabled. Also increase refine fraction to one third to prevent
 // refine flags getting smoothed out.
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 class SignalListener
 {
 public:
@@ -81,7 +81,7 @@ private:
 };
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   typedef parallel::distributed::Triangulation<dim, spacedim> TriaType;
diff --git a/tests/mpi/tria_signals_05.cc b/tests/mpi/tria_signals_05.cc
index 54188463e9..663f00e019 100644
--- a/tests/mpi/tria_signals_05.cc
+++ b/tests/mpi/tria_signals_05.cc
@@ -33,7 +33,7 @@
 // that p4est is doing mesh smoothing beyond class Triangulation. The case setup
 // is borrowed from tests/distributed_grids/2d_refinement_10.
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 class SignalListener
 {
 public:
@@ -81,7 +81,7 @@ private:
 };
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   typedef parallel::distributed::Triangulation<dim, spacedim> TriaType;
diff --git a/tests/mpi/tria_signals_06.cc b/tests/mpi/tria_signals_06.cc
index ab0d1e160e..3ae58477c1 100644
--- a/tests/mpi/tria_signals_06.cc
+++ b/tests/mpi/tria_signals_06.cc
@@ -33,7 +33,7 @@
 //
 // This test is modified from tria_signals_04.
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 class SignalListener
 {
 public:
@@ -81,7 +81,7 @@ private:
 };
 
 
-template<int dim, int spacedim>
+template <int dim, int spacedim>
 void test()
 {
   typedef parallel::distributed::Triangulation<dim, spacedim> TriaType;
diff --git a/tests/multigrid/mg_coarse_01.cc b/tests/multigrid/mg_coarse_01.cc
index b4c279d27e..9a88748ea6 100644
--- a/tests/multigrid/mg_coarse_01.cc
+++ b/tests/multigrid/mg_coarse_01.cc
@@ -408,7 +408,7 @@ namespace Step50
       }
   }
 
-  template<typename VECTOR>
+  template <typename VECTOR>
   class MGCoarseAMG : public MGCoarseGridBase<VECTOR>
   {
   public:
diff --git a/tests/multigrid/mg_output_dirichlet.cc b/tests/multigrid/mg_output_dirichlet.cc
index 6f779c54d5..4b86beb1c8 100644
--- a/tests/multigrid/mg_output_dirichlet.cc
+++ b/tests/multigrid/mg_output_dirichlet.cc
@@ -62,7 +62,7 @@ reinit_vector (const dealii::DoFHandler<dim,spacedim> &mg_dof,
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/mg_output_neumann.cc b/tests/multigrid/mg_output_neumann.cc
index 1a2d4c047e..487effb5c5 100644
--- a/tests/multigrid/mg_output_neumann.cc
+++ b/tests/multigrid/mg_output_neumann.cc
@@ -62,7 +62,7 @@ reinit_vector (const dealii::DoFHandler<dim,spacedim> &mg_dof,
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/smoother_block.cc b/tests/multigrid/smoother_block.cc
index a2dc3d2797..5083fee845 100644
--- a/tests/multigrid/smoother_block.cc
+++ b/tests/multigrid/smoother_block.cc
@@ -43,7 +43,7 @@ public:
   /**
   * Apply preconditioner.
   */
-  template<typename VectorType>
+  template <typename VectorType>
   void vmult (VectorType &, const VectorType &) const;
 
   /**
@@ -53,12 +53,12 @@ public:
    * the same as
    * vmult().
    */
-  template<typename VectorType>
+  template <typename VectorType>
   void Tvmult (VectorType &, const VectorType &) const;
   /**
    * Apply preconditioner, adding to the previous value.
    */
-  template<typename VectorType>
+  template <typename VectorType>
   void vmult_add (VectorType &, const VectorType &) const;
 
   /**
@@ -68,7 +68,7 @@ public:
    * the same as
    * vmult_add().
    */
-  template<typename VectorType>
+  template <typename VectorType>
   void Tvmult_add (VectorType &, const VectorType &) const;
 
 private:
@@ -78,31 +78,31 @@ private:
 
 //----------------------------------------------------------------------//
 
-template<typename number>
+template <typename number>
 ScalingMatrix<number>::ScalingMatrix(number factor)
   :
   factor(factor)
 {}
 
 
-template<typename number>
-template<typename VectorType>
+template <typename number>
+template <typename VectorType>
 inline void
 ScalingMatrix<number>::vmult (VectorType &dst, const VectorType &src) const
 {
   dst.equ(factor, src);
 }
 
-template<typename number>
-template<typename VectorType>
+template <typename number>
+template <typename VectorType>
 inline void
 ScalingMatrix<number>::Tvmult (VectorType &dst, const VectorType &src) const
 {
   dst.equ(factor, src);
 }
 
-template<typename number>
-template<typename VectorType>
+template <typename number>
+template <typename VectorType>
 inline void
 ScalingMatrix<number>::vmult_add (VectorType &dst, const VectorType &src) const
 {
@@ -111,8 +111,8 @@ ScalingMatrix<number>::vmult_add (VectorType &dst, const VectorType &src) const
 
 
 
-template<typename number>
-template<typename VectorType>
+template <typename number>
+template <typename VectorType>
 inline void
 ScalingMatrix<number>::Tvmult_add (VectorType &dst, const VectorType &src) const
 {
@@ -121,7 +121,7 @@ ScalingMatrix<number>::Tvmult_add (VectorType &dst, const VectorType &src) const
 
 //----------------------------------------------------------------------//
 
-template<typename MatrixType, class RELAX>
+template <typename MatrixType, class RELAX>
 void check_smoother(const MGLevelObject<MatrixType> &m,
                     const MGLevelObject<RELAX> &r)
 {
diff --git a/tests/multigrid/transfer_02.cc b/tests/multigrid/transfer_02.cc
index 1e03bc08f3..fcc0fd8949 100644
--- a/tests/multigrid/transfer_02.cc
+++ b/tests/multigrid/transfer_02.cc
@@ -59,7 +59,7 @@ reinit_vector (const dealii::DoFHandler<dim,spacedim> &mg_dof,
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/transfer_03.cc b/tests/multigrid/transfer_03.cc
index ec1d21241d..784bd4126b 100644
--- a/tests/multigrid/transfer_03.cc
+++ b/tests/multigrid/transfer_03.cc
@@ -61,7 +61,7 @@ reinit_vector (const dealii::DoFHandler<dim,spacedim> &mg_dof,
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/transfer_system_adaptive_01.cc b/tests/multigrid/transfer_system_adaptive_01.cc
index 8a667b1f4b..1555b5dd32 100644
--- a/tests/multigrid/transfer_system_adaptive_01.cc
+++ b/tests/multigrid/transfer_system_adaptive_01.cc
@@ -86,7 +86,7 @@ void print_matrix (const FullMatrix<double> &m)
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/transfer_system_adaptive_02.cc b/tests/multigrid/transfer_system_adaptive_02.cc
index 65053d111e..03d5a7e475 100644
--- a/tests/multigrid/transfer_system_adaptive_02.cc
+++ b/tests/multigrid/transfer_system_adaptive_02.cc
@@ -86,7 +86,7 @@ void print_matrix (const FullMatrix<double> &m)
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/transfer_system_adaptive_03.cc b/tests/multigrid/transfer_system_adaptive_03.cc
index 1a33ab8b95..4bafaf36d9 100644
--- a/tests/multigrid/transfer_system_adaptive_03.cc
+++ b/tests/multigrid/transfer_system_adaptive_03.cc
@@ -87,7 +87,7 @@ void print_matrix (const FullMatrix<double> &m)
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/transfer_system_adaptive_04.cc b/tests/multigrid/transfer_system_adaptive_04.cc
index ed78526c35..0eb37daa21 100644
--- a/tests/multigrid/transfer_system_adaptive_04.cc
+++ b/tests/multigrid/transfer_system_adaptive_04.cc
@@ -86,7 +86,7 @@ void print_matrix (const FullMatrix<double> &m)
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/transfer_system_adaptive_05.cc b/tests/multigrid/transfer_system_adaptive_05.cc
index ab5d52109e..4c1e2c46a0 100644
--- a/tests/multigrid/transfer_system_adaptive_05.cc
+++ b/tests/multigrid/transfer_system_adaptive_05.cc
@@ -87,7 +87,7 @@ void print_matrix (const FullMatrix<double> &m)
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/transfer_system_adaptive_06.cc b/tests/multigrid/transfer_system_adaptive_06.cc
index df006f786b..763a0181b0 100644
--- a/tests/multigrid/transfer_system_adaptive_06.cc
+++ b/tests/multigrid/transfer_system_adaptive_06.cc
@@ -86,7 +86,7 @@ void print_matrix (const FullMatrix<double> &m)
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/transfer_system_adaptive_07.cc b/tests/multigrid/transfer_system_adaptive_07.cc
index 46df3a16a9..fdbcc981a9 100644
--- a/tests/multigrid/transfer_system_adaptive_07.cc
+++ b/tests/multigrid/transfer_system_adaptive_07.cc
@@ -88,7 +88,7 @@ void print_matrix (const FullMatrix<double> &m)
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/transfer_system_adaptive_08.cc b/tests/multigrid/transfer_system_adaptive_08.cc
index ed00bd0b86..5d6de31e4e 100644
--- a/tests/multigrid/transfer_system_adaptive_08.cc
+++ b/tests/multigrid/transfer_system_adaptive_08.cc
@@ -87,7 +87,7 @@ void print_matrix (const FullMatrix<double> &m)
 }
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/multigrid/transfer_system_adaptive_09.cc b/tests/multigrid/transfer_system_adaptive_09.cc
index ba794e42a3..9dc2ba7538 100644
--- a/tests/multigrid/transfer_system_adaptive_09.cc
+++ b/tests/multigrid/transfer_system_adaptive_09.cc
@@ -42,7 +42,7 @@
 using namespace std;
 
 
-template<int dim>
+template <int dim>
 void refine_mesh (Triangulation<dim> &triangulation)
 {
   bool cell_refined = false;
diff --git a/tests/numerics/boundaries.cc b/tests/numerics/boundaries.cc
index c5be172d7b..720f0c0892 100644
--- a/tests/numerics/boundaries.cc
+++ b/tests/numerics/boundaries.cc
@@ -40,7 +40,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/numerics/data_out_08.cc b/tests/numerics/data_out_08.cc
index f332c0d289..3d80415914 100644
--- a/tests/numerics/data_out_08.cc
+++ b/tests/numerics/data_out_08.cc
@@ -40,7 +40,7 @@
 #include <deal.II/fe/fe_dgq.h>
 
 
-template<int dim>
+template <int dim>
 class FilteredDataOut : public DataOut<dim>
 {
 public:
diff --git a/tests/numerics/derivative_approximation_02.cc b/tests/numerics/derivative_approximation_02.cc
index 46e6a918a0..73175f0ff5 100644
--- a/tests/numerics/derivative_approximation_02.cc
+++ b/tests/numerics/derivative_approximation_02.cc
@@ -42,7 +42,7 @@ using namespace std;
 const double a=4,b=5;
 
 
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
diff --git a/tests/numerics/derivative_approximation_03.cc b/tests/numerics/derivative_approximation_03.cc
index 3d398811db..4e222749b3 100644
--- a/tests/numerics/derivative_approximation_03.cc
+++ b/tests/numerics/derivative_approximation_03.cc
@@ -41,7 +41,7 @@ using namespace std;
 const double a=4,b=5;
 
 
-template<int dim>
+template <int dim>
 class MyFunction : public Function<dim>
 {
 public:
diff --git a/tests/numerics/error_estimator.cc b/tests/numerics/error_estimator.cc
index f8f28a282d..ed7aa218f3 100644
--- a/tests/numerics/error_estimator.cc
+++ b/tests/numerics/error_estimator.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/numerics/error_estimator_02.cc b/tests/numerics/error_estimator_02.cc
index 6ec450ae4b..35be164a94 100644
--- a/tests/numerics/error_estimator_02.cc
+++ b/tests/numerics/error_estimator_02.cc
@@ -97,7 +97,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 class MyFunction : public dealii::Function<dim>
 {
 public:
@@ -112,7 +112,7 @@ private:
   const double k;
 };
 
-template<int dim>
+template <int dim>
 MyFunction<dim>::MyFunction(const double k)
   :
   dealii::Function<dim>(1),
@@ -121,7 +121,7 @@ MyFunction<dim>::MyFunction(const double k)
 
 }
 
-template<int dim>
+template <int dim>
 double MyFunction<dim>::value(const dealii::Point<dim> &point,
                               const unsigned int ) const
 {
@@ -133,14 +133,14 @@ double MyFunction<dim>::value(const dealii::Point<dim> &point,
     return k * x;
 }
 
-template<int dim>
+template <int dim>
 double MyFunction<dim>::get_k() const
 {
   return k;
 }
 
 // neuman bc
-template<int dim>
+template <int dim>
 class NeumanBC : public dealii::Function<dim>
 {
 public:
@@ -155,7 +155,7 @@ private:
   const double c;
 };
 
-template<int dim>
+template <int dim>
 NeumanBC<dim>::NeumanBC(const double c)
   :
   dealii::Function<dim>(1),
@@ -163,14 +163,14 @@ NeumanBC<dim>::NeumanBC(const double c)
 {
 }
 
-template<int dim>
+template <int dim>
 double NeumanBC<dim>::value(const dealii::Point<dim> &point,
                             const unsigned int ) const
 {
   return c;
 }
 
-template<int dim>
+template <int dim>
 double NeumanBC<dim>::get_c() const
 {
   return c;
@@ -178,17 +178,17 @@ double NeumanBC<dim>::get_c() const
 
 // helper function to get diagonal and
 // area of the squared element with lenght h
-template<int dim>
+template <int dim>
 void get_h_area(double &h, double &a, const double L);
 
-template<>
+template <>
 void get_h_area<2>(double &h, double &a, const double L)
 {
   h = L;
   a = L;
 }
 
-template<>
+template <>
 void get_h_area<3>(double &h, double &a, const double L)
 {
   h = std::sqrt(2.0)*L;
@@ -197,17 +197,17 @@ void get_h_area<3>(double &h, double &a, const double L)
 
 // helper function to get diagonal and area of the
 // h-refined face.
-template<int dim>
+template <int dim>
 void get_h_area_sub(double &h, double &a, const double L);
 
-template<>
+template <>
 void get_h_area_sub<2>(double &h, double &a, const double L)
 {
   h = L/2;
   a = L/2;
 }
 
-template<>
+template <>
 void get_h_area_sub<3>(double &h, double &a, const double L)
 {
   h = std::sqrt(2.0)*L/2;
@@ -215,7 +215,7 @@ void get_h_area_sub<3>(double &h, double &a, const double L)
 }
 
 // output for inspection
-template<int dim>
+template <int dim>
 void output(const std::string          name,
             const Triangulation<dim>  &triangulation,
             const hp::DoFHandler<dim> &dof_handler,
@@ -246,7 +246,7 @@ void output(const std::string          name,
 }
 
 // case 1)
-template<int dim>
+template <int dim>
 void test_neumann(const NeumanBC<dim> &func)
 {
   deallog << "NeumanBC case:"<<std::endl;
@@ -326,7 +326,7 @@ void test_neumann(const NeumanBC<dim> &func)
 }
 
 // case 2)
-template<int dim>
+template <int dim>
 void test_regular(const MyFunction<dim> &func)
 {
   deallog << std::endl;
@@ -438,7 +438,7 @@ void test_regular(const MyFunction<dim> &func)
 }
 
 // case 3)
-template<int dim>
+template <int dim>
 void test_irregular(const MyFunction<dim> &func)
 {
   deallog << std::endl;
@@ -586,7 +586,7 @@ void test_irregular(const MyFunction<dim> &func)
   dof_handler.clear();
 }
 
-template<int dim>
+template <int dim>
 class MySecondFunction : public dealii::Function<dim>
 {
 public:
@@ -596,7 +596,7 @@ public:
                        const unsigned int component = 0 ) const;
 };
 
-template<int dim>
+template <int dim>
 MySecondFunction<dim>::MySecondFunction()
   :
   dealii::Function<dim>(1)
@@ -604,7 +604,7 @@ MySecondFunction<dim>::MySecondFunction()
 
 }
 
-template<int dim>
+template <int dim>
 double MySecondFunction<dim>::value(const dealii::Point<dim> &point,
                                     const unsigned int ) const
 {
@@ -616,7 +616,7 @@ double MySecondFunction<dim>::value(const dealii::Point<dim> &point,
   return (1.-x)*(1.-y)*(1.-y)+std::pow(1.0-y,4)*std::exp(-x);
 }
 
-template<int dim>
+template <int dim>
 void test(const MySecondFunction<dim> &func)
 {
   deallog << std::endl;
diff --git a/tests/numerics/no_flux_01.cc b/tests/numerics/no_flux_01.cc
index ef1a19ccbb..34b0267346 100644
--- a/tests/numerics/no_flux_01.cc
+++ b/tests/numerics/no_flux_01.cc
@@ -35,7 +35,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -60,7 +60,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/no_flux_02.cc b/tests/numerics/no_flux_02.cc
index 4543851b7e..99a32d2456 100644
--- a/tests/numerics/no_flux_02.cc
+++ b/tests/numerics/no_flux_02.cc
@@ -37,7 +37,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -62,7 +62,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/no_flux_03.cc b/tests/numerics/no_flux_03.cc
index 6e343768d2..903dafa4a3 100644
--- a/tests/numerics/no_flux_03.cc
+++ b/tests/numerics/no_flux_03.cc
@@ -38,7 +38,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -59,7 +59,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/no_flux_04.cc b/tests/numerics/no_flux_04.cc
index 810711fcb6..c20f54f8fe 100644
--- a/tests/numerics/no_flux_04.cc
+++ b/tests/numerics/no_flux_04.cc
@@ -71,7 +71,7 @@ public:
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -118,7 +118,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/no_flux_05.cc b/tests/numerics/no_flux_05.cc
index 34bcf8736f..d7c0ca01b4 100644
--- a/tests/numerics/no_flux_05.cc
+++ b/tests/numerics/no_flux_05.cc
@@ -45,7 +45,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -72,7 +72,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/no_flux_06.cc b/tests/numerics/no_flux_06.cc
index 9a2f84f494..63d38f22c5 100644
--- a/tests/numerics/no_flux_06.cc
+++ b/tests/numerics/no_flux_06.cc
@@ -37,7 +37,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/no_flux_07.cc b/tests/numerics/no_flux_07.cc
index eb0d35ad81..99f05b8ae9 100644
--- a/tests/numerics/no_flux_07.cc
+++ b/tests/numerics/no_flux_07.cc
@@ -43,7 +43,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -60,7 +60,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/no_flux_hp_01.cc b/tests/numerics/no_flux_hp_01.cc
index 9e47a059cb..4c22b890ee 100644
--- a/tests/numerics/no_flux_hp_01.cc
+++ b/tests/numerics/no_flux_hp_01.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const hp::FECollection<dim> &fe)
 {
@@ -56,7 +56,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/no_flux_hp_02.cc b/tests/numerics/no_flux_hp_02.cc
index d542c3f4f7..149398a9e0 100644
--- a/tests/numerics/no_flux_hp_02.cc
+++ b/tests/numerics/no_flux_hp_02.cc
@@ -33,7 +33,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const hp::FECollection<dim> &fe)
 {
@@ -58,7 +58,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/no_flux_hp_03.cc b/tests/numerics/no_flux_hp_03.cc
index 53228b035d..4ee6c663a3 100644
--- a/tests/numerics/no_flux_hp_03.cc
+++ b/tests/numerics/no_flux_hp_03.cc
@@ -32,7 +32,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const hp::FECollection<dim> &fe)
 {
@@ -53,7 +53,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/no_flux_hp_04.cc b/tests/numerics/no_flux_hp_04.cc
index 08d53f877e..9d511a8d19 100644
--- a/tests/numerics/no_flux_hp_04.cc
+++ b/tests/numerics/no_flux_hp_04.cc
@@ -64,7 +64,7 @@ public:
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const hp::FECollection<dim> &fe)
 {
@@ -111,7 +111,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/no_flux_hp_05.cc b/tests/numerics/no_flux_hp_05.cc
index a819c80c00..b5bbd8f9b7 100644
--- a/tests/numerics/no_flux_hp_05.cc
+++ b/tests/numerics/no_flux_hp_05.cc
@@ -36,7 +36,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const hp::FECollection<dim> &fe)
 {
@@ -63,7 +63,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/normal_flux_01.cc b/tests/numerics/normal_flux_01.cc
index 997661fb6d..50b6de4fe2 100644
--- a/tests/numerics/normal_flux_01.cc
+++ b/tests/numerics/normal_flux_01.cc
@@ -35,7 +35,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -60,7 +60,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/normal_flux_02.cc b/tests/numerics/normal_flux_02.cc
index bf687ae9ea..4d4e1dcd18 100644
--- a/tests/numerics/normal_flux_02.cc
+++ b/tests/numerics/normal_flux_02.cc
@@ -37,7 +37,7 @@
 
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -62,7 +62,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/normal_flux_03.cc b/tests/numerics/normal_flux_03.cc
index 4bb896c9e6..beb24fb86d 100644
--- a/tests/numerics/normal_flux_03.cc
+++ b/tests/numerics/normal_flux_03.cc
@@ -33,7 +33,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -54,7 +54,7 @@ void test (const Triangulation<dim> &tr,
 
 
 
-template<int dim>
+template <int dim>
 void test_hyper_sphere()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/normal_flux_hp_01.cc b/tests/numerics/normal_flux_hp_01.cc
index 77db5df5c2..2532278eaf 100644
--- a/tests/numerics/normal_flux_hp_01.cc
+++ b/tests/numerics/normal_flux_hp_01.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const hp::FECollection<dim> &fe)
 {
@@ -59,7 +59,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/normal_flux_inhom_01.cc b/tests/numerics/normal_flux_inhom_01.cc
index 98b7e61bdc..50b891e02f 100644
--- a/tests/numerics/normal_flux_inhom_01.cc
+++ b/tests/numerics/normal_flux_inhom_01.cc
@@ -36,7 +36,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -96,7 +96,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/project_01.cc b/tests/numerics/project_01.cc
index e52ee80c6d..4924634e5b 100644
--- a/tests/numerics/project_01.cc
+++ b/tests/numerics/project_01.cc
@@ -51,7 +51,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   // create 2 triangulations with the
diff --git a/tests/numerics/project_01_curved_boundary.cc b/tests/numerics/project_01_curved_boundary.cc
index 073612fc56..f7ffcb19a5 100644
--- a/tests/numerics/project_01_curved_boundary.cc
+++ b/tests/numerics/project_01_curved_boundary.cc
@@ -61,7 +61,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   HyperBallBoundary<dim> boundary;
diff --git a/tests/numerics/project_02.cc b/tests/numerics/project_02.cc
index ac9394d0e5..c259149aa0 100644
--- a/tests/numerics/project_02.cc
+++ b/tests/numerics/project_02.cc
@@ -51,7 +51,7 @@ public:
 };
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   // create 2 triangulations with the
diff --git a/tests/numerics/project_boundary_01.cc b/tests/numerics/project_boundary_01.cc
index 3d389f6e0c..673e980be9 100644
--- a/tests/numerics/project_boundary_01.cc
+++ b/tests/numerics/project_boundary_01.cc
@@ -40,7 +40,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/numerics/project_boundary_rt_01.cc b/tests/numerics/project_boundary_rt_01.cc
index 4f603971ee..fe4a549525 100644
--- a/tests/numerics/project_boundary_rt_01.cc
+++ b/tests/numerics/project_boundary_rt_01.cc
@@ -33,7 +33,7 @@
 /**
  * A vector-valued polynomial for testing RT elements.
  */
-template<int dim>
+template <int dim>
 class TestFunction : public Function<dim>
 {
 public:
@@ -48,14 +48,14 @@ private:
 };
 
 
-template<int dim>
+template <int dim>
 TestFunction<dim>::TestFunction (unsigned int p)
   :
   Function<dim>(dim), degree(p)
 {}
 
 
-template<int dim>
+template <int dim>
 void
 TestFunction<dim>::vector_value_list (const std::vector<Point<dim> > &points,
                                       std::vector<Vector<double> >   &values) const
@@ -87,7 +87,7 @@ TestFunction<dim>::vector_value_list (const std::vector<Point<dim> > &points,
 
 
 
-template<int dim>
+template <int dim>
 double integrate_error(const DoFHandler<dim> &dof,
                        FEFaceValues<dim> &fe,
                        const Vector<double> &u,
@@ -120,7 +120,7 @@ double integrate_error(const DoFHandler<dim> &dof,
 }
 
 
-template<int dim>
+template <int dim>
 void test_projection (const Triangulation<dim> &tr,
                       const FiniteElement<dim> &fe)
 {
@@ -162,7 +162,7 @@ void test_projection (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube(const FiniteElement<dim> &fe)
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/tangential_flux_inhom_01.cc b/tests/numerics/tangential_flux_inhom_01.cc
index 1e0aeb0801..cacf6cf66d 100644
--- a/tests/numerics/tangential_flux_inhom_01.cc
+++ b/tests/numerics/tangential_flux_inhom_01.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 void test (const Triangulation<dim> &tr,
            const FiniteElement<dim> &fe)
 {
@@ -95,7 +95,7 @@ void test (const Triangulation<dim> &tr,
 }
 
 
-template<int dim>
+template <int dim>
 void test_hyper_cube()
 {
   Triangulation<dim> tr;
diff --git a/tests/numerics/vectors_boundary_rhs_01.cc b/tests/numerics/vectors_boundary_rhs_01.cc
index ddad97156c..3082f91f38 100644
--- a/tests/numerics/vectors_boundary_rhs_01.cc
+++ b/tests/numerics/vectors_boundary_rhs_01.cc
@@ -42,7 +42,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/numerics/vectors_boundary_rhs_02.cc b/tests/numerics/vectors_boundary_rhs_02.cc
index 132618113f..522f3952da 100644
--- a/tests/numerics/vectors_boundary_rhs_02.cc
+++ b/tests/numerics/vectors_boundary_rhs_02.cc
@@ -44,7 +44,7 @@
 
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/numerics/vectors_boundary_rhs_03.cc b/tests/numerics/vectors_boundary_rhs_03.cc
index 1b6c9f2033..78be315764 100644
--- a/tests/numerics/vectors_boundary_rhs_03.cc
+++ b/tests/numerics/vectors_boundary_rhs_03.cc
@@ -43,7 +43,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/numerics/vectors_point_source_01.cc b/tests/numerics/vectors_point_source_01.cc
index d42fe9ace5..50362286fe 100644
--- a/tests/numerics/vectors_point_source_01.cc
+++ b/tests/numerics/vectors_point_source_01.cc
@@ -43,7 +43,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/numerics/vectors_rhs_01.cc b/tests/numerics/vectors_rhs_01.cc
index 4f03477c5b..f4fe64889b 100644
--- a/tests/numerics/vectors_rhs_01.cc
+++ b/tests/numerics/vectors_rhs_01.cc
@@ -42,7 +42,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/numerics/vectors_rhs_03.cc b/tests/numerics/vectors_rhs_03.cc
index 6de936827c..0109919ba4 100644
--- a/tests/numerics/vectors_rhs_03.cc
+++ b/tests/numerics/vectors_rhs_03.cc
@@ -43,7 +43,7 @@
 #include <fstream>
 
 
-template<int dim>
+template <int dim>
 class MySquareFunction : public Function<dim>
 {
 public:
diff --git a/tests/petsc/64.cc b/tests/petsc/64.cc
index 0e0eea128e..d90e20d203 100644
--- a/tests/petsc/64.cc
+++ b/tests/petsc/64.cc
@@ -30,7 +30,7 @@
 #include <vector>
 
 
-template<typename MatrixType>
+template <typename MatrixType>
 void test (MatrixType &m)
 {
   m.add(0,0,1);
diff --git a/tests/petsc/deal_solver_01.cc b/tests/petsc/deal_solver_01.cc
index 988f1b4e3e..44b2ef05e6 100644
--- a/tests/petsc/deal_solver_01.cc
+++ b/tests/petsc/deal_solver_01.cc
@@ -36,7 +36,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/deal_solver_02.cc b/tests/petsc/deal_solver_02.cc
index 26052bf986..09e9c664eb 100644
--- a/tests/petsc/deal_solver_02.cc
+++ b/tests/petsc/deal_solver_02.cc
@@ -38,7 +38,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/deal_solver_03.cc b/tests/petsc/deal_solver_03.cc
index ac76462285..268e208b0e 100644
--- a/tests/petsc/deal_solver_03.cc
+++ b/tests/petsc/deal_solver_03.cc
@@ -38,7 +38,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/deal_solver_04.cc b/tests/petsc/deal_solver_04.cc
index 5a28f79885..49fa00fd1a 100644
--- a/tests/petsc/deal_solver_04.cc
+++ b/tests/petsc/deal_solver_04.cc
@@ -37,7 +37,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/deal_solver_05.cc b/tests/petsc/deal_solver_05.cc
index 3da07e9a3b..291378d5db 100644
--- a/tests/petsc/deal_solver_05.cc
+++ b/tests/petsc/deal_solver_05.cc
@@ -36,7 +36,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_03.cc b/tests/petsc/solver_03.cc
index ca0cdc1a09..877053b04e 100644
--- a/tests/petsc/solver_03.cc
+++ b/tests/petsc/solver_03.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_03_mf.cc b/tests/petsc/solver_03_mf.cc
index 6d0ea169f0..32b1768d20 100644
--- a/tests/petsc/solver_03_mf.cc
+++ b/tests/petsc/solver_03_mf.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_03_precondition_boomeramg.cc b/tests/petsc/solver_03_precondition_boomeramg.cc
index b3402712d1..5163b149a9 100644
--- a/tests/petsc/solver_03_precondition_boomeramg.cc
+++ b/tests/petsc/solver_03_precondition_boomeramg.cc
@@ -32,7 +32,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc b/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc
index 51c9e77422..594721f7b8 100644
--- a/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc
+++ b/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc
@@ -33,7 +33,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_03_precondition_eisenstat.cc b/tests/petsc/solver_03_precondition_eisenstat.cc
index ea59ec3423..4e82eb6fce 100644
--- a/tests/petsc/solver_03_precondition_eisenstat.cc
+++ b/tests/petsc/solver_03_precondition_eisenstat.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_03_precondition_icc.cc b/tests/petsc/solver_03_precondition_icc.cc
index b1de5b810c..7d4cb5e4cf 100644
--- a/tests/petsc/solver_03_precondition_icc.cc
+++ b/tests/petsc/solver_03_precondition_icc.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_03_precondition_ilu.cc b/tests/petsc/solver_03_precondition_ilu.cc
index faf8d63d80..3fc5c010b7 100644
--- a/tests/petsc/solver_03_precondition_ilu.cc
+++ b/tests/petsc/solver_03_precondition_ilu.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_03_precondition_lu.cc b/tests/petsc/solver_03_precondition_lu.cc
index 628b3a911e..4316a41c25 100644
--- a/tests/petsc/solver_03_precondition_lu.cc
+++ b/tests/petsc/solver_03_precondition_lu.cc
@@ -32,7 +32,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_03_precondition_parasails.cc b/tests/petsc/solver_03_precondition_parasails.cc
index 3e99f147e2..a732255645 100644
--- a/tests/petsc/solver_03_precondition_parasails.cc
+++ b/tests/petsc/solver_03_precondition_parasails.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_03_precondition_sor.cc b/tests/petsc/solver_03_precondition_sor.cc
index 2b42ca3679..3923263fc3 100644
--- a/tests/petsc/solver_03_precondition_sor.cc
+++ b/tests/petsc/solver_03_precondition_sor.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_03_precondition_ssor.cc b/tests/petsc/solver_03_precondition_ssor.cc
index 70c88ab39b..54cf6d49e1 100644
--- a/tests/petsc/solver_03_precondition_ssor.cc
+++ b/tests/petsc/solver_03_precondition_ssor.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_04.cc b/tests/petsc/solver_04.cc
index c0e15d2c79..16af79ec64 100644
--- a/tests/petsc/solver_04.cc
+++ b/tests/petsc/solver_04.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_05.cc b/tests/petsc/solver_05.cc
index 329eb8bf76..bcdbe9330d 100644
--- a/tests/petsc/solver_05.cc
+++ b/tests/petsc/solver_05.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_06.cc b/tests/petsc/solver_06.cc
index 757c6f4cfa..5884307595 100644
--- a/tests/petsc/solver_06.cc
+++ b/tests/petsc/solver_06.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_07.cc b/tests/petsc/solver_07.cc
index d8ac25cf28..bbc8741b6a 100644
--- a/tests/petsc/solver_07.cc
+++ b/tests/petsc/solver_07.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_08.cc b/tests/petsc/solver_08.cc
index 67fae993d5..6916a06cbd 100644
--- a/tests/petsc/solver_08.cc
+++ b/tests/petsc/solver_08.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_09.cc b/tests/petsc/solver_09.cc
index 094a2256bd..03abcd3213 100644
--- a/tests/petsc/solver_09.cc
+++ b/tests/petsc/solver_09.cc
@@ -35,7 +35,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_10.cc b/tests/petsc/solver_10.cc
index 2e438591bd..b5e5997f7c 100644
--- a/tests/petsc/solver_10.cc
+++ b/tests/petsc/solver_10.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_12.cc b/tests/petsc/solver_12.cc
index 99965ee9d6..da8dd49cee 100644
--- a/tests/petsc/solver_12.cc
+++ b/tests/petsc/solver_12.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc/solver_13.cc b/tests/petsc/solver_13.cc
index dd6e419ade..959a05f726 100644
--- a/tests/petsc/solver_13.cc
+++ b/tests/petsc/solver_13.cc
@@ -31,7 +31,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve(SolverType          &solver,
             const SolverControl &solver_control,
diff --git a/tests/petsc_complex/parallel_sparse_matrix_01.cc b/tests/petsc_complex/parallel_sparse_matrix_01.cc
index b58ed172d9..193e357668 100644
--- a/tests/petsc_complex/parallel_sparse_matrix_01.cc
+++ b/tests/petsc_complex/parallel_sparse_matrix_01.cc
@@ -50,7 +50,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 void test (const unsigned int poly_degree = 1)
 {
 
diff --git a/tests/petsc_complex/solver_real_03.cc b/tests/petsc_complex/solver_real_03.cc
index fcf16fd39b..ab0b95be76 100644
--- a/tests/petsc_complex/solver_real_03.cc
+++ b/tests/petsc_complex/solver_real_03.cc
@@ -32,7 +32,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<class SOLVER, class MATRIX, class VECTOR, class PRECONDITION>
+template <class SOLVER, class MATRIX, class VECTOR, class PRECONDITION>
 void
 check_solve( SOLVER &solver, const MATRIX &A,
              VECTOR &u, VECTOR &f, const PRECONDITION &P)
diff --git a/tests/petsc_complex/solver_real_03_mf.cc b/tests/petsc_complex/solver_real_03_mf.cc
index c6d50c0e65..dc0b9ee087 100644
--- a/tests/petsc_complex/solver_real_03_mf.cc
+++ b/tests/petsc_complex/solver_real_03_mf.cc
@@ -44,7 +44,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<class SOLVER, class MATRIX, class VECTOR, class PRECONDITION>
+template <class SOLVER, class MATRIX, class VECTOR, class PRECONDITION>
 void
 check_solve( SOLVER &solver, const MATRIX &A,
              VECTOR &u, VECTOR &f, const PRECONDITION &P)
diff --git a/tests/petsc_complex/solver_real_04.cc b/tests/petsc_complex/solver_real_04.cc
index 9eaeb36744..6ba5cca727 100644
--- a/tests/petsc_complex/solver_real_04.cc
+++ b/tests/petsc_complex/solver_real_04.cc
@@ -32,7 +32,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<class SOLVER, class MATRIX, class VECTOR, class PRECONDITION>
+template <class SOLVER, class MATRIX, class VECTOR, class PRECONDITION>
 void
 check_solve( SOLVER &solver, const MATRIX &A,
              VECTOR &u, VECTOR &f, const PRECONDITION &P)
diff --git a/tests/physics/elasticity-kinematics_01.cc b/tests/physics/elasticity-kinematics_01.cc
index 1b7921564f..25ad8a3f57 100644
--- a/tests/physics/elasticity-kinematics_01.cc
+++ b/tests/physics/elasticity-kinematics_01.cc
@@ -45,7 +45,7 @@ using namespace dealii;
 using namespace dealii::Physics;
 using namespace dealii::Physics::Elasticity;
 
-template<int dim>
+template <int dim>
 void
 test_kinematic_tensors ()
 {
diff --git a/tests/physics/elasticity-standard_tensors_01.cc b/tests/physics/elasticity-standard_tensors_01.cc
index 2e9b08c4d8..d8825f5301 100644
--- a/tests/physics/elasticity-standard_tensors_01.cc
+++ b/tests/physics/elasticity-standard_tensors_01.cc
@@ -34,7 +34,7 @@ const double c01 = 20.0;
 // where I1 = I1(C), I2 = I2(C)
 // Then dI1/dC = I and dI2/dC = I1.I - C
 // and S = 2 dpsi/dC
-template<int dim>
+template <int dim>
 SymmetricTensor<2,dim>
 get_S (const Tensor<2,dim> &F)
 {
@@ -46,7 +46,7 @@ get_S (const Tensor<2,dim> &F)
 // For isotropic media, tau = 2.b.dpsi/db == 2.dpsi/db . b
 // where b = F.F^{T}, I1(b) == I1(C) and
 //  I2(b) == I2(C)
-template<int dim>
+template <int dim>
 SymmetricTensor<2,dim>
 get_tau (const Tensor<2,dim> &F)
 {
@@ -58,7 +58,7 @@ get_tau (const Tensor<2,dim> &F)
   return symmetrize(static_cast< Tensor<2,dim> >(tmp)*static_cast< Tensor<2,dim> >(b));
 }
 
-template<int dim>
+template <int dim>
 void
 test_standard_tensors ()
 {
diff --git a/tests/quick_tests/p4est.cc b/tests/quick_tests/p4est.cc
index 79913e626d..9b105ddedb 100644
--- a/tests/quick_tests/p4est.cc
+++ b/tests/quick_tests/p4est.cc
@@ -38,7 +38,7 @@
 
 using namespace dealii;
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::distributed::Triangulation<dim>
diff --git a/tests/sharedtria/copy_tria_01.cc b/tests/sharedtria/copy_tria_01.cc
index ba6e7f4010..9ce0b7c0c6 100644
--- a/tests/sharedtria/copy_tria_01.cc
+++ b/tests/sharedtria/copy_tria_01.cc
@@ -22,7 +22,7 @@
 #include <deal.II/distributed/shared_tria.h>
 #include <deal.II/grid/grid_generator.h>
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tr1;
diff --git a/tests/sharedtria/dof_01.cc b/tests/sharedtria/dof_01.cc
index c0d4995369..96abb79ec8 100644
--- a/tests/sharedtria/dof_01.cc
+++ b/tests/sharedtria/dof_01.cc
@@ -37,7 +37,7 @@
 #include <numeric>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim>
diff --git a/tests/sharedtria/dof_02.cc b/tests/sharedtria/dof_02.cc
index dd15f63705..7ea096edcc 100644
--- a/tests/sharedtria/dof_02.cc
+++ b/tests/sharedtria/dof_02.cc
@@ -38,7 +38,7 @@
 #include <numeric>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim>
diff --git a/tests/sharedtria/dof_03.cc b/tests/sharedtria/dof_03.cc
index 09fb710594..3ec702875a 100644
--- a/tests/sharedtria/dof_03.cc
+++ b/tests/sharedtria/dof_03.cc
@@ -37,7 +37,7 @@
 #include <numeric>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim>
diff --git a/tests/sharedtria/dof_04.cc b/tests/sharedtria/dof_04.cc
index 632cc25dbd..09c2cb8855 100644
--- a/tests/sharedtria/dof_04.cc
+++ b/tests/sharedtria/dof_04.cc
@@ -38,7 +38,7 @@
 #include <numeric>
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim>
diff --git a/tests/sharedtria/tria_01.cc b/tests/sharedtria/tria_01.cc
index daf2e4fbca..aa18aa3921 100644
--- a/tests/sharedtria/tria_01.cc
+++ b/tests/sharedtria/tria_01.cc
@@ -54,7 +54,7 @@ void write_mesh (const parallel::shared::Triangulation<dim,spacedim> &tria,
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim> tr(MPI_COMM_WORLD);
diff --git a/tests/sharedtria/tria_02.cc b/tests/sharedtria/tria_02.cc
index 53b9a3c635..a7829dec8d 100644
--- a/tests/sharedtria/tria_02.cc
+++ b/tests/sharedtria/tria_02.cc
@@ -56,7 +56,7 @@ void write_mesh (const parallel::shared::Triangulation<dim,spacedim> &tria,
 
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim> tr(MPI_COMM_WORLD,
diff --git a/tests/sharedtria/tria_custom_refine01.cc b/tests/sharedtria/tria_custom_refine01.cc
index 7422ee3bd6..7453179378 100644
--- a/tests/sharedtria/tria_custom_refine01.cc
+++ b/tests/sharedtria/tria_custom_refine01.cc
@@ -52,7 +52,7 @@ void mypartition(parallel::shared::Triangulation<dim> &tria)
     }
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim> shared_tria(MPI_COMM_WORLD,typename Triangulation<dim>::MeshSmoothing
diff --git a/tests/sharedtria/tria_custom_refine02.cc b/tests/sharedtria/tria_custom_refine02.cc
index ac4ba9d340..d6fd388a25 100644
--- a/tests/sharedtria/tria_custom_refine02.cc
+++ b/tests/sharedtria/tria_custom_refine02.cc
@@ -61,7 +61,7 @@ void mypartition(parallel::shared::Triangulation<dim> &tria)
     }
 }
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim> shared_tria(MPI_COMM_WORLD,typename Triangulation<dim>::MeshSmoothing
diff --git a/tests/sharedtria/tria_load_01.cc b/tests/sharedtria/tria_load_01.cc
index 681902975c..fd31e782fa 100644
--- a/tests/sharedtria/tria_load_01.cc
+++ b/tests/sharedtria/tria_load_01.cc
@@ -28,7 +28,7 @@
 #include <sstream>
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   Triangulation<dim> tr1;
diff --git a/tests/sharedtria/tria_multigrid_01.cc b/tests/sharedtria/tria_multigrid_01.cc
index 763269cf23..cfe09f2843 100644
--- a/tests/sharedtria/tria_multigrid_01.cc
+++ b/tests/sharedtria/tria_multigrid_01.cc
@@ -105,7 +105,7 @@ void compare_meshes (parallel::shared::Triangulation<dim> &shared_tria, parallel
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim> shared_tria(MPI_COMM_WORLD,typename Triangulation<dim>::MeshSmoothing
diff --git a/tests/sharedtria/tria_multigrid_02.cc b/tests/sharedtria/tria_multigrid_02.cc
index de3a0ae242..c60968dc1e 100644
--- a/tests/sharedtria/tria_multigrid_02.cc
+++ b/tests/sharedtria/tria_multigrid_02.cc
@@ -33,7 +33,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim> shared_tria(MPI_COMM_WORLD,typename Triangulation<dim>::MeshSmoothing
diff --git a/tests/sharedtria/tria_zorder_01.cc b/tests/sharedtria/tria_zorder_01.cc
index 4b240e2327..085d6e4c28 100644
--- a/tests/sharedtria/tria_zorder_01.cc
+++ b/tests/sharedtria/tria_zorder_01.cc
@@ -70,7 +70,7 @@ void compare_meshes (parallel::shared::Triangulation<dim> &shared_tria, parallel
 }
 
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim> shared_tria(MPI_COMM_WORLD,typename Triangulation<dim>::MeshSmoothing
diff --git a/tests/sharedtria/tria_zorder_02.cc b/tests/sharedtria/tria_zorder_02.cc
index 919d6645bb..97108f242b 100644
--- a/tests/sharedtria/tria_zorder_02.cc
+++ b/tests/sharedtria/tria_zorder_02.cc
@@ -33,7 +33,7 @@
 
 #include <fstream>
 
-template<int dim>
+template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim> shared_tria(MPI_COMM_WORLD,typename Triangulation<dim>::MeshSmoothing
diff --git a/tests/slepc/solve_01.cc b/tests/slepc/solve_01.cc
index 4168712627..6a0a628c5c 100644
--- a/tests/slepc/solve_01.cc
+++ b/tests/slepc/solve_01.cc
@@ -36,7 +36,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType>
+template <typename SolverType, typename MatrixType, typename VectorType>
 void
 check_solve( SolverType &solver,
              const SolverControl &solver_control,
diff --git a/tests/slepc/solve_04.cc b/tests/slepc/solve_04.cc
index 5d2964b1f5..f079a5e70a 100644
--- a/tests/slepc/solve_04.cc
+++ b/tests/slepc/solve_04.cc
@@ -36,7 +36,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType>
+template <typename SolverType, typename MatrixType, typename VectorType>
 void
 check_solve( SolverType &solver,
              const unsigned int solver_number,
diff --git a/tests/slepc/testmatrix.h b/tests/slepc/testmatrix.h
index 07f00073c6..e70b853fe9 100644
--- a/tests/slepc/testmatrix.h
+++ b/tests/slepc/testmatrix.h
@@ -75,7 +75,7 @@ FDDiagMatrix::diag_structure(SP &structure) const
 }
 
 
-template<typename MatrixType>
+template <typename MatrixType>
 inline
 void
 FDDiagMatrix::diag(MatrixType &A) const
@@ -91,7 +91,7 @@ FDDiagMatrix::diag(MatrixType &A) const
     }
 }
 
-template<typename number>
+template <typename number>
 inline
 void
 FDDiagMatrix::gnuplot_print(std::ostream &s, const Vector<number> &V) const
@@ -168,7 +168,7 @@ FD1DLaplaceMatrix::three_point_structure(SP &structure) const
 }
 
 
-template<typename MatrixType>
+template <typename MatrixType>
 inline
 void
 FD1DLaplaceMatrix::three_point(MatrixType &A) const
diff --git a/tests/testmatrix.h b/tests/testmatrix.h
index 358b412355..4e0a43c920 100644
--- a/tests/testmatrix.h
+++ b/tests/testmatrix.h
@@ -173,7 +173,7 @@ FDMatrix::nine_point_structure(SP &structure) const
 
 
 
-template<typename MatrixType>
+template <typename MatrixType>
 void
 FDMatrix::nine_point(MatrixType &A, bool) const
 {
@@ -229,7 +229,7 @@ FDMatrix::nine_point(MatrixType &A, bool) const
     }
 }
 
-template<typename MatrixType>
+template <typename MatrixType>
 inline
 void
 FDMatrix::five_point(MatrixType &A, bool nonsymmetric) const
@@ -273,7 +273,7 @@ FDMatrix::five_point(MatrixType &A, bool nonsymmetric) const
 
 
 
-template<typename MatrixType>
+template <typename MatrixType>
 inline
 void
 FDMatrix::upwind(MatrixType &A, bool back) const
@@ -295,7 +295,7 @@ FDMatrix::upwind(MatrixType &A, bool back) const
     }
 }
 
-template<typename number>
+template <typename number>
 inline
 void
 FDMatrix::gnuplot_print(std::ostream &s, const Vector<number> &V) const
diff --git a/tests/tests.h b/tests/tests.h
index 1ce99af8a6..32189f1020 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -79,14 +79,14 @@ PetscReal get_real_assert_zero_imag(const PETScWrappers::internal::VectorReferen
 }
 #endif
 
-template<typename number>
+template <typename number>
 number get_real_assert_zero_imag(const std::complex<number> &a)
 {
   Assert (a.imag() == 0.0, ExcInternalError());
   return a.real();
 }
 
-template<typename number>
+template <typename number>
 number get_real_assert_zero_imag(const number &a)
 {
   return a;
diff --git a/tests/trilinos/64.cc b/tests/trilinos/64.cc
index 4e32ab6fe3..676d5a1776 100644
--- a/tests/trilinos/64.cc
+++ b/tests/trilinos/64.cc
@@ -30,7 +30,7 @@
 #include <vector>
 
 
-template<typename MatrixType>
+template <typename MatrixType>
 void test (MatrixType &m)
 {
   m.set(0,0,1.);
diff --git a/tests/trilinos/deal_solver_01.cc b/tests/trilinos/deal_solver_01.cc
index 9d4630a8de..984d355002 100644
--- a/tests/trilinos/deal_solver_01.cc
+++ b/tests/trilinos/deal_solver_01.cc
@@ -37,7 +37,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType          &solver,
              const SolverControl &solver_control,
diff --git a/tests/trilinos/deal_solver_02.cc b/tests/trilinos/deal_solver_02.cc
index e71a3a2785..42adb4488d 100644
--- a/tests/trilinos/deal_solver_02.cc
+++ b/tests/trilinos/deal_solver_02.cc
@@ -39,7 +39,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType          &solver,
              const SolverControl &solver_control,
diff --git a/tests/trilinos/deal_solver_03.cc b/tests/trilinos/deal_solver_03.cc
index d45ae717e1..343486235a 100644
--- a/tests/trilinos/deal_solver_03.cc
+++ b/tests/trilinos/deal_solver_03.cc
@@ -39,7 +39,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType          &solver,
              const SolverControl &solver_control,
diff --git a/tests/trilinos/deal_solver_04.cc b/tests/trilinos/deal_solver_04.cc
index f2d2de8ce2..bab2dee0dc 100644
--- a/tests/trilinos/deal_solver_04.cc
+++ b/tests/trilinos/deal_solver_04.cc
@@ -38,7 +38,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType          &solver,
              const SolverControl &solver_control,
diff --git a/tests/trilinos/deal_solver_05.cc b/tests/trilinos/deal_solver_05.cc
index fd7665f412..6a32655016 100644
--- a/tests/trilinos/deal_solver_05.cc
+++ b/tests/trilinos/deal_solver_05.cc
@@ -37,7 +37,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType          &solver,
              const SolverControl &solver_control,
diff --git a/tests/trilinos/deal_solver_06.cc b/tests/trilinos/deal_solver_06.cc
index 0573c8697b..7a3a746568 100644
--- a/tests/trilinos/deal_solver_06.cc
+++ b/tests/trilinos/deal_solver_06.cc
@@ -37,7 +37,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType          &solver,
              const SolverControl &solver_control,
diff --git a/tests/trilinos/elide_zeros.cc b/tests/trilinos/elide_zeros.cc
index ba4c09dcdb..a276e92818 100644
--- a/tests/trilinos/elide_zeros.cc
+++ b/tests/trilinos/elide_zeros.cc
@@ -94,7 +94,7 @@ namespace LinearAdvectionTest
 {
   using namespace dealii;
 
-  template<int dim>
+  template <int dim>
   class AdvectionProblem
   {
   public:
@@ -129,7 +129,7 @@ namespace LinearAdvectionTest
 
 
 
-  template<int dim>
+  template <int dim>
   AdvectionProblem<dim>::AdvectionProblem()
     : n_mpi_processes (Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD)),
       this_mpi_process (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD)),
@@ -147,7 +147,7 @@ namespace LinearAdvectionTest
                                               p0, p1);
   }
 
-  template<int dim>
+  template <int dim>
   void AdvectionProblem<dim>::setup_system ()
   {
     dof_handler.distribute_dofs(fe);
@@ -175,7 +175,7 @@ namespace LinearAdvectionTest
 
 
 
-  template<int dim>
+  template <int dim>
   void AdvectionProblem<dim>::calculate_flux_terms
   (const TriaActiveIterator<DoFCellAccessor<DoFHandler<dim>, false> > &current_cell,
    FEFaceValues<dim> &current_face_values,
@@ -200,7 +200,7 @@ namespace LinearAdvectionTest
   }
 
 
-  template<int dim>
+  template <int dim>
   void AdvectionProblem<dim>::assemble_system()
   {
     const unsigned int dofs_per_cell = fe.dofs_per_cell;
@@ -294,7 +294,7 @@ namespace LinearAdvectionTest
   }
 
 
-  template<int dim>
+  template <int dim>
   void AdvectionProblem<dim>::run()
   {
     setup_system();
diff --git a/tests/trilinos/solver_03.cc b/tests/trilinos/solver_03.cc
index 56c747f093..3346578f52 100644
--- a/tests/trilinos/solver_03.cc
+++ b/tests/trilinos/solver_03.cc
@@ -32,7 +32,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType          &solver,
              const SolverControl &solver_control,
diff --git a/tests/trilinos/solver_05.cc b/tests/trilinos/solver_05.cc
index 54916f3ca5..b97da29d19 100644
--- a/tests/trilinos/solver_05.cc
+++ b/tests/trilinos/solver_05.cc
@@ -32,7 +32,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType          &solver,
              const SolverControl &solver_control,
diff --git a/tests/trilinos/solver_07.cc b/tests/trilinos/solver_07.cc
index d57a0fb3c4..12c27e921f 100644
--- a/tests/trilinos/solver_07.cc
+++ b/tests/trilinos/solver_07.cc
@@ -32,7 +32,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename SolverType, typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverType          &solver,
              const SolverControl &solver_control,
diff --git a/tests/trilinos/solver_control_01.cc b/tests/trilinos/solver_control_01.cc
index 6242b9537b..c7b337ff34 100644
--- a/tests/trilinos/solver_control_01.cc
+++ b/tests/trilinos/solver_control_01.cc
@@ -33,7 +33,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverControl       &solver_control,
              const MatrixType    &A,
diff --git a/tests/trilinos/solver_control_02.cc b/tests/trilinos/solver_control_02.cc
index 1c832fe0ef..83ddd3144b 100644
--- a/tests/trilinos/solver_control_02.cc
+++ b/tests/trilinos/solver_control_02.cc
@@ -33,7 +33,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverControl       &solver_control,
              const MatrixType    &A,
diff --git a/tests/trilinos/solver_control_03.cc b/tests/trilinos/solver_control_03.cc
index 7c527fe15a..631aedc9ef 100644
--- a/tests/trilinos/solver_control_03.cc
+++ b/tests/trilinos/solver_control_03.cc
@@ -33,7 +33,7 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<typename MatrixType, typename VectorType, class PRECONDITION>
+template <typename MatrixType, typename VectorType, class PRECONDITION>
 void
 check_solve (SolverControl       &solver_control,
              const MatrixType    &A,
diff --git a/tests/trilinos/sparse_matrix_mmult_01.cc b/tests/trilinos/sparse_matrix_mmult_01.cc
index f801d00fa7..01fcff49e9 100644
--- a/tests/trilinos/sparse_matrix_mmult_01.cc
+++ b/tests/trilinos/sparse_matrix_mmult_01.cc
@@ -26,7 +26,7 @@
 using namespace dealii;
 
 
-template<typename MATRIX>
+template <typename MATRIX>
 void out_matrix_size(const MATRIX &M,
                      const std::string &name)
 {