diff --git a/ippl/src/Particle/CellParticleCachingPolicy.h b/ippl/src/Particle/CellParticleCachingPolicy.h
index b771b250d8da31b6dc30c55c224c7e0cd6479b78..614b5f75b2e905c8ddc34823c6b7825956995f29 100644
--- a/ippl/src/Particle/CellParticleCachingPolicy.h
+++ b/ippl/src/Particle/CellParticleCachingPolicy.h
@@ -1,13 +1,29 @@
+//
+// Class CellParticleCachingPolicy
+//
+//   The Cell caching layout ensures that each node has all ghost particles
+//   for each external particle that is inside a neighboring cell.
+//
+//   Please note: for the time being this class is *not* used! But since it
+//   might be used in future projects, we keep this file.
+//
+// Copyright (c) 2003 - 2020, Paul Scherrer Institut, Villigen PSI, Switzerland
+// All rights reserved
+//
+// This file is part of OPAL.
+//
+// OPAL is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// You should have received a copy of the GNU General Public License
+// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
+//
+
 #ifndef CELL_PARTICLE_CACHING_POLICY
 #define CELL_PARTICLE_CACHING_POLICY
 
-/*
- *
- * The Cell caching layout ensures that each node has all ghost particles
- * for each external particle that is inside a neighboring cell.
- *
- */
-
 #include <Particle/BoxParticleCachingPolicy.h>
 
 template<class T, unsigned Dim, class Mesh>
@@ -56,4 +72,12 @@ private:
 	int cells[Dim];
 };
 
-#endif
\ No newline at end of file
+#endif
+
+// vi: set et ts=4 sw=4 sts=4:
+// Local Variables:
+// mode:c
+// c-basic-offset: 4
+// indent-tabs-mode: nil
+// require-final-newline: nil
+// End:
\ No newline at end of file
diff --git a/ippl/src/Particle/NoParticleCachingPolicy.h b/ippl/src/Particle/NoParticleCachingPolicy.h
index 4941663270e2f4db6aac2419088260a959d7fd8a..f3e0965c5b4929c74eee6cc772e5741d23dd5398 100644
--- a/ippl/src/Particle/NoParticleCachingPolicy.h
+++ b/ippl/src/Particle/NoParticleCachingPolicy.h
@@ -1,12 +1,27 @@
+//
+// Class NoParticleCachingPolicy
+//   Empty caching strategy that doesn't cache anything
+//
+//   Please note: for the time being this class is *not* used! But since it
+//   might be used in future projects, we keep this file.
+//
+// Copyright (c) 2003 - 2020, Paul Scherrer Institut, Villigen PSI, Switzerland
+// All rights reserved
+//
+// This file is part of OPAL.
+//
+// OPAL is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// You should have received a copy of the GNU General Public License
+// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
+//
+
 #ifndef NO_PARTICLE_CACHING_POLICY
 #define NO_PARTICLE_CACHING_POLICY
 
-/*
- * 
- * Empty caching strategy that doesn't cache anything
- * 
- */
-
 template <class T, unsigned Dim, class Mesh, class CachingPolicy> class ParticleSpatialLayout;
 
 //basic policy that doesn't cache any particles
@@ -33,3 +48,11 @@ protected:
 };
 
 #endif
+
+// vi: set et ts=4 sw=4 sts=4:
+// Local Variables:
+// mode:c
+// c-basic-offset: 4
+// indent-tabs-mode: nil
+// require-final-newline: nil
+// End:
diff --git a/ippl/src/Particle/ParticleCashedLayout.h b/ippl/src/Particle/ParticleCashedLayout.h
index 45f9aee96edeb58df9435bf22143ff3f149077e8..d596c54188b3209bdb9afad764adfeb5f39ccd02 100644
--- a/ippl/src/Particle/ParticleCashedLayout.h
+++ b/ippl/src/Particle/ParticleCashedLayout.h
@@ -1,12 +1,21 @@
-// -*- C++ -*-
-/***************************************************************************
- *
- * The IPPL Framework
- * 
- *
- * Visit http://people.web.psi.ch/adelmann/ for more details
- *
- ***************************************************************************/
+//
+// Class ParticleCashedLayout
+//   Please note: for the time being this class is *not* used! But since it
+//   might be used in future projects, we keep this file.
+//
+// Copyright (c) 2003 - 2020, Paul Scherrer Institut, Villigen PSI, Switzerland
+// All rights reserved
+//
+// This file is part of OPAL.
+//
+// OPAL is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// You should have received a copy of the GNU General Public License
+// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
+//
 
 #ifndef PARTICLE_CASHED_LAYOUT_H
 #define PARTICLE_CASHED_LAYOUT_H
@@ -178,10 +187,12 @@ private:
 
 #include "Particle/ParticleCashedLayout.hpp"
 
-#endif  // PARTICLE_CASHED_LAYOUT_H
+#endif
 
-/***************************************************************************
- * $RCSfile: ParticleCashedLayout.h,v $   $Author: adelmann $
- * $Revision: 1.1.1.1 $   $Date: 2003/01/23 07:40:29 $
- * IPPL_VERSION_ID: $Id: ParticleCashedLayout.h,v 1.1.1.1 2003/01/23 07:40:29 adelmann Exp $ 
- ***************************************************************************/
+// vi: set et ts=4 sw=4 sts=4:
+// Local Variables:
+// mode:c
+// c-basic-offset: 4
+// indent-tabs-mode: nil
+// require-final-newline: nil
+// End:
\ No newline at end of file
diff --git a/ippl/src/Particle/ParticleCashedLayout.hpp b/ippl/src/Particle/ParticleCashedLayout.hpp
index 4caa14f36cb6e70330dcf0431758232ccdfc6c0f..479ef2ca8429758dd17ae3c001ff7712c754b84c 100644
--- a/ippl/src/Particle/ParticleCashedLayout.hpp
+++ b/ippl/src/Particle/ParticleCashedLayout.hpp
@@ -1,11 +1,22 @@
-// -*- C++ -*-
-/***************************************************************************
- *
- * The IPPL Framework
- *
- ***************************************************************************/
+//
+// Class ParticleCashedLayout
+//   Please note: for the time being this class is *not* used! But since it
+//   might be used in future projects, we keep this file.
+//
+// Copyright (c) 2003 - 2020, Paul Scherrer Institut, Villigen PSI, Switzerland
+// All rights reserved
+//
+// This file is part of OPAL.
+//
+// OPAL is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// You should have received a copy of the GNU General Public License
+// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
+//
 
-// include files
 #include "Particle/ParticleCashedLayout.h"
 #include "Particle/ParticleBConds.h"
 #include "Particle/IpplParticleBase.h"
@@ -896,9 +907,10 @@ void ParticleCashedLayout<T,Dim,Mesh>::Repartition(UserList* userlist) {
   }
 }
 
-
-/***************************************************************************
- * $RCSfile: ParticleCashedLayout.cpp,v $   $Author: adelmann $
- * $Revision: 1.1.1.1 $   $Date: 2003/01/23 07:40:29 $
- * IPPL_VERSION_ID: $Id: ParticleCashedLayout.cpp,v 1.1.1.1 2003/01/23 07:40:29 adelmann Exp $
- ***************************************************************************/
+// vi: set et ts=4 sw=4 sts=4:
+// Local Variables:
+// mode:c
+// c-basic-offset: 4
+// indent-tabs-mode: nil
+// require-final-newline: nil
+// End:
\ No newline at end of file
diff --git a/ippl/src/Particle/ParticleInteractLayout.h b/ippl/src/Particle/ParticleInteractLayout.h
index 78b4797d501b8d811dc6ae7faa40bfe6cc61ace8..6a3e09976e237a88d0568e697dd6ced9b276769b 100644
--- a/ippl/src/Particle/ParticleInteractLayout.h
+++ b/ippl/src/Particle/ParticleInteractLayout.h
@@ -1,9 +1,21 @@
-// -*- C++ -*-
-/***************************************************************************
- *
- * The IPPL Framework
- *
- ***************************************************************************/
+//
+// Class ParticleInteractLayout
+//   Please note: for the time being this class is *not* used! But since it
+//   might be used in future projects, we keep this file.
+//
+// Copyright (c) 2003 - 2020, Paul Scherrer Institut, Villigen PSI, Switzerland
+// All rights reserved
+//
+// This file is part of OPAL.
+//
+// OPAL is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// You should have received a copy of the GNU General Public License
+// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
+//
 
 #ifndef PARTICLE_INTERACT_LAYOUT_H
 #define PARTICLE_INTERACT_LAYOUT_H
@@ -205,10 +217,12 @@ private:
 
 #include "Particle/ParticleInteractLayout.hpp"
 
-#endif  // PARTICLE_INTERACT_LAYOUT_H
+#endif
 
-/***************************************************************************
- * $RCSfile: ParticleInteractLayout.h,v $   $Author: adelmann $
- * $Revision: 1.1.1.1 $   $Date: 2003/01/23 07:40:29 $
- * IPPL_VERSION_ID: $Id: ParticleInteractLayout.h,v 1.1.1.1 2003/01/23 07:40:29 adelmann Exp $ 
- ***************************************************************************/
+// vi: set et ts=4 sw=4 sts=4:
+// Local Variables:
+// mode:c
+// c-basic-offset: 4
+// indent-tabs-mode: nil
+// require-final-newline: nil
+// End:
diff --git a/ippl/src/Particle/ParticleInteractLayout.hpp b/ippl/src/Particle/ParticleInteractLayout.hpp
index 865b8fea020334113a55505e4c908e2348ab7890..76e374d070204720a64c0ee5bd00bcf6ccf64819 100644
--- a/ippl/src/Particle/ParticleInteractLayout.hpp
+++ b/ippl/src/Particle/ParticleInteractLayout.hpp
@@ -1,11 +1,22 @@
-// -*- C++ -*-
-/***************************************************************************
- *
- * The IPPL Framework
- *
- ***************************************************************************/
-
-// include files
+//
+// Class ParticleInteractLayout
+//   Please note: for the time being this class is *not* used! But since it
+//   might be used in future projects, we keep this file.
+//
+// Copyright (c) 2003 - 2020, Paul Scherrer Institut, Villigen PSI, Switzerland
+// All rights reserved
+//
+// This file is part of OPAL.
+//
+// OPAL is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// You should have received a copy of the GNU General Public License
+// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
+//
+
 #include "Particle/ParticleInteractLayout.h"
 #include "Particle/ParticleBConds.h"
 #include "Particle/IpplParticleBase.h"
@@ -15,7 +26,6 @@
 #include "Message/Communicate.h"
 #include "Message/Message.h"
 
-
 #include <algorithm>
 
 /////////////////////////////////////////////////////////////////////
@@ -978,3 +988,11 @@ void ParticleInteractLayout<T,Dim,Mesh>::Repartition(UserList* userlist) {
     NeedGhostSwap = true;
   }
 }
+
+// vi: set et ts=4 sw=4 sts=4:
+// Local Variables:
+// mode:c
+// c-basic-offset: 4
+// indent-tabs-mode: nil
+// require-final-newline: nil
+// End: