From 61347a8571bd19748fa312495bed36b70e4f695b Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sun, 9 May 2021 14:34:47 +0200
Subject: [PATCH 01/58] initial tests with IWYU

---
 .../ComputeDiagFunctors/DivBFunctor.cpp       |  1 +
 .../ComputeDiagFunctors/DivEFunctor.cpp       |  1 +
 .../PartPerGridFunctor.cpp                    |  1 +
 Source/Diagnostics/FieldIO.H                  |  6 +++-
 Source/Diagnostics/FieldIO.cpp                |  1 -
 .../FlushFormats/FlushFormatAscent.cpp        |  2 +-
 .../ReducedDiags/LoadBalanceCosts.H           |  2 +-
 .../ReducedDiags/LoadBalanceEfficiency.H      |  2 --
 .../ReducedDiags/ParticleHistogram.H          |  3 +-
 Source/Diagnostics/SliceDiagnostic.H          |  3 --
 .../FiniteDifferenceSolver/ComputeDivE.cpp    | 17 ++++++++-
 .../FiniteDifferenceSolver/EvolveF.cpp        | 17 ++++++++-
 .../FiniteDifferenceSolver/EvolveG.cpp        | 17 ++++++++-
 .../FiniteDifferenceSolver.H                  |  5 +--
 .../FiniteDifferenceSolver.cpp                |  7 +++-
 .../SpectralSolver/SpectralSolver.H           |  6 ++++
 .../SpectralSolver/SpectralSolver.cpp         |  4 +--
 Source/Filter/BilinearFilter.cpp              | 13 ++++---
 Source/Utils/CoarsenIO.H                      | 11 ++++--
 Source/Utils/CoarsenIO.cpp                    | 12 +++++++
 Source/Utils/CoarsenMR.H                      | 11 ++++--
 Source/Utils/CoarsenMR.cpp                    | 10 ++++++
 Source/Utils/Interpolate.H                    |  7 ++--
 Source/Utils/Interpolate.cpp                  | 17 +++++++++
 Source/Utils/IntervalsParser.cpp              |  5 +++
 Source/Utils/MPIInitHelpers.H                 |  2 --
 Source/Utils/MPIInitHelpers.cpp               |  8 +++--
 Source/Utils/ParticleUtils.H                  |  2 ++
 Source/Utils/ParticleUtils.cpp                | 14 ++++++++
 Source/Utils/RelativeCellPosition.H           |  2 --
 Source/Utils/RelativeCellPosition.cpp         |  2 +-
 Source/Utils/WarpXAlgorithmSelection.H        |  1 +
 Source/Utils/WarpXAlgorithmSelection.cpp      |  5 ++-
 Source/Utils/WarpXMovingWindow.cpp            | 36 +++++++++++++++++--
 Source/Utils/WarpXProfilerWrapper.H           |  1 +
 Source/Utils/WarpXTagging.cpp                 | 13 +++++--
 Source/Utils/WarpXUtil.H                      |  5 ++-
 Source/Utils/WarpXUtil.cpp                    | 17 ++++++++-
 Source/WarpX.H                                | 17 +++++----
 Source/main.cpp                               | 10 +++++-
 40 files changed, 264 insertions(+), 52 deletions(-)

diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
index 512d801483a..196c781c061 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
@@ -1,3 +1,4 @@
+#include "WarpX.H"
 #include "DivBFunctor.H"
 #include "Utils/CoarsenIO.H"
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
index 6abdb893853..32714688f48 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
@@ -1,3 +1,4 @@
+#include "WarpX.H"
 #include "DivEFunctor.H"
 #include "Utils/CoarsenIO.H"
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
index f6be64f7309..becf593501b 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
@@ -1,3 +1,4 @@
+#include "WarpX.H"
 #include "PartPerGridFunctor.H"
 #include "Utils/CoarsenIO.H"
 
diff --git a/Source/Diagnostics/FieldIO.H b/Source/Diagnostics/FieldIO.H
index 6a868ef4ce1..2023a9ec726 100644
--- a/Source/Diagnostics/FieldIO.H
+++ b/Source/Diagnostics/FieldIO.H
@@ -8,7 +8,11 @@
 #ifndef WARPX_FielIO_H_
 #define WARPX_FielIO_H_
 
-#include <WarpX.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_IntVect.H>
+
 
 void
 AverageAndPackVectorField( amrex::MultiFab& mf_avg,
diff --git a/Source/Diagnostics/FieldIO.cpp b/Source/Diagnostics/FieldIO.cpp
index 01f0b329c5b..8e72ba45c3a 100644
--- a/Source/Diagnostics/FieldIO.cpp
+++ b/Source/Diagnostics/FieldIO.cpp
@@ -6,7 +6,6 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "FieldIO.H"
-#include "WarpX.H"
 #include "Utils/CoarsenIO.H"
 #include "Utils/WarpXUtil.H"
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp b/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp
index 15a67f036bd..fc5561a0f7d 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp
@@ -1,7 +1,7 @@
 #include "FlushFormatAscent.H"
-#include "WarpX.H"
 
 #include <AMReX.H>
+#include <AMReX_MultiFab.H>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.H b/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.H
index b02a6aa72ae..6209c12bee1 100644
--- a/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.H
+++ b/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.H
@@ -8,9 +8,9 @@
 #ifndef WARPX_DIAGNOSTICS_REDUCEDDIAGS_LOADBALANCECOSTS_H_
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_LOADBALANCECOSTS_H_
 
-#include "WarpX.H"
 #include "ReducedDiags.H"
 
+#include <AMReX_Vector.H>
 
 /**
  *  This class mainly contains a function that update the
diff --git a/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.H b/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.H
index db91c9822d7..33f7892f040 100644
--- a/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.H
+++ b/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.H
@@ -8,10 +8,8 @@
 #ifndef WARPX_DIAGNOSTICS_REDUCEDDIAGS_LOADBALANCEEFFICIENCY_H_
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_LOADBALANCEEFFICIENCY_H_
 
-#include "WarpX.H"
 #include "ReducedDiags.H"
 
-
 /**
  *  This class mainly contains a function that gets the
  *  current load balance efficiency for writing to output.
diff --git a/Source/Diagnostics/ReducedDiags/ParticleHistogram.H b/Source/Diagnostics/ReducedDiags/ParticleHistogram.H
index 3dfd04cc828..b22632b15c6 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleHistogram.H
+++ b/Source/Diagnostics/ReducedDiags/ParticleHistogram.H
@@ -9,8 +9,7 @@
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_PARTICLEHISTOGRAM_H_
 
 #include "ReducedDiags.H"
-#include "WarpX.H"
-#include <fstream>
+#include "Parser/WarpXParserWrapper.H"
 
 /**
  * Reduced diagnostics that computes a histogram over particles
diff --git a/Source/Diagnostics/SliceDiagnostic.H b/Source/Diagnostics/SliceDiagnostic.H
index 68a8c1f92c0..f6decdcbc3f 100644
--- a/Source/Diagnostics/SliceDiagnostic.H
+++ b/Source/Diagnostics/SliceDiagnostic.H
@@ -12,7 +12,6 @@
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_Geometry.H>
 
-#include <WarpX.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_IArrayBox.H>
 #include <AMReX_Vector.H>
@@ -20,8 +19,6 @@
 #include <AMReX_MultiFabUtil.H>
 #include <AMReX_MultiFabUtil_C.H>
 
-
-
 std::unique_ptr<amrex::MultiFab> CreateSlice( const amrex::MultiFab& mf,
                const amrex::Vector<amrex::Geometry> &dom_geom,
                amrex::RealBox &slice_realbox,
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
index bcc7c4460a1..1d18657c7d6 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
@@ -15,8 +15,23 @@
 #   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
 #include "Utils/WarpXConst.H"
-#include "WarpX.H"
+
 #include <AMReX_Gpu.H>
+#include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+
+#include <array>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
index 445b62fb61a..be16dea7765 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
@@ -15,8 +15,23 @@
 #   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
 #include "Utils/WarpXConst.H"
-#include "WarpX.H"
+
 #include <AMReX_Gpu.H>
+#include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+
+#include <array>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
index f69fb57c4b1..e3ba4528309 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
@@ -15,8 +15,23 @@
 #   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
 #include "Utils/WarpXConst.H"
-#include "WarpX.H"
+
 #include <AMReX_Gpu.H>
+#include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+
+#include <array>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
index 92812d4e01b..d1e50f71950 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
@@ -8,9 +8,10 @@
 #ifndef WARPX_FINITE_DIFFERENCE_SOLVER_H_
 #define WARPX_FINITE_DIFFERENCE_SOLVER_H_
 
-#include <AMReX_MultiFab.H>
-#include "MacroscopicProperties/MacroscopicProperties.H"
 #include "BoundaryConditions/PML.H"
+#include "MacroscopicProperties/MacroscopicProperties.H"
+
+#include <AMReX_MultiFab.H>
 
 /**
  * \brief Top-level class for the electromagnetic finite-difference solver
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
index 3a752ca4b6d..90c39173121 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
@@ -14,7 +14,12 @@
 #    include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
 #include "FiniteDifferenceSolver.H"
-#include "WarpX.H"
+
+#include <AMReX.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_Vector.H>
+#include <vector>
 
 /* This function initializes the stencil coefficients for the chosen finite-difference algorithm */
 FiniteDifferenceSolver::FiniteDifferenceSolver (
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.H b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
index d5c7725fe6d..295ebe9f650 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolver.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
@@ -10,6 +10,12 @@
 #include "SpectralAlgorithms/SpectralBaseAlgorithm.H"
 #include "SpectralFieldData.H"
 
+#include <AMReX_Array.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealVect.H>
+
+#include <array>
+#include <memory>
 
 #ifdef WARPX_USE_PSATD
 /**
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
index ae631ba6c78..6787817b962 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
@@ -9,9 +9,9 @@
 #include "SpectralAlgorithms/PsatdAlgorithm.H"
 #include "SpectralAlgorithms/PMLPsatdAlgorithm.H"
 #include "SpectralAlgorithms/ComovingPsatdAlgorithm.H"
-#include "WarpX.H"
+#include "FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H"
+#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #include "Utils/WarpXProfilerWrapper.H"
-#include "Utils/WarpXUtil.H"
 
 #include <memory>
 
diff --git a/Source/Filter/BilinearFilter.cpp b/Source/Filter/BilinearFilter.cpp
index 57360333477..bbf31335d41 100644
--- a/Source/Filter/BilinearFilter.cpp
+++ b/Source/Filter/BilinearFilter.cpp
@@ -6,14 +6,17 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "BilinearFilter.H"
-#include "WarpX.H"
+#include "Utils/WarpXProfilerWrapper.H"
 
+#include <AMReX_Dim3.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_Vector.H>
 #include <AMReX_REAL.H>
 
-#ifdef AMREX_USE_OMP
-#   include <omp.h>
-#endif
-
+#include <array>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Utils/CoarsenIO.H b/Source/Utils/CoarsenIO.H
index 63ffa1f623f..6114b81350d 100644
--- a/Source/Utils/CoarsenIO.H
+++ b/Source/Utils/CoarsenIO.H
@@ -1,8 +1,15 @@
 #ifndef WARPX_COARSEN_IO_H_
 #define WARPX_COARSEN_IO_H_
 
-#include "WarpX.H"
-#include <AMReX_Math.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_REAL.H>
+#include <AMReX_MultiFab.H>
+
+#include <cstdlib>
 
 namespace CoarsenIO{
 
diff --git a/Source/Utils/CoarsenIO.cpp b/Source/Utils/CoarsenIO.cpp
index b51419bbdcb..a2e27a250a1 100644
--- a/Source/Utils/CoarsenIO.cpp
+++ b/Source/Utils/CoarsenIO.cpp
@@ -1,5 +1,17 @@
 #include "CoarsenIO.H"
 
+#include <AMReX_BLProfiler.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+
 using namespace amrex;
 
 void
diff --git a/Source/Utils/CoarsenMR.H b/Source/Utils/CoarsenMR.H
index 0ece65a57cc..f165b46f0ca 100644
--- a/Source/Utils/CoarsenMR.H
+++ b/Source/Utils/CoarsenMR.H
@@ -1,8 +1,15 @@
 #ifndef WARPX_COARSEN_MR_H_
 #define WARPX_COARSEN_MR_H_
 
-#include "WarpX.H"
-#include <AMReX_Math.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_REAL.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_IntVect.H>
+
+#include <cstdlib>
 
 namespace CoarsenMR{
 
diff --git a/Source/Utils/CoarsenMR.cpp b/Source/Utils/CoarsenMR.cpp
index 4de504dab22..fce3b488b10 100644
--- a/Source/Utils/CoarsenMR.cpp
+++ b/Source/Utils/CoarsenMR.cpp
@@ -1,5 +1,15 @@
 #include "CoarsenMR.H"
 
+#include <AMReX_BLProfiler.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+
 using namespace amrex;
 
 void
diff --git a/Source/Utils/Interpolate.H b/Source/Utils/Interpolate.H
index ca69aa63ea5..5ec98f746a1 100644
--- a/Source/Utils/Interpolate.H
+++ b/Source/Utils/Interpolate.H
@@ -1,9 +1,12 @@
 #ifndef WARPX_INTERPOLATE_H_
 #define WARPX_INTERPOLATE_H_
 
-#include "WarpX.H"
+#include <AMReX_REAL.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_IntVect.H>
 
-#include<memory>
+#include <array>
+#include <memory>
 
 namespace Interpolate
 {
diff --git a/Source/Utils/Interpolate.cpp b/Source/Utils/Interpolate.cpp
index 72c80530b01..393872e9401 100644
--- a/Source/Utils/Interpolate.cpp
+++ b/Source/Utils/Interpolate.cpp
@@ -1,6 +1,23 @@
 #include "Interpolate.H"
 #include "Interpolate_K.H"
 
+#include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BCRec.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_Interpolater.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_SPACE.H>
+
 namespace Interpolate
 {
     using namespace amrex;
diff --git a/Source/Utils/IntervalsParser.cpp b/Source/Utils/IntervalsParser.cpp
index a98bf57a286..c79c8cf7a95 100644
--- a/Source/Utils/IntervalsParser.cpp
+++ b/Source/Utils/IntervalsParser.cpp
@@ -1,6 +1,11 @@
 #include "WarpXUtil.H"
 #include "IntervalsParser.H"
 
+#include <AMReX_Utility.H>
+
+#include <algorithm>
+#include <memory>
+
 SliceParser::SliceParser (const std::string& instr)
 {
     const std::string assert_msg = "ERROR: '" + instr + "' is not a valid syntax for a slice.";
diff --git a/Source/Utils/MPIInitHelpers.H b/Source/Utils/MPIInitHelpers.H
index 34d98bcb28f..7147ee0e17f 100644
--- a/Source/Utils/MPIInitHelpers.H
+++ b/Source/Utils/MPIInitHelpers.H
@@ -7,10 +7,8 @@
 #ifndef WARPX_MPI_INIT_HELPERS_H_
 #define WARPX_MPI_INIT_HELPERS_H_
 
-#include <string>
 #include <utility>
 
-
 namespace utils
 {
     /** Initialize MPI
diff --git a/Source/Utils/MPIInitHelpers.cpp b/Source/Utils/MPIInitHelpers.cpp
index e46127ee257..3611bb598f2 100644
--- a/Source/Utils/MPIInitHelpers.cpp
+++ b/Source/Utils/MPIInitHelpers.cpp
@@ -6,12 +6,16 @@
  */
 #include "MPIInitHelpers.H"
 
-#include <AMReX.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_Print.H>
+#include <AMReX_Config.H>
 
-#include <utility>
+#if defined(AMREX_USE_MPI)
+        #include <mpi.h>
+#endif
 
+#include <utility>
+#include <string>
 
 namespace utils
 {
diff --git a/Source/Utils/ParticleUtils.H b/Source/Utils/ParticleUtils.H
index cb25607a339..b076d3a38ef 100644
--- a/Source/Utils/ParticleUtils.H
+++ b/Source/Utils/ParticleUtils.H
@@ -8,7 +8,9 @@
 #define WARPX_PARTICLE_UTILS_H_
 
 #include "Particles/WarpXParticleContainer.H"
+
 #include <AMReX_DenseBins.H>
+#include <AMReX_Particles.H>
 
 namespace ParticleUtils {
 
diff --git a/Source/Utils/ParticleUtils.cpp b/Source/Utils/ParticleUtils.cpp
index 92c03bc306e..3986dfbda88 100644
--- a/Source/Utils/ParticleUtils.cpp
+++ b/Source/Utils/ParticleUtils.cpp
@@ -7,6 +7,20 @@
 #include "ParticleUtils.H"
 #include "WarpX.H"
 
+#include <AMReX_Algorithm.H>
+#include <AMReX_Array.H>
+#include <AMReX_Box.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParticleTile.H>
+#include <AMReX_REAL.H>
+#include <AMReX_SPACE.H>
+
 namespace ParticleUtils {
 
     using namespace amrex;
diff --git a/Source/Utils/RelativeCellPosition.H b/Source/Utils/RelativeCellPosition.H
index 15ec0670740..f31c0f48576 100644
--- a/Source/Utils/RelativeCellPosition.H
+++ b/Source/Utils/RelativeCellPosition.H
@@ -7,8 +7,6 @@
 #ifndef WARPX_RELATIVE_CELL_POSITION_H_
 #define WARPX_RELATIVE_CELL_POSITION_H_
 
-#include "WarpX.H"
-
 #include <AMReX_MultiFab.H>
 
 #include <vector>
diff --git a/Source/Utils/RelativeCellPosition.cpp b/Source/Utils/RelativeCellPosition.cpp
index 58c35fa52f1..01a0c68f3f6 100644
--- a/Source/Utils/RelativeCellPosition.cpp
+++ b/Source/Utils/RelativeCellPosition.cpp
@@ -7,7 +7,7 @@
 #include "RelativeCellPosition.H"
 
 #include <AMReX_IndexType.H>
-
+#include <AMReX_Config.H>
 
 std::vector< double >
 utils::getRelativeCellPosition(amrex::MultiFab const& mf)
diff --git a/Source/Utils/WarpXAlgorithmSelection.H b/Source/Utils/WarpXAlgorithmSelection.H
index bc8a653ab7c..4d4081d2005 100644
--- a/Source/Utils/WarpXAlgorithmSelection.H
+++ b/Source/Utils/WarpXAlgorithmSelection.H
@@ -9,6 +9,7 @@
 #define UTILS_WARPXALGORITHMSELECTION_H_
 
 #include <AMReX_ParmParse.H>
+
 #include <string>
 
 /**
diff --git a/Source/Utils/WarpXAlgorithmSelection.cpp b/Source/Utils/WarpXAlgorithmSelection.cpp
index 14d1bea6429..b457020e03c 100644
--- a/Source/Utils/WarpXAlgorithmSelection.cpp
+++ b/Source/Utils/WarpXAlgorithmSelection.cpp
@@ -9,10 +9,13 @@
 #include "WarpX.H"
 #include "WarpXAlgorithmSelection.H"
 
+#include <AMReX.H>
+
 #include <algorithm>
 #include <cstring>
 #include <map>
-
+#include <ctype.h>
+#include <utility>
 
 // Define dictionary with correspondance between user-input strings,
 // and corresponding integer for use inside the code
diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp
index 7a066993169..fb22fbb3c2e 100644
--- a/Source/Utils/WarpXMovingWindow.cpp
+++ b/Source/Utils/WarpXMovingWindow.cpp
@@ -6,11 +6,41 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "Parallelization/GuardCellManager.H"
 #include "WarpX.H"
-#include "Utils/WarpXUtil.H"
 #include "Utils/WarpXConst.H"
-
+#include "BoundaryConditions/PML.H"            // for PML
+#include "Parser/WarpXParserWrapper.H"         // for getParser, HostDeviceP...
+#include "Particles/MultiParticleContainer.H"  // for MultiParticleContainer
+#include "Utils/WarpXProfilerWrapper.H"        // for WARPX_PROFILE
+
+#include <AMReX_Array.H>                       // for Array, GpuArray
+#include <AMReX_Array4.H>                      // for Array4
+#include <AMReX_BLassert.H>                    // for AMREX_ALWAYS_ASSERT
+#include <AMReX_Box.H>                         // for Box, adjCellHi, adjCellLo
+#include <AMReX_BoxArray.H>                    // for BoxArray
+#include <AMReX_Config.H>                      // for AMREX_SPACEDIM, AMREX_...
+#include <AMReX_Dim3.H>                        // for Dim3
+#include <AMReX_FArrayBox.H>                   // for FArrayBox
+#include <AMReX_FabArray.H>                    // for FabArray
+#include <AMReX_Geometry.H>                    // for Geometry
+#include <AMReX_GpuControl.H>                  // for notInLaunchRegion
+#include <AMReX_GpuLaunch.H>                   // for AMREX_PARALLEL_FOR_4D
+#include <AMReX_GpuLaunchFunctsC.H>            // for ParallelFor
+#include <AMReX_GpuQualifiers.H>               // for AMREX_GPU_DEVICE
+#include <AMReX_INT.H>                         // for amrex
+#include <AMReX_IndexType.H>                   // for IndexType
+#include <AMReX_IntVect.H>                     // for IntVect
+#include <AMReX_MFIter.H>                      // for MFIter
+#include <AMReX_MultiFab.H>                    // for MultiFab
+#include <AMReX_REAL.H>                        // for Real
+#include <AMReX_RealBox.H>                     // for RealBox
+#include <AMReX_SPACE.H>                       // for AMREX_D_DECL
+#include <AMReX_Vector.H>                      // for Vector
+
+#include <cmath>
+#include <array>                               // for array
+#include <memory>                              // for allocator, unique_ptr
+#include <string>                              // for operator==, basic_string
 
 using namespace amrex;
 
diff --git a/Source/Utils/WarpXProfilerWrapper.H b/Source/Utils/WarpXProfilerWrapper.H
index f05aa2faee8..5e07794a1bf 100644
--- a/Source/Utils/WarpXProfilerWrapper.H
+++ b/Source/Utils/WarpXProfilerWrapper.H
@@ -10,6 +10,7 @@
 
 #include <AMReX_BLProfiler.H>
 #include <AMReX_GpuDevice.H>
+#include <WarpX.H>
 
 AMREX_FORCE_INLINE
 void doDeviceSynchronize(int do_device_synchronize)
diff --git a/Source/Utils/WarpXTagging.cpp b/Source/Utils/WarpXTagging.cpp
index 739ed0d5334..5079669793c 100644
--- a/Source/Utils/WarpXTagging.cpp
+++ b/Source/Utils/WarpXTagging.cpp
@@ -8,8 +8,17 @@
 
 #include <WarpX.H>
 #include <AMReX_BoxIterator.H>
-#include <array>
-#include <algorithm>
+#include <AMReX_BaseFab.H>
+#include <AMReX_Config.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealVect.H>
+#include <AMReX_SPACE.H>
+#include <AMReX_TagBox.H>
 
 using namespace amrex;
 
diff --git a/Source/Utils/WarpXUtil.H b/Source/Utils/WarpXUtil.H
index 057b3193c0a..a504b261158 100644
--- a/Source/Utils/WarpXUtil.H
+++ b/Source/Utils/WarpXUtil.H
@@ -15,10 +15,13 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_Utility.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_Extension.H>
 
 #include <cstdint>
 #include <string>
-
+#include <cstddef>
+#include <vector>
 
 void ReadBoostedFrameParameters(amrex::Real& gamma_boost, amrex::Real& beta_boost,
                                 amrex::Vector<int>& boost_direction);
diff --git a/Source/Utils/WarpXUtil.cpp b/Source/Utils/WarpXUtil.cpp
index 32931dba2f8..6a02d43d299 100644
--- a/Source/Utils/WarpXUtil.cpp
+++ b/Source/Utils/WarpXUtil.cpp
@@ -9,14 +9,29 @@
 #include "WarpXAlgorithmSelection.H"
 #include "WarpXConst.H"
 #include "WarpXUtil.H"
+#include "WarpXProfilerWrapper.H"
 
 #include <AMReX_ParmParse.H>
+#include <AMReX.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
 
 #include <cmath>
 #include <fstream>
 #include <set>
 #include <string>
-
+#include <cstring>
+#include <algorithm>
+#include <array>
 
 using namespace amrex;
 
diff --git a/Source/WarpX.H b/Source/WarpX.H
index 8663fd9c476..b0ce9ceb824 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -44,22 +44,27 @@
 
 #include <AMReX_AmrCore.H>
 #include <AMReX_BLProfiler.H>
-#include <AMReX_Print.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_RealVect.H>
 #include <AMReX_iMultiFab.H>
 #include <AMReX_VisMF.H>
 #include <AMReX_LayoutData.H>
-#include <AMReX_Interpolater.H>
 #include <AMReX_FillPatchUtil.H>
-
-#ifdef AMREX_USE_OMP
-#   include <omp.h>
-#endif
+#include <AMReX.H>
+#include <AMReX_Array.H>
+#include <AMReX_Config.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_Vector.H>
 
 #include <iostream>
 #include <memory>
 #include <array>
+#include <limits>
+#include <string>
+#include <vector>
 
 enum struct PatchType : int
 {
diff --git a/Source/main.cpp b/Source/main.cpp
index 477a0d495a7..b0971213da8 100644
--- a/Source/main.cpp
+++ b/Source/main.cpp
@@ -13,8 +13,16 @@
 #include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX.H>
-#include <AMReX_BLProfiler.H>
 #include <AMReX_ParallelDescriptor.H>
+#include <AMReX_Config.H>
+#include <AMReX_Print.H>
+#include <AMReX_REAL.H>
+#include <AMReX_TinyProfiler.H>
+#include <AMReX_Utility.H>
+
+#if defined(AMREX_USE_MPI)
+    #include <mpi.h>
+#endif
 
 #if defined(AMREX_USE_HIP) && defined(WARPX_USE_PSATD)
 #include <rocfft.h>

From ce3e39ce7e76f36491c2a489b3915eca11fa74f1 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Mon, 10 May 2021 09:51:05 +0200
Subject: [PATCH 02/58] added a couple of forward declarations

---
 Source/BoundaryConditions/PML.H                               | 4 +++-
 .../FiniteDifferenceSolver/FiniteDifferenceSolver.H           | 2 ++
 Source/WarpX.H                                                | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Source/BoundaryConditions/PML.H b/Source/BoundaryConditions/PML.H
index 9f07032ea06..a2c2072b6c6 100644
--- a/Source/BoundaryConditions/PML.H
+++ b/Source/BoundaryConditions/PML.H
@@ -9,6 +9,9 @@
 #ifndef WARPX_PML_H_
 #define WARPX_PML_H_
 
+class MultiSigmaBox; /*Forward declaration*/
+class PML;           /*Forward declaration*/
+
 #include "Utils/WarpXProfilerWrapper.H"
 
 #ifdef WARPX_USE_PSATD
@@ -20,7 +23,6 @@
 
 #include <array>
 
-
 struct Sigma : amrex::Gpu::DeviceVector<amrex::Real>
 {
     int lo() const { return m_lo; }
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
index d1e50f71950..1592cd56e26 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
@@ -8,6 +8,8 @@
 #ifndef WARPX_FINITE_DIFFERENCE_SOLVER_H_
 #define WARPX_FINITE_DIFFERENCE_SOLVER_H_
 
+class FiniteDifferenceSolver; /*Forward declaration*/
+
 #include "BoundaryConditions/PML.H"
 #include "MacroscopicProperties/MacroscopicProperties.H"
 
diff --git a/Source/WarpX.H b/Source/WarpX.H
index b0ce9ceb824..35c819906d0 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -12,9 +12,9 @@
 #ifndef WARPX_H_
 #define WARPX_H_
 
+#include "BoundaryConditions/PML.H"
 #include "Evolve/WarpXDtType.H"
 #include "Particles/MultiParticleContainer.H"
-#include "BoundaryConditions/PML.H"
 #include "Diagnostics/BackTransformedDiagnostic.H"
 #include "Diagnostics/MultiDiagnostics.H"
 #include "Filter/BilinearFilter.H"

From 523006cfeece179e8b48c1d909aceb1cda5dc6dc Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Mon, 10 May 2021 10:41:37 +0200
Subject: [PATCH 03/58] used iwyu on more files

---
 Source/BoundaryConditions/PML.H              | 15 +++++++--
 Source/BoundaryConditions/WarpXEvolvePML.cpp | 25 +++++++++++----
 Source/Diagnostics/Diagnostics.H             |  7 ++++-
 Source/Diagnostics/Diagnostics.cpp           | 24 ++++++++++++---
 Source/Diagnostics/FieldIO.H                 |  4 +++
 Source/Diagnostics/FieldIO.cpp               |  8 ++++-
 Source/Diagnostics/FullDiagnostics.H         |  3 ++
 Source/Diagnostics/FullDiagnostics.cpp       | 32 +++++++++++++++-----
 Source/Diagnostics/MultiDiagnostics.H        |  7 +++--
 Source/Diagnostics/MultiDiagnostics.cpp      |  8 +++++
 10 files changed, 109 insertions(+), 24 deletions(-)

diff --git a/Source/BoundaryConditions/PML.H b/Source/BoundaryConditions/PML.H
index a2c2072b6c6..651ee8c70c0 100644
--- a/Source/BoundaryConditions/PML.H
+++ b/Source/BoundaryConditions/PML.H
@@ -12,16 +12,27 @@
 class MultiSigmaBox; /*Forward declaration*/
 class PML;           /*Forward declaration*/
 
-#include "Utils/WarpXProfilerWrapper.H"
-
 #ifdef WARPX_USE_PSATD
 #   include "FieldSolver/SpectralSolver/SpectralSolver.H"
 #endif
+#include <Utils/WarpXProfilerWrapper.H>
 
 #include <AMReX_MultiFab.H>
 #include <AMReX_Geometry.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_FabFactory.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
 
 #include <array>
+#include <memory>
+#include <string>
+#include <vector>
 
 struct Sigma : amrex::Gpu::DeviceVector<amrex::Real>
 {
diff --git a/Source/BoundaryConditions/WarpXEvolvePML.cpp b/Source/BoundaryConditions/WarpXEvolvePML.cpp
index 4f0c1eb810d..169ce83011f 100644
--- a/Source/BoundaryConditions/WarpXEvolvePML.cpp
+++ b/Source/BoundaryConditions/WarpXEvolvePML.cpp
@@ -6,18 +6,31 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
-#include "Utils/WarpXConst.H"
 #include "WarpX_PML_kernels.H"
-
+#include "BoundaryConditions/PML.H"
+#include "Utils/WarpXProfilerWrapper.H"
 #include "PML_current.H"
 
 #ifdef BL_USE_SENSEI_INSITU
 #   include <AMReX_AmrMeshInSituBridge.H>
 #endif
-
-#include <cmath>
-#include <limits>
-
+#include <AMReX_Array4.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_INT.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
+
+#include <array>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/Diagnostics.H b/Source/Diagnostics/Diagnostics.H
index 561da5ed38b..e5a878e636e 100644
--- a/Source/Diagnostics/Diagnostics.H
+++ b/Source/Diagnostics/Diagnostics.H
@@ -4,10 +4,15 @@
 #include "FlushFormats/FlushFormat.H"
 #include "ComputeDiagFunctors/ComputeDiagFunctor.H"
 #include "ParticleDiag/ParticleDiag.H"
-#include "Utils/IntervalsParser.H"
+
 #include <AMReX_Vector.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Geometry.H>
 
+#include <string>
+#include <vector>
 #include <memory>
 
 /**
diff --git a/Source/Diagnostics/Diagnostics.cpp b/Source/Diagnostics/Diagnostics.cpp
index 1e305d0fcd5..f5bd0bdf493 100644
--- a/Source/Diagnostics/Diagnostics.cpp
+++ b/Source/Diagnostics/Diagnostics.cpp
@@ -1,20 +1,34 @@
 #include "Diagnostics.H"
-#include "ComputeDiagFunctors/CellCenterFunctor.H"
-#include "ComputeDiagFunctors/PartPerCellFunctor.H"
-#include "ComputeDiagFunctors/PartPerGridFunctor.H"
-#include "ComputeDiagFunctors/DivBFunctor.H"
-#include "ComputeDiagFunctors/DivEFunctor.H"
+
 #include "FlushFormats/FlushFormatPlotfile.H"
 #include "FlushFormats/FlushFormatCheckpoint.H"
 #include "FlushFormats/FlushFormatAscent.H"
 #include "FlushFormats/FlushFormatSensei.H"
+#include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
+#include "Diagnostics/FlushFormats/FlushFormat.H"
+#include "Diagnostics/ParticleDiag/ParticleDiag.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXProfilerWrapper.H"
 #ifdef WARPX_USE_OPENPMD
 #   include "FlushFormats/FlushFormatOpenPMD.H"
 #endif
 #include "WarpX.H"
 #include "Utils/WarpXUtil.H"
+
 #include <AMReX_Vector.H>
+#include <AMReX.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Config.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Print.H>
+
 #include <string>
+#include <algorithm>
+
 using namespace amrex::literals;
 
 Diagnostics::Diagnostics (int i, std::string name)
diff --git a/Source/Diagnostics/FieldIO.H b/Source/Diagnostics/FieldIO.H
index 2023a9ec726..4985020957d 100644
--- a/Source/Diagnostics/FieldIO.H
+++ b/Source/Diagnostics/FieldIO.H
@@ -13,6 +13,10 @@
 #include <AMReX_REAL.H>
 #include <AMReX_IntVect.H>
 
+#include <cstdint>
+#include <array>
+#include <memory>
+#include <vector>
 
 void
 AverageAndPackVectorField( amrex::MultiFab& mf_avg,
diff --git a/Source/Diagnostics/FieldIO.cpp b/Source/Diagnostics/FieldIO.cpp
index 8e72ba45c3a..a9603b734be 100644
--- a/Source/Diagnostics/FieldIO.cpp
+++ b/Source/Diagnostics/FieldIO.cpp
@@ -7,7 +7,6 @@
  */
 #include "FieldIO.H"
 #include "Utils/CoarsenIO.H"
-#include "Utils/WarpXUtil.H"
 
 #ifdef WARPX_USE_PSATD
 #   include "FieldSolver/SpectralSolver/SpectralSolver.H"
@@ -18,8 +17,15 @@
 #endif
 
 #include <AMReX.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_SPACE.H>
+#include <AMReX_ccse-mpi.H>
+#include <AMReX_DistributionMapping.H>
 
 #include <memory>
+#include <algorithm>
+#include <cstdint>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/FullDiagnostics.H b/Source/Diagnostics/FullDiagnostics.H
index 367acbfe8f2..05272a127f3 100644
--- a/Source/Diagnostics/FullDiagnostics.H
+++ b/Source/Diagnostics/FullDiagnostics.H
@@ -2,6 +2,9 @@
 #define WARPX_FULLDIAGNOSTICS_H_
 
 #include "Diagnostics.H"
+#include "Utils/IntervalsParser.H"
+
+#include <string>
 
 class
 FullDiagnostics final : public Diagnostics
diff --git a/Source/Diagnostics/FullDiagnostics.cpp b/Source/Diagnostics/FullDiagnostics.cpp
index 9fe54c09427..c3efae32554 100644
--- a/Source/Diagnostics/FullDiagnostics.cpp
+++ b/Source/Diagnostics/FullDiagnostics.cpp
@@ -1,6 +1,10 @@
 #include "FullDiagnostics.H"
+
 #include "WarpX.H"
-#include "ComputeDiagFunctors/ComputeDiagFunctor.H"
+#include "Diagnostics/Diagnostics.H"
+#include "Diagnostics/ParticleDiag/ParticleDiag.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 #include "ComputeDiagFunctors/CellCenterFunctor.H"
 #include "ComputeDiagFunctors/PartPerCellFunctor.H"
 #include "ComputeDiagFunctors/PartPerGridFunctor.H"
@@ -8,15 +12,29 @@
 #include "ComputeDiagFunctors/DivEFunctor.H"
 #include "ComputeDiagFunctors/RhoFunctor.H"
 #include "FlushFormats/FlushFormat.H"
-#include "FlushFormats/FlushFormatPlotfile.H"
-#include "FlushFormats/FlushFormatCheckpoint.H"
-#include "FlushFormats/FlushFormatAscent.H"
-#ifdef WARPX_USE_OPENPMD
-#    include "FlushFormats/FlushFormatOpenPMD.H"
-#endif
+
 #include <AMReX.H>
 #include <AMReX_Vector.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_Array.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_CoordSys.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MakeType.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+
+#include <cmath>
+#include <algorithm>
+#include <memory>
+#include <vector>
+
 using namespace amrex::literals;
 
 FullDiagnostics::FullDiagnostics (int i, std::string name)
diff --git a/Source/Diagnostics/MultiDiagnostics.H b/Source/Diagnostics/MultiDiagnostics.H
index f59dea7dde4..491460eea19 100644
--- a/Source/Diagnostics/MultiDiagnostics.H
+++ b/Source/Diagnostics/MultiDiagnostics.H
@@ -1,9 +1,12 @@
 #ifndef WARPX_MULTIDIAGNOSTICS_H_
 #define WARPX_MULTIDIAGNOSTICS_H_
 
-#include "FullDiagnostics.H"
-#include "BTDiagnostics.H"
+#include "Diagnostics/Diagnostics.H"
 
+#include <AMReX_Vector.H>
+
+#include <string>
+#include <vector>
 #include <memory>
 
 /** All types of diagnostics. */
diff --git a/Source/Diagnostics/MultiDiagnostics.cpp b/Source/Diagnostics/MultiDiagnostics.cpp
index 0e873830a6c..f2b412eb85b 100644
--- a/Source/Diagnostics/MultiDiagnostics.cpp
+++ b/Source/Diagnostics/MultiDiagnostics.cpp
@@ -1,5 +1,13 @@
 #include "MultiDiagnostics.H"
+
+#include "Diagnostics/BTDiagnostics.H"
+#include "Diagnostics/FullDiagnostics.H"
+
 #include <AMReX_ParmParse.H>
+#include <AMReX.H>
+#include <AMReX_REAL.H>
+
+#include <algorithm>
 
 using namespace amrex;
 

From 3e39b87618cd367cdb1a64946add71862e10e60e Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 11 May 2021 03:24:47 +0200
Subject: [PATCH 04/58] progress

---
 Source/BoundaryConditions/PML.cpp             | 33 +++++++++++++----
 Source/BoundaryConditions/WarpXEvolvePML.cpp  |  2 +-
 .../Diagnostics/BackTransformedDiagnostic.H   | 14 +++++---
 .../Diagnostics/BackTransformedDiagnostic.cpp | 36 ++++++++++++++++---
 .../FlushFormats/FlushFormatCheckpoint.cpp    |  2 ++
 .../FlushFormats/FlushFormatPlotfile.cpp      |  2 ++
 Source/WarpX.cpp                              | 33 +++++++++++++----
 7 files changed, 98 insertions(+), 24 deletions(-)

diff --git a/Source/BoundaryConditions/PML.cpp b/Source/BoundaryConditions/PML.cpp
index cb7fb7075bd..7f4f0dfebc3 100644
--- a/Source/BoundaryConditions/PML.cpp
+++ b/Source/BoundaryConditions/PML.cpp
@@ -6,23 +6,42 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "PML.H"
+
+#include "WarpX.H"
 #include "BoundaryConditions/PML.H"
 #include "BoundaryConditions/PMLComponent.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "WarpX.H"
+#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+#include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX.H>
-#include <AMReX_Print.H>
 #include <AMReX_VisMF.H>
-
-#ifdef AMREX_USE_OMP
-#   include <omp.h>
-#endif
+#include <AMReX_Algorithm.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxList.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FBI.H>
+#include <AMReX_FabArrayBase.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_RealVect.H>
+#include <AMReX_SPACE.H>
+#include <AMReX_ccse-mpi.H>
 
 #include <algorithm>
 #include <memory>
-
+#include <cmath>
+#include <utility>
 
 using namespace amrex;
 
diff --git a/Source/BoundaryConditions/WarpXEvolvePML.cpp b/Source/BoundaryConditions/WarpXEvolvePML.cpp
index 169ce83011f..800979be2ad 100644
--- a/Source/BoundaryConditions/WarpXEvolvePML.cpp
+++ b/Source/BoundaryConditions/WarpXEvolvePML.cpp
@@ -21,13 +21,13 @@
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuLaunchFunctsC.H>
 #include <AMReX_GpuQualifiers.H>
-#include <AMReX_INT.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
+#include <AMReX_ccse-mpi.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/Diagnostics/BackTransformedDiagnostic.H b/Source/Diagnostics/BackTransformedDiagnostic.H
index 96dbb948318..f3757b60e49 100644
--- a/Source/Diagnostics/BackTransformedDiagnostic.H
+++ b/Source/Diagnostics/BackTransformedDiagnostic.H
@@ -8,17 +8,21 @@
 #ifndef WARPX_BackTransformedDiagnostic_H_
 #define WARPX_BackTransformedDiagnostic_H_
 
+#include "Particles/WarpXParticleContainer.H"
 #include "Particles/MultiParticleContainer.H"
-#include "Utils/WarpXConst.H"
 
+#include <AMReX_Box.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_Vector.H>
 #include <AMReX_Geometry.H>
-#include <AMReX_ParallelDescriptor.H>
-#include <AMReX_PlotFileUtil.H>
-#include <AMReX_VisMF.H>
 
 #include <map>
 #include <vector>
-
+#include <memory>
+#include <string>
 
 /** \brief
  * The capability for back-transformed lab-frame data is implemented to generate
diff --git a/Source/Diagnostics/BackTransformedDiagnostic.cpp b/Source/Diagnostics/BackTransformedDiagnostic.cpp
index a628ca4e431..dd428987072 100644
--- a/Source/Diagnostics/BackTransformedDiagnostic.cpp
+++ b/Source/Diagnostics/BackTransformedDiagnostic.cpp
@@ -5,14 +5,42 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include <AMReX_MultiFabUtil.H>
-#include <AMReX_MultiFabUtil_C.H>
-
 #include "BackTransformedDiagnostic.H"
-#include "SliceDiagnostic.H"
+
+#include "Utils/WarpXConst.H"
+#include "Utils/WarpXProfilerWrapper.H"
 #include "WarpX.H"
 
+#include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_Extension.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_PlotFileUtil.H>
+#include <AMReX_SPACE.H>
+#include <AMReX_Scan.H>
+#include <AMReX_StructOfArrays.H>
+#include <AMReX_Utility.H>
+#include <AMReX_VectorIO.H>
+#include <AMReX_VisMF.H>
+#include <AMReX_MultiFabUtil.H>
+
 #include <memory>
+#include <cmath>
+#include <algorithm>
+#include <fstream>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
index 9a570ce3254..400caab3e42 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
@@ -1,8 +1,10 @@
 #include "FlushFormatCheckpoint.H"
+
 #include "WarpX.H"
 #include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX_buildInfo.H>
+#include <AMReX_PlotFileUtil.H>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
index 28bf7e23b71..239fe016548 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
@@ -1,10 +1,12 @@
 #include "FlushFormatPlotfile.H"
+
 #include "WarpX.H"
 #include "Utils/Interpolate.H"
 #include "Particles/Filter/FilterFunctors.H"
 
 #include <AMReX_AmrParticles.H>
 #include <AMReX_buildInfo.H>
+#include <AMReX_PlotFileUtil.H>
 
 using namespace amrex;
 
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index 2629da00aad..d02deccc2d7 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -10,6 +10,7 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
+
 #include "FieldSolver/WarpX_FDTD.H"
 #ifdef WARPX_USE_PSATD
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
@@ -18,25 +19,43 @@
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX_ParmParse.H>
 #include <AMReX_MultiFabUtil.H>
+#include <AMReX_Array4.H>
 #ifdef BL_USE_SENSEI_INSITU
 #   include <AMReX_AmrMeshInSituBridge.H>
 #endif
-
-#ifdef AMREX_USE_OMP
-#   include <omp.h>
-#endif
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_EBSupport.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_FabFactory.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IArrayBox.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MakeType.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_Print.H>
+#include <AMReX_Random.H>
+#include <AMReX_SPACE.H>
+#include <AMReX_ccse-mpi.H>
+#include <AMReX_iMultiFab.H>
 
 #include <algorithm>
-#include <cctype>
 #include <cmath>
 #include <limits>
-#include <numeric>
 #include <string>
 #include <utility>
+#include <random>
 
 using namespace amrex;
 

From 397e6128c8a41b03c055f92c8a4a1fe8581d1590 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 11 May 2021 10:59:41 +0200
Subject: [PATCH 05/58] used iwyu on more files

---
 Source/Diagnostics/BTD_Plotfile_Header_Impl.H |  9 ++++--
 .../Diagnostics/BTD_Plotfile_Header_Impl.cpp  | 11 ++++---
 Source/Diagnostics/BTDiagnostics.H            | 14 +++++++++
 Source/Diagnostics/BTDiagnostics.cpp          | 22 ++++++++++++--
 .../ComputeDiagFunctors/CellCenterFunctor.cpp |  3 ++
 .../ComputeDiagFunctors/DivBFunctor.H         |  2 ++
 .../ComputeDiagFunctors/DivBFunctor.cpp       |  3 +-
 .../ComputeDiagFunctors/DivEFunctor.H         |  2 ++
 .../ComputeDiagFunctors/DivEFunctor.cpp       |  6 +++-
 .../PartPerCellFunctor.cpp                    |  8 +++++
 .../PartPerGridFunctor.cpp                    | 19 +++++++++++-
 .../ComputeDiagFunctors/RhoFunctor.cpp        | 13 +++++++--
 Source/Diagnostics/Diagnostics.H              |  2 +-
 Source/Diagnostics/FieldIO.cpp                |  9 +-----
 Source/Diagnostics/ParticleIO.cpp             | 25 +++++++++++++++-
 Source/Diagnostics/SliceDiagnostic.H          |  7 ++---
 Source/Diagnostics/SliceDiagnostic.cpp        | 26 +++++++++++++++--
 Source/Diagnostics/WarpXIO.cpp                | 29 +++++++++++++------
 Source/Diagnostics/WarpXOpenPMD.H             |  9 +++---
 Source/Diagnostics/WarpXOpenPMD.cpp           | 27 ++++++++++++++---
 20 files changed, 196 insertions(+), 50 deletions(-)

diff --git a/Source/Diagnostics/BTD_Plotfile_Header_Impl.H b/Source/Diagnostics/BTD_Plotfile_Header_Impl.H
index 78bfcb66d5f..c2ddf1f283a 100644
--- a/Source/Diagnostics/BTD_Plotfile_Header_Impl.H
+++ b/Source/Diagnostics/BTD_Plotfile_Header_Impl.H
@@ -1,10 +1,15 @@
 #ifndef BTD_PLOTFILE_HEADER_IMPL_H
 #define BTD_PLOTFILE_HEADER_IMPL_H
 
-#include <string>
 #include <AMReX_Vector.H>
-#include <AMReX_MultiFab.H>
+#include <AMReX_Array.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_REAL.H>
+#include <AMReX_SPACE.H>
 
+#include <string>
 
 /**
  * \brief Class to read, modify, and write plotfile header when
diff --git a/Source/Diagnostics/BTD_Plotfile_Header_Impl.cpp b/Source/Diagnostics/BTD_Plotfile_Header_Impl.cpp
index 90a0c8317cd..de7bdf89b53 100644
--- a/Source/Diagnostics/BTD_Plotfile_Header_Impl.cpp
+++ b/Source/Diagnostics/BTD_Plotfile_Header_Impl.cpp
@@ -1,14 +1,17 @@
 #include "BTD_Plotfile_Header_Impl.H"
+
 #include "WarpX.H"
 
-#include <AMReX_ParallelDescriptor.H>
-#include <AMReX_PlotFileUtil.H>
 #include <AMReX_FileSystem.H>
 #include <AMReX_INT.H>
-#include <memory>
+#include <AMReX.H>
+#include <AMReX_Print.H>
+#include <AMReX_Utility.H>
 
-using namespace amrex::literals;
+#include <array>
+#include <istream>
 
+using namespace amrex::literals;
 
 BTDPlotfileHeaderImpl::BTDPlotfileHeaderImpl (std::string const & Headerfile_path)
     : m_Header_path(Headerfile_path)
diff --git a/Source/Diagnostics/BTDiagnostics.H b/Source/Diagnostics/BTDiagnostics.H
index 8f513acfc78..54d2388c8e8 100644
--- a/Source/Diagnostics/BTDiagnostics.H
+++ b/Source/Diagnostics/BTDiagnostics.H
@@ -2,6 +2,20 @@
 #define WARPX_BTDIAGNOSTICS_H_
 
 #include "Diagnostics.H"
+#include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
+#include "Utils/WarpXConst.H"
+
+#include <AMReX_Box.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_Vector.H>
+
+#include <limits>
+#include <memory>
+#include <string>
 
 class
 BTDiagnostics final : public Diagnostics
diff --git a/Source/Diagnostics/BTDiagnostics.cpp b/Source/Diagnostics/BTDiagnostics.cpp
index 234079a2080..b36b57b2a0c 100644
--- a/Source/Diagnostics/BTDiagnostics.cpp
+++ b/Source/Diagnostics/BTDiagnostics.cpp
@@ -1,4 +1,5 @@
 #include "BTDiagnostics.H"
+
 #include "BTD_Plotfile_Header_Impl.H"
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
@@ -7,13 +8,28 @@
 #include "ComputeDiagFunctors/BackTransformFunctor.H"
 #include "ComputeDiagFunctors/RhoFunctor.H"
 #include "Utils/CoarsenIO.H"
-
+#include "Diagnostics/Diagnostics.H"
+#include "Diagnostics/FlushFormats/FlushFormat.H"
+#include "Utils/WarpXUtil.H"
 
 #include <AMReX_ParallelDescriptor.H>
-#include <AMReX_PlotFileUtil.H>
-#include <AMReX_VisMF.H>
+#include <AMReX.H>
+#include <AMReX_Algorithm.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_CoordSys.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_FileSystem.H>
+#include <AMReX_ParallelContext.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Utility.H>
 
 #include <memory>
+#include <cmath>
+#include <algorithm>
+#include <cstdio>
+#include <vector>
 
 using namespace amrex::literals;
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.cpp
index 7a139f379c5..7da657de245 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.cpp
@@ -1,7 +1,10 @@
 #include "CellCenterFunctor.H"
+
 #include "Utils/CoarsenIO.H"
 
 #include <AMReX.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
 
 CellCenterFunctor::CellCenterFunctor(amrex::MultiFab const * mf_src, int lev,
                                      amrex::IntVect crse_ratio,
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H
index 52b9a1dbd05..95bb6b6689f 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H
@@ -3,6 +3,8 @@
 
 #include "ComputeDiagFunctor.H"
 
+#include <array>
+
 /**
  * \brief Functor to compute divB into mf_out.
  */
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
index 196c781c061..d5fb9885de1 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
@@ -1,5 +1,6 @@
-#include "WarpX.H"
 #include "DivBFunctor.H"
+
+#include "WarpX.H"
 #include "Utils/CoarsenIO.H"
 
 DivBFunctor::DivBFunctor(const std::array<const amrex::MultiFab* const, 3> arr_mf_src, const int lev, const amrex::IntVect crse_ratio, const int ncomp)
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H
index 503737f84e9..a352682417d 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H
@@ -3,6 +3,8 @@
 
 #include "ComputeDiagFunctor.H"
 
+#include <array>
+
 /**
  * \brief Functor to compute divE into mf_out.
  */
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
index 32714688f48..6e1b2d75d63 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
@@ -1,8 +1,12 @@
-#include "WarpX.H"
 #include "DivEFunctor.H"
+
+#include "WarpX.H"
 #include "Utils/CoarsenIO.H"
 
 #include <AMReX.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
 
 DivEFunctor::DivEFunctor(const std::array<const amrex::MultiFab* const, 3> arr_mf_src, const int lev,
                          const amrex::IntVect crse_ratio,
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
index 31acacc9bce..8c5479640ea 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
@@ -1,6 +1,14 @@
 #include "PartPerCellFunctor.H"
+
 #include "WarpX.H"
 #include "Utils/CoarsenIO.H"
+#include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
+#include "Particles/MultiParticleContainer.H"
+
+#include <AMReX_BLassert.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
 
 using namespace amrex::literals;
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
index becf593501b..c4552d81e8a 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
@@ -1,6 +1,23 @@
-#include "WarpX.H"
 #include "PartPerGridFunctor.H"
+
+#include "WarpX.H"
 #include "Utils/CoarsenIO.H"
+#include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
+#include "Particles/MultiParticleContainer.H"
+
+#include <AMReX_BLassert.H>
+#include <AMReX_Config.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_INT.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
+
+#include <memory>
 
 PartPerGridFunctor::PartPerGridFunctor(const amrex::MultiFab * const mf_src, const int lev, const amrex::IntVect crse_ratio, const int ncomp)
     : ComputeDiagFunctor(ncomp, crse_ratio), m_lev(lev)
diff --git a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
index a87b797e958..21fa160d1f3 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
@@ -1,12 +1,19 @@
-#include "WarpX.H"
 #include "RhoFunctor.H"
-#include "Utils/CoarsenIO.H"
 
+#include "WarpX.H"
+#include "Utils/CoarsenIO.H"
+#include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
 #if (defined WARPX_DIM_RZ) && (defined WARPX_USE_PSATD)
-#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+    #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #endif
 
 #include <AMReX.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+
+#include <memory>
 
 RhoFunctor::RhoFunctor (const int lev,
                         const amrex::IntVect crse_ratio,
diff --git a/Source/Diagnostics/Diagnostics.H b/Source/Diagnostics/Diagnostics.H
index e5a878e636e..6badc364d82 100644
--- a/Source/Diagnostics/Diagnostics.H
+++ b/Source/Diagnostics/Diagnostics.H
@@ -1,9 +1,9 @@
 #ifndef WARPX_DIAGNOSTICS_H_
 #define WARPX_DIAGNOSTICS_H_
 
+#include "ParticleDiag/ParticleDiag.H"
 #include "FlushFormats/FlushFormat.H"
 #include "ComputeDiagFunctors/ComputeDiagFunctor.H"
-#include "ParticleDiag/ParticleDiag.H"
 
 #include <AMReX_Vector.H>
 #include <AMReX_MultiFab.H>
diff --git a/Source/Diagnostics/FieldIO.cpp b/Source/Diagnostics/FieldIO.cpp
index a9603b734be..e11af41c17e 100644
--- a/Source/Diagnostics/FieldIO.cpp
+++ b/Source/Diagnostics/FieldIO.cpp
@@ -6,15 +6,8 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "FieldIO.H"
-#include "Utils/CoarsenIO.H"
-
-#ifdef WARPX_USE_PSATD
-#   include "FieldSolver/SpectralSolver/SpectralSolver.H"
-#endif
 
-#ifdef WARPX_USE_OPENPMD
-#   include <openPMD/openPMD.hpp>
-#endif
+#include "Utils/CoarsenIO.H"
 
 #include <AMReX.H>
 #include <AMReX_IntVect.H>
diff --git a/Source/Diagnostics/ParticleIO.cpp b/Source/Diagnostics/ParticleIO.cpp
index 41a60c992de..f150f9b1585 100644
--- a/Source/Diagnostics/ParticleIO.cpp
+++ b/Source/Diagnostics/ParticleIO.cpp
@@ -7,10 +7,33 @@
  * License: BSD-3-Clause-LBNL
  */
 
-#include "Particles/Filter/FilterFunctors.H"
 #include "Particles/MultiParticleContainer.H"
+#include "Particles/PhysicalParticleContainer.H"
+#include "Particles/RigidInjectedParticleContainer.H"
+#include "Particles/SpeciesPhysicalProperties.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXConst.H"
+#include "Utils/WarpXProfilerWrapper.H"
 #include "WarpX.H"
 
+#include <AMReX_BLassert.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParIter.H>
+#include <AMReX_ParticleIO.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
+
+#include <array>
+#include <istream>
+#include <memory>
+#include <string>
+#include <vector>
+
 using namespace amrex;
 
 void
diff --git a/Source/Diagnostics/SliceDiagnostic.H b/Source/Diagnostics/SliceDiagnostic.H
index f6decdcbc3f..b1839328bd9 100644
--- a/Source/Diagnostics/SliceDiagnostic.H
+++ b/Source/Diagnostics/SliceDiagnostic.H
@@ -7,18 +7,15 @@
 #ifndef WARPX_SliceDiagnostic_H_
 #define WARPX_SliceDiagnostic_H_
 
-#include <AMReX_VisMF.H>
-#include <AMReX_PlotFileUtil.H>
-#include <AMReX_ParallelDescriptor.H>
 #include <AMReX_Geometry.H>
-
 #include <AMReX_FArrayBox.H>
 #include <AMReX_IArrayBox.H>
 #include <AMReX_Vector.H>
-#include <AMReX_BLassert.H>
 #include <AMReX_MultiFabUtil.H>
 #include <AMReX_MultiFabUtil_C.H>
 
+#include <memory>
+
 std::unique_ptr<amrex::MultiFab> CreateSlice( const amrex::MultiFab& mf,
                const amrex::Vector<amrex::Geometry> &dom_geom,
                amrex::RealBox &slice_realbox,
diff --git a/Source/Diagnostics/SliceDiagnostic.cpp b/Source/Diagnostics/SliceDiagnostic.cpp
index d895a858075..960059c4068 100644
--- a/Source/Diagnostics/SliceDiagnostic.cpp
+++ b/Source/Diagnostics/SliceDiagnostic.cpp
@@ -6,12 +6,32 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "SliceDiagnostic.H"
-#include <AMReX_MultiFabUtil.H>
-#include <AMReX_PlotFileUtil.H>
 
-#include <WarpX.H>
+#include "WarpX.H"
+
+#include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_MultiFabUtil_3D_C.H>
+#include <AMReX_Print.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_SPACE.H>
 
 #include <memory>
+#include <cmath>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/WarpXIO.cpp b/Source/Diagnostics/WarpXIO.cpp
index b567781e791..ae58457657c 100644
--- a/Source/Diagnostics/WarpXIO.cpp
+++ b/Source/Diagnostics/WarpXIO.cpp
@@ -9,22 +9,33 @@
  */
 #include "WarpX.H"
 #include "FieldIO.H"
-#include "SliceDiagnostic.H"
 #include "Utils/CoarsenIO.H"
-
-#ifdef WARPX_USE_OPENPMD
-#   include "Diagnostics/WarpXOpenPMD.H"
-#endif
-
-#include <AMReX_MultiFabUtil.H>
+#include "BoundaryConditions/PML.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Utils/WarpXProfilerWrapper.H"
+
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_Print.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_Vector.H>
+#include <AMReX_VisMF.H>
 #include <AMReX_PlotFileUtil.H>
-#include <AMReX_buildInfo.H>
-
 #ifdef BL_USE_SENSEI_INSITU
 #   include <AMReX_AmrMeshInSituBridge.H>
 #endif
 
 #include <memory>
+#include <array>
+#include <istream>
+#include <string>
+#include <utility>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/WarpXOpenPMD.H b/Source/Diagnostics/WarpXOpenPMD.H
index 4152dd89692..3274b7a810f 100644
--- a/Source/Diagnostics/WarpXOpenPMD.H
+++ b/Source/Diagnostics/WarpXOpenPMD.H
@@ -9,15 +9,17 @@
 #define WARPX_OPEN_PMD_H_
 
 #include "Particles/WarpXParticleContainer.H"
-#include "Particles/MultiParticleContainer.H" // PIdx
-#include "Particles/PhysicalParticleContainer.H"
-
 #include "Diagnostics/ParticleDiag/ParticleDiag.H"
 
 #include <AMReX_AmrParticles.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuAllocators.H>
+#include <AMReX_ParIter.H>
+#include <AMReX_Print.H>
+#include <AMReX_Vector.H>
 
 #ifdef WARPX_USE_OPENPMD
 #   include <openPMD/openPMD.hpp>
@@ -27,7 +29,6 @@
 #include <string>
 #include <vector>
 
-
 //
 // helper class
 //
diff --git a/Source/Diagnostics/WarpXOpenPMD.cpp b/Source/Diagnostics/WarpXOpenPMD.cpp
index 2ff21de2aab..b13e5b373ef 100644
--- a/Source/Diagnostics/WarpXOpenPMD.cpp
+++ b/Source/Diagnostics/WarpXOpenPMD.cpp
@@ -5,14 +5,35 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpXOpenPMD.H"
-#include "FieldIO.H"  // for getReversedVec
+
+#include "WarpX.H"
+#include "FieldIO.H"
 #include "Particles/Filter/FilterFunctors.H"
 #include "Utils/RelativeCellPosition.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXUtil.H"
+#include "Diagnostics/ParticleDiag/ParticleDiag.H"
+#include "Parser/WarpXParserWrapper.H"
+#include "Utils/WarpXProfilerWrapper.H"
 
-#include <AMReX_AmrParticles.H>
 #include <AMReX_ParallelDescriptor.H>
+#include <AMReX.H>
+#include <AMReX_ArrayOfStructs.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParallelReduce.H>
+#include <AMReX_Particle.H>
+#include <AMReX_Particles.H>
+#include <AMReX_Periodicity.H>
+#include <AMReX_StructOfArrays.H>
 
 #include <algorithm>
 #include <cstdint>
@@ -22,8 +43,6 @@
 #include <tuple>
 #include <utility>
 #include <iostream>
-#include <fstream>
-
 
 namespace detail
 {

From 0f88dfc9f03aa8524dc5a472931795fb32fda3b9 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 11 May 2021 12:56:22 +0200
Subject: [PATCH 06/58] progress with iwyu

---
 .../BackTransformFunctor.H                    |  7 ++++
 .../BackTransformFunctor.cpp                  | 17 ++++++++-
 .../FlushFormats/FlushFormatAscent.H          |  4 +++
 .../FlushFormats/FlushFormatAscent.cpp        |  2 +-
 .../FlushFormats/FlushFormatCheckpoint.H      |  5 +++
 .../FlushFormats/FlushFormatCheckpoint.cpp    | 11 +++++-
 .../FlushFormats/FlushFormatPlotfile.H        |  6 ++++
 .../FlushFormats/FlushFormatPlotfile.cpp      | 36 +++++++++++++++++++
 8 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
index 87747c30a6d..0f3f537e91b 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
@@ -3,6 +3,13 @@
 
 #include "ComputeDiagFunctor.H"
 
+#include <AMReX_Box.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
+
+#include <string>
+
 /**
  * \brief Functor to back-transform cell-centered data and store result in mf_out
  *
diff --git a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
index 211e1d4ec7f..bcadbafa2ae 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
@@ -1,10 +1,25 @@
 #include "BackTransformFunctor.H"
+
 #include "WarpX.H"
+#include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"  // for Comp...
+#include "Utils/WarpXConst.H"                                    // for c
 
 #include <AMReX_MultiFabUtil.H>
-#include <AMReX_MultiFabUtil_C.H>
+#include <AMReX_Array4.H>                                        // for Array4
+#include <AMReX_BoxArray.H>                                      // for BoxA...
+#include <AMReX_Config.H>                                        // for AMRE...
+#include <AMReX_FArrayBox.H>                                     // for FArr...
+#include <AMReX_FabArray.H>                                      // for FabA...
+#include <AMReX_Geometry.H>                                      // for Geom...
+#include <AMReX_GpuControl.H>                                    // for notI...
+#include <AMReX_GpuLaunchFunctsC.H>                              // for Para...
+#include <AMReX_GpuQualifiers.H>                                 // for AMRE...
+#include <AMReX_MFIter.H>                                        // for MFIter
+#include <AMReX_MultiFab.H>                                      // for Mult...
 
 #include <memory>
+#include <cmath>
+#include <map>                                                   // for map
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
index de8bec0915d..b9258b1410a 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
@@ -4,11 +4,15 @@
 #include "FlushFormat.H"
 #include "Diagnostics/ParticleDiag/ParticleDiag.H"
 
+#include <AMReX_Geometry.H>
+#include <AMReX_Vector.H>
 #ifdef AMREX_USE_ASCENT
 #   include <ascent.hpp>
 #   include <AMReX_Conduit_Blueprint.H>
 #endif
 
+#include <string>
+
 /**
  * \brief This class aims at dumping performing in-situ diagnostics with ASCENT.
  * In particular, function WriteToFile takes fields and particles as input arguments,
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp b/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp
index fc5561a0f7d..02de2f12782 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp
@@ -1,7 +1,7 @@
 #include "FlushFormatAscent.H"
 
 #include <AMReX.H>
-#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
index aa2dccdfd95..d23cc386509 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
@@ -3,6 +3,11 @@
 
 #include "FlushFormatPlotfile.H"
 
+#include <AMReX_Geometry.H>
+#include <AMReX_Vector.H>
+
+#include <string>
+
 class FlushFormatCheckpoint final : public FlushFormatPlotfile
 {
     /** Flush fields and particles to plotfile */
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
index 400caab3e42..7eb9f9ef79f 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
@@ -2,9 +2,18 @@
 
 #include "WarpX.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "BoundaryConditions/PML.H"
+#include "Diagnostics/ParticleDiag/ParticleDiag.H"
+#include "Particles/WarpXParticleContainer.H"
 
-#include <AMReX_buildInfo.H>
 #include <AMReX_PlotFileUtil.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParticleIO.H>
+#include <AMReX_PlotFileUtil.H>
+#include <AMReX_Print.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Utility.H>
+#include <AMReX_VisMF.H>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
index e8f87f88482..f26ab63d47a 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
@@ -4,6 +4,12 @@
 #include "FlushFormat.H"
 #include "Diagnostics/ParticleDiag/ParticleDiag.H"
 
+#include <AMReX_Geometry.H>
+#include <AMReX_Vector.H>
+
+#include <iosfwd>
+#include <string>
+
 /**
  * \brief This class aims at dumping diags data to disk using the AMReX Plotfile format.
  * In particular, function WriteToFile takes fields and particles as input arguments,
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
index 239fe016548..e0bf0f3d95c 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
@@ -3,10 +3,46 @@
 #include "WarpX.H"
 #include "Utils/Interpolate.H"
 #include "Particles/Filter/FilterFunctors.H"
+#include "Diagnostics/ParticleDiag/ParticleDiag.H"
+#include "Parser/WarpXParserWrapper.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX_AmrParticles.H>
 #include <AMReX_buildInfo.H>
 #include <AMReX_PlotFileUtil.H>
+#include <AMReX.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_GpuAllocators.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MakeType.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_ParticleIO.H>
+#include <AMReX_Particles.H>
+#include <AMReX_PlotFileUtil.H>
+#include <AMReX_Print.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Utility.H>
+#include <AMReX_VisMF.H>
+
+#ifdef AMREX_USE_OMP
+#   include <omp.h>
+#endif
+
+#include <cstring>
+#include <algorithm>
+#include <array>
+#include <fstream>
+#include <map>
+#include <memory>
+#include <utility>
+#include <vector>
 
 using namespace amrex;
 

From 02ddc414a54fdbe321d899d2d393f01c7326aaa6 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 11 May 2021 13:07:29 +0200
Subject: [PATCH 07/58] progress with iwyu

---
 .../FlushFormats/FlushFormatOpenPMD.H           |  5 ++++-
 .../FlushFormats/FlushFormatOpenPMD.cpp         |  7 +++++++
 Source/Diagnostics/ParticleDiag/ParticleDiag.H  |  6 +++++-
 .../Diagnostics/ParticleDiag/ParticleDiag.cpp   |  8 +++++++-
 Source/Diagnostics/ReducedDiags/BeamRelevant.H  |  3 ++-
 .../Diagnostics/ReducedDiags/BeamRelevant.cpp   | 16 ++++++++++++++--
 Source/Diagnostics/ReducedDiags/FieldEnergy.H   |  3 ++-
 Source/Diagnostics/ReducedDiags/FieldEnergy.cpp | 17 ++++++++++++-----
 8 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
index e88dfc331e3..c83ad731570 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
@@ -4,8 +4,11 @@
 #include "FlushFormat.H"
 #include "Diagnostics/WarpXOpenPMD.H"
 
-#include <memory>
+#include <AMReX_Geometry.H>
+#include <AMReX_Vector.H>
 
+#include <memory>
+#include <string>
 
 /**
  * \brief This class aims at dumping diags data to disk using the openPMD standard.
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp
index eb3846e69c4..8e520e315da 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp
@@ -1,5 +1,12 @@
 #include "FlushFormatOpenPMD.H"
+
 #include "WarpX.H"
+#include "Utils/WarpXProfilerWrapper.H"
+
+#include <AMReX_BLassert.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
 
 #include <memory>
 
diff --git a/Source/Diagnostics/ParticleDiag/ParticleDiag.H b/Source/Diagnostics/ParticleDiag/ParticleDiag.H
index 119a341b6a5..e26b49df0d9 100644
--- a/Source/Diagnostics/ParticleDiag/ParticleDiag.H
+++ b/Source/Diagnostics/ParticleDiag/ParticleDiag.H
@@ -2,9 +2,13 @@
 #define WARPX_PARTICLEDIAG_H_
 
 #include "Parser/WarpXParserWrapper.H"
-#include "Utils/WarpXUtil.H"
 #include "Particles/WarpXParticleContainer.H"
 
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_Vector.H>
+
+#include <string>
 #include <memory>
 
 class ParticleDiag
diff --git a/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp b/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp
index be6812cafdd..68710ff6c6e 100644
--- a/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp
+++ b/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp
@@ -1,9 +1,15 @@
-#include "WarpX.H"
 #include "ParticleDiag.H"
+
+#include "WarpX.H"
 #include "Utils/WarpXUtil.H"
+#include "Diagnostics/ParticleDiag/ParticleDiag.H"
+#include "Particles/WarpXParticleContainer.H"
 
 #include <AMReX_ParmParse.H>
 
+#include <map>
+#include <vector>
+
 using namespace amrex;
 
 ParticleDiag::ParticleDiag(std::string diag_name, std::string name, WarpXParticleContainer* pc)
diff --git a/Source/Diagnostics/ReducedDiags/BeamRelevant.H b/Source/Diagnostics/ReducedDiags/BeamRelevant.H
index bf775f25006..a85123ed187 100644
--- a/Source/Diagnostics/ReducedDiags/BeamRelevant.H
+++ b/Source/Diagnostics/ReducedDiags/BeamRelevant.H
@@ -9,7 +9,8 @@
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_BEAMRELEVANT_H_
 
 #include "ReducedDiags.H"
-#include <fstream>
+
+#include <string>
 
 /**
  *  This class contains diagnostics that are relevant to beam.
diff --git a/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp b/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp
index b57e09c794e..3e01ab9c2ac 100644
--- a/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp
+++ b/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp
@@ -5,16 +5,28 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "BeamRelevant.H"
+
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
+#include "Diagnostics/ReducedDiags/ReducedDiags.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/IntervalsParser.H"
 
 #include <AMReX_REAL.H>
 #include <AMReX_ParticleReduce.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Particles.H>
 
-#include <iostream>
 #include <cmath>
 #include <limits>
-
+#include <algorithm>
+#include <fstream>
+#include <map>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/FieldEnergy.H b/Source/Diagnostics/ReducedDiags/FieldEnergy.H
index 71398290c02..f13439d370a 100644
--- a/Source/Diagnostics/ReducedDiags/FieldEnergy.H
+++ b/Source/Diagnostics/ReducedDiags/FieldEnergy.H
@@ -9,7 +9,8 @@
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_FIELDENERGY_H_
 
 #include "ReducedDiags.H"
-#include <fstream>
+
+#include <string>
 
 /**
  *  This class mainly contains a function that
diff --git a/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp b/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp
index 6ad4ee1b3e1..35e49c50550 100644
--- a/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp
+++ b/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp
@@ -6,15 +6,22 @@
  */
 
 #include "FieldEnergy.H"
+
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
+#include "Diagnostics/ReducedDiags/ReducedDiags.H"
+#include "Utils/IntervalsParser.H"
 
 #include <AMReX_REAL.H>
-#include <AMReX_ParticleReduce.H>
-
-#include <iostream>
-#include <cmath>
-
+#include <AMReX_Config.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+
+#include <algorithm>
+#include <fstream>
+#include <vector>
 
 using namespace amrex;
 

From 1f2f7937238cc50d85e5ad339266ea906dfd79e1 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 11 May 2021 14:24:22 +0200
Subject: [PATCH 08/58] fixed bug

---
 Source/WarpX.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index d02deccc2d7..59fc7b4184b 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -30,7 +30,6 @@
 #include <AMReX_Box.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_Dim3.H>
-#include <AMReX_EBSupport.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_FabFactory.H>
 #include <AMReX_Geometry.H>

From 0758826a95ec9ec96ae3670f7e7b47d15ac009d2 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 11 May 2021 15:13:48 +0200
Subject: [PATCH 09/58] progress with iwyu

---
 .../Diagnostics/ReducedDiags/FieldMaximum.H   |  2 +
 .../Diagnostics/ReducedDiags/FieldMaximum.cpp | 27 +++++++++++++
 .../ReducedDiags/LoadBalanceCosts.H           |  3 ++
 .../ReducedDiags/LoadBalanceCosts.cpp         | 24 +++++++++++-
 .../ReducedDiags/LoadBalanceEfficiency.H      |  2 +
 .../ReducedDiags/LoadBalanceEfficiency.cpp    | 12 +++++-
 .../ReducedDiags/MultiReducedDiags.H          |  1 +
 .../ReducedDiags/MultiReducedDiags.cpp        |  7 +++-
 .../Diagnostics/ReducedDiags/ParticleEnergy.H |  3 +-
 .../ReducedDiags/ParticleEnergy.cpp           | 16 +++++++-
 .../ReducedDiags/ParticleExtrema.H            |  3 +-
 .../ReducedDiags/ParticleExtrema.cpp          | 39 +++++++++++++++++--
 .../ReducedDiags/ParticleHistogram.H          |  5 +++
 .../ReducedDiags/ParticleHistogram.cpp        | 23 +++++++++--
 .../Diagnostics/ReducedDiags/ParticleNumber.H |  2 +
 .../ReducedDiags/ParticleNumber.cpp           | 17 ++++++++
 .../Diagnostics/ReducedDiags/ReducedDiags.H   |  1 -
 .../Diagnostics/ReducedDiags/ReducedDiags.cpp |  4 ++
 Source/Diagnostics/ReducedDiags/RhoMaximum.H  |  5 +++
 .../Diagnostics/ReducedDiags/RhoMaximum.cpp   | 19 ++++++++-
 Source/EmbeddedBoundary/WarpXInitEB.cpp       | 16 ++++++++
 Source/Evolve/WarpXComputeDt.cpp              | 12 ++++++
 Source/Evolve/WarpXEvolve.cpp                 | 31 +++++++++++++--
 23 files changed, 253 insertions(+), 21 deletions(-)

diff --git a/Source/Diagnostics/ReducedDiags/FieldMaximum.H b/Source/Diagnostics/ReducedDiags/FieldMaximum.H
index 31953e2801a..e2faf76877e 100644
--- a/Source/Diagnostics/ReducedDiags/FieldMaximum.H
+++ b/Source/Diagnostics/ReducedDiags/FieldMaximum.H
@@ -10,6 +10,8 @@
 
 #include "ReducedDiags.H"
 
+#include <string>
+
 /**
  *  This class mainly contains a function that computes the maximum value of each component
  * of the EM field and of the vector norm of the E and B fields.
diff --git a/Source/Diagnostics/ReducedDiags/FieldMaximum.cpp b/Source/Diagnostics/ReducedDiags/FieldMaximum.cpp
index 49d968a5341..79c1c0781d3 100644
--- a/Source/Diagnostics/ReducedDiags/FieldMaximum.cpp
+++ b/Source/Diagnostics/ReducedDiags/FieldMaximum.cpp
@@ -6,8 +6,35 @@
  */
 
 #include "FieldMaximum.H"
+
 #include "WarpX.H"
 #include "Utils/CoarsenIO.H"
+#include "Utils/IntervalsParser.H"
+
+#include <AMReX_Algorithm.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Reduce.H>
+#include <AMReX_Tuple.H>
+#include <AMReX_Vector.H>
+
+#include <algorithm>
+#include <ostream>
+#include <vector>
+#include <cmath>
+#include <cstdlib>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.H b/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.H
index 6209c12bee1..db40aca26f5 100644
--- a/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.H
+++ b/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.H
@@ -12,6 +12,9 @@
 
 #include <AMReX_Vector.H>
 
+#include <string>
+#include <vector>
+
 /**
  *  This class mainly contains a function that update the
  *  costs (used in load balance) for writing to output.
diff --git a/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp b/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp
index 07c22931ca2..1b2e014e6de 100644
--- a/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp
+++ b/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp
@@ -4,12 +4,32 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "LoadBalanceCosts.H"
 
 #include "WarpX.H"
-#include "LoadBalanceCosts.H"
-#include "Utils/WarpXUtil.H"
+#include "Diagnostics/ReducedDiags/ReducedDiags.H"
+#include "Utils/IntervalsParser.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Utility.H>
+
+#ifdef AMREX_USE_MPI
+#   include <mpi.h>
+#endif
 
 #include <memory>
+#include <algorithm>
+#include <cstdio>
+#include <iomanip>
+#include <istream>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.H b/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.H
index 33f7892f040..543dd1e0982 100644
--- a/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.H
+++ b/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.H
@@ -10,6 +10,8 @@
 
 #include "ReducedDiags.H"
 
+#include <string>
+
 /**
  *  This class mainly contains a function that gets the
  *  current load balance efficiency for writing to output.
diff --git a/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.cpp b/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.cpp
index 44380a7db50..bbe114b63a1 100644
--- a/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.cpp
+++ b/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.cpp
@@ -4,9 +4,19 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "LoadBalanceEfficiency.H"
 
 #include "WarpX.H"
-#include "LoadBalanceEfficiency.H"
+#include "Diagnostics/ReducedDiags/ReducedDiags.H"
+#include "Utils/IntervalsParser.H"
+
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
+
+#include <algorithm>
+#include <ostream>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H
index 79f487d81c1..3c8d9a6282b 100644
--- a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H
+++ b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H
@@ -9,6 +9,7 @@
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_MULTIREDUCEDDIAGS_H_
 
 #include "ReducedDiags.H"
+
 #include <vector>
 #include <string>
 #include <memory>
diff --git a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp
index d1e0be528fc..e9773f711b2 100644
--- a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp
+++ b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp
@@ -4,6 +4,7 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "MultiReducedDiags.H"
 
 #include "LoadBalanceCosts.H"
 #include "LoadBalanceEfficiency.H"
@@ -15,12 +16,14 @@
 #include "FieldMaximum.H"
 #include "RhoMaximum.H"
 #include "ParticleNumber.H"
-#include "MultiReducedDiags.H"
+#include "Utils/IntervalsParser.H"
 
 #include <AMReX_ParmParse.H>
 #include <AMReX_ParallelDescriptor.H>
+#include <AMReX.H>
+#include <AMReX_REAL.H>
 
-#include <fstream>
+#include <algorithm>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/ParticleEnergy.H b/Source/Diagnostics/ReducedDiags/ParticleEnergy.H
index fbbf197a574..08f3c0aee7e 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleEnergy.H
+++ b/Source/Diagnostics/ReducedDiags/ParticleEnergy.H
@@ -9,7 +9,8 @@
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_PARTICLEENERGY_H_
 
 #include "ReducedDiags.H"
-#include <fstream>
+
+#include <string>
 
 /**
  *  This class mainly contains a function that
diff --git a/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp b/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp
index 72395cc8468..f83fbdefefd 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp
@@ -6,16 +6,28 @@
  */
 
 #include "ParticleEnergy.H"
+
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
+#include "Diagnostics/ReducedDiags/ReducedDiags.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Particles/SpeciesPhysicalProperties.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/IntervalsParser.H"
 
 #include <AMReX_REAL.H>
 #include <AMReX_ParticleReduce.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_Particles.H>
 
-#include <iostream>
 #include <cmath>
 #include <limits>
-
+#include <algorithm>
+#include <fstream>
+#include <map>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/ParticleExtrema.H b/Source/Diagnostics/ReducedDiags/ParticleExtrema.H
index 6e61cdde960..c85e43b1c2c 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleExtrema.H
+++ b/Source/Diagnostics/ReducedDiags/ParticleExtrema.H
@@ -9,7 +9,8 @@
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_PARTICLEEXTREMA_H_
 
 #include "ReducedDiags.H"
-#include <fstream>
+
+#include <string>
 
 /**
  *  This class mainly contains a function that
diff --git a/Source/Diagnostics/ReducedDiags/ParticleExtrema.cpp b/Source/Diagnostics/ReducedDiags/ParticleExtrema.cpp
index 0e325306b24..22245864ccc 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleExtrema.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleExtrema.cpp
@@ -6,19 +6,50 @@
  */
 
 #include "ParticleExtrema.H"
+
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
+#include "Diagnostics/ReducedDiags/ReducedDiags.H"
+#include "Particles/Gather/FieldGather.H"
+#include "Particles/Gather/GetExternalFields.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Particles/Pusher/GetAndSetPosition.H"
+#include "Particles/SpeciesPhysicalProperties.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/IntervalsParser.H"
 #if (defined WARPX_QED)
-#include "Particles/ElementaryProcess/QEDInternals/QedChiFunctions.H"
+#   include "Particles/ElementaryProcess/QEDInternals/QedChiFunctions.H"
 #endif
 
 #include <AMReX_REAL.H>
 #include <AMReX_ParticleReduce.H>
+#include <AMReX_Algorithm.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Box.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_Extension.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParIter.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Particles.H>
+#include <AMReX_Reduce.H>
+#include <AMReX_Tuple.H>
+#include <AMReX_Vector.H>
 
-#include <iostream>
 #include <cmath>
-#include <limits>
-
+#include <algorithm>
+#include <array>
+#include <fstream>
+#include <map>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/ParticleHistogram.H b/Source/Diagnostics/ReducedDiags/ParticleHistogram.H
index b22632b15c6..2856fe3ad6a 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleHistogram.H
+++ b/Source/Diagnostics/ReducedDiags/ParticleHistogram.H
@@ -11,6 +11,11 @@
 #include "ReducedDiags.H"
 #include "Parser/WarpXParserWrapper.H"
 
+#include <AMReX_REAL.H>
+
+#include <memory>
+#include <string>
+
 /**
  * Reduced diagnostics that computes a histogram over particles
  * for a quantity specified by the user in the input file using the parser.
diff --git a/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp b/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp
index b6788b964b6..e8a8ed0331e 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp
@@ -6,20 +6,37 @@
  */
 
 #include "ParticleHistogram.H"
+
 #include "WarpX.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "Utils/WarpXUtil.H"
-#include "Particles/Filter/FilterFunctors.H"
+#include "Diagnostics/ReducedDiags/ReducedDiags.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/IntervalsParser.H"
+#include "Utils/WarpXConst.H"
 
 #include <AMReX_GpuContainers.H>
 #include <AMReX_Math.H>
-#include <AMReX_ParticleReduce.H>
 #include <AMReX_REAL.H>
+#include <AMReX.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuAtomic.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParIter.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
 
 #include <algorithm>
 #include <limits>
 #include <memory>
-
+#include <array>
+#include <ostream>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/ParticleNumber.H b/Source/Diagnostics/ReducedDiags/ParticleNumber.H
index cc653a875db..1a5acc32133 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleNumber.H
+++ b/Source/Diagnostics/ReducedDiags/ParticleNumber.H
@@ -10,6 +10,8 @@
 
 #include "ReducedDiags.H"
 
+#include <string>
+
 /**
  *  This class mainly contains a function that computes the total number of macroparticles and of
  *  physical particles (i.e. the sum of the weights) of each species.
diff --git a/Source/Diagnostics/ReducedDiags/ParticleNumber.cpp b/Source/Diagnostics/ReducedDiags/ParticleNumber.cpp
index 111ab07c0bb..da3fbb83436 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleNumber.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleNumber.cpp
@@ -6,7 +6,24 @@
  */
 
 #include "ParticleNumber.H"
+
 #include "WarpX.H"
+#include "Diagnostics/ReducedDiags/ReducedDiags.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/IntervalsParser.H"
+
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParticleReduce.H>
+#include <AMReX_Particles.H>
+#include <AMReX_REAL.H>
+
+#include <algorithm>
+#include <map>
+#include <ostream>
+#include <vector>
 
 using namespace amrex::literals;
 
diff --git a/Source/Diagnostics/ReducedDiags/ReducedDiags.H b/Source/Diagnostics/ReducedDiags/ReducedDiags.H
index b7c97f327d6..aa80d3098bb 100644
--- a/Source/Diagnostics/ReducedDiags/ReducedDiags.H
+++ b/Source/Diagnostics/ReducedDiags/ReducedDiags.H
@@ -14,7 +14,6 @@
 
 #include <string>
 #include <vector>
-#include <fstream>
 
 /**
  *  Base class for reduced diagnostics. Each type of reduced diagnostics is
diff --git a/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp b/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp
index a667d1a6b8a..82082741538 100644
--- a/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp
+++ b/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp
@@ -6,11 +6,15 @@
  */
 
 #include "ReducedDiags.H"
+
 #include "WarpX.H"
 
 #include <AMReX_ParmParse.H>
 #include <AMReX_Utility.H>
+#include <AMReX.H>
+#include <AMReX_ParallelDescriptor.H>
 
+#include <fstream>
 #include <iomanip>
 
 using namespace amrex;
diff --git a/Source/Diagnostics/ReducedDiags/RhoMaximum.H b/Source/Diagnostics/ReducedDiags/RhoMaximum.H
index 0638fae16f3..29a5537564c 100644
--- a/Source/Diagnostics/ReducedDiags/RhoMaximum.H
+++ b/Source/Diagnostics/ReducedDiags/RhoMaximum.H
@@ -11,6 +11,11 @@
 #include "ReducedDiags.H"
 #include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
 
+#include <AMReX_Vector.H>
+
+#include <memory>
+#include <string>
+
 /**
  *  This class mainly contains a function that computes the extrema of the total charge density
  *  and of the charge density of each charged species.
diff --git a/Source/Diagnostics/ReducedDiags/RhoMaximum.cpp b/Source/Diagnostics/ReducedDiags/RhoMaximum.cpp
index bd284038331..a40440bfb25 100644
--- a/Source/Diagnostics/ReducedDiags/RhoMaximum.cpp
+++ b/Source/Diagnostics/ReducedDiags/RhoMaximum.cpp
@@ -6,8 +6,25 @@
  */
 
 #include "RhoMaximum.H"
-#include "Diagnostics/ComputeDiagFunctors/RhoFunctor.H"
+
 #include "WarpX.H"
+#include "Diagnostics/ComputeDiagFunctors/RhoFunctor.H"
+#include "Diagnostics/ReducedDiags/ReducedDiags.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/IntervalsParser.H"
+
+#include <AMReX_BoxArray.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
+
+#include <algorithm>
+#include <ostream>
+#include <vector>
 
 using namespace amrex::literals;
 
diff --git a/Source/EmbeddedBoundary/WarpXInitEB.cpp b/Source/EmbeddedBoundary/WarpXInitEB.cpp
index 8214eec9b16..a87ec53aedc 100644
--- a/Source/EmbeddedBoundary/WarpXInitEB.cpp
+++ b/Source/EmbeddedBoundary/WarpXInitEB.cpp
@@ -1,11 +1,27 @@
 #include "WarpX.H"
 
 #include <AMReX_Config.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BLProfiler.H>
+#include <AMReX_Box.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_FabFactory.H>
+#include <AMReX_Loop.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiCutFab.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
 #ifdef AMREX_USE_EB
 #   include <AMReX_EB2.H>
 #   include <AMReX_ParmParse.H>
 #endif
 
+#include <array>
+#include <memory>
+#include <string>
+#include <cstdlib>
+
 
 void
 WarpX::InitEB ()
diff --git a/Source/Evolve/WarpXComputeDt.cpp b/Source/Evolve/WarpXComputeDt.cpp
index 6237f85c4c4..5510fe074d1 100644
--- a/Source/Evolve/WarpXComputeDt.cpp
+++ b/Source/Evolve/WarpXComputeDt.cpp
@@ -5,7 +5,9 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
+
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXConst.H"
 #ifdef WARPX_DIM_RZ
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #else
@@ -14,6 +16,16 @@
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
 
+#include <AMReX.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_Print.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
+
+#include <algorithm>
+#include <memory>
+
 /**
  * Determine the timestep of the simulation. */
 void
diff --git a/Source/Evolve/WarpXEvolve.cpp b/Source/Evolve/WarpXEvolve.cpp
index 2f04310a513..d7ad37b768d 100644
--- a/Source/Evolve/WarpXEvolve.cpp
+++ b/Source/Evolve/WarpXEvolve.cpp
@@ -9,17 +9,42 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
-#include "FieldSolver/WarpX_QED_K.H"
+
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Python/WarpX_py.H"
+#include "Diagnostics/BackTransformedDiagnostic.H"
+#include "Diagnostics/MultiDiagnostics.H"
+#include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
+#include "Evolve/WarpXDtType.H"
+#include "Parallelization/GuardCellManager.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Utils/IntervalsParser.H"
+#include "Utils/WarpXProfilerWrapper.H"
 #ifdef WARPX_USE_PSATD
 #   include "FieldSolver/SpectralSolver/SpectralSolver.H"
 #endif
 
-#include <cmath>
-#include <limits>
+#include <AMReX.H>
+#include <AMReX_Array.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Config.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Print.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Utility.H>
+#include <AMReX_Vector.H>
+
+#include <algorithm>
+#include <array>
+#include <memory>
+#include <ostream>
+#include <vector>
 
 using namespace amrex;
 

From 2cd1fa07b89a8de9f94bb94f9f1e9eb6d45748bf Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Wed, 12 May 2021 03:05:23 +0200
Subject: [PATCH 10/58] progress with IWYU

---
 Source/Diagnostics/SliceDiagnostic.cpp        |  1 -
 Source/FieldSolver/ElectrostaticSolver.cpp    | 31 ++++++++++++++---
 .../ApplySilverMuellerBoundary.cpp            | 19 +++++++++--
 .../FiniteDifferenceSolver/ComputeDivE.cpp    |  4 +--
 .../FiniteDifferenceSolver/EvolveB.cpp        | 24 +++++++++++--
 .../FiniteDifferenceSolver/EvolveBPML.cpp     | 17 ++++++++--
 .../FiniteDifferenceSolver/EvolveE.cpp        | 22 ++++++++++--
 .../FiniteDifferenceSolver/EvolveEPML.cpp     | 17 ++++++++--
 .../FiniteDifferenceSolver/EvolveF.cpp        |  3 +-
 .../FiniteDifferenceSolver/EvolveFPML.cpp     | 17 ++++++++--
 .../FiniteDifferenceSolver/EvolveG.cpp        |  2 --
 .../FiniteDifferenceSolver.H                  |  5 +++
 .../FiniteDifferenceSolver.cpp                |  3 +-
 .../MacroscopicEvolveE.cpp                    | 23 ++++++++++---
 .../MacroscopicProperties.H                   |  9 +++--
 .../MacroscopicProperties.cpp                 | 12 +++++++
 .../SpectralSolver/SpectralFieldData.H        | 10 +++++-
 .../SpectralSolver/SpectralFieldData.cpp      | 19 +++++++++--
 Source/FieldSolver/WarpXPushFieldsEM.cpp      | 34 +++++++++++++++----
 .../FieldSolver/WarpX_QED_Field_Pushers.cpp   | 34 ++++++++++++++-----
 20 files changed, 256 insertions(+), 50 deletions(-)

diff --git a/Source/Diagnostics/SliceDiagnostic.cpp b/Source/Diagnostics/SliceDiagnostic.cpp
index 960059c4068..52644d351c4 100644
--- a/Source/Diagnostics/SliceDiagnostic.cpp
+++ b/Source/Diagnostics/SliceDiagnostic.cpp
@@ -24,7 +24,6 @@
 #include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
-#include <AMReX_MultiFabUtil_3D_C.H>
 #include <AMReX_Print.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
diff --git a/Source/FieldSolver/ElectrostaticSolver.cpp b/Source/FieldSolver/ElectrostaticSolver.cpp
index ab2fc2b25eb..cbc7b396267 100644
--- a/Source/FieldSolver/ElectrostaticSolver.cpp
+++ b/Source/FieldSolver/ElectrostaticSolver.cpp
@@ -4,19 +4,40 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include <WarpX.H>
+#include "Parallelization/GuardCellManager.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXConst.H"
 
-#include <AMReX_ParallelDescriptor.H>
 #include <AMReX_MLMG.H>
 #ifdef WARPX_DIM_RZ
-#include <AMReX_MLNodeLaplacian.H>
+    #include <AMReX_MLNodeLaplacian.H>
 #else
-#include <AMReX_MLNodeTensorLaplacian.H>
+    #include <AMReX_MLNodeTensorLaplacian.H>
 #endif
 #include <AMReX_REAL.H>
-
-#include <WarpX.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_LO_BCTYPES.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_Vector.H>
 
 #include <memory>
+#include <array>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp
index 1a4aa10b2f5..c9ea9956191 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp
@@ -4,15 +4,30 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "FiniteDifferenceSolver.H"
 
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "FiniteDifferenceSolver.H"
 #include "Utils/WarpXConst.H"
-#include <AMReX_Gpu.H>
 #ifdef WARPX_DIM_RZ
 #   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
 
+#include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+
+#include <array>
+#include <memory>
+
 using namespace amrex;
 
 /**
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
index 1d18657c7d6..947d5c1c8cc 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
@@ -4,9 +4,9 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "FiniteDifferenceSolver.H"
 
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "FiniteDifferenceSolver.H"
 #ifdef WARPX_DIM_RZ
 #   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #else
@@ -14,9 +14,7 @@
 #   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
-#include "Utils/WarpXConst.H"
 
-#include <AMReX_Gpu.H>
 #include <AMReX.H>
 #include <AMReX_Array4.H>
 #include <AMReX_Config.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
index 3d2dc42d85b..299e928f7b7 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
@@ -4,10 +4,11 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "FiniteDifferenceSolver.H"
 
 #include "WarpX.H"
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "FiniteDifferenceSolver.H"
+#include "Utils/WarpXConst.H"
 #ifdef WARPX_DIM_RZ
 #   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #else
@@ -15,7 +16,26 @@
 #   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
-#include <AMReX_Gpu.H>
+
+#include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuAtomic.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Utility.H>
+
+#include <array>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
index 6eb7caacc0c..a7aabfe7b08 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
@@ -4,9 +4,9 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 #ifdef WARPX_DIM_RZ
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #else
@@ -15,8 +15,21 @@
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
 #include "BoundaryConditions/PMLComponent.H"
-#include <AMReX_Gpu.H>
+
 #include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+
+#include <array>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
index 63fc8b38d00..be239705137 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
@@ -4,10 +4,10 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "FiniteDifferenceSolver.H"
 
 #include "WarpX.H"
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "FiniteDifferenceSolver.H"
 #ifdef WARPX_DIM_RZ
 #   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #else
@@ -16,8 +16,26 @@
 #   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
 #include "Utils/WarpXConst.H"
-#include <AMReX_Gpu.H>
 
+#include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuAtomic.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Utility.H>
+
+#include <array>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
index f93f6841404..0447fc9f9c5 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
@@ -4,9 +4,9 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 #ifdef WARPX_DIM_RZ
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #else
@@ -18,8 +18,21 @@
 #include "BoundaryConditions/PML_current.H"
 #include "BoundaryConditions/PMLComponent.H"
 #include "Utils/WarpXConst.H"
-#include <AMReX_Gpu.H>
+
 #include <AMReX.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+
+#include <array>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
index be16dea7765..140ab4357f3 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
@@ -4,9 +4,9 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "FiniteDifferenceSolver.H"
 
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "FiniteDifferenceSolver.H"
 #ifdef WARPX_DIM_RZ
 #   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #else
@@ -16,7 +16,6 @@
 #endif
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_Gpu.H>
 #include <AMReX.H>
 #include <AMReX_Array4.H>
 #include <AMReX_Config.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
index 1a49316dda3..99ebd543401 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
@@ -4,9 +4,9 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 #ifdef WARPX_DIM_RZ
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #else
@@ -15,8 +15,21 @@
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
 #include "BoundaryConditions/PMLComponent.H"
-#include <AMReX_Gpu.H>
+
 #include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+
+#include <array>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
index e3ba4528309..a1800bc655a 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
@@ -14,9 +14,7 @@
 #   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
-#include "Utils/WarpXConst.H"
 
-#include <AMReX_Gpu.H>
 #include <AMReX.H>
 #include <AMReX_Array4.H>
 #include <AMReX_Config.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
index 1592cd56e26..d6f34afca59 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
@@ -14,6 +14,11 @@ class FiniteDifferenceSolver; /*Forward declaration*/
 #include "MacroscopicProperties/MacroscopicProperties.H"
 
 #include <AMReX_MultiFab.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_REAL.H>
+
+#include <array>
+#include <memory>
 
 /**
  * \brief Top-level class for the electromagnetic finite-difference solver
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
index 90c39173121..db35c7f2076 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
@@ -4,6 +4,7 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "FiniteDifferenceSolver.H"
 
 #include "Utils/WarpXAlgorithmSelection.H"
 #ifdef WARPX_DIM_RZ
@@ -13,12 +14,12 @@
 #    include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #    include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
-#include "FiniteDifferenceSolver.H"
 
 #include <AMReX.H>
 #include <AMReX_GpuDevice.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_Vector.H>
+
 #include <vector>
 
 /* This function initializes the stencil coefficients for the chosen finite-difference algorithm */
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
index 448c9b57dc6..af9969999d0 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
@@ -1,5 +1,6 @@
-#include "Utils/WarpXAlgorithmSelection.H"
 #include "FiniteDifferenceSolver.H"
+
+#include "Utils/WarpXAlgorithmSelection.H"
 #ifdef WARPX_DIM_RZ
     // currently works only for 3D
 #else
@@ -7,12 +8,26 @@
 #   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #   include "FiniteDifferenceAlgorithms/FieldAccessorFunctors.H"
 #endif
-#include "Utils/WarpXConst.H"
 #include "Utils/CoarsenIO.H"
-#include <WarpX.H>
+#include "WarpX.H"
+#include "MacroscopicProperties/MacroscopicProperties.H"
+
 #include <AMReX.H>
 #include <AMReX_Gpu.H>
-
+#include <AMReX_Array4.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+
+#include <array>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H
index 7dfa2ff6219..c0f0e94bd50 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H
@@ -1,12 +1,17 @@
 #ifndef WARPX_MACROSCOPICPROPERTIES_H_
 #define WARPX_MACROSCOPICPROPERTIES_H_
 
-
 #include "Parser/WarpXParserWrapper.H"
 #include "Utils/WarpXConst.H"
-#include <AMReX_MultiFab.H>
 
+#include <AMReX_MultiFab.H>
+#include <AMReX_Array.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_REAL.H>
 
+#include <memory>
+#include <string>
 
 /**
  * \brief This class contains the macroscopic properties of the medium needed to
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
index 170ee6d8070..d81c5ce0d90 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
@@ -1,8 +1,20 @@
 #include "MacroscopicProperties.H"
+
 #include "WarpX.H"
 #include "Utils/WarpXUtil.H"
 
 #include <AMReX_ParmParse.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_Print.H>
+#include <AMReX_RealBox.H>
 
 #include <memory>
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
index 4fc73485383..b38bae2634a 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
@@ -13,8 +13,16 @@
 #include "AnyFFT.H"
 
 #include <AMReX_MultiFab.H>
+#include <AMReX_BaseFab.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_IntVect.H>
 
-#include <string>
+#include <vector>
 
 // Declare type for spectral fields
 using SpectralField = amrex::FabArray< amrex::BaseFab <Complex> >;
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
index 9c4e786de1a..0807016fdf1 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
@@ -6,9 +6,24 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "SpectralFieldData.H"
-#include "WarpX.H"
 
-#include <map>
+#include "WarpX.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+
+#include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_GpuAtomic.H>
+#include <AMReX_GpuComplex.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Utility.H>
 
 #if WARPX_USE_PSATD
 
diff --git a/Source/FieldSolver/WarpXPushFieldsEM.cpp b/Source/FieldSolver/WarpXPushFieldsEM.cpp
index 222a6ae6fcb..64f09f3e5b2 100644
--- a/Source/FieldSolver/WarpXPushFieldsEM.cpp
+++ b/Source/FieldSolver/WarpXPushFieldsEM.cpp
@@ -8,18 +8,38 @@
  */
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
-#include "BoundaryConditions/WarpX_PML_kernels.H"
-#include "BoundaryConditions/PML_current.H"
-#include "WarpX_FDTD.H"
-
-#ifdef BL_USE_SENSEI_INSITU
-#   include <AMReX_AmrMeshInSituBridge.H>
+#include "BoundaryConditions/PML.H"
+#include "Evolve/WarpXDtType.H"
+#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXProfilerWrapper.H"
+#if defined(WARPX_DIM_RZ) || defined(WARPX_USE_PSATD)
+#   include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+#   include "FieldSolver/SpectralSolver/SpectralSolver.H"
 #endif
 
 #include <AMReX.H>
 #include <AMReX_Math.H>
-#include <limits>
+#include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
+#ifdef BL_USE_SENSEI_INSITU
+#   include <AMReX_AmrMeshInSituBridge.H>
+#endif
 
+#include <cmath>
+#include <array>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp b/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp
index 2020532c1be..8f667dfecdc 100644
--- a/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp
+++ b/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp
@@ -5,19 +5,37 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
-#include "Utils/WarpXConst.H"
 #include "WarpX_QED_K.H"
-#include "BoundaryConditions/WarpX_PML_kernels.H"
-#include "BoundaryConditions/PML_current.H"
-#include "WarpX_FDTD.H"
-
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXProfilerWrapper.H"
+
+#include <AMReX_Array4.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_GpuAtomic.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuElixir.H>
+#include <AMReX_GpuLaunch.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_Print.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Utility.H>
+#include <AMReX_Vector.H>
 #ifdef BL_USE_SENSEI_INSITU
 #   include <AMReX_AmrMeshInSituBridge.H>
 #endif
 
-#include <cmath>
-#include <limits>
-
+#include <array>
+#include <iostream>
+#include <memory>
+#include <cstdlib>
 
 using namespace amrex;
 

From 3f61f6f4371e7cfe5a634dd72555063a7f5d05ad Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Wed, 12 May 2021 12:10:15 +0200
Subject: [PATCH 11/58] progress with IWYU

---
 Source/EmbeddedBoundary/WarpXInitEB.cpp       |  1 -
 .../ComovingPsatdAlgorithm.H                  |  9 +++++
 .../ComovingPsatdAlgorithm.cpp                | 15 +++++++
 .../SpectralAlgorithms/PMLPsatdAlgorithm.H    |  6 +++
 .../SpectralAlgorithms/PMLPsatdAlgorithm.cpp  | 15 ++++++-
 .../SpectralAlgorithms/PsatdAlgorithm.H       | 11 +++++
 .../SpectralAlgorithms/PsatdAlgorithm.cpp     | 13 ++++++
 .../SpectralBaseAlgorithm.H                   |  2 -
 .../SpectralBaseAlgorithm.cpp                 | 18 ++++++++-
 .../SpectralSolver/SpectralFieldData.H        |  1 +
 .../SpectralSolver/SpectralFieldData.cpp      |  1 +
 .../SpectralSolver/SpectralKSpace.H           |  8 +++-
 .../SpectralSolver/SpectralKSpace.cpp         | 16 +++++++-
 .../SpectralSolver/SpectralSolver.H           |  3 ++
 .../FieldSolver/SpectralSolver/WrapFFTW.cpp   |  6 +++
 Source/Filter/BilinearFilter.H                |  3 +-
 Source/Filter/BilinearFilter.cpp              |  1 +
 Source/Filter/Filter.H                        |  4 ++
 Source/Filter/Filter.cpp                      | 15 +++++--
 Source/Filter/NCIGodfreyFilter.H              |  1 +
 Source/Filter/NCIGodfreyFilter.cpp            | 17 +++++---
 Source/Initialization/InjectorDensity.H       | 10 ++++-
 Source/Initialization/InjectorDensity.cpp     |  9 ++++-
 Source/Initialization/InjectorMomentum.H      |  7 +++-
 Source/Initialization/InjectorMomentum.cpp    |  2 -
 Source/Initialization/PlasmaInjector.H        |  9 ++---
 Source/Initialization/PlasmaInjector.cpp      | 15 +++++--
 Source/Initialization/WarpXInitData.cpp       | 40 ++++++++++++++++++-
 28 files changed, 224 insertions(+), 34 deletions(-)

diff --git a/Source/EmbeddedBoundary/WarpXInitEB.cpp b/Source/EmbeddedBoundary/WarpXInitEB.cpp
index a87ec53aedc..9f06858d93d 100644
--- a/Source/EmbeddedBoundary/WarpXInitEB.cpp
+++ b/Source/EmbeddedBoundary/WarpXInitEB.cpp
@@ -8,7 +8,6 @@
 #include <AMReX_FabFactory.H>
 #include <AMReX_Loop.H>
 #include <AMReX_MFIter.H>
-#include <AMReX_MultiCutFab.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
index 76526024f38..701ee6aafd4 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
@@ -2,6 +2,15 @@
 #define WARPX_COMOVING_PSATD_ALGORITHM_H_
 
 #include "SpectralBaseAlgorithm.H"
+#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+#include "FieldSolver/SpectralSolver/SpectralKSpace.H"
+
+#include <AMReX_Array.H>
+#include <AMReX_Config.H>
+#include <AMReX_REAL.H>
+
+#include <array>
+#include <memory>
 
 #if WARPX_USE_PSATD
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp
index eb4f13bb4ce..f5f43c771c4 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp
@@ -1,5 +1,20 @@
 #include "ComovingPsatdAlgorithm.H"
+
 #include "Utils/WarpXConst.H"
+#include "Utils/WarpX_Complex.H"
+
+#include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BLProfiler.H>
+#include <AMReX_BaseFab.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_GpuComplex.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_PODVector.H>
+
+#include <cmath>
 
 #if WARPX_USE_PSATD
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
index 1b97558264b..eb0ae5cd371 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
@@ -8,6 +8,12 @@
 #define WARPX_PML_PSATD_ALGORITHM_H_
 
 #include "SpectralBaseAlgorithm.H"
+#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+
+#include <AMReX_REAL.H>
+
+#include <array>
+#include <memory>
 
 #if WARPX_USE_PSATD
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
index 3c152635715..aac0a1313fd 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
@@ -5,10 +5,23 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "PMLPsatdAlgorithm.H"
+
+#include "FieldSolver/SpectralSolver/SpectralKSpace.H"
+#include "Utils/WarpX_Complex.H"
 #include "Utils/WarpXConst.H"
 
-#include <cmath>
+#include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BaseFab.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_GpuComplex.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_PODVector.H>
 
+#include <cmath>
 
 #if WARPX_USE_PSATD
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
index 973265cdfb4..2b6f99bd4f7 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
@@ -8,6 +8,17 @@
 #define WARPX_PSATD_ALGORITHM_H_
 
 #include "SpectralBaseAlgorithm.H"
+#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+#include "FieldSolver/SpectralSolver/SpectralKSpace.H"
+
+#include <AMReX_Array.H>
+#include <AMReX_Config.H>
+#include <AMReX_REAL.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_MultiFab.H>
+
+#include <array>
+#include <memory>
 
 #if WARPX_USE_PSATD
 /* \brief Class that updates the field in spectral space
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
index 01a2cfe946d..83e8aaec761 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
@@ -5,7 +5,20 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "PsatdAlgorithm.H"
+
 #include "Utils/WarpXConst.H"
+#include "Utils/WarpX_Complex.H"
+
+#include <AMReX_Array4.H>
+#include <AMReX_BLProfiler.H>
+#include <AMReX_BaseFab.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_GpuComplex.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_PODVector.H>
 
 #include <cmath>
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
index 59804604256..107ca688124 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
@@ -10,8 +10,6 @@
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
 #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 
-#include <AMReX.H>
-
 #if WARPX_USE_PSATD
 
 /* \brief Class that updates the field in spectral space
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
index 46fe8390008..91abad70de2 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
@@ -5,7 +5,23 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "SpectralBaseAlgorithm.H"
-#include <cmath>
+#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+
+#include "Utils/WarpX_Complex.H"
+
+#include <AMReX_BaseFab.H>
+#include <AMReX_Config.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Array4.H>
+#include <AMReX_GpuComplex.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_PODVector.H>
+
+#include <array>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
index b38bae2634a..875dfddab3b 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
@@ -21,6 +21,7 @@
 #include <AMReX_BoxArray.H>
 #include <AMReX_DistributionMapping.H>
 #include <AMReX_IntVect.H>
+#include <AMReX_Vector.H>
 
 #include <vector>
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
index 0807016fdf1..77dc118bc39 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
@@ -24,6 +24,7 @@
 #include <AMReX_PODVector.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
+#include <AMReX_BoxArray.H>
 
 #if WARPX_USE_PSATD
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
index b53fc7c4db7..10302ce7b0d 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
@@ -12,7 +12,13 @@
 
 #include <AMReX_BoxArray.H>
 #include <AMReX_LayoutData.H>
-
+#include <AMReX_Array.H>
+#include <AMReX_Config.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealVect.H>
+#include <AMReX_Vector.H>
+#include <AMReX_DistributionMapping.H>
 
 // `KVectorComponent` and `SpectralShiftFactor` hold one 1D array
 // ("DeviceVector") for each box ("LayoutData"). The arrays are
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
index d04d238ade2..16774496574 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
@@ -5,9 +5,23 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "Utils/WarpXConst.H"
 #include "SpectralKSpace.H"
 
+#include "Utils/WarpXConst.H"
+
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxList.H>
+#include <AMReX_GpuComplex.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+
+#include <array>
+#include <vector>
 #include <cmath>
 
 using namespace amrex;
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.H b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
index 295ebe9f650..82e313ec7fa 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolver.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
@@ -13,6 +13,9 @@
 #include <AMReX_Array.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealVect.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_MultiFab.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/WrapFFTW.cpp b/Source/FieldSolver/SpectralSolver/WrapFFTW.cpp
index b4999380b79..a4dfc8b293b 100644
--- a/Source/FieldSolver/SpectralSolver/WrapFFTW.cpp
+++ b/Source/FieldSolver/SpectralSolver/WrapFFTW.cpp
@@ -7,6 +7,12 @@
 
 #include "AnyFFT.H"
 
+#include <AMReX.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_REAL.H>
+
+#include <fftw3.h>
+
 namespace AnyFFT
 {
 #ifdef AMREX_USE_FLOAT
diff --git a/Source/Filter/BilinearFilter.H b/Source/Filter/BilinearFilter.H
index 0b431672eda..1bf19978dff 100644
--- a/Source/Filter/BilinearFilter.H
+++ b/Source/Filter/BilinearFilter.H
@@ -8,10 +8,9 @@
 #ifndef WARPX_BILIN_FILTER_H_
 #define WARPX_BILIN_FILTER_H_
 
-#include <AMReX_Array.H>
-
 #include "Filter.H"
 
+#include <AMReX_Array.H>
 
 class BilinearFilter : public Filter
 {
diff --git a/Source/Filter/BilinearFilter.cpp b/Source/Filter/BilinearFilter.cpp
index bbf31335d41..bb885ee887a 100644
--- a/Source/Filter/BilinearFilter.cpp
+++ b/Source/Filter/BilinearFilter.cpp
@@ -14,6 +14,7 @@
 #include <AMReX_IntVect.H>
 #include <AMReX_Vector.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Config.H>
 
 #include <array>
 #include <vector>
diff --git a/Source/Filter/Filter.H b/Source/Filter/Filter.H
index fdd37d8419f..d3bcd56a4eb 100644
--- a/Source/Filter/Filter.H
+++ b/Source/Filter/Filter.H
@@ -5,6 +5,10 @@
  * License: BSD-3-Clause-LBNL
  */
 #include <AMReX_MultiFab.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_REAL.H>
 
 #ifndef WARPX_FILTER_H_
 #define WARPX_FILTER_H_
diff --git a/Source/Filter/Filter.cpp b/Source/Filter/Filter.cpp
index 8d4b6ed563b..781dfd8045e 100644
--- a/Source/Filter/Filter.cpp
+++ b/Source/Filter/Filter.cpp
@@ -6,12 +6,19 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "Filter.H"
-#include "WarpX.H"
 
-#ifdef AMREX_USE_OMP
-#   include <omp.h>
-#endif
+#include "Utils/WarpXProfilerWrapper.H"
+
+#include <AMReX_Array4.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
 
+#include <algorithm>
 
 using namespace amrex;
 
diff --git a/Source/Filter/NCIGodfreyFilter.H b/Source/Filter/NCIGodfreyFilter.H
index 3d784c6c9c4..0bcd0fb675c 100644
--- a/Source/Filter/NCIGodfreyFilter.H
+++ b/Source/Filter/NCIGodfreyFilter.H
@@ -9,6 +9,7 @@
 
 #include "Filter.H"
 
+#include <AMReX_REAL.H>
 
 enum class godfrey_coeff_set { Ex_Ey_Bz=0, Bx_By_Ez=1 };
 
diff --git a/Source/Filter/NCIGodfreyFilter.cpp b/Source/Filter/NCIGodfreyFilter.cpp
index 4af0e2b22c3..224bfb946cc 100644
--- a/Source/Filter/NCIGodfreyFilter.cpp
+++ b/Source/Filter/NCIGodfreyFilter.cpp
@@ -5,15 +5,20 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "NCIGodfreyFilter.H"
-#include "Utils/NCIGodfreyTables.H"
-#include "WarpX.H"
 
-#include <AMReX_REAL.H>
+#include "Utils/NCIGodfreyTables.H"
 
-#ifdef AMREX_USE_OMP
-#   include <omp.h>
-#endif
+#include <AMReX.H>
+#include <AMReX_Algorithm.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Config.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_Vector.H>
 
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Initialization/InjectorDensity.H b/Source/Initialization/InjectorDensity.H
index 83a55bfe9b3..9d707f41538 100644
--- a/Source/Initialization/InjectorDensity.H
+++ b/Source/Initialization/InjectorDensity.H
@@ -10,11 +10,17 @@
 #define INJECTOR_DENSITY_H_
 
 #include "Parser/GpuParser.H"
+#include "Parser/WarpXParser.H"
 #include "CustomDensityProb.H"
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_Gpu.H>
-#include <AMReX_Dim3.H>
+#include <AMReX.H>
+#include <AMReX_Array.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_REAL.H>
+
+#include <string>
+#include <cmath>
 
 // struct whose getDensity returns constant density.
 struct InjectorDensityConstant
diff --git a/Source/Initialization/InjectorDensity.cpp b/Source/Initialization/InjectorDensity.cpp
index a6df6ae131d..3f79f8d8891 100644
--- a/Source/Initialization/InjectorDensity.cpp
+++ b/Source/Initialization/InjectorDensity.cpp
@@ -6,8 +6,15 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "InjectorDensity.H"
-#include "PlasmaInjector.H"
 
+#include "Initialization/CustomDensityProb.H"
+
+#include <AMReX_BLassert.H>
+#include <AMReX_ParmParse.H>
+
+#include <algorithm>
+#include <vector>
+#include <ctype.h>
 
 using namespace amrex;
 
diff --git a/Source/Initialization/InjectorMomentum.H b/Source/Initialization/InjectorMomentum.H
index 28223f21afb..c53405f736f 100644
--- a/Source/Initialization/InjectorMomentum.H
+++ b/Source/Initialization/InjectorMomentum.H
@@ -11,10 +11,15 @@
 #include "CustomMomentumProb.H"
 #include "Parser/GpuParser.H"
 #include "Utils/WarpXConst.H"
+#include "Parser/WarpXParser.H"
 
-#include <AMReX_Gpu.H>
+#include <AMReX.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Random.H>
 #include <AMReX_Dim3.H>
 
+#include <string>
 #include <cmath>
 
 
diff --git a/Source/Initialization/InjectorMomentum.cpp b/Source/Initialization/InjectorMomentum.cpp
index 236fd1b4643..40e247cd9a8 100644
--- a/Source/Initialization/InjectorMomentum.cpp
+++ b/Source/Initialization/InjectorMomentum.cpp
@@ -6,8 +6,6 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "InjectorMomentum.H"
-#include "PlasmaInjector.H"
-
 
 using namespace amrex;
 
diff --git a/Source/Initialization/PlasmaInjector.H b/Source/Initialization/PlasmaInjector.H
index ce4d3184242..daaacf50267 100644
--- a/Source/Initialization/PlasmaInjector.H
+++ b/Source/Initialization/PlasmaInjector.H
@@ -14,19 +14,18 @@
 #include "InjectorDensity.H"
 #include "InjectorMomentum.H"
 
-#include "Utils/WarpXConst.H"
-#include "Parser/WarpXParser.H"
-
 #include <AMReX_Vector.H>
 #include <AMReX_ParmParse.H>
-#include <AMReX_Utility.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_REAL.H>
 
 #ifdef WARPX_USE_OPENPMD
 #   include <openPMD/openPMD.hpp>
 #endif
 
-#include <array>
 #include <memory>
+#include <limits>
+#include <string>
 
 ///
 /// The PlasmaInjector class parses and stores information about the plasma
diff --git a/Source/Initialization/PlasmaInjector.cpp b/Source/Initialization/PlasmaInjector.cpp
index e838cfcb4c1..c29f9204056 100644
--- a/Source/Initialization/PlasmaInjector.cpp
+++ b/Source/Initialization/PlasmaInjector.cpp
@@ -8,6 +8,7 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "PlasmaInjector.H"
+
 #include "Particles/SpeciesPhysicalProperties.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
@@ -16,11 +17,19 @@
 #include <AMReX.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_Print.H>
-
-#include <functional>
+#include <AMReX_BLassert.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_RandomEngine.H>
+
+#include <algorithm>
+#include <map>
+#include <utility>
+#include <vector>
 #include <sstream>
-#include <string>
 #include <memory>
+#include <ctype.h>
 
 using namespace amrex;
 
diff --git a/Source/Initialization/WarpXInitData.cpp b/Source/Initialization/WarpXInitData.cpp
index b6182b1ff3a..aa6f70c2715 100644
--- a/Source/Initialization/WarpXInitData.cpp
+++ b/Source/Initialization/WarpXInitData.cpp
@@ -9,20 +9,58 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
+
 #include "Filter/BilinearFilter.H"
 #include "Filter/NCIGodfreyFilter.H"
 #include "Parser/GpuParser.H"
 #include "Utils/WarpXUtil.H"
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "BoundaryConditions/PML.H"
+#include "Diagnostics/BackTransformedDiagnostic.H"
+#include "Diagnostics/MultiDiagnostics.H"
+#include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
+#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H"
+#include "Parser/WarpXParserWrapper.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Utils/WarpXConst.H"
+#include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
-
+#include <ctype.h>
+#include <AMReX.H>
+#include <AMReX_AmrCore.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_BoxList.H>
+#include <AMReX_Config.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_INT.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_Print.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_SPACE.H>
+#include <AMReX_Vector.H>
 #ifdef BL_USE_SENSEI_INSITU
 #   include <AMReX_AmrMeshInSituBridge.H>
 #endif
 
 #include <memory>
+#include <algorithm>
+#include <array>
+#include <iostream>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace amrex;
 

From 0088e482d534fa93616694fda9288b55eddd6d6c Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Wed, 12 May 2021 14:17:27 +0200
Subject: [PATCH 12/58] fixed bug

---
 Source/BoundaryConditions/PML.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/BoundaryConditions/PML.cpp b/Source/BoundaryConditions/PML.cpp
index 7f4f0dfebc3..016de485d73 100644
--- a/Source/BoundaryConditions/PML.cpp
+++ b/Source/BoundaryConditions/PML.cpp
@@ -13,8 +13,10 @@
 #include "BoundaryConditions/PMLComponent.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#ifdef WARPX_USE_PSATD
+#   include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+#endif
 
 #include <AMReX.H>
 #include <AMReX_VisMF.H>

From b178fe39e16cf8b7c7c374210871ffe3ece16020 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Wed, 12 May 2021 14:25:04 +0200
Subject: [PATCH 13/58] fixed bug

---
 Source/FieldSolver/WarpXPushFieldsEM.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/FieldSolver/WarpXPushFieldsEM.cpp b/Source/FieldSolver/WarpXPushFieldsEM.cpp
index 9da95800d0f..92df6600695 100644
--- a/Source/FieldSolver/WarpXPushFieldsEM.cpp
+++ b/Source/FieldSolver/WarpXPushFieldsEM.cpp
@@ -16,6 +16,7 @@
 #if defined(WARPX_DIM_RZ) || defined(WARPX_USE_PSATD)
 #   include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #   include "FieldSolver/SpectralSolver/SpectralSolver.H"
+#endif
 #include "BoundaryConditions/WarpX_PML_kernels.H"
 #include "BoundaryConditions/PML_current.H"
 #include "WarpX_FDTD.H"

From 2c131719b099d1507048486ac34d193edff06938 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Wed, 12 May 2021 15:50:19 +0200
Subject: [PATCH 14/58] progress with IWYU

---
 Source/BoundaryConditions/PML.H              |  3 -
 Source/Diagnostics/MultiDiagnostics.H        |  2 +-
 Source/Parallelization/WarpXComm.cpp         |  6 +-
 Source/Parallelization/WarpXRegrid.cpp       |  3 +
 Source/Parallelization/WarpXSumGuardCells.H  |  2 +
 Source/Particles/LaserParticleContainer.cpp  |  2 +
 Source/Particles/MultiParticleContainer.cpp  |  1 +
 Source/Particles/PhysicalParticleContainer.H |  2 +
 Source/WarpX.H                               | 83 +++++++++++++-------
 Source/WarpX.cpp                             | 12 ++-
 10 files changed, 82 insertions(+), 34 deletions(-)

diff --git a/Source/BoundaryConditions/PML.H b/Source/BoundaryConditions/PML.H
index 651ee8c70c0..869bac55a1d 100644
--- a/Source/BoundaryConditions/PML.H
+++ b/Source/BoundaryConditions/PML.H
@@ -9,9 +9,6 @@
 #ifndef WARPX_PML_H_
 #define WARPX_PML_H_
 
-class MultiSigmaBox; /*Forward declaration*/
-class PML;           /*Forward declaration*/
-
 #ifdef WARPX_USE_PSATD
 #   include "FieldSolver/SpectralSolver/SpectralSolver.H"
 #endif
diff --git a/Source/Diagnostics/MultiDiagnostics.H b/Source/Diagnostics/MultiDiagnostics.H
index 491460eea19..22246c7c658 100644
--- a/Source/Diagnostics/MultiDiagnostics.H
+++ b/Source/Diagnostics/MultiDiagnostics.H
@@ -1,7 +1,7 @@
 #ifndef WARPX_MULTIDIAGNOSTICS_H_
 #define WARPX_MULTIDIAGNOSTICS_H_
 
-#include "Diagnostics/Diagnostics.H"
+#include "Diagnostics.H"
 
 #include <AMReX_Vector.H>
 
diff --git a/Source/Parallelization/WarpXComm.cpp b/Source/Parallelization/WarpXComm.cpp
index 3badbdf2df1..2025bb9ce5e 100644
--- a/Source/Parallelization/WarpXComm.cpp
+++ b/Source/Parallelization/WarpXComm.cpp
@@ -7,11 +7,15 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpXComm_K.H"
+
 #include "WarpX.H"
 #include "WarpXSumGuardCells.H"
 #include "Utils/CoarsenMR.H"
+#include "Utils/WarpXProfilerWrapper.H"
+#include "BoundaryConditions/PML.H"
+
 #ifdef WARPX_USE_PSATD
-#include "FieldSolver/SpectralSolver/SpectralKSpace.H"
+#   include "FieldSolver/SpectralSolver/SpectralKSpace.H"
 #endif
 
 #include <algorithm>
diff --git a/Source/Parallelization/WarpXRegrid.cpp b/Source/Parallelization/WarpXRegrid.cpp
index f222f90dc0f..c20c7d96b22 100644
--- a/Source/Parallelization/WarpXRegrid.cpp
+++ b/Source/Parallelization/WarpXRegrid.cpp
@@ -7,7 +7,10 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
+
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXProfilerWrapper.H"
+#include "Particles/MultiParticleContainer.H"
 
 #include <AMReX_BLProfiler.H>
 
diff --git a/Source/Parallelization/WarpXSumGuardCells.H b/Source/Parallelization/WarpXSumGuardCells.H
index b9789b45ca4..53894f686a5 100644
--- a/Source/Parallelization/WarpXSumGuardCells.H
+++ b/Source/Parallelization/WarpXSumGuardCells.H
@@ -8,6 +8,8 @@
 #ifndef WARPX_SUM_GUARD_CELLS_H_
 #define WARPX_SUM_GUARD_CELLS_H_
 
+#include "Utils/WarpXAlgorithmSelection.H"
+
 #include <AMReX_MultiFab.H>
 
 /** \brief Sum the values of `mf`, where the different boxes overlap
diff --git a/Source/Particles/LaserParticleContainer.cpp b/Source/Particles/LaserParticleContainer.cpp
index c5fe3e4fb31..6e3ccf90f7e 100644
--- a/Source/Particles/LaserParticleContainer.cpp
+++ b/Source/Particles/LaserParticleContainer.cpp
@@ -11,6 +11,8 @@
 #include "Utils/WarpX_Complex.H"
 #include "Particles/MultiParticleContainer.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
+#include "Utils/WarpXProfilerWrapper.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 
 #include <AMReX.H>
 
diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
index 4f6bdf05cca..f8dee2ae338 100644
--- a/Source/Particles/MultiParticleContainer.cpp
+++ b/Source/Particles/MultiParticleContainer.cpp
@@ -12,6 +12,7 @@
 #include "MultiParticleContainer.H"
 #include "SpeciesPhysicalProperties.H"
 #include "WarpX.H"
+#include "Utils/WarpXProfilerWrapper.H"
 #ifdef WARPX_QED
     #include "Particles/ElementaryProcess/QEDInternals/SchwingerProcessWrapper.H"
     #include "Particles/ElementaryProcess/QEDSchwingerProcess.H"
diff --git a/Source/Particles/PhysicalParticleContainer.H b/Source/Particles/PhysicalParticleContainer.H
index 000caf7908e..84271a12403 100644
--- a/Source/Particles/PhysicalParticleContainer.H
+++ b/Source/Particles/PhysicalParticleContainer.H
@@ -15,6 +15,8 @@
 #include "Filter/NCIGodfreyFilter.H"
 #include "Particles/ElementaryProcess/Ionization.H"
 #include "Particles/Gather/ScaleFields.H"
+#include "Utils/WarpXProfilerWrapper.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 
 #ifdef WARPX_QED
 #    include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
diff --git a/Source/WarpX.H b/Source/WarpX.H
index 8d3161d5a09..07f8fcf4498 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -12,44 +12,17 @@
 #ifndef WARPX_H_
 #define WARPX_H_
 
-#include "BoundaryConditions/PML.H"
 #include "Evolve/WarpXDtType.H"
-#include "Particles/MultiParticleContainer.H"
-#include "Diagnostics/BackTransformedDiagnostic.H"
-#include "Diagnostics/MultiDiagnostics.H"
 #include "Filter/BilinearFilter.H"
-#include "Filter/NCIGodfreyFilter.H"
-#include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
-#include "Utils/WarpXUtil.H"
-#include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/IntervalsParser.H"
-#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H"
-
-#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
-#ifdef WARPX_USE_PSATD
-#   ifdef WARPX_DIM_RZ
-#       include "FieldSolver/SpectralSolver/SpectralSolverRZ.H"
-#   else
-#       include "FieldSolver/SpectralSolver/SpectralSolver.H"
-#   endif
-#endif
-
 #include "Parallelization/GuardCellManager.H"
-
-#ifdef WARPX_USE_OPENPMD
-#   include "Diagnostics/WarpXOpenPMD.H"
-#endif
-
 #include "Parser/WarpXParserWrapper.H"
+#include "Diagnostics/MultiDiagnostics.H"
 
 #include <AMReX_AmrCore.H>
-#include <AMReX_BLProfiler.H>
-#include <AMReX_Geometry.H>
 #include <AMReX_RealVect.H>
 #include <AMReX_iMultiFab.H>
 #include <AMReX_VisMF.H>
-#include <AMReX_LayoutData.H>
-#include <AMReX_FillPatchUtil.H>
 #include <AMReX.H>
 #include <AMReX_Array.H>
 #include <AMReX_Config.H>
@@ -58,6 +31,60 @@
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
 #include <AMReX_Vector.H>
+#ifdef AMREX_USE_EB
+#   include "AMReX_EBFabFactory.H"
+#endif
+
+// _______________________________________________WarpX Forward declarations
+class BackTransformedDiagnostic;
+class FiniteDifferenceSolver;
+class MacroscopicProperties;
+class MultiDiagnostics;
+class MultiParticleContainer;
+class MultiReducedDiags;
+class NCIGodfreyFilter;
+class PML;
+class WarpXParticleContainer;
+class SpectralSolverRZ;
+class SpectralSolver;
+// _______________________________________________Headers
+//#include "Diagnostics/BackTransformedDiagnostic.H"
+//#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
+//#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H"
+//#include "Diagnostics/MultiDiagnostics.H"
+//#include "Particles/MultiParticleContainer.H"
+//#include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
+//#include "Filter/NCIGodfreyFilter.H"
+//#include "BoundaryConditions/PML.H"
+//#include "FieldSolver/SpectralSolver/SpectralSolver.H"
+//#ifdef WARPX_USE_PSATD
+//#   ifdef WARPX_DIM_RZ
+//#       include "FieldSolver/SpectralSolver/SpectralSolverRZ.H"
+//#   else
+//#       include "FieldSolver/SpectralSolver/SpectralSolver.H"
+//#   endif
+//#endif
+// ________________________________________________________________________
+
+// _______________________________________________AMReX Forward declarations
+namespace amrex { class Box; }
+namespace amrex { class BoxArray; }
+namespace amrex { class DistributionMapping; }
+namespace amrex { class FArrayBox; }
+namespace amrex { class Geometry; }
+namespace amrex { class IArrayBox; }
+namespace amrex { class MultiFab; }
+namespace amrex { class TagBoxArray; }
+namespace amrex { class iMultiFab; }
+namespace amrex { template <typename FAB> class FabFactory; }
+namespace amrex { template <typename T> class LayoutData; }
+// _______________________________________________Headers
+//#include <AMReX_Geometry.H>
+//#include <AMReX_LayoutData.H>
+//#include <AMReX_iMultiFab.H>
+// #include <AMReX_LayoutData.H>
+// ________________________________________________________________________
+
 
 #include <iostream>
 #include <memory>
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index 7ba3e97fc32..d771032568e 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -13,12 +13,22 @@
 
 #include "FieldSolver/WarpX_FDTD.H"
 #ifdef WARPX_USE_PSATD
-#include "FieldSolver/SpectralSolver/SpectralKSpace.H"
+#   include "FieldSolver/SpectralSolver/SpectralSolver.H"
+#   include "FieldSolver/SpectralSolver/SpectralKSpace.H"
+#endif
+#ifdef WARPX_DIM_RZ
+#   include "FieldSolver/SpectralSolver/SpectralSolverRZ.H"
 #endif
 #include "Python/WarpXWrappers.h"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
+#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
+#include "Diagnostics/MultiDiagnostics.H"
+#include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
+#include "Diagnostics/BackTransformedDiagnostic.H"
 
 #include <AMReX_ParmParse.H>
 #include <AMReX_MultiFabUtil.H>

From dbb9cd777f13653249ccdd0053814b8ee8f810e3 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Wed, 12 May 2021 17:14:08 +0200
Subject: [PATCH 15/58] progress with IWYU + use forward declarations in
 WarpX.H

---
 Source/Parallelization/WarpXRegrid.cpp              | 1 +
 Source/Particles/Gather/GetExternalFields.cpp       | 4 +++-
 Source/Particles/RigidInjectedParticleContainer.cpp | 1 +
 Source/Python/WarpXWrappers.cpp                     | 2 ++
 Source/WarpX.H                                      | 1 -
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Source/Parallelization/WarpXRegrid.cpp b/Source/Parallelization/WarpXRegrid.cpp
index c20c7d96b22..872a78c0e01 100644
--- a/Source/Parallelization/WarpXRegrid.cpp
+++ b/Source/Parallelization/WarpXRegrid.cpp
@@ -11,6 +11,7 @@
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXProfilerWrapper.H"
 #include "Particles/MultiParticleContainer.H"
+#include "Diagnostics/MultiDiagnostics.H"
 
 #include <AMReX_BLProfiler.H>
 
diff --git a/Source/Particles/Gather/GetExternalFields.cpp b/Source/Particles/Gather/GetExternalFields.cpp
index c1fbe49daca..e8ff350d839 100644
--- a/Source/Particles/Gather/GetExternalFields.cpp
+++ b/Source/Particles/Gather/GetExternalFields.cpp
@@ -1,6 +1,8 @@
-#include "WarpX.H"
 #include "Particles/Gather/GetExternalFields.H"
 
+#include "WarpX.H"
+#include "Particles/MultiParticleContainer.H"
+
 GetExternalEField::GetExternalEField (const WarpXParIter& a_pti, int a_offset) noexcept
 {
     auto& warpx = WarpX::GetInstance();
diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp
index 5cb49f69ce3..fad735b7d8e 100644
--- a/Source/Particles/RigidInjectedParticleContainer.cpp
+++ b/Source/Particles/RigidInjectedParticleContainer.cpp
@@ -14,6 +14,7 @@
 #include "RigidInjectedParticleContainer.H"
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
+#include "Utils/WarpXUtil.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Pusher/UpdateMomentumBoris.H"
 #include "Pusher/UpdateMomentumVay.H"
diff --git a/Source/Python/WarpXWrappers.cpp b/Source/Python/WarpXWrappers.cpp
index be06c259ecb..37e55652c69 100644
--- a/Source/Python/WarpXWrappers.cpp
+++ b/Source/Python/WarpXWrappers.cpp
@@ -12,6 +12,8 @@
 #include "WarpX.H"
 #include "Utils/WarpXUtil.H"
 #include "WarpX_py.H"
+#include "Particles/MultiParticleContainer.H"
+#include "BoundaryConditions/PML.H"
 
 #include <AMReX.H>
 #include <AMReX_BLProfiler.H>
diff --git a/Source/WarpX.H b/Source/WarpX.H
index 07f8fcf4498..4c57c769f82 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -17,7 +17,6 @@
 #include "Utils/IntervalsParser.H"
 #include "Parallelization/GuardCellManager.H"
 #include "Parser/WarpXParserWrapper.H"
-#include "Diagnostics/MultiDiagnostics.H"
 
 #include <AMReX_AmrCore.H>
 #include <AMReX_RealVect.H>

From 377cfe7fb403fa35bfe19cb630ca6190d4d47f25 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 15 May 2021 16:08:41 +0200
Subject: [PATCH 16/58] first try with .def files

---
 Source/BoundaryConditions/PML.def             | 16 ++++++
 .../Diagnostics/BackTransformedDiagnostic.def | 11 ++++
 Source/Diagnostics/MultiDiagnostics.def       |  8 +++
 .../ReducedDiags/MultiReducedDiags.def        |  8 +++
 .../FiniteDifferenceSolver.H                  |  3 --
 .../FiniteDifferenceSolver.def                |  8 +++
 .../MacroscopicProperties.def                 |  8 +++
 .../SpectralSolver/SpectralSolver.def         |  8 +++
 .../SpectralSolver/SpectralSolverRZ.def       |  8 +++
 Source/Filter/NCIGodfreyFilter.def            | 10 ++++
 Source/Particles/MultiParticleContainer.def   |  8 +++
 Source/Particles/WarpXParticleContainer.def   | 17 +++++++
 Source/WarpX.H                                | 51 +++++++------------
 13 files changed, 129 insertions(+), 35 deletions(-)
 create mode 100644 Source/BoundaryConditions/PML.def
 create mode 100644 Source/Diagnostics/BackTransformedDiagnostic.def
 create mode 100644 Source/Diagnostics/MultiDiagnostics.def
 create mode 100644 Source/Diagnostics/ReducedDiags/MultiReducedDiags.def
 create mode 100644 Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.def
 create mode 100644 Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.def
 create mode 100644 Source/FieldSolver/SpectralSolver/SpectralSolver.def
 create mode 100644 Source/FieldSolver/SpectralSolver/SpectralSolverRZ.def
 create mode 100644 Source/Filter/NCIGodfreyFilter.def
 create mode 100644 Source/Particles/MultiParticleContainer.def
 create mode 100644 Source/Particles/WarpXParticleContainer.def

diff --git a/Source/BoundaryConditions/PML.def b/Source/BoundaryConditions/PML.def
new file mode 100644
index 00000000000..7395a2c87cd
--- /dev/null
+++ b/Source/BoundaryConditions/PML.def
@@ -0,0 +1,16 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+struct Sigma;
+struct SigmaBox;
+
+class SigmaBoxFactory;
+class MultiSigmaBox;
+
+enum struct PatchType;
+
+class PML;
diff --git a/Source/Diagnostics/BackTransformedDiagnostic.def b/Source/Diagnostics/BackTransformedDiagnostic.def
new file mode 100644
index 00000000000..32ff20f762d
--- /dev/null
+++ b/Source/Diagnostics/BackTransformedDiagnostic.def
@@ -0,0 +1,11 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+
+class LabFrameDiag;
+class LabFrameSnapShot;
+class BackTransformedDiagnostic;
diff --git a/Source/Diagnostics/MultiDiagnostics.def b/Source/Diagnostics/MultiDiagnostics.def
new file mode 100644
index 00000000000..195174bb959
--- /dev/null
+++ b/Source/Diagnostics/MultiDiagnostics.def
@@ -0,0 +1,8 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class MultiDiagnostics;
diff --git a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.def b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.def
new file mode 100644
index 00000000000..c3b9c1f514a
--- /dev/null
+++ b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.def
@@ -0,0 +1,8 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class MultiReducedDiags;
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
index d6f34afca59..41d7346575c 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
@@ -8,9 +8,6 @@
 #ifndef WARPX_FINITE_DIFFERENCE_SOLVER_H_
 #define WARPX_FINITE_DIFFERENCE_SOLVER_H_
 
-class FiniteDifferenceSolver; /*Forward declaration*/
-
-#include "BoundaryConditions/PML.H"
 #include "MacroscopicProperties/MacroscopicProperties.H"
 
 #include <AMReX_MultiFab.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.def b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.def
new file mode 100644
index 00000000000..4ecd05116c4
--- /dev/null
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.def
@@ -0,0 +1,8 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class FiniteDifferenceSolver;
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.def b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.def
new file mode 100644
index 00000000000..2ca4662d7dc
--- /dev/null
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.def
@@ -0,0 +1,8 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class MacroscopicProperties;
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.def b/Source/FieldSolver/SpectralSolver/SpectralSolver.def
new file mode 100644
index 00000000000..fecd3bd8b2c
--- /dev/null
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.def
@@ -0,0 +1,8 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class SpectralSolver;
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.def b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.def
new file mode 100644
index 00000000000..bfe332fe742
--- /dev/null
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.def
@@ -0,0 +1,8 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class SpectralSolverRZ;
diff --git a/Source/Filter/NCIGodfreyFilter.def b/Source/Filter/NCIGodfreyFilter.def
new file mode 100644
index 00000000000..33e098ddeaf
--- /dev/null
+++ b/Source/Filter/NCIGodfreyFilter.def
@@ -0,0 +1,10 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+enum class godfrey_coeff_set;
+
+class NCIGodfreyFilter;
diff --git a/Source/Particles/MultiParticleContainer.def b/Source/Particles/MultiParticleContainer.def
new file mode 100644
index 00000000000..20316a9cd53
--- /dev/null
+++ b/Source/Particles/MultiParticleContainer.def
@@ -0,0 +1,8 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class MultiParticleContainer;
diff --git a/Source/Particles/WarpXParticleContainer.def b/Source/Particles/WarpXParticleContainer.def
new file mode 100644
index 00000000000..4228892e6d1
--- /dev/null
+++ b/Source/Particles/WarpXParticleContainer.def
@@ -0,0 +1,17 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+enum struct ParticleBC;
+enum struct ConvertDirection;
+
+struct PIdx;
+struct DiagIdx;
+struct TmpIdx;
+
+class WarpXParIter;
+
+class WarpXParticleContainer;
diff --git a/Source/WarpX.H b/Source/WarpX.H
index 4c57c769f82..41817a128be 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -17,6 +17,25 @@
 #include "Utils/IntervalsParser.H"
 #include "Parallelization/GuardCellManager.H"
 #include "Parser/WarpXParserWrapper.H"
+// _______________________________________________WarpX Forward declarations
+#include "Diagnostics/BackTransformedDiagnostic.def"
+#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.def"
+#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.def"
+#include "Diagnostics/MultiDiagnostics.def"
+#include "Particles/MultiParticleContainer.def"
+#include "Diagnostics/ReducedDiags/MultiReducedDiags.def"
+#include "Filter/NCIGodfreyFilter.def"
+#include "BoundaryConditions/PML.def"
+#include "Particles/WarpXParticleContainer.def"
+#include "FieldSolver/SpectralSolver/SpectralSolver.H"
+#ifdef WARPX_USE_PSATD
+#   ifdef WARPX_DIM_RZ
+#       include "FieldSolver/SpectralSolver/SpectralSolverRZ.def"
+#   else
+#       include "FieldSolver/SpectralSolver/SpectralSolver.def"
+#   endif
+#endif
+// ________________________________________________________________________
 
 #include <AMReX_AmrCore.H>
 #include <AMReX_RealVect.H>
@@ -34,37 +53,6 @@
 #   include "AMReX_EBFabFactory.H"
 #endif
 
-// _______________________________________________WarpX Forward declarations
-class BackTransformedDiagnostic;
-class FiniteDifferenceSolver;
-class MacroscopicProperties;
-class MultiDiagnostics;
-class MultiParticleContainer;
-class MultiReducedDiags;
-class NCIGodfreyFilter;
-class PML;
-class WarpXParticleContainer;
-class SpectralSolverRZ;
-class SpectralSolver;
-// _______________________________________________Headers
-//#include "Diagnostics/BackTransformedDiagnostic.H"
-//#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
-//#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H"
-//#include "Diagnostics/MultiDiagnostics.H"
-//#include "Particles/MultiParticleContainer.H"
-//#include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
-//#include "Filter/NCIGodfreyFilter.H"
-//#include "BoundaryConditions/PML.H"
-//#include "FieldSolver/SpectralSolver/SpectralSolver.H"
-//#ifdef WARPX_USE_PSATD
-//#   ifdef WARPX_DIM_RZ
-//#       include "FieldSolver/SpectralSolver/SpectralSolverRZ.H"
-//#   else
-//#       include "FieldSolver/SpectralSolver/SpectralSolver.H"
-//#   endif
-//#endif
-// ________________________________________________________________________
-
 // _______________________________________________AMReX Forward declarations
 namespace amrex { class Box; }
 namespace amrex { class BoxArray; }
@@ -84,7 +72,6 @@ namespace amrex { template <typename T> class LayoutData; }
 // #include <AMReX_LayoutData.H>
 // ________________________________________________________________________
 
-
 #include <iostream>
 #include <memory>
 #include <array>

From a4ff7473b3714b92cdf1f986c1639225cb50e10b Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 15 May 2021 16:31:36 +0200
Subject: [PATCH 17/58] fix bugs

---
 Source/BoundaryConditions/PML.H                                | 2 ++
 .../FiniteDifferenceSolver/FiniteDifferenceSolver.H            | 3 +++
 Source/WarpX.H                                                 | 1 -
 Source/WarpX.cpp                                               | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Source/BoundaryConditions/PML.H b/Source/BoundaryConditions/PML.H
index 869bac55a1d..ba1f7cd2167 100644
--- a/Source/BoundaryConditions/PML.H
+++ b/Source/BoundaryConditions/PML.H
@@ -180,6 +180,8 @@ public:
 
     static void Exchange (amrex::MultiFab& pml, amrex::MultiFab& reg, const amrex::Geometry& geom, int do_pml_in_domain);
 
+    ~PML () = default;
+
 private:
     bool m_ok;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
index 41d7346575c..79792ac822c 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
@@ -9,6 +9,9 @@
 #define WARPX_FINITE_DIFFERENCE_SOLVER_H_
 
 #include "MacroscopicProperties/MacroscopicProperties.H"
+// _______________________________________________WarpX Forward declarations
+#include "BoundaryConditions/PML.def"
+//________________________________________________
 
 #include <AMReX_MultiFab.H>
 #include <AMReX_GpuContainers.H>
diff --git a/Source/WarpX.H b/Source/WarpX.H
index 41817a128be..30ec258426b 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -27,7 +27,6 @@
 #include "Filter/NCIGodfreyFilter.def"
 #include "BoundaryConditions/PML.def"
 #include "Particles/WarpXParticleContainer.def"
-#include "FieldSolver/SpectralSolver/SpectralSolver.H"
 #ifdef WARPX_USE_PSATD
 #   ifdef WARPX_DIM_RZ
 #       include "FieldSolver/SpectralSolver/SpectralSolverRZ.def"
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index d771032568e..d3d65c94c0d 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -29,6 +29,7 @@
 #include "Diagnostics/MultiDiagnostics.H"
 #include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
 #include "Diagnostics/BackTransformedDiagnostic.H"
+#include "BoundaryConditions/PML.H"
 
 #include <AMReX_ParmParse.H>
 #include <AMReX_MultiFabUtil.H>

From 7a9f121e5d3e534ae5743b06efdc04284ff40299 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Mon, 17 May 2021 11:08:26 +0200
Subject: [PATCH 18/58] progress with IWYU

---
 Source/BoundaryConditions/PML.H               |  1 -
 .../ComputeDiagFunctor.def                    |  9 ++++++
 Source/Diagnostics/Diagnostics.H              |  6 ++--
 .../Diagnostics/FlushFormats/FlushFormat.def  |  8 +++++
 .../FlushFormats/FlushFormatAscent.H          |  4 ++-
 .../FlushFormats/FlushFormatCheckpoint.H      |  3 ++
 .../FlushFormats/FlushFormatOpenPMD.H         |  4 +++
 .../FlushFormats/FlushFormatPlotfile.H        |  4 ++-
 .../Diagnostics/ParticleDiag/ParticleDiag.H   |  6 ++--
 .../Diagnostics/ParticleDiag/ParticleDiag.cpp |  1 +
 .../Diagnostics/ParticleDiag/ParticleDiag.def | 10 ++++++
 Source/Diagnostics/WarpXOpenPMD.H             |  4 ++-
 .../FiniteDifferenceSolver.H                  |  2 +-
 .../MacroscopicEvolveE.cpp                    |  1 -
 .../SpectralAlgorithms/PMLPsatdAlgorithm.H    |  9 +++---
 .../SpectralAlgorithms/PMLPsatdAlgorithm.cpp  |  5 +++
 .../SpectralBaseAlgorithm.H                   | 32 +++++++++----------
 .../SpectralBaseAlgorithm.cpp                 | 21 ++++++++++++
 .../SpectralSolver/SpectralFieldData.def      | 12 +++++++
 .../SpectralSolver/SpectralKSpace.def         | 10 ++++++
 Source/Initialization/InjectorPosition.def    | 10 ++++++
 Source/Initialization/PlasmaInjector.H        |  6 ++--
 Source/Initialization/PlasmaInjector.cpp      |  3 ++
 .../LaserProfileFieldFunction.cpp             | 12 +++++++
 .../LaserProfileFromTXYEFile.cpp              | 21 ++++++++++--
 .../LaserProfileGaussian.cpp                  | 16 ++++++++--
 .../LaserProfilesImpl/LaserProfileHarris.cpp  |  8 ++++-
 Source/Parallelization/GuardCellManager.H     |  2 ++
 Source/Parallelization/GuardCellManager.cpp   |  7 +++-
 Source/Parallelization/WarpXComm.cpp          |  9 ++----
 Source/Parser/WarpXParser.H                   | 18 +++++------
 Source/Parser/WarpXParserWrapper.def          |  9 ++++++
 .../Particles/PhysicalParticleContainer.cpp   |  1 +
 Source/WarpX.cpp                              |  9 ++++--
 34 files changed, 226 insertions(+), 57 deletions(-)
 create mode 100644 Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.def
 create mode 100644 Source/Diagnostics/FlushFormats/FlushFormat.def
 create mode 100644 Source/Diagnostics/ParticleDiag/ParticleDiag.def
 create mode 100644 Source/FieldSolver/SpectralSolver/SpectralFieldData.def
 create mode 100644 Source/FieldSolver/SpectralSolver/SpectralKSpace.def
 create mode 100644 Source/Initialization/InjectorPosition.def
 create mode 100644 Source/Parser/WarpXParserWrapper.def

diff --git a/Source/BoundaryConditions/PML.H b/Source/BoundaryConditions/PML.H
index ba1f7cd2167..33ebacb3054 100644
--- a/Source/BoundaryConditions/PML.H
+++ b/Source/BoundaryConditions/PML.H
@@ -12,7 +12,6 @@
 #ifdef WARPX_USE_PSATD
 #   include "FieldSolver/SpectralSolver/SpectralSolver.H"
 #endif
-#include <Utils/WarpXProfilerWrapper.H>
 
 #include <AMReX_MultiFab.H>
 #include <AMReX_Geometry.H>
diff --git a/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.def b/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.def
new file mode 100644
index 00000000000..ca4b730585f
--- /dev/null
+++ b/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.def
@@ -0,0 +1,9 @@
+/* Copyright 2019 Andrew Myers, Axel Huebl, Maxence Thevenet
+ * Revathi Jambunathan, Weiqun Zhang
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class ComputeDiagFunctor;
diff --git a/Source/Diagnostics/Diagnostics.H b/Source/Diagnostics/Diagnostics.H
index 6badc364d82..16fa15c3fbe 100644
--- a/Source/Diagnostics/Diagnostics.H
+++ b/Source/Diagnostics/Diagnostics.H
@@ -2,8 +2,10 @@
 #define WARPX_DIAGNOSTICS_H_
 
 #include "ParticleDiag/ParticleDiag.H"
-#include "FlushFormats/FlushFormat.H"
-#include "ComputeDiagFunctors/ComputeDiagFunctor.H"
+// _______________________________________________WarpX Forward declarations
+#include "FlushFormats/FlushFormat.def"
+#include "ComputeDiagFunctors/ComputeDiagFunctor.def"
+//________________________________________________________________________
 
 #include <AMReX_Vector.H>
 #include <AMReX_MultiFab.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormat.def b/Source/Diagnostics/FlushFormats/FlushFormat.def
new file mode 100644
index 00000000000..53890ddbd7e
--- /dev/null
+++ b/Source/Diagnostics/FlushFormats/FlushFormat.def
@@ -0,0 +1,8 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class FlushFormat;
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
index b9258b1410a..64dba02f394 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
@@ -2,7 +2,9 @@
 #define WARPX_FLUSHFORMATASCENT_H_
 
 #include "FlushFormat.H"
-#include "Diagnostics/ParticleDiag/ParticleDiag.H"
+// _______________________________________________WarpX Forward declarations
+#include "Diagnostics/ParticleDiag/ParticleDiag.def"
+//________________________________________________________________________
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Vector.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
index d23cc386509..22fc274f58c 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
@@ -2,6 +2,9 @@
 #define WARPX_FLUSHFORMATCHECKPOINT_H_
 
 #include "FlushFormatPlotfile.H"
+// _______________________________________________WarpX Forward declarations
+#include "Diagnostics/ParticleDiag/ParticleDiag.def"
+//________________________________________________________________________
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Vector.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
index c83ad731570..750fa320fc4 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
@@ -3,6 +3,10 @@
 
 #include "FlushFormat.H"
 #include "Diagnostics/WarpXOpenPMD.H"
+// _______________________________________________WarpX Forward declarations
+#include "Diagnostics/ParticleDiag/ParticleDiag.def"
+//________________________________________________________________________
+
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Vector.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
index f26ab63d47a..21500282981 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
@@ -2,7 +2,9 @@
 #define WARPX_FLUSHFORMATPLOTFILE_H_
 
 #include "FlushFormat.H"
-#include "Diagnostics/ParticleDiag/ParticleDiag.H"
+// _______________________________________________WarpX Forward declarations
+#include "Diagnostics/ParticleDiag/ParticleDiag.def"
+//________________________________________________________________________
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Vector.H>
diff --git a/Source/Diagnostics/ParticleDiag/ParticleDiag.H b/Source/Diagnostics/ParticleDiag/ParticleDiag.H
index e26b49df0d9..00c7ee4efc5 100644
--- a/Source/Diagnostics/ParticleDiag/ParticleDiag.H
+++ b/Source/Diagnostics/ParticleDiag/ParticleDiag.H
@@ -1,8 +1,10 @@
 #ifndef WARPX_PARTICLEDIAG_H_
 #define WARPX_PARTICLEDIAG_H_
 
-#include "Parser/WarpXParserWrapper.H"
-#include "Particles/WarpXParticleContainer.H"
+// _______________________________________________WarpX Forward declarations
+#include "Particles/WarpXParticleContainer.def"
+#include "Parser/WarpXParserWrapper.def"
+//________________________________________________________________________
 
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
diff --git a/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp b/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp
index 68710ff6c6e..64f91104977 100644
--- a/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp
+++ b/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp
@@ -4,6 +4,7 @@
 #include "Utils/WarpXUtil.H"
 #include "Diagnostics/ParticleDiag/ParticleDiag.H"
 #include "Particles/WarpXParticleContainer.H"
+#include "Parser/WarpXParserWrapper.H"
 
 #include <AMReX_ParmParse.H>
 
diff --git a/Source/Diagnostics/ParticleDiag/ParticleDiag.def b/Source/Diagnostics/ParticleDiag/ParticleDiag.def
new file mode 100644
index 00000000000..99cecb2198a
--- /dev/null
+++ b/Source/Diagnostics/ParticleDiag/ParticleDiag.def
@@ -0,0 +1,10 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class ParticleDiag;
+
+
diff --git a/Source/Diagnostics/WarpXOpenPMD.H b/Source/Diagnostics/WarpXOpenPMD.H
index 3274b7a810f..66674a2a502 100644
--- a/Source/Diagnostics/WarpXOpenPMD.H
+++ b/Source/Diagnostics/WarpXOpenPMD.H
@@ -9,7 +9,9 @@
 #define WARPX_OPEN_PMD_H_
 
 #include "Particles/WarpXParticleContainer.H"
-#include "Diagnostics/ParticleDiag/ParticleDiag.H"
+// _______________________________________________WarpX Forward declarations
+#include "Diagnostics/ParticleDiag/ParticleDiag.def"
+//________________________________________________________________________
 
 #include <AMReX_AmrParticles.H>
 #include <AMReX_ParallelDescriptor.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
index 79792ac822c..303c01ca09d 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
@@ -8,9 +8,9 @@
 #ifndef WARPX_FINITE_DIFFERENCE_SOLVER_H_
 #define WARPX_FINITE_DIFFERENCE_SOLVER_H_
 
-#include "MacroscopicProperties/MacroscopicProperties.H"
 // _______________________________________________WarpX Forward declarations
 #include "BoundaryConditions/PML.def"
+#include "MacroscopicProperties/MacroscopicProperties.def"
 //________________________________________________
 
 #include <AMReX_MultiFab.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
index af9969999d0..5227550cf92 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
@@ -13,7 +13,6 @@
 #include "MacroscopicProperties/MacroscopicProperties.H"
 
 #include <AMReX.H>
-#include <AMReX_Gpu.H>
 #include <AMReX_Array4.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
index eb0ae5cd371..649ebd424ad 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
@@ -8,7 +8,10 @@
 #define WARPX_PML_PSATD_ALGORITHM_H_
 
 #include "SpectralBaseAlgorithm.H"
-#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+// _______________________________________________WarpX Forward declarations
+#include "FieldSolver/SpectralSolver/SpectralFieldData.def"
+#include "FieldSolver/SpectralSolver/SpectralKSpace.def"
+//________________________________________________________________________
 
 #include <AMReX_REAL.H>
 
@@ -38,9 +41,7 @@ class PMLPsatdAlgorithm : public SpectralBaseAlgorithm
 
         // Redefine functions from base class
         virtual void pushSpectralFields(SpectralFieldData& f) const override final;
-        virtual int getRequiredNumberOfFields() const override final {
-            return SpectralPMLIndex::n_fields;
-        }
+        virtual int getRequiredNumberOfFields() const override final;
 
         /**
          * \brief Virtual function for current correction in Fourier space
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
index aac0a1313fd..86e0f768f90 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
@@ -6,6 +6,7 @@
  */
 #include "PMLPsatdAlgorithm.H"
 
+#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
 #include "Utils/WarpX_Complex.H"
 #include "Utils/WarpXConst.H"
@@ -414,4 +415,8 @@ PMLPsatdAlgorithm::VayDeposition (const int /*lev*/,
     amrex::Abort("Vay deposition not implemented for PML PSATD");
 }
 
+int PMLPsatdAlgorithm::getRequiredNumberOfFields() const {
+    return SpectralPMLIndex::n_fields;
+}
+
 #endif // WARPX_USE_PSATD
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
index 107ca688124..7290fe73b2a 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
@@ -7,8 +7,19 @@
 #ifndef WARPX_SPECTRAL_BASE_ALGORITHM_H_
 #define WARPX_SPECTRAL_BASE_ALGORITHM_H_
 
+#include "Utils/WarpX_Complex.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
-#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+// _______________________________________________WarpX Forward declarations
+#include "FieldSolver/SpectralSolver/SpectralFieldData.def"
+//________________________________________________________________________
+
+#include <AMReX_BaseFab.H>
+#include <AMReX_Config.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_REAL.H>
+
+#include <array>
+#include <memory>
 
 #if WARPX_USE_PSATD
 
@@ -73,24 +84,13 @@ class SpectralBaseAlgorithm
         using SpectralComplexCoefficients = \
             amrex::FabArray< amrex::BaseFab <Complex> >;
 
-        // Constructor
+        /**
+        * \brief Constructor
+        */
         SpectralBaseAlgorithm(const SpectralKSpace& spectral_kspace,
                               const amrex::DistributionMapping& dm,
                               const int norder_x, const int norder_y,
-                              const int norder_z, const bool nodal)
-          // Compute and assign the modified k vectors
-          : modified_kx_vec(spectral_kspace.getModifiedKComponent(dm,0,norder_x,nodal)),
-#if (AMREX_SPACEDIM==3)
-            modified_ky_vec(spectral_kspace.getModifiedKComponent(dm,1,norder_y,nodal)),
-            modified_kz_vec(spectral_kspace.getModifiedKComponent(dm,2,norder_z,nodal))
-#else
-            modified_kz_vec(spectral_kspace.getModifiedKComponent(dm,1,norder_z,nodal))
-#endif
-          {
-#if (AMREX_SPACEDIM!=3)
-            amrex::ignore_unused(norder_y);
-#endif
-          }
+                              const int norder_z, const bool nodal);
 
         // Modified finite-order vectors
         KVectorComponent modified_kx_vec;
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
index 91abad70de2..e3640ee6ca6 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
@@ -25,6 +25,27 @@
 
 using namespace amrex;
 
+/**
+ * \brief Constructor
+ */
+SpectralBaseAlgorithm::SpectralBaseAlgorithm(const SpectralKSpace& spectral_kspace,
+    const amrex::DistributionMapping& dm,
+    const int norder_x, const int norder_y,
+    const int norder_z, const bool nodal):
+    // Compute and assign the modified k vectors
+        modified_kx_vec(spectral_kspace.getModifiedKComponent(dm,0,norder_x,nodal)),
+#if (AMREX_SPACEDIM==3)
+        modified_ky_vec(spectral_kspace.getModifiedKComponent(dm,1,norder_y,nodal)),
+        modified_kz_vec(spectral_kspace.getModifiedKComponent(dm,2,norder_z,nodal))
+#else
+        modified_kz_vec(spectral_kspace.getModifiedKComponent(dm,1,norder_z,nodal))
+#endif
+    {
+#if (AMREX_SPACEDIM!=3)
+        amrex::ignore_unused(norder_y);
+#endif
+    }
+
 /**
  * \brief Compute spectral divergence of E
  */
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.def b/Source/FieldSolver/SpectralSolver/SpectralFieldData.def
new file mode 100644
index 00000000000..631dd3b06c1
--- /dev/null
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.def
@@ -0,0 +1,12 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+struct SpectralFieldIndex;
+struct SpectralAvgFieldIndex;
+struct SpectralPMLIndex;
+
+class SpectralFieldData;
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.def b/Source/FieldSolver/SpectralSolver/SpectralKSpace.def
new file mode 100644
index 00000000000..32417ff5c94
--- /dev/null
+++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.def
@@ -0,0 +1,10 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+struct ShiftType;
+
+class SpectralKSpace;
diff --git a/Source/Initialization/InjectorPosition.def b/Source/Initialization/InjectorPosition.def
new file mode 100644
index 00000000000..7c585915f1b
--- /dev/null
+++ b/Source/Initialization/InjectorPosition.def
@@ -0,0 +1,10 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+struct InjectorPositionRandom;
+struct InjectorPositionRegular;
+struct InjectorPosition;
diff --git a/Source/Initialization/PlasmaInjector.H b/Source/Initialization/PlasmaInjector.H
index daaacf50267..d486cce1cf8 100644
--- a/Source/Initialization/PlasmaInjector.H
+++ b/Source/Initialization/PlasmaInjector.H
@@ -10,9 +10,11 @@
 #define PLASMA_INJECTOR_H_
 
 #include "Particles/SpeciesPhysicalProperties.H"
-#include "InjectorPosition.H"
-#include "InjectorDensity.H"
 #include "InjectorMomentum.H"
+#include "InjectorDensity.H"
+// _______________________________________________WarpX Forward declarations
+#include "InjectorPosition.def"
+// ________________________________________________________________________
 
 #include <AMReX_Vector.H>
 #include <AMReX_ParmParse.H>
diff --git a/Source/Initialization/PlasmaInjector.cpp b/Source/Initialization/PlasmaInjector.cpp
index c29f9204056..9573f71f736 100644
--- a/Source/Initialization/PlasmaInjector.cpp
+++ b/Source/Initialization/PlasmaInjector.cpp
@@ -10,6 +10,9 @@
 #include "PlasmaInjector.H"
 
 #include "Particles/SpeciesPhysicalProperties.H"
+#include "Initialization/InjectorDensity.H"
+#include "Initialization/InjectorMomentum.H"
+#include "Initialization/InjectorPosition.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
 #include "WarpX.H"
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
index 3ec95b5934b..bd3beef4c70 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
@@ -5,8 +5,20 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "Laser/LaserProfiles.H"
+#include "Parser/WarpXParser.H"
+#include "Parser/WarpXParserWrapper.H"
 #include "Utils/WarpX_Complex.H"
 
+#include <AMReX.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
+
+#include <memory>
+#include <set>
+#include <string>
 
 using namespace amrex;
 
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp
index 589fc5267e8..87b9f73ae24 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp
@@ -5,19 +5,34 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "Laser/LaserProfiles.H"
-#include "Utils/WarpX_Complex.H"
-#include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
+#include "Utils/WarpX_Complex.H"
 
 #include <AMReX_Print.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX.H>
+#include <AMReX_Algorithm.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
 
 #include <limits>
-#include <iostream>
 #include <fstream>
 #include <cstdint>
 #include <algorithm>
+#include <cmath>
+#include <iterator>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp
index 7fdeb2bc2d1..7fe446210d7 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp
@@ -6,12 +6,24 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "Laser/LaserProfiles.H"
-#include "Utils/WarpX_Complex.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
+#include "Utils/WarpX_Complex.H"
 
-#include <cmath>
+#include <AMReX_BLassert.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuComplex.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
 
+#include <numeric>
+#include <vector>
+#include <cstdlib>
+#include <cmath>
 
 using namespace amrex;
 
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp
index 068a1409de6..0402dc73645 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp
@@ -5,10 +5,16 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "Laser/LaserProfiles.H"
-#include "Utils/WarpX_Complex.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
+#include "Utils/WarpX_Complex.H"
+
+#include <AMReX_Extension.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_REAL.H>
 
+#include <cmath>
 
 using namespace amrex;
 
diff --git a/Source/Parallelization/GuardCellManager.H b/Source/Parallelization/GuardCellManager.H
index 1583c0bd622..cd2db4fb125 100644
--- a/Source/Parallelization/GuardCellManager.H
+++ b/Source/Parallelization/GuardCellManager.H
@@ -9,6 +9,8 @@
 
 #include <AMReX_IntVect.H>
 #include <AMReX_RealVect.H>
+#include <AMReX_Array.H>
+#include <AMReX_REAL.H>
 
 /**
  * \brief This class computes and stores the number of guard cells needed for
diff --git a/Source/Parallelization/GuardCellManager.cpp b/Source/Parallelization/GuardCellManager.cpp
index b569c43e79d..f1d3d7fd2d3 100644
--- a/Source/Parallelization/GuardCellManager.cpp
+++ b/Source/Parallelization/GuardCellManager.cpp
@@ -10,7 +10,12 @@
 #include "Utils/WarpXConst.H"
 
 #include <AMReX_ParmParse.H>
-#include <AMReX.H>
+#include <AMReX_Config.H>
+#include <AMReX_INT.H>
+#include <AMReX_SPACE.H>
+
+#include <math.h>
+#include <algorithm>
 
 using namespace amrex;
 
diff --git a/Source/Parallelization/WarpXComm.cpp b/Source/Parallelization/WarpXComm.cpp
index 2025bb9ce5e..9d148532327 100644
--- a/Source/Parallelization/WarpXComm.cpp
+++ b/Source/Parallelization/WarpXComm.cpp
@@ -6,20 +6,15 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "WarpXComm_K.H"
-
 #include "WarpX.H"
+
+#include "WarpXComm_K.H"
 #include "WarpXSumGuardCells.H"
 #include "Utils/CoarsenMR.H"
 #include "Utils/WarpXProfilerWrapper.H"
 #include "BoundaryConditions/PML.H"
 
-#ifdef WARPX_USE_PSATD
-#   include "FieldSolver/SpectralSolver/SpectralKSpace.H"
-#endif
-
 #include <algorithm>
-#include <cstdlib>
 #include <memory>
 
 using namespace amrex;
diff --git a/Source/Parser/WarpXParser.H b/Source/Parser/WarpXParser.H
index 3e7a373a4cf..10207fe6cc8 100644
--- a/Source/Parser/WarpXParser.H
+++ b/Source/Parser/WarpXParser.H
@@ -7,21 +7,21 @@
 #ifndef WARPX_PARSER_H_
 #define WARPX_PARSER_H_
 
-#include <array>
-#include <vector>
-#include <string>
-#include <set>
-
-#include <AMReX_REAL.H>
-
 #include "wp_parser_c.h"
 #include "wp_parser_y.h"
 
+#include <AMReX_REAL.H>
+#include <AMReX_Config.H>
+
 #ifdef AMREX_USE_OMP
-#include <omp.h>
+#   include <omp.h>
 #endif
 
-template <int N> class GpuParser;
+#include <array>
+#include <vector>
+#include <string>
+#include <set>
+#include <memory>
 
 class WarpXParser
 {
diff --git a/Source/Parser/WarpXParserWrapper.def b/Source/Parser/WarpXParserWrapper.def
new file mode 100644
index 00000000000..6e0f9bcebd0
--- /dev/null
+++ b/Source/Parser/WarpXParserWrapper.def
@@ -0,0 +1,9 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+template <int N> struct HostDeviceParser;
+template <int N> struct ParserWrapper;
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index be068f6a77f..68456293ee0 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -22,6 +22,7 @@
 #include "Particles/Pusher/PushSelector.H"
 #include "Particles/Gather/GetExternalFields.H"
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "Initialization/InjectorPosition.H"
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Print.H>
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index d3d65c94c0d..498de61e932 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -24,15 +24,16 @@
 #include "Utils/WarpXUtil.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Particles/MultiParticleContainer.H"
-#include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
 #include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 #include "Diagnostics/MultiDiagnostics.H"
 #include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
 #include "Diagnostics/BackTransformedDiagnostic.H"
 #include "BoundaryConditions/PML.H"
+#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H"
+#include "Filter/NCIGodfreyFilter.H"
+#include "Parser/WarpXParserWrapper.H"
 
 #include <AMReX_ParmParse.H>
-#include <AMReX_MultiFabUtil.H>
 #include <AMReX_Array4.H>
 #ifdef BL_USE_SENSEI_INSITU
 #   include <AMReX_AmrMeshInSituBridge.H>
@@ -59,6 +60,10 @@
 #include <AMReX_SPACE.H>
 #include <AMReX_ccse-mpi.H>
 #include <AMReX_iMultiFab.H>
+#ifdef AMREX_USE_EB
+#   include <AMReX_EBFabFactory.H>
+#   include <AMReX_EBSupport.H>
+#endif
 
 #include <algorithm>
 #include <cmath>

From c4a319d00348346888afead3b119be44bcdb992c Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Mon, 17 May 2021 12:20:53 +0200
Subject: [PATCH 19/58] progress with IWYU

---
 .../BreitWheelerEngineWrapper.def             | 12 +++++
 .../QEDInternals/QuantumSyncEngineWrapper.def | 12 +++++
 Source/Particles/LaserParticleContainer.cpp   |  3 ++
 Source/Particles/MultiParticleContainer.H     | 34 +++++++++-----
 Source/Particles/MultiParticleContainer.cpp   | 45 +++++++++++++++++--
 Source/Particles/PhotonParticleContainer.H    | 15 ++++++-
 Source/Particles/PhotonParticleContainer.cpp  | 32 ++++++++-----
 7 files changed, 128 insertions(+), 25 deletions(-)
 create mode 100644 Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def
 create mode 100644 Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def

diff --git a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def
new file mode 100644
index 00000000000..42ad2369409
--- /dev/null
+++ b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def
@@ -0,0 +1,12 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class BreitWheelerGetOpticalDepth;
+class BreitWheelerEvolveOpticalDepth;
+class BreitWheelerGeneratePairs;
+
+class BreitWheelerEngine;
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def
new file mode 100644
index 00000000000..eb79b0c07a2
--- /dev/null
+++ b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def
@@ -0,0 +1,12 @@
+/* Copyright 2021 Luca Fedeli
+ *
+ * This file is part of WarpX.
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+
+class QuantumSynchrotronGetOpticalDepth;
+class QuantumSynchrotronEvolveOpticalDepth;
+class QuantumSynchrotronPhotonEmission;
+
+class QuantumSynchrotronEngine;
diff --git a/Source/Particles/LaserParticleContainer.cpp b/Source/Particles/LaserParticleContainer.cpp
index 2cc9200752d..285fabf5761 100644
--- a/Source/Particles/LaserParticleContainer.cpp
+++ b/Source/Particles/LaserParticleContainer.cpp
@@ -6,6 +6,8 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "LaserParticleContainer.H"
+
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpX_Complex.H"
@@ -13,6 +15,7 @@
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "Utils/WarpXProfilerWrapper.H"
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "Laser/LaserProfiles.H"
 
 #include <AMReX.H>
 
diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H
index d6a7967b5dd..2dbc5cf6ca6 100644
--- a/Source/Particles/MultiParticleContainer.H
+++ b/Source/Particles/MultiParticleContainer.H
@@ -14,28 +14,40 @@
 #include "Utils/WarpXUtil.H"
 #include "WarpXParticleContainer.H"
 #include "PhysicalParticleContainer.H"
-#include "PhotonParticleContainer.H"
-#include "LaserParticleContainer.H"
 #include "Parser/WarpXParserWrapper.H"
 #include "Particles/Collision/CollisionHandler.H"
-#include "Particles/ParticleCreation/SmartUtils.H"
-#include "Particles/ParticleCreation/SmartCopy.H"
-#include "Particles/ParticleCreation/SmartCreate.H"
-#include "Particles/ParticleCreation/FilterCopyTransform.H"
-#include "Particles/RigidInjectedParticleContainer.H"
+#include "Evolve/WarpXDtType.H"
+#include "Utils/WarpXConst.H"
 
 #ifdef WARPX_QED
 #   include "Particles/ElementaryProcess/QEDInternals/QedChiFunctions.H"
-#   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
-#   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
+#   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def"
+#   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def"
 #endif
 
-#include <AMReX_Particles.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_INT.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
+#include <AMReX_AmrCore.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_RealBox.H>
 
 #include <memory>
-#include <map>
 #include <string>
 #include <algorithm>
+#include <array>
+#include <iosfwd>
+#include <iterator>
+#include <limits>
+#include <vector>
 
 /**
  * The class MultiParticleContainer holds multiple instances of the polymorphic
diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
index 5b3f1751f32..97ac16affb2 100644
--- a/Source/Particles/MultiParticleContainer.cpp
+++ b/Source/Particles/MultiParticleContainer.cpp
@@ -13,18 +13,57 @@
 #include "SpeciesPhysicalProperties.H"
 #include "WarpX.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "Particles/ElementaryProcess/Ionization.H"
+#include "Particles/LaserParticleContainer.H"
+#include "Particles/ParticleCreation/FilterCopyTransform.H"
+#include "Particles/ParticleCreation/SmartCopy.H"
+#include "Particles/ParticleCreation/SmartCreate.H"
+#include "Particles/ParticleCreation/SmartUtils.H"
+#include "Particles/PhotonParticleContainer.H"
+#include "Particles/PhysicalParticleContainer.H"
+#include "Particles/RigidInjectedParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 #ifdef WARPX_QED
-    #include "Particles/ElementaryProcess/QEDInternals/SchwingerProcessWrapper.H"
-    #include "Particles/ElementaryProcess/QEDSchwingerProcess.H"
-    #include "Particles/ParticleCreation/FilterCreateTransformFromFAB.H"
+#   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
+#   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
+#   include "Particles/ElementaryProcess/QEDInternals/SchwingerProcessWrapper.H"
+#   include "Particles/ElementaryProcess/QEDSchwingerProcess.H"
+#   include "Particles/ParticleCreation/FilterCreateTransformFromFAB.H"
+#   include "Particles/ElementaryProcess/QEDInternals/QedChiFunctions.H"
 #endif
 
 #include <AMReX_Vector.H>
+#include <AMReX.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuAtomic.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParIter.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Particles.H>
+#include <AMReX_ParticleTile.H>
+#include <AMReX_Print.H>
+#include <AMReX_StructOfArrays.H>
+#include <AMReX_Utility.H>
 
 #include <limits>
 #include <algorithm>
 #include <string>
 #include <vector>
+#include <cmath>
+#include <map>
+#include <utility>
 
 using namespace amrex;
 
diff --git a/Source/Particles/PhotonParticleContainer.H b/Source/Particles/PhotonParticleContainer.H
index 0cfb37729ed..7d6df0f9554 100644
--- a/Source/Particles/PhotonParticleContainer.H
+++ b/Source/Particles/PhotonParticleContainer.H
@@ -9,7 +9,20 @@
 #define WARPX_PhotonParticleContainer_H_
 
 #include "PhysicalParticleContainer.H"
-#include <AMReX_Vector.H>
+#include "Evolve/WarpXDtType.H"
+#include "Particles/Gather/ScaleFields.H"
+// _______________________________________________WarpX Forward declarations
+#include "Particles/WarpXParticleContainer.def"
+// ________________________________________________________________________
+
+#include <AMReX_Particles.H>
+#include <AMReX_REAL.H>
+#include <AMReX_AmrCore.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+
+#include <string>
 
 /**
  * Photon particles have no mass, they deposit no charge, and see specific QED
diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp
index bda0f984e34..1f3b71ed9d4 100644
--- a/Source/Particles/PhotonParticleContainer.cpp
+++ b/Source/Particles/PhotonParticleContainer.cpp
@@ -6,9 +6,13 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "PhotonParticleContainer.H"
-#include "Utils/WarpXConst.H"
-#include "WarpX.H"
 
+#include "WarpX.H"
+#include "Particles/PhysicalParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
+#ifdef WARPX_QED
+#   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
+#endif
 // Import low-level single-particle kernels
 #include "Particles/Pusher/UpdatePositionPhoton.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
@@ -16,14 +20,22 @@
 #include "Particles/Gather/FieldGather.H"
 #include "Particles/Gather/GetExternalFields.H"
 
-#ifdef AMREX_USE_OMP
-#include <omp.h>
-#endif
-
-#include <limits>
-#include <sstream>
-#include <algorithm>
-
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_Extension.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Particles.H>
+#include <AMReX_StructOfArrays.H>
 
 using namespace amrex;
 

From 845a8e0e357dfe5c3efddf8d59318ac6be229b09 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 18 May 2021 04:52:48 +0200
Subject: [PATCH 20/58] progress with iwyu

---
 Source/Particles/Collision/CollisionBase.H    |  9 ++-
 Source/Particles/Collision/CollisionBase.cpp  |  2 +
 Source/Particles/Collision/CollisionHandler.H |  9 ++-
 .../Particles/Collision/CollisionHandler.cpp  |  4 ++
 .../Collision/PairWiseCoulombCollision.H      | 10 +++-
 .../Collision/PairWiseCoulombCollision.cpp    | 26 ++++++++
 .../Particles/ElementaryProcess/Ionization.H  | 11 ++++
 .../ElementaryProcess/Ionization.cpp          | 10 +++-
 .../QEDInternals/BreitWheelerEngineWrapper.H  | 18 ++++--
 .../BreitWheelerEngineWrapper.cpp             | 13 ++--
 .../QEDInternals/QuantumSyncEngineWrapper.H   | 16 ++++-
 .../QEDInternals/QuantumSyncEngineWrapper.cpp | 12 +++-
 .../ElementaryProcess/QEDPairGeneration.H     | 10 +++-
 .../ElementaryProcess/QEDPairGeneration.cpp   | 10 +++-
 .../ElementaryProcess/QEDPhotonEmission.H     | 10 ++++
 .../ElementaryProcess/QEDPhotonEmission.cpp   |  9 ++-
 Source/Particles/Gather/GetExternalFields.H   | 12 +++-
 Source/Particles/Gather/GetExternalFields.cpp |  6 ++
 Source/Particles/LaserParticleContainer.H     | 12 +++-
 Source/Particles/LaserParticleContainer.cpp   | 45 +++++++++++++-
 .../Particles/ParticleCreation/SmartUtils.H   | 11 ++++
 .../Particles/ParticleCreation/SmartUtils.cpp |  3 +
 Source/Particles/PhysicalParticleContainer.H  | 29 +++++----
 .../Particles/PhysicalParticleContainer.cpp   | 59 ++++++++++++++++++-
 Source/Particles/Pusher/PushSelector.H        |  1 +
 .../Particles/Resampling/LevelingThinning.H   |  6 ++
 .../Particles/Resampling/LevelingThinning.cpp | 16 ++++-
 Source/Particles/Resampling/Resampling.H      |  9 ++-
 Source/Particles/Resampling/Resampling.cpp    |  4 ++
 .../Particles/Resampling/ResamplingTrigger.H  |  5 +-
 .../Resampling/ResamplingTrigger.cpp          |  6 ++
 .../RigidInjectedParticleContainer.H          | 14 +++++
 .../RigidInjectedParticleContainer.cpp        | 34 ++++++++---
 Source/Particles/Sorting/Partition.cpp        | 11 +++-
 Source/Particles/WarpXParticleContainer.H     | 29 ++++++---
 Source/Particles/WarpXParticleContainer.cpp   | 39 +++++++++++-
 Source/Python/WarpXWrappers.cpp               | 19 +++++-
 Source/Python/WarpXWrappers.h                 |  7 +--
 38 files changed, 481 insertions(+), 75 deletions(-)

diff --git a/Source/Particles/Collision/CollisionBase.H b/Source/Particles/Collision/CollisionBase.H
index f4047684767..56dd72b80d3 100644
--- a/Source/Particles/Collision/CollisionBase.H
+++ b/Source/Particles/Collision/CollisionBase.H
@@ -7,11 +7,14 @@
 #ifndef WARPX_PARTICLES_COLLISION_COLLISIONBASE_H_
 #define WARPX_PARTICLES_COLLISION_COLLISIONBASE_H_
 
-#include <AMReX_ParmParse.H>
+// _______________________________________________WarpX Forward declarations
+#include "Particles/MultiParticleContainer.def"
+// ______________________________________________
+
 #include <AMReX_Vector.H>
+#include <AMReX_REAL.H>
 
-// Forward declaration needed
-class MultiParticleContainer;
+#include <string>
 
 class CollisionBase
 {
diff --git a/Source/Particles/Collision/CollisionBase.cpp b/Source/Particles/Collision/CollisionBase.cpp
index 99822842a82..067a8c7e9d4 100644
--- a/Source/Particles/Collision/CollisionBase.cpp
+++ b/Source/Particles/Collision/CollisionBase.cpp
@@ -6,6 +6,8 @@
  */
 #include "CollisionBase.H"
 
+#include <AMReX_ParmParse.H>
+
 CollisionBase::CollisionBase (std::string collision_name)
 {
 
diff --git a/Source/Particles/Collision/CollisionHandler.H b/Source/Particles/Collision/CollisionHandler.H
index f4338e3bfb8..9826ce563d8 100644
--- a/Source/Particles/Collision/CollisionHandler.H
+++ b/Source/Particles/Collision/CollisionHandler.H
@@ -8,10 +8,15 @@
 #define WARPX_PARTICLES_COLLISION_COLLISIONHANDLER_H_
 
 #include "CollisionBase.H"
+// _______________________________________________WarpX Forward declarations
+#include "Particles/MultiParticleContainer.def"
+// ______________________________________________
+
 #include <AMReX_Vector.H>
+#include <AMReX_REAL.H>
 
-// Forward declaration needed
-class MultiParticleContainer;
+#include <memory>
+#include <string>
 
 /* \brief CollisionHandler is a light weight class that contains the
  * list of collisions to be done.
diff --git a/Source/Particles/Collision/CollisionHandler.cpp b/Source/Particles/Collision/CollisionHandler.cpp
index c4ba94a4d08..1be2f69ed3f 100644
--- a/Source/Particles/Collision/CollisionHandler.cpp
+++ b/Source/Particles/Collision/CollisionHandler.cpp
@@ -5,9 +5,13 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "CollisionHandler.H"
+
 #include "PairWiseCoulombCollision.H"
+
 #include <AMReX_ParmParse.H>
 
+#include <vector>
+
 CollisionHandler::CollisionHandler()
 {
 
diff --git a/Source/Particles/Collision/PairWiseCoulombCollision.H b/Source/Particles/Collision/PairWiseCoulombCollision.H
index 15ae329f6d7..2a68b61aee7 100644
--- a/Source/Particles/Collision/PairWiseCoulombCollision.H
+++ b/Source/Particles/Collision/PairWiseCoulombCollision.H
@@ -7,9 +7,15 @@
 #ifndef WARPX_PARTICLES_COLLISION_PAIRWISECOULOMBCOLLISION_H_
 #define WARPX_PARTICLES_COLLISION_PAIRWISECOULOMBCOLLISION_H_
 
-#include "Particles/MultiParticleContainer.H"
 #include "CollisionBase.H"
-#include <AMReX_ParmParse.H>
+// _______________________________________________WarpX Forward declarations
+#include "Particles/MultiParticleContainer.def"
+#include "Particles/WarpXParticleContainer.def"
+// ______________________________________________
+
+#include <AMReX_REAL.H>
+
+#include <string>
 
 class PairWiseCoulombCollision
     : public CollisionBase
diff --git a/Source/Particles/Collision/PairWiseCoulombCollision.cpp b/Source/Particles/Collision/PairWiseCoulombCollision.cpp
index 79e0b83b072..d8ebcfe7bb6 100644
--- a/Source/Particles/Collision/PairWiseCoulombCollision.cpp
+++ b/Source/Particles/Collision/PairWiseCoulombCollision.cpp
@@ -9,8 +9,34 @@
 #include "ElasticCollisionPerez.H"
 #include "Utils/ParticleUtils.H"
 #include "Utils/WarpXUtil.H"
+#include "Particles/Collision/CollisionBase.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 #include "WarpX.H"
 
+#include <AMReX_Algorithm.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Config.H>
+#include <AMReX_DenseBins.H>
+#include <AMReX_Extension.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuAtomic.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Particles.H>
+#include <AMReX_StructOfArrays.H>
+#include <AMReX_Utility.H>
+#include <AMReX_Vector.H>
+
+#include <cmath>
+
 using namespace amrex::literals;
 
 PairWiseCoulombCollision::PairWiseCoulombCollision (std::string const collision_name)
diff --git a/Source/Particles/ElementaryProcess/Ionization.H b/Source/Particles/ElementaryProcess/Ionization.H
index e371be919eb..995b2bd548e 100644
--- a/Source/Particles/ElementaryProcess/Ionization.H
+++ b/Source/Particles/ElementaryProcess/Ionization.H
@@ -14,6 +14,17 @@
 #include "Particles/Gather/FieldGather.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
 
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Random.H>
+
+#include <cmath>
+
 struct IonizationFilterFunc
 {
     const amrex::Real* AMREX_RESTRICT m_ionization_energies;
diff --git a/Source/Particles/ElementaryProcess/Ionization.cpp b/Source/Particles/ElementaryProcess/Ionization.cpp
index 189764e6b01..4e361e8e5df 100644
--- a/Source/Particles/ElementaryProcess/Ionization.cpp
+++ b/Source/Particles/ElementaryProcess/Ionization.cpp
@@ -6,9 +6,17 @@
  * License: BSD-3-Clause-LBNL
  */
 
-#include "WarpX.H"
 #include "Particles/ElementaryProcess/Ionization.H"
 
+#include "WarpX.H"
+
+#include <AMReX_Box.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_IntVect.H>
+
+#include <algorithm>
+#include <array>
+
 IonizationFilterFunc::IonizationFilterFunc (const WarpXParIter& a_pti, int lev, amrex::IntVect ngE,
                                             amrex::FArrayBox const& exfab,
                                             amrex::FArrayBox const& eyfab,
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H
index 0a38e37f0be..16322a90a44 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H
+++ b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H
@@ -11,16 +11,26 @@
 #include "QedChiFunctions.H"
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_Array.H>
-#include <AMReX_Vector.H>
-#include <AMReX_Gpu.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Random.H>
 
 #include <picsar_qed/physics/gamma_functions.hpp>
 #include <picsar_qed/physics/breit_wheeler/breit_wheeler_engine_tables.hpp>
 #include <picsar_qed/physics/breit_wheeler/breit_wheeler_engine_core.hpp>
+#include <picsar_qed/containers/picsar_array.hpp>
+#include <picsar_qed/math/cmath_overloads.hpp>
+#include <picsar_qed/math/math_constants.h>
+#include <picsar_qed/math/vec_functions.hpp>
+#include <picsar_qed/physics/phys_constants.h>
+#include <picsar_qed/physics/unit_conversion.hpp>
 
-#include <string>
 #include <vector>
+#include <cmath>
+
+namespace amrex { struct RandomEngine; }
 
 // Aliases =============================
 using BW_dndt_table_params =
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp
index 6904698105e..6da3103678c 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp
+++ b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp
@@ -6,18 +6,23 @@
  */
 #include "BreitWheelerEngineWrapper.H"
 
-#include <picsar_qed/utils/serialization.hpp>
-
 //Functions needed to generate a new table
 #ifdef WARPX_QED_TABLE_GEN
 #   include <picsar_qed/physics/breit_wheeler/breit_wheeler_engine_tables_generator.hpp>
 #endif
 
-#include <AMReX.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_GpuDevice.H>
+
+#include <picsar_qed/utils/serialization.hpp>
+#include <picsar_qed/physics/breit_wheeler/breit_wheeler_engine_tables.hpp>
 
-#include <utility>
 #include <vector>
 #include <cstdint>
+#include <algorithm>
+#include <cmath>
+#include <initializer_list>
+#include <iosfwd>
 
 using namespace std;
 using namespace amrex;
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H
index 6a771dd6877..fe7bbfacd17 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H
+++ b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H
@@ -11,15 +11,25 @@
 #include "QedChiFunctions.H"
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_Array.H>
 #include <AMReX_Vector.H>
-#include <AMReX_Gpu.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Random.H>
 
 #include <picsar_qed/physics/quantum_sync/quantum_sync_engine_tables.hpp>
 #include <picsar_qed/physics/quantum_sync/quantum_sync_engine_core.hpp>
+#include <picsar_qed/containers/picsar_array.hpp>
+#include <picsar_qed/math/cmath_overloads.hpp>
+#include <picsar_qed/math/vec_functions.hpp>
+#include <picsar_qed/physics/phys_constants.h>
+#include <picsar_qed/physics/unit_conversion.hpp>
 
-#include <string>
 #include <vector>
+#include <cmath>
+
+namespace amrex { struct RandomEngine; }
 
 // Aliases =============================
 using QS_dndt_table_params =
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp
index 0019f042b86..b8234bcb028 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp
+++ b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp
@@ -6,16 +6,22 @@
  */
 #include "QuantumSyncEngineWrapper.H"
 
+#include <AMReX_BLassert.H>
+#include <AMReX_GpuDevice.H>
+
 //Functions needed to generate a new table
 #ifdef WARPX_QED_TABLE_GEN
 #   include <picsar_qed/physics/quantum_sync/quantum_sync_engine_tables_generator.hpp>
 #endif
+#include "picsar_qed/physics/quantum_sync/quantum_sync_engine_tables.hpp"
+#include "picsar_qed/utils/serialization.hpp"
 
-#include <AMReX.H>
-
-#include <utility>
 #include <vector>
 #include <cstdint>
+#include <algorithm>
+#include <cmath>
+#include <initializer_list>
+#include <iosfwd>
 
 using namespace std;
 using namespace amrex;
diff --git a/Source/Particles/ElementaryProcess/QEDPairGeneration.H b/Source/Particles/ElementaryProcess/QEDPairGeneration.H
index c1c695647b0..bfdc5ebb441 100644
--- a/Source/Particles/ElementaryProcess/QEDPairGeneration.H
+++ b/Source/Particles/ElementaryProcess/QEDPairGeneration.H
@@ -8,13 +8,21 @@
 #ifndef QED_PAIR_GENERATION_H_
 #define QED_PAIR_GENERATION_H_
 
-#include "Utils/WarpXConst.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Particles/Gather/GetExternalFields.H"
 #include "Particles/Gather/FieldGather.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "QEDInternals/BreitWheelerEngineWrapper.H"
 
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_REAL.H>
+
+
 /** @file
  *
  * This file contains the implementation of the elementary process
diff --git a/Source/Particles/ElementaryProcess/QEDPairGeneration.cpp b/Source/Particles/ElementaryProcess/QEDPairGeneration.cpp
index 5daa6ca17fe..344fd973a42 100644
--- a/Source/Particles/ElementaryProcess/QEDPairGeneration.cpp
+++ b/Source/Particles/ElementaryProcess/QEDPairGeneration.cpp
@@ -6,9 +6,17 @@
  * License: BSD-3-Clause-LBNL
  */
 
-#include "WarpX.H"
 #include "Particles/ElementaryProcess/QEDPairGeneration.H"
 
+#include "WarpX.H"
+
+#include <AMReX_Box.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_IntVect.H>
+
+#include <algorithm>
+#include <array>
+
 PairGenerationTransformFunc::
 PairGenerationTransformFunc (BreitWheelerGeneratePairs const generate_functor,
                              const WarpXParIter& a_pti, int lev, amrex::IntVect ngE,
diff --git a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
index d285a835c1a..0490665e879 100644
--- a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
+++ b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
@@ -15,6 +15,16 @@
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "QEDInternals/QuantumSyncEngineWrapper.H"
 
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_REAL.H>
+
+#include <algorithm>
 #include <limits>
 
 /** @file
diff --git a/Source/Particles/ElementaryProcess/QEDPhotonEmission.cpp b/Source/Particles/ElementaryProcess/QEDPhotonEmission.cpp
index 58a84d1cea2..3feec1ec703 100644
--- a/Source/Particles/ElementaryProcess/QEDPhotonEmission.cpp
+++ b/Source/Particles/ElementaryProcess/QEDPhotonEmission.cpp
@@ -6,9 +6,16 @@
  * License: BSD-3-Clause-LBNL
  */
 
-#include "WarpX.H"
 #include "Particles/ElementaryProcess/QEDPhotonEmission.H"
 
+#include "WarpX.H"
+
+#include <AMReX_Box.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_IntVect.H>
+
+#include <array>
+
 PhotonEmissionTransformFunc::
 PhotonEmissionTransformFunc (QuantumSynchrotronGetOpticalDepth opt_depth_functor,
                              int const opt_depth_runtime_comp,
diff --git a/Source/Particles/Gather/GetExternalFields.H b/Source/Particles/Gather/GetExternalFields.H
index 4bf520be955..44dee13920d 100644
--- a/Source/Particles/Gather/GetExternalFields.H
+++ b/Source/Particles/Gather/GetExternalFields.H
@@ -1,12 +1,18 @@
 #ifndef WARPX_PARTICLES_GATHER_GETEXTERNALFIELDS_H_
 #define WARPX_PARTICLES_GATHER_GETEXTERNALFIELDS_H_
 
-#include "Particles/WarpXParticleContainer.H"
+
 #include "Particles/Pusher/GetAndSetPosition.H"
+#include "Parser/WarpXParserWrapper.H"
+// _______________________________________________WarpX Forward declarations
+#include "Particles/WarpXParticleContainer.def"
+// ________________________________________________________________________
 
 #include <AMReX_REAL.H>
-
-#include <limits>
+#include <AMReX.H>
+#include <AMReX_Array.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuQualifiers.H>
 
 enum ExternalFieldInitType { Constant, Parser };
 
diff --git a/Source/Particles/Gather/GetExternalFields.cpp b/Source/Particles/Gather/GetExternalFields.cpp
index e8ff350d839..898a32f9a2e 100644
--- a/Source/Particles/Gather/GetExternalFields.cpp
+++ b/Source/Particles/Gather/GetExternalFields.cpp
@@ -1,8 +1,14 @@
 #include "Particles/Gather/GetExternalFields.H"
 
 #include "WarpX.H"
+#include "Particles/WarpXParticleContainer.H"
 #include "Particles/MultiParticleContainer.H"
 
+#include <AMReX_Vector.H>
+
+#include <string>
+
+
 GetExternalEField::GetExternalEField (const WarpXParIter& a_pti, int a_offset) noexcept
 {
     auto& warpx = WarpX::GetInstance();
diff --git a/Source/Particles/LaserParticleContainer.H b/Source/Particles/LaserParticleContainer.H
index eabd64bbd0b..deda1aa48c9 100644
--- a/Source/Particles/LaserParticleContainer.H
+++ b/Source/Particles/LaserParticleContainer.H
@@ -10,13 +10,19 @@
 #define WARPX_LaserParticleContainer_H_
 
 #include "Laser/LaserProfiles.H"
-
+#include "Evolve/WarpXDtType.H"
 #include "WarpXParticleContainer.H"
-#include "Utils/WarpXConst.H"
-#include "Parser/WarpXParser.H"
+
+#include <AMReX_Extension.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_Vector.H>
+#include <AMReX_AmrCore.H>
+#include <AMReX_MultiFab.H>
 
 #include <memory>
 #include <limits>
+#include <string>
 
 /**
  * The main method to inject a laser pulse in WarpX is to use an artificial
diff --git a/Source/Particles/LaserParticleContainer.cpp b/Source/Particles/LaserParticleContainer.cpp
index 285fabf5761..9443fa71212 100644
--- a/Source/Particles/LaserParticleContainer.cpp
+++ b/Source/Particles/LaserParticleContainer.cpp
@@ -10,19 +10,60 @@
 
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
-#include "Utils/WarpX_Complex.H"
-#include "Particles/MultiParticleContainer.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
+#include "Particles/LaserParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
 #include "Utils/WarpXProfilerWrapper.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Laser/LaserProfiles.H"
+#include "Evolve/WarpXDtType.H"
+#include "Utils/WarpXUtil.H"
 
 #include <AMReX.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_Extension.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuAtomic.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParIter.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Particles.H>
+#include <AMReX_Print.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_StructOfArrays.H>
+#include <AMReX_TinyProfiler.H>
+#include <AMReX_Utility.H>
+#include <AMReX_Vector.H>
+
+#ifdef AMREX_USE_OMP
+#   include <omp.h>
+#endif
 
 #include <limits>
 #include <cmath>
 #include <algorithm>
 #include <numeric>
+#include <ctype.h>
+#include <cstdlib>
+#include <array>
+#include <functional>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace amrex;
 using namespace WarpXLaserProfiles;
diff --git a/Source/Particles/ParticleCreation/SmartUtils.H b/Source/Particles/ParticleCreation/SmartUtils.H
index 94a72f8822e..1784a5f1883 100644
--- a/Source/Particles/ParticleCreation/SmartUtils.H
+++ b/Source/Particles/ParticleCreation/SmartUtils.H
@@ -11,6 +11,17 @@
 
 #include "DefaultInitialization.H"
 
+#include <AMReX_Config.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_INT.H>
+#include <AMReX_ParallelDescriptor.H>
+
+#include <map>
+#include <string>
+#include <vector>
+
 using NameMap = std::map<std::string, int>;
 using PolicyVec = amrex::Gpu::DeviceVector<InitializationPolicy>;
 
diff --git a/Source/Particles/ParticleCreation/SmartUtils.cpp b/Source/Particles/ParticleCreation/SmartUtils.cpp
index eeff136a738..2ed06b9a269 100644
--- a/Source/Particles/ParticleCreation/SmartUtils.cpp
+++ b/Source/Particles/ParticleCreation/SmartUtils.cpp
@@ -7,6 +7,9 @@
  */
 #include "SmartUtils.H"
 
+#include <algorithm>
+#include <utility>
+
 PolicyVec getPolicies (const NameMap& names) noexcept
 {
     PolicyVec policies;
diff --git a/Source/Particles/PhysicalParticleContainer.H b/Source/Particles/PhysicalParticleContainer.H
index 84271a12403..43b68f8cf91 100644
--- a/Source/Particles/PhysicalParticleContainer.H
+++ b/Source/Particles/PhysicalParticleContainer.H
@@ -12,24 +12,31 @@
 
 #include "Initialization/PlasmaInjector.H"
 #include "WarpXParticleContainer.H"
-#include "Filter/NCIGodfreyFilter.H"
 #include "Particles/ElementaryProcess/Ionization.H"
 #include "Particles/Gather/ScaleFields.H"
-#include "Utils/WarpXProfilerWrapper.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-
+#include "Evolve/WarpXDtType.H"
+#include "Particles/Resampling/Resampling.H"
 #ifdef WARPX_QED
-#    include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
-#    include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
-#    include "Particles/ElementaryProcess/QEDInternals/QedChiFunctions.H"
-
 #    include "Particles/ElementaryProcess/QEDPairGeneration.H"
 #    include "Particles/ElementaryProcess/QEDPhotonEmission.H"
+// _______________________________________________WarpX Forward declarations
+#    include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def"
+#    include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def"
+// ______________________________________________
 #endif
 
-#include <AMReX_IArrayBox.H>
-
-#include <map>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_Particles.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_AmrCore.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_iMultiFab.H>
+
+#include <memory>
+#include <string>
 
 /**
  * PhysicalParticleContainer is the ParticleContainer class containing plasma
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index 68456293ee0..f056b459d8a 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -23,19 +23,76 @@
 #include "Particles/Gather/GetExternalFields.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Initialization/InjectorPosition.H"
+#include "Filter/NCIGodfreyFilter.H"
+#include "Initialization/InjectorDensity.H"
+#include "Initialization/InjectorMomentum.H"
+#include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
+#include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
+#include "Particles/Pusher/UpdateMomentumBoris.H"
+#include "Particles/Pusher/UpdateMomentumBorisWithRadiationReaction.H"
+#include "Particles/Pusher/UpdateMomentumHigueraCary.H"
+#include "Particles/Pusher/UpdateMomentumVay.H"
+#include "Particles/SpeciesPhysicalProperties.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Print.H>
 #include <AMReX.H>
+#include <AMReX_Algorithm.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_ArrayOfStructs.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_Extension.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuAtomic.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuElixir.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_INT.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParGDB.H>
+#include <AMReX_ParIter.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_ParticleContainerBase.H>
+#include <AMReX_ParticleTile.H>
+#include <AMReX_SPACE.H>
+#include <AMReX_Scan.H>
+#include <AMReX_StructOfArrays.H>
+#include <AMReX_TinyProfiler.H>
+#include <AMReX_Utility.H>
+#include <AMReX_Vector.H>
 
 #ifdef WARPX_USE_OPENPMD
 #   include <openPMD/openPMD.hpp>
 #endif
 
+#ifdef AMREX_USE_OMP
+#   include <omp.h>
+#endif
+
 #include <cmath>
 #include <limits>
-#include <sstream>
 #include <string>
+#include <cstdlib>
+#include <algorithm>
+#include <array>
+#include <map>
+#include <random>
+#include <utility>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Particles/Pusher/PushSelector.H b/Source/Particles/Pusher/PushSelector.H
index bd469b51b4b..c7f227af8ab 100644
--- a/Source/Particles/Pusher/PushSelector.H
+++ b/Source/Particles/Pusher/PushSelector.H
@@ -7,6 +7,7 @@
 #ifndef WARPX_PARTICLES_PUSHER_PUSHSELECTOR_H_
 #define WARPX_PARTICLES_PUSHER_PUSHSELECTOR_H_
 
+#include "Utils/WarpXAlgorithmSelection.H"
 // Import low-level single-particle kernels
 #include "Particles/Pusher/UpdatePosition.H"
 #include "Particles/Pusher/UpdateMomentumBoris.H"
diff --git a/Source/Particles/Resampling/LevelingThinning.H b/Source/Particles/Resampling/LevelingThinning.H
index ecfd727c4c4..8570a137466 100644
--- a/Source/Particles/Resampling/LevelingThinning.H
+++ b/Source/Particles/Resampling/LevelingThinning.H
@@ -8,6 +8,12 @@
 #define WARPX_LEVELING_THINNING_H_
 
 #include "Resampling.H"
+// _______________________________________________WarpX Forward declarations
+#include "Particles/WarpXParticleContainer.def"
+// ________________________________________________________________________
+
+#include <AMReX_REAL.H>
+#include <string>
 
 /**
  * \brief This class implements the leveling thinning algorithm as defined in Muraviev, A., et al.
diff --git a/Source/Particles/Resampling/LevelingThinning.cpp b/Source/Particles/Resampling/LevelingThinning.cpp
index 4406b6adeb2..99cd72c115f 100644
--- a/Source/Particles/Resampling/LevelingThinning.cpp
+++ b/Source/Particles/Resampling/LevelingThinning.cpp
@@ -5,9 +5,23 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "LevelingThinning.H"
+
 #include "Utils/ParticleUtils.H"
 #include "Utils/WarpXUtil.H"
-
+#include "Particles/WarpXParticleContainer.H"
+
+#include <AMReX.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_DenseBins.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Particle.H>
+#include <AMReX_ParticleTile.H>
+#include <AMReX_Random.H>
+#include <AMReX_StructOfArrays.H>
 #include <AMReX_Particles.H>
 
 LevelingThinning::LevelingThinning (const std::string species_name)
diff --git a/Source/Particles/Resampling/Resampling.H b/Source/Particles/Resampling/Resampling.H
index 7b08c39e399..d4d9271110d 100644
--- a/Source/Particles/Resampling/Resampling.H
+++ b/Source/Particles/Resampling/Resampling.H
@@ -8,9 +8,14 @@
 #define WARPX_RESAMPLING_H_
 
 #include "ResamplingTrigger.H"
+// _______________________________________________WarpX Forward declarations
+#include "Particles/WarpXParticleContainer.def"
+// ________________________________________________________________________
 
-class WarpXParIter; // forward declaration
-class WarpXParticleContainer; // forward declaration
+#include <AMReX_REAL.H>
+
+#include <memory>
+#include <string>
 
 /**
  * \brief An empty base class from which specific resampling algorithms are derived.
diff --git a/Source/Particles/Resampling/Resampling.cpp b/Source/Particles/Resampling/Resampling.cpp
index 6c12ed49aaf..2034f291c11 100644
--- a/Source/Particles/Resampling/Resampling.cpp
+++ b/Source/Particles/Resampling/Resampling.cpp
@@ -5,8 +5,12 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "Resampling.H"
+
 #include "LevelingThinning.H"
 
+#include <AMReX.H>
+#include <AMReX_ParmParse.H>
+
 Resampling::Resampling (const std::string species_name)
 {
     amrex::ParmParse pp_species_name(species_name);
diff --git a/Source/Particles/Resampling/ResamplingTrigger.H b/Source/Particles/Resampling/ResamplingTrigger.H
index 830b511f2bd..03850cf510f 100644
--- a/Source/Particles/Resampling/ResamplingTrigger.H
+++ b/Source/Particles/Resampling/ResamplingTrigger.H
@@ -9,7 +9,10 @@
 
 #include "Utils/IntervalsParser.H"
 
-#include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
+
+#include <limits>
+#include <string>
 
 /**
  * \brief This class is used to determine if resampling should be done at a given timestep for
diff --git a/Source/Particles/Resampling/ResamplingTrigger.cpp b/Source/Particles/Resampling/ResamplingTrigger.cpp
index 8d6726da7e2..44c1ef75be0 100644
--- a/Source/Particles/Resampling/ResamplingTrigger.cpp
+++ b/Source/Particles/Resampling/ResamplingTrigger.cpp
@@ -5,9 +5,15 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "ResamplingTrigger.H"
+
 #include "WarpX.H"
 #include "Utils/WarpXUtil.H"
 
+#include <AMReX_BoxArray.H>
+#include <AMReX_ParmParse.H>
+
+#include <vector>
+
 ResamplingTrigger::ResamplingTrigger (const std::string species_name)
 {
     amrex::ParmParse pp_species_name(species_name);
diff --git a/Source/Particles/RigidInjectedParticleContainer.H b/Source/Particles/RigidInjectedParticleContainer.H
index 1f52c0861a2..539380fd7d3 100644
--- a/Source/Particles/RigidInjectedParticleContainer.H
+++ b/Source/Particles/RigidInjectedParticleContainer.H
@@ -9,7 +9,21 @@
 #define WARPX_RigidInjectedParticleContainer_H_
 
 #include "PhysicalParticleContainer.H"
+#include "Evolve/WarpXDtType.H"
+#include "Particles/Gather/ScaleFields.H"
+// _______________________________________________WarpX Forward declarations
+#include "WarpXParticleContainer.def"
+// ________________________________________________________________________
+
 #include <AMReX_Vector.H>
+#include <AMReX_REAL.H>
+#include <AMReX_AmrCore.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+
+#include <iosfwd>
+#include <string>
 
 /**
  * When injecting a particle beam (typically for a plasma wakefield
diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp
index fad735b7d8e..85ee8862953 100644
--- a/Source/Particles/RigidInjectedParticleContainer.cpp
+++ b/Source/Particles/RigidInjectedParticleContainer.cpp
@@ -7,9 +7,6 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#ifdef AMREX_USE_OMP
-#   include <omp.h>
-#endif
 
 #include "RigidInjectedParticleContainer.H"
 #include "WarpX.H"
@@ -21,15 +18,38 @@
 #include "Pusher/UpdateMomentumBorisWithRadiationReaction.H"
 #include "Pusher/UpdateMomentumHigueraCary.H"
 #include "Pusher/GetAndSetPosition.H"
-#include "Gather/ScaleFields.H"
 #include "Gather/FieldGather.H"
+#include "Particles/Gather/GetExternalFields.H"
+#include "Particles/PhysicalParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX_Geometry.H>
+#include <AMReX.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_Extension.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParIter.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Particles.H>
+#include <AMReX_StructOfArrays.H>
 
-#include <limits>
-#include <sstream>
 #include <algorithm>
-
+#include <cmath>
+#include <array>
+#include <map>
 
 using namespace amrex;
 
diff --git a/Source/Particles/Sorting/Partition.cpp b/Source/Particles/Sorting/Partition.cpp
index 455c3ffb81a..109b12daccd 100644
--- a/Source/Particles/Sorting/Partition.cpp
+++ b/Source/Particles/Sorting/Partition.cpp
@@ -7,9 +7,18 @@
 #include "SortingUtils.H"
 #include "Particles/PhysicalParticleContainer.H"
 #include "WarpX.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX_Particles.H>
-
+#include <AMReX_ArrayOfStructs.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_REAL.H>
+#include <AMReX_StructOfArrays.H>
+
+#include <utility>
 
 using namespace amrex;
 
diff --git a/Source/Particles/WarpXParticleContainer.H b/Source/Particles/WarpXParticleContainer.H
index 07a9ddcd662..a3647865976 100644
--- a/Source/Particles/WarpXParticleContainer.H
+++ b/Source/Particles/WarpXParticleContainer.H
@@ -10,21 +10,35 @@
 #ifndef WARPX_WarpXParticleContainer_H_
 #define WARPX_WarpXParticleContainer_H_
 
-#include "Parser/WarpXParserWrapper.H"
-#include "Utils/WarpXConst.H"
 #include "SpeciesPhysicalProperties.H"
 #include "Evolve/WarpXDtType.H"
-#include "Particles/Resampling/Resampling.H"
-
+// _______________________________________________WarpX Forward declarations
+#include "MultiParticleContainer.def"
 #ifdef WARPX_QED
-#    include "ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
-#    include "ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
+#    include "ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def"
+#    include "ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def"
 #endif
+// ________________________________________________________________________
 
 #include <AMReX_Particles.H>
 #include <AMReX_AmrCore.H>
+#include <AMReX_Array.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_INT.H>
+#include <AMReX_ParIter.H>
+#include <AMReX_REAL.H>
+#include <AMReX_StructOfArrays.H>
+#include <AMReX_Vector.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_RealBox.H>
 
 #include <memory>
+#include <array>
+#include <iosfwd>
+#include <map>
+#include <string>
+#include <utility>
 
 enum struct ParticleBC { none=0, absorbing };
 
@@ -104,9 +118,6 @@ public:
     }
 };
 
-// Forward-declaration needed by WarpXParticleContainer below
-class MultiParticleContainer;
-
 /**
  * WarpXParticleContainer is the base polymorphic class from which all concrete
  * particle container classes (that store a collection of particles) derive. Derived
diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp
index d838704a294..52c872f18fc 100644
--- a/Source/Particles/WarpXParticleContainer.cpp
+++ b/Source/Particles/WarpXParticleContainer.cpp
@@ -7,7 +7,6 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "MultiParticleContainer.H"
 #include "WarpXParticleContainer.H"
 #include "WarpX.H"
 #include "Utils/WarpXAlgorithmSelection.H"
@@ -17,12 +16,48 @@
 #include "Pusher/UpdatePosition.H"
 #include "Deposition/CurrentDeposition.H"
 #include "Deposition/ChargeDeposition.H"
+#include "Utils/WarpXConst.H"
+#include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX_AmrParGDB.H>
 #include <AMReX.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_Extension.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuAllocators.H>
+#include <AMReX_GpuAtomic.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParGDB.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParallelReduce.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Particle.H>
+#include <AMReX_ParticleContainerBase.H>
+#include <AMReX_ParticleTile.H>
+#include <AMReX_ParticleTransformation.H>
+#include <AMReX_ParticleUtil.H>
+#include <AMReX_TinyProfiler.H>
+#include <AMReX_Utility.H>
 
-#include <limits>
+#ifdef AMREX_USE_OMP
+#   include <omp.h>
+#endif
 
+#include <cmath>
+#include <algorithm>
 
 using namespace amrex;
 
diff --git a/Source/Python/WarpXWrappers.cpp b/Source/Python/WarpXWrappers.cpp
index 37e55652c69..b645ed14241 100644
--- a/Source/Python/WarpXWrappers.cpp
+++ b/Source/Python/WarpXWrappers.cpp
@@ -16,8 +16,23 @@
 #include "BoundaryConditions/PML.H"
 
 #include <AMReX.H>
-#include <AMReX_BLProfiler.H>
-
+#include <AMReX_ArrayOfStructs.H>
+#include <AMReX_Box.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParIter.H>
+#include <AMReX_Particles.H>
+#include <AMReX_StructOfArrays.H>
+
+#include <cstdlib>
+#include <array>
 
 namespace
 {
diff --git a/Source/Python/WarpXWrappers.h b/Source/Python/WarpXWrappers.h
index 766d813c28f..443b2cbf139 100644
--- a/Source/Python/WarpXWrappers.h
+++ b/Source/Python/WarpXWrappers.h
@@ -8,16 +8,13 @@
 #ifndef WARPX_WRAPPERS_H_
 #define WARPX_WRAPPERS_H_
 
-#include <AMReX.H>
-#include <AMReX_BLProfiler.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Config.H>
 
 #ifdef BL_USE_MPI
 #   include <mpi.h>
 #endif
 
-#include <AMReX_REAL.H>
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif

From 3510163dda0e8eb3999f10ae621aac79467aebdd Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Thu, 20 May 2021 18:51:14 +0200
Subject: [PATCH 21/58] correct copyright

---
 Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.def | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.def b/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.def
index ca4b730585f..958da378b47 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.def
+++ b/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.def
@@ -1,5 +1,4 @@
-/* Copyright 2019 Andrew Myers, Axel Huebl, Maxence Thevenet
- * Revathi Jambunathan, Weiqun Zhang
+/* Copyright 2021 Luca Fedeli
  *
  * This file is part of WarpX.
  *

From 6d17b5329b55d736171f8753add1040d9d8f1142 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Thu, 20 May 2021 19:22:14 +0200
Subject: [PATCH 22/58] fixed bug

---
 Source/Particles/PhysicalParticleContainer.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index f056b459d8a..adb4980eeef 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -26,8 +26,6 @@
 #include "Filter/NCIGodfreyFilter.H"
 #include "Initialization/InjectorDensity.H"
 #include "Initialization/InjectorMomentum.H"
-#include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
-#include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
 #include "Particles/Pusher/UpdateMomentumBoris.H"
 #include "Particles/Pusher/UpdateMomentumBorisWithRadiationReaction.H"
 #include "Particles/Pusher/UpdateMomentumHigueraCary.H"
@@ -35,6 +33,10 @@
 #include "Particles/SpeciesPhysicalProperties.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#ifdef WARPX_QED
+#   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
+#   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
+#endif
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Print.H>

From 8aea73fa7689a6bfdf614795d325f0d3f3d1ed45 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Thu, 20 May 2021 19:39:51 +0200
Subject: [PATCH 23/58] fixed bugs

---
 Source/BoundaryConditions/PML.cpp                               | 2 +-
 Source/BoundaryConditions/WarpXEvolvePML.cpp                    | 2 +-
 Source/Diagnostics/BackTransformedDiagnostic.cpp                | 2 +-
 Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp | 2 +-
 Source/Diagnostics/ParticleIO.cpp                               | 2 +-
 Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp           | 2 +-
 Source/FieldSolver/ElectrostaticSolver.cpp                      | 2 +-
 .../FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp       | 2 +-
 Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp       | 2 +-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp           | 2 +-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp        | 2 +-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp           | 2 +-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp        | 2 +-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp           | 2 +-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp        | 2 +-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp           | 2 +-
 .../FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp   | 2 +-
 .../MacroscopicProperties/MacroscopicProperties.cpp             | 2 +-
 .../SpectralAlgorithms/ComovingPsatdAlgorithm.cpp               | 2 +-
 .../SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp     | 2 +-
 .../SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp        | 2 +-
 .../SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp | 2 +-
 Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp         | 2 +-
 Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp            | 2 +-
 Source/FieldSolver/WarpXPushFieldsEM.cpp                        | 2 +-
 Source/FieldSolver/WarpX_QED_Field_Pushers.cpp                  | 2 +-
 Source/Initialization/WarpXInitData.cpp                         | 2 +-
 Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp    | 2 +-
 Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp     | 2 +-
 Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp         | 2 +-
 Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp           | 2 +-
 Source/Particles/Collision/PairWiseCoulombCollision.cpp         | 2 +-
 Source/Particles/ElementaryProcess/QEDPhotonEmission.H          | 2 +-
 Source/Particles/LaserParticleContainer.cpp                     | 2 +-
 Source/Particles/ParticleCreation/SmartUtils.H                  | 2 +-
 Source/Particles/PhotonParticleContainer.cpp                    | 2 +-
 Source/Particles/PhysicalParticleContainer.cpp                  | 2 +-
 Source/Particles/Resampling/LevelingThinning.cpp                | 2 +-
 Source/Particles/RigidInjectedParticleContainer.cpp             | 2 +-
 Source/Particles/Sorting/Partition.cpp                          | 2 +-
 Source/Particles/WarpXParticleContainer.cpp                     | 2 +-
 Source/Utils/CoarsenIO.cpp                                      | 2 +-
 Source/Utils/CoarsenMR.cpp                                      | 2 +-
 Source/Utils/Interpolate.cpp                                    | 2 +-
 Source/Utils/ParticleUtils.cpp                                  | 2 +-
 Source/Utils/WarpXMovingWindow.cpp                              | 1 -
 Source/Utils/WarpXUtil.cpp                                      | 2 +-
 Source/WarpX.cpp                                                | 2 +-
 48 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/Source/BoundaryConditions/PML.cpp b/Source/BoundaryConditions/PML.cpp
index 016de485d73..cebfe5131d8 100644
--- a/Source/BoundaryConditions/PML.cpp
+++ b/Source/BoundaryConditions/PML.cpp
@@ -31,7 +31,7 @@
 #include <AMReX_FabArrayBase.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/BoundaryConditions/WarpXEvolvePML.cpp b/Source/BoundaryConditions/WarpXEvolvePML.cpp
index 800979be2ad..e51d7aa9f8a 100644
--- a/Source/BoundaryConditions/WarpXEvolvePML.cpp
+++ b/Source/BoundaryConditions/WarpXEvolvePML.cpp
@@ -19,7 +19,7 @@
 #include <AMReX_Extension.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_IntVect.H>
diff --git a/Source/Diagnostics/BackTransformedDiagnostic.cpp b/Source/Diagnostics/BackTransformedDiagnostic.cpp
index 5dcec5ed372..7c123544a65 100644
--- a/Source/Diagnostics/BackTransformedDiagnostic.cpp
+++ b/Source/Diagnostics/BackTransformedDiagnostic.cpp
@@ -22,7 +22,7 @@
 #include <AMReX_Geometry.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_PODVector.H>
diff --git a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
index 9ab4a013304..4226983a30c 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
@@ -12,7 +12,7 @@
 #include <AMReX_FabArray.H>                                      // for FabA...
 #include <AMReX_Geometry.H>                                      // for Geom...
 #include <AMReX_GpuControl.H>                                    // for notI...
-#include <AMReX_GpuLaunchFunctsC.H>                              // for Para...
+#include <AMReX_GpuLaunch.H>                              // for Para...
 #include <AMReX_GpuQualifiers.H>                                 // for AMRE...
 #include <AMReX_MFIter.H>                                        // for MFIter
 #include <AMReX_MultiFab.H>                                      // for Mult...
diff --git a/Source/Diagnostics/ParticleIO.cpp b/Source/Diagnostics/ParticleIO.cpp
index f150f9b1585..e391cbf8bef 100644
--- a/Source/Diagnostics/ParticleIO.cpp
+++ b/Source/Diagnostics/ParticleIO.cpp
@@ -20,7 +20,7 @@
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParIter.H>
diff --git a/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp b/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp
index e8a8ed0331e..f5e6fd33318 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp
@@ -24,7 +24,7 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuAtomic.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParIter.H>
diff --git a/Source/FieldSolver/ElectrostaticSolver.cpp b/Source/FieldSolver/ElectrostaticSolver.cpp
index 536094af4b5..24bcc9b8087 100644
--- a/Source/FieldSolver/ElectrostaticSolver.cpp
+++ b/Source/FieldSolver/ElectrostaticSolver.cpp
@@ -27,7 +27,7 @@
 #include <AMReX_FabArray.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_IntVect.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp
index c9ea9956191..cedfe467524 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp
@@ -18,7 +18,7 @@
 #include <AMReX_Config.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
index 947d5c1c8cc..487377227f7 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
@@ -21,7 +21,7 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
index 299e928f7b7..904e8ed4959 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
@@ -25,7 +25,7 @@
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_LayoutData.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
index a7aabfe7b08..baa8f6668fe 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
@@ -22,7 +22,7 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
index be239705137..29e5cf7443e 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
@@ -25,7 +25,7 @@
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_LayoutData.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
index 0447fc9f9c5..bc430ffbbcc 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
@@ -25,7 +25,7 @@
 #include <AMReX_FabArray.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
index 140ab4357f3..e28097b112a 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
@@ -22,7 +22,7 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
index 99ebd543401..f90fceb8f7c 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
@@ -22,7 +22,7 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
index a1800bc655a..a060b64ff71 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
@@ -21,7 +21,7 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
index 5227550cf92..b32f3de2b2c 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
@@ -18,7 +18,7 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
index d81c5ce0d90..662d87ca563 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
@@ -9,7 +9,7 @@
 #include <AMReX_Config.H>
 #include <AMReX_DistributionMapping.H>
 #include <AMReX_Geometry.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp
index f5f43c771c4..64920d32518 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp
@@ -9,7 +9,7 @@
 #include <AMReX_BaseFab.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_GpuComplex.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_PODVector.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
index 86e0f768f90..1be5094bd02 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
@@ -17,7 +17,7 @@
 #include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
 #include <AMReX_GpuComplex.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_PODVector.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
index 83e8aaec761..8a5b791ab2d 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
@@ -14,7 +14,7 @@
 #include <AMReX_BaseFab.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_GpuComplex.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
index e3640ee6ca6..d281bbedc70 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
@@ -15,7 +15,7 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Array4.H>
 #include <AMReX_GpuComplex.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_PODVector.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
index 126ef3e5804..455f83925a8 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
@@ -17,7 +17,7 @@
 #include <AMReX_GpuAtomic.H>
 #include <AMReX_GpuComplex.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_LayoutData.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
index 16774496574..1c2d1e065b3 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
@@ -14,7 +14,7 @@
 #include <AMReX_BoxList.H>
 #include <AMReX_GpuComplex.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_IntVect.H>
diff --git a/Source/FieldSolver/WarpXPushFieldsEM.cpp b/Source/FieldSolver/WarpXPushFieldsEM.cpp
index f8a63a87ef2..79e4ec7fe7b 100644
--- a/Source/FieldSolver/WarpXPushFieldsEM.cpp
+++ b/Source/FieldSolver/WarpXPushFieldsEM.cpp
@@ -34,7 +34,7 @@
 #include <AMReX_FArrayBox.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_Geometry.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
diff --git a/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp b/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp
index 8f667dfecdc..d49e4053c2c 100644
--- a/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp
+++ b/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp
@@ -18,7 +18,7 @@
 #include <AMReX_GpuDevice.H>
 #include <AMReX_GpuElixir.H>
 #include <AMReX_GpuLaunch.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_LayoutData.H>
diff --git a/Source/Initialization/WarpXInitData.cpp b/Source/Initialization/WarpXInitData.cpp
index f6fbc563279..2fd8eaa2ee0 100644
--- a/Source/Initialization/WarpXInitData.cpp
+++ b/Source/Initialization/WarpXInitData.cpp
@@ -37,7 +37,7 @@
 #include <AMReX_BoxList.H>
 #include <AMReX_Config.H>
 #include <AMReX_Geometry.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_INT.H>
 #include <AMReX_IndexType.H>
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
index bd3beef4c70..d8ed19173e9 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
@@ -11,7 +11,7 @@
 
 #include <AMReX.H>
 #include <AMReX_Extension.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_REAL.H>
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp
index 87b9f73ae24..91b8801d2ec 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp
@@ -16,7 +16,7 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParmParse.H>
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp
index 7fe446210d7..371b0324795 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp
@@ -14,7 +14,7 @@
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuComplex.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_REAL.H>
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp
index 0402dc73645..a174606a504 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp
@@ -10,7 +10,7 @@
 #include "Utils/WarpX_Complex.H"
 
 #include <AMReX_Extension.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_REAL.H>
 
diff --git a/Source/Particles/Collision/PairWiseCoulombCollision.cpp b/Source/Particles/Collision/PairWiseCoulombCollision.cpp
index d8ebcfe7bb6..f5f15a2785c 100644
--- a/Source/Particles/Collision/PairWiseCoulombCollision.cpp
+++ b/Source/Particles/Collision/PairWiseCoulombCollision.cpp
@@ -24,7 +24,7 @@
 #include <AMReX_GpuAtomic.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_LayoutData.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
index 0490665e879..9ab29023aef 100644
--- a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
+++ b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
@@ -19,7 +19,7 @@
 #include <AMReX_Array4.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_REAL.H>
diff --git a/Source/Particles/LaserParticleContainer.cpp b/Source/Particles/LaserParticleContainer.cpp
index 9443fa71212..c2952ea3fa7 100644
--- a/Source/Particles/LaserParticleContainer.cpp
+++ b/Source/Particles/LaserParticleContainer.cpp
@@ -31,7 +31,7 @@
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_LayoutData.H>
diff --git a/Source/Particles/ParticleCreation/SmartUtils.H b/Source/Particles/ParticleCreation/SmartUtils.H
index 1784a5f1883..ee1dc321cef 100644
--- a/Source/Particles/ParticleCreation/SmartUtils.H
+++ b/Source/Particles/ParticleCreation/SmartUtils.H
@@ -13,7 +13,7 @@
 
 #include <AMReX_Config.H>
 #include <AMReX_GpuContainers.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_INT.H>
 #include <AMReX_ParallelDescriptor.H>
diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp
index 1f3b71ed9d4..78862f01978 100644
--- a/Source/Particles/PhotonParticleContainer.cpp
+++ b/Source/Particles/PhotonParticleContainer.cpp
@@ -28,7 +28,7 @@
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
 #include <AMReX_FArrayBox.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_IntVect.H>
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index adb4980eeef..e7e17508c5b 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -56,7 +56,7 @@
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
 #include <AMReX_GpuElixir.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_INT.H>
 #include <AMReX_IndexType.H>
diff --git a/Source/Particles/Resampling/LevelingThinning.cpp b/Source/Particles/Resampling/LevelingThinning.cpp
index 99cd72c115f..7575766c3e5 100644
--- a/Source/Particles/Resampling/LevelingThinning.cpp
+++ b/Source/Particles/Resampling/LevelingThinning.cpp
@@ -14,7 +14,7 @@
 #include <AMReX_BLassert.H>
 #include <AMReX_DenseBins.H>
 #include <AMReX_Extension.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParmParse.H>
diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp
index 85ee8862953..cdef638840c 100644
--- a/Source/Particles/RigidInjectedParticleContainer.cpp
+++ b/Source/Particles/RigidInjectedParticleContainer.cpp
@@ -37,7 +37,7 @@
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_PODVector.H>
diff --git a/Source/Particles/Sorting/Partition.cpp b/Source/Particles/Sorting/Partition.cpp
index 109b12daccd..d6021191200 100644
--- a/Source/Particles/Sorting/Partition.cpp
+++ b/Source/Particles/Sorting/Partition.cpp
@@ -14,7 +14,7 @@
 #include <AMReX_ArrayOfStructs.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_REAL.H>
 #include <AMReX_StructOfArrays.H>
 
diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp
index 52c872f18fc..572977a35f9 100644
--- a/Source/Particles/WarpXParticleContainer.cpp
+++ b/Source/Particles/WarpXParticleContainer.cpp
@@ -33,7 +33,7 @@
 #include <AMReX_GpuAtomic.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_IntVect.H>
diff --git a/Source/Utils/CoarsenIO.cpp b/Source/Utils/CoarsenIO.cpp
index a2e27a250a1..33a0d024636 100644
--- a/Source/Utils/CoarsenIO.cpp
+++ b/Source/Utils/CoarsenIO.cpp
@@ -8,7 +8,7 @@
 #include <AMReX_FArrayBox.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
 
diff --git a/Source/Utils/CoarsenMR.cpp b/Source/Utils/CoarsenMR.cpp
index fce3b488b10..cc1095f93d8 100644
--- a/Source/Utils/CoarsenMR.cpp
+++ b/Source/Utils/CoarsenMR.cpp
@@ -5,7 +5,7 @@
 #include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/Utils/Interpolate.cpp b/Source/Utils/Interpolate.cpp
index 393872e9401..3c7e403fddd 100644
--- a/Source/Utils/Interpolate.cpp
+++ b/Source/Utils/Interpolate.cpp
@@ -9,7 +9,7 @@
 #include <AMReX_FArrayBox.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_IntVect.H>
diff --git a/Source/Utils/ParticleUtils.cpp b/Source/Utils/ParticleUtils.cpp
index 3986dfbda88..c31f84ba2db 100644
--- a/Source/Utils/ParticleUtils.cpp
+++ b/Source/Utils/ParticleUtils.cpp
@@ -12,7 +12,7 @@
 #include <AMReX_Box.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Geometry.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp
index fb22fbb3c2e..5d034286c79 100644
--- a/Source/Utils/WarpXMovingWindow.cpp
+++ b/Source/Utils/WarpXMovingWindow.cpp
@@ -25,7 +25,6 @@
 #include <AMReX_Geometry.H>                    // for Geometry
 #include <AMReX_GpuControl.H>                  // for notInLaunchRegion
 #include <AMReX_GpuLaunch.H>                   // for AMREX_PARALLEL_FOR_4D
-#include <AMReX_GpuLaunchFunctsC.H>            // for ParallelFor
 #include <AMReX_GpuQualifiers.H>               // for AMREX_GPU_DEVICE
 #include <AMReX_INT.H>                         // for amrex
 #include <AMReX_IndexType.H>                   // for IndexType
diff --git a/Source/Utils/WarpXUtil.cpp b/Source/Utils/WarpXUtil.cpp
index 45dc2677aca..f0b5cbde151 100644
--- a/Source/Utils/WarpXUtil.cpp
+++ b/Source/Utils/WarpXUtil.cpp
@@ -21,7 +21,7 @@
 #include <AMReX_FArrayBox.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_GpuControl.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index 6799bd18bdf..004ba66e8b2 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -47,7 +47,7 @@
 #include <AMReX_Geometry.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
-#include <AMReX_GpuLaunchFunctsC.H>
+#include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IArrayBox.H>
 #include <AMReX_LayoutData.H>

From 90ed4cec3827c4474d71579963f865197b83a330 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Fri, 21 May 2021 03:34:33 +0200
Subject: [PATCH 24/58] fix missing include

---
 Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.cpp
index 7da657de245..5ca0c3edce0 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.cpp
@@ -1,6 +1,9 @@
 #include "CellCenterFunctor.H"
 
 #include "Utils/CoarsenIO.H"
+#ifdef WARPX_DIM_RZ
+#   include "WarpX.H"
+#endif
 
 #include <AMReX.H>
 #include <AMReX_IntVect.H>

From ff9600364f829104d3359a02c7f73022903beb0c Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 22 May 2021 11:45:53 +0200
Subject: [PATCH 25/58] fixed bug

---
 Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp | 3 +++
 Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
index 6e1b2d75d63..f047f41ad73 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
@@ -2,6 +2,9 @@
 
 #include "WarpX.H"
 #include "Utils/CoarsenIO.H"
+#ifdef WARPX_DIM_RZ
+#   include "WarpXAlgorithmSelection.H"
+#endif
 
 #include <AMReX.H>
 #include <AMReX_BoxArray.H>
diff --git a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
index 21fa160d1f3..467374ad4d5 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
@@ -7,6 +7,7 @@
 #include "Particles/WarpXParticleContainer.H"
 #if (defined WARPX_DIM_RZ) && (defined WARPX_USE_PSATD)
     #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+    #include "FieldSolver/SpectralSolver/SpectralSolverRZ.H"
 #endif
 
 #include <AMReX.H>

From 4ec73cb789c4e53fd5aa8805613d6288f7c53491 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 22 May 2021 12:02:47 +0200
Subject: [PATCH 26/58] fix bug

---
 Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
index f047f41ad73..b1f16646399 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
@@ -3,7 +3,7 @@
 #include "WarpX.H"
 #include "Utils/CoarsenIO.H"
 #ifdef WARPX_DIM_RZ
-#   include "WarpXAlgorithmSelection.H"
+#   include "Utilis/WarpXAlgorithmSelection.H"
 #endif
 
 #include <AMReX.H>

From f3ca90a07fb664572d702e7e5140a1ea499c5d96 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 22 May 2021 12:37:40 +0200
Subject: [PATCH 27/58] fix bug introduced during last bugfix

---
 Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
index b1f16646399..c0c744db706 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
@@ -3,7 +3,7 @@
 #include "WarpX.H"
 #include "Utils/CoarsenIO.H"
 #ifdef WARPX_DIM_RZ
-#   include "Utilis/WarpXAlgorithmSelection.H"
+#   include "Utils/WarpXAlgorithmSelection.H"
 #endif
 
 #include <AMReX.H>

From ed357165fe7109899108c776bf23bb261ac0e794 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 22 May 2021 12:41:38 +0200
Subject: [PATCH 28/58] use iwyu on newly added files

---
 Source/BoundaryConditions/WarpXFieldBoundaries.cpp |  8 ++++++--
 Source/BoundaryConditions/WarpX_PEC.H              | 10 ++++++++++
 Source/BoundaryConditions/WarpX_PEC.cpp            | 12 ++++++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Source/BoundaryConditions/WarpXFieldBoundaries.cpp b/Source/BoundaryConditions/WarpXFieldBoundaries.cpp
index 7e99dbc8eb5..ac5f60e35d7 100644
--- a/Source/BoundaryConditions/WarpXFieldBoundaries.cpp
+++ b/Source/BoundaryConditions/WarpXFieldBoundaries.cpp
@@ -1,8 +1,12 @@
 #include "WarpX.H"
 #include "WarpX_PEC.H"
-#include <AMReX.H>
+
 #include <AMReX_Vector.H>
-#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+
+#include <array>
+#include <memory>
+
 using namespace amrex::literals;
 
 void WarpX::ApplyEfieldBoundary(const int lev, PatchType patch_type)
diff --git a/Source/BoundaryConditions/WarpX_PEC.H b/Source/BoundaryConditions/WarpX_PEC.H
index f196d8bf889..044cd7d8c2a 100644
--- a/Source/BoundaryConditions/WarpX_PEC.H
+++ b/Source/BoundaryConditions/WarpX_PEC.H
@@ -4,6 +4,16 @@
 #include "WarpX.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Config.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_REAL.H>
+
+#include <array>
+#include <memory>
 
 namespace PEC {
 using namespace amrex;
diff --git a/Source/BoundaryConditions/WarpX_PEC.cpp b/Source/BoundaryConditions/WarpX_PEC.cpp
index 29eb8d60a1b..f7c940098fa 100644
--- a/Source/BoundaryConditions/WarpX_PEC.cpp
+++ b/Source/BoundaryConditions/WarpX_PEC.cpp
@@ -1,10 +1,18 @@
 #include "BoundaryConditions/WarpX_PEC.H"
+
 #include "WarpX.H"
-#include <AMReX.H>
+
 #include <AMReX_Vector.H>
 #include <AMReX_MultiFab.H>
-using namespace amrex::literals;
+#include <AMReX_Box.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunch.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_SPACE.H>
 
+using namespace amrex::literals;
 
 bool
 PEC::isAnyBoundaryPEC() {

From bb3b6ac801f11dbe4df7c0e359bb9e60811c2298 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 22 May 2021 12:42:05 +0200
Subject: [PATCH 29/58] add space

---
 Source/BoundaryConditions/WarpX_PML_kernels.H | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/BoundaryConditions/WarpX_PML_kernels.H b/Source/BoundaryConditions/WarpX_PML_kernels.H
index 0ede94cbd66..ca6b594ac9d 100644
--- a/Source/BoundaryConditions/WarpX_PML_kernels.H
+++ b/Source/BoundaryConditions/WarpX_PML_kernels.H
@@ -9,6 +9,7 @@
 #define WARPX_PML_KERNELS_H_
 
 #include "BoundaryConditions/PMLComponent.H"
+
 #include <AMReX.H>
 #include <AMReX_FArrayBox.H>
 

From 7a2abbc30eaaf7467b4bef00d52271156b8eb85c Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 22 May 2021 13:05:15 +0200
Subject: [PATCH 30/58] fix bug

---
 Source/FieldSolver/WarpXPushFieldsEM.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Source/FieldSolver/WarpXPushFieldsEM.cpp b/Source/FieldSolver/WarpXPushFieldsEM.cpp
index 861ad3d5406..d838ccce1c4 100644
--- a/Source/FieldSolver/WarpXPushFieldsEM.cpp
+++ b/Source/FieldSolver/WarpXPushFieldsEM.cpp
@@ -13,14 +13,18 @@
 #include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXProfilerWrapper.H"
-#if defined(WARPX_DIM_RZ) || defined(WARPX_USE_PSATD)
-#   include "FieldSolver/SpectralSolver/SpectralFieldData.H"
-#   include "FieldSolver/SpectralSolver/SpectralSolver.H"
-#endif
 #include "BoundaryConditions/WarpX_PML_kernels.H"
 #include "BoundaryConditions/PML_current.H"
 #include "WarpX_FDTD.H"
 #include "WarpXPushFieldsEM_K.H"
+#if defined(WARPX_DIM_RZ) || defined(WARPX_USE_PSATD)
+#   include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+#   ifdef WARPX_DIM_RZ
+#       include "FieldSolver/SpectralSolver/SpectralSolverRZ.H"
+#   elif defined(WARPX_USE_PSATD)
+#       include "FieldSolver/SpectralSolver/SpectralSolver.H"
+#   endif
+#endif
 
 #ifdef BL_USE_SENSEI_INSITU
 #   include <AMReX_AmrMeshInSituBridge.H>

From 620ba3c4331005dc3941a0a464e91a74e537d97a Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 22 May 2021 14:35:24 +0200
Subject: [PATCH 31/58] fix missing include

---
 .../SpectralSolver/SpectralHankelTransform/BesselRoots.H        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/BesselRoots.H b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/BesselRoots.H
index 6465d119e56..64ffc80ac37 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/BesselRoots.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/BesselRoots.H
@@ -32,6 +32,8 @@
 !                                          (www.jpmoreau.fr)
 ! ------------------------------------------------------------------------ */
 
+#include "Utils/WarpXConst.H"
+
 #include <AMReX_REAL.H>
 
 #include <cmath>

From 8bdadbe7cc5ea732a4efb25ebfdf0d67a98cc18f Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 22 May 2021 14:36:46 +0200
Subject: [PATCH 32/58] fix missing include

---
 .../SpectralSolver/SpectralHankelTransform/HankelTransform.cpp   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp
index 24e9d7f815a..9000f164c23 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp
@@ -5,6 +5,7 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
+#include "Utils/WarpXConst.H"
 
 #include "HankelTransform.H"
 #include "BesselRoots.H"

From 59a45ee54d76695c58b0345ba4bb9edbaf7b625b Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 22 May 2021 14:54:28 +0200
Subject: [PATCH 33/58] fix missing include

---
 .../FiniteDifferenceSolver/FiniteDifferenceSolver.cpp            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
index db35c7f2076..63bda58ef4e 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
@@ -7,6 +7,7 @@
 #include "FiniteDifferenceSolver.H"
 
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "WarpX.H"
 #ifdef WARPX_DIM_RZ
 #    include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #else

From 7e03a34bbed6f11bcd2dd52324c9a75079fcea5e Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 22 May 2021 15:15:29 +0200
Subject: [PATCH 34/58] fixed bugs

---
 Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp  |  1 +
 .../FiniteDifferenceSolver/FiniteDifferenceSolver.cpp  | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
index e28097b112a..f5d5d58a4e7 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
@@ -8,6 +8,7 @@
 
 #include "Utils/WarpXAlgorithmSelection.H"
 #ifdef WARPX_DIM_RZ
+#   include "WarpX.H"
 #   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #else
 #   include "FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
index 63bda58ef4e..54dd680d6ae 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
@@ -7,13 +7,13 @@
 #include "FiniteDifferenceSolver.H"
 
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "WarpX.H"
 #ifdef WARPX_DIM_RZ
-#    include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
+#   include "WarpX.H"
+#   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #else
-#    include "FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
-#    include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
-#    include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
+#   include "FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
+#   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
+#   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
 
 #include <AMReX.H>

From 50394a46b9548b11c6d86ca847ec2f2aceb991b4 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sat, 22 May 2021 15:50:48 +0200
Subject: [PATCH 35/58] fixed bug

---
 Source/Evolve/WarpXEvolve.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Evolve/WarpXEvolve.cpp b/Source/Evolve/WarpXEvolve.cpp
index d7ad37b768d..98d0b0ee1db 100644
--- a/Source/Evolve/WarpXEvolve.cpp
+++ b/Source/Evolve/WarpXEvolve.cpp
@@ -25,6 +25,9 @@
 #ifdef WARPX_USE_PSATD
 #   include "FieldSolver/SpectralSolver/SpectralSolver.H"
 #endif
+#ifdef WARPX_DIM_RZ
+#   include "FieldSolver/SpectralSolver/SpectralSolverRZ.H"
+#endif
 
 #include <AMReX.H>
 #include <AMReX_Array.H>

From f965f6e9c3b3226936ded88d021690d50f53d94f Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Mon, 24 May 2021 23:13:02 +0200
Subject: [PATCH 36/58] attempt at fixing issue with math functions

---
 Source/Parallelization/GuardCellManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Parallelization/GuardCellManager.cpp b/Source/Parallelization/GuardCellManager.cpp
index a28ca5a540a..b5ed4ac846e 100644
--- a/Source/Parallelization/GuardCellManager.cpp
+++ b/Source/Parallelization/GuardCellManager.cpp
@@ -19,8 +19,8 @@
 #include <AMReX_Config.H>
 #include <AMReX_INT.H>
 #include <AMReX_SPACE.H>
+#include <AMReX_Math.H>
 
-#include <math.h>
 #include <algorithm>
 
 using namespace amrex;

From d4c2fc502be3b10f821eb753ccfab5050e40dbda Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 25 May 2021 02:23:48 +0200
Subject: [PATCH 37/58] added missing include

---
 Source/EmbeddedBoundary/WarpXInitEB.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/EmbeddedBoundary/WarpXInitEB.cpp b/Source/EmbeddedBoundary/WarpXInitEB.cpp
index 7ce6033afdc..2329d74fdce 100644
--- a/Source/EmbeddedBoundary/WarpXInitEB.cpp
+++ b/Source/EmbeddedBoundary/WarpXInitEB.cpp
@@ -1,4 +1,5 @@
 #include "WarpX.H"
+#include "Utils/WarpXUtil.H"
 
 #include <AMReX_Config.H>
 #include <AMReX_Array4.H>

From c4ba1f90647d2f25157a28f9ae03969cd6d81130 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 25 May 2021 09:38:47 +0200
Subject: [PATCH 38/58] fixed missing include

---
 Source/Diagnostics/ReducedDiags/FieldReduction.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Diagnostics/ReducedDiags/FieldReduction.cpp b/Source/Diagnostics/ReducedDiags/FieldReduction.cpp
index c60ae22e754..64f0670b73c 100644
--- a/Source/Diagnostics/ReducedDiags/FieldReduction.cpp
+++ b/Source/Diagnostics/ReducedDiags/FieldReduction.cpp
@@ -8,6 +8,7 @@
 #include "FieldReduction.H"
 #include "WarpX.H"
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXUtil.H"
 
 // constructor
 FieldReduction::FieldReduction (std::string rd_name)

From 90d98bd47bb3610728963293a30cb3151402daaa Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Thu, 10 Jun 2021 14:41:18 +0200
Subject: [PATCH 39/58] using _fwd.H

---
 Source/BoundaryConditions/PML.H               |   2 ++
 .../BoundaryConditions/{PML.def => PML_fwd.H} |   0
 .../Diagnostics/BackTransformedDiagnostic.H   |   2 ++
 ...ic.def => BackTransformedDiagnostic_fwd.H} |   0
 .../ComputeDiagFunctors/ComputeDiagFunctor.H  |   2 ++
 ...agFunctor.def => ComputeDiagFunctor_fwd.H} |   0
 Source/Diagnostics/Diagnostics.H              |   7 ++--
 Source/Diagnostics/FlushFormats/FlushFormat.H |   2 ++
 .../FlushFormats/FlushFormatAscent.H          |   5 ++-
 .../FlushFormats/FlushFormatCheckpoint.H      |   5 ++-
 .../FlushFormats/FlushFormatOpenPMD.H         |   4 +--
 .../FlushFormats/FlushFormatPlotfile.H        |   5 ++-
 .../{FlushFormat.def => FlushFormat_fwd.H}    |   0
 Source/Diagnostics/MultiDiagnostics.H         |   2 ++
 ...Diagnostics.def => MultiDiagnostics_fwd.H} |   0
 .../Diagnostics/ParticleDiag/ParticleDiag.H   |   8 ++---
 .../{ParticleDiag.def => ParticleDiag_fwd.H}  |   0
 .../ReducedDiags/MultiReducedDiags.H          |   2 ++
 ...ducedDiags.def => MultiReducedDiags_fwd.H} |   0
 Source/Diagnostics/WarpXOpenPMD.H             |   5 ++-
 .../FiniteDifferenceSolver.H                  |   8 ++---
 ...olver.def => FiniteDifferenceSolver_fwd.H} |   0
 .../MacroscopicProperties.H                   |   2 ++
 ...erties.def => MacroscopicProperties_fwd.H} |   0
 .../SpectralAlgorithms/PMLPsatdAlgorithm.H    |   7 ++--
 .../SpectralBaseAlgorithm.H                   |   5 ++-
 .../SpectralSolver/SpectralFieldData.H        |   2 ++
 ...lFieldData.def => SpectralFieldData_fwd.H} |   0
 .../SpectralSolver/SpectralKSpace.H           |   2 ++
 ...pectralKSpace.def => SpectralKSpace_fwd.H} |   0
 .../SpectralSolver/SpectralSolver.H           |   2 ++
 .../SpectralSolver/SpectralSolverRZ.H         |   2 ++
 ...ralSolverRZ.def => SpectralSolverRZ_fwd.H} |   0
 ...pectralSolver.def => SpectralSolver_fwd.H} |   0
 Source/Filter/NCIGodfreyFilter.H              |   2 ++
 ...dfreyFilter.def => NCIGodfreyFilter_fwd.H} |   0
 Source/Initialization/InjectorPosition.H      |   2 ++
 ...torPosition.def => InjectorPosition_fwd.H} |   0
 Source/Initialization/PlasmaInjector.H        |   5 ++-
 Source/Parser/WarpXParserWrapper.H            |   2 ++
 ...erWrapper.def => WarpXParserWrapper_fwd.H} |   0
 Source/Particles/Collision/CollisionBase.H    |   4 +--
 Source/Particles/Collision/CollisionHandler.H |   5 ++-
 .../Collision/PairWiseCoulombCollision.H      |   7 ++--
 .../QEDInternals/BreitWheelerEngineWrapper.H  |   2 ++
 ...er.def => BreitWheelerEngineWrapper_fwd.H} |   0
 .../QEDInternals/QuantumSyncEngineWrapper.H   |   2 ++
 ...per.def => QuantumSyncEngineWrapper_fwd.H} |   0
 Source/Particles/Gather/GetExternalFields.H   |   5 ++-
 Source/Particles/MultiParticleContainer.H     |   6 ++--
 ...ainer.def => MultiParticleContainer_fwd.H} |   0
 Source/Particles/PhotonParticleContainer.H    |   5 ++-
 Source/Particles/PhysicalParticleContainer.H  |   6 ++--
 .../Particles/Resampling/LevelingThinning.H   |   5 ++-
 Source/Particles/Resampling/Resampling.H      |   4 +--
 .../RigidInjectedParticleContainer.H          |   5 ++-
 Source/Particles/WarpXParticleContainer.H     |  11 +++---
 ...ainer.def => WarpXParticleContainer_fwd.H} |   0
 Source/Utils/a.out                            | Bin 0 -> 152760 bytes
 Source/Utils/main.cpp                         |  34 ++++++++++++++++++
 Source/WarpX.H                                |  26 +++++++-------
 61 files changed, 132 insertions(+), 87 deletions(-)
 rename Source/BoundaryConditions/{PML.def => PML_fwd.H} (100%)
 rename Source/Diagnostics/{BackTransformedDiagnostic.def => BackTransformedDiagnostic_fwd.H} (100%)
 rename Source/Diagnostics/ComputeDiagFunctors/{ComputeDiagFunctor.def => ComputeDiagFunctor_fwd.H} (100%)
 rename Source/Diagnostics/FlushFormats/{FlushFormat.def => FlushFormat_fwd.H} (100%)
 rename Source/Diagnostics/{MultiDiagnostics.def => MultiDiagnostics_fwd.H} (100%)
 rename Source/Diagnostics/ParticleDiag/{ParticleDiag.def => ParticleDiag_fwd.H} (100%)
 rename Source/Diagnostics/ReducedDiags/{MultiReducedDiags.def => MultiReducedDiags_fwd.H} (100%)
 rename Source/FieldSolver/FiniteDifferenceSolver/{FiniteDifferenceSolver.def => FiniteDifferenceSolver_fwd.H} (100%)
 rename Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/{MacroscopicProperties.def => MacroscopicProperties_fwd.H} (100%)
 rename Source/FieldSolver/SpectralSolver/{SpectralFieldData.def => SpectralFieldData_fwd.H} (100%)
 rename Source/FieldSolver/SpectralSolver/{SpectralKSpace.def => SpectralKSpace_fwd.H} (100%)
 rename Source/FieldSolver/SpectralSolver/{SpectralSolverRZ.def => SpectralSolverRZ_fwd.H} (100%)
 rename Source/FieldSolver/SpectralSolver/{SpectralSolver.def => SpectralSolver_fwd.H} (100%)
 rename Source/Filter/{NCIGodfreyFilter.def => NCIGodfreyFilter_fwd.H} (100%)
 rename Source/Initialization/{InjectorPosition.def => InjectorPosition_fwd.H} (100%)
 rename Source/Parser/{WarpXParserWrapper.def => WarpXParserWrapper_fwd.H} (100%)
 rename Source/Particles/ElementaryProcess/QEDInternals/{BreitWheelerEngineWrapper.def => BreitWheelerEngineWrapper_fwd.H} (100%)
 rename Source/Particles/ElementaryProcess/QEDInternals/{QuantumSyncEngineWrapper.def => QuantumSyncEngineWrapper_fwd.H} (100%)
 rename Source/Particles/{MultiParticleContainer.def => MultiParticleContainer_fwd.H} (100%)
 rename Source/Particles/{WarpXParticleContainer.def => WarpXParticleContainer_fwd.H} (100%)
 create mode 100755 Source/Utils/a.out
 create mode 100644 Source/Utils/main.cpp

diff --git a/Source/BoundaryConditions/PML.H b/Source/BoundaryConditions/PML.H
index 33ebacb3054..57ff7a20741 100644
--- a/Source/BoundaryConditions/PML.H
+++ b/Source/BoundaryConditions/PML.H
@@ -9,6 +9,8 @@
 #ifndef WARPX_PML_H_
 #define WARPX_PML_H_
 
+#include "PML_fwd.H"
+
 #ifdef WARPX_USE_PSATD
 #   include "FieldSolver/SpectralSolver/SpectralSolver.H"
 #endif
diff --git a/Source/BoundaryConditions/PML.def b/Source/BoundaryConditions/PML_fwd.H
similarity index 100%
rename from Source/BoundaryConditions/PML.def
rename to Source/BoundaryConditions/PML_fwd.H
diff --git a/Source/Diagnostics/BackTransformedDiagnostic.H b/Source/Diagnostics/BackTransformedDiagnostic.H
index f3757b60e49..9226a157995 100644
--- a/Source/Diagnostics/BackTransformedDiagnostic.H
+++ b/Source/Diagnostics/BackTransformedDiagnostic.H
@@ -8,6 +8,8 @@
 #ifndef WARPX_BackTransformedDiagnostic_H_
 #define WARPX_BackTransformedDiagnostic_H_
 
+#include "BackTransformedDiagnostic_fwd.H"
+
 #include "Particles/WarpXParticleContainer.H"
 #include "Particles/MultiParticleContainer.H"
 
diff --git a/Source/Diagnostics/BackTransformedDiagnostic.def b/Source/Diagnostics/BackTransformedDiagnostic_fwd.H
similarity index 100%
rename from Source/Diagnostics/BackTransformedDiagnostic.def
rename to Source/Diagnostics/BackTransformedDiagnostic_fwd.H
diff --git a/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H
index 0c3aa799a9e..3ce6a11da22 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H
@@ -1,6 +1,8 @@
 #ifndef WARPX_COMPUTEDIAGFUNCTOR_H_
 #define WARPX_COMPUTEDIAGFUNCTOR_H_
 
+#include "ComputeDiagFunctor_fwd.H"
+
 #include <AMReX.H>
 #include <AMReX_MultiFab.H>
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.def b/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor_fwd.H
similarity index 100%
rename from Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.def
rename to Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor_fwd.H
diff --git a/Source/Diagnostics/Diagnostics.H b/Source/Diagnostics/Diagnostics.H
index 16fa15c3fbe..2d1dfb0c310 100644
--- a/Source/Diagnostics/Diagnostics.H
+++ b/Source/Diagnostics/Diagnostics.H
@@ -2,10 +2,9 @@
 #define WARPX_DIAGNOSTICS_H_
 
 #include "ParticleDiag/ParticleDiag.H"
-// _______________________________________________WarpX Forward declarations
-#include "FlushFormats/FlushFormat.def"
-#include "ComputeDiagFunctors/ComputeDiagFunctor.def"
-//________________________________________________________________________
+
+#include "FlushFormats/FlushFormat_fwd.H"
+#include "ComputeDiagFunctors/ComputeDiagFunctor_fwd.H"
 
 #include <AMReX_Vector.H>
 #include <AMReX_MultiFab.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormat.H b/Source/Diagnostics/FlushFormats/FlushFormat.H
index 800c991602a..8fa4dd4f47b 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormat.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormat.H
@@ -1,6 +1,8 @@
 #ifndef WARPX_FLUSHFORMAT_H_
 #define WARPX_FLUSHFORMAT_H_
 
+#include "FlushFormat_fwd.H"
+
 #include "Particles/MultiParticleContainer.H"
 #include "Diagnostics/ParticleDiag/ParticleDiag.H"
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
index 64dba02f394..75ae2269620 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
@@ -2,9 +2,8 @@
 #define WARPX_FLUSHFORMATASCENT_H_
 
 #include "FlushFormat.H"
-// _______________________________________________WarpX Forward declarations
-#include "Diagnostics/ParticleDiag/ParticleDiag.def"
-//________________________________________________________________________
+
+#include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Vector.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
index 22fc274f58c..f7d5801af36 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
@@ -2,9 +2,8 @@
 #define WARPX_FLUSHFORMATCHECKPOINT_H_
 
 #include "FlushFormatPlotfile.H"
-// _______________________________________________WarpX Forward declarations
-#include "Diagnostics/ParticleDiag/ParticleDiag.def"
-//________________________________________________________________________
+
+#include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Vector.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
index 750fa320fc4..6da1b27c5f7 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
@@ -3,10 +3,8 @@
 
 #include "FlushFormat.H"
 #include "Diagnostics/WarpXOpenPMD.H"
-// _______________________________________________WarpX Forward declarations
-#include "Diagnostics/ParticleDiag/ParticleDiag.def"
-//________________________________________________________________________
 
+#include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Vector.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
index 21500282981..8983db6ff12 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
@@ -2,9 +2,8 @@
 #define WARPX_FLUSHFORMATPLOTFILE_H_
 
 #include "FlushFormat.H"
-// _______________________________________________WarpX Forward declarations
-#include "Diagnostics/ParticleDiag/ParticleDiag.def"
-//________________________________________________________________________
+
+#include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Vector.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormat.def b/Source/Diagnostics/FlushFormats/FlushFormat_fwd.H
similarity index 100%
rename from Source/Diagnostics/FlushFormats/FlushFormat.def
rename to Source/Diagnostics/FlushFormats/FlushFormat_fwd.H
diff --git a/Source/Diagnostics/MultiDiagnostics.H b/Source/Diagnostics/MultiDiagnostics.H
index 22246c7c658..c13d5656f4b 100644
--- a/Source/Diagnostics/MultiDiagnostics.H
+++ b/Source/Diagnostics/MultiDiagnostics.H
@@ -1,6 +1,8 @@
 #ifndef WARPX_MULTIDIAGNOSTICS_H_
 #define WARPX_MULTIDIAGNOSTICS_H_
 
+#include "MultiDiagnostics_fwd.H"
+
 #include "Diagnostics.H"
 
 #include <AMReX_Vector.H>
diff --git a/Source/Diagnostics/MultiDiagnostics.def b/Source/Diagnostics/MultiDiagnostics_fwd.H
similarity index 100%
rename from Source/Diagnostics/MultiDiagnostics.def
rename to Source/Diagnostics/MultiDiagnostics_fwd.H
diff --git a/Source/Diagnostics/ParticleDiag/ParticleDiag.H b/Source/Diagnostics/ParticleDiag/ParticleDiag.H
index 00c7ee4efc5..092d0b521bd 100644
--- a/Source/Diagnostics/ParticleDiag/ParticleDiag.H
+++ b/Source/Diagnostics/ParticleDiag/ParticleDiag.H
@@ -1,10 +1,10 @@
 #ifndef WARPX_PARTICLEDIAG_H_
 #define WARPX_PARTICLEDIAG_H_
 
-// _______________________________________________WarpX Forward declarations
-#include "Particles/WarpXParticleContainer.def"
-#include "Parser/WarpXParserWrapper.def"
-//________________________________________________________________________
+#include "ParticleDiag_fwd.H"
+
+#include "Particles/WarpXParticleContainer_fwd.H"
+#include "Parser/WarpXParserWrapper_fwd.H"
 
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
diff --git a/Source/Diagnostics/ParticleDiag/ParticleDiag.def b/Source/Diagnostics/ParticleDiag/ParticleDiag_fwd.H
similarity index 100%
rename from Source/Diagnostics/ParticleDiag/ParticleDiag.def
rename to Source/Diagnostics/ParticleDiag/ParticleDiag_fwd.H
diff --git a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H
index 3c8d9a6282b..ecfa6a7c249 100644
--- a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H
+++ b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H
@@ -8,6 +8,8 @@
 #ifndef WARPX_DIAGNOSTICS_REDUCEDDIAGS_MULTIREDUCEDDIAGS_H_
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_MULTIREDUCEDDIAGS_H_
 
+#include "MultiReducedDiags_fwd.H"
+
 #include "ReducedDiags.H"
 
 #include <vector>
diff --git a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.def b/Source/Diagnostics/ReducedDiags/MultiReducedDiags_fwd.H
similarity index 100%
rename from Source/Diagnostics/ReducedDiags/MultiReducedDiags.def
rename to Source/Diagnostics/ReducedDiags/MultiReducedDiags_fwd.H
diff --git a/Source/Diagnostics/WarpXOpenPMD.H b/Source/Diagnostics/WarpXOpenPMD.H
index 13650c54118..33b64d3339f 100644
--- a/Source/Diagnostics/WarpXOpenPMD.H
+++ b/Source/Diagnostics/WarpXOpenPMD.H
@@ -9,9 +9,8 @@
 #define WARPX_OPEN_PMD_H_
 
 #include "Particles/WarpXParticleContainer.H"
-// _______________________________________________WarpX Forward declarations
-#include "Diagnostics/ParticleDiag/ParticleDiag.def"
-//________________________________________________________________________
+
+#include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_AmrParticles.H>
 #include <AMReX_ParallelDescriptor.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
index 303c01ca09d..dc44ab1b338 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
@@ -8,10 +8,10 @@
 #ifndef WARPX_FINITE_DIFFERENCE_SOLVER_H_
 #define WARPX_FINITE_DIFFERENCE_SOLVER_H_
 
-// _______________________________________________WarpX Forward declarations
-#include "BoundaryConditions/PML.def"
-#include "MacroscopicProperties/MacroscopicProperties.def"
-//________________________________________________
+#include "FiniteDifferenceSolver_fwd.H"
+
+#include "BoundaryConditions/PML_fwd.H"
+#include "MacroscopicProperties/MacroscopicProperties_fwd.H"
 
 #include <AMReX_MultiFab.H>
 #include <AMReX_GpuContainers.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.def b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver_fwd.H
similarity index 100%
rename from Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.def
rename to Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver_fwd.H
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H
index c0f0e94bd50..efa059b0341 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H
@@ -1,6 +1,8 @@
 #ifndef WARPX_MACROSCOPICPROPERTIES_H_
 #define WARPX_MACROSCOPICPROPERTIES_H_
 
+#include "MacroscopicProperties_fwd.H"
+
 #include "Parser/WarpXParserWrapper.H"
 #include "Utils/WarpXConst.H"
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.def b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties_fwd.H
similarity index 100%
rename from Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.def
rename to Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties_fwd.H
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
index 649ebd424ad..99032cf060b 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
@@ -8,10 +8,9 @@
 #define WARPX_PML_PSATD_ALGORITHM_H_
 
 #include "SpectralBaseAlgorithm.H"
-// _______________________________________________WarpX Forward declarations
-#include "FieldSolver/SpectralSolver/SpectralFieldData.def"
-#include "FieldSolver/SpectralSolver/SpectralKSpace.def"
-//________________________________________________________________________
+
+#include "FieldSolver/SpectralSolver/SpectralFieldData_fwd.H"
+#include "FieldSolver/SpectralSolver/SpectralKSpace_fwd.H"
 
 #include <AMReX_REAL.H>
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
index 7290fe73b2a..17b0851ad09 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
@@ -9,9 +9,8 @@
 
 #include "Utils/WarpX_Complex.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
-// _______________________________________________WarpX Forward declarations
-#include "FieldSolver/SpectralSolver/SpectralFieldData.def"
-//________________________________________________________________________
+
+#include "FieldSolver/SpectralSolver/SpectralFieldData_fwd.H"
 
 #include <AMReX_BaseFab.H>
 #include <AMReX_Config.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
index 875dfddab3b..fa0074cd217 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
@@ -8,6 +8,8 @@
 #ifndef WARPX_SPECTRAL_FIELD_DATA_H_
 #define WARPX_SPECTRAL_FIELD_DATA_H_
 
+#include "SpectralFieldData_fwd.H"
+
 #include "Utils/WarpX_Complex.H"
 #include "SpectralKSpace.H"
 #include "AnyFFT.H"
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.def b/Source/FieldSolver/SpectralSolver/SpectralFieldData_fwd.H
similarity index 100%
rename from Source/FieldSolver/SpectralSolver/SpectralFieldData.def
rename to Source/FieldSolver/SpectralSolver/SpectralFieldData_fwd.H
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
index 10302ce7b0d..9d74c38534c 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
@@ -8,6 +8,8 @@
 #ifndef WARPX_SPECTRAL_K_SPACE_H_
 #define WARPX_SPECTRAL_K_SPACE_H_
 
+#include "SpectralKSpace_fwd.H"
+
 #include "Utils/WarpX_Complex.H"
 
 #include <AMReX_BoxArray.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.def b/Source/FieldSolver/SpectralSolver/SpectralKSpace_fwd.H
similarity index 100%
rename from Source/FieldSolver/SpectralSolver/SpectralKSpace.def
rename to Source/FieldSolver/SpectralSolver/SpectralKSpace_fwd.H
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.H b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
index 82e313ec7fa..7b8b5b01c06 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolver.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
@@ -7,6 +7,8 @@
 #ifndef WARPX_SPECTRAL_SOLVER_H_
 #define WARPX_SPECTRAL_SOLVER_H_
 
+#include "SpectralSolver_fwd.H"
+
 #include "SpectralAlgorithms/SpectralBaseAlgorithm.H"
 #include "SpectralFieldData.H"
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.H b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.H
index 7fe4bd00ccd..114d199c5b3 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.H
@@ -7,6 +7,8 @@
 #ifndef WARPX_SPECTRAL_SOLVER_RZ_H_
 #define WARPX_SPECTRAL_SOLVER_RZ_H_
 
+#include "SpectralSolverRZ_fwd.H"
+
 #include "SpectralAlgorithms/SpectralBaseAlgorithmRZ.H"
 #include "SpectralFieldDataRZ.H"
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.def b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ_fwd.H
similarity index 100%
rename from Source/FieldSolver/SpectralSolver/SpectralSolverRZ.def
rename to Source/FieldSolver/SpectralSolver/SpectralSolverRZ_fwd.H
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.def b/Source/FieldSolver/SpectralSolver/SpectralSolver_fwd.H
similarity index 100%
rename from Source/FieldSolver/SpectralSolver/SpectralSolver.def
rename to Source/FieldSolver/SpectralSolver/SpectralSolver_fwd.H
diff --git a/Source/Filter/NCIGodfreyFilter.H b/Source/Filter/NCIGodfreyFilter.H
index 0bcd0fb675c..18b93189d76 100644
--- a/Source/Filter/NCIGodfreyFilter.H
+++ b/Source/Filter/NCIGodfreyFilter.H
@@ -7,6 +7,8 @@
 #ifndef WARPX_GODFREY_FILTER_H_
 #define WARPX_GODFREY_FILTER_H_
 
+#include "NCIGodfreyFilter_fwd.H"
+
 #include "Filter.H"
 
 #include <AMReX_REAL.H>
diff --git a/Source/Filter/NCIGodfreyFilter.def b/Source/Filter/NCIGodfreyFilter_fwd.H
similarity index 100%
rename from Source/Filter/NCIGodfreyFilter.def
rename to Source/Filter/NCIGodfreyFilter_fwd.H
diff --git a/Source/Initialization/InjectorPosition.H b/Source/Initialization/InjectorPosition.H
index ee90ce7ffd5..88f989c8317 100644
--- a/Source/Initialization/InjectorPosition.H
+++ b/Source/Initialization/InjectorPosition.H
@@ -8,6 +8,8 @@
 #ifndef INJECTOR_POSITION_H_
 #define INJECTOR_POSITION_H_
 
+#include "InjectorPosition_fwd.H"
+
 #include <AMReX_Gpu.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Utility.H>
diff --git a/Source/Initialization/InjectorPosition.def b/Source/Initialization/InjectorPosition_fwd.H
similarity index 100%
rename from Source/Initialization/InjectorPosition.def
rename to Source/Initialization/InjectorPosition_fwd.H
diff --git a/Source/Initialization/PlasmaInjector.H b/Source/Initialization/PlasmaInjector.H
index bdca52cbf71..3e578c5d3c3 100644
--- a/Source/Initialization/PlasmaInjector.H
+++ b/Source/Initialization/PlasmaInjector.H
@@ -12,9 +12,8 @@
 #include "Particles/SpeciesPhysicalProperties.H"
 #include "InjectorMomentum.H"
 #include "InjectorDensity.H"
-// _______________________________________________WarpX Forward declarations
-#include "InjectorPosition.def"
-// ________________________________________________________________________
+
+#include "InjectorPosition_fwd.H"
 
 #include <AMReX_Vector.H>
 #include <AMReX_ParmParse.H>
diff --git a/Source/Parser/WarpXParserWrapper.H b/Source/Parser/WarpXParserWrapper.H
index bcd222910ec..4395858b5ec 100644
--- a/Source/Parser/WarpXParserWrapper.H
+++ b/Source/Parser/WarpXParserWrapper.H
@@ -7,6 +7,8 @@
 #ifndef WARPX_PARSER_WRAPPER_H_
 #define WARPX_PARSER_WRAPPER_H_
 
+#include "WarpXParserWrapper_fwd.H"
+
 #include "Parser/WarpXParser.H"
 #include "Parser/GpuParser.H"
 
diff --git a/Source/Parser/WarpXParserWrapper.def b/Source/Parser/WarpXParserWrapper_fwd.H
similarity index 100%
rename from Source/Parser/WarpXParserWrapper.def
rename to Source/Parser/WarpXParserWrapper_fwd.H
diff --git a/Source/Particles/Collision/CollisionBase.H b/Source/Particles/Collision/CollisionBase.H
index 56dd72b80d3..528185aa2eb 100644
--- a/Source/Particles/Collision/CollisionBase.H
+++ b/Source/Particles/Collision/CollisionBase.H
@@ -7,9 +7,7 @@
 #ifndef WARPX_PARTICLES_COLLISION_COLLISIONBASE_H_
 #define WARPX_PARTICLES_COLLISION_COLLISIONBASE_H_
 
-// _______________________________________________WarpX Forward declarations
-#include "Particles/MultiParticleContainer.def"
-// ______________________________________________
+#include "Particles/MultiParticleContainer_fwd.H"
 
 #include <AMReX_Vector.H>
 #include <AMReX_REAL.H>
diff --git a/Source/Particles/Collision/CollisionHandler.H b/Source/Particles/Collision/CollisionHandler.H
index 9826ce563d8..efcb7fe9513 100644
--- a/Source/Particles/Collision/CollisionHandler.H
+++ b/Source/Particles/Collision/CollisionHandler.H
@@ -8,9 +8,8 @@
 #define WARPX_PARTICLES_COLLISION_COLLISIONHANDLER_H_
 
 #include "CollisionBase.H"
-// _______________________________________________WarpX Forward declarations
-#include "Particles/MultiParticleContainer.def"
-// ______________________________________________
+
+#include "Particles/MultiParticleContainer_fwd.H"
 
 #include <AMReX_Vector.H>
 #include <AMReX_REAL.H>
diff --git a/Source/Particles/Collision/PairWiseCoulombCollision.H b/Source/Particles/Collision/PairWiseCoulombCollision.H
index 2a68b61aee7..ae7f191dad3 100644
--- a/Source/Particles/Collision/PairWiseCoulombCollision.H
+++ b/Source/Particles/Collision/PairWiseCoulombCollision.H
@@ -8,10 +8,9 @@
 #define WARPX_PARTICLES_COLLISION_PAIRWISECOULOMBCOLLISION_H_
 
 #include "CollisionBase.H"
-// _______________________________________________WarpX Forward declarations
-#include "Particles/MultiParticleContainer.def"
-#include "Particles/WarpXParticleContainer.def"
-// ______________________________________________
+
+#include "Particles/MultiParticleContainer_fwd.H"
+#include "Particles/WarpXParticleContainer_fwd.H"
 
 #include <AMReX_REAL.H>
 
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H
index 16322a90a44..e59aea89281 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H
+++ b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H
@@ -7,6 +7,8 @@
 #ifndef WARPX_breit_wheeler_engine_wrapper_h_
 #define WARPX_breit_wheeler_engine_wrapper_h_
 
+#include "BreitWheelerEngineWrapper_fwd.H"
+
 #include "QedWrapperCommons.H"
 #include "QedChiFunctions.H"
 #include "Utils/WarpXConst.H"
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper_fwd.H
similarity index 100%
rename from Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def
rename to Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper_fwd.H
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H
index fe7bbfacd17..d1e9aee074e 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H
+++ b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H
@@ -7,6 +7,8 @@
 #ifndef WARPX_quantum_sync_engine_wrapper_h_
 #define WARPX_quantum_sync_engine_wrapper_h_
 
+#include "BreitWheelerEngineWrapper_fwd.H"
+
 #include "QedWrapperCommons.H"
 #include "QedChiFunctions.H"
 #include "Utils/WarpXConst.H"
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper_fwd.H
similarity index 100%
rename from Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def
rename to Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper_fwd.H
diff --git a/Source/Particles/Gather/GetExternalFields.H b/Source/Particles/Gather/GetExternalFields.H
index 44dee13920d..f742f6668fd 100644
--- a/Source/Particles/Gather/GetExternalFields.H
+++ b/Source/Particles/Gather/GetExternalFields.H
@@ -4,9 +4,8 @@
 
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "Parser/WarpXParserWrapper.H"
-// _______________________________________________WarpX Forward declarations
-#include "Particles/WarpXParticleContainer.def"
-// ________________________________________________________________________
+
+#include "Particles/WarpXParticleContainer_fwd.H"
 
 #include <AMReX_REAL.H>
 #include <AMReX.H>
diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H
index a29f3928aea..05d2730f1d4 100644
--- a/Source/Particles/MultiParticleContainer.H
+++ b/Source/Particles/MultiParticleContainer.H
@@ -11,6 +11,8 @@
 #ifndef WARPX_ParticleContainer_H_
 #define WARPX_ParticleContainer_H_
 
+#include "MultiParticleContainer_fwd.H"
+
 #include "Utils/WarpXUtil.H"
 #include "WarpXParticleContainer.H"
 #include "PhysicalParticleContainer.H"
@@ -21,8 +23,8 @@
 
 #ifdef WARPX_QED
 #   include "Particles/ElementaryProcess/QEDInternals/QedChiFunctions.H"
-#   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def"
-#   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def"
+#   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper_fwd.H"
+#   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper_fwd.H"
 #endif
 
 #include <AMReX_BLassert.H>
diff --git a/Source/Particles/MultiParticleContainer.def b/Source/Particles/MultiParticleContainer_fwd.H
similarity index 100%
rename from Source/Particles/MultiParticleContainer.def
rename to Source/Particles/MultiParticleContainer_fwd.H
diff --git a/Source/Particles/PhotonParticleContainer.H b/Source/Particles/PhotonParticleContainer.H
index 7d6df0f9554..fce97b2cbc6 100644
--- a/Source/Particles/PhotonParticleContainer.H
+++ b/Source/Particles/PhotonParticleContainer.H
@@ -11,9 +11,8 @@
 #include "PhysicalParticleContainer.H"
 #include "Evolve/WarpXDtType.H"
 #include "Particles/Gather/ScaleFields.H"
-// _______________________________________________WarpX Forward declarations
-#include "Particles/WarpXParticleContainer.def"
-// ________________________________________________________________________
+
+#include "Particles/WarpXParticleContainer_fwd.H"
 
 #include <AMReX_Particles.H>
 #include <AMReX_REAL.H>
diff --git a/Source/Particles/PhysicalParticleContainer.H b/Source/Particles/PhysicalParticleContainer.H
index 900afddf59d..13d91d59b58 100644
--- a/Source/Particles/PhysicalParticleContainer.H
+++ b/Source/Particles/PhysicalParticleContainer.H
@@ -19,10 +19,8 @@
 #ifdef WARPX_QED
 #    include "Particles/ElementaryProcess/QEDPairGeneration.H"
 #    include "Particles/ElementaryProcess/QEDPhotonEmission.H"
-// _______________________________________________WarpX Forward declarations
-#    include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def"
-#    include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def"
-// ______________________________________________
+#    include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper_fwd.H"
+#    include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper_fwd.H"
 #endif
 
 #include <AMReX_GpuContainers.H>
diff --git a/Source/Particles/Resampling/LevelingThinning.H b/Source/Particles/Resampling/LevelingThinning.H
index 8570a137466..535585e8cc8 100644
--- a/Source/Particles/Resampling/LevelingThinning.H
+++ b/Source/Particles/Resampling/LevelingThinning.H
@@ -8,9 +8,8 @@
 #define WARPX_LEVELING_THINNING_H_
 
 #include "Resampling.H"
-// _______________________________________________WarpX Forward declarations
-#include "Particles/WarpXParticleContainer.def"
-// ________________________________________________________________________
+
+#include "Particles/WarpXParticleContainer_fwd.H"
 
 #include <AMReX_REAL.H>
 #include <string>
diff --git a/Source/Particles/Resampling/Resampling.H b/Source/Particles/Resampling/Resampling.H
index d4d9271110d..69823836acd 100644
--- a/Source/Particles/Resampling/Resampling.H
+++ b/Source/Particles/Resampling/Resampling.H
@@ -8,9 +8,7 @@
 #define WARPX_RESAMPLING_H_
 
 #include "ResamplingTrigger.H"
-// _______________________________________________WarpX Forward declarations
-#include "Particles/WarpXParticleContainer.def"
-// ________________________________________________________________________
+#include "Particles/WarpXParticleContainer_fwd.H"
 
 #include <AMReX_REAL.H>
 
diff --git a/Source/Particles/RigidInjectedParticleContainer.H b/Source/Particles/RigidInjectedParticleContainer.H
index 539380fd7d3..cdd3927e0a8 100644
--- a/Source/Particles/RigidInjectedParticleContainer.H
+++ b/Source/Particles/RigidInjectedParticleContainer.H
@@ -11,9 +11,8 @@
 #include "PhysicalParticleContainer.H"
 #include "Evolve/WarpXDtType.H"
 #include "Particles/Gather/ScaleFields.H"
-// _______________________________________________WarpX Forward declarations
-#include "WarpXParticleContainer.def"
-// ________________________________________________________________________
+
+#include "WarpXParticleContainer_fwd.H"
 
 #include <AMReX_Vector.H>
 #include <AMReX_REAL.H>
diff --git a/Source/Particles/WarpXParticleContainer.H b/Source/Particles/WarpXParticleContainer.H
index 377606ff078..0852483c25d 100644
--- a/Source/Particles/WarpXParticleContainer.H
+++ b/Source/Particles/WarpXParticleContainer.H
@@ -10,15 +10,16 @@
 #ifndef WARPX_WarpXParticleContainer_H_
 #define WARPX_WarpXParticleContainer_H_
 
+#include "WarpXParticleContainer_fwd.H"
+
 #include "SpeciesPhysicalProperties.H"
 #include "Evolve/WarpXDtType.H"
-// _______________________________________________WarpX Forward declarations
-#include "MultiParticleContainer.def"
+
+#include "MultiParticleContainer_fwd.H"
 #ifdef WARPX_QED
-#    include "ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.def"
-#    include "ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.def"
+#    include "ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper_fwd.H"
+#    include "ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper_fwd.H"
 #endif
-// ________________________________________________________________________
 
 #include <AMReX_Particles.H>
 #include <AMReX_AmrCore.H>
diff --git a/Source/Particles/WarpXParticleContainer.def b/Source/Particles/WarpXParticleContainer_fwd.H
similarity index 100%
rename from Source/Particles/WarpXParticleContainer.def
rename to Source/Particles/WarpXParticleContainer_fwd.H
diff --git a/Source/Utils/a.out b/Source/Utils/a.out
new file mode 100755
index 0000000000000000000000000000000000000000..7e50880f53d3005753c319c9e7bd3c5b8ab31866
GIT binary patch
literal 152760
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

literal 0
HcmV?d00001

diff --git a/Source/Utils/main.cpp b/Source/Utils/main.cpp
new file mode 100644
index 00000000000..1366093b1bb
--- /dev/null
+++ b/Source/Utils/main.cpp
@@ -0,0 +1,34 @@
+#include "MsgLogger.H"
+
+#include <iostream>
+#include <sstream>
+
+int main()
+{
+    MsgLogger::Logger logger;
+
+    logger.record_entry(
+        MsgLogger::Type::warning, MsgLogger::Importance::low,
+        "Particles", "species_1 has 0 particles at time 0");
+
+    logger.record_entry(
+        MsgLogger::Type::warning, MsgLogger::Importance::medium,
+        "Laser", "laser_1 has e_max=0 and will be disabled");
+
+    logger.record_entry(
+        MsgLogger::Type::warning, MsgLogger::Importance::high,
+        "Parallelization", "Parallelization is extremely inefficient!");
+
+    logger.record_entry(
+        MsgLogger::Type::warning, MsgLogger::Importance::medium,
+        "Laser", "laser_1 is out of the simulation box and will be disabled");
+
+    logger.record_entry(
+        MsgLogger::Type::warning, MsgLogger::Importance::medium,
+        "Algorithms", "algorithm xxx is experimental!");
+
+    std::stringstream ss;
+    logger.print_warnings(ss);
+
+    std::cout << ss.str();
+}
\ No newline at end of file
diff --git a/Source/WarpX.H b/Source/WarpX.H
index 7b244172e12..a30c31530e3 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -17,24 +17,23 @@
 #include "Utils/IntervalsParser.H"
 #include "Parallelization/GuardCellManager.H"
 #include "Parser/WarpXParserWrapper.H"
-// _______________________________________________WarpX Forward declarations
-#include "Diagnostics/BackTransformedDiagnostic.def"
-#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.def"
-#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.def"
-#include "Diagnostics/MultiDiagnostics.def"
-#include "Particles/MultiParticleContainer.def"
-#include "Diagnostics/ReducedDiags/MultiReducedDiags.def"
-#include "Filter/NCIGodfreyFilter.def"
-#include "BoundaryConditions/PML.def"
-#include "Particles/WarpXParticleContainer.def"
+
+#include "Diagnostics/BackTransformedDiagnostic_fwd.H"
+#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver_fwd.H"
+#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties_fwd.H"
+#include "Diagnostics/MultiDiagnostics_fwd.H"
+#include "Particles/MultiParticleContainer_fwd.H"
+#include "Diagnostics/ReducedDiags/MultiReducedDiags_fwd.H"
+#include "Filter/NCIGodfreyFilter_fwd.H"
+#include "BoundaryConditions/PML_fwd.H"
+#include "Particles/WarpXParticleContainer_fwd.H"
 #ifdef WARPX_USE_PSATD
 #   ifdef WARPX_DIM_RZ
-#       include "FieldSolver/SpectralSolver/SpectralSolverRZ.def"
+#       include "FieldSolver/SpectralSolver/SpectralSolverRZ_fwd.H"
 #   else
-#       include "FieldSolver/SpectralSolver/SpectralSolver.def"
+#       include "FieldSolver/SpectralSolver/SpectralSolver_fwd.H"
 #   endif
 #endif
-// ________________________________________________________________________
 
 #include <AMReX_AmrCore.H>
 #include <AMReX_RealVect.H>
@@ -52,7 +51,6 @@
 #   include "AMReX_EBFabFactory.H"
 #endif
 
-// _______________________________________________AMReX Forward declarations
 namespace amrex { class Box; }
 namespace amrex { class BoxArray; }
 namespace amrex { class DistributionMapping; }

From 8ca245ea0630a1c37b3b6ab1dc59aba543a736bc Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Thu, 10 Jun 2021 14:50:43 +0200
Subject: [PATCH 40/58] fixed bug

---
 Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp b/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp
index 6fbf76822cb..752905fdeab 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp
@@ -8,6 +8,7 @@
 #include "ParticleMomentum.H"
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
+#include "Particles/MultiParticleContainer.H"
 
 #include <AMReX_REAL.H>
 #include <AMReX_ParticleReduce.H>

From 5299f3b6154df4b7d79280ed55dcea62d6b60a87 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Thu, 10 Jun 2021 17:38:41 +0200
Subject: [PATCH 41/58] progress with iwyu

---
 Source/BoundaryConditions/WarpX_PEC.H         |  1 +
 .../BackTransformFunctor.H                    |  1 +
 .../BackTransformFunctor.cpp                  | 27 +++++++++---------
 .../ComputeDiagFunctors/CellCenterFunctor.H   |  3 ++
 .../ComputeDiagFunctors/DivBFunctor.H         |  3 ++
 .../ComputeDiagFunctors/DivEFunctor.H         |  3 ++
 .../ComputeDiagFunctors/DivEFunctor.cpp       |  2 --
 .../ComputeDiagFunctors/PartPerCellFunctor.H  |  3 ++
 .../PartPerCellFunctor.cpp                    |  2 --
 .../ComputeDiagFunctors/PartPerGridFunctor.H  |  3 ++
 .../PartPerGridFunctor.cpp                    |  2 --
 .../ComputeDiagFunctors/RhoFunctor.H          |  4 +++
 .../ComputeDiagFunctors/RhoFunctor.cpp        |  2 --
 .../FlushFormats/FlushFormatAscent.H          |  1 +
 .../FlushFormats/FlushFormatCheckpoint.H      |  1 +
 .../FlushFormats/FlushFormatCheckpoint.cpp    |  1 -
 .../FlushFormats/FlushFormatOpenPMD.H         |  1 +
 .../FlushFormats/FlushFormatOpenPMD.cpp       |  5 ++--
 .../FlushFormats/FlushFormatPlotfile.H        |  1 +
 .../FlushFormats/FlushFormatPlotfile.cpp      |  2 --
 .../Diagnostics/ReducedDiags/FieldMomentum.H  |  1 +
 .../ReducedDiags/FieldMomentum.cpp            | 19 +++++++++++--
 .../Diagnostics/ReducedDiags/FieldReduction.H | 24 ++++++++++++++++
 .../ReducedDiags/FieldReduction.cpp           | 11 +++++++-
 .../ReducedDiags/MultiReducedDiags.cpp        |  3 ++
 .../ReducedDiags/ParticleEnergy.cpp           |  3 ++
 .../ReducedDiags/ParticleMomentum.H           |  1 +
 .../ReducedDiags/ParticleMomentum.cpp         | 15 ++++++++--
 Source/Diagnostics/WarpXOpenPMD.H             |  3 +-
 Source/EmbeddedBoundary/WarpXInitEB.cpp       | 12 ++++++++
 Source/FieldSolver/ElectrostaticSolver.cpp    |  7 +++++
 .../FiniteDifferenceSolver/ComputeDivE.cpp    |  1 +
 .../FiniteDifferenceSolver/EvolveB.cpp        |  1 +
 .../FiniteDifferenceSolver/EvolveE.cpp        |  1 +
 .../FiniteDifferenceSolver/EvolveEPML.cpp     |  2 ++
 .../FiniteDifferenceSolver/EvolveF.cpp        |  1 +
 .../FiniteDifferenceSolver/EvolveFPML.cpp     |  1 +
 .../FiniteDifferenceSolver/EvolveG.cpp        |  1 +
 .../FiniteDifferenceSolver.H                  |  1 +
 .../MacroscopicEvolveE.cpp                    |  1 +
 .../ComovingPsatdAlgorithm.H                  |  2 ++
 .../SpectralAlgorithms/PMLPsatdAlgorithm.H    |  2 ++
 .../SpectralBaseAlgorithm.H                   |  2 ++
 .../SpectralBaseAlgorithm.cpp                 |  1 -
 .../SpectralSolver/SpectralFieldData.cpp      |  1 +
 Source/FieldSolver/WarpXPushFieldsEM.cpp      |  3 +-
 Source/Filter/BilinearFilter.H                |  1 +
 Source/Filter/Filter.H                        |  3 ++
 Source/Initialization/InjectorDensity.cpp     |  1 +
 Source/Initialization/InjectorMomentum.H      |  1 +
 Source/Initialization/PlasmaInjector.cpp      |  1 +
 Source/Initialization/WarpXAMReXInit.cpp      |  2 +-
 Source/Initialization/WarpXInitData.cpp       |  2 +-
 Source/Parallelization/WarpXComm.cpp          | 25 +++++++++++++++++
 Source/Parallelization/WarpXRegrid.cpp        | 28 ++++++++++++++++++-
 .../Collision/PairWiseCoulombCollision.H      |  1 +
 .../Particles/ElementaryProcess/Ionization.H  |  4 ++-
 .../ElementaryProcess/QEDPairGeneration.H     |  4 ++-
 .../ElementaryProcess/QEDPhotonEmission.H     |  3 ++
 Source/Particles/MultiParticleContainer.H     |  1 -
 Source/Particles/MultiParticleContainer.cpp   |  4 +--
 Source/Particles/PhotonParticleContainer.cpp  |  5 ++++
 Source/Particles/Sorting/Partition.cpp        |  1 +
 Source/Utils/CoarsenIO.cpp                    |  1 +
 Source/Utils/ParticleUtils.H                  |  1 +
 Source/WarpX.H                                | 21 +++-----------
 66 files changed, 235 insertions(+), 63 deletions(-)

diff --git a/Source/BoundaryConditions/WarpX_PEC.H b/Source/BoundaryConditions/WarpX_PEC.H
index 044cd7d8c2a..3426fccff12 100644
--- a/Source/BoundaryConditions/WarpX_PEC.H
+++ b/Source/BoundaryConditions/WarpX_PEC.H
@@ -11,6 +11,7 @@
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_REAL.H>
+#include <AMReX_MultiFab.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
index 0f3f537e91b..151d16d7008 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
@@ -7,6 +7,7 @@
 #include <AMReX_IntVect.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
+#include <AMReX_MultiFab.H>
 
 #include <string>
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
index 4226983a30c..8182a5ccd62 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
@@ -1,25 +1,24 @@
 #include "BackTransformFunctor.H"
 
 #include "WarpX.H"
-#include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"  // for Comp...
-#include "Utils/WarpXConst.H"                                    // for c
+#include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
+#include "Utils/WarpXConst.H"
 
 #include <AMReX_MultiFabUtil.H>
-#include <AMReX_Array4.H>                                        // for Array4
-#include <AMReX_BoxArray.H>                                      // for BoxA...
-#include <AMReX_Config.H>                                        // for AMRE...
-#include <AMReX_FArrayBox.H>                                     // for FArr...
-#include <AMReX_FabArray.H>                                      // for FabA...
-#include <AMReX_Geometry.H>                                      // for Geom...
-#include <AMReX_GpuControl.H>                                    // for notI...
-#include <AMReX_GpuLaunch.H>                              // for Para...
-#include <AMReX_GpuQualifiers.H>                                 // for AMRE...
-#include <AMReX_MFIter.H>                                        // for MFIter
-#include <AMReX_MultiFab.H>                                      // for Mult...
+#include <AMReX_Array4.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunch.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_MFIter.H>
 
 #include <memory>
 #include <cmath>
-#include <map>                                                   // for map
+#include <map>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.H
index 809cc47bb38..9f963b6e2cf 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.H
@@ -3,6 +3,9 @@
 
 #include "ComputeDiagFunctor.H"
 
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+
 /**
  * \brief Functor to cell-center MF and store result in mf_out.
  */
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H
index 95bb6b6689f..31966899487 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H
@@ -3,6 +3,9 @@
 
 #include "ComputeDiagFunctor.H"
 
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+
 #include <array>
 
 /**
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H
index a352682417d..45c868d1144 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H
@@ -3,6 +3,9 @@
 
 #include "ComputeDiagFunctor.H"
 
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+
 #include <array>
 
 /**
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
index c0c744db706..ef5534dc562 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
@@ -8,8 +8,6 @@
 
 #include <AMReX.H>
 #include <AMReX_BoxArray.H>
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 
 DivEFunctor::DivEFunctor(const std::array<const amrex::MultiFab* const, 3> arr_mf_src, const int lev,
                          const amrex::IntVect crse_ratio,
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.H
index ac76c0db15b..0e5baebdf6c 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.H
@@ -3,6 +3,9 @@
 
 #include "ComputeDiagFunctor.H"
 
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+
 /**
  * \brief Functor to cell-center MF and store result in mf_out.
  */
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
index 8c5479640ea..50b8d3a428f 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
@@ -6,8 +6,6 @@
 #include "Particles/MultiParticleContainer.H"
 
 #include <AMReX_BLassert.H>
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
 using namespace amrex::literals;
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.H
index 5c5d4b84ac8..e4f7cb372ab 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.H
@@ -3,6 +3,9 @@
 
 #include "ComputeDiagFunctor.H"
 
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+
 /**
  * \brief Functor to cell-center MF and store result in mf_out.
  */
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
index c4552d81e8a..20f66bbeb01 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
@@ -11,9 +11,7 @@
 #include <AMReX_FabArray.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_INT.H>
-#include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.H
index b6af4a41a45..5f1e52187f9 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.H
@@ -3,6 +3,10 @@
 
 #include "ComputeDiagFunctor.H"
 
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+
+
 /**
  * \brief Functor to compute charge density rho into mf_out
  */
diff --git a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
index 467374ad4d5..50c5400afee 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
@@ -11,8 +11,6 @@
 #endif
 
 #include <AMReX.H>
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 
 #include <memory>
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
index 75ae2269620..6eba18fd826 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
@@ -11,6 +11,7 @@
 #   include <ascent.hpp>
 #   include <AMReX_Conduit_Blueprint.H>
 #endif
+#include <AMReX_MultiFab.H>
 
 #include <string>
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
index f7d5801af36..2f56fd82502 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
@@ -7,6 +7,7 @@
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Vector.H>
+#include <AMReX_MultiFab.H>
 
 #include <string>
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
index 7eb9f9ef79f..1c6fc6ab401 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
@@ -9,7 +9,6 @@
 #include <AMReX_PlotFileUtil.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_ParticleIO.H>
-#include <AMReX_PlotFileUtil.H>
 #include <AMReX_Print.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
index 6da1b27c5f7..4fc200c0484 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
@@ -8,6 +8,7 @@
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Vector.H>
+#include <AMReX_MultiFab.H>
 
 #include <memory>
 #include <string>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp
index aa82a1e8886..c9773315b02 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp
@@ -4,15 +4,14 @@
 #include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX_BLassert.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_REAL.H>
-
-#include <AMReX_ParmParse.H>
+#include <AMReX.H>
 
 #include <map>
 #include <memory>
 #include <string>
+#include <set>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
index 8983db6ff12..e533bac29a7 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
@@ -7,6 +7,7 @@
 
 #include <AMReX_Geometry.H>
 #include <AMReX_Vector.H>
+#include <AMReX_MultiFab.H>
 
 #include <iosfwd>
 #include <string>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
index e0bf0f3d95c..16d0edc6464 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
@@ -19,13 +19,11 @@
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MakeType.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_ParticleIO.H>
 #include <AMReX_Particles.H>
-#include <AMReX_PlotFileUtil.H>
 #include <AMReX_Print.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
diff --git a/Source/Diagnostics/ReducedDiags/FieldMomentum.H b/Source/Diagnostics/ReducedDiags/FieldMomentum.H
index 5056e6c77c3..2dadb6a8e86 100644
--- a/Source/Diagnostics/ReducedDiags/FieldMomentum.H
+++ b/Source/Diagnostics/ReducedDiags/FieldMomentum.H
@@ -9,6 +9,7 @@
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_FIELDMOMENTUM_H_
 
 #include "ReducedDiags.H"
+
 #include <string>
 
 /**
diff --git a/Source/Diagnostics/ReducedDiags/FieldMomentum.cpp b/Source/Diagnostics/ReducedDiags/FieldMomentum.cpp
index 7948ae8495e..26831601049 100644
--- a/Source/Diagnostics/ReducedDiags/FieldMomentum.cpp
+++ b/Source/Diagnostics/ReducedDiags/FieldMomentum.cpp
@@ -9,8 +9,8 @@
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/CoarsenIO.H"
+#include "Utils/IntervalsParser.H"
 
-#include <AMReX.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_ParallelDescriptor.H>
@@ -18,9 +18,22 @@
 #include <AMReX_Reduce.H>
 #include <AMReX_REAL.H>
 
-#include <cmath>
 #include <ostream>
-#include <string>
+#include <algorithm>
+#include <vector>
+
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_Tuple.H>
+#include <AMReX_Vector.H>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/FieldReduction.H b/Source/Diagnostics/ReducedDiags/FieldReduction.H
index 772656009f1..ae65ced2b11 100644
--- a/Source/Diagnostics/ReducedDiags/FieldReduction.H
+++ b/Source/Diagnostics/ReducedDiags/FieldReduction.H
@@ -11,6 +11,30 @@
 #include "ReducedDiags.H"
 #include "WarpX.H"
 #include "Utils/CoarsenIO.H"
+#include "Parser/WarpXParserWrapper.H"
+
+#include <AMReX_Array.H>
+#include <AMReX_Box.H>
+#include <AMReX_Config.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_Reduce.H>
+#include <AMReX_Tuple.H>
+
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <vector>
+
 
 /**
  * This class contains a function that computes an arbitrary reduction of the fields. The function
diff --git a/Source/Diagnostics/ReducedDiags/FieldReduction.cpp b/Source/Diagnostics/ReducedDiags/FieldReduction.cpp
index e10d913f12e..4a95fc2eacd 100644
--- a/Source/Diagnostics/ReducedDiags/FieldReduction.cpp
+++ b/Source/Diagnostics/ReducedDiags/FieldReduction.cpp
@@ -6,10 +6,19 @@
  */
 
 #include "FieldReduction.H"
-#include "WarpX.H"
+
+#include "Utils/IntervalsParser.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXUtil.H"
 
+#include <AMReX_Algorithm.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Vector.H>
+
+#include <algorithm>
+#include <ostream>
+
 // constructor
 FieldReduction::FieldReduction (std::string rd_name)
 : ReducedDiags{rd_name}
diff --git a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp
index d9e28c26801..aa6d9a1faaa 100644
--- a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp
+++ b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp
@@ -27,6 +27,9 @@
 #include <AMReX_REAL.H>
 
 #include <algorithm>
+#include <functional>
+#include <iterator>
+#include <map>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp b/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp
index 797326b79c4..17828bc9148 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp
@@ -21,6 +21,9 @@
 #include <AMReX_PODVector.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_Particles.H>
+#include <AMReX_Reduce.H>
+#include <AMReX_Tuple.H>
+#include <AMReX_Vector.H>
 
 #include <cmath>
 #include <limits>
diff --git a/Source/Diagnostics/ReducedDiags/ParticleMomentum.H b/Source/Diagnostics/ReducedDiags/ParticleMomentum.H
index 67f94de433b..ec16d8184c5 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleMomentum.H
+++ b/Source/Diagnostics/ReducedDiags/ParticleMomentum.H
@@ -9,6 +9,7 @@
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_PARTICLEMOMENTUM_H_
 
 #include "ReducedDiags.H"
+
 #include <string>
 
 /**
diff --git a/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp b/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp
index 752905fdeab..508ff07c2ac 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp
@@ -9,11 +9,22 @@
 #include "WarpX.H"
 #include "Utils/WarpXConst.H"
 #include "Particles/MultiParticleContainer.H"
+#include "Particles/SpeciesPhysicalProperties.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/IntervalsParser.H"
 
 #include <AMReX_REAL.H>
 #include <AMReX_ParticleReduce.H>
-
-#include <cmath>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_PODVector.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_Particles.H>
+#include <AMReX_Reduce.H>
+#include <AMReX_Tuple.H>
+#include <AMReX_Vector.H>
+
+#include <algorithm>
+#include <map>
 #include <limits>
 #include <vector>
 #include <ostream>
diff --git a/Source/Diagnostics/WarpXOpenPMD.H b/Source/Diagnostics/WarpXOpenPMD.H
index 33b64d3339f..5e0cf70f144 100644
--- a/Source/Diagnostics/WarpXOpenPMD.H
+++ b/Source/Diagnostics/WarpXOpenPMD.H
@@ -26,8 +26,9 @@
 #   include <openPMD/openPMD.hpp>
 #endif
 
+#include <cstdint>
+#include <map>
 #include <memory>
-#include <set>
 #include <string>
 #include <vector>
 
diff --git a/Source/EmbeddedBoundary/WarpXInitEB.cpp b/Source/EmbeddedBoundary/WarpXInitEB.cpp
index ef6bf7b4280..b5da3730656 100644
--- a/Source/EmbeddedBoundary/WarpXInitEB.cpp
+++ b/Source/EmbeddedBoundary/WarpXInitEB.cpp
@@ -1,6 +1,12 @@
 #include "WarpX.H"
 #include "Utils/WarpXUtil.H"
+#include "Parser/WarpXParser.H"
+#include "Parser/WarpXParserWrapper.H"
 
+#include <AMReX.H>
+#include <AMReX_Array.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_BoxList.H>
 #include <AMReX_Config.H>
 #include <AMReX_Array4.H>
 #include <AMReX_BLProfiler.H>
@@ -12,11 +18,17 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_SPACE.H>
 #ifdef AMREX_USE_EB
 #   include <AMReX_EB2.H>
 #   include <AMReX_ParmParse.H>
 #endif
 
+#include <vector>
 #include <array>
 #include <memory>
 #include <string>
diff --git a/Source/FieldSolver/ElectrostaticSolver.cpp b/Source/FieldSolver/ElectrostaticSolver.cpp
index 9de1facb679..71f71fcc884 100644
--- a/Source/FieldSolver/ElectrostaticSolver.cpp
+++ b/Source/FieldSolver/ElectrostaticSolver.cpp
@@ -9,6 +9,8 @@
 #include "Particles/MultiParticleContainer.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "Parser/WarpXParser.H"
+#include "Utils/WarpXUtil.H"
 #include "Utils/WarpXConst.H"
 
 #include <AMReX_MLMG.H>
@@ -35,7 +37,12 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_Vector.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_SPACE.H>
 
+#include <string>
 #include <memory>
 #include <array>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
index 487377227f7..09bb139df96 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
@@ -27,6 +27,7 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
index 904e8ed4959..14fe0def55d 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
@@ -33,6 +33,7 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
+#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
index 29e5cf7443e..6608252e36f 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
@@ -33,6 +33,7 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
+#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
index bc430ffbbcc..fd51cfe74f5 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
@@ -31,6 +31,8 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Box.H>
+#include <AMReX_Array4.H>
 
 #include <array>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
index f5d5d58a4e7..534f566d4f8 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
@@ -29,6 +29,7 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
index f90fceb8f7c..4d7c2ef0be9 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
@@ -28,6 +28,7 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Box.H>
 
 #include <array>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
index a060b64ff71..72cb504214f 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
@@ -27,6 +27,7 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
index dc44ab1b338..0e5afb89561 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
@@ -16,6 +16,7 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
index b32f3de2b2c..fa5dc283ad5 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
@@ -24,6 +24,7 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
index 701ee6aafd4..f8c8259010e 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
@@ -8,6 +8,8 @@
 #include <AMReX_Array.H>
 #include <AMReX_Config.H>
 #include <AMReX_REAL.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_MultiFab.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
index 99032cf060b..6cb7dfc6ace 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
@@ -13,6 +13,8 @@
 #include "FieldSolver/SpectralSolver/SpectralKSpace_fwd.H"
 
 #include <AMReX_REAL.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_MultiFab.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
index 17b0851ad09..6d8f349215d 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
@@ -16,6 +16,8 @@
 #include <AMReX_Config.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_REAL.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_MultiFab.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
index d281bbedc70..1f2950ca6a5 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
@@ -11,7 +11,6 @@
 
 #include <AMReX_BaseFab.H>
 #include <AMReX_Config.H>
-#include <AMReX_FabArray.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Array4.H>
 #include <AMReX_GpuComplex.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
index 455f83925a8..c2c227fadf6 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
@@ -25,6 +25,7 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
 #include <AMReX_BoxArray.H>
+#include <AMReX_Dim3.H>
 
 #if WARPX_USE_PSATD
 
diff --git a/Source/FieldSolver/WarpXPushFieldsEM.cpp b/Source/FieldSolver/WarpXPushFieldsEM.cpp
index d838ccce1c4..56766a2a5ac 100644
--- a/Source/FieldSolver/WarpXPushFieldsEM.cpp
+++ b/Source/FieldSolver/WarpXPushFieldsEM.cpp
@@ -13,8 +13,6 @@
 #include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXProfilerWrapper.H"
-#include "BoundaryConditions/WarpX_PML_kernels.H"
-#include "BoundaryConditions/PML_current.H"
 #include "WarpX_FDTD.H"
 #include "WarpXPushFieldsEM_K.H"
 #if defined(WARPX_DIM_RZ) || defined(WARPX_USE_PSATD)
@@ -44,6 +42,7 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
+#include <AMReX_IndexType.H>
 
 #include <cmath>
 #include <array>
diff --git a/Source/Filter/BilinearFilter.H b/Source/Filter/BilinearFilter.H
index 1bf19978dff..c797523f71e 100644
--- a/Source/Filter/BilinearFilter.H
+++ b/Source/Filter/BilinearFilter.H
@@ -11,6 +11,7 @@
 #include "Filter.H"
 
 #include <AMReX_Array.H>
+#include <AMReX_Config.H>
 
 class BilinearFilter : public Filter
 {
diff --git a/Source/Filter/Filter.H b/Source/Filter/Filter.H
index d3bcd56a4eb..1dd1a6a9533 100644
--- a/Source/Filter/Filter.H
+++ b/Source/Filter/Filter.H
@@ -9,6 +9,9 @@
 #include <AMReX_GpuContainers.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Box.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_Array4.H>
 
 #ifndef WARPX_FILTER_H_
 #define WARPX_FILTER_H_
diff --git a/Source/Initialization/InjectorDensity.cpp b/Source/Initialization/InjectorDensity.cpp
index 456f23f88db..4d8c708ab52 100644
--- a/Source/Initialization/InjectorDensity.cpp
+++ b/Source/Initialization/InjectorDensity.cpp
@@ -8,6 +8,7 @@
 #include "InjectorDensity.H"
 
 #include "Initialization/CustomDensityProb.H"
+#include "Utils/WarpXUtil.H"
 
 #include <AMReX_BLassert.H>
 #include <AMReX_ParmParse.H>
diff --git a/Source/Initialization/InjectorMomentum.H b/Source/Initialization/InjectorMomentum.H
index 1741b5ece06..34726882139 100644
--- a/Source/Initialization/InjectorMomentum.H
+++ b/Source/Initialization/InjectorMomentum.H
@@ -18,6 +18,7 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Random.H>
 #include <AMReX_Dim3.H>
+#include <AMReX_Config.H>
 
 #include <string>
 #include <cmath>
diff --git a/Source/Initialization/PlasmaInjector.cpp b/Source/Initialization/PlasmaInjector.cpp
index ef4e60fbc20..7fff101b8ac 100644
--- a/Source/Initialization/PlasmaInjector.cpp
+++ b/Source/Initialization/PlasmaInjector.cpp
@@ -25,6 +25,7 @@
 #include <AMReX_GpuDevice.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_RandomEngine.H>
+#include <AMReX_Config.H>
 
 #include <algorithm>
 #include <map>
diff --git a/Source/Initialization/WarpXAMReXInit.cpp b/Source/Initialization/WarpXAMReXInit.cpp
index a1d7d1b3651..396fe67e325 100644
--- a/Source/Initialization/WarpXAMReXInit.cpp
+++ b/Source/Initialization/WarpXAMReXInit.cpp
@@ -7,9 +7,9 @@
 
 #include "Initialization/WarpXAMReXInit.H"
 
+#include <AMReX.H>
 #include <AMReX_ParmParse.H>
 
-
 namespace {
     /** Overwrite defaults in AMReX Inputs
      *
diff --git a/Source/Initialization/WarpXInitData.cpp b/Source/Initialization/WarpXInitData.cpp
index 2b8eab12eab..05e3b19be46 100644
--- a/Source/Initialization/WarpXInitData.cpp
+++ b/Source/Initialization/WarpXInitData.cpp
@@ -27,7 +27,6 @@
 
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
-#include <ctype.h>
 #include <AMReX.H>
 #include <AMReX_AmrCore.H>
 #include <AMReX_Array.H>
@@ -50,6 +49,7 @@
 #include <AMReX_RealBox.H>
 #include <AMReX_SPACE.H>
 #include <AMReX_Vector.H>
+#include <AMReX_BLassert.H>
 #ifdef BL_USE_SENSEI_INSITU
 #   include <AMReX_AmrMeshInSituBridge.H>
 #endif
diff --git a/Source/Parallelization/WarpXComm.cpp b/Source/Parallelization/WarpXComm.cpp
index 9d148532327..468d5d8a9d5 100644
--- a/Source/Parallelization/WarpXComm.cpp
+++ b/Source/Parallelization/WarpXComm.cpp
@@ -13,9 +13,34 @@
 #include "Utils/CoarsenMR.H"
 #include "Utils/WarpXProfilerWrapper.H"
 #include "BoundaryConditions/PML.H"
+#include "Filter/BilinearFilter.H"
+#include "Utils/IntervalsParser.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+
+#include <AMReX.H>
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_FabArrayBase.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MakeType.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
 
 #include <algorithm>
 #include <memory>
+#include <array>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Parallelization/WarpXRegrid.cpp b/Source/Parallelization/WarpXRegrid.cpp
index 872a78c0e01..c0c76e336bc 100644
--- a/Source/Parallelization/WarpXRegrid.cpp
+++ b/Source/Parallelization/WarpXRegrid.cpp
@@ -12,9 +12,35 @@
 #include "Utils/WarpXProfilerWrapper.H"
 #include "Particles/MultiParticleContainer.H"
 #include "Diagnostics/MultiDiagnostics.H"
+#include "Particles/WarpXParticleContainer.H"
 
 #include <AMReX_BLProfiler.H>
-
+#include <AMReX_IntVect.H>
+#include <AMReX.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_DistributionMapping.H>
+#include <AMReX_FabFactory.H>
+#include <AMReX_IArrayBox.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MakeType.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParIter.H>
+#include <AMReX_ParallelContext.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
+#include <AMReX_iMultiFab.H>
+
+#include <algorithm>
+#include <array>
+#include <utility>
+#include <vector>
+#include <cmath>
 #include <memory>
 #include <cstddef>
 
diff --git a/Source/Particles/Collision/PairWiseCoulombCollision.H b/Source/Particles/Collision/PairWiseCoulombCollision.H
index ae7f191dad3..94548b89eb4 100644
--- a/Source/Particles/Collision/PairWiseCoulombCollision.H
+++ b/Source/Particles/Collision/PairWiseCoulombCollision.H
@@ -13,6 +13,7 @@
 #include "Particles/WarpXParticleContainer_fwd.H"
 
 #include <AMReX_REAL.H>
+#include <AMReX_MFIter.H>
 
 #include <string>
 
diff --git a/Source/Particles/ElementaryProcess/Ionization.H b/Source/Particles/ElementaryProcess/Ionization.H
index 995b2bd548e..6f760f8241d 100644
--- a/Source/Particles/ElementaryProcess/Ionization.H
+++ b/Source/Particles/ElementaryProcess/Ionization.H
@@ -21,7 +21,9 @@
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Random.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_RandomEngine.H>
 
 #include <cmath>
 
diff --git a/Source/Particles/ElementaryProcess/QEDPairGeneration.H b/Source/Particles/ElementaryProcess/QEDPairGeneration.H
index bfdc5ebb441..2bbae44ae9b 100644
--- a/Source/Particles/ElementaryProcess/QEDPairGeneration.H
+++ b/Source/Particles/ElementaryProcess/QEDPairGeneration.H
@@ -21,7 +21,9 @@
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_REAL.H>
-
+#include <AMReX_FArrayBox.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_RandomEngine.H>
 
 /** @file
  *
diff --git a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
index 9ab29023aef..0d3b605b754 100644
--- a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
+++ b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
@@ -23,6 +23,9 @@
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_REAL.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_RandomEngine.H>
 
 #include <algorithm>
 #include <limits>
diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H
index 05d2730f1d4..66903fcb710 100644
--- a/Source/Particles/MultiParticleContainer.H
+++ b/Source/Particles/MultiParticleContainer.H
@@ -22,7 +22,6 @@
 #include "Utils/WarpXConst.H"
 
 #ifdef WARPX_QED
-#   include "Particles/ElementaryProcess/QEDInternals/QedChiFunctions.H"
 #   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper_fwd.H"
 #   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper_fwd.H"
 #endif
diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
index ad0e1ac5758..f8729b067e9 100644
--- a/Source/Particles/MultiParticleContainer.cpp
+++ b/Source/Particles/MultiParticleContainer.cpp
@@ -27,10 +27,10 @@
 #ifdef WARPX_QED
 #   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
 #   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
-#   include "Particles/ElementaryProcess/QEDInternals/SchwingerProcessWrapper.H"
 #   include "Particles/ElementaryProcess/QEDSchwingerProcess.H"
 #   include "Particles/ParticleCreation/FilterCreateTransformFromFAB.H"
-#   include "Particles/ElementaryProcess/QEDInternals/QedChiFunctions.H"
+#   include "Particles/ElementaryProcess/QEDPairGeneration.H"
+#   include "Particles/ElementaryProcess/QEDPhotonEmission.H"
 #endif
 
 #include <AMReX_Vector.H>
diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp
index 78862f01978..39cdae3f0f7 100644
--- a/Source/Particles/PhotonParticleContainer.cpp
+++ b/Source/Particles/PhotonParticleContainer.cpp
@@ -37,6 +37,11 @@
 #include <AMReX_Particles.H>
 #include <AMReX_StructOfArrays.H>
 
+#include <algorithm>
+#include <array>
+#include <map>
+#include <memory>
+
 using namespace amrex;
 
 PhotonParticleContainer::PhotonParticleContainer (AmrCore* amr_core, int ispecies,
diff --git a/Source/Particles/Sorting/Partition.cpp b/Source/Particles/Sorting/Partition.cpp
index d6021191200..6753a6b9475 100644
--- a/Source/Particles/Sorting/Partition.cpp
+++ b/Source/Particles/Sorting/Partition.cpp
@@ -17,6 +17,7 @@
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_REAL.H>
 #include <AMReX_StructOfArrays.H>
+#include <AMReX_iMultiFab.H>
 
 #include <utility>
 
diff --git a/Source/Utils/CoarsenIO.cpp b/Source/Utils/CoarsenIO.cpp
index 3d9139ab447..de508e7bb73 100644
--- a/Source/Utils/CoarsenIO.cpp
+++ b/Source/Utils/CoarsenIO.cpp
@@ -2,6 +2,7 @@
 
 #include <AMReX_BLProfiler.H>
 #include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
 #include <AMReX_DistributionMapping.H>
diff --git a/Source/Utils/ParticleUtils.H b/Source/Utils/ParticleUtils.H
index b076d3a38ef..663519f302a 100644
--- a/Source/Utils/ParticleUtils.H
+++ b/Source/Utils/ParticleUtils.H
@@ -11,6 +11,7 @@
 
 #include <AMReX_DenseBins.H>
 #include <AMReX_Particles.H>
+#include <AMReX_MFIter.H>
 
 namespace ParticleUtils {
 
diff --git a/Source/WarpX.H b/Source/WarpX.H
index a30c31530e3..708f75e4546 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -51,23 +51,10 @@
 #   include "AMReX_EBFabFactory.H"
 #endif
 
-namespace amrex { class Box; }
-namespace amrex { class BoxArray; }
-namespace amrex { class DistributionMapping; }
-namespace amrex { class FArrayBox; }
-namespace amrex { class Geometry; }
-namespace amrex { class IArrayBox; }
-namespace amrex { class MultiFab; }
-namespace amrex { class TagBoxArray; }
-namespace amrex { class iMultiFab; }
-namespace amrex { template <typename FAB> class FabFactory; }
-namespace amrex { template <typename T> class LayoutData; }
-// _______________________________________________Headers
-//#include <AMReX_Geometry.H>
-//#include <AMReX_LayoutData.H>
-//#include <AMReX_iMultiFab.H>
-// #include <AMReX_LayoutData.H>
-// ________________________________________________________________________
+#include <AMReX_Geometry.H>
+#include <AMReX_LayoutData.H>
+#include <AMReX_iMultiFab.H>
+#include <AMReX_LayoutData.H>
 
 #include <iostream>
 #include <memory>

From 721d8140225908ef77261c525a79d752637a2bd6 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Sun, 13 Jun 2021 14:28:13 +0200
Subject: [PATCH 42/58] update AMReX branch

---
 cmake/dependencies/AMReX.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
index f3651fc607e..6b26fe325bd 100644
--- a/cmake/dependencies/AMReX.cmake
+++ b/cmake/dependencies/AMReX.cmake
@@ -231,7 +231,7 @@ set(WarpX_amrex_src ""
 set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
-set(WarpX_amrex_branch "87e01fe44b483adab034072dc000aed67aa1b5a7"
+set(WarpX_amrex_branch "64e41a8d314fc28f6d6473095ac5bdcd256c445f"
     CACHE STRING
     "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
 

From 829a112227b27583d363d1e78d99dcd5f39229e7 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Mon, 14 Jun 2021 14:37:22 +0200
Subject: [PATCH 43/58] enforce alphabetic order

---
 Source/BoundaryConditions/PML.cpp             | 12 ++--
 Source/BoundaryConditions/PML_current.H       |  1 +
 Source/BoundaryConditions/WarpXEvolvePML.cpp  |  5 +-
 .../WarpXFieldBoundaries.cpp                  |  3 +-
 Source/BoundaryConditions/WarpX_PEC.H         |  2 +-
 Source/BoundaryConditions/WarpX_PEC.cpp       |  4 +-
 Source/Diagnostics/BTD_Plotfile_Header_Impl.H |  2 +-
 .../Diagnostics/BTD_Plotfile_Header_Impl.cpp  |  2 +-
 Source/Diagnostics/BTDiagnostics.cpp          | 16 ++---
 .../Diagnostics/BackTransformedDiagnostic.H   |  6 +-
 .../Diagnostics/BackTransformedDiagnostic.cpp | 12 ++--
 .../BackTransformFunctor.H                    |  2 +-
 .../BackTransformFunctor.cpp                  |  6 +-
 .../ComputeDiagFunctors/DivBFunctor.cpp       |  2 +-
 .../ComputeDiagFunctors/DivEFunctor.cpp       |  2 +-
 .../PartPerCellFunctor.cpp                    |  4 +-
 .../PartPerGridFunctor.cpp                    |  4 +-
 .../ComputeDiagFunctors/RhoFunctor.cpp        |  8 +--
 Source/Diagnostics/Diagnostics.H              | 10 +--
 Source/Diagnostics/Diagnostics.cpp            | 20 +++---
 Source/Diagnostics/FieldIO.H                  |  4 +-
 Source/Diagnostics/FieldIO.cpp                |  4 +-
 Source/Diagnostics/FlushFormats/FlushFormat.H |  2 +-
 .../FlushFormats/FlushFormatAscent.H          |  7 ++-
 .../FlushFormats/FlushFormatCheckpoint.H      |  2 +-
 .../FlushFormats/FlushFormatCheckpoint.cpp    |  6 +-
 .../FlushFormats/FlushFormatOpenPMD.H         |  4 +-
 .../FlushFormats/FlushFormatOpenPMD.cpp       |  6 +-
 .../FlushFormats/FlushFormatPlotfile.H        |  2 +-
 .../FlushFormats/FlushFormatPlotfile.cpp      | 14 ++---
 .../FlushFormats/FlushFormatSensei.cpp        |  1 +
 Source/Diagnostics/FullDiagnostics.cpp        | 20 +++---
 Source/Diagnostics/MultiDiagnostics.H         |  6 +-
 .../Diagnostics/ParticleDiag/ParticleDiag.H   |  2 +-
 .../Diagnostics/ParticleDiag/ParticleDiag.cpp |  6 +-
 .../Diagnostics/ReducedDiags/BeamRelevant.cpp | 12 ++--
 .../Diagnostics/ReducedDiags/FieldEnergy.cpp  |  6 +-
 .../Diagnostics/ReducedDiags/FieldMaximum.cpp |  6 +-
 .../ReducedDiags/FieldMomentum.cpp            | 26 ++++----
 .../Diagnostics/ReducedDiags/FieldReduction.H |  4 +-
 .../ReducedDiags/LoadBalanceCosts.cpp         |  4 +-
 .../ReducedDiags/LoadBalanceEfficiency.cpp    |  2 +-
 .../ReducedDiags/MultiReducedDiags.H          |  4 +-
 .../ReducedDiags/MultiReducedDiags.cpp        | 20 +++---
 .../ReducedDiags/ParticleEnergy.cpp           | 12 ++--
 .../ReducedDiags/ParticleExtrema.cpp          | 16 ++---
 .../ReducedDiags/ParticleHistogram.H          |  2 +-
 .../ReducedDiags/ParticleHistogram.cpp        | 14 ++---
 .../ReducedDiags/ParticleMomentum.cpp         | 13 ++--
 .../ReducedDiags/ParticleNumber.cpp           |  2 +-
 .../Diagnostics/ReducedDiags/ReducedDiags.cpp |  4 +-
 Source/Diagnostics/ReducedDiags/RhoMaximum.H  |  2 +-
 .../Diagnostics/ReducedDiags/RhoMaximum.cpp   |  2 +-
 Source/Diagnostics/SliceDiagnostic.H          |  4 +-
 Source/Diagnostics/SliceDiagnostic.cpp        |  2 +-
 Source/Diagnostics/WarpXIO.cpp                | 16 ++---
 Source/Diagnostics/WarpXOpenPMD.H             |  6 +-
 Source/Diagnostics/WarpXOpenPMD.cpp           | 12 ++--
 Source/EmbeddedBoundary/WarpXInitEB.cpp       | 30 ++++-----
 Source/Evolve/WarpXComputeDt.cpp              | 12 ++--
 Source/Evolve/WarpXEvolve.cpp                 | 16 ++---
 Source/FieldSolver/ElectrostaticSolver.cpp    | 31 ++++-----
 .../ApplySilverMuellerBoundary.cpp            |  4 +-
 .../FiniteDifferenceSolver/ComputeDivE.cpp    | 10 +--
 .../FiniteDifferenceSolver/EvolveB.cpp        | 14 ++---
 .../FiniteDifferenceSolver/EvolveBPML.cpp     | 11 ++--
 .../FiniteDifferenceSolver/EvolveE.cpp        | 16 ++---
 .../FiniteDifferenceSolver/EvolveEPML.cpp     | 18 +++---
 .../FiniteDifferenceSolver/EvolveF.cpp        | 18 +++---
 .../FiniteDifferenceSolver/EvolveFPML.cpp     | 12 ++--
 .../FiniteDifferenceSolver/EvolveG.cpp        | 15 ++---
 .../CartesianCKCAlgorithm.H                   |  4 +-
 .../CartesianNodalAlgorithm.H                 |  4 +-
 .../CartesianYeeAlgorithm.H                   |  4 +-
 .../CylindricalYeeAlgorithm.H                 |  4 +-
 .../FieldAccessorFunctors.H                   |  2 +
 .../FiniteDifferenceSolver.H                  |  4 +-
 .../FiniteDifferenceSolver.cpp                | 14 +++--
 .../MacroscopicEvolveE.cpp                    |  6 +-
 .../MacroscopicProperties.H                   |  2 +-
 .../MacroscopicProperties.cpp                 |  4 +-
 Source/FieldSolver/SpectralSolver/AnyFFT.H    |  3 +-
 .../ComovingPsatdAlgorithm.H                  |  4 +-
 .../GalileanPsatdAlgorithmRZ.cpp              |  2 +-
 .../SpectralAlgorithms/PMLPsatdAlgorithm.H    |  2 +-
 .../SpectralAlgorithms/PMLPsatdAlgorithm.cpp  |  2 +-
 .../SpectralAlgorithms/PsatdAlgorithm.H       |  4 +-
 .../SpectralAlgorithms/PsatdAlgorithmRZ.cpp   |  2 +-
 .../SpectralBaseAlgorithm.H                   |  6 +-
 .../SpectralBaseAlgorithm.cpp                 |  6 +-
 .../SpectralSolver/SpectralBinomialFilter.cpp |  1 +
 .../SpectralSolver/SpectralFieldData.H        | 10 +--
 .../SpectralSolver/SpectralFieldData.cpp      |  6 +-
 .../SpectralSolver/SpectralFieldDataRZ.H      |  5 +-
 .../HankelTransform.cpp                       |  6 +-
 .../SpectralHankelTransformer.H               |  3 +-
 .../SpectralHankelTransformer.cpp             |  3 +-
 .../SpectralSolver/SpectralKSpace.H           |  6 +-
 .../SpectralSolver/SpectralKSpace.cpp         |  2 +-
 .../SpectralSolver/SpectralSolver.H           |  4 +-
 .../SpectralSolver/SpectralSolver.cpp         | 10 +--
 .../SpectralSolver/SpectralSolverRZ.cpp       |  6 +-
 Source/FieldSolver/WarpXPushFieldsEM.cpp      | 19 +++---
 Source/FieldSolver/WarpXPushFieldsEM_K.H      |  1 +
 .../FieldSolver/WarpX_QED_Field_Pushers.cpp   | 11 ++--
 Source/FieldSolver/WarpX_QED_K.H              |  3 +-
 Source/Filter/BilinearFilter.cpp              |  5 +-
 Source/Filter/Filter.H                        |  8 +--
 Source/Initialization/CustomDensityProb.H     |  8 +--
 Source/Initialization/CustomMomentumProb.H    |  4 +-
 Source/Initialization/InjectorDensity.H       |  4 +-
 Source/Initialization/InjectorDensity.cpp     |  2 +-
 Source/Initialization/InjectorMomentum.H      |  9 ++-
 Source/Initialization/InjectorPosition.H      |  2 +-
 Source/Initialization/PlasmaInjector.H        | 10 +--
 Source/Initialization/PlasmaInjector.cpp      | 14 ++---
 Source/Initialization/WarpXInitData.cpp       | 24 +++----
 Source/Laser/LaserProfiles.H                  | 10 +--
 .../LaserProfileFieldFunction.cpp             |  1 +
 .../LaserProfileFromTXYEFile.cpp              | 11 ++--
 .../LaserProfileGaussian.cpp                  |  5 +-
 .../LaserProfilesImpl/LaserProfileHarris.cpp  |  1 +
 Source/Parallelization/GuardCellManager.H     |  4 +-
 Source/Parallelization/GuardCellManager.cpp   | 19 +++---
 Source/Parallelization/KernelTimer.H          |  2 +-
 Source/Parallelization/WarpXComm.cpp          | 10 +--
 Source/Parallelization/WarpXComm_K.H          |  2 +-
 Source/Parallelization/WarpXRegrid.cpp        | 16 ++---
 Source/Parser/GpuParser.H                     |  4 +-
 Source/Parser/WarpXParser.H                   |  8 +--
 Source/Parser/WarpXParser.cpp                 |  2 +-
 Source/Parser/WarpXParserWrapper.H            |  2 +-
 Source/Parser/wp_parser_c.h                   |  8 +--
 Source/Parser/wp_parser_y.cpp                 |  1 +
 Source/Parser/wp_parser_y.h                   |  6 +-
 Source/Particles/Collision/CollisionBase.H    |  2 +-
 Source/Particles/Collision/CollisionHandler.H |  2 +-
 .../Collision/ElasticCollisionPerez.H         |  2 +-
 .../Collision/PairWiseCoulombCollision.H      |  2 +-
 .../Collision/PairWiseCoulombCollision.cpp    |  7 ++-
 .../Collision/UpdateMomentumPerezElastic.H    |  4 +-
 .../Particles/Deposition/CurrentDeposition.H  |  4 +-
 .../Particles/ElementaryProcess/Ionization.H  | 10 +--
 .../QEDInternals/BreitWheelerEngineWrapper.H  | 10 +--
 .../BreitWheelerEngineWrapper.cpp             | 13 ++--
 .../QEDInternals/QedWrapperCommons.H          |  2 +-
 .../QEDInternals/QuantumSyncEngineWrapper.H   | 10 +--
 .../QEDInternals/QuantumSyncEngineWrapper.cpp |  6 +-
 .../QEDInternals/SchwingerProcessWrapper.H    |  4 +-
 .../ElementaryProcess/QEDPairGeneration.H     |  8 +--
 .../ElementaryProcess/QEDPhotonEmission.H     | 10 +--
 Source/Particles/Filter/FilterFunctors.H      |  2 +-
 Source/Particles/Gather/FieldGather.H         |  2 +-
 Source/Particles/Gather/GetExternalFields.H   |  5 +-
 Source/Particles/Gather/GetExternalFields.cpp |  4 +-
 Source/Particles/LaserParticleContainer.H     |  8 +--
 Source/Particles/LaserParticleContainer.cpp   | 22 +++----
 Source/Particles/MultiParticleContainer.H     | 27 ++++----
 Source/Particles/MultiParticleContainer.cpp   | 34 +++++-----
 .../ParticleCreation/DefaultInitialization.H  |  4 +-
 .../Particles/ParticleCreation/SmartCreate.H  |  2 +-
 Source/Particles/PhotonParticleContainer.H    |  6 +-
 Source/Particles/PhotonParticleContainer.cpp  | 13 ++--
 Source/Particles/PhysicalParticleContainer.H  | 16 ++---
 .../Particles/PhysicalParticleContainer.cpp   | 52 +++++++--------
 Source/Particles/Pusher/PushSelector.H        |  6 +-
 ...UpdateMomentumBorisWithRadiationReaction.H |  1 -
 Source/Particles/Pusher/UpdateMomentumVay.H   |  2 +-
 Source/Particles/Pusher/UpdatePosition.H      |  4 +-
 .../Particles/Pusher/UpdatePositionPhoton.H   |  2 +-
 .../Particles/Resampling/LevelingThinning.H   |  1 +
 .../Particles/Resampling/LevelingThinning.cpp |  4 +-
 Source/Particles/Resampling/Resampling.H      |  1 +
 .../Resampling/ResamplingTrigger.cpp          |  2 +-
 .../RigidInjectedParticleContainer.H          |  6 +-
 .../RigidInjectedParticleContainer.cpp        | 24 +++----
 Source/Particles/Sorting/Partition.cpp        |  6 +-
 Source/Particles/SpeciesPhysicalProperties.H  |  4 +-
 Source/Particles/WarpXParticleContainer.H     | 14 ++---
 Source/Particles/WarpXParticleContainer.cpp   | 16 ++---
 Source/Python/WarpXWrappers.cpp               | 10 +--
 Source/Python/WarpXWrappers.h                 |  2 +-
 Source/Utils/CoarsenIO.H                      |  2 +-
 Source/Utils/CoarsenMR.H                      |  4 +-
 Source/Utils/Interpolate.H                    |  4 +-
 Source/Utils/IntervalsParser.H                |  2 +-
 Source/Utils/IntervalsParser.cpp              |  2 +-
 Source/Utils/MPIInitHelpers.cpp               |  4 +-
 Source/Utils/ParticleUtils.H                  |  2 +-
 Source/Utils/ParticleUtils.cpp                |  1 +
 Source/Utils/RelativeCellPosition.H           |  1 -
 Source/Utils/RelativeCellPosition.cpp         |  2 +-
 Source/Utils/WarpXAlgorithmSelection.cpp      |  2 +-
 Source/Utils/WarpXConst.H                     |  1 +
 Source/Utils/WarpXMovingWindow.cpp            | 63 ++++++++++---------
 Source/Utils/WarpXTagging.cpp                 |  3 +-
 Source/Utils/WarpXUtil.H                      | 10 +--
 Source/Utils/WarpXUtil.cpp                    | 11 ++--
 Source/Utils/WarpX_Complex.H                  |  2 +-
 Source/WarpX.H                                | 48 +++++++-------
 Source/WarpX.cpp                              | 36 +++++------
 Source/main.cpp                               |  3 +-
 202 files changed, 812 insertions(+), 773 deletions(-)

diff --git a/Source/BoundaryConditions/PML.cpp b/Source/BoundaryConditions/PML.cpp
index cebfe5131d8..2adba1f14a2 100644
--- a/Source/BoundaryConditions/PML.cpp
+++ b/Source/BoundaryConditions/PML.cpp
@@ -8,18 +8,17 @@
  */
 #include "PML.H"
 
-#include "WarpX.H"
 #include "BoundaryConditions/PML.H"
 #include "BoundaryConditions/PMLComponent.H"
-#include "Utils/WarpXConst.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/WarpXProfilerWrapper.H"
 #ifdef WARPX_USE_PSATD
 #   include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #endif
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXConst.H"
+#include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX.H"
 
 #include <AMReX.H>
-#include <AMReX_VisMF.H>
 #include <AMReX_Algorithm.H>
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
@@ -38,11 +37,12 @@
 #include <AMReX_ParmParse.H>
 #include <AMReX_RealVect.H>
 #include <AMReX_SPACE.H>
+#include <AMReX_VisMF.H>
 #include <AMReX_ccse-mpi.H>
 
 #include <algorithm>
-#include <memory>
 #include <cmath>
+#include <memory>
 #include <utility>
 
 using namespace amrex;
diff --git a/Source/BoundaryConditions/PML_current.H b/Source/BoundaryConditions/PML_current.H
index ed4d69d0c6f..707e1a18ae8 100644
--- a/Source/BoundaryConditions/PML_current.H
+++ b/Source/BoundaryConditions/PML_current.H
@@ -9,6 +9,7 @@
 #define PML_CURRENT_H_
 
 #include "BoundaryConditions/PMLComponent.H"
+
 #include <AMReX.H>
 #include <AMReX_FArrayBox.H>
 
diff --git a/Source/BoundaryConditions/WarpXEvolvePML.cpp b/Source/BoundaryConditions/WarpXEvolvePML.cpp
index e51d7aa9f8a..37df51aa994 100644
--- a/Source/BoundaryConditions/WarpXEvolvePML.cpp
+++ b/Source/BoundaryConditions/WarpXEvolvePML.cpp
@@ -6,10 +6,11 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
-#include "WarpX_PML_kernels.H"
+
 #include "BoundaryConditions/PML.H"
-#include "Utils/WarpXProfilerWrapper.H"
 #include "PML_current.H"
+#include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX_PML_kernels.H"
 
 #ifdef BL_USE_SENSEI_INSITU
 #   include <AMReX_AmrMeshInSituBridge.H>
diff --git a/Source/BoundaryConditions/WarpXFieldBoundaries.cpp b/Source/BoundaryConditions/WarpXFieldBoundaries.cpp
index ac5f60e35d7..2e69dc3d542 100644
--- a/Source/BoundaryConditions/WarpXFieldBoundaries.cpp
+++ b/Source/BoundaryConditions/WarpXFieldBoundaries.cpp
@@ -1,8 +1,9 @@
 #include "WarpX.H"
+
 #include "WarpX_PEC.H"
 
-#include <AMReX_Vector.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/BoundaryConditions/WarpX_PEC.H b/Source/BoundaryConditions/WarpX_PEC.H
index 3426fccff12..9fdd378c5f8 100644
--- a/Source/BoundaryConditions/WarpX_PEC.H
+++ b/Source/BoundaryConditions/WarpX_PEC.H
@@ -10,8 +10,8 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IntVect.H>
-#include <AMReX_REAL.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/BoundaryConditions/WarpX_PEC.cpp b/Source/BoundaryConditions/WarpX_PEC.cpp
index f7c940098fa..f74160b6921 100644
--- a/Source/BoundaryConditions/WarpX_PEC.cpp
+++ b/Source/BoundaryConditions/WarpX_PEC.cpp
@@ -2,15 +2,15 @@
 
 #include "WarpX.H"
 
-#include <AMReX_Vector.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_Box.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_SPACE.H>
+#include <AMReX_Vector.H>
 
 using namespace amrex::literals;
 
diff --git a/Source/Diagnostics/BTD_Plotfile_Header_Impl.H b/Source/Diagnostics/BTD_Plotfile_Header_Impl.H
index c2ddf1f283a..33efbe01b99 100644
--- a/Source/Diagnostics/BTD_Plotfile_Header_Impl.H
+++ b/Source/Diagnostics/BTD_Plotfile_Header_Impl.H
@@ -1,13 +1,13 @@
 #ifndef BTD_PLOTFILE_HEADER_IMPL_H
 #define BTD_PLOTFILE_HEADER_IMPL_H
 
-#include <AMReX_Vector.H>
 #include <AMReX_Array.H>
 #include <AMReX_Box.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
 #include <AMReX_REAL.H>
 #include <AMReX_SPACE.H>
+#include <AMReX_Vector.H>
 
 #include <string>
 
diff --git a/Source/Diagnostics/BTD_Plotfile_Header_Impl.cpp b/Source/Diagnostics/BTD_Plotfile_Header_Impl.cpp
index de7bdf89b53..8b613adab6d 100644
--- a/Source/Diagnostics/BTD_Plotfile_Header_Impl.cpp
+++ b/Source/Diagnostics/BTD_Plotfile_Header_Impl.cpp
@@ -2,9 +2,9 @@
 
 #include "WarpX.H"
 
+#include <AMReX.H>
 #include <AMReX_FileSystem.H>
 #include <AMReX_INT.H>
-#include <AMReX.H>
 #include <AMReX_Print.H>
 #include <AMReX_Utility.H>
 
diff --git a/Source/Diagnostics/BTDiagnostics.cpp b/Source/Diagnostics/BTDiagnostics.cpp
index b36b57b2a0c..d1cfeab22ca 100644
--- a/Source/Diagnostics/BTDiagnostics.cpp
+++ b/Source/Diagnostics/BTDiagnostics.cpp
@@ -1,18 +1,17 @@
 #include "BTDiagnostics.H"
 
 #include "BTD_Plotfile_Header_Impl.H"
-#include "WarpX.H"
-#include "Utils/WarpXConst.H"
-#include "ComputeDiagFunctors/ComputeDiagFunctor.H"
-#include "ComputeDiagFunctors/CellCenterFunctor.H"
 #include "ComputeDiagFunctors/BackTransformFunctor.H"
+#include "ComputeDiagFunctors/CellCenterFunctor.H"
+#include "ComputeDiagFunctors/ComputeDiagFunctor.H"
 #include "ComputeDiagFunctors/RhoFunctor.H"
-#include "Utils/CoarsenIO.H"
 #include "Diagnostics/Diagnostics.H"
 #include "Diagnostics/FlushFormats/FlushFormat.H"
+#include "Utils/CoarsenIO.H"
+#include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
+#include "WarpX.H"
 
-#include <AMReX_ParallelDescriptor.H>
 #include <AMReX.H>
 #include <AMReX_Algorithm.H>
 #include <AMReX_BLassert.H>
@@ -22,13 +21,14 @@
 #include <AMReX_DistributionMapping.H>
 #include <AMReX_FileSystem.H>
 #include <AMReX_ParallelContext.H>
+#include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_Utility.H>
 
-#include <memory>
-#include <cmath>
 #include <algorithm>
+#include <cmath>
 #include <cstdio>
+#include <memory>
 #include <vector>
 
 using namespace amrex::literals;
diff --git a/Source/Diagnostics/BackTransformedDiagnostic.H b/Source/Diagnostics/BackTransformedDiagnostic.H
index 9226a157995..f5827977f9c 100644
--- a/Source/Diagnostics/BackTransformedDiagnostic.H
+++ b/Source/Diagnostics/BackTransformedDiagnostic.H
@@ -10,21 +10,21 @@
 
 #include "BackTransformedDiagnostic_fwd.H"
 
-#include "Particles/WarpXParticleContainer.H"
 #include "Particles/MultiParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
 
 #include <AMReX_Box.H>
+#include <AMReX_Geometry.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
 #include <AMReX_Vector.H>
-#include <AMReX_Geometry.H>
 
 #include <map>
-#include <vector>
 #include <memory>
 #include <string>
+#include <vector>
 
 /** \brief
  * The capability for back-transformed lab-frame data is implemented to generate
diff --git a/Source/Diagnostics/BackTransformedDiagnostic.cpp b/Source/Diagnostics/BackTransformedDiagnostic.cpp
index 7c123544a65..d84e2f7df9b 100644
--- a/Source/Diagnostics/BackTransformedDiagnostic.cpp
+++ b/Source/Diagnostics/BackTransformedDiagnostic.cpp
@@ -25,6 +25,7 @@
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_MultiFabUtil.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
@@ -35,19 +36,20 @@
 #include <AMReX_Utility.H>
 #include <AMReX_VectorIO.H>
 #include <AMReX_VisMF.H>
-#include <AMReX_MultiFabUtil.H>
 
-#include <memory>
-#include <cmath>
+#ifdef WARPX_USE_HDF5
+    #include <hdf5.h>
+#endif
+
 #include <algorithm>
+#include <cmath>
 #include <fstream>
+#include <memory>
 
 using namespace amrex;
 
 #ifdef WARPX_USE_HDF5
 
-#include <hdf5.h>
-
 /*
   Helper functions for doing the HDF5 IO.
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
index 151d16d7008..f09763d1c94 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
@@ -5,9 +5,9 @@
 
 #include <AMReX_Box.H>
 #include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
-#include <AMReX_MultiFab.H>
 
 #include <string>
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
index 8182a5ccd62..256ff106c5d 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
@@ -1,10 +1,9 @@
 #include "BackTransformFunctor.H"
 
-#include "WarpX.H"
 #include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
 #include "Utils/WarpXConst.H"
+#include "WarpX.H"
 
-#include <AMReX_MultiFabUtil.H>
 #include <AMReX_Array4.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
@@ -15,10 +14,11 @@
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_MultiFabUtil.H>
 
-#include <memory>
 #include <cmath>
 #include <map>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
index d5fb9885de1..9de42afeae6 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
@@ -1,7 +1,7 @@
 #include "DivBFunctor.H"
 
-#include "WarpX.H"
 #include "Utils/CoarsenIO.H"
+#include "WarpX.H"
 
 DivBFunctor::DivBFunctor(const std::array<const amrex::MultiFab* const, 3> arr_mf_src, const int lev, const amrex::IntVect crse_ratio, const int ncomp)
     : ComputeDiagFunctor(ncomp, crse_ratio), m_arr_mf_src(arr_mf_src), m_lev(lev)
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
index ef5534dc562..fb9df7c46b1 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
@@ -1,10 +1,10 @@
 #include "DivEFunctor.H"
 
-#include "WarpX.H"
 #include "Utils/CoarsenIO.H"
 #ifdef WARPX_DIM_RZ
 #   include "Utils/WarpXAlgorithmSelection.H"
 #endif
+#include "WarpX.H"
 
 #include <AMReX.H>
 #include <AMReX_BoxArray.H>
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
index 50b8d3a428f..ebedee56bad 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
@@ -1,9 +1,9 @@
 #include "PartPerCellFunctor.H"
 
-#include "WarpX.H"
-#include "Utils/CoarsenIO.H"
 #include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
 #include "Particles/MultiParticleContainer.H"
+#include "Utils/CoarsenIO.H"
+#include "WarpX.H"
 
 #include <AMReX_BLassert.H>
 #include <AMReX_REAL.H>
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
index 20f66bbeb01..51d0cfd0c4f 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
@@ -1,9 +1,9 @@
 #include "PartPerGridFunctor.H"
 
-#include "WarpX.H"
-#include "Utils/CoarsenIO.H"
 #include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
 #include "Particles/MultiParticleContainer.H"
+#include "Utils/CoarsenIO.H"
+#include "WarpX.H"
 
 #include <AMReX_BLassert.H>
 #include <AMReX_Config.H>
diff --git a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
index 50c5400afee..3cee521ea87 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
@@ -1,14 +1,14 @@
 #include "RhoFunctor.H"
 
-#include "WarpX.H"
-#include "Utils/CoarsenIO.H"
 #include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
-#include "Particles/MultiParticleContainer.H"
-#include "Particles/WarpXParticleContainer.H"
 #if (defined WARPX_DIM_RZ) && (defined WARPX_USE_PSATD)
     #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
     #include "FieldSolver/SpectralSolver/SpectralSolverRZ.H"
 #endif
+#include "Particles/MultiParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/CoarsenIO.H"
+#include "WarpX.H"
 
 #include <AMReX.H>
 
diff --git a/Source/Diagnostics/Diagnostics.H b/Source/Diagnostics/Diagnostics.H
index 2d1dfb0c310..b3daa866210 100644
--- a/Source/Diagnostics/Diagnostics.H
+++ b/Source/Diagnostics/Diagnostics.H
@@ -3,18 +3,18 @@
 
 #include "ParticleDiag/ParticleDiag.H"
 
-#include "FlushFormats/FlushFormat_fwd.H"
 #include "ComputeDiagFunctors/ComputeDiagFunctor_fwd.H"
+#include "FlushFormats/FlushFormat_fwd.H"
 
-#include <AMReX_Vector.H>
-#include <AMReX_MultiFab.H>
+#include <AMReX_Geometry.H>
 #include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Geometry.H>
+#include <AMReX_Vector.H>
 
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
 
 /**
  * \brief base class for diagnostics.
diff --git a/Source/Diagnostics/Diagnostics.cpp b/Source/Diagnostics/Diagnostics.cpp
index b380a973069..91a0dd21854 100644
--- a/Source/Diagnostics/Diagnostics.cpp
+++ b/Source/Diagnostics/Diagnostics.cpp
@@ -1,22 +1,21 @@
 #include "Diagnostics.H"
 
-#include "FlushFormats/FlushFormatPlotfile.H"
-#include "FlushFormats/FlushFormatCheckpoint.H"
-#include "FlushFormats/FlushFormatAscent.H"
-#include "FlushFormats/FlushFormatSensei.H"
 #include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
 #include "Diagnostics/FlushFormats/FlushFormat.H"
 #include "Diagnostics/ParticleDiag/ParticleDiag.H"
-#include "Particles/MultiParticleContainer.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/WarpXProfilerWrapper.H"
+#include "FlushFormats/FlushFormatAscent.H"
+#include "FlushFormats/FlushFormatCheckpoint.H"
 #ifdef WARPX_USE_OPENPMD
 #   include "FlushFormats/FlushFormatOpenPMD.H"
 #endif
-#include "WarpX.H"
+#include "FlushFormats/FlushFormatPlotfile.H"
+#include "FlushFormats/FlushFormatSensei.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXProfilerWrapper.H"
 #include "Utils/WarpXUtil.H"
+#include "WarpX.H"
 
-#include <AMReX_Vector.H>
 #include <AMReX.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Config.H>
@@ -25,9 +24,10 @@
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_Print.H>
+#include <AMReX_Vector.H>
 
-#include <string>
 #include <algorithm>
+#include <string>
 
 using namespace amrex::literals;
 
diff --git a/Source/Diagnostics/FieldIO.H b/Source/Diagnostics/FieldIO.H
index 4985020957d..c479cfe0fa5 100644
--- a/Source/Diagnostics/FieldIO.H
+++ b/Source/Diagnostics/FieldIO.H
@@ -9,12 +9,12 @@
 #define WARPX_FielIO_H_
 
 #include <AMReX_DistributionMapping.H>
+#include <AMReX_IntVect.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
-#include <AMReX_IntVect.H>
 
-#include <cstdint>
 #include <array>
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/Source/Diagnostics/FieldIO.cpp b/Source/Diagnostics/FieldIO.cpp
index e11af41c17e..1c26eaa6928 100644
--- a/Source/Diagnostics/FieldIO.cpp
+++ b/Source/Diagnostics/FieldIO.cpp
@@ -10,15 +10,15 @@
 #include "Utils/CoarsenIO.H"
 
 #include <AMReX.H>
+#include <AMReX_DistributionMapping.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_SPACE.H>
 #include <AMReX_ccse-mpi.H>
-#include <AMReX_DistributionMapping.H>
 
-#include <memory>
 #include <algorithm>
 #include <cstdint>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormat.H b/Source/Diagnostics/FlushFormats/FlushFormat.H
index 8fa4dd4f47b..865a5805a93 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormat.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormat.H
@@ -3,8 +3,8 @@
 
 #include "FlushFormat_fwd.H"
 
-#include "Particles/MultiParticleContainer.H"
 #include "Diagnostics/ParticleDiag/ParticleDiag.H"
+#include "Particles/MultiParticleContainer.H"
 
 class FlushFormat
 {
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
index 6eba18fd826..1dd155fac35 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
@@ -5,13 +5,16 @@
 
 #include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
+#ifdef AMREX_USE_ASCENT
+#   include <AMReX_Conduit_Blueprint.H>
+#endif
 #include <AMReX_Geometry.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_Vector.H>
+
 #ifdef AMREX_USE_ASCENT
 #   include <ascent.hpp>
-#   include <AMReX_Conduit_Blueprint.H>
 #endif
-#include <AMReX_MultiFab.H>
 
 #include <string>
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
index 2f56fd82502..66c82817da0 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
@@ -6,8 +6,8 @@
 #include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_Geometry.H>
-#include <AMReX_Vector.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_Vector.H>
 
 #include <string>
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
index 1c6fc6ab401..7477dfcd08e 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
@@ -1,14 +1,14 @@
 #include "FlushFormatCheckpoint.H"
 
-#include "WarpX.H"
-#include "Utils/WarpXProfilerWrapper.H"
 #include "BoundaryConditions/PML.H"
 #include "Diagnostics/ParticleDiag/ParticleDiag.H"
 #include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX.H"
 
-#include <AMReX_PlotFileUtil.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_ParticleIO.H>
+#include <AMReX_PlotFileUtil.H>
 #include <AMReX_Print.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
index 4fc200c0484..214559bf30f 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
@@ -1,14 +1,14 @@
 #ifndef WARPX_FLUSHFORMATOPENPMD_H_
 #define WARPX_FLUSHFORMATOPENPMD_H_
 
-#include "FlushFormat.H"
 #include "Diagnostics/WarpXOpenPMD.H"
+#include "FlushFormat.H"
 
 #include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_Geometry.H>
-#include <AMReX_Vector.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_Vector.H>
 
 #include <memory>
 #include <string>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp
index c9773315b02..147c8c61be2 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp
@@ -1,17 +1,17 @@
 #include "FlushFormatOpenPMD.H"
 
-#include "WarpX.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX.H"
 
+#include <AMReX.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_REAL.H>
-#include <AMReX.H>
 
 #include <map>
 #include <memory>
-#include <string>
 #include <set>
+#include <string>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
index e533bac29a7..92f836a287f 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
@@ -6,8 +6,8 @@
 #include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_Geometry.H>
-#include <AMReX_Vector.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_Vector.H>
 
 #include <iosfwd>
 #include <string>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
index 16d0edc6464..6b1d067fc96 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
@@ -1,17 +1,15 @@
 #include "FlushFormatPlotfile.H"
 
-#include "WarpX.H"
-#include "Utils/Interpolate.H"
-#include "Particles/Filter/FilterFunctors.H"
 #include "Diagnostics/ParticleDiag/ParticleDiag.H"
 #include "Parser/WarpXParserWrapper.H"
+#include "Particles/Filter/FilterFunctors.H"
 #include "Particles/WarpXParticleContainer.H"
+#include "Utils/Interpolate.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX.H"
 
-#include <AMReX_AmrParticles.H>
-#include <AMReX_buildInfo.H>
-#include <AMReX_PlotFileUtil.H>
 #include <AMReX.H>
+#include <AMReX_AmrParticles.H>
 #include <AMReX_Box.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
@@ -24,18 +22,20 @@
 #include <AMReX_ParmParse.H>
 #include <AMReX_ParticleIO.H>
 #include <AMReX_Particles.H>
+#include <AMReX_PlotFileUtil.H>
 #include <AMReX_Print.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
 #include <AMReX_VisMF.H>
+#include <AMReX_buildInfo.H>
 
 #ifdef AMREX_USE_OMP
 #   include <omp.h>
 #endif
 
-#include <cstring>
 #include <algorithm>
 #include <array>
+#include <cstring>
 #include <fstream>
 #include <map>
 #include <memory>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatSensei.cpp b/Source/Diagnostics/FlushFormats/FlushFormatSensei.cpp
index 215e25f18ba..74c9fd20324 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatSensei.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatSensei.cpp
@@ -1,4 +1,5 @@
 #include "FlushFormatSensei.H"
+
 #include "WarpX.H"
 
 #ifdef BL_USE_SENSEI_INSITU
diff --git a/Source/Diagnostics/FullDiagnostics.cpp b/Source/Diagnostics/FullDiagnostics.cpp
index c3efae32554..c3690689a1a 100644
--- a/Source/Diagnostics/FullDiagnostics.cpp
+++ b/Source/Diagnostics/FullDiagnostics.cpp
@@ -1,21 +1,19 @@
 #include "FullDiagnostics.H"
 
-#include "WarpX.H"
-#include "Diagnostics/Diagnostics.H"
-#include "Diagnostics/ParticleDiag/ParticleDiag.H"
-#include "Particles/MultiParticleContainer.H"
-#include "Utils/WarpXAlgorithmSelection.H"
 #include "ComputeDiagFunctors/CellCenterFunctor.H"
-#include "ComputeDiagFunctors/PartPerCellFunctor.H"
-#include "ComputeDiagFunctors/PartPerGridFunctor.H"
 #include "ComputeDiagFunctors/DivBFunctor.H"
 #include "ComputeDiagFunctors/DivEFunctor.H"
+#include "ComputeDiagFunctors/PartPerCellFunctor.H"
+#include "ComputeDiagFunctors/PartPerGridFunctor.H"
 #include "ComputeDiagFunctors/RhoFunctor.H"
+#include "Diagnostics/Diagnostics.H"
+#include "Diagnostics/ParticleDiag/ParticleDiag.H"
 #include "FlushFormats/FlushFormat.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "WarpX.H"
 
 #include <AMReX.H>
-#include <AMReX_Vector.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_Array.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
@@ -26,12 +24,14 @@
 #include <AMReX_Geometry.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MakeType.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
+#include <AMReX_Vector.H>
 
-#include <cmath>
 #include <algorithm>
+#include <cmath>
 #include <memory>
 #include <vector>
 
diff --git a/Source/Diagnostics/MultiDiagnostics.H b/Source/Diagnostics/MultiDiagnostics.H
index c13d5656f4b..aea96914aef 100644
--- a/Source/Diagnostics/MultiDiagnostics.H
+++ b/Source/Diagnostics/MultiDiagnostics.H
@@ -1,15 +1,15 @@
 #ifndef WARPX_MULTIDIAGNOSTICS_H_
 #define WARPX_MULTIDIAGNOSTICS_H_
 
-#include "MultiDiagnostics_fwd.H"
-
 #include "Diagnostics.H"
 
+#include "MultiDiagnostics_fwd.H"
+
 #include <AMReX_Vector.H>
 
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
 
 /** All types of diagnostics. */
 enum struct DiagTypes {Full, BackTransformed};
diff --git a/Source/Diagnostics/ParticleDiag/ParticleDiag.H b/Source/Diagnostics/ParticleDiag/ParticleDiag.H
index 092d0b521bd..0ac5ab69e7d 100644
--- a/Source/Diagnostics/ParticleDiag/ParticleDiag.H
+++ b/Source/Diagnostics/ParticleDiag/ParticleDiag.H
@@ -10,8 +10,8 @@
 #include <AMReX_RealBox.H>
 #include <AMReX_Vector.H>
 
-#include <string>
 #include <memory>
+#include <string>
 
 class ParticleDiag
 {
diff --git a/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp b/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp
index 64f91104977..258ab7903a9 100644
--- a/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp
+++ b/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp
@@ -1,10 +1,10 @@
 #include "ParticleDiag.H"
 
-#include "WarpX.H"
-#include "Utils/WarpXUtil.H"
 #include "Diagnostics/ParticleDiag/ParticleDiag.H"
-#include "Particles/WarpXParticleContainer.H"
 #include "Parser/WarpXParserWrapper.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXUtil.H"
+#include "WarpX.H"
 
 #include <AMReX_ParmParse.H>
 
diff --git a/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp b/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp
index 1c53c19921b..3178104ddd9 100644
--- a/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp
+++ b/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp
@@ -6,25 +6,25 @@
  */
 #include "BeamRelevant.H"
 
-#include "WarpX.H"
-#include "Utils/WarpXConst.H"
 #include "Diagnostics/ReducedDiags/ReducedDiags.H"
 #include "Particles/MultiParticleContainer.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Utils/IntervalsParser.H"
+#include "Utils/WarpXConst.H"
+#include "WarpX.H"
 
-#include <AMReX_REAL.H>
-#include <AMReX_ParticleReduce.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
+#include <AMReX_ParticleReduce.H>
 #include <AMReX_Particles.H>
+#include <AMReX_REAL.H>
 
-#include <cmath>
-#include <limits>
 #include <algorithm>
+#include <cmath>
 #include <fstream>
+#include <limits>
 #include <map>
 #include <vector>
 
diff --git a/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp b/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp
index 4d385ae1357..378a11989e1 100644
--- a/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp
+++ b/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp
@@ -7,17 +7,17 @@
 
 #include "FieldEnergy.H"
 
-#include "WarpX.H"
-#include "Utils/WarpXConst.H"
 #include "Diagnostics/ReducedDiags/ReducedDiags.H"
 #include "Utils/IntervalsParser.H"
+#include "Utils/WarpXConst.H"
+#include "WarpX.H"
 
-#include <AMReX_REAL.H>
 #include <AMReX_Config.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
 
 #include <algorithm>
 #include <fstream>
diff --git a/Source/Diagnostics/ReducedDiags/FieldMaximum.cpp b/Source/Diagnostics/ReducedDiags/FieldMaximum.cpp
index 7a3644567ad..93fb83a199b 100644
--- a/Source/Diagnostics/ReducedDiags/FieldMaximum.cpp
+++ b/Source/Diagnostics/ReducedDiags/FieldMaximum.cpp
@@ -7,9 +7,9 @@
 
 #include "FieldMaximum.H"
 
-#include "WarpX.H"
 #include "Utils/CoarsenIO.H"
 #include "Utils/IntervalsParser.H"
+#include "WarpX.H"
 
 #include <AMReX_Algorithm.H>
 #include <AMReX_Array.H>
@@ -31,10 +31,10 @@
 #include <AMReX_Vector.H>
 
 #include <algorithm>
-#include <ostream>
-#include <vector>
 #include <cmath>
 #include <cstdlib>
+#include <ostream>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/FieldMomentum.cpp b/Source/Diagnostics/ReducedDiags/FieldMomentum.cpp
index 26831601049..c835feafd7a 100644
--- a/Source/Diagnostics/ReducedDiags/FieldMomentum.cpp
+++ b/Source/Diagnostics/ReducedDiags/FieldMomentum.cpp
@@ -6,21 +6,11 @@
  */
 
 #include "FieldMomentum.H"
-#include "WarpX.H"
-#include "Utils/WarpXConst.H"
+
 #include "Utils/CoarsenIO.H"
 #include "Utils/IntervalsParser.H"
-
-#include <AMReX_Geometry.H>
-#include <AMReX_MultiFab.H>
-#include <AMReX_ParallelDescriptor.H>
-#include <AMReX_ParmParse.H>
-#include <AMReX_Reduce.H>
-#include <AMReX_REAL.H>
-
-#include <ostream>
-#include <algorithm>
-#include <vector>
+#include "Utils/WarpXConst.H"
+#include "WarpX.H"
 
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
@@ -28,13 +18,23 @@
 #include <AMReX_Config.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Reduce.H>
 #include <AMReX_Tuple.H>
 #include <AMReX_Vector.H>
 
+#include <ostream>
+#include <algorithm>
+#include <vector>
+
 using namespace amrex;
 
 FieldMomentum::FieldMomentum (std::string rd_name)
diff --git a/Source/Diagnostics/ReducedDiags/FieldReduction.H b/Source/Diagnostics/ReducedDiags/FieldReduction.H
index ae65ced2b11..e6dc8d8c55a 100644
--- a/Source/Diagnostics/ReducedDiags/FieldReduction.H
+++ b/Source/Diagnostics/ReducedDiags/FieldReduction.H
@@ -8,10 +8,10 @@
 #ifndef WARPX_DIAGNOSTICS_REDUCEDDIAGS_FIELDREDUCTION_H_
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_FIELDREDUCTION_H_
 
+#include "Parser/WarpXParserWrapper.H"
 #include "ReducedDiags.H"
-#include "WarpX.H"
 #include "Utils/CoarsenIO.H"
-#include "Parser/WarpXParserWrapper.H"
+#include "WarpX.H"
 
 #include <AMReX_Array.H>
 #include <AMReX_Box.H>
diff --git a/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp b/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp
index d7775cfc018..7b7e6aa9a96 100644
--- a/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp
+++ b/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp
@@ -6,10 +6,10 @@
  */
 #include "LoadBalanceCosts.H"
 
-#include "WarpX.H"
 #include "Diagnostics/ReducedDiags/ReducedDiags.H"
 #include "Utils/IntervalsParser.H"
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "WarpX.H"
 
 #include <AMReX_Box.H>
 #include <AMReX_Config.H>
@@ -25,11 +25,11 @@
 #   include <mpi.h>
 #endif
 
-#include <memory>
 #include <algorithm>
 #include <cstdio>
 #include <iomanip>
 #include <istream>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.cpp b/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.cpp
index d28746996a6..6f599653722 100644
--- a/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.cpp
+++ b/Source/Diagnostics/ReducedDiags/LoadBalanceEfficiency.cpp
@@ -6,9 +6,9 @@
  */
 #include "LoadBalanceEfficiency.H"
 
-#include "WarpX.H"
 #include "Diagnostics/ReducedDiags/ReducedDiags.H"
 #include "Utils/IntervalsParser.H"
+#include "WarpX.H"
 
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
diff --git a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H
index ecfa6a7c249..fc8bbcc5c23 100644
--- a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H
+++ b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.H
@@ -12,9 +12,9 @@
 
 #include "ReducedDiags.H"
 
-#include <vector>
-#include <string>
 #include <memory>
+#include <string>
+#include <vector>
 
 /**
  * This class holds multiple instances of ReducedDiagnostics, and contains
diff --git a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp
index aa6d9a1faaa..23ec57a8106 100644
--- a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp
+++ b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp
@@ -6,24 +6,24 @@
  */
 #include "MultiReducedDiags.H"
 
+#include "BeamRelevant.H"
+#include "FieldEnergy.H"
+#include "FieldMaximum.H"
+#include "FieldMomentum.H"
+#include "FieldReduction.H"
 #include "LoadBalanceCosts.H"
 #include "LoadBalanceEfficiency.H"
-#include "ParticleHistogram.H"
-#include "BeamRelevant.H"
 #include "ParticleEnergy.H"
-#include "ParticleMomentum.H"
 #include "ParticleExtrema.H"
-#include "FieldEnergy.H"
-#include "FieldMomentum.H"
-#include "FieldMaximum.H"
-#include "RhoMaximum.H"
+#include "ParticleHistogram.H"
+#include "ParticleMomentum.H"
 #include "ParticleNumber.H"
+#include "RhoMaximum.H"
 #include "Utils/IntervalsParser.H"
-#include "FieldReduction.H"
 
-#include <AMReX_ParmParse.H>
-#include <AMReX_ParallelDescriptor.H>
 #include <AMReX.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
 #include <AMReX_REAL.H>
 
 #include <algorithm>
diff --git a/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp b/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp
index 17828bc9148..b5196a03266 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp
@@ -7,28 +7,28 @@
 
 #include "ParticleEnergy.H"
 
-#include "WarpX.H"
-#include "Utils/WarpXConst.H"
 #include "Diagnostics/ReducedDiags/ReducedDiags.H"
 #include "Particles/MultiParticleContainer.H"
 #include "Particles/SpeciesPhysicalProperties.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Utils/IntervalsParser.H"
+#include "Utils/WarpXConst.H"
+#include "WarpX.H"
 
-#include <AMReX_REAL.H>
-#include <AMReX_ParticleReduce.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParticleReduce.H>
 #include <AMReX_Particles.H>
+#include <AMReX_REAL.H>
 #include <AMReX_Reduce.H>
 #include <AMReX_Tuple.H>
 #include <AMReX_Vector.H>
 
-#include <cmath>
-#include <limits>
 #include <algorithm>
+#include <cmath>
 #include <fstream>
+#include <limits>
 #include <map>
 #include <vector>
 
diff --git a/Source/Diagnostics/ReducedDiags/ParticleExtrema.cpp b/Source/Diagnostics/ReducedDiags/ParticleExtrema.cpp
index e2cbcf69a34..d683fce8557 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleExtrema.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleExtrema.cpp
@@ -7,9 +7,10 @@
 
 #include "ParticleExtrema.H"
 
-#include "WarpX.H"
-#include "Utils/WarpXConst.H"
 #include "Diagnostics/ReducedDiags/ReducedDiags.H"
+#if (defined WARPX_QED)
+#   include "Particles/ElementaryProcess/QEDInternals/QedChiFunctions.H"
+#endif
 #include "Particles/Gather/FieldGather.H"
 #include "Particles/Gather/GetExternalFields.H"
 #include "Particles/MultiParticleContainer.H"
@@ -17,12 +18,9 @@
 #include "Particles/SpeciesPhysicalProperties.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Utils/IntervalsParser.H"
-#if (defined WARPX_QED)
-#   include "Particles/ElementaryProcess/QEDInternals/QedChiFunctions.H"
-#endif
+#include "Utils/WarpXConst.H"
+#include "WarpX.H"
 
-#include <AMReX_REAL.H>
-#include <AMReX_ParticleReduce.H>
 #include <AMReX_Algorithm.H>
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
@@ -39,14 +37,16 @@
 #include <AMReX_ParIter.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
+#include <AMReX_ParticleReduce.H>
 #include <AMReX_Particles.H>
+#include <AMReX_REAL.H>
 #include <AMReX_Reduce.H>
 #include <AMReX_Tuple.H>
 #include <AMReX_Vector.H>
 
-#include <cmath>
 #include <algorithm>
 #include <array>
+#include <cmath>
 #include <fstream>
 #include <map>
 #include <vector>
diff --git a/Source/Diagnostics/ReducedDiags/ParticleHistogram.H b/Source/Diagnostics/ReducedDiags/ParticleHistogram.H
index 01b5a384e4d..e44a21b6226 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleHistogram.H
+++ b/Source/Diagnostics/ReducedDiags/ParticleHistogram.H
@@ -8,8 +8,8 @@
 #ifndef WARPX_DIAGNOSTICS_REDUCEDDIAGS_PARTICLEHISTOGRAM_H_
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_PARTICLEHISTOGRAM_H_
 
-#include "ReducedDiags.H"
 #include "Parser/WarpXParserWrapper.H"
+#include "ReducedDiags.H"
 
 #include <AMReX_REAL.H>
 
diff --git a/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp b/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp
index 1ce09ec3d39..b5737a23e95 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleHistogram.cpp
@@ -7,34 +7,34 @@
 
 #include "ParticleHistogram.H"
 
-#include "WarpX.H"
-#include "Particles/Pusher/GetAndSetPosition.H"
-#include "Utils/WarpXUtil.H"
 #include "Diagnostics/ReducedDiags/ReducedDiags.H"
 #include "Particles/MultiParticleContainer.H"
+#include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Utils/IntervalsParser.H"
 #include "Utils/WarpXConst.H"
+#include "Utils/WarpXUtil.H"
+#include "WarpX.H"
 
-#include <AMReX_GpuContainers.H>
-#include <AMReX_Math.H>
-#include <AMReX_REAL.H>
 #include <AMReX.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuAtomic.H>
+#include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
+#include <AMReX_Math.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParIter.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
 
 #include <algorithm>
+#include <array>
 #include <limits>
 #include <memory>
-#include <array>
 #include <ostream>
 #include <vector>
 
diff --git a/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp b/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp
index 508ff07c2ac..56487820e86 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleMomentum.cpp
@@ -6,29 +6,30 @@
  */
 
 #include "ParticleMomentum.H"
-#include "WarpX.H"
-#include "Utils/WarpXConst.H"
+
 #include "Particles/MultiParticleContainer.H"
 #include "Particles/SpeciesPhysicalProperties.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Utils/IntervalsParser.H"
+#include "Utils/WarpXConst.H"
+#include "WarpX.H"
 
-#include <AMReX_REAL.H>
-#include <AMReX_ParticleReduce.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParticleReduce.H>
 #include <AMReX_Particles.H>
+#include <AMReX_REAL.H>
 #include <AMReX_Reduce.H>
 #include <AMReX_Tuple.H>
 #include <AMReX_Vector.H>
 
 #include <algorithm>
-#include <map>
 #include <limits>
-#include <vector>
+#include <map>
 #include <ostream>
 #include <string>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/ReducedDiags/ParticleNumber.cpp b/Source/Diagnostics/ReducedDiags/ParticleNumber.cpp
index 03353aaeee0..9a2a3c79703 100644
--- a/Source/Diagnostics/ReducedDiags/ParticleNumber.cpp
+++ b/Source/Diagnostics/ReducedDiags/ParticleNumber.cpp
@@ -7,11 +7,11 @@
 
 #include "ParticleNumber.H"
 
-#include "WarpX.H"
 #include "Diagnostics/ReducedDiags/ReducedDiags.H"
 #include "Particles/MultiParticleContainer.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Utils/IntervalsParser.H"
+#include "WarpX.H"
 
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_PODVector.H>
diff --git a/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp b/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp
index 38a2b19dfd1..c60f4fbc686 100644
--- a/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp
+++ b/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp
@@ -9,10 +9,10 @@
 
 #include "WarpX.H"
 
-#include <AMReX_ParmParse.H>
-#include <AMReX_Utility.H>
 #include <AMReX.H>
 #include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_Utility.H>
 
 #include <fstream>
 #include <iomanip>
diff --git a/Source/Diagnostics/ReducedDiags/RhoMaximum.H b/Source/Diagnostics/ReducedDiags/RhoMaximum.H
index 79b7da7d2d0..e7386f73383 100644
--- a/Source/Diagnostics/ReducedDiags/RhoMaximum.H
+++ b/Source/Diagnostics/ReducedDiags/RhoMaximum.H
@@ -8,8 +8,8 @@
 #ifndef WARPX_DIAGNOSTICS_REDUCEDDIAGS_RHOMAXIMUM_H_
 #define WARPX_DIAGNOSTICS_REDUCEDDIAGS_RHOMAXIMUM_H_
 
-#include "ReducedDiags.H"
 #include "Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H"
+#include "ReducedDiags.H"
 
 #include <AMReX_Vector.H>
 
diff --git a/Source/Diagnostics/ReducedDiags/RhoMaximum.cpp b/Source/Diagnostics/ReducedDiags/RhoMaximum.cpp
index f9b6f155198..5fa86a12e94 100644
--- a/Source/Diagnostics/ReducedDiags/RhoMaximum.cpp
+++ b/Source/Diagnostics/ReducedDiags/RhoMaximum.cpp
@@ -7,12 +7,12 @@
 
 #include "RhoMaximum.H"
 
-#include "WarpX.H"
 #include "Diagnostics/ComputeDiagFunctors/RhoFunctor.H"
 #include "Diagnostics/ReducedDiags/ReducedDiags.H"
 #include "Particles/MultiParticleContainer.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Utils/IntervalsParser.H"
+#include "WarpX.H"
 
 #include <AMReX_BoxArray.H>
 #include <AMReX_DistributionMapping.H>
diff --git a/Source/Diagnostics/SliceDiagnostic.H b/Source/Diagnostics/SliceDiagnostic.H
index b1839328bd9..daf2b9e96d3 100644
--- a/Source/Diagnostics/SliceDiagnostic.H
+++ b/Source/Diagnostics/SliceDiagnostic.H
@@ -7,12 +7,12 @@
 #ifndef WARPX_SliceDiagnostic_H_
 #define WARPX_SliceDiagnostic_H_
 
-#include <AMReX_Geometry.H>
 #include <AMReX_FArrayBox.H>
+#include <AMReX_Geometry.H>
 #include <AMReX_IArrayBox.H>
-#include <AMReX_Vector.H>
 #include <AMReX_MultiFabUtil.H>
 #include <AMReX_MultiFabUtil_C.H>
+#include <AMReX_Vector.H>
 
 #include <memory>
 
diff --git a/Source/Diagnostics/SliceDiagnostic.cpp b/Source/Diagnostics/SliceDiagnostic.cpp
index 52644d351c4..2a1563531a6 100644
--- a/Source/Diagnostics/SliceDiagnostic.cpp
+++ b/Source/Diagnostics/SliceDiagnostic.cpp
@@ -29,8 +29,8 @@
 #include <AMReX_RealBox.H>
 #include <AMReX_SPACE.H>
 
-#include <memory>
 #include <cmath>
+#include <memory>
 
 using namespace amrex;
 
diff --git a/Source/Diagnostics/WarpXIO.cpp b/Source/Diagnostics/WarpXIO.cpp
index ae58457657c..7fe59f8646b 100644
--- a/Source/Diagnostics/WarpXIO.cpp
+++ b/Source/Diagnostics/WarpXIO.cpp
@@ -7,13 +7,16 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "WarpX.H"
-#include "FieldIO.H"
-#include "Utils/CoarsenIO.H"
 #include "BoundaryConditions/PML.H"
+#include "FieldIO.H"
 #include "Particles/MultiParticleContainer.H"
+#include "Utils/CoarsenIO.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX.H"
 
+#ifdef BL_USE_SENSEI_INSITU
+#   include <AMReX_AmrMeshInSituBridge.H>
+#endif
 #include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
 #include <AMReX_DistributionMapping.H>
@@ -21,19 +24,16 @@
 #include <AMReX_IntVect.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_ParallelDescriptor.H>
+#include <AMReX_PlotFileUtil.H>
 #include <AMReX_Print.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
 #include <AMReX_Vector.H>
 #include <AMReX_VisMF.H>
-#include <AMReX_PlotFileUtil.H>
-#ifdef BL_USE_SENSEI_INSITU
-#   include <AMReX_AmrMeshInSituBridge.H>
-#endif
 
-#include <memory>
 #include <array>
 #include <istream>
+#include <memory>
 #include <string>
 #include <utility>
 
diff --git a/Source/Diagnostics/WarpXOpenPMD.H b/Source/Diagnostics/WarpXOpenPMD.H
index 5e0cf70f144..780e95cddd9 100644
--- a/Source/Diagnostics/WarpXOpenPMD.H
+++ b/Source/Diagnostics/WarpXOpenPMD.H
@@ -13,13 +13,13 @@
 #include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_AmrParticles.H>
-#include <AMReX_ParallelDescriptor.H>
-#include <AMReX_REAL.H>
-#include <AMReX_Utility.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_GpuAllocators.H>
 #include <AMReX_ParIter.H>
+#include <AMReX_ParallelDescriptor.H>
 #include <AMReX_Print.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Utility.H>
 #include <AMReX_Vector.H>
 
 #ifdef WARPX_USE_OPENPMD
diff --git a/Source/Diagnostics/WarpXOpenPMD.cpp b/Source/Diagnostics/WarpXOpenPMD.cpp
index 929c436433d..51abbf7a2a6 100644
--- a/Source/Diagnostics/WarpXOpenPMD.cpp
+++ b/Source/Diagnostics/WarpXOpenPMD.cpp
@@ -6,17 +6,16 @@
  */
 #include "WarpXOpenPMD.H"
 
-#include "WarpX.H"
+#include "Diagnostics/ParticleDiag/ParticleDiag.H"
 #include "FieldIO.H"
+#include "Parser/WarpXParserWrapper.H"
 #include "Particles/Filter/FilterFunctors.H"
 #include "Utils/RelativeCellPosition.H"
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/WarpXUtil.H"
-#include "Diagnostics/ParticleDiag/ParticleDiag.H"
-#include "Parser/WarpXParserWrapper.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "Utils/WarpXUtil.H"
+#include "WarpX.H"
 
-#include <AMReX_ParallelDescriptor.H>
 #include <AMReX.H>
 #include <AMReX_ArrayOfStructs.H>
 #include <AMReX_BLassert.H>
@@ -29,6 +28,7 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_PODVector.H>
+#include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParallelReduce.H>
 #include <AMReX_Particle.H>
 #include <AMReX_Particles.H>
@@ -37,12 +37,12 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <iostream>
 #include <map>
 #include <set>
 #include <string>
 #include <tuple>
 #include <utility>
-#include <iostream>
 
 namespace detail
 {
diff --git a/Source/EmbeddedBoundary/WarpXInitEB.cpp b/Source/EmbeddedBoundary/WarpXInitEB.cpp
index b5da3730656..cd575491a29 100644
--- a/Source/EmbeddedBoundary/WarpXInitEB.cpp
+++ b/Source/EmbeddedBoundary/WarpXInitEB.cpp
@@ -1,38 +1,40 @@
-#include "WarpX.H"
-#include "Utils/WarpXUtil.H"
 #include "Parser/WarpXParser.H"
 #include "Parser/WarpXParserWrapper.H"
+#include "Utils/WarpXUtil.H"
+#include "WarpX.H"
 
 #include <AMReX.H>
 #include <AMReX_Array.H>
-#include <AMReX_BoxArray.H>
-#include <AMReX_BoxList.H>
-#include <AMReX_Config.H>
 #include <AMReX_Array4.H>
 #include <AMReX_BLProfiler.H>
 #include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_BoxList.H>
+#include <AMReX_Config.H>
+#ifdef AMREX_USE_EB
+#   include <AMReX_EB2.H>
+#endif
 #include <AMReX_FabArray.H>
 #include <AMReX_FabFactory.H>
-#include <AMReX_Loop.H>
-#include <AMReX_MFIter.H>
-#include <AMReX_MultiFab.H>
-#include <AMReX_REAL.H>
-#include <AMReX_Vector.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IntVect.H>
-#include <AMReX_SPACE.H>
+#include <AMReX_Loop.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
 #ifdef AMREX_USE_EB
-#   include <AMReX_EB2.H>
 #   include <AMReX_ParmParse.H>
 #endif
+#include <AMReX_REAL.H>
+#include <AMReX_SPACE.H>
+#include <AMReX_Vector.H>
 
-#include <vector>
 #include <array>
+#include <cstdlib>
 #include <memory>
 #include <string>
-#include <cstdlib>
+#include <vector>
 
 #ifdef AMREX_USE_EB
 namespace {
diff --git a/Source/Evolve/WarpXComputeDt.cpp b/Source/Evolve/WarpXComputeDt.cpp
index 5510fe074d1..4e0c85454c9 100644
--- a/Source/Evolve/WarpXComputeDt.cpp
+++ b/Source/Evolve/WarpXComputeDt.cpp
@@ -6,15 +6,15 @@
  */
 #include "WarpX.H"
 
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/WarpXConst.H"
-#ifdef WARPX_DIM_RZ
-#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
-#else
-#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
+#ifndef WARPX_DIM_RZ
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
+#else
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXConst.H"
 
 #include <AMReX.H>
 #include <AMReX_Geometry.H>
diff --git a/Source/Evolve/WarpXEvolve.cpp b/Source/Evolve/WarpXEvolve.cpp
index 854bdb778ab..d35c1310b32 100644
--- a/Source/Evolve/WarpXEvolve.cpp
+++ b/Source/Evolve/WarpXEvolve.cpp
@@ -10,24 +10,24 @@
  */
 #include "WarpX.H"
 
-#include "Utils/WarpXConst.H"
-#include "Utils/WarpXUtil.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Python/WarpX_py.H"
 #include "Diagnostics/BackTransformedDiagnostic.H"
 #include "Diagnostics/MultiDiagnostics.H"
 #include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
 #include "Evolve/WarpXDtType.H"
-#include "Parallelization/GuardCellManager.H"
-#include "Particles/MultiParticleContainer.H"
-#include "Utils/IntervalsParser.H"
-#include "Utils/WarpXProfilerWrapper.H"
 #ifdef WARPX_USE_PSATD
 #   include "FieldSolver/SpectralSolver/SpectralSolver.H"
 #endif
 #ifdef WARPX_DIM_RZ
 #   include "FieldSolver/SpectralSolver/SpectralSolverRZ.H"
 #endif
+#include "Parallelization/GuardCellManager.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Python/WarpX_py.H"
+#include "Utils/IntervalsParser.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXConst.H"
+#include "Utils/WarpXProfilerWrapper.H"
+#include "Utils/WarpXUtil.H"
 
 #include <AMReX.H>
 #include <AMReX_Array.H>
diff --git a/Source/FieldSolver/ElectrostaticSolver.cpp b/Source/FieldSolver/ElectrostaticSolver.cpp
index 71f71fcc884..3db4ac50ed1 100644
--- a/Source/FieldSolver/ElectrostaticSolver.cpp
+++ b/Source/FieldSolver/ElectrostaticSolver.cpp
@@ -4,24 +4,20 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include <WarpX.H>
+#include "WarpX.H"
+
 #include "Parallelization/GuardCellManager.H"
+#include "Parser/WarpXParser.H"
 #include "Particles/MultiParticleContainer.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "Parser/WarpXParser.H"
-#include "Utils/WarpXUtil.H"
 #include "Utils/WarpXConst.H"
+#include "Utils/WarpXUtil.H"
 
-#include <AMReX_MLMG.H>
-#ifdef WARPX_DIM_RZ
-    #include <AMReX_MLNodeLaplacian.H>
-#else
-    #include <AMReX_MLNodeTensorLaplacian.H>
-#endif
-#include <AMReX_REAL.H>
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
 #include <AMReX_DistributionMapping.H>
@@ -35,16 +31,21 @@
 #include <AMReX_IntVect.H>
 #include <AMReX_LO_BCTYPES.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_MLMG.H>
+#ifdef WARPX_DIM_RZ
+    #include <AMReX_MLNodeLaplacian.H>
+#else
+    #include <AMReX_MLNodeTensorLaplacian.H>
+#endif
 #include <AMReX_MultiFab.H>
-#include <AMReX_Vector.H>
-#include <AMReX_BLassert.H>
-#include <AMReX_Box.H>
 #include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
 #include <AMReX_SPACE.H>
+#include <AMReX_Vector.H>
 
-#include <string>
-#include <memory>
 #include <array>
+#include <memory>
+#include <string>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp
index cedfe467524..592bb8bb2b4 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp
@@ -6,11 +6,11 @@
  */
 #include "FiniteDifferenceSolver.H"
 
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/WarpXConst.H"
 #ifdef WARPX_DIM_RZ
 #   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXConst.H"
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
index 09bb139df96..bd3381a90d5 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
@@ -7,16 +7,17 @@
 #include "FiniteDifferenceSolver.H"
 
 #include "Utils/WarpXAlgorithmSelection.H"
-#ifdef WARPX_DIM_RZ
-#   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
-#else
-#   include "FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
+#ifndef WARPX_DIM_RZ
 #   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
+#   include "FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
+#else
+#   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
+#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
@@ -27,7 +28,6 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
index 14fe0def55d..92fb423ecf9 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
@@ -6,19 +6,20 @@
  */
 #include "FiniteDifferenceSolver.H"
 
-#include "WarpX.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/WarpXConst.H"
-#ifdef WARPX_DIM_RZ
-#   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
-#else
+#ifndef WARPX_DIM_RZ
 #   include "FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
 #   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
+#else
+#   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXConst.H"
+#include "WarpX.H"
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
+#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuAtomic.H>
@@ -33,7 +34,6 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
-#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
index baa8f6668fe..bf49f3d0782 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
@@ -6,15 +6,16 @@
  */
 #include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 
-#include "Utils/WarpXAlgorithmSelection.H"
-#ifdef WARPX_DIM_RZ
-#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
-#else
+#include "BoundaryConditions/PMLComponent.H"
+
+#ifndef WARPX_DIM_RZ
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
+#else
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
-#include "BoundaryConditions/PMLComponent.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
index 6608252e36f..9a6ce023024 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
@@ -6,19 +6,20 @@
  */
 #include "FiniteDifferenceSolver.H"
 
-#include "WarpX.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-#ifdef WARPX_DIM_RZ
-#   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
+#ifndef WARPX_DIM_RZ
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #else
-#   include "FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
-#   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
-#   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
+#include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXConst.H"
+#include "WarpX.H"
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
+#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuAtomic.H>
@@ -33,7 +34,6 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
-#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
index fd51cfe74f5..7c368db144a 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
@@ -6,20 +6,22 @@
  */
 #include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 
-#include "Utils/WarpXAlgorithmSelection.H"
-#ifdef WARPX_DIM_RZ
-#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
-#else
+#include "BoundaryConditions/PML.H"
+#include "BoundaryConditions/PMLComponent.H"
+#include "BoundaryConditions/PML_current.H"
+#ifndef WARPX_DIM_RZ
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
+#else
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
-#include "BoundaryConditions/PML.H"
-#include "BoundaryConditions/PML_current.H"
-#include "BoundaryConditions/PMLComponent.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXConst.H"
 
 #include <AMReX.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_FabArray.H>
@@ -31,8 +33,6 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Box.H>
-#include <AMReX_Array4.H>
 
 #include <array>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
index 534f566d4f8..0de8d4f8058 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
@@ -6,19 +6,22 @@
  */
 #include "FiniteDifferenceSolver.H"
 
-#include "Utils/WarpXAlgorithmSelection.H"
-#ifdef WARPX_DIM_RZ
-#   include "WarpX.H"
-#   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
+#ifndef WARPX_DIM_RZ
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #else
-#   include "FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
-#   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
-#   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
+#include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXConst.H"
+#ifndef WARPX_DIM_RZ
+#   include "WarpX.H"
+#endif
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
+#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
@@ -29,7 +32,6 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
index 4d7c2ef0be9..af6f54bed05 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
@@ -6,18 +6,19 @@
  */
 #include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
 
-#include "Utils/WarpXAlgorithmSelection.H"
-#ifdef WARPX_DIM_RZ
-#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
-#else
+#include "BoundaryConditions/PMLComponent.H"
+#ifndef WARPX_DIM_RZ
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
+#else
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
-#include "BoundaryConditions/PMLComponent.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
+#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
@@ -28,7 +29,6 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Box.H>
 
 #include <array>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
index 72cb504214f..86ddf99f9ed 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
@@ -5,18 +5,20 @@
  * License: BSD-3-Clause-LBNL
  */
 
-#include "Utils/WarpXAlgorithmSelection.H"
+
 #include "FiniteDifferenceSolver.H"
-#ifdef WARPX_DIM_RZ
-#   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
+#ifndef WARPX_DIM_RZ
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #else
-#   include "FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
-#   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
-#   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
+#include "Utils/WarpXAlgorithmSelection.H"
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
+#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
@@ -27,7 +29,6 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H
index da1a8c9a945..216723553d5 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H
@@ -10,10 +10,10 @@
 
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_REAL.H>
+#include <AMReX.H>
 #include <AMReX_Array4.H>
 #include <AMReX_Gpu.H>
-#include <AMReX.H>
+#include <AMReX_REAL.H>
 
 #include <algorithm>
 #include <array>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H
index 68ecdfc60db..5c1d686877b 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H
@@ -10,10 +10,10 @@
 
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_REAL.H>
+#include <AMReX.H>
 #include <AMReX_Array4.H>
 #include <AMReX_Gpu.H>
-#include <AMReX.H>
+#include <AMReX_REAL.H>
 
 #include <array>
 #include <cmath>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H
index 4fd76a699a7..4fe81375469 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H
@@ -8,13 +8,13 @@
 #ifndef WARPX_FINITE_DIFFERENCE_ALGORITHM_CARTESIAN_YEE_H_
 #define WARPX_FINITE_DIFFERENCE_ALGORITHM_CARTESIAN_YEE_H_
 
-#include "Utils/WarpXConst.H"
 #include "FieldAccessorFunctors.H"
+#include "Utils/WarpXConst.H"
 
 #include <AMReX.H>
-#include <AMReX_REAL.H>
 #include <AMReX_Array4.H>
 #include <AMReX_Gpu.H>
+#include <AMReX_REAL.H>
 
 #include <array>
 #include <cmath>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H
index 2283df09ae4..fee0a9dc872 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H
@@ -10,10 +10,10 @@
 
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_REAL.H>
+#include <AMReX.H>
 #include <AMReX_Array4.H>
 #include <AMReX_Gpu.H>
-#include <AMReX.H>
+#include <AMReX_REAL.H>
 
 #include <array>
 #include <cmath>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/FieldAccessorFunctors.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/FieldAccessorFunctors.H
index 3ba6de3355f..0b524522805 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/FieldAccessorFunctors.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/FieldAccessorFunctors.H
@@ -1,6 +1,8 @@
 #ifndef WARPX_FIELD_ACCESSOR_FUNCTORS_H
 #define WARPX_FIELD_ACCESSOR_FUNCTORS_H
+
 #include "WarpX.H"
+
 /**
  * \brief Functor that returns the division of the source m_field Array4 value
           by macroparameter, m_parameter value at the respective (i,j,k,ncomp).
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
index 0e5afb89561..f2e5e06c921 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
@@ -13,10 +13,10 @@
 #include "BoundaryConditions/PML_fwd.H"
 #include "MacroscopicProperties/MacroscopicProperties_fwd.H"
 
-#include <AMReX_MultiFab.H>
+#include <AMReX_Box.H>
 #include <AMReX_GpuContainers.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
index 54dd680d6ae..1ad5a6c3d9f 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
@@ -6,14 +6,16 @@
  */
 #include "FiniteDifferenceSolver.H"
 
+#ifndef WARPX_DIM_RZ
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
+#else
+#   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
+#endif
 #include "Utils/WarpXAlgorithmSelection.H"
-#ifdef WARPX_DIM_RZ
+#ifndef WARPX_DIM_RZ
 #   include "WarpX.H"
-#   include "FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
-#else
-#   include "FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
-#   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
-#   include "FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #endif
 
 #include <AMReX.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
index fa5dc283ad5..d7f11ef37f7 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
@@ -1,6 +1,5 @@
 #include "FiniteDifferenceSolver.H"
 
-#include "Utils/WarpXAlgorithmSelection.H"
 #ifdef WARPX_DIM_RZ
     // currently works only for 3D
 #else
@@ -8,12 +7,14 @@
 #   include "FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
 #   include "FiniteDifferenceAlgorithms/FieldAccessorFunctors.H"
 #endif
+#include "MacroscopicProperties/MacroscopicProperties.H"
 #include "Utils/CoarsenIO.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 #include "WarpX.H"
-#include "MacroscopicProperties/MacroscopicProperties.H"
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
+#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
@@ -24,7 +25,6 @@
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Box.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H
index efa059b0341..3597212c43c 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H
@@ -6,10 +6,10 @@
 #include "Parser/WarpXParserWrapper.H"
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_MultiFab.H>
 #include <AMReX_Array.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuQualifiers.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
 #include <memory>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
index 662d87ca563..42b912fbae8 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
@@ -1,9 +1,8 @@
 #include "MacroscopicProperties.H"
 
-#include "WarpX.H"
 #include "Utils/WarpXUtil.H"
+#include "WarpX.H"
 
-#include <AMReX_ParmParse.H>
 #include <AMReX_Array4.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
@@ -13,6 +12,7 @@
 #include <AMReX_IndexType.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_ParmParse.H>
 #include <AMReX_Print.H>
 #include <AMReX_RealBox.H>
 
diff --git a/Source/FieldSolver/SpectralSolver/AnyFFT.H b/Source/FieldSolver/SpectralSolver/AnyFFT.H
index 6ba77e13bcd..23cadd30f84 100644
--- a/Source/FieldSolver/SpectralSolver/AnyFFT.H
+++ b/Source/FieldSolver/SpectralSolver/AnyFFT.H
@@ -9,6 +9,7 @@
 #define ANYFFT_H_
 
 #include <AMReX_Config.H>
+#include <AMReX_LayoutData.H>
 
 #if defined(AMREX_USE_CUDA)
 #  include <cufft.h>
@@ -18,8 +19,6 @@
 #  include <fftw3.h>
 #endif
 
-#include <AMReX_LayoutData.H>
-
 /**
  * Wrapper around FFT libraries. The header file defines the API and the base types
  * (Complex and VendorFFTPlan), and the implementation for different FFT libraries is
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
index f8c8259010e..0f276635fcf 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
@@ -1,15 +1,15 @@
 #ifndef WARPX_COMOVING_PSATD_ALGORITHM_H_
 #define WARPX_COMOVING_PSATD_ALGORITHM_H_
 
-#include "SpectralBaseAlgorithm.H"
 #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
+#include "SpectralBaseAlgorithm.H"
 
 #include <AMReX_Array.H>
 #include <AMReX_Config.H>
-#include <AMReX_REAL.H>
 #include <AMReX_DistributionMapping.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.cpp
index a76311db376..ce6d5b933d5 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.cpp
@@ -4,10 +4,10 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "WarpX.H"
 #include "GalileanPsatdAlgorithmRZ.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX.H"
 
 #include <cmath>
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
index 6cb7dfc6ace..2f0183cbb10 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
@@ -12,9 +12,9 @@
 #include "FieldSolver/SpectralSolver/SpectralFieldData_fwd.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace_fwd.H"
 
-#include <AMReX_REAL.H>
 #include <AMReX_DistributionMapping.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
index 1be5094bd02..d28b5218a90 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
@@ -8,8 +8,8 @@
 
 #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
-#include "Utils/WarpX_Complex.H"
 #include "Utils/WarpXConst.H"
+#include "Utils/WarpX_Complex.H"
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
index 2b6f99bd4f7..ae74af02ce6 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
@@ -7,15 +7,15 @@
 #ifndef WARPX_PSATD_ALGORITHM_H_
 #define WARPX_PSATD_ALGORITHM_H_
 
-#include "SpectralBaseAlgorithm.H"
 #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
+#include "SpectralBaseAlgorithm.H"
 
 #include <AMReX_Array.H>
 #include <AMReX_Config.H>
-#include <AMReX_REAL.H>
 #include <AMReX_DistributionMapping.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp
index 86d9f9696db..cb055a27b21 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp
@@ -4,10 +4,10 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "WarpX.H"
 #include "PsatdAlgorithmRZ.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX.H"
 
 #include <cmath>
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
index 6d8f349215d..fcef643fc27 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
@@ -7,17 +7,17 @@
 #ifndef WARPX_SPECTRAL_BASE_ALGORITHM_H_
 #define WARPX_SPECTRAL_BASE_ALGORITHM_H_
 
-#include "Utils/WarpX_Complex.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
+#include "Utils/WarpX_Complex.H"
 
 #include "FieldSolver/SpectralSolver/SpectralFieldData_fwd.H"
 
 #include <AMReX_BaseFab.H>
 #include <AMReX_Config.H>
-#include <AMReX_FabArray.H>
-#include <AMReX_REAL.H>
 #include <AMReX_DistributionMapping.H>
+#include <AMReX_FabArray.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
index 1f2950ca6a5..e57302cc4ef 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp
@@ -5,19 +5,19 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "SpectralBaseAlgorithm.H"
-#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 
+#include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #include "Utils/WarpX_Complex.H"
 
+#include <AMReX_Array4.H>
 #include <AMReX_BaseFab.H>
 #include <AMReX_Config.H>
-#include <AMReX_REAL.H>
-#include <AMReX_Array4.H>
 #include <AMReX_GpuComplex.H>
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_PODVector.H>
+#include <AMReX_REAL.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralBinomialFilter.cpp b/Source/FieldSolver/SpectralSolver/SpectralBinomialFilter.cpp
index e0ac3e886d4..14246b5be13 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralBinomialFilter.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralBinomialFilter.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SpectralBinomialFilter.H"
+
 #include <AMReX_REAL.H>
 
 #include <cmath>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
index fa0074cd217..12a9fcadfcf 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
@@ -10,19 +10,19 @@
 
 #include "SpectralFieldData_fwd.H"
 
-#include "Utils/WarpX_Complex.H"
-#include "SpectralKSpace.H"
 #include "AnyFFT.H"
+#include "SpectralKSpace.H"
+#include "Utils/WarpX_Complex.H"
 
-#include <AMReX_MultiFab.H>
 #include <AMReX_BaseFab.H>
+#include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
+#include <AMReX_DistributionMapping.H>
 #include <AMReX_Extension.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_IndexType.H>
-#include <AMReX_BoxArray.H>
-#include <AMReX_DistributionMapping.H>
 #include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_Vector.H>
 
 #include <vector>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
index c2c227fadf6..71dfc82d2ad 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
@@ -7,12 +7,14 @@
  */
 #include "SpectralFieldData.H"
 
-#include "WarpX.H"
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "WarpX.H"
 
 #include <AMReX_Array4.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Dim3.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_GpuAtomic.H>
 #include <AMReX_GpuComplex.H>
@@ -24,8 +26,6 @@
 #include <AMReX_PODVector.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
-#include <AMReX_BoxArray.H>
-#include <AMReX_Dim3.H>
 
 #if WARPX_USE_PSATD
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.H b/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.H
index 8484d7174fa..85aa41d3b84 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.H
@@ -7,10 +7,11 @@
 #ifndef WARPX_SPECTRAL_FIELD_DATA_RZ_H_
 #define WARPX_SPECTRAL_FIELD_DATA_RZ_H_
 
-#include "SpectralKSpaceRZ.H"
+#include "SpectralBinomialFilter.H"
 #include "SpectralFieldData.H"
 #include "SpectralHankelTransform/SpectralHankelTransformer.H"
-#include "SpectralBinomialFilter.H"
+#include "SpectralKSpaceRZ.H"
+
 #include <AMReX_MultiFab.H>
 
 /* \brief Class that stores the fields in spectral space, and performs the
diff --git a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp
index 9000f164c23..d6a357b7ff2 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp
@@ -4,11 +4,11 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "WarpX.H"
-#include "Utils/WarpXConst.H"
-
 #include "HankelTransform.H"
+
 #include "BesselRoots.H"
+#include "Utils/WarpXConst.H"
+#include "WarpX.H"
 
 #include <blas.hh>
 #include <lapack.hh>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.H b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.H
index 82cf48fe467..e6dddf60e12 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.H
@@ -7,9 +7,10 @@
 #ifndef WARPX_SPECTRALHANKELTRANSFORMER_H_
 #define WARPX_SPECTRALHANKELTRANSFORMER_H_
 
-#include <AMReX_FArrayBox.H>
 #include "HankelTransform.H"
 
+#include <AMReX_FArrayBox.H>
+
 /* \brief Object that allows to transform the fields back and forth between the
  *  spectral and interpolation grid.
  *
diff --git a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.cpp b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.cpp
index 884ee5f4573..a40e62f0da1 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.cpp
@@ -4,9 +4,10 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "Utils/WarpXConst.H"
 #include "SpectralHankelTransformer.H"
 
+#include "Utils/WarpXConst.H"
+
 #include <memory>
 
 SpectralHankelTransformer::SpectralHankelTransformer (int const nr,
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
index 9d74c38534c..cb56f24d1da 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
@@ -12,15 +12,15 @@
 
 #include "Utils/WarpX_Complex.H"
 
-#include <AMReX_BoxArray.H>
-#include <AMReX_LayoutData.H>
 #include <AMReX_Array.H>
+#include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
+#include <AMReX_DistributionMapping.H>
 #include <AMReX_GpuContainers.H>
+#include <AMReX_LayoutData.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealVect.H>
 #include <AMReX_Vector.H>
-#include <AMReX_DistributionMapping.H>
 
 // `KVectorComponent` and `SpectralShiftFactor` hold one 1D array
 // ("DeviceVector") for each box ("LayoutData"). The arrays are
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
index 1c2d1e065b3..2f11f84caa0 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
@@ -21,8 +21,8 @@
 #include <AMReX_MFIter.H>
 
 #include <array>
-#include <vector>
 #include <cmath>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.H b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
index 7b8b5b01c06..d8088552f06 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolver.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
@@ -13,11 +13,11 @@
 #include "SpectralFieldData.H"
 
 #include <AMReX_Array.H>
-#include <AMReX_REAL.H>
-#include <AMReX_RealVect.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_DistributionMapping.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealVect.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
index 6787817b962..d04961c5fc8 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
@@ -4,13 +4,13 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "SpectralKSpace.H"
-#include "SpectralSolver.H"
-#include "SpectralAlgorithms/PsatdAlgorithm.H"
-#include "SpectralAlgorithms/PMLPsatdAlgorithm.H"
-#include "SpectralAlgorithms/ComovingPsatdAlgorithm.H"
 #include "FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H"
 #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
+#include "SpectralAlgorithms/ComovingPsatdAlgorithm.H"
+#include "SpectralAlgorithms/PMLPsatdAlgorithm.H"
+#include "SpectralAlgorithms/PsatdAlgorithm.H"
+#include "SpectralKSpace.H"
+#include "SpectralSolver.H"
 #include "Utils/WarpXProfilerWrapper.H"
 
 #include <memory>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp
index f59b99752cc..ee4e5fd6d07 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp
@@ -4,12 +4,12 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "SpectralAlgorithms/GalileanPsatdAlgorithmRZ.H"
+#include "SpectralAlgorithms/PsatdAlgorithmRZ.H"
 #include "SpectralKSpaceRZ.H"
 #include "SpectralSolverRZ.H"
-#include "SpectralAlgorithms/PsatdAlgorithmRZ.H"
-#include "SpectralAlgorithms/GalileanPsatdAlgorithmRZ.H"
-#include "WarpX.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX.H"
 
 /* \brief Initialize the spectral Maxwell solver
  *
diff --git a/Source/FieldSolver/WarpXPushFieldsEM.cpp b/Source/FieldSolver/WarpXPushFieldsEM.cpp
index 56766a2a5ac..f2fae02be98 100644
--- a/Source/FieldSolver/WarpXPushFieldsEM.cpp
+++ b/Source/FieldSolver/WarpXPushFieldsEM.cpp
@@ -7,14 +7,10 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
-#include "Utils/WarpXConst.H"
+
 #include "BoundaryConditions/PML.H"
 #include "Evolve/WarpXDtType.H"
 #include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/WarpXProfilerWrapper.H"
-#include "WarpX_FDTD.H"
-#include "WarpXPushFieldsEM_K.H"
 #if defined(WARPX_DIM_RZ) || defined(WARPX_USE_PSATD)
 #   include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #   ifdef WARPX_DIM_RZ
@@ -23,12 +19,16 @@
 #       include "FieldSolver/SpectralSolver/SpectralSolver.H"
 #   endif
 #endif
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXConst.H"
+#include "Utils/WarpXProfilerWrapper.H"
+#include "WarpXPushFieldsEM_K.H"
+#include "WarpX_FDTD.H"
 
+#include <AMReX.H>
 #ifdef BL_USE_SENSEI_INSITU
 #   include <AMReX_AmrMeshInSituBridge.H>
 #endif
-#include <AMReX.H>
-#include <AMReX_Math.H>
 #include <AMReX_Array4.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
@@ -38,14 +38,15 @@
 #include <AMReX_Geometry.H>
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
+#include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_Math.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
-#include <AMReX_IndexType.H>
 
-#include <cmath>
 #include <array>
+#include <cmath>
 #include <memory>
 
 using namespace amrex;
diff --git a/Source/FieldSolver/WarpXPushFieldsEM_K.H b/Source/FieldSolver/WarpXPushFieldsEM_K.H
index 7f6ca5f6997..8fe1b781bc5 100644
--- a/Source/FieldSolver/WarpXPushFieldsEM_K.H
+++ b/Source/FieldSolver/WarpXPushFieldsEM_K.H
@@ -9,6 +9,7 @@
 #define WarpXPushFieldsEM_K_h
 
 #include "Utils/WarpXConst.H"
+
 #include <AMReX.H>
 
 /*
diff --git a/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp b/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp
index d49e4053c2c..0ea37eb5d26 100644
--- a/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp
+++ b/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp
@@ -5,10 +5,14 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
-#include "WarpX_QED_K.H"
+
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX_QED_K.H"
 
+#ifdef BL_USE_SENSEI_INSITU
+#   include <AMReX_AmrMeshInSituBridge.H>
+#endif
 #include <AMReX_Array4.H>
 #include <AMReX_Box.H>
 #include <AMReX_Config.H>
@@ -28,14 +32,11 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
 #include <AMReX_Vector.H>
-#ifdef BL_USE_SENSEI_INSITU
-#   include <AMReX_AmrMeshInSituBridge.H>
-#endif
 
 #include <array>
+#include <cstdlib>
 #include <iostream>
 #include <memory>
-#include <cstdlib>
 
 using namespace amrex;
 
diff --git a/Source/FieldSolver/WarpX_QED_K.H b/Source/FieldSolver/WarpX_QED_K.H
index 6a1f2b3381b..6bc5986b1bc 100644
--- a/Source/FieldSolver/WarpX_QED_K.H
+++ b/Source/FieldSolver/WarpX_QED_K.H
@@ -9,8 +9,9 @@
 #define WarpX_QED_K_h
 
 #include "Utils/WarpXConst.H"
-#include <AMReX_FArrayBox.H>
+
 #include <AMReX.H>
+#include <AMReX_FArrayBox.H>
 
 #include <cmath>
 
diff --git a/Source/Filter/BilinearFilter.cpp b/Source/Filter/BilinearFilter.cpp
index bb885ee887a..8a16e2a9b95 100644
--- a/Source/Filter/BilinearFilter.cpp
+++ b/Source/Filter/BilinearFilter.cpp
@@ -6,15 +6,16 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "BilinearFilter.H"
+
 #include "Utils/WarpXProfilerWrapper.H"
 
+#include <AMReX_Config.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuDevice.H>
 #include <AMReX_IntVect.H>
-#include <AMReX_Vector.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Config.H>
+#include <AMReX_Vector.H>
 
 #include <array>
 #include <vector>
diff --git a/Source/Filter/Filter.H b/Source/Filter/Filter.H
index 1dd1a6a9533..8b8bdf09334 100644
--- a/Source/Filter/Filter.H
+++ b/Source/Filter/Filter.H
@@ -4,14 +4,14 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include <AMReX_MultiFab.H>
+#include <AMReX_Array4.H>
+#include <AMReX_Box.H>
 #include <AMReX_Dim3.H>
+#include <AMReX_FArrayBox.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Box.H>
-#include <AMReX_FArrayBox.H>
-#include <AMReX_Array4.H>
 
 #ifndef WARPX_FILTER_H_
 #define WARPX_FILTER_H_
diff --git a/Source/Initialization/CustomDensityProb.H b/Source/Initialization/CustomDensityProb.H
index 935345bd9a2..d2d9b04bae9 100644
--- a/Source/Initialization/CustomDensityProb.H
+++ b/Source/Initialization/CustomDensityProb.H
@@ -7,12 +7,12 @@
 #ifndef CUSTOM_DENSITY_PROB_H_
 #define CUSTOM_DENSITY_PROB_H_
 
-#include <AMReX_ParmParse.H>
+#include "Utils/WarpXUtil.H"
+
 #include <AMReX_Arena.H>
-#include <AMReX_Gpu.H>
 #include <AMReX_Dim3.H>
-
-#include "Utils/WarpXUtil.H"
+#include <AMReX_Gpu.H>
+#include <AMReX_ParmParse.H>
 
 // An example of Custom Density Profile
 
diff --git a/Source/Initialization/CustomMomentumProb.H b/Source/Initialization/CustomMomentumProb.H
index f406a4706ff..1cda54c9d30 100644
--- a/Source/Initialization/CustomMomentumProb.H
+++ b/Source/Initialization/CustomMomentumProb.H
@@ -7,10 +7,10 @@
 #ifndef CUSTOM_MOMENTUM_PROB_H
 #define CUSTOM_MOMENTUM_PROB_H
 
-#include <AMReX_ParmParse.H>
-#include <AMReX_Gpu.H>
 #include <AMReX_Arena.H>
 #include <AMReX_Dim3.H>
+#include <AMReX_Gpu.H>
+#include <AMReX_ParmParse.H>
 
 // An example of Custom Momentum Profile
 
diff --git a/Source/Initialization/InjectorDensity.H b/Source/Initialization/InjectorDensity.H
index 9d707f41538..a0d2f3366e3 100644
--- a/Source/Initialization/InjectorDensity.H
+++ b/Source/Initialization/InjectorDensity.H
@@ -9,9 +9,9 @@
 #ifndef INJECTOR_DENSITY_H_
 #define INJECTOR_DENSITY_H_
 
+#include "CustomDensityProb.H"
 #include "Parser/GpuParser.H"
 #include "Parser/WarpXParser.H"
-#include "CustomDensityProb.H"
 #include "Utils/WarpXConst.H"
 
 #include <AMReX.H>
@@ -19,8 +19,8 @@
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_REAL.H>
 
-#include <string>
 #include <cmath>
+#include <string>
 
 // struct whose getDensity returns constant density.
 struct InjectorDensityConstant
diff --git a/Source/Initialization/InjectorDensity.cpp b/Source/Initialization/InjectorDensity.cpp
index 4d8c708ab52..572b37d9eb6 100644
--- a/Source/Initialization/InjectorDensity.cpp
+++ b/Source/Initialization/InjectorDensity.cpp
@@ -14,8 +14,8 @@
 #include <AMReX_ParmParse.H>
 
 #include <algorithm>
+#include <cctype>
 #include <vector>
-#include <ctype.h>
 
 using namespace amrex;
 
diff --git a/Source/Initialization/InjectorMomentum.H b/Source/Initialization/InjectorMomentum.H
index 34726882139..1848b6c0584 100644
--- a/Source/Initialization/InjectorMomentum.H
+++ b/Source/Initialization/InjectorMomentum.H
@@ -10,19 +10,18 @@
 
 #include "CustomMomentumProb.H"
 #include "Parser/GpuParser.H"
-#include "Utils/WarpXConst.H"
 #include "Parser/WarpXParser.H"
+#include "Utils/WarpXConst.H"
 
 #include <AMReX.H>
+#include <AMReX_Config.H>
+#include <AMReX_Dim3.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Random.H>
-#include <AMReX_Dim3.H>
-#include <AMReX_Config.H>
 
-#include <string>
 #include <cmath>
-
+#include <string>
 
 // struct whose getMomentum returns constant momentum.
 struct InjectorMomentumConstant
diff --git a/Source/Initialization/InjectorPosition.H b/Source/Initialization/InjectorPosition.H
index 88f989c8317..1b0db4b10cb 100644
--- a/Source/Initialization/InjectorPosition.H
+++ b/Source/Initialization/InjectorPosition.H
@@ -10,8 +10,8 @@
 
 #include "InjectorPosition_fwd.H"
 
-#include <AMReX_Gpu.H>
 #include <AMReX_Dim3.H>
+#include <AMReX_Gpu.H>
 #include <AMReX_Utility.H>
 
 // struct whose getPositionUnitBox returns x, y and z for a particle with
diff --git a/Source/Initialization/PlasmaInjector.H b/Source/Initialization/PlasmaInjector.H
index 3e578c5d3c3..0de2c6f68b7 100644
--- a/Source/Initialization/PlasmaInjector.H
+++ b/Source/Initialization/PlasmaInjector.H
@@ -9,23 +9,23 @@
 #ifndef PLASMA_INJECTOR_H_
 #define PLASMA_INJECTOR_H_
 
-#include "Particles/SpeciesPhysicalProperties.H"
-#include "InjectorMomentum.H"
 #include "InjectorDensity.H"
+#include "InjectorMomentum.H"
+#include "Particles/SpeciesPhysicalProperties.H"
 
 #include "InjectorPosition_fwd.H"
 
-#include <AMReX_Vector.H>
-#include <AMReX_ParmParse.H>
 #include <AMReX_Dim3.H>
+#include <AMReX_ParmParse.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
 
 #ifdef WARPX_USE_OPENPMD
 #   include <openPMD/openPMD.hpp>
 #endif
 
-#include <memory>
 #include <limits>
+#include <memory>
 #include <string>
 
 ///
diff --git a/Source/Initialization/PlasmaInjector.cpp b/Source/Initialization/PlasmaInjector.cpp
index 7fff101b8ac..c77960eb6d6 100644
--- a/Source/Initialization/PlasmaInjector.cpp
+++ b/Source/Initialization/PlasmaInjector.cpp
@@ -9,31 +9,31 @@
  */
 #include "PlasmaInjector.H"
 
-#include "Particles/SpeciesPhysicalProperties.H"
 #include "Initialization/InjectorDensity.H"
 #include "Initialization/InjectorMomentum.H"
 #include "Initialization/InjectorPosition.H"
+#include "Particles/SpeciesPhysicalProperties.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
 #include "WarpX.H"
 
 #include <AMReX.H>
-#include <AMReX_ParallelDescriptor.H>
-#include <AMReX_Print.H>
 #include <AMReX_BLassert.H>
+#include <AMReX_Config.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_GpuDevice.H>
+#include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
+#include <AMReX_Print.H>
 #include <AMReX_RandomEngine.H>
-#include <AMReX_Config.H>
 
 #include <algorithm>
+#include <cctype>
 #include <map>
+#include <memory>
+#include <sstream>
 #include <utility>
 #include <vector>
-#include <sstream>
-#include <memory>
-#include <ctype.h>
 
 using namespace amrex;
 
diff --git a/Source/Initialization/WarpXInitData.cpp b/Source/Initialization/WarpXInitData.cpp
index 05e3b19be46..7e452afb7bc 100644
--- a/Source/Initialization/WarpXInitData.cpp
+++ b/Source/Initialization/WarpXInitData.cpp
@@ -10,27 +10,29 @@
  */
 #include "WarpX.H"
 
-#include "Filter/BilinearFilter.H"
-#include "Filter/NCIGodfreyFilter.H"
-#include "Parser/GpuParser.H"
-#include "Utils/WarpXUtil.H"
-#include "Utils/WarpXAlgorithmSelection.H"
 #include "BoundaryConditions/PML.H"
 #include "Diagnostics/BackTransformedDiagnostic.H"
 #include "Diagnostics/MultiDiagnostics.H"
 #include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
 #include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H"
+#include "Filter/BilinearFilter.H"
+#include "Filter/NCIGodfreyFilter.H"
+#include "Parser/GpuParser.H"
 #include "Parser/WarpXParserWrapper.H"
 #include "Particles/MultiParticleContainer.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "Utils/WarpXUtil.H"
 
-#include <AMReX_ParallelDescriptor.H>
-#include <AMReX_ParmParse.H>
 #include <AMReX.H>
 #include <AMReX_AmrCore.H>
+#ifdef BL_USE_SENSEI_INSITU
+#   include <AMReX_AmrMeshInSituBridge.H>
+#endif
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_BoxList.H>
@@ -44,20 +46,18 @@
 #include <AMReX_LayoutData.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
 #include <AMReX_Print.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
 #include <AMReX_SPACE.H>
 #include <AMReX_Vector.H>
-#include <AMReX_BLassert.H>
-#ifdef BL_USE_SENSEI_INSITU
-#   include <AMReX_AmrMeshInSituBridge.H>
-#endif
 
-#include <memory>
 #include <algorithm>
 #include <array>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/Source/Laser/LaserProfiles.H b/Source/Laser/LaserProfiles.H
index 2bb566a01b4..22b2187cd3b 100644
--- a/Source/Laser/LaserProfiles.H
+++ b/Source/Laser/LaserProfiles.H
@@ -9,16 +9,16 @@
 
 #include "Parser/WarpXParserWrapper.H"
 
-#include <AMReX_REAL.H>
+#include <AMReX_Gpu.H>
 #include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
-#include <AMReX_Gpu.H>
 
-#include <map>
-#include <string>
-#include <memory>
 #include <functional>
 #include <limits>
+#include <map>
+#include <memory>
+#include <string>
 #include <utility>
 
 
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
index d8ed19173e9..e54a18f813b 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
@@ -5,6 +5,7 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "Laser/LaserProfiles.H"
+
 #include "Parser/WarpXParser.H"
 #include "Parser/WarpXParserWrapper.H"
 #include "Utils/WarpX_Complex.H"
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp
index 91b8801d2ec..127470314b5 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp
@@ -5,11 +5,10 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "Laser/LaserProfiles.H"
+
 #include "Utils/WarpXUtil.H"
 #include "Utils/WarpX_Complex.H"
 
-#include <AMReX_Print.H>
-#include <AMReX_ParallelDescriptor.H>
 #include <AMReX.H>
 #include <AMReX_Algorithm.H>
 #include <AMReX_Config.H>
@@ -19,16 +18,18 @@
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_PODVector.H>
+#include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
+#include <AMReX_Print.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
 
-#include <limits>
-#include <fstream>
-#include <cstdint>
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
+#include <fstream>
 #include <iterator>
+#include <limits>
 #include <string>
 #include <tuple>
 #include <utility>
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp
index 371b0324795..c797901594e 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp
@@ -6,6 +6,7 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "Laser/LaserProfiles.H"
+
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
 #include "Utils/WarpX_Complex.H"
@@ -20,10 +21,10 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
 
+#include <cmath>
+#include <cstdlib>
 #include <numeric>
 #include <vector>
-#include <cstdlib>
-#include <cmath>
 
 using namespace amrex;
 
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp
index a174606a504..1440222c5cc 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileHarris.cpp
@@ -5,6 +5,7 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "Laser/LaserProfiles.H"
+
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
 #include "Utils/WarpX_Complex.H"
diff --git a/Source/Parallelization/GuardCellManager.H b/Source/Parallelization/GuardCellManager.H
index cd2db4fb125..d07c5c99a1c 100644
--- a/Source/Parallelization/GuardCellManager.H
+++ b/Source/Parallelization/GuardCellManager.H
@@ -7,10 +7,10 @@
 #ifndef GUARDCELLMANAGER_H_
 #define GUARDCELLMANAGER_H_
 
-#include <AMReX_IntVect.H>
-#include <AMReX_RealVect.H>
 #include <AMReX_Array.H>
+#include <AMReX_IntVect.H>
 #include <AMReX_REAL.H>
+#include <AMReX_RealVect.H>
 
 /**
  * \brief This class computes and stores the number of guard cells needed for
diff --git a/Source/Parallelization/GuardCellManager.cpp b/Source/Parallelization/GuardCellManager.cpp
index b5ed4ac846e..8fe9622a471 100644
--- a/Source/Parallelization/GuardCellManager.cpp
+++ b/Source/Parallelization/GuardCellManager.cpp
@@ -4,22 +4,23 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "GuardCellManager.H"
-#include "Filter/NCIGodfreyFilter.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/WarpXConst.H"
-#ifdef WARPX_DIM_RZ
-#    include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
-#else
+#ifndef WARPX_DIM_RZ
 #    include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
 #    include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
 #    include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H"
+#else
+#    include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
-#include <AMReX_ParmParse.H>
+#include "Filter/NCIGodfreyFilter.H"
+#include "GuardCellManager.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXConst.H"
+
 #include <AMReX_Config.H>
 #include <AMReX_INT.H>
-#include <AMReX_SPACE.H>
 #include <AMReX_Math.H>
+#include <AMReX_ParmParse.H>
+#include <AMReX_SPACE.H>
 
 #include <algorithm>
 
diff --git a/Source/Parallelization/KernelTimer.H b/Source/Parallelization/KernelTimer.H
index 2972b59ef8c..9166ecb5fe0 100644
--- a/Source/Parallelization/KernelTimer.H
+++ b/Source/Parallelization/KernelTimer.H
@@ -11,7 +11,7 @@
 
 // #ifdef WARPX_USE_GPUCLOCK
 
-#include <limits.h>
+#include <climits>
 
 /**
  * \brief Defines a timer object to be used on GPU; measures summed thread cycles.
diff --git a/Source/Parallelization/WarpXComm.cpp b/Source/Parallelization/WarpXComm.cpp
index 468d5d8a9d5..f91de969fa2 100644
--- a/Source/Parallelization/WarpXComm.cpp
+++ b/Source/Parallelization/WarpXComm.cpp
@@ -8,14 +8,14 @@
  */
 #include "WarpX.H"
 
-#include "WarpXComm_K.H"
-#include "WarpXSumGuardCells.H"
-#include "Utils/CoarsenMR.H"
-#include "Utils/WarpXProfilerWrapper.H"
 #include "BoundaryConditions/PML.H"
 #include "Filter/BilinearFilter.H"
+#include "Utils/CoarsenMR.H"
 #include "Utils/IntervalsParser.H"
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXProfilerWrapper.H"
+#include "WarpXComm_K.H"
+#include "WarpXSumGuardCells.H"
 
 #include <AMReX.H>
 #include <AMReX_Array.H>
@@ -38,8 +38,8 @@
 #include <AMReX_Vector.H>
 
 #include <algorithm>
-#include <memory>
 #include <array>
+#include <memory>
 #include <vector>
 
 using namespace amrex;
diff --git a/Source/Parallelization/WarpXComm_K.H b/Source/Parallelization/WarpXComm_K.H
index 9c1b16b7daa..04226e97177 100644
--- a/Source/Parallelization/WarpXComm_K.H
+++ b/Source/Parallelization/WarpXComm_K.H
@@ -7,8 +7,8 @@
 #ifndef WARPX_COMM_K_H_
 #define WARPX_COMM_K_H_
 
-#include <AMReX_FArrayBox.H>
 #include <AMReX.H>
+#include <AMReX_FArrayBox.H>
 
 AMREX_GPU_DEVICE AMREX_FORCE_INLINE
 void warpx_interp (int j, int k, int l,
diff --git a/Source/Parallelization/WarpXRegrid.cpp b/Source/Parallelization/WarpXRegrid.cpp
index c0c76e336bc..cd9234a88b3 100644
--- a/Source/Parallelization/WarpXRegrid.cpp
+++ b/Source/Parallelization/WarpXRegrid.cpp
@@ -8,15 +8,14 @@
  */
 #include "WarpX.H"
 
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/WarpXProfilerWrapper.H"
-#include "Particles/MultiParticleContainer.H"
 #include "Diagnostics/MultiDiagnostics.H"
+#include "Particles/MultiParticleContainer.H"
 #include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXProfilerWrapper.H"
 
-#include <AMReX_BLProfiler.H>
-#include <AMReX_IntVect.H>
 #include <AMReX.H>
+#include <AMReX_BLProfiler.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
 #include <AMReX_BoxArray.H>
@@ -25,6 +24,7 @@
 #include <AMReX_FabFactory.H>
 #include <AMReX_IArrayBox.H>
 #include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
 #include <AMReX_LayoutData.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_MakeType.H>
@@ -38,11 +38,11 @@
 
 #include <algorithm>
 #include <array>
-#include <utility>
-#include <vector>
 #include <cmath>
-#include <memory>
 #include <cstddef>
+#include <memory>
+#include <utility>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Parser/GpuParser.H b/Source/Parser/GpuParser.H
index f7a95a7b1ff..3d7a631d73a 100644
--- a/Source/Parser/GpuParser.H
+++ b/Source/Parser/GpuParser.H
@@ -9,10 +9,10 @@
 
 #include "Parser/WarpXParser.H"
 
-#include <AMReX_Gpu.H>
+#include <AMReX.H>
 #include <AMReX_Array.H>
+#include <AMReX_Gpu.H>
 #include <AMReX_TypeTraits.H>
-#include <AMReX.H>
 
 // When compiled for CPU, wrap WarpXParser and enable threading.
 // When compiled for GPU, store one copy of the parser in
diff --git a/Source/Parser/WarpXParser.H b/Source/Parser/WarpXParser.H
index 10207fe6cc8..f29abb11c9e 100644
--- a/Source/Parser/WarpXParser.H
+++ b/Source/Parser/WarpXParser.H
@@ -10,18 +10,18 @@
 #include "wp_parser_c.h"
 #include "wp_parser_y.h"
 
-#include <AMReX_REAL.H>
 #include <AMReX_Config.H>
+#include <AMReX_REAL.H>
 
 #ifdef AMREX_USE_OMP
 #   include <omp.h>
 #endif
 
 #include <array>
-#include <vector>
-#include <string>
-#include <set>
 #include <memory>
+#include <set>
+#include <string>
+#include <vector>
 
 class WarpXParser
 {
diff --git a/Source/Parser/WarpXParser.cpp b/Source/Parser/WarpXParser.cpp
index c7efe739b46..4f228aedf69 100644
--- a/Source/Parser/WarpXParser.cpp
+++ b/Source/Parser/WarpXParser.cpp
@@ -4,9 +4,9 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+#include "WarpXParser.H"
 
 #include <algorithm>
-#include "WarpXParser.H"
 
 WarpXParser::WarpXParser (std::string const& func_body)
 {
diff --git a/Source/Parser/WarpXParserWrapper.H b/Source/Parser/WarpXParserWrapper.H
index 4395858b5ec..96035861092 100644
--- a/Source/Parser/WarpXParserWrapper.H
+++ b/Source/Parser/WarpXParserWrapper.H
@@ -9,8 +9,8 @@
 
 #include "WarpXParserWrapper_fwd.H"
 
-#include "Parser/WarpXParser.H"
 #include "Parser/GpuParser.H"
+#include "Parser/WarpXParser.H"
 
 #include <AMReX_Gpu.H>
 
diff --git a/Source/Parser/wp_parser_c.h b/Source/Parser/wp_parser_c.h
index 14053691db7..92c8a5c6774 100644
--- a/Source/Parser/wp_parser_c.h
+++ b/Source/Parser/wp_parser_c.h
@@ -3,13 +3,13 @@
 
 #include "wp_parser_y.h"
 
-#include <AMReX_GpuQualifiers.H>
-#include <AMReX_GpuPrint.H>
+#include <AMReX.H>
 #include <AMReX_Extension.H>
+#include <AMReX_GpuPrint.H>
+#include <AMReX_GpuQualifiers.H>
 #include <AMReX_Math.H>
-#include <AMReX_REAL.H>
 #include <AMReX_Print.H>
-#include <AMReX.H>
+#include <AMReX_REAL.H>
 
 #include <cassert>
 #include <cmath>
diff --git a/Source/Parser/wp_parser_y.cpp b/Source/Parser/wp_parser_y.cpp
index ce0d739fc81..a3f7386c824 100644
--- a/Source/Parser/wp_parser_y.cpp
+++ b/Source/Parser/wp_parser_y.cpp
@@ -1,5 +1,6 @@
 #include "wp_parser_y.h"
 #include "wp_parser.tab.h"
+
 #include <cstdarg>
 
 static struct wp_node* wp_root = NULL;
diff --git a/Source/Parser/wp_parser_y.h b/Source/Parser/wp_parser_y.h
index 865cc807203..e91a5ba6cf0 100644
--- a/Source/Parser/wp_parser_y.h
+++ b/Source/Parser/wp_parser_y.h
@@ -1,15 +1,15 @@
 #ifndef WP_PARSER_Y_H_
 #define WP_PARSER_Y_H_
 
-#include <AMReX_GpuQualifiers.H>
 #include <AMReX_GpuPrint.H>
-#include <AMReX_REAL.H>
+#include <AMReX_GpuQualifiers.H>
 #include <AMReX_Math.H>
 #include <AMReX_Print.H>
+#include <AMReX_REAL.H>
 
 #include <cmath>
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 #include <type_traits>
diff --git a/Source/Particles/Collision/CollisionBase.H b/Source/Particles/Collision/CollisionBase.H
index 528185aa2eb..3d79857e055 100644
--- a/Source/Particles/Collision/CollisionBase.H
+++ b/Source/Particles/Collision/CollisionBase.H
@@ -9,8 +9,8 @@
 
 #include "Particles/MultiParticleContainer_fwd.H"
 
-#include <AMReX_Vector.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
 
 #include <string>
 
diff --git a/Source/Particles/Collision/CollisionHandler.H b/Source/Particles/Collision/CollisionHandler.H
index efcb7fe9513..78141fea08d 100644
--- a/Source/Particles/Collision/CollisionHandler.H
+++ b/Source/Particles/Collision/CollisionHandler.H
@@ -11,8 +11,8 @@
 
 #include "Particles/MultiParticleContainer_fwd.H"
 
-#include <AMReX_Vector.H>
 #include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
 
 #include <memory>
 #include <string>
diff --git a/Source/Particles/Collision/ElasticCollisionPerez.H b/Source/Particles/Collision/ElasticCollisionPerez.H
index 35f784f57e3..9c54c94c064 100644
--- a/Source/Particles/Collision/ElasticCollisionPerez.H
+++ b/Source/Particles/Collision/ElasticCollisionPerez.H
@@ -7,8 +7,8 @@
 #ifndef WARPX_PARTICLES_COLLISION_ELASTIC_COLLISION_PEREZ_H_
 #define WARPX_PARTICLES_COLLISION_ELASTIC_COLLISION_PEREZ_H_
 
-#include "UpdateMomentumPerezElastic.H"
 #include "ComputeTemperature.H"
+#include "UpdateMomentumPerezElastic.H"
 #include "Utils/WarpXConst.H"
 
 #include <AMReX_Random.H>
diff --git a/Source/Particles/Collision/PairWiseCoulombCollision.H b/Source/Particles/Collision/PairWiseCoulombCollision.H
index 94548b89eb4..abd7e4ccc09 100644
--- a/Source/Particles/Collision/PairWiseCoulombCollision.H
+++ b/Source/Particles/Collision/PairWiseCoulombCollision.H
@@ -12,8 +12,8 @@
 #include "Particles/MultiParticleContainer_fwd.H"
 #include "Particles/WarpXParticleContainer_fwd.H"
 
-#include <AMReX_REAL.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_REAL.H>
 
 #include <string>
 
diff --git a/Source/Particles/Collision/PairWiseCoulombCollision.cpp b/Source/Particles/Collision/PairWiseCoulombCollision.cpp
index f5f15a2785c..b6ca69f5b1c 100644
--- a/Source/Particles/Collision/PairWiseCoulombCollision.cpp
+++ b/Source/Particles/Collision/PairWiseCoulombCollision.cpp
@@ -5,14 +5,15 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "PairWiseCoulombCollision.H"
-#include "ShuffleFisherYates.H"
+
 #include "ElasticCollisionPerez.H"
-#include "Utils/ParticleUtils.H"
-#include "Utils/WarpXUtil.H"
 #include "Particles/Collision/CollisionBase.H"
 #include "Particles/MultiParticleContainer.H"
 #include "Particles/WarpXParticleContainer.H"
+#include "ShuffleFisherYates.H"
+#include "Utils/ParticleUtils.H"
 #include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXUtil.H"
 #include "WarpX.H"
 
 #include <AMReX_Algorithm.H>
diff --git a/Source/Particles/Collision/UpdateMomentumPerezElastic.H b/Source/Particles/Collision/UpdateMomentumPerezElastic.H
index 2a6d2c61427..b5acd85a706 100644
--- a/Source/Particles/Collision/UpdateMomentumPerezElastic.H
+++ b/Source/Particles/Collision/UpdateMomentumPerezElastic.H
@@ -8,13 +8,13 @@
 #define WARPX_PARTICLES_COLLISION_UPDATE_MOMENTUM_PEREZ_ELASTIC_H_
 
 #include "Utils/WarpXConst.H"
-#include <AMReX_Random.H>
+
 #include <AMReX_Math.H>
+#include <AMReX_Random.H>
 
 #include <cmath>  // isnan() isinf()
 #include <limits> // numeric_limits<float>::min()
 
-
 /* \brief Update particle velocities according to
  *        F. Perez et al., Phys.Plasmas.19.083104 (2012),
  *        which is based on Nanbu's method, PhysRevE.55.4642 (1997).
diff --git a/Source/Particles/Deposition/CurrentDeposition.H b/Source/Particles/Deposition/CurrentDeposition.H
index ff288b500df..84afa49857a 100644
--- a/Source/Particles/Deposition/CurrentDeposition.H
+++ b/Source/Particles/Deposition/CurrentDeposition.H
@@ -8,15 +8,15 @@
 #ifndef CURRENTDEPOSITION_H_
 #define CURRENTDEPOSITION_H_
 
+#include "Parallelization/KernelTimer.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/ShapeFactors.H"
-#include "Parallelization/KernelTimer.H"
 #include "Utils/WarpX_Complex.H"
 
 #include <AMReX.H>
+#include <AMReX_Arena.H>
 #include <AMReX_Array4.H>
 #include <AMReX_REAL.H>
-#include <AMReX_Arena.H>
 
 using namespace amrex::literals;
 
diff --git a/Source/Particles/ElementaryProcess/Ionization.H b/Source/Particles/ElementaryProcess/Ionization.H
index 6f760f8241d..897fe4cad17 100644
--- a/Source/Particles/ElementaryProcess/Ionization.H
+++ b/Source/Particles/ElementaryProcess/Ionization.H
@@ -8,21 +8,21 @@
 #ifndef IONIZATION_H_
 #define IONIZATION_H_
 
-#include "Utils/WarpXConst.H"
-#include "Particles/WarpXParticleContainer.H"
-#include "Particles/Gather/GetExternalFields.H"
 #include "Particles/Gather/FieldGather.H"
+#include "Particles/Gather/GetExternalFields.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXConst.H"
 
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
+#include <AMReX_FArrayBox.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
-#include <AMReX_REAL.H>
-#include <AMReX_FArrayBox.H>
 #include <AMReX_IntVect.H>
+#include <AMReX_REAL.H>
 #include <AMReX_RandomEngine.H>
 
 #include <cmath>
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H
index e59aea89281..3709091bc54 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H
+++ b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H
@@ -9,8 +9,8 @@
 
 #include "BreitWheelerEngineWrapper_fwd.H"
 
-#include "QedWrapperCommons.H"
 #include "QedChiFunctions.H"
+#include "QedWrapperCommons.H"
 #include "Utils/WarpXConst.H"
 
 #include <AMReX_Extension.H>
@@ -19,18 +19,18 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Random.H>
 
-#include <picsar_qed/physics/gamma_functions.hpp>
-#include <picsar_qed/physics/breit_wheeler/breit_wheeler_engine_tables.hpp>
-#include <picsar_qed/physics/breit_wheeler/breit_wheeler_engine_core.hpp>
 #include <picsar_qed/containers/picsar_array.hpp>
 #include <picsar_qed/math/cmath_overloads.hpp>
 #include <picsar_qed/math/math_constants.h>
 #include <picsar_qed/math/vec_functions.hpp>
+#include <picsar_qed/physics/breit_wheeler/breit_wheeler_engine_core.hpp>
+#include <picsar_qed/physics/breit_wheeler/breit_wheeler_engine_tables.hpp>
+#include <picsar_qed/physics/gamma_functions.hpp>
 #include <picsar_qed/physics/phys_constants.h>
 #include <picsar_qed/physics/unit_conversion.hpp>
 
-#include <vector>
 #include <cmath>
+#include <vector>
 
 namespace amrex { struct RandomEngine; }
 
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp
index 6da3103678c..655c0eb262b 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp
+++ b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp
@@ -6,23 +6,22 @@
  */
 #include "BreitWheelerEngineWrapper.H"
 
+#include <AMReX_BLassert.H>
+#include <AMReX_GpuDevice.H>
+
+#include <picsar_qed/physics/breit_wheeler/breit_wheeler_engine_tables.hpp>
 //Functions needed to generate a new table
 #ifdef WARPX_QED_TABLE_GEN
 #   include <picsar_qed/physics/breit_wheeler/breit_wheeler_engine_tables_generator.hpp>
 #endif
-
-#include <AMReX_BLassert.H>
-#include <AMReX_GpuDevice.H>
-
 #include <picsar_qed/utils/serialization.hpp>
-#include <picsar_qed/physics/breit_wheeler/breit_wheeler_engine_tables.hpp>
 
-#include <vector>
-#include <cstdint>
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 #include <initializer_list>
 #include <iosfwd>
+#include <vector>
 
 using namespace std;
 using namespace amrex;
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/QedWrapperCommons.H b/Source/Particles/ElementaryProcess/QEDInternals/QedWrapperCommons.H
index aa95486ae57..95d832de550 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/QedWrapperCommons.H
+++ b/Source/Particles/ElementaryProcess/QEDInternals/QedWrapperCommons.H
@@ -14,8 +14,8 @@
  */
 
 #include <AMReX_AmrCore.H>
-#include <AMReX_GpuQualifiers.H>
 #include <AMReX_Extension.H>
+#include <AMReX_GpuQualifiers.H>
 
 /**
  * PICSAR uses PXRMP_GPU to decorate methods which should be
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H
index d1e9aee074e..b47fd1e095d 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H
+++ b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H
@@ -9,27 +9,27 @@
 
 #include "BreitWheelerEngineWrapper_fwd.H"
 
-#include "QedWrapperCommons.H"
 #include "QedChiFunctions.H"
+#include "QedWrapperCommons.H"
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_Vector.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Random.H>
+#include <AMReX_Vector.H>
 
-#include <picsar_qed/physics/quantum_sync/quantum_sync_engine_tables.hpp>
-#include <picsar_qed/physics/quantum_sync/quantum_sync_engine_core.hpp>
 #include <picsar_qed/containers/picsar_array.hpp>
 #include <picsar_qed/math/cmath_overloads.hpp>
 #include <picsar_qed/math/vec_functions.hpp>
 #include <picsar_qed/physics/phys_constants.h>
+#include <picsar_qed/physics/quantum_sync/quantum_sync_engine_core.hpp>
+#include <picsar_qed/physics/quantum_sync/quantum_sync_engine_tables.hpp>
 #include <picsar_qed/physics/unit_conversion.hpp>
 
-#include <vector>
 #include <cmath>
+#include <vector>
 
 namespace amrex { struct RandomEngine; }
 
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp
index b8234bcb028..81f396456d9 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp
+++ b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp
@@ -9,19 +9,19 @@
 #include <AMReX_BLassert.H>
 #include <AMReX_GpuDevice.H>
 
+#include "picsar_qed/physics/quantum_sync/quantum_sync_engine_tables.hpp"
 //Functions needed to generate a new table
 #ifdef WARPX_QED_TABLE_GEN
 #   include <picsar_qed/physics/quantum_sync/quantum_sync_engine_tables_generator.hpp>
 #endif
-#include "picsar_qed/physics/quantum_sync/quantum_sync_engine_tables.hpp"
 #include "picsar_qed/utils/serialization.hpp"
 
-#include <vector>
-#include <cstdint>
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 #include <initializer_list>
 #include <iosfwd>
+#include <vector>
 
 using namespace std;
 using namespace amrex;
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/SchwingerProcessWrapper.H b/Source/Particles/ElementaryProcess/QEDInternals/SchwingerProcessWrapper.H
index b794c8b0880..8cef3c3e5ce 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/SchwingerProcessWrapper.H
+++ b/Source/Particles/ElementaryProcess/QEDInternals/SchwingerProcessWrapper.H
@@ -10,8 +10,10 @@
 
 #include "QedWrapperCommons.H"
 
-#include <picsar_qed/physics/schwinger/schwinger_pair_engine_core.hpp>
 #include <AMReX_Random.H>
+
+#include <picsar_qed/physics/schwinger/schwinger_pair_engine_core.hpp>
+
 #include <cmath>
 
 /**
diff --git a/Source/Particles/ElementaryProcess/QEDPairGeneration.H b/Source/Particles/ElementaryProcess/QEDPairGeneration.H
index 2bbae44ae9b..f0e229b5e7f 100644
--- a/Source/Particles/ElementaryProcess/QEDPairGeneration.H
+++ b/Source/Particles/ElementaryProcess/QEDPairGeneration.H
@@ -8,21 +8,21 @@
 #ifndef QED_PAIR_GENERATION_H_
 #define QED_PAIR_GENERATION_H_
 
-#include "Particles/WarpXParticleContainer.H"
-#include "Particles/Gather/GetExternalFields.H"
 #include "Particles/Gather/FieldGather.H"
+#include "Particles/Gather/GetExternalFields.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
+#include "Particles/WarpXParticleContainer.H"
 #include "QEDInternals/BreitWheelerEngineWrapper.H"
 
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
+#include <AMReX_FArrayBox.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
-#include <AMReX_REAL.H>
-#include <AMReX_FArrayBox.H>
 #include <AMReX_IntVect.H>
+#include <AMReX_REAL.H>
 #include <AMReX_RandomEngine.H>
 
 /** @file
diff --git a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
index 0d3b605b754..25f76859499 100644
--- a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
+++ b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
@@ -8,23 +8,23 @@
 #ifndef QED_PHOTON_EMISSION_H_
 #define QED_PHOTON_EMISSION_H_
 
-#include "Utils/WarpXConst.H"
-#include "Particles/WarpXParticleContainer.H"
-#include "Particles/Gather/GetExternalFields.H"
 #include "Particles/Gather/FieldGather.H"
+#include "Particles/Gather/GetExternalFields.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
+#include "Particles/WarpXParticleContainer.H"
 #include "QEDInternals/QuantumSyncEngineWrapper.H"
+#include "Utils/WarpXConst.H"
 
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
+#include <AMReX_FArrayBox.H>
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
-#include <AMReX_REAL.H>
-#include <AMReX_FArrayBox.H>
 #include <AMReX_IntVect.H>
+#include <AMReX_REAL.H>
 #include <AMReX_RandomEngine.H>
 
 #include <algorithm>
diff --git a/Source/Particles/Filter/FilterFunctors.H b/Source/Particles/Filter/FilterFunctors.H
index 70856bbbef2..e713bcfe3f4 100644
--- a/Source/Particles/Filter/FilterFunctors.H
+++ b/Source/Particles/Filter/FilterFunctors.H
@@ -7,10 +7,10 @@
 #ifndef FILTERFUNCTORS_H
 #define FILTERFUNCTORS_H
 
-#include "WarpX.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Utils/WarpXConst.H"
+#include "WarpX.H"
 
 #include <AMReX_Gpu.H>
 #include <AMReX_Random.H>
diff --git a/Source/Particles/Gather/FieldGather.H b/Source/Particles/Gather/FieldGather.H
index 7f3eeda297f..7f240b2e855 100644
--- a/Source/Particles/Gather/FieldGather.H
+++ b/Source/Particles/Gather/FieldGather.H
@@ -8,8 +8,8 @@
 #ifndef FIELDGATHER_H_
 #define FIELDGATHER_H_
 
-#include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/Gather/GetExternalFields.H"
+#include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/ShapeFactors.H"
 #include "Utils/WarpX_Complex.H"
 
diff --git a/Source/Particles/Gather/GetExternalFields.H b/Source/Particles/Gather/GetExternalFields.H
index f742f6668fd..73fc3e941b6 100644
--- a/Source/Particles/Gather/GetExternalFields.H
+++ b/Source/Particles/Gather/GetExternalFields.H
@@ -1,17 +1,16 @@
 #ifndef WARPX_PARTICLES_GATHER_GETEXTERNALFIELDS_H_
 #define WARPX_PARTICLES_GATHER_GETEXTERNALFIELDS_H_
 
-
-#include "Particles/Pusher/GetAndSetPosition.H"
 #include "Parser/WarpXParserWrapper.H"
+#include "Particles/Pusher/GetAndSetPosition.H"
 
 #include "Particles/WarpXParticleContainer_fwd.H"
 
-#include <AMReX_REAL.H>
 #include <AMReX.H>
 #include <AMReX_Array.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuQualifiers.H>
+#include <AMReX_REAL.H>
 
 enum ExternalFieldInitType { Constant, Parser };
 
diff --git a/Source/Particles/Gather/GetExternalFields.cpp b/Source/Particles/Gather/GetExternalFields.cpp
index 898a32f9a2e..f21c8fb5eb0 100644
--- a/Source/Particles/Gather/GetExternalFields.cpp
+++ b/Source/Particles/Gather/GetExternalFields.cpp
@@ -1,8 +1,8 @@
 #include "Particles/Gather/GetExternalFields.H"
 
-#include "WarpX.H"
-#include "Particles/WarpXParticleContainer.H"
 #include "Particles/MultiParticleContainer.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "WarpX.H"
 
 #include <AMReX_Vector.H>
 
diff --git a/Source/Particles/LaserParticleContainer.H b/Source/Particles/LaserParticleContainer.H
index deda1aa48c9..46c346660ce 100644
--- a/Source/Particles/LaserParticleContainer.H
+++ b/Source/Particles/LaserParticleContainer.H
@@ -9,19 +9,19 @@
 #ifndef WARPX_LaserParticleContainer_H_
 #define WARPX_LaserParticleContainer_H_
 
-#include "Laser/LaserProfiles.H"
 #include "Evolve/WarpXDtType.H"
+#include "Laser/LaserProfiles.H"
 #include "WarpXParticleContainer.H"
 
+#include <AMReX_AmrCore.H>
 #include <AMReX_Extension.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
 #include <AMReX_Vector.H>
-#include <AMReX_AmrCore.H>
-#include <AMReX_MultiFab.H>
 
-#include <memory>
 #include <limits>
+#include <memory>
 #include <string>
 
 /**
diff --git a/Source/Particles/LaserParticleContainer.cpp b/Source/Particles/LaserParticleContainer.cpp
index c2952ea3fa7..5219a07de10 100644
--- a/Source/Particles/LaserParticleContainer.cpp
+++ b/Source/Particles/LaserParticleContainer.cpp
@@ -8,16 +8,16 @@
  */
 #include "LaserParticleContainer.H"
 
-#include "WarpX.H"
-#include "Utils/WarpXConst.H"
-#include "Particles/Pusher/GetAndSetPosition.H"
+#include "Evolve/WarpXDtType.H"
+#include "Laser/LaserProfiles.H"
 #include "Particles/LaserParticleContainer.H"
+#include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/WarpXParticleContainer.H"
-#include "Utils/WarpXProfilerWrapper.H"
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "Laser/LaserProfiles.H"
-#include "Evolve/WarpXDtType.H"
+#include "Utils/WarpXConst.H"
+#include "Utils/WarpXProfilerWrapper.H"
 #include "Utils/WarpXUtil.H"
+#include "WarpX.H"
 
 #include <AMReX.H>
 #include <AMReX_BLassert.H>
@@ -52,16 +52,16 @@
 #   include <omp.h>
 #endif
 
-#include <limits>
-#include <cmath>
 #include <algorithm>
-#include <numeric>
-#include <ctype.h>
-#include <cstdlib>
 #include <array>
+#include <cmath>
+#include <cstdlib>
+#include <ctype.h>
 #include <functional>
+#include <limits>
 #include <map>
 #include <memory>
+#include <numeric>
 #include <string>
 #include <vector>
 
diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H
index 66903fcb710..48135dd4267 100644
--- a/Source/Particles/MultiParticleContainer.H
+++ b/Source/Particles/MultiParticleContainer.H
@@ -13,41 +13,40 @@
 
 #include "MultiParticleContainer_fwd.H"
 
-#include "Utils/WarpXUtil.H"
-#include "WarpXParticleContainer.H"
-#include "PhysicalParticleContainer.H"
+#include "Evolve/WarpXDtType.H"
 #include "Parser/WarpXParserWrapper.H"
 #include "Particles/Collision/CollisionHandler.H"
-#include "Evolve/WarpXDtType.H"
-#include "Utils/WarpXConst.H"
-
 #ifdef WARPX_QED
 #   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper_fwd.H"
 #   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper_fwd.H"
 #endif
+#include "PhysicalParticleContainer.H"
+#include "Utils/WarpXConst.H"
+#include "Utils/WarpXUtil.H"
+#include "WarpXParticleContainer.H"
 
+#include <AMReX_AmrCore.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
+#include <AMReX_DistributionMapping.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_INT.H>
-#include <AMReX_MFIter.H>
-#include <AMReX_REAL.H>
-#include <AMReX_Vector.H>
-#include <AMReX_AmrCore.H>
-#include <AMReX_BoxArray.H>
-#include <AMReX_DistributionMapping.H>
 #include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
+#include <AMReX_Vector.H>
 
-#include <memory>
-#include <string>
 #include <algorithm>
 #include <array>
 #include <iosfwd>
 #include <iterator>
 #include <limits>
+#include <memory>
+#include <string>
 #include <vector>
 
 /**
diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
index f8729b067e9..4990f7c6dd0 100644
--- a/Source/Particles/MultiParticleContainer.cpp
+++ b/Source/Particles/MultiParticleContainer.cpp
@@ -10,12 +10,19 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "MultiParticleContainer.H"
-#include "SpeciesPhysicalProperties.H"
-#include "WarpX.H"
-#include "Utils/WarpXProfilerWrapper.H"
 #include "Particles/ElementaryProcess/Ionization.H"
+#ifdef WARPX_QED
+#   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
+#   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
+#   include "Particles/ElementaryProcess/QEDSchwingerProcess.H"
+#   include "Particles/ElementaryProcess/QEDPairGeneration.H"
+#   include "Particles/ElementaryProcess/QEDPhotonEmission.H"
+#endif
 #include "Particles/LaserParticleContainer.H"
 #include "Particles/ParticleCreation/FilterCopyTransform.H"
+#ifdef WARPX_QED
+#   include "Particles/ParticleCreation/FilterCreateTransformFromFAB.H"
+#endif
 #include "Particles/ParticleCreation/SmartCopy.H"
 #include "Particles/ParticleCreation/SmartCreate.H"
 #include "Particles/ParticleCreation/SmartUtils.H"
@@ -23,17 +30,11 @@
 #include "Particles/PhysicalParticleContainer.H"
 #include "Particles/RigidInjectedParticleContainer.H"
 #include "Particles/WarpXParticleContainer.H"
+#include "SpeciesPhysicalProperties.H"
 #include "Utils/WarpXAlgorithmSelection.H"
-#ifdef WARPX_QED
-#   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
-#   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
-#   include "Particles/ElementaryProcess/QEDSchwingerProcess.H"
-#   include "Particles/ParticleCreation/FilterCreateTransformFromFAB.H"
-#   include "Particles/ElementaryProcess/QEDPairGeneration.H"
-#   include "Particles/ElementaryProcess/QEDPhotonEmission.H"
-#endif
+#include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX.H"
 
-#include <AMReX_Vector.H>
 #include <AMReX.H>
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
@@ -51,19 +52,20 @@
 #include <AMReX_ParIter.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
-#include <AMReX_Particles.H>
 #include <AMReX_ParticleTile.H>
+#include <AMReX_Particles.H>
 #include <AMReX_Print.H>
 #include <AMReX_StructOfArrays.H>
 #include <AMReX_Utility.H>
+#include <AMReX_Vector.H>
 
-#include <limits>
 #include <algorithm>
-#include <string>
-#include <vector>
 #include <cmath>
+#include <limits>
 #include <map>
+#include <string>
 #include <utility>
+#include <vector>
 
 using namespace amrex;
 
diff --git a/Source/Particles/ParticleCreation/DefaultInitialization.H b/Source/Particles/ParticleCreation/DefaultInitialization.H
index b891a0d51f2..a58e92a06de 100644
--- a/Source/Particles/ParticleCreation/DefaultInitialization.H
+++ b/Source/Particles/ParticleCreation/DefaultInitialization.H
@@ -8,12 +8,12 @@
 #ifndef DEFAULTINITIALIZATION_H_
 #define DEFAULTINITIALIZATION_H_
 
-#include <AMReX_REAL.H>
 #include <AMReX_GpuContainers.H>
+#include <AMReX_REAL.H>
 
+#include <cmath>
 #include <map>
 #include <string>
-#include <cmath>
 
 /**
  * \brief This set of initialization policies describes what happens
diff --git a/Source/Particles/ParticleCreation/SmartCreate.H b/Source/Particles/ParticleCreation/SmartCreate.H
index 4f395f9b04f..926168985cd 100644
--- a/Source/Particles/ParticleCreation/SmartCreate.H
+++ b/Source/Particles/ParticleCreation/SmartCreate.H
@@ -10,10 +10,10 @@
 
 #include "DefaultInitialization.H"
 
+#include <AMReX.H>
 #include <AMReX_AmrCore.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_ParallelDescriptor.H>
-#include <AMReX.H>
 
 /**
  * \brief This is a functor for performing a "smart create" that works
diff --git a/Source/Particles/PhotonParticleContainer.H b/Source/Particles/PhotonParticleContainer.H
index fce97b2cbc6..15014551bb7 100644
--- a/Source/Particles/PhotonParticleContainer.H
+++ b/Source/Particles/PhotonParticleContainer.H
@@ -8,18 +8,18 @@
 #ifndef WARPX_PhotonParticleContainer_H_
 #define WARPX_PhotonParticleContainer_H_
 
-#include "PhysicalParticleContainer.H"
 #include "Evolve/WarpXDtType.H"
 #include "Particles/Gather/ScaleFields.H"
+#include "PhysicalParticleContainer.H"
 
 #include "Particles/WarpXParticleContainer_fwd.H"
 
-#include <AMReX_Particles.H>
-#include <AMReX_REAL.H>
 #include <AMReX_AmrCore.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_Particles.H>
+#include <AMReX_REAL.H>
 
 #include <string>
 
diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp
index 8a7ef1fdf7e..ec8d9113d04 100644
--- a/Source/Particles/PhotonParticleContainer.cpp
+++ b/Source/Particles/PhotonParticleContainer.cpp
@@ -7,18 +7,17 @@
  */
 #include "PhotonParticleContainer.H"
 
-#include "WarpX.H"
-#include "Particles/PhysicalParticleContainer.H"
-#include "Particles/WarpXParticleContainer.H"
 #ifdef WARPX_QED
 #   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
 #endif
-// Import low-level single-particle kernels
-#include "Particles/Pusher/UpdatePositionPhoton.H"
-#include "Particles/Pusher/GetAndSetPosition.H"
-#include "Particles/Pusher/CopyParticleAttribs.H"
 #include "Particles/Gather/FieldGather.H"
 #include "Particles/Gather/GetExternalFields.H"
+#include "Particles/PhysicalParticleContainer.H"
+#include "Particles/Pusher/CopyParticleAttribs.H"
+#include "Particles/Pusher/GetAndSetPosition.H"
+#include "Particles/Pusher/UpdatePositionPhoton.H"
+#include "Particles/WarpXParticleContainer.H"
+#include "WarpX.H"
 
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
diff --git a/Source/Particles/PhysicalParticleContainer.H b/Source/Particles/PhysicalParticleContainer.H
index 13d91d59b58..e2c96613777 100644
--- a/Source/Particles/PhysicalParticleContainer.H
+++ b/Source/Particles/PhysicalParticleContainer.H
@@ -10,27 +10,27 @@
 #ifndef WARPX_PhysicalParticleContainer_H_
 #define WARPX_PhysicalParticleContainer_H_
 
+#include "Evolve/WarpXDtType.H"
 #include "Initialization/PlasmaInjector.H"
-#include "WarpXParticleContainer.H"
 #include "Particles/ElementaryProcess/Ionization.H"
-#include "Particles/Gather/ScaleFields.H"
-#include "Evolve/WarpXDtType.H"
-#include "Particles/Resampling/Resampling.H"
 #ifdef WARPX_QED
 #    include "Particles/ElementaryProcess/QEDPairGeneration.H"
 #    include "Particles/ElementaryProcess/QEDPhotonEmission.H"
 #    include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper_fwd.H"
 #    include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper_fwd.H"
 #endif
+#include "Particles/Gather/ScaleFields.H"
+#include "Particles/Resampling/Resampling.H"
+#include "WarpXParticleContainer.H"
 
-#include <AMReX_GpuContainers.H>
-#include <AMReX_Particles.H>
-#include <AMReX_REAL.H>
-#include <AMReX_RealBox.H>
 #include <AMReX_AmrCore.H>
 #include <AMReX_FArrayBox.H>
+#include <AMReX_GpuContainers.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_Particles.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
 #include <AMReX_iMultiFab.H>
 
 #include <memory>
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index 2ba9f27dd9c..1b997ae9816 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -10,36 +10,34 @@
  */
 #include "PhysicalParticleContainer.H"
 
+#include "Filter/NCIGodfreyFilter.H"
+#include "Initialization/InjectorDensity.H"
+#include "Initialization/InjectorMomentum.H"
+#include "Initialization/InjectorPosition.H"
 #include "MultiParticleContainer.H"
-#include "WarpX.H"
-#include "Utils/WarpXConst.H"
-#include "Utils/WarpXUtil.H"
-#include "Python/WarpXWrappers.h"
-#include "Utils/IonizationEnergiesTable.H"
+#ifdef WARPX_QED
+#   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
+#   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
+#endif
 #include "Particles/Gather/FieldGather.H"
-#include "Particles/Pusher/GetAndSetPosition.H"
+#include "Particles/Gather/GetExternalFields.H"
 #include "Particles/Pusher/CopyParticleAttribs.H"
+#include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/Pusher/PushSelector.H"
-#include "Particles/Gather/GetExternalFields.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Initialization/InjectorPosition.H"
-#include "Filter/NCIGodfreyFilter.H"
-#include "Initialization/InjectorDensity.H"
-#include "Initialization/InjectorMomentum.H"
 #include "Particles/Pusher/UpdateMomentumBoris.H"
 #include "Particles/Pusher/UpdateMomentumBorisWithRadiationReaction.H"
 #include "Particles/Pusher/UpdateMomentumHigueraCary.H"
 #include "Particles/Pusher/UpdateMomentumVay.H"
 #include "Particles/SpeciesPhysicalProperties.H"
 #include "Particles/WarpXParticleContainer.H"
+#include "Python/WarpXWrappers.h"
+#include "Utils/IonizationEnergiesTable.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXConst.H"
 #include "Utils/WarpXProfilerWrapper.H"
-#ifdef WARPX_QED
-#   include "Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.H"
-#   include "Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.H"
-#endif
+#include "Utils/WarpXUtil.H"
+#include "WarpX.H"
 
-#include <AMReX_Geometry.H>
-#include <AMReX_Print.H>
 #include <AMReX.H>
 #include <AMReX_Algorithm.H>
 #include <AMReX_Array.H>
@@ -52,6 +50,7 @@
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
 #include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
 #include <AMReX_GpuAtomic.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
@@ -70,6 +69,7 @@
 #include <AMReX_ParmParse.H>
 #include <AMReX_ParticleContainerBase.H>
 #include <AMReX_ParticleTile.H>
+#include <AMReX_Print.H>
 #include <AMReX_SPACE.H>
 #include <AMReX_Scan.H>
 #include <AMReX_StructOfArrays.H>
@@ -77,22 +77,22 @@
 #include <AMReX_Utility.H>
 #include <AMReX_Vector.H>
 
-#ifdef WARPX_USE_OPENPMD
-#   include <openPMD/openPMD.hpp>
-#endif
-
 #ifdef AMREX_USE_OMP
 #   include <omp.h>
 #endif
 
-#include <cmath>
-#include <limits>
-#include <string>
-#include <cstdlib>
+#ifdef WARPX_USE_OPENPMD
+#   include <openPMD/openPMD.hpp>
+#endif
+
 #include <algorithm>
 #include <array>
+#include <cmath>
+#include <cstdlib>
+#include <limits>
 #include <map>
 #include <random>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/Source/Particles/Pusher/PushSelector.H b/Source/Particles/Pusher/PushSelector.H
index c7f227af8ab..df27630b4cd 100644
--- a/Source/Particles/Pusher/PushSelector.H
+++ b/Source/Particles/Pusher/PushSelector.H
@@ -7,14 +7,14 @@
 #ifndef WARPX_PARTICLES_PUSHER_PUSHSELECTOR_H_
 #define WARPX_PARTICLES_PUSHER_PUSHSELECTOR_H_
 
-#include "Utils/WarpXAlgorithmSelection.H"
 // Import low-level single-particle kernels
-#include "Particles/Pusher/UpdatePosition.H"
 #include "Particles/Pusher/UpdateMomentumBoris.H"
-#include "Particles/Pusher/UpdateMomentumVay.H"
 #include "Particles/Pusher/UpdateMomentumBorisWithRadiationReaction.H"
 #include "Particles/Pusher/UpdateMomentumHigueraCary.H"
+#include "Particles/Pusher/UpdateMomentumVay.H"
+#include "Particles/Pusher/UpdatePosition.H"
 #include "Particles/WarpXParticleContainer.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 
 #include <AMReX_REAL.H>
 
diff --git a/Source/Particles/Pusher/UpdateMomentumBorisWithRadiationReaction.H b/Source/Particles/Pusher/UpdateMomentumBorisWithRadiationReaction.H
index 421b803aaf0..8dfa85ed62f 100644
--- a/Source/Particles/Pusher/UpdateMomentumBorisWithRadiationReaction.H
+++ b/Source/Particles/Pusher/UpdateMomentumBorisWithRadiationReaction.H
@@ -11,7 +11,6 @@
 
 #include <AMReX_REAL.H>
 
-
 /**
  * Push the particle's positions over one timestep,
  * given the value of its momenta `ux`, `uy`, `uz`.
diff --git a/Source/Particles/Pusher/UpdateMomentumVay.H b/Source/Particles/Pusher/UpdateMomentumVay.H
index e5e31f4f2a2..610d644d201 100644
--- a/Source/Particles/Pusher/UpdateMomentumVay.H
+++ b/Source/Particles/Pusher/UpdateMomentumVay.H
@@ -10,8 +10,8 @@
 
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_REAL.H>
 #include <AMReX_FArrayBox.H>
+#include <AMReX_REAL.H>
 
 
 /** \brief Push the particle's positions over one timestep,
diff --git a/Source/Particles/Pusher/UpdatePosition.H b/Source/Particles/Pusher/UpdatePosition.H
index d6189256cec..8ebb0b49a4a 100644
--- a/Source/Particles/Pusher/UpdatePosition.H
+++ b/Source/Particles/Pusher/UpdatePosition.H
@@ -10,9 +10,9 @@
 
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_REAL.H>
-#include <AMReX_FArrayBox.H>
 #include <AMReX.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_REAL.H>
 
 
 /** \brief Push the particle's positions over one timestep,
diff --git a/Source/Particles/Pusher/UpdatePositionPhoton.H b/Source/Particles/Pusher/UpdatePositionPhoton.H
index 4787c67c03a..4c6967b7eeb 100644
--- a/Source/Particles/Pusher/UpdatePositionPhoton.H
+++ b/Source/Particles/Pusher/UpdatePositionPhoton.H
@@ -10,9 +10,9 @@
 
 #include "Utils/WarpXConst.H"
 
+#include <AMReX.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_REAL.H>
-#include <AMReX.H>
 
 /**
  * \brief Push the position of a photon particle over one timestep,
diff --git a/Source/Particles/Resampling/LevelingThinning.H b/Source/Particles/Resampling/LevelingThinning.H
index 535585e8cc8..7b491fc9d59 100644
--- a/Source/Particles/Resampling/LevelingThinning.H
+++ b/Source/Particles/Resampling/LevelingThinning.H
@@ -12,6 +12,7 @@
 #include "Particles/WarpXParticleContainer_fwd.H"
 
 #include <AMReX_REAL.H>
+
 #include <string>
 
 /**
diff --git a/Source/Particles/Resampling/LevelingThinning.cpp b/Source/Particles/Resampling/LevelingThinning.cpp
index 7575766c3e5..d6ff6a182fc 100644
--- a/Source/Particles/Resampling/LevelingThinning.cpp
+++ b/Source/Particles/Resampling/LevelingThinning.cpp
@@ -6,9 +6,9 @@
  */
 #include "LevelingThinning.H"
 
+#include "Particles/WarpXParticleContainer.H"
 #include "Utils/ParticleUtils.H"
 #include "Utils/WarpXUtil.H"
-#include "Particles/WarpXParticleContainer.H"
 
 #include <AMReX.H>
 #include <AMReX_BLassert.H>
@@ -20,9 +20,9 @@
 #include <AMReX_ParmParse.H>
 #include <AMReX_Particle.H>
 #include <AMReX_ParticleTile.H>
+#include <AMReX_Particles.H>
 #include <AMReX_Random.H>
 #include <AMReX_StructOfArrays.H>
-#include <AMReX_Particles.H>
 
 LevelingThinning::LevelingThinning (const std::string species_name)
 {
diff --git a/Source/Particles/Resampling/Resampling.H b/Source/Particles/Resampling/Resampling.H
index 69823836acd..3a065d2397a 100644
--- a/Source/Particles/Resampling/Resampling.H
+++ b/Source/Particles/Resampling/Resampling.H
@@ -8,6 +8,7 @@
 #define WARPX_RESAMPLING_H_
 
 #include "ResamplingTrigger.H"
+
 #include "Particles/WarpXParticleContainer_fwd.H"
 
 #include <AMReX_REAL.H>
diff --git a/Source/Particles/Resampling/ResamplingTrigger.cpp b/Source/Particles/Resampling/ResamplingTrigger.cpp
index 44c1ef75be0..220b65f84ce 100644
--- a/Source/Particles/Resampling/ResamplingTrigger.cpp
+++ b/Source/Particles/Resampling/ResamplingTrigger.cpp
@@ -6,8 +6,8 @@
  */
 #include "ResamplingTrigger.H"
 
-#include "WarpX.H"
 #include "Utils/WarpXUtil.H"
+#include "WarpX.H"
 
 #include <AMReX_BoxArray.H>
 #include <AMReX_ParmParse.H>
diff --git a/Source/Particles/RigidInjectedParticleContainer.H b/Source/Particles/RigidInjectedParticleContainer.H
index cdd3927e0a8..94dd252cc8a 100644
--- a/Source/Particles/RigidInjectedParticleContainer.H
+++ b/Source/Particles/RigidInjectedParticleContainer.H
@@ -8,18 +8,18 @@
 #ifndef WARPX_RigidInjectedParticleContainer_H_
 #define WARPX_RigidInjectedParticleContainer_H_
 
-#include "PhysicalParticleContainer.H"
 #include "Evolve/WarpXDtType.H"
 #include "Particles/Gather/ScaleFields.H"
+#include "PhysicalParticleContainer.H"
 
 #include "WarpXParticleContainer_fwd.H"
 
-#include <AMReX_Vector.H>
-#include <AMReX_REAL.H>
 #include <AMReX_AmrCore.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_Vector.H>
 
 #include <iosfwd>
 #include <string>
diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp
index b3818f1c6a8..143caaf0f5f 100644
--- a/Source/Particles/RigidInjectedParticleContainer.cpp
+++ b/Source/Particles/RigidInjectedParticleContainer.cpp
@@ -8,23 +8,22 @@
  * License: BSD-3-Clause-LBNL
  */
 
-#include "RigidInjectedParticleContainer.H"
-#include "WarpX.H"
-#include "Utils/WarpXConst.H"
-#include "Utils/WarpXUtil.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Pusher/UpdateMomentumBoris.H"
-#include "Pusher/UpdateMomentumVay.H"
-#include "Pusher/UpdateMomentumBorisWithRadiationReaction.H"
-#include "Pusher/UpdateMomentumHigueraCary.H"
-#include "Pusher/GetAndSetPosition.H"
 #include "Gather/FieldGather.H"
 #include "Particles/Gather/GetExternalFields.H"
 #include "Particles/PhysicalParticleContainer.H"
 #include "Particles/WarpXParticleContainer.H"
+#include "Pusher/GetAndSetPosition.H"
+#include "Pusher/UpdateMomentumBoris.H"
+#include "Pusher/UpdateMomentumBorisWithRadiationReaction.H"
+#include "Pusher/UpdateMomentumHigueraCary.H"
+#include "Pusher/UpdateMomentumVay.H"
+#include "RigidInjectedParticleContainer.H"
+#include "Utils/WarpXAlgorithmSelection.H"
+#include "Utils/WarpXConst.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "Utils/WarpXUtil.H"
+#include "WarpX.H"
 
-#include <AMReX_Geometry.H>
 #include <AMReX.H>
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
@@ -34,6 +33,7 @@
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
 #include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
@@ -47,8 +47,8 @@
 #include <AMReX_StructOfArrays.H>
 
 #include <algorithm>
-#include <cmath>
 #include <array>
+#include <cmath>
 #include <map>
 
 using namespace amrex;
diff --git a/Source/Particles/Sorting/Partition.cpp b/Source/Particles/Sorting/Partition.cpp
index 6753a6b9475..c649d0b2b95 100644
--- a/Source/Particles/Sorting/Partition.cpp
+++ b/Source/Particles/Sorting/Partition.cpp
@@ -4,17 +4,17 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "SortingUtils.H"
 #include "Particles/PhysicalParticleContainer.H"
-#include "WarpX.H"
 #include "Particles/WarpXParticleContainer.H"
+#include "SortingUtils.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX.H"
 
-#include <AMReX_Particles.H>
 #include <AMReX_ArrayOfStructs.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuDevice.H>
 #include <AMReX_GpuLaunch.H>
+#include <AMReX_Particles.H>
 #include <AMReX_REAL.H>
 #include <AMReX_StructOfArrays.H>
 #include <AMReX_iMultiFab.H>
diff --git a/Source/Particles/SpeciesPhysicalProperties.H b/Source/Particles/SpeciesPhysicalProperties.H
index addefce7e49..9a10f956b81 100644
--- a/Source/Particles/SpeciesPhysicalProperties.H
+++ b/Source/Particles/SpeciesPhysicalProperties.H
@@ -10,11 +10,11 @@
 
 #include "Utils/WarpXConst.H"
 
-#include <AMReX_REAL.H>
 #include <AMReX_AmrCore.H>
+#include <AMReX_REAL.H>
 
-#include <map>
 #include <limits>
+#include <map>
 
 enum struct PhysicalSpecies{unspecified=0, electron, positron, photon, hydrogen, carbon, nitrogen, oxygen, copper};
 
diff --git a/Source/Particles/WarpXParticleContainer.H b/Source/Particles/WarpXParticleContainer.H
index 0852483c25d..25fb48d0aa0 100644
--- a/Source/Particles/WarpXParticleContainer.H
+++ b/Source/Particles/WarpXParticleContainer.H
@@ -12,32 +12,32 @@
 
 #include "WarpXParticleContainer_fwd.H"
 
-#include "SpeciesPhysicalProperties.H"
 #include "Evolve/WarpXDtType.H"
+#include "SpeciesPhysicalProperties.H"
 
-#include "MultiParticleContainer_fwd.H"
 #ifdef WARPX_QED
-#    include "ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper_fwd.H"
 #    include "ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper_fwd.H"
+#    include "ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper_fwd.H"
 #endif
+#include "MultiParticleContainer_fwd.H"
 
-#include <AMReX_Particles.H>
 #include <AMReX_AmrCore.H>
 #include <AMReX_Array.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_INT.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_ParIter.H>
+#include <AMReX_Particles.H>
 #include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
 #include <AMReX_StructOfArrays.H>
 #include <AMReX_Vector.H>
-#include <AMReX_MultiFab.H>
-#include <AMReX_RealBox.H>
 
-#include <memory>
 #include <array>
 #include <iosfwd>
 #include <map>
+#include <memory>
 #include <string>
 #include <utility>
 
diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp
index 572977a35f9..8e0cde96e33 100644
--- a/Source/Particles/WarpXParticleContainer.cpp
+++ b/Source/Particles/WarpXParticleContainer.cpp
@@ -8,19 +8,19 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpXParticleContainer.H"
-#include "WarpX.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/CoarsenMR.H"
-// Import low-level single-particle kernels
+
+#include "Deposition/ChargeDeposition.H"
+#include "Deposition/CurrentDeposition.H"
 #include "Pusher/GetAndSetPosition.H"
 #include "Pusher/UpdatePosition.H"
-#include "Deposition/CurrentDeposition.H"
-#include "Deposition/ChargeDeposition.H"
+#include "Utils/CoarsenMR.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXProfilerWrapper.H"
+#include "WarpX.H"
 
-#include <AMReX_AmrParGDB.H>
 #include <AMReX.H>
+#include <AMReX_AmrParGDB.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
 #include <AMReX_BoxArray.H>
@@ -56,8 +56,8 @@
 #   include <omp.h>
 #endif
 
-#include <cmath>
 #include <algorithm>
+#include <cmath>
 
 using namespace amrex;
 
diff --git a/Source/Python/WarpXWrappers.cpp b/Source/Python/WarpXWrappers.cpp
index e1ce18f4308..e1980097b73 100644
--- a/Source/Python/WarpXWrappers.cpp
+++ b/Source/Python/WarpXWrappers.cpp
@@ -6,14 +6,14 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "WarpXWrappers.h"
+#include "BoundaryConditions/PML.H"
 #include "Initialization/WarpXAMReXInit.H"
+#include "Particles/MultiParticleContainer.H"
 #include "Particles/WarpXParticleContainer.H"
-#include "WarpX.H"
 #include "Utils/WarpXUtil.H"
+#include "WarpX.H"
+#include "WarpXWrappers.h"
 #include "WarpX_py.H"
-#include "Particles/MultiParticleContainer.H"
-#include "BoundaryConditions/PML.H"
 
 #include <AMReX.H>
 #include <AMReX_ArrayOfStructs.H>
@@ -31,8 +31,8 @@
 #include <AMReX_Particles.H>
 #include <AMReX_StructOfArrays.H>
 
-#include <cstdlib>
 #include <array>
+#include <cstdlib>
 
 namespace
 {
diff --git a/Source/Python/WarpXWrappers.h b/Source/Python/WarpXWrappers.h
index 43ad0bacf76..36804499b2a 100644
--- a/Source/Python/WarpXWrappers.h
+++ b/Source/Python/WarpXWrappers.h
@@ -8,8 +8,8 @@
 #ifndef WARPX_WRAPPERS_H_
 #define WARPX_WRAPPERS_H_
 
-#include <AMReX_REAL.H>
 #include <AMReX_Config.H>
+#include <AMReX_REAL.H>
 
 #ifdef BL_USE_MPI
 #   include <mpi.h>
diff --git a/Source/Utils/CoarsenIO.H b/Source/Utils/CoarsenIO.H
index 6114b81350d..9aa102fc8e4 100644
--- a/Source/Utils/CoarsenIO.H
+++ b/Source/Utils/CoarsenIO.H
@@ -6,8 +6,8 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IntVect.H>
-#include <AMReX_REAL.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
 
 #include <cstdlib>
 
diff --git a/Source/Utils/CoarsenMR.H b/Source/Utils/CoarsenMR.H
index f165b46f0ca..f269c8575cd 100644
--- a/Source/Utils/CoarsenMR.H
+++ b/Source/Utils/CoarsenMR.H
@@ -5,9 +5,9 @@
 #include <AMReX_Array4.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuQualifiers.H>
-#include <AMReX_REAL.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
 
 #include <cstdlib>
 
diff --git a/Source/Utils/Interpolate.H b/Source/Utils/Interpolate.H
index 5ec98f746a1..cfd178666fe 100644
--- a/Source/Utils/Interpolate.H
+++ b/Source/Utils/Interpolate.H
@@ -1,9 +1,9 @@
 #ifndef WARPX_INTERPOLATE_H_
 #define WARPX_INTERPOLATE_H_
 
-#include <AMReX_REAL.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/Utils/IntervalsParser.H b/Source/Utils/IntervalsParser.H
index b89d8502b45..c91fe271abc 100644
--- a/Source/Utils/IntervalsParser.H
+++ b/Source/Utils/IntervalsParser.H
@@ -1,8 +1,8 @@
 #ifndef WARPX_INTERVALSPARSER_H_
 #define WARPX_INTERVALSPARSER_H_
 
-#include <string>
 #include <limits>
+#include <string>
 #include <vector>
 
 /**
diff --git a/Source/Utils/IntervalsParser.cpp b/Source/Utils/IntervalsParser.cpp
index c79c8cf7a95..7b7540d0c90 100644
--- a/Source/Utils/IntervalsParser.cpp
+++ b/Source/Utils/IntervalsParser.cpp
@@ -1,5 +1,5 @@
-#include "WarpXUtil.H"
 #include "IntervalsParser.H"
+#include "WarpXUtil.H"
 
 #include <AMReX_Utility.H>
 
diff --git a/Source/Utils/MPIInitHelpers.cpp b/Source/Utils/MPIInitHelpers.cpp
index 3611bb598f2..ffe79e22a8b 100644
--- a/Source/Utils/MPIInitHelpers.cpp
+++ b/Source/Utils/MPIInitHelpers.cpp
@@ -6,16 +6,16 @@
  */
 #include "MPIInitHelpers.H"
 
+#include <AMReX_Config.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_Print.H>
-#include <AMReX_Config.H>
 
 #if defined(AMREX_USE_MPI)
         #include <mpi.h>
 #endif
 
-#include <utility>
 #include <string>
+#include <utility>
 
 namespace utils
 {
diff --git a/Source/Utils/ParticleUtils.H b/Source/Utils/ParticleUtils.H
index 663519f302a..45680bd71a5 100644
--- a/Source/Utils/ParticleUtils.H
+++ b/Source/Utils/ParticleUtils.H
@@ -10,8 +10,8 @@
 #include "Particles/WarpXParticleContainer.H"
 
 #include <AMReX_DenseBins.H>
-#include <AMReX_Particles.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_Particles.H>
 
 namespace ParticleUtils {
 
diff --git a/Source/Utils/ParticleUtils.cpp b/Source/Utils/ParticleUtils.cpp
index c31f84ba2db..a3545110025 100644
--- a/Source/Utils/ParticleUtils.cpp
+++ b/Source/Utils/ParticleUtils.cpp
@@ -5,6 +5,7 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "ParticleUtils.H"
+
 #include "WarpX.H"
 
 #include <AMReX_Algorithm.H>
diff --git a/Source/Utils/RelativeCellPosition.H b/Source/Utils/RelativeCellPosition.H
index f31c0f48576..52dd2c2c3a9 100644
--- a/Source/Utils/RelativeCellPosition.H
+++ b/Source/Utils/RelativeCellPosition.H
@@ -11,7 +11,6 @@
 
 #include <vector>
 
-
 namespace utils
 {
     /** Get the Relative Cell Position of Values in an MultiFab
diff --git a/Source/Utils/RelativeCellPosition.cpp b/Source/Utils/RelativeCellPosition.cpp
index 01a0c68f3f6..3c38a6dcb44 100644
--- a/Source/Utils/RelativeCellPosition.cpp
+++ b/Source/Utils/RelativeCellPosition.cpp
@@ -6,8 +6,8 @@
  */
 #include "RelativeCellPosition.H"
 
-#include <AMReX_IndexType.H>
 #include <AMReX_Config.H>
+#include <AMReX_IndexType.H>
 
 std::vector< double >
 utils::getRelativeCellPosition(amrex::MultiFab const& mf)
diff --git a/Source/Utils/WarpXAlgorithmSelection.cpp b/Source/Utils/WarpXAlgorithmSelection.cpp
index 4cd247d7aae..4caaeb4b438 100644
--- a/Source/Utils/WarpXAlgorithmSelection.cpp
+++ b/Source/Utils/WarpXAlgorithmSelection.cpp
@@ -13,8 +13,8 @@
 
 #include <algorithm>
 #include <cstring>
-#include <map>
 #include <ctype.h>
+#include <map>
 #include <utility>
 
 // Define dictionary with correspondance between user-input strings,
diff --git a/Source/Utils/WarpXConst.H b/Source/Utils/WarpXConst.H
index e6778284056..29aa3887afd 100644
--- a/Source/Utils/WarpXConst.H
+++ b/Source/Utils/WarpXConst.H
@@ -9,6 +9,7 @@
 #define WARPX_CONST_H_
 
 #include <AMReX_REAL.H>
+
 #include <cmath>
 
 // Math constants
diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp
index 5d034286c79..908c5e5a372 100644
--- a/Source/Utils/WarpXMovingWindow.cpp
+++ b/Source/Utils/WarpXMovingWindow.cpp
@@ -7,39 +7,40 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
-#include "Utils/WarpXConst.H"
-#include "BoundaryConditions/PML.H"            // for PML
-#include "Parser/WarpXParserWrapper.H"         // for getParser, HostDeviceP...
-#include "Particles/MultiParticleContainer.H"  // for MultiParticleContainer
-#include "Utils/WarpXProfilerWrapper.H"        // for WARPX_PROFILE
-
-#include <AMReX_Array.H>                       // for Array, GpuArray
-#include <AMReX_Array4.H>                      // for Array4
-#include <AMReX_BLassert.H>                    // for AMREX_ALWAYS_ASSERT
-#include <AMReX_Box.H>                         // for Box, adjCellHi, adjCellLo
-#include <AMReX_BoxArray.H>                    // for BoxArray
-#include <AMReX_Config.H>                      // for AMREX_SPACEDIM, AMREX_...
-#include <AMReX_Dim3.H>                        // for Dim3
-#include <AMReX_FArrayBox.H>                   // for FArrayBox
-#include <AMReX_FabArray.H>                    // for FabArray
-#include <AMReX_Geometry.H>                    // for Geometry
-#include <AMReX_GpuControl.H>                  // for notInLaunchRegion
-#include <AMReX_GpuLaunch.H>                   // for AMREX_PARALLEL_FOR_4D
-#include <AMReX_GpuQualifiers.H>               // for AMREX_GPU_DEVICE
-#include <AMReX_INT.H>                         // for amrex
-#include <AMReX_IndexType.H>                   // for IndexType
-#include <AMReX_IntVect.H>                     // for IntVect
-#include <AMReX_MFIter.H>                      // for MFIter
-#include <AMReX_MultiFab.H>                    // for MultiFab
-#include <AMReX_REAL.H>                        // for Real
-#include <AMReX_RealBox.H>                     // for RealBox
-#include <AMReX_SPACE.H>                       // for AMREX_D_DECL
-#include <AMReX_Vector.H>                      // for Vector
 
+#include "BoundaryConditions/PML.H"
+#include "Parser/WarpXParserWrapper.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Utils/WarpXConst.H"
+#include "Utils/WarpXProfilerWrapper.H"
+
+#include <AMReX_Array.H>
+#include <AMReX_Array4.H>
+#include <AMReX_BLassert.H>
+#include <AMReX_Box.H>
+#include <AMReX_BoxArray.H>
+#include <AMReX_Config.H>
+#include <AMReX_Dim3.H>
+#include <AMReX_FArrayBox.H>
+#include <AMReX_FabArray.H>
+#include <AMReX_Geometry.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuLaunch.H>
+#include <AMReX_GpuQualifiers.H>
+#include <AMReX_INT.H>
+#include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_SPACE.H>
+#include <AMReX_Vector.H>
+
+#include <array>
 #include <cmath>
-#include <array>                               // for array
-#include <memory>                              // for allocator, unique_ptr
-#include <string>                              // for operator==, basic_string
+#include <memory>
+#include <string>
 
 using namespace amrex;
 
diff --git a/Source/Utils/WarpXTagging.cpp b/Source/Utils/WarpXTagging.cpp
index 5079669793c..fb38881a5e9 100644
--- a/Source/Utils/WarpXTagging.cpp
+++ b/Source/Utils/WarpXTagging.cpp
@@ -7,8 +7,9 @@
  */
 
 #include <WarpX.H>
-#include <AMReX_BoxIterator.H>
+
 #include <AMReX_BaseFab.H>
+#include <AMReX_BoxIterator.H>
 #include <AMReX_Config.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_Geometry.H>
diff --git a/Source/Utils/WarpXUtil.H b/Source/Utils/WarpXUtil.H
index f7f158fc1b1..efd6c01421d 100644
--- a/Source/Utils/WarpXUtil.H
+++ b/Source/Utils/WarpXUtil.H
@@ -10,17 +10,17 @@
 
 #include "Parser/WarpXParser.H"
 
-#include <AMReX_REAL.H>
-#include <AMReX_Vector.H>
+#include <AMReX_Extension.H>
+#include <AMReX_GpuQualifiers.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_ParmParse.H>
+#include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
-#include <AMReX_GpuQualifiers.H>
-#include <AMReX_Extension.H>
+#include <AMReX_Vector.H>
 
+#include <cstddef>
 #include <cstdint>
 #include <string>
-#include <cstddef>
 #include <vector>
 
 void ParseGeometryInput();
diff --git a/Source/Utils/WarpXUtil.cpp b/Source/Utils/WarpXUtil.cpp
index fb0cff2b95b..d3536fc3ba7 100644
--- a/Source/Utils/WarpXUtil.cpp
+++ b/Source/Utils/WarpXUtil.cpp
@@ -6,12 +6,12 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
+
 #include "WarpXAlgorithmSelection.H"
 #include "WarpXConst.H"
-#include "WarpXUtil.H"
 #include "WarpXProfilerWrapper.H"
+#include "WarpXUtil.H"
 
-#include <AMReX_ParmParse.H>
 #include <AMReX.H>
 #include <AMReX_Array.H>
 #include <AMReX_Array4.H>
@@ -24,14 +24,15 @@
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_ParmParse.H>
 
+#include <algorithm>
+#include <array>
 #include <cmath>
+#include <cstring>
 #include <fstream>
 #include <set>
 #include <string>
-#include <cstring>
-#include <algorithm>
-#include <array>
 
 using namespace amrex;
 
diff --git a/Source/Utils/WarpX_Complex.H b/Source/Utils/WarpX_Complex.H
index e5a7f460204..048ee29940f 100644
--- a/Source/Utils/WarpX_Complex.H
+++ b/Source/Utils/WarpX_Complex.H
@@ -12,9 +12,9 @@
 #  include "FieldSolver/SpectralSolver/AnyFFT.H"
 #endif
 
-#include <AMReX_REAL.H>
 #include <AMReX_Gpu.H>
 #include <AMReX_GpuComplex.H>
+#include <AMReX_REAL.H>
 
 #include <complex>
 
diff --git a/Source/WarpX.H b/Source/WarpX.H
index 708f75e4546..dcf6951808b 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -12,21 +12,13 @@
 #ifndef WARPX_H_
 #define WARPX_H_
 
-#include "Evolve/WarpXDtType.H"
-#include "Filter/BilinearFilter.H"
-#include "Utils/IntervalsParser.H"
-#include "Parallelization/GuardCellManager.H"
-#include "Parser/WarpXParserWrapper.H"
-
+#include "BoundaryConditions/PML_fwd.H"
 #include "Diagnostics/BackTransformedDiagnostic_fwd.H"
-#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver_fwd.H"
-#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties_fwd.H"
 #include "Diagnostics/MultiDiagnostics_fwd.H"
-#include "Particles/MultiParticleContainer_fwd.H"
 #include "Diagnostics/ReducedDiags/MultiReducedDiags_fwd.H"
-#include "Filter/NCIGodfreyFilter_fwd.H"
-#include "BoundaryConditions/PML_fwd.H"
-#include "Particles/WarpXParticleContainer_fwd.H"
+#include "Evolve/WarpXDtType.H"
+#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver_fwd.H"
+#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties_fwd.H"
 #ifdef WARPX_USE_PSATD
 #   ifdef WARPX_DIM_RZ
 #       include "FieldSolver/SpectralSolver/SpectralSolverRZ_fwd.H"
@@ -34,32 +26,38 @@
 #       include "FieldSolver/SpectralSolver/SpectralSolver_fwd.H"
 #   endif
 #endif
+#include "Filter/BilinearFilter.H"
+#include "Filter/NCIGodfreyFilter_fwd.H"
+#include "Parallelization/GuardCellManager.H"
+#include "Parser/WarpXParserWrapper.H"
+#include "Particles/MultiParticleContainer_fwd.H"
+#include "Particles/WarpXParticleContainer_fwd.H"
+#include "Utils/IntervalsParser.H"
 
-#include <AMReX_AmrCore.H>
-#include <AMReX_RealVect.H>
-#include <AMReX_iMultiFab.H>
-#include <AMReX_VisMF.H>
 #include <AMReX.H>
+#include <AMReX_AmrCore.H>
 #include <AMReX_Array.H>
 #include <AMReX_Config.H>
-#include <AMReX_GpuContainers.H>
-#include <AMReX_IntVect.H>
-#include <AMReX_REAL.H>
-#include <AMReX_RealBox.H>
-#include <AMReX_Vector.H>
 #ifdef AMREX_USE_EB
 #   include "AMReX_EBFabFactory.H"
 #endif
-
 #include <AMReX_Geometry.H>
+#include <AMReX_GpuContainers.H>
+#include <AMReX_IntVect.H>
 #include <AMReX_LayoutData.H>
-#include <AMReX_iMultiFab.H>
 #include <AMReX_LayoutData.H>
+#include <AMReX_REAL.H>
+#include <AMReX_RealBox.H>
+#include <AMReX_RealVect.H>
+#include <AMReX_Vector.H>
+#include <AMReX_VisMF.H>
+#include <AMReX_iMultiFab.H>
+#include <AMReX_iMultiFab.H>
 
-#include <iostream>
-#include <memory>
 #include <array>
+#include <iostream>
 #include <limits>
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index 1176e2c6422..1fcce07a84c 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -11,7 +11,12 @@
  */
 #include "WarpX.H"
 
-#include "FieldSolver/WarpX_FDTD.H"
+#include "BoundaryConditions/PML.H"
+#include "Diagnostics/BackTransformedDiagnostic.H"
+#include "Diagnostics/MultiDiagnostics.H"
+#include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
+#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
+#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H"
 #ifdef WARPX_USE_PSATD
 #   include "FieldSolver/SpectralSolver/SpectralSolver.H"
 #   include "FieldSolver/SpectralSolver/SpectralKSpace.H"
@@ -19,29 +24,27 @@
 #ifdef WARPX_DIM_RZ
 #   include "FieldSolver/SpectralSolver/SpectralSolverRZ.H"
 #endif
+#include "FieldSolver/WarpX_FDTD.H"
+#include "Filter/NCIGodfreyFilter.H"
+#include "Parser/WarpXParserWrapper.H"
+#include "Particles/MultiParticleContainer.H"
 #include "Python/WarpXWrappers.h"
+#include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXUtil.H"
-#include "Utils/WarpXAlgorithmSelection.H"
-#include "Particles/MultiParticleContainer.H"
-#include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H"
-#include "Diagnostics/MultiDiagnostics.H"
-#include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
-#include "Diagnostics/BackTransformedDiagnostic.H"
-#include "BoundaryConditions/PML.H"
-#include "FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H"
-#include "Filter/NCIGodfreyFilter.H"
-#include "Parser/WarpXParserWrapper.H"
 
-#include <AMReX_ParmParse.H>
-#include <AMReX_Array4.H>
 #ifdef BL_USE_SENSEI_INSITU
 #   include <AMReX_AmrMeshInSituBridge.H>
 #endif
+#include <AMReX_Array4.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_Dim3.H>
+#ifdef AMREX_USE_EB
+#   include <AMReX_EBFabFactory.H>
+#   include <AMReX_EBSupport.H>
+#endif
 #include <AMReX_FabArray.H>
 #include <AMReX_FabFactory.H>
 #include <AMReX_Geometry.H>
@@ -55,22 +58,19 @@
 #include <AMReX_MakeType.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_ParallelDescriptor.H>
+#include <AMReX_ParmParse.H>
 #include <AMReX_Print.H>
 #include <AMReX_Random.H>
 #include <AMReX_SPACE.H>
 #include <AMReX_ccse-mpi.H>
 #include <AMReX_iMultiFab.H>
-#ifdef AMREX_USE_EB
-#   include <AMReX_EBFabFactory.H>
-#   include <AMReX_EBSupport.H>
-#endif
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <random>
 #include <string>
 #include <utility>
-#include <random>
 
 using namespace amrex;
 
diff --git a/Source/main.cpp b/Source/main.cpp
index 2d98f5fd893..a2735421092 100644
--- a/Source/main.cpp
+++ b/Source/main.cpp
@@ -7,14 +7,15 @@
  * License: BSD-3-Clause-LBNL
  */
 #include "WarpX.H"
+
 #include "Initialization/WarpXAMReXInit.H"
 #include "Utils/MPIInitHelpers.H"
 #include "Utils/WarpXUtil.H"
 #include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX.H>
-#include <AMReX_ParallelDescriptor.H>
 #include <AMReX_Config.H>
+#include <AMReX_ParallelDescriptor.H>
 #include <AMReX_Print.H>
 #include <AMReX_REAL.H>
 #include <AMReX_TinyProfiler.H>

From 35d3723a4cc7c1f21b6f073497b6c3ccabd13dc7 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Mon, 14 Jun 2021 18:42:14 +0200
Subject: [PATCH 44/58] progress with iwyu

---
 Source/BoundaryConditions/PML.H                           | 4 ++--
 Source/BoundaryConditions/PML.cpp                         | 2 ++
 Source/BoundaryConditions/WarpXEvolvePML.cpp              | 3 ++-
 Source/BoundaryConditions/WarpX_PEC.H                     | 3 ++-
 Source/Diagnostics/BackTransformedDiagnostic.H            | 3 ++-
 .../ComputeDiagFunctors/BackTransformFunctor.H            | 3 ++-
 .../ComputeDiagFunctors/BackTransformFunctor.cpp          | 1 +
 .../Diagnostics/ComputeDiagFunctors/CellCenterFunctor.H   | 3 +--
 Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H      | 3 +--
 Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp    | 3 +++
 Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H      | 3 +--
 Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp    | 2 ++
 .../Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.H  | 3 +--
 .../ComputeDiagFunctors/PartPerCellFunctor.cpp            | 2 ++
 .../Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.H  | 3 +--
 .../ComputeDiagFunctors/PartPerGridFunctor.cpp            | 2 ++
 Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.H       | 4 +---
 Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp     | 2 ++
 Source/Diagnostics/Diagnostics.H                          | 4 ++--
 Source/Diagnostics/FieldIO.H                              | 5 ++---
 Source/Diagnostics/FieldIO.cpp                            | 1 -
 Source/Diagnostics/FlushFormats/FlushFormatAscent.H       | 3 ++-
 Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H   | 3 ++-
 Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H      | 3 ++-
 Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H     | 3 ++-
 Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp   | 1 +
 Source/Diagnostics/SliceDiagnostic.H                      | 7 ++-----
 Source/Diagnostics/SliceDiagnostic.cpp                    | 1 +
 Source/Diagnostics/WarpXOpenPMD.H                         | 2 ++
 Source/Evolve/WarpXEvolve.cpp                             | 1 -
 Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp | 3 ++-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp     | 3 ++-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp  | 2 ++
 Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp     | 3 ++-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp  | 3 ++-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp     | 3 ++-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp  | 3 ++-
 Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp     | 3 ++-
 .../FiniteDifferenceSolver/FiniteDifferenceSolver.H       | 4 ++--
 .../FiniteDifferenceSolver/FiniteDifferenceSolver.cpp     | 2 +-
 .../FiniteDifferenceSolver/MacroscopicEvolveE.cpp         | 3 ++-
 .../MacroscopicProperties/MacroscopicProperties.cpp       | 2 ++
 .../SpectralAlgorithms/ComovingPsatdAlgorithm.H           | 4 ++--
 .../SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H | 4 ++--
 .../SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H    | 4 ++--
 .../SpectralAlgorithms/SpectralBaseAlgorithm.H            | 4 ++--
 Source/FieldSolver/SpectralSolver/SpectralFieldData.H     | 5 ++---
 Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp   | 1 +
 Source/FieldSolver/SpectralSolver/SpectralKSpace.H        | 3 ++-
 Source/FieldSolver/SpectralSolver/SpectralSolver.H        | 5 ++---
 Source/Filter/Filter.H                                    | 6 ++----
 Source/Initialization/InjectorDensity.H                   | 1 +
 Source/Initialization/InjectorMomentum.H                  | 2 ++
 Source/Initialization/PlasmaInjector.H                    | 3 ++-
 Source/Initialization/WarpXInitData.cpp                   | 2 ++
 .../Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp | 1 +
 Source/Parallelization/GuardCellManager.cpp               | 4 +++-
 Source/Parallelization/WarpXRegrid.cpp                    | 2 --
 Source/Particles/Collision/PairWiseCoulombCollision.H     | 3 ++-
 Source/Particles/ElementaryProcess/Ionization.H           | 6 +++---
 .../QEDInternals/BreitWheelerEngineWrapper.cpp            | 1 +
 .../QEDInternals/QuantumSyncEngineWrapper.cpp             | 1 +
 Source/Particles/ElementaryProcess/QEDPairGeneration.H    | 5 ++---
 Source/Particles/ElementaryProcess/QEDPhotonEmission.H    | 5 ++---
 Source/Particles/LaserParticleContainer.H                 | 5 +++--
 Source/Particles/MultiParticleContainer.H                 | 8 +++-----
 .../ParticleCreation/FilterCreateTransformFromFAB.H       | 2 ++
 Source/Particles/PhotonParticleContainer.H                | 7 +++----
 Source/Particles/PhotonParticleContainer.cpp              | 1 -
 Source/Particles/PhysicalParticleContainer.H              | 8 +++-----
 Source/Particles/PhysicalParticleContainer.cpp            | 7 +++++++
 Source/Particles/Resampling/LevelingThinning.cpp          | 2 ++
 Source/Particles/RigidInjectedParticleContainer.H         | 7 +++----
 Source/Particles/RigidInjectedParticleContainer.cpp       | 3 +++
 Source/Particles/Sorting/Partition.cpp                    | 3 ++-
 Source/Particles/WarpXParticleContainer.H                 | 6 +++---
 Source/Particles/WarpXParticleContainer.cpp               | 3 +++
 Source/Utils/CoarsenIO.H                                  | 3 ++-
 Source/Utils/CoarsenIO.cpp                                | 1 +
 Source/Utils/CoarsenMR.H                                  | 4 ++--
 Source/Utils/CoarsenMR.cpp                                | 1 +
 Source/Utils/Interpolate.H                                | 4 ++--
 Source/Utils/ParticleUtils.H                              | 3 ++-
 Source/Utils/RelativeCellPosition.H                       | 2 +-
 Source/Utils/RelativeCellPosition.cpp                     | 1 +
 Source/Utils/WarpXAlgorithmSelection.H                    | 2 +-
 Source/Utils/WarpXAlgorithmSelection.cpp                  | 2 ++
 Source/Utils/WarpXMovingWindow.cpp                        | 2 ++
 Source/Utils/WarpXTagging.cpp                             | 2 ++
 Source/Utils/WarpXUtil.H                                  | 4 ++--
 Source/WarpX.H                                            | 8 +++-----
 Source/WarpX.cpp                                          | 2 +-
 92 files changed, 172 insertions(+), 120 deletions(-)

diff --git a/Source/BoundaryConditions/PML.H b/Source/BoundaryConditions/PML.H
index 57ff7a20741..58343f0f379 100644
--- a/Source/BoundaryConditions/PML.H
+++ b/Source/BoundaryConditions/PML.H
@@ -16,8 +16,6 @@
 #endif
 
 #include <AMReX_MultiFab.H>
-#include <AMReX_Geometry.H>
-#include <AMReX_DistributionMapping.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
 #include <AMReX_FabArray.H>
@@ -27,6 +25,8 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 #include <string>
diff --git a/Source/BoundaryConditions/PML.cpp b/Source/BoundaryConditions/PML.cpp
index 2adba1f14a2..4990c56715d 100644
--- a/Source/BoundaryConditions/PML.cpp
+++ b/Source/BoundaryConditions/PML.cpp
@@ -25,9 +25,11 @@
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
 #include <AMReX_BoxList.H>
+#include <AMReX_DistributionMapping.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_FBI.H>
 #include <AMReX_FabArrayBase.H>
+#include <AMReX_Geometry.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_GpuDevice.H>
 #include <AMReX_GpuLaunch.H>
diff --git a/Source/BoundaryConditions/WarpXEvolvePML.cpp b/Source/BoundaryConditions/WarpXEvolvePML.cpp
index 37df51aa994..6730c58bdee 100644
--- a/Source/BoundaryConditions/WarpXEvolvePML.cpp
+++ b/Source/BoundaryConditions/WarpXEvolvePML.cpp
@@ -28,7 +28,8 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
-#include <AMReX_ccse-mpi.H>
+
+#include <AMReX_BaseFwd.H>
 
 #include <array>
 #include <memory>
diff --git a/Source/BoundaryConditions/WarpX_PEC.H b/Source/BoundaryConditions/WarpX_PEC.H
index 9fdd378c5f8..43c678f121d 100644
--- a/Source/BoundaryConditions/WarpX_PEC.H
+++ b/Source/BoundaryConditions/WarpX_PEC.H
@@ -10,9 +10,10 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/Diagnostics/BackTransformedDiagnostic.H b/Source/Diagnostics/BackTransformedDiagnostic.H
index f5827977f9c..aaff8a44ab3 100644
--- a/Source/Diagnostics/BackTransformedDiagnostic.H
+++ b/Source/Diagnostics/BackTransformedDiagnostic.H
@@ -14,13 +14,14 @@
 #include "Particles/WarpXParticleContainer.H"
 
 #include <AMReX_Box.H>
-#include <AMReX_Geometry.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <map>
 #include <memory>
 #include <string>
diff --git a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
index f09763d1c94..a36c8260e45 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.H
@@ -5,10 +5,11 @@
 
 #include <AMReX_Box.H>
 #include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <string>
 
 /**
diff --git a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
index 256ff106c5d..78e070bfd99 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp
@@ -14,6 +14,7 @@
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_MultiFabUtil.H>
 
 #include <cmath>
diff --git a/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.H
index 9f963b6e2cf..f34a2ffc01d 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/CellCenterFunctor.H
@@ -3,8 +3,7 @@
 
 #include "ComputeDiagFunctor.H"
 
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
+#include <AMReX_BaseFwd.H>
 
 /**
  * \brief Functor to cell-center MF and store result in mf_out.
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H
index 31966899487..eac6f4872e4 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.H
@@ -3,8 +3,7 @@
 
 #include "ComputeDiagFunctor.H"
 
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
+#include <AMReX_BaseFwd.H>
 
 #include <array>
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
index 9de42afeae6..01592a1092f 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivBFunctor.cpp
@@ -3,6 +3,9 @@
 #include "Utils/CoarsenIO.H"
 #include "WarpX.H"
 
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
+
 DivBFunctor::DivBFunctor(const std::array<const amrex::MultiFab* const, 3> arr_mf_src, const int lev, const amrex::IntVect crse_ratio, const int ncomp)
     : ComputeDiagFunctor(ncomp, crse_ratio), m_arr_mf_src(arr_mf_src), m_lev(lev)
 {}
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H
index 45c868d1144..6470fdec33e 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.H
@@ -3,8 +3,7 @@
 
 #include "ComputeDiagFunctor.H"
 
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
+#include <AMReX_BaseFwd.H>
 
 #include <array>
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
index fb9df7c46b1..803e97c25cd 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp
@@ -8,6 +8,8 @@
 
 #include <AMReX.H>
 #include <AMReX_BoxArray.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
 
 DivEFunctor::DivEFunctor(const std::array<const amrex::MultiFab* const, 3> arr_mf_src, const int lev,
                          const amrex::IntVect crse_ratio,
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.H
index 0e5baebdf6c..294ee475fb7 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.H
@@ -3,8 +3,7 @@
 
 #include "ComputeDiagFunctor.H"
 
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
+#include <AMReX_BaseFwd.H>
 
 /**
  * \brief Functor to cell-center MF and store result in mf_out.
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
index ebedee56bad..dd663cfb31f 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerCellFunctor.cpp
@@ -6,6 +6,8 @@
 #include "WarpX.H"
 
 #include <AMReX_BLassert.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
 using namespace amrex::literals;
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.H
index e4f7cb372ab..4afb190bfdd 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.H
@@ -3,8 +3,7 @@
 
 #include "ComputeDiagFunctor.H"
 
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
+#include <AMReX_BaseFwd.H>
 
 /**
  * \brief Functor to cell-center MF and store result in mf_out.
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
index 51d0cfd0c4f..45a0ad11585 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/PartPerGridFunctor.cpp
@@ -11,7 +11,9 @@
 #include <AMReX_FabArray.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_INT.H>
+#include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
 
diff --git a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.H
index 5f1e52187f9..7b45a8224a7 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.H
+++ b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.H
@@ -3,9 +3,7 @@
 
 #include "ComputeDiagFunctor.H"
 
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
-
+#include <AMReX_BaseFwd.H>
 
 /**
  * \brief Functor to compute charge density rho into mf_out
diff --git a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
index 3cee521ea87..74972d906b6 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/RhoFunctor.cpp
@@ -11,6 +11,8 @@
 #include "WarpX.H"
 
 #include <AMReX.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
 
 #include <memory>
 
diff --git a/Source/Diagnostics/Diagnostics.H b/Source/Diagnostics/Diagnostics.H
index b3daa866210..aa5ff1f6cb2 100644
--- a/Source/Diagnostics/Diagnostics.H
+++ b/Source/Diagnostics/Diagnostics.H
@@ -6,12 +6,12 @@
 #include "ComputeDiagFunctors/ComputeDiagFunctor_fwd.H"
 #include "FlushFormats/FlushFormat_fwd.H"
 
-#include <AMReX_Geometry.H>
 #include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/Source/Diagnostics/FieldIO.H b/Source/Diagnostics/FieldIO.H
index c479cfe0fa5..756532290d3 100644
--- a/Source/Diagnostics/FieldIO.H
+++ b/Source/Diagnostics/FieldIO.H
@@ -8,11 +8,10 @@
 #ifndef WARPX_FielIO_H_
 #define WARPX_FielIO_H_
 
-#include <AMReX_DistributionMapping.H>
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <cstdint>
 #include <memory>
diff --git a/Source/Diagnostics/FieldIO.cpp b/Source/Diagnostics/FieldIO.cpp
index 1c26eaa6928..024f3d0a071 100644
--- a/Source/Diagnostics/FieldIO.cpp
+++ b/Source/Diagnostics/FieldIO.cpp
@@ -10,7 +10,6 @@
 #include "Utils/CoarsenIO.H"
 
 #include <AMReX.H>
-#include <AMReX_DistributionMapping.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_SPACE.H>
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
index 1dd155fac35..50a72d26ce7 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
@@ -9,9 +9,10 @@
 #   include <AMReX_Conduit_Blueprint.H>
 #endif
 #include <AMReX_Geometry.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #ifdef AMREX_USE_ASCENT
 #   include <ascent.hpp>
 #endif
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
index 66c82817da0..a08a54d72d7 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
@@ -6,9 +6,10 @@
 #include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_Geometry.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <string>
 
 class FlushFormatCheckpoint final : public FlushFormatPlotfile
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
index 214559bf30f..db2e7fb4a78 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
@@ -7,9 +7,10 @@
 #include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_Geometry.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <memory>
 #include <string>
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
index 92f836a287f..b2f648d5a3d 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
+++ b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
@@ -6,9 +6,10 @@
 #include "Diagnostics/ParticleDiag/ParticleDiag_fwd.H"
 
 #include <AMReX_Geometry.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <iosfwd>
 #include <string>
 
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
index 6b1d067fc96..e63ddc20075 100644
--- a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
+++ b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
@@ -17,6 +17,7 @@
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MakeType.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
diff --git a/Source/Diagnostics/SliceDiagnostic.H b/Source/Diagnostics/SliceDiagnostic.H
index daf2b9e96d3..4a230c36d77 100644
--- a/Source/Diagnostics/SliceDiagnostic.H
+++ b/Source/Diagnostics/SliceDiagnostic.H
@@ -7,13 +7,10 @@
 #ifndef WARPX_SliceDiagnostic_H_
 #define WARPX_SliceDiagnostic_H_
 
-#include <AMReX_FArrayBox.H>
-#include <AMReX_Geometry.H>
-#include <AMReX_IArrayBox.H>
-#include <AMReX_MultiFabUtil.H>
-#include <AMReX_MultiFabUtil_C.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <memory>
 
 std::unique_ptr<amrex::MultiFab> CreateSlice( const amrex::MultiFab& mf,
diff --git a/Source/Diagnostics/SliceDiagnostic.cpp b/Source/Diagnostics/SliceDiagnostic.cpp
index 2a1563531a6..5e58f416308 100644
--- a/Source/Diagnostics/SliceDiagnostic.cpp
+++ b/Source/Diagnostics/SliceDiagnostic.cpp
@@ -24,6 +24,7 @@
 #include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_MultiFab.H>
+#include <AMReX_MultiFabUtil.H>
 #include <AMReX_Print.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
diff --git a/Source/Diagnostics/WarpXOpenPMD.H b/Source/Diagnostics/WarpXOpenPMD.H
index 780e95cddd9..8ff5dbb8b1a 100644
--- a/Source/Diagnostics/WarpXOpenPMD.H
+++ b/Source/Diagnostics/WarpXOpenPMD.H
@@ -22,6 +22,8 @@
 #include <AMReX_Utility.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #ifdef WARPX_USE_OPENPMD
 #   include <openPMD/openPMD.hpp>
 #endif
diff --git a/Source/Evolve/WarpXEvolve.cpp b/Source/Evolve/WarpXEvolve.cpp
index d35c1310b32..e91d24aaa38 100644
--- a/Source/Evolve/WarpXEvolve.cpp
+++ b/Source/Evolve/WarpXEvolve.cpp
@@ -32,7 +32,6 @@
 #include <AMReX.H>
 #include <AMReX_Array.H>
 #include <AMReX_BLassert.H>
-#include <AMReX_Config.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_LayoutData.H>
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
index bd3381a90d5..0e511e27900 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
@@ -17,7 +17,6 @@
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
-#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
@@ -29,6 +28,8 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
index 92fb423ecf9..eefd5f57c7e 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
@@ -19,7 +19,6 @@
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
-#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuAtomic.H>
@@ -35,6 +34,8 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
index bf49f3d0782..299f92f2f34 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
@@ -30,6 +30,8 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 
 using namespace amrex;
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
index 9a6ce023024..83494e3c297 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
@@ -19,7 +19,6 @@
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
-#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuAtomic.H>
@@ -35,6 +34,8 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
index 7c368db144a..ea5ecb38188 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
@@ -21,7 +21,6 @@
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
-#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_FabArray.H>
@@ -34,6 +33,8 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 
 using namespace amrex;
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
index 0de8d4f8058..bdf3ae0d143 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
@@ -21,7 +21,6 @@
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
-#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
@@ -33,6 +32,8 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
index af6f54bed05..79eed1efb89 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
@@ -18,7 +18,6 @@
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
-#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
@@ -30,6 +29,8 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 
 using namespace amrex;
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
index 86ddf99f9ed..b2aa302adb3 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
@@ -18,7 +18,6 @@
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
-#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
@@ -30,6 +29,8 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
index f2e5e06c921..c4936b20483 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.H
@@ -13,11 +13,11 @@
 #include "BoundaryConditions/PML_fwd.H"
 #include "MacroscopicProperties/MacroscopicProperties_fwd.H"
 
-#include <AMReX_Box.H>
 #include <AMReX_GpuContainers.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
index 1ad5a6c3d9f..e6b23e87a8a 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
@@ -14,7 +14,7 @@
 #   include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
 #include "Utils/WarpXAlgorithmSelection.H"
-#ifndef WARPX_DIM_RZ
+#ifdef WARPX_DIM_RZ
 #   include "WarpX.H"
 #endif
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
index d7f11ef37f7..f2a0cc9c7c6 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
@@ -14,7 +14,6 @@
 
 #include <AMReX.H>
 #include <AMReX_Array4.H>
-#include <AMReX_Box.H>
 #include <AMReX_Config.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuContainers.H>
@@ -26,6 +25,8 @@
 #include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
index 42b912fbae8..579296e14cd 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
@@ -16,6 +16,8 @@
 #include <AMReX_Print.H>
 #include <AMReX_RealBox.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <memory>
 
 using namespace amrex;
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
index 0f276635fcf..ecbc1578b45 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
@@ -7,10 +7,10 @@
 
 #include <AMReX_Array.H>
 #include <AMReX_Config.H>
-#include <AMReX_DistributionMapping.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
index 2f0183cbb10..7e17eda0741 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
@@ -12,10 +12,10 @@
 #include "FieldSolver/SpectralSolver/SpectralFieldData_fwd.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace_fwd.H"
 
-#include <AMReX_DistributionMapping.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
index ae74af02ce6..7b917284b3d 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
@@ -13,10 +13,10 @@
 
 #include <AMReX_Array.H>
 #include <AMReX_Config.H>
-#include <AMReX_DistributionMapping.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
index fcef643fc27..624d7870c5e 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H
@@ -14,11 +14,11 @@
 
 #include <AMReX_BaseFab.H>
 #include <AMReX_Config.H>
-#include <AMReX_DistributionMapping.H>
 #include <AMReX_FabArray.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
index 12a9fcadfcf..a1fed5cce22 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H
@@ -15,16 +15,15 @@
 #include "Utils/WarpX_Complex.H"
 
 #include <AMReX_BaseFab.H>
-#include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
-#include <AMReX_DistributionMapping.H>
 #include <AMReX_Extension.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_IndexType.H>
-#include <AMReX_IntVect.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <vector>
 
 // Declare type for spectral fields
diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
index 71dfc82d2ad..bdb631063cf 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp
@@ -21,6 +21,7 @@
 #include <AMReX_GpuDevice.H>
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
+#include <AMReX_IntVect.H>
 #include <AMReX_LayoutData.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_PODVector.H>
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
index cb56f24d1da..acd58cdb66d 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
@@ -15,13 +15,14 @@
 #include <AMReX_Array.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
-#include <AMReX_DistributionMapping.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_LayoutData.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealVect.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 // `KVectorComponent` and `SpectralShiftFactor` hold one 1D array
 // ("DeviceVector") for each box ("LayoutData"). The arrays are
 // only allocated if the corresponding box is owned by the local MPI rank.
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.H b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
index d8088552f06..996053a8826 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolver.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
@@ -13,12 +13,11 @@
 #include "SpectralFieldData.H"
 
 #include <AMReX_Array.H>
-#include <AMReX_BoxArray.H>
-#include <AMReX_DistributionMapping.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealVect.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/Filter/Filter.H b/Source/Filter/Filter.H
index 8b8bdf09334..92724a154c5 100644
--- a/Source/Filter/Filter.H
+++ b/Source/Filter/Filter.H
@@ -4,15 +4,13 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include <AMReX_Array4.H>
-#include <AMReX_Box.H>
 #include <AMReX_Dim3.H>
-#include <AMReX_FArrayBox.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #ifndef WARPX_FILTER_H_
 #define WARPX_FILTER_H_
 
diff --git a/Source/Initialization/InjectorDensity.H b/Source/Initialization/InjectorDensity.H
index a0d2f3366e3..5b57fd23a95 100644
--- a/Source/Initialization/InjectorDensity.H
+++ b/Source/Initialization/InjectorDensity.H
@@ -17,6 +17,7 @@
 #include <AMReX.H>
 #include <AMReX_Array.H>
 #include <AMReX_GpuQualifiers.H>
+#include <AMReX_Math.H>
 #include <AMReX_REAL.H>
 
 #include <cmath>
diff --git a/Source/Initialization/InjectorMomentum.H b/Source/Initialization/InjectorMomentum.H
index 1848b6c0584..fe7d8aaea12 100644
--- a/Source/Initialization/InjectorMomentum.H
+++ b/Source/Initialization/InjectorMomentum.H
@@ -20,6 +20,8 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Random.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <cmath>
 #include <string>
 
diff --git a/Source/Initialization/PlasmaInjector.H b/Source/Initialization/PlasmaInjector.H
index 0de2c6f68b7..0e899a9eb9c 100644
--- a/Source/Initialization/PlasmaInjector.H
+++ b/Source/Initialization/PlasmaInjector.H
@@ -16,10 +16,11 @@
 #include "InjectorPosition_fwd.H"
 
 #include <AMReX_Dim3.H>
-#include <AMReX_ParmParse.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #ifdef WARPX_USE_OPENPMD
 #   include <openPMD/openPMD.hpp>
 #endif
diff --git a/Source/Initialization/WarpXInitData.cpp b/Source/Initialization/WarpXInitData.cpp
index 7e452afb7bc..3fac28e0a47 100644
--- a/Source/Initialization/WarpXInitData.cpp
+++ b/Source/Initialization/WarpXInitData.cpp
@@ -56,12 +56,14 @@
 
 #include <algorithm>
 #include <array>
+#include <cctype>
 #include <iostream>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
+
 using namespace amrex;
 
 void
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
index e54a18f813b..8dd1a6218eb 100644
--- a/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
+++ b/Source/Laser/LaserProfilesImpl/LaserProfileFieldFunction.cpp
@@ -14,6 +14,7 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
+#include <AMReX_Math.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_REAL.H>
 
diff --git a/Source/Parallelization/GuardCellManager.cpp b/Source/Parallelization/GuardCellManager.cpp
index 8fe9622a471..c4c9c7b1b83 100644
--- a/Source/Parallelization/GuardCellManager.cpp
+++ b/Source/Parallelization/GuardCellManager.cpp
@@ -4,6 +4,9 @@
  *
  * License: BSD-3-Clause-LBNL
  */
+
+#include "GuardCellManager.H"
+
 #ifndef WARPX_DIM_RZ
 #    include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H"
 #    include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H"
@@ -12,7 +15,6 @@
 #    include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H"
 #endif
 #include "Filter/NCIGodfreyFilter.H"
-#include "GuardCellManager.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXConst.H"
 
diff --git a/Source/Parallelization/WarpXRegrid.cpp b/Source/Parallelization/WarpXRegrid.cpp
index cd9234a88b3..09cb7cb28d0 100644
--- a/Source/Parallelization/WarpXRegrid.cpp
+++ b/Source/Parallelization/WarpXRegrid.cpp
@@ -15,7 +15,6 @@
 #include "Utils/WarpXProfilerWrapper.H"
 
 #include <AMReX.H>
-#include <AMReX_BLProfiler.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
 #include <AMReX_BoxArray.H>
@@ -24,7 +23,6 @@
 #include <AMReX_FabFactory.H>
 #include <AMReX_IArrayBox.H>
 #include <AMReX_IndexType.H>
-#include <AMReX_IntVect.H>
 #include <AMReX_LayoutData.H>
 #include <AMReX_MFIter.H>
 #include <AMReX_MakeType.H>
diff --git a/Source/Particles/Collision/PairWiseCoulombCollision.H b/Source/Particles/Collision/PairWiseCoulombCollision.H
index abd7e4ccc09..b65f93787e5 100644
--- a/Source/Particles/Collision/PairWiseCoulombCollision.H
+++ b/Source/Particles/Collision/PairWiseCoulombCollision.H
@@ -12,9 +12,10 @@
 #include "Particles/MultiParticleContainer_fwd.H"
 #include "Particles/WarpXParticleContainer_fwd.H"
 
-#include <AMReX_MFIter.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <string>
 
 class PairWiseCoulombCollision
diff --git a/Source/Particles/ElementaryProcess/Ionization.H b/Source/Particles/ElementaryProcess/Ionization.H
index 897fe4cad17..bb919550ab2 100644
--- a/Source/Particles/ElementaryProcess/Ionization.H
+++ b/Source/Particles/ElementaryProcess/Ionization.H
@@ -18,12 +18,12 @@
 #include <AMReX_Array4.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
-#include <AMReX_FArrayBox.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
-#include <AMReX_IntVect.H>
 #include <AMReX_REAL.H>
-#include <AMReX_RandomEngine.H>
+#include <AMReX_Random.H>
+
+#include <AMReX_BaseFwd.H>
 
 #include <cmath>
 
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp
index 655c0eb262b..22a47a714ce 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp
+++ b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp
@@ -6,6 +6,7 @@
  */
 #include "BreitWheelerEngineWrapper.H"
 
+#include <AMReX.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_GpuDevice.H>
 
diff --git a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp
index 81f396456d9..958b0221a2c 100644
--- a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp
+++ b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp
@@ -6,6 +6,7 @@
  */
 #include "QuantumSyncEngineWrapper.H"
 
+#include <AMReX.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_GpuDevice.H>
 
diff --git a/Source/Particles/ElementaryProcess/QEDPairGeneration.H b/Source/Particles/ElementaryProcess/QEDPairGeneration.H
index f0e229b5e7f..2303d0bdec4 100644
--- a/Source/Particles/ElementaryProcess/QEDPairGeneration.H
+++ b/Source/Particles/ElementaryProcess/QEDPairGeneration.H
@@ -18,12 +18,11 @@
 #include <AMReX_Array4.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
-#include <AMReX_FArrayBox.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
-#include <AMReX_IntVect.H>
 #include <AMReX_REAL.H>
-#include <AMReX_RandomEngine.H>
+
+#include <AMReX_BaseFwd.H>
 
 /** @file
  *
diff --git a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
index 25f76859499..a311f2cf4b5 100644
--- a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
+++ b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H
@@ -19,13 +19,12 @@
 #include <AMReX_Array4.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
-#include <AMReX_FArrayBox.H>
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
-#include <AMReX_IntVect.H>
 #include <AMReX_REAL.H>
-#include <AMReX_RandomEngine.H>
+
+#include <AMReX_BaseFwd.H>
 
 #include <algorithm>
 #include <limits>
diff --git a/Source/Particles/LaserParticleContainer.H b/Source/Particles/LaserParticleContainer.H
index 46c346660ce..7715902f977 100644
--- a/Source/Particles/LaserParticleContainer.H
+++ b/Source/Particles/LaserParticleContainer.H
@@ -13,13 +13,14 @@
 #include "Laser/LaserProfiles.H"
 #include "WarpXParticleContainer.H"
 
-#include <AMReX_AmrCore.H>
 #include <AMReX_Extension.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+#include <AMReX_AmrCoreFwd.H>
+
 #include <limits>
 #include <memory>
 #include <string>
diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H
index 48135dd4267..cad602e5880 100644
--- a/Source/Particles/MultiParticleContainer.H
+++ b/Source/Particles/MultiParticleContainer.H
@@ -25,21 +25,19 @@
 #include "Utils/WarpXUtil.H"
 #include "WarpXParticleContainer.H"
 
-#include <AMReX_AmrCore.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
-#include <AMReX_BoxArray.H>
 #include <AMReX_Config.H>
-#include <AMReX_DistributionMapping.H>
 #include <AMReX_GpuControl.H>
 #include <AMReX_INT.H>
-#include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+#include <AMReX_AmrCoreFwd.H>
+
 #include <algorithm>
 #include <array>
 #include <iosfwd>
diff --git a/Source/Particles/ParticleCreation/FilterCreateTransformFromFAB.H b/Source/Particles/ParticleCreation/FilterCreateTransformFromFAB.H
index 732107770e0..95455d51c57 100644
--- a/Source/Particles/ParticleCreation/FilterCreateTransformFromFAB.H
+++ b/Source/Particles/ParticleCreation/FilterCreateTransformFromFAB.H
@@ -8,6 +8,8 @@
 #ifndef FILTER_CREATE_TRANSFORM_FROM_FAB_H_
 #define FILTER_CREATE_TRANSFORM_FROM_FAB_H_
 
+#include "WarpX.H"
+
 #include <AMReX_REAL.H>
 #include <AMReX_TypeTraits.H>
 
diff --git a/Source/Particles/PhotonParticleContainer.H b/Source/Particles/PhotonParticleContainer.H
index 15014551bb7..e37deb9383e 100644
--- a/Source/Particles/PhotonParticleContainer.H
+++ b/Source/Particles/PhotonParticleContainer.H
@@ -14,13 +14,12 @@
 
 #include "Particles/WarpXParticleContainer_fwd.H"
 
-#include <AMReX_AmrCore.H>
-#include <AMReX_FArrayBox.H>
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_Particles.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+#include <AMReX_AmrCoreFwd.H>
+
 #include <string>
 
 /**
diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp
index ec8d9113d04..f7c391cde3d 100644
--- a/Source/Particles/PhotonParticleContainer.cpp
+++ b/Source/Particles/PhotonParticleContainer.cpp
@@ -23,7 +23,6 @@
 #include <AMReX_Array4.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
-#include <AMReX_Config.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
 #include <AMReX_FArrayBox.H>
diff --git a/Source/Particles/PhysicalParticleContainer.H b/Source/Particles/PhysicalParticleContainer.H
index e2c96613777..88c496eacef 100644
--- a/Source/Particles/PhysicalParticleContainer.H
+++ b/Source/Particles/PhysicalParticleContainer.H
@@ -23,15 +23,13 @@
 #include "Particles/Resampling/Resampling.H"
 #include "WarpXParticleContainer.H"
 
-#include <AMReX_AmrCore.H>
-#include <AMReX_FArrayBox.H>
 #include <AMReX_GpuContainers.H>
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_Particles.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
-#include <AMReX_iMultiFab.H>
+
+#include <AMReX_BaseFwd.H>
+#include <AMReX_AmrCoreFwd.H>
 
 #include <memory>
 #include <string>
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index 1b997ae9816..df5a5c33c04 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -28,6 +28,7 @@
 #include "Particles/Pusher/UpdateMomentumBorisWithRadiationReaction.H"
 #include "Particles/Pusher/UpdateMomentumHigueraCary.H"
 #include "Particles/Pusher/UpdateMomentumVay.H"
+#include "Particles/Pusher/UpdatePosition.H"
 #include "Particles/SpeciesPhysicalProperties.H"
 #include "Particles/WarpXParticleContainer.H"
 #include "Python/WarpXWrappers.h"
@@ -49,6 +50,7 @@
 #include <AMReX_Config.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
+#include <AMReX_FArrayBox.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_GpuAtomic.H>
@@ -62,14 +64,18 @@
 #include <AMReX_IntVect.H>
 #include <AMReX_LayoutData.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_Math.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParGDB.H>
 #include <AMReX_ParIter.H>
 #include <AMReX_ParallelDescriptor.H>
 #include <AMReX_ParmParse.H>
+#include <AMReX_Particle.H>
 #include <AMReX_ParticleContainerBase.H>
 #include <AMReX_ParticleTile.H>
 #include <AMReX_Print.H>
+#include <AMReX_Random.H>
 #include <AMReX_SPACE.H>
 #include <AMReX_Scan.H>
 #include <AMReX_StructOfArrays.H>
@@ -77,6 +83,7 @@
 #include <AMReX_Utility.H>
 #include <AMReX_Vector.H>
 
+
 #ifdef AMREX_USE_OMP
 #   include <omp.h>
 #endif
diff --git a/Source/Particles/Resampling/LevelingThinning.cpp b/Source/Particles/Resampling/LevelingThinning.cpp
index d6ff6a182fc..8d2516a0fff 100644
--- a/Source/Particles/Resampling/LevelingThinning.cpp
+++ b/Source/Particles/Resampling/LevelingThinning.cpp
@@ -24,6 +24,8 @@
 #include <AMReX_Random.H>
 #include <AMReX_StructOfArrays.H>
 
+#include <AMReX_BaseFwd.H>
+
 LevelingThinning::LevelingThinning (const std::string species_name)
 {
     using namespace amrex::literals;
diff --git a/Source/Particles/RigidInjectedParticleContainer.H b/Source/Particles/RigidInjectedParticleContainer.H
index 94dd252cc8a..142068f7fde 100644
--- a/Source/Particles/RigidInjectedParticleContainer.H
+++ b/Source/Particles/RigidInjectedParticleContainer.H
@@ -14,13 +14,12 @@
 
 #include "WarpXParticleContainer_fwd.H"
 
-#include <AMReX_AmrCore.H>
-#include <AMReX_FArrayBox.H>
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+#include <AMReX_AmrCoreFwd.H>
+
 #include <iosfwd>
 #include <string>
 
diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp
index 143caaf0f5f..df55a3800cb 100644
--- a/Source/Particles/RigidInjectedParticleContainer.cpp
+++ b/Source/Particles/RigidInjectedParticleContainer.cpp
@@ -32,6 +32,7 @@
 #include <AMReX_Config.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_Extension.H>
+#include <AMReX_FArrayBox.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_GpuContainers.H>
@@ -40,6 +41,8 @@
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IndexType.H>
+#include <AMReX_IntVect.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParIter.H>
 #include <AMReX_ParmParse.H>
diff --git a/Source/Particles/Sorting/Partition.cpp b/Source/Particles/Sorting/Partition.cpp
index c649d0b2b95..0fba225595a 100644
--- a/Source/Particles/Sorting/Partition.cpp
+++ b/Source/Particles/Sorting/Partition.cpp
@@ -17,7 +17,8 @@
 #include <AMReX_Particles.H>
 #include <AMReX_REAL.H>
 #include <AMReX_StructOfArrays.H>
-#include <AMReX_iMultiFab.H>
+
+#include <AMReX_BaseFwd.H>
 
 #include <utility>
 
diff --git a/Source/Particles/WarpXParticleContainer.H b/Source/Particles/WarpXParticleContainer.H
index 25fb48d0aa0..c63802d084f 100644
--- a/Source/Particles/WarpXParticleContainer.H
+++ b/Source/Particles/WarpXParticleContainer.H
@@ -21,19 +21,19 @@
 #endif
 #include "MultiParticleContainer_fwd.H"
 
-#include <AMReX_AmrCore.H>
 #include <AMReX_Array.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_INT.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_ParIter.H>
 #include <AMReX_Particles.H>
 #include <AMReX_REAL.H>
-#include <AMReX_RealBox.H>
 #include <AMReX_StructOfArrays.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+#include <AMReX_AmrCoreFwd.H>
+
 #include <array>
 #include <iosfwd>
 #include <map>
diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp
index 8e0cde96e33..aa80e1673c2 100644
--- a/Source/Particles/WarpXParticleContainer.cpp
+++ b/Source/Particles/WarpXParticleContainer.cpp
@@ -20,6 +20,7 @@
 #include "WarpX.H"
 
 #include <AMReX.H>
+#include <AMReX_AmrCore.H>
 #include <AMReX_AmrParGDB.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_Box.H>
@@ -39,6 +40,7 @@
 #include <AMReX_IntVect.H>
 #include <AMReX_LayoutData.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
 #include <AMReX_PODVector.H>
 #include <AMReX_ParGDB.H>
 #include <AMReX_ParallelDescriptor.H>
@@ -52,6 +54,7 @@
 #include <AMReX_TinyProfiler.H>
 #include <AMReX_Utility.H>
 
+
 #ifdef AMREX_USE_OMP
 #   include <omp.h>
 #endif
diff --git a/Source/Utils/CoarsenIO.H b/Source/Utils/CoarsenIO.H
index 9aa102fc8e4..0b53831e6a4 100644
--- a/Source/Utils/CoarsenIO.H
+++ b/Source/Utils/CoarsenIO.H
@@ -6,9 +6,10 @@
 #include <AMReX_Extension.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <cstdlib>
 
 namespace CoarsenIO{
diff --git a/Source/Utils/CoarsenIO.cpp b/Source/Utils/CoarsenIO.cpp
index de508e7bb73..2cb97b0e1b9 100644
--- a/Source/Utils/CoarsenIO.cpp
+++ b/Source/Utils/CoarsenIO.cpp
@@ -12,6 +12,7 @@
 #include <AMReX_GpuLaunch.H>
 #include <AMReX_IndexType.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
 
 using namespace amrex;
 
diff --git a/Source/Utils/CoarsenMR.H b/Source/Utils/CoarsenMR.H
index f269c8575cd..1191b0c7e1d 100644
--- a/Source/Utils/CoarsenMR.H
+++ b/Source/Utils/CoarsenMR.H
@@ -5,10 +5,10 @@
 #include <AMReX_Array4.H>
 #include <AMReX_Extension.H>
 #include <AMReX_GpuQualifiers.H>
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <cstdlib>
 
 namespace CoarsenMR{
diff --git a/Source/Utils/CoarsenMR.cpp b/Source/Utils/CoarsenMR.cpp
index cc1095f93d8..80562d54218 100644
--- a/Source/Utils/CoarsenMR.cpp
+++ b/Source/Utils/CoarsenMR.cpp
@@ -9,6 +9,7 @@
 #include <AMReX_IndexType.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_MFIter.H>
+#include <AMReX_MultiFab.H>
 
 using namespace amrex;
 
diff --git a/Source/Utils/Interpolate.H b/Source/Utils/Interpolate.H
index cfd178666fe..a67ee191849 100644
--- a/Source/Utils/Interpolate.H
+++ b/Source/Utils/Interpolate.H
@@ -1,10 +1,10 @@
 #ifndef WARPX_INTERPOLATE_H_
 #define WARPX_INTERPOLATE_H_
 
-#include <AMReX_IntVect.H>
-#include <AMReX_MultiFab.H>
 #include <AMReX_REAL.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <memory>
 
diff --git a/Source/Utils/ParticleUtils.H b/Source/Utils/ParticleUtils.H
index 45680bd71a5..c0f36d60fc3 100644
--- a/Source/Utils/ParticleUtils.H
+++ b/Source/Utils/ParticleUtils.H
@@ -10,9 +10,10 @@
 #include "Particles/WarpXParticleContainer.H"
 
 #include <AMReX_DenseBins.H>
-#include <AMReX_MFIter.H>
 #include <AMReX_Particles.H>
 
+#include <AMReX_BaseFwd.H>
+
 namespace ParticleUtils {
 
     /**
diff --git a/Source/Utils/RelativeCellPosition.H b/Source/Utils/RelativeCellPosition.H
index 52dd2c2c3a9..cbc6064a7a5 100644
--- a/Source/Utils/RelativeCellPosition.H
+++ b/Source/Utils/RelativeCellPosition.H
@@ -7,7 +7,7 @@
 #ifndef WARPX_RELATIVE_CELL_POSITION_H_
 #define WARPX_RELATIVE_CELL_POSITION_H_
 
-#include <AMReX_MultiFab.H>
+#include <AMReX_BaseFwd.H>
 
 #include <vector>
 
diff --git a/Source/Utils/RelativeCellPosition.cpp b/Source/Utils/RelativeCellPosition.cpp
index 3c38a6dcb44..55e933af012 100644
--- a/Source/Utils/RelativeCellPosition.cpp
+++ b/Source/Utils/RelativeCellPosition.cpp
@@ -8,6 +8,7 @@
 
 #include <AMReX_Config.H>
 #include <AMReX_IndexType.H>
+#include <AMReX_MultiFab.H>
 
 std::vector< double >
 utils::getRelativeCellPosition(amrex::MultiFab const& mf)
diff --git a/Source/Utils/WarpXAlgorithmSelection.H b/Source/Utils/WarpXAlgorithmSelection.H
index 866ccdf3223..8596e439047 100644
--- a/Source/Utils/WarpXAlgorithmSelection.H
+++ b/Source/Utils/WarpXAlgorithmSelection.H
@@ -8,7 +8,7 @@
 #ifndef UTILS_WARPXALGORITHMSELECTION_H_
 #define UTILS_WARPXALGORITHMSELECTION_H_
 
-#include <AMReX_ParmParse.H>
+#include <AMReX_BaseFwd.H>
 
 #include <string>
 
diff --git a/Source/Utils/WarpXAlgorithmSelection.cpp b/Source/Utils/WarpXAlgorithmSelection.cpp
index 4caaeb4b438..e73d3e30eba 100644
--- a/Source/Utils/WarpXAlgorithmSelection.cpp
+++ b/Source/Utils/WarpXAlgorithmSelection.cpp
@@ -11,6 +11,8 @@
 
 #include <AMReX.H>
 
+#include <AMReX_ParmParse.H>
+
 #include <algorithm>
 #include <cstring>
 #include <ctype.h>
diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp
index 908c5e5a372..42095a9576f 100644
--- a/Source/Utils/WarpXMovingWindow.cpp
+++ b/Source/Utils/WarpXMovingWindow.cpp
@@ -37,6 +37,8 @@
 #include <AMReX_SPACE.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <array>
 #include <cmath>
 #include <memory>
diff --git a/Source/Utils/WarpXTagging.cpp b/Source/Utils/WarpXTagging.cpp
index fb38881a5e9..7b0f6222e22 100644
--- a/Source/Utils/WarpXTagging.cpp
+++ b/Source/Utils/WarpXTagging.cpp
@@ -21,6 +21,8 @@
 #include <AMReX_SPACE.H>
 #include <AMReX_TagBox.H>
 
+#include <AMReX_BaseFwd.H>
+
 using namespace amrex;
 
 void
diff --git a/Source/Utils/WarpXUtil.H b/Source/Utils/WarpXUtil.H
index efd6c01421d..22216d3fba5 100644
--- a/Source/Utils/WarpXUtil.H
+++ b/Source/Utils/WarpXUtil.H
@@ -12,12 +12,12 @@
 
 #include <AMReX_Extension.H>
 #include <AMReX_GpuQualifiers.H>
-#include <AMReX_MultiFab.H>
-#include <AMReX_ParmParse.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Utility.H>
 #include <AMReX_Vector.H>
 
+#include <AMReX_BaseFwd.H>
+
 #include <cstddef>
 #include <cstdint>
 #include <string>
diff --git a/Source/WarpX.H b/Source/WarpX.H
index dcf6951808b..a70ea2af27f 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -41,18 +41,16 @@
 #ifdef AMREX_USE_EB
 #   include "AMReX_EBFabFactory.H"
 #endif
-#include <AMReX_Geometry.H>
 #include <AMReX_GpuContainers.H>
 #include <AMReX_IntVect.H>
-#include <AMReX_LayoutData.H>
-#include <AMReX_LayoutData.H>
 #include <AMReX_REAL.H>
 #include <AMReX_RealBox.H>
 #include <AMReX_RealVect.H>
 #include <AMReX_Vector.H>
 #include <AMReX_VisMF.H>
-#include <AMReX_iMultiFab.H>
-#include <AMReX_iMultiFab.H>
+
+#include <AMReX_BaseFwd.H>
+#include <AMReX_AmrCoreFwd.H>
 
 #include <array>
 #include <iostream>
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index 1fcce07a84c..d4f9b5de11f 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -45,6 +45,7 @@
 #   include <AMReX_EBFabFactory.H>
 #   include <AMReX_EBSupport.H>
 #endif
+#include <AMReX_FArrayBox.H>
 #include <AMReX_FabArray.H>
 #include <AMReX_FabFactory.H>
 #include <AMReX_Geometry.H>
@@ -62,7 +63,6 @@
 #include <AMReX_Print.H>
 #include <AMReX_Random.H>
 #include <AMReX_SPACE.H>
-#include <AMReX_ccse-mpi.H>
 #include <AMReX_iMultiFab.H>
 
 #include <algorithm>

From 4d6166e0294bca0a8dbcd66cf0ca06eb5582f22e Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 15 Jun 2021 04:23:11 +0200
Subject: [PATCH 45/58] use right version of amrex

---
 cmake/dependencies/AMReX.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
index f3f9c6d9c2b..7f9a5a9f437 100644
--- a/cmake/dependencies/AMReX.cmake
+++ b/cmake/dependencies/AMReX.cmake
@@ -231,7 +231,7 @@ set(WarpX_amrex_src ""
 set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
-set(WarpX_amrex_branch "fc9bc1e3efdaead0253d0a55dcf1abb7abc06bd7"
+set(WarpX_amrex_branch "659ab43420a2c4a918cda2702910771fbbc395d3"
     CACHE STRING
     "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
 

From 9b482a6cac6b5623f29fd22ea96e2c60ba0f9ca4 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 15 Jun 2021 04:42:19 +0200
Subject: [PATCH 46/58] use right version of amrex for tests

---
 run_test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run_test.sh b/run_test.sh
index 792baa67d83..8ae2440d2ca 100755
--- a/run_test.sh
+++ b/run_test.sh
@@ -51,7 +51,7 @@ echo "cd $PWD"
 
 # Clone PICSAR and AMReX
 git clone https://github.com/AMReX-Codes/amrex.git
-cd amrex && git checkout fc9bc1e3efdaead0253d0a55dcf1abb7abc06bd7 && cd -
+cd amrex && git checkout 659ab43420a2c4a918cda2702910771fbbc395d3 && cd -
 # Use QED brach for QED tests
 git clone https://github.com/ECP-WarpX/picsar.git
 cd picsar && git checkout c16b642e3dcf860480dd1dd21cefa3874f395773 && cd -

From 6fceb05d2c527a9de5b6e1ff4a1048478da67837 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 15 Jun 2021 05:00:47 +0200
Subject: [PATCH 47/58] fixed bug

---
 Source/Particles/Deposition/CurrentDeposition.H | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Particles/Deposition/CurrentDeposition.H b/Source/Particles/Deposition/CurrentDeposition.H
index 84afa49857a..af6fb87f114 100644
--- a/Source/Particles/Deposition/CurrentDeposition.H
+++ b/Source/Particles/Deposition/CurrentDeposition.H
@@ -11,6 +11,7 @@
 #include "Parallelization/KernelTimer.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/ShapeFactors.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpX_Complex.H"
 
 #include <AMReX.H>

From f690826b12290cb84ba97ab2c64da64316b2a8df Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 15 Jun 2021 09:50:29 +0200
Subject: [PATCH 48/58] fix another bug

---
 Source/Particles/Deposition/ChargeDeposition.H | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Particles/Deposition/ChargeDeposition.H b/Source/Particles/Deposition/ChargeDeposition.H
index 01b370417c9..547522280a8 100644
--- a/Source/Particles/Deposition/ChargeDeposition.H
+++ b/Source/Particles/Deposition/ChargeDeposition.H
@@ -10,6 +10,7 @@
 
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/ShapeFactors.H"
+#include "Utils/WarpXAlgorithmSelection.H"
 
 #include <AMReX.H>
 

From 106287f99d40f5ef336e0b5ea7fee47035c97419 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 15 Jun 2021 10:06:39 +0200
Subject: [PATCH 49/58] fix missing include

---
 Source/Particles/Deposition/ChargeDeposition.H | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Particles/Deposition/ChargeDeposition.H b/Source/Particles/Deposition/ChargeDeposition.H
index 547522280a8..d91abfb5d32 100644
--- a/Source/Particles/Deposition/ChargeDeposition.H
+++ b/Source/Particles/Deposition/ChargeDeposition.H
@@ -8,6 +8,7 @@
 #ifndef CHARGEDEPOSITION_H_
 #define CHARGEDEPOSITION_H_
 
+#include "Parallelization/KernelTimer.H"
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/ShapeFactors.H"
 #include "Utils/WarpXAlgorithmSelection.H"

From 6572bf77571f7129fc3264f1e44500fc01e1ff60 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 15 Jun 2021 10:50:23 +0200
Subject: [PATCH 50/58] fix missing include

---
 Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
index bdf3ae0d143..18401d74ef7 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
@@ -15,7 +15,7 @@
 #endif
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXConst.H"
-#ifndef WARPX_DIM_RZ
+#ifdef WARPX_DIM_RZ
 #   include "WarpX.H"
 #endif
 

From 2ba8484a65685ef2224603630f08b472dc4e7e78 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 15 Jun 2021 11:14:15 +0200
Subject: [PATCH 51/58] fix missing include

---
 Source/Particles/Deposition/ChargeDeposition.H  | 3 +++
 Source/Particles/Deposition/CurrentDeposition.H | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Source/Particles/Deposition/ChargeDeposition.H b/Source/Particles/Deposition/ChargeDeposition.H
index d91abfb5d32..d651b1b6cdc 100644
--- a/Source/Particles/Deposition/ChargeDeposition.H
+++ b/Source/Particles/Deposition/ChargeDeposition.H
@@ -12,6 +12,9 @@
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/ShapeFactors.H"
 #include "Utils/WarpXAlgorithmSelection.H"
+#ifdef WARPX_DIM_RZ
+#   include "Utils/WarpX_Complex.H"
+#endif
 
 #include <AMReX.H>
 
diff --git a/Source/Particles/Deposition/CurrentDeposition.H b/Source/Particles/Deposition/CurrentDeposition.H
index af6fb87f114..c15b94cac15 100644
--- a/Source/Particles/Deposition/CurrentDeposition.H
+++ b/Source/Particles/Deposition/CurrentDeposition.H
@@ -12,7 +12,9 @@
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/ShapeFactors.H"
 #include "Utils/WarpXAlgorithmSelection.H"
-#include "Utils/WarpX_Complex.H"
+#ifdef WARPX_DIM_RZ
+#   include "Utils/WarpX_Complex.H"
+#endif
 
 #include <AMReX.H>
 #include <AMReX_Arena.H>

From f9ab2868db449742da25b01e48d7d39abc9d3791 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Tue, 15 Jun 2021 12:04:25 +0200
Subject: [PATCH 52/58] updated amrex

---
 cmake/dependencies/AMReX.cmake | 2 +-
 run_test.sh                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
index 7f9a5a9f437..3bd9e6ca63c 100644
--- a/cmake/dependencies/AMReX.cmake
+++ b/cmake/dependencies/AMReX.cmake
@@ -231,7 +231,7 @@ set(WarpX_amrex_src ""
 set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
-set(WarpX_amrex_branch "659ab43420a2c4a918cda2702910771fbbc395d3"
+set(WarpX_amrex_branch "d7ff203305e8c8605ca6f92e9212acf717da56de"
     CACHE STRING
     "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
 
diff --git a/run_test.sh b/run_test.sh
index 8ae2440d2ca..dfe89d002c4 100755
--- a/run_test.sh
+++ b/run_test.sh
@@ -51,7 +51,7 @@ echo "cd $PWD"
 
 # Clone PICSAR and AMReX
 git clone https://github.com/AMReX-Codes/amrex.git
-cd amrex && git checkout 659ab43420a2c4a918cda2702910771fbbc395d3 && cd -
+cd amrex && git checkout d7ff203305e8c8605ca6f92e9212acf717da56de && cd -
 # Use QED brach for QED tests
 git clone https://github.com/ECP-WarpX/picsar.git
 cd picsar && git checkout c16b642e3dcf860480dd1dd21cefa3874f395773 && cd -

From ad2e7a0dd40897a5676206b7225772ccddac3fa9 Mon Sep 17 00:00:00 2001
From: Luca Fedeli <luca.fedeli@cea.fr>
Date: Thu, 17 Jun 2021 15:23:07 +0200
Subject: [PATCH 53/58] initial work to document new include strategy

---
 Docs/source/developers/repo_organization.rst | 39 +++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/Docs/source/developers/repo_organization.rst b/Docs/source/developers/repo_organization.rst
index 4bd67a4d553..7f3df5194c7 100644
--- a/Docs/source/developers/repo_organization.rst
+++ b/Docs/source/developers/repo_organization.rst
@@ -28,15 +28,42 @@ All WarpX header files need to be specified relative to the ``Source/`` director
 - e.g. ``#include "Utils/WarpXConst.H"``
 - files in the same directory as the including header-file can be included with ``#include "FileName.H"``
 
-The `include order <https://github.com/ECP-WarpX/WarpX/pull/874#issuecomment-607038803>`_ and `proper quotation marks <https://gcc.gnu.org/onlinedocs/cpp/Include-Syntax.html>`_ are:
+By default, in a ``MyName.cpp`` source file we do not include headers already included in ``MyName.H``. Besides this exception, if a function or a class
+is used in a source file, the header file containing its declaration must be included, unless the inclusion of a façade header is more appropriate. This is
+sometimes the case for AMReX headers. For instance ``AMReX_GpuLaunch.H`` is a façade header for ``AMReX_GpuLaunchFunctsC.H`` and ``AMReX_GpuLaunchFunctsG.H``, which
+contain respectively the CPU and the GPU implemetation of some methods, and which should not be included directly.
+Whenever possible, forward declarations headers are included instead of the actual headers, in order to save compilation time (see dedicated section below). In WarpX forward
+declaration headers have the suffix ``*_fwd.H``, while in AMReX they have the suffix ``*Fwd.H``.
+The include order (see `PR #874 <https://github.com/ECP-WarpX/WarpX/pull/874#issuecomment-607038803>` _ and `PR #1947 <https://github.com/ECP-WarpX/WarpX/pull/1947>` ) _ and `proper quotation marks <https://gcc.gnu.org/onlinedocs/cpp/Include-Syntax.html>`_ are:
 
-1. In a ``<MyName>.cpp`` file: ``#include "<MyName>.H"`` (its header) then
+1. In a ``MyName.cpp`` file: ``#include "MyName.H"`` (its header) then
 2. (further) WarpX header files ``#include "..."`` then
-3. PICSAR and AMReX header files ``#include <...>`` then
-4. other third party includes ``#include <...>`` then
-5. standard library includes, e.g. ``#include <vector>``
+3. WarpX forward declaration header files ``#include "..._fwd.H"``
+4. AMReX header files ``#include <...>`` then
+5. AMReX forward declaration header files ``#include <...Fwd.H>`` then
+6. PICSAR header files ``#include <...>`` then
+7. other third party includes ``#include <...>`` then
+8. standard library includes, e.g. ``#include <vector>``
 
-For details why this is needed, please see `PR #874 <https://github.com/ECP-WarpX/WarpX/pull/874#issuecomment-607038803>`_, the `LLVM guidelines <https://llvm.org/docs/CodingStandards.html#include-style>`_, and `include-what-you-use <https://github.com/include-what-you-use/include-what-you-use/blob/master/docs/WhyIWYU.md>`_.
+1. In a ``MyName.H`` file: ``#include "MyName_fwd.H"`` (the corresponding forward declaration header, if it exists) then
+2. WarpX header files ``#include "..."`` then
+3. WarpX forward declaration header files ``#include "..._fwd.H"``
+4. AMReX header files ``#include <...>`` then
+5. AMReX forward declaration header files ``#include <...Fwd.H>`` then
+6. PICSAR header files ``#include <...>`` then
+7. other third party includes ``#include <...>`` then
+8. standard library includes, e.g. ``#include <vector>``
+
+Each of these groups of header files should ideally be sorted alphabetically, and a blank line should be placed between the groups.
+
+For details why this is needed, please see `PR #874 <https://github.com/ECP-WarpX/WarpX/pull/874#issuecomment-607038803>`_, `PR #1947 <https://github.com/ECP-WarpX/WarpX/pull/1947>`_, the `LLVM guidelines <https://llvm.org/docs/CodingStandards.html#include-style>`_, and `include-what-you-use <https://github.com/include-what-you-use/include-what-you-use/blob/master/docs/WhyIWYU.md>`_.
+
+Forward declaration headers
+------------
+
+Forward declaration headers are a convenient way to organize forward declarations (see for instance `include-what-you-use <https://github.com/include-what-you-use/include-what-you-use/blob/master/docs/WhyIWYU.md>`).
+
+[TODO]
 
 WarpX-specific vocabulary
 -------------------------

From 6288550142016545a7541c5d00a7ad5e0b68906f Mon Sep 17 00:00:00 2001
From: lucafedeli88 <luca.fedeli@cea.fr>
Date: Thu, 24 Jun 2021 12:19:21 +0200
Subject: [PATCH 54/58] updated documentation

---
 Docs/source/developers/repo_organization.rst | 29 +++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/Docs/source/developers/repo_organization.rst b/Docs/source/developers/repo_organization.rst
index 7f3df5194c7..6e4122f25cd 100644
--- a/Docs/source/developers/repo_organization.rst
+++ b/Docs/source/developers/repo_organization.rst
@@ -60,10 +60,31 @@ For details why this is needed, please see `PR #874 <https://github.com/ECP-Warp
 
 Forward declaration headers
 ------------
-
-Forward declaration headers are a convenient way to organize forward declarations (see for instance `include-what-you-use <https://github.com/include-what-you-use/include-what-you-use/blob/master/docs/WhyIWYU.md>`).
-
-[TODO]
+Forward declarations can be used when a header file needs only to know that a given class exists, without any further detail (e.g., when only a pointer to an instance of
+that class is used). Forward declaration headers are a convenient way to organize forward declarations. If a forward declaration is needed for a given class ``MyClass``, declared in ``MyClass.H``,
+the forward declaration should appear in a header file named ``MyClass_fwd.H``, placed in the same folder containing ``MyClass.H``.
+Below we provide a simple example:
+
+``MyClass_fwd.H``:
+.. code-block:: cpp
+  class MyClass;
+
+``MyClass.H``:
+.. code-block:: cpp
+  #include “MyClass_fwd.H”
+  #include “someHeader.H”
+  class MyClass{/* stuff */};
+
+``MyClass.cpp``:
+.. code-block:: cpp
+  #include “MyClass.H”
+  class MyClass{/* stuff */};
+
+Usage:
+``SimpleUsage.H``
+.. code-block:: cpp
+  #include “MyClass_fwd.H”
+  #include <memory>
 
 WarpX-specific vocabulary
 -------------------------

From dc1b0208e8d95d0cfa9702cd97e27264f72836fd Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Thu, 24 Jun 2021 17:17:50 -0700
Subject: [PATCH 55/58] Fix rst & private includes

---
 Docs/source/developers/repo_organization.rst | 29 ++++++++++++--------
 Source/BoundaryConditions/PML.cpp            |  1 -
 Source/Diagnostics/FieldIO.cpp               |  1 -
 Source/Utils/MPIInitHelpers.cpp              |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Docs/source/developers/repo_organization.rst b/Docs/source/developers/repo_organization.rst
index 6e4122f25cd..41389672195 100644
--- a/Docs/source/developers/repo_organization.rst
+++ b/Docs/source/developers/repo_organization.rst
@@ -29,14 +29,16 @@ All WarpX header files need to be specified relative to the ``Source/`` director
 - files in the same directory as the including header-file can be included with ``#include "FileName.H"``
 
 By default, in a ``MyName.cpp`` source file we do not include headers already included in ``MyName.H``. Besides this exception, if a function or a class
-is used in a source file, the header file containing its declaration must be included, unless the inclusion of a façade header is more appropriate. This is
+is used in a source file, the header file containing its declaration must be included, unless the inclusion of a facade header is more appropriate. This is
 sometimes the case for AMReX headers. For instance ``AMReX_GpuLaunch.H`` is a façade header for ``AMReX_GpuLaunchFunctsC.H`` and ``AMReX_GpuLaunchFunctsG.H``, which
 contain respectively the CPU and the GPU implemetation of some methods, and which should not be included directly.
 Whenever possible, forward declarations headers are included instead of the actual headers, in order to save compilation time (see dedicated section below). In WarpX forward
 declaration headers have the suffix ``*_fwd.H``, while in AMReX they have the suffix ``*Fwd.H``.
 The include order (see `PR #874 <https://github.com/ECP-WarpX/WarpX/pull/874#issuecomment-607038803>` _ and `PR #1947 <https://github.com/ECP-WarpX/WarpX/pull/1947>` ) _ and `proper quotation marks <https://gcc.gnu.org/onlinedocs/cpp/Include-Syntax.html>`_ are:
 
-1. In a ``MyName.cpp`` file: ``#include "MyName.H"`` (its header) then
+In a ``MyName.cpp`` file:
+
+1. ``#include "MyName.H"`` (its header) then
 2. (further) WarpX header files ``#include "..."`` then
 3. WarpX forward declaration header files ``#include "..._fwd.H"``
 4. AMReX header files ``#include <...>`` then
@@ -45,7 +47,9 @@ The include order (see `PR #874 <https://github.com/ECP-WarpX/WarpX/pull/874#iss
 7. other third party includes ``#include <...>`` then
 8. standard library includes, e.g. ``#include <vector>``
 
-1. In a ``MyName.H`` file: ``#include "MyName_fwd.H"`` (the corresponding forward declaration header, if it exists) then
+In a ``MyName.H`` file:
+
+1. ``#include "MyName_fwd.H"`` (the corresponding forward declaration header, if it exists) then
 2. WarpX header files ``#include "..."`` then
 3. WarpX forward declaration header files ``#include "..._fwd.H"``
 4. AMReX header files ``#include <...>`` then
@@ -59,7 +63,7 @@ Each of these groups of header files should ideally be sorted alphabetically, an
 For details why this is needed, please see `PR #874 <https://github.com/ECP-WarpX/WarpX/pull/874#issuecomment-607038803>`_, `PR #1947 <https://github.com/ECP-WarpX/WarpX/pull/1947>`_, the `LLVM guidelines <https://llvm.org/docs/CodingStandards.html#include-style>`_, and `include-what-you-use <https://github.com/include-what-you-use/include-what-you-use/blob/master/docs/WhyIWYU.md>`_.
 
 Forward declaration headers
-------------
+---------------------------
 Forward declarations can be used when a header file needs only to know that a given class exists, without any further detail (e.g., when only a pointer to an instance of
 that class is used). Forward declaration headers are a convenient way to organize forward declarations. If a forward declaration is needed for a given class ``MyClass``, declared in ``MyClass.H``,
 the forward declaration should appear in a header file named ``MyClass_fwd.H``, placed in the same folder containing ``MyClass.H``.
@@ -71,20 +75,23 @@ Below we provide a simple example:
 
 ``MyClass.H``:
 .. code-block:: cpp
-  #include “MyClass_fwd.H”
-  #include “someHeader.H”
-  class MyClass{/* stuff */};
+
+   #include "MyClass_fwd.H"
+   #include "someHeader.H"
+   class MyClass{/* stuff */};
 
 ``MyClass.cpp``:
 .. code-block:: cpp
-  #include “MyClass.H”
-  class MyClass{/* stuff */};
+
+   #include "MyClass.H"
+   class MyClass{/* stuff */};
 
 Usage:
 ``SimpleUsage.H``
 .. code-block:: cpp
-  #include “MyClass_fwd.H”
-  #include <memory>
+
+   #include "MyClass_fwd.H"
+   #include <memory>
 
 WarpX-specific vocabulary
 -------------------------
diff --git a/Source/BoundaryConditions/PML.cpp b/Source/BoundaryConditions/PML.cpp
index 4990c56715d..c1c4d55a04c 100644
--- a/Source/BoundaryConditions/PML.cpp
+++ b/Source/BoundaryConditions/PML.cpp
@@ -40,7 +40,6 @@
 #include <AMReX_RealVect.H>
 #include <AMReX_SPACE.H>
 #include <AMReX_VisMF.H>
-#include <AMReX_ccse-mpi.H>
 
 #include <algorithm>
 #include <cmath>
diff --git a/Source/Diagnostics/FieldIO.cpp b/Source/Diagnostics/FieldIO.cpp
index 024f3d0a071..5f7de7f715b 100644
--- a/Source/Diagnostics/FieldIO.cpp
+++ b/Source/Diagnostics/FieldIO.cpp
@@ -13,7 +13,6 @@
 #include <AMReX_IntVect.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_SPACE.H>
-#include <AMReX_ccse-mpi.H>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/Source/Utils/MPIInitHelpers.cpp b/Source/Utils/MPIInitHelpers.cpp
index ffe79e22a8b..d4b049d7c49 100644
--- a/Source/Utils/MPIInitHelpers.cpp
+++ b/Source/Utils/MPIInitHelpers.cpp
@@ -11,7 +11,7 @@
 #include <AMReX_Print.H>
 
 #if defined(AMREX_USE_MPI)
-        #include <mpi.h>
+#   include <mpi.h>
 #endif
 
 #include <string>

From 547f6ed3191105c79e7eb72378a96d0e0ea3c905 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Thu, 24 Jun 2021 17:18:52 -0700
Subject: [PATCH 56/58] Remove accidentially added files

---
 Source/Utils/a.out    | Bin 152760 -> 0 bytes
 Source/Utils/main.cpp |  34 ----------------------------------
 2 files changed, 34 deletions(-)
 delete mode 100755 Source/Utils/a.out
 delete mode 100644 Source/Utils/main.cpp

diff --git a/Source/Utils/a.out b/Source/Utils/a.out
deleted file mode 100755
index 7e50880f53d3005753c319c9e7bd3c5b8ab31866..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 152760
zcmeFa4O~@K_BVb&P%=|0Gcv1dS!tO8qGD;Ga`mF9Bxq*Z72zrrZvz)Y$I3!YQq0VZ
z%*x7Xn6hHZ8m6(ra>UAt%8JU2%<B45LuO@V@qE|bYo9mnxxO|3|MPo(o<8xtXRWo@
zUVH7e*M2$YUT<-y4i66t)6~^QyF#P8x#vkr5;JO3!}*h@C25J;N%-s1&e7U}8iD_l
zm}|#IE~YSw<=OzLTnv2(g54xpQ>ZK?q;gJIQ?%qL)cBstMH0(Je{i|PUmeHKk@pJC
z<wSj}S>A>-he^6Zb2;)&-CoJBJ7~p;-0mvX7`Bt#Mdcc~TqBoL7|s4vsQgK4=>J64
zYsXmd=u&7em&4`km@JEF3aJjd(!ca)A5DE}TyE>bQjZ-6b&zz0s=ljGj{I`C7rRp%
z$Mre&LlU=JA;k$@m*(Y8>z{CGUiKw<xdo+Vmy{*;zodUcpOV5p@q$lwx$r;5)QB<T
zHFQfI(O8`pK3Co=eZ=d`e3GAi>+J92zWMgbtM7_;t&KYW`sT{F`;!dWO=U=iF4D(c
zF7D}bcl=K>(jRw;&qSlE!S`1FX;mGD$-CBnKY_wiT9dU&P#BDUJ}L}Gzrun3oCAG0
z>I|mmQwRFh4t9R(U}skc`dtos=EB**?8$bpC(WT<-#gGRcBpr=gZ@|tdm0?%3mxQF
zIrt&P!Jaq=y30ZT-45-gxOL%w`!&@;Pql-dRSxoKR#5%D9q1=H=&ywSbL~dr{vG(?
zWbI5XNsK0pL#mK2uXjd%VS%^ApIPkpdNprK#%OQ0uh=&ux5V!&&KNx`udu+EkvT2T
zCwaj+lhXb1v0kq~r?~J&Z=SDUhCj#aD=sc9P8*e_dBM#qNy$q0$HiskWEOk<#hJN&
z5ZvjR_~RZ2M&D_fCAnGN!V-V6FEc+S!<!N7b*B&TjvF;5-9NzV%_=L4i;IhwQV_~5
zn30m6;7#x6&4}~5-KZlwFKuQ%aEwrz9Os@XZk!4`S~D!pJr<g6g%iy+vyq`xQ04H+
zK<~I|Xs*xa%`GVL!NZva+1_H`w9LHBf-K*(G_*WX7bz&r_IXi{FFn>fF5PZ{we6wm
zhR?^1O7BYwEc$Z`vWk8Az5>5PwX(^HxrHUdiiDJcTtE8}de8~7d#7b)do%O$3bW8g
z^h>698iJ+3o0aL$${`h_OdWPaZtDxbQm=Vul$Cjle8nY&1(|ud{#o9cvBES87WB^1
z_ba?2I#z@unq-T{V1byGfiUdnm0?_PqYN;=)ko4M;fi9P@R9VSL)bcYU67bPBLC@q
zm5^0f>bG~rVaCsZtit@F%wnILoh6#(L)5DNwS-i*?@%E%zTn1Olpg0RDa}U;p+u8)
zgEuSZ2JiID+&qq;Ouw%z7Z!`krsq<(&n96kQnENT<!9y=Xt*!&XJ=h}F)dX3)9s8b
z2+&;|-DOGoh+)ILefz{}BT`d_4)ezMNzgyV_vxn%n>caE&=hZ6pT2ztO2)*A5Krh6
z-`~VDbIhOn#K%$E49Ci)jTRv=T>Nc|zmfP~a@q-g6z(E~9MZCO0zQc~x<DjkTw(a{
zMKIO;l6JwY6G`%YDj@jb+8fM|#eL`8+><mdO8b;)rCoDRpjFz}x_qSe6!WP3taqM<
zzINL8Oq+S&Ud$X=S-}vh^S!5Uz^4eU6W{xLEyL2ejn<X#|0LwYwF_`hms;nm_4U*q
zlD?VO@rv%dSkfD8bQjA<@jRsD)qO*YEJtg<?((Df+i0S9HPM?)^s`L#fQf##iQa6Y
zpJSpQFwtEmdNkWf)8!c^x|&DHEtdI~^|S+BO|eug%0x#8=vTCfE+ay+VoY>&oqoAY
zbnX(t>uI9Pb+arIYoe1)>Pj@xRUZ&9$wWtB>6gbuZ?97|EzLwnpy}5{6P>p_f;ZJf
zM<DB0j)~q;r)pY}iQdUXFEi08j@32SL_b*(feTG^^SXGciGHd{zRE<WeT}+So9L%0
zBCy&-?_#3YnCPdQ=(Q$#jEP=nqMvD^Z#L1pndrwq9{0d;4;=TvaSt5#z;O>8_rP%v
z9QVL+4;=TvaSt5#z;O>~+V`E#{>4+iH_Edp@}ti*%`?BwAKud7Dc>0Ns&G$Bzt^{G
z+P;?a-vD$vN66<8XWy>RTUuI{Qu!P@$l15+9sQmTaQ5xmpx@KM&AwfK*YD}TX5X%d
z^?N#~*|+O1{hkhJ_U*b=zo&zleY^go-_wE2zFnF6JsrgC+jW(GPX{pjb`8<*>ELDG
zt~mXk4qW!_>aO3@LCd~fC+qigz_M>wn0`+OEBkhR_q%E@9jKuF`aK<_p#Azi9iX87
z`aK<-p#Azi9hji~`aK<#p#Azi9gv{?`aK<tp#Azi9f+X)`aK=Iq5bL}z4Zg0t9Cjk
zS@tjPPqW>hWV?^F-T$`DTK)&y{WrGzFKzdq+V0=C-M?wO|F`Y_Mce&zw)-b-_kXe7
zKVZAR$97+7yPt2nzsYuAYP-+3-TQ3!Q*8I+ZTF+i_i^8(RJ?PYr(%bvd}ni7Mrvi`
zV`UhMl_y;)VDJWXZ_8=%D6)U4r*d#6K6ol4ClL%h;6DvRw<CSV&^@80sna=gA+Ej3
z2>Cc6-|r%VUcY-Pnmrr7z0$McKpRikCeJ&+`#VFym!C)lQ7ui=Mck<JG`{B!J|E$s
zm0mpFQ$BblBsEXPm;Mf(MT0ltCQ$KPOG_XdgJo0XZ>S?|3d-vBQ~6ytf=M67qg=Y@
z*1ZRiFtR<1BF^tAbh!g@b)L%k(THD9MSb8M40qgi;@j5=EAJ7vmGh^HyME*UOh(iP
zrik159a;84DJyO(=O;<o(JUJ$ZY!mRdn8j-no_aZQ}NCVutj@`{*dCy7^5&kNa6N;
zv=O(eo=x&rr~<d0yj2!gTW?R0Mp+xMaki{yl~wVl;`SbE12(X1kzhJEfYPwufcuej
zOby6BXlX#CtX4H(xa6t^d~Ln;NTaL`=*vcZVpZHNSOel%_GuyO+yI(4^agy4ENW`N
zqrX}jkSwcJ4VW*vssR^R8*sb0wS~|#vt$o+m9na9ua&aa9=MWazZKOuH^9;ZXILAs
z;}=T<%B97s0UIS(HNa<W&n9teYd{<ub&Zr&4Ol5<tqthGvX=<vVK!hQ<~36fbhkF(
z6?v-~(8k(;HCAq<xV=XRtC9WzjkD`abyP}zg<za26(rH%sn~=xw(LXXns0s<PL$O8
zz!G_@Y<ODUszg$abw{lj(2GU~vOO1f5c#Ilysn6|UGxGS<s?tVtEM&%hK4=u47zga
z`__uO*u+$~Jq7wMdIiVOpiKSZKyb}}wrXB)6H}TqNb}I3nk#HYl+E3(ny1;sl;&SR
z-xYwHTHAc7t%%ZG4?3Kt+#Y2UQ<_(k<|RQjzyDKkZ{%AwKV=hBnuk-316mt=vrS%E
zxWYzP5wZXd^;9%cAf`iQ;CIM*7EL+u+N-3SrYo$CqbqJYSW$YQ{HB9prSZ4k1Ubxw
zy%3Qne}IVmm5NlJwtg#(m43g!4_FlWAl*S}A2631%3h+PFH@2TtiqHy#Zrr>;-&+h
zMeYOj6tPg^K0q31sSFKboh|HPDNlV8t%4ypUX=1wq(z%P$B6RvNiLFEI>l5T?NK$6
z{wCs^_1pOK4#D3@i{udHS0AGMnnRR76#r)ESH4=NK9|=;QQK%W5X!dVL)f;3^i{kf
z)r+K*rfPup#}A=>ja@r>&e9Y1`|`am^i050QQG7wzo|*{k3!8&)Q}wA5O9Sd^>CZw
zP8D2)%cAj3peYeS7E$DG+Vhmf4=RQhB}JQJP}-vhz9AH26%zgsMUALbQBzUc3^VXQ
zMX#`w_AWNkaFERQq+^i9=uPJ~=ZjXoDjQTENENr+$s46qy!9v*Q7!71Bd4n<u>lI2
zU!WmJvq;6;flMlG3`sQ>Oifg6p*ED)p-(VNp^&MJl4#x9du`ffpTZaLOU3vA9D)Bw
zvwz+q)fKHuSjJ~f@R~V0Y?Ost_k*-ujDk9+5hi^FyXph$Tgy-^TJ5fA@N8%b_k=Zg
z!s_VnhNd=hbU=mZ>ZSW^<Bdbe!MCV)Xej%^Ukko<1jZ7DTmM*Vt1Z3@lDnu?$48jV
zD#u3{;=4ZZKWT*Z`OonY#_KX;dOALbh0e1_I)|0Zq^vIl4n2p789B)O$a#7d6gqI(
zw#BBb{=yzxj9X?~x0tVLT4(;Fn6H}bHHG#ga>avWXN6o5F7n{eoK{_+h?)FuQzOp9
zXY(pUwShgdLb8L;+ly!=Pl_>pH+Xt&#!+3QUa728R#;@JaGBjB!P;W?k$IgqIkd&J
z1U0YOuw=7pE5E5(^Pesa=S7aRa<GHq){7^%y$-YiE9N5z#H3Jl!KIhGoBe01<%0*p
zGy#kwEO#Gp?fE2R3u$S+p^3Xft$9}M649#L7|iXKMad@tYXSCSMd|(uteY!F2U06A
zJyZWzj^ED<tCR3Rgd(7lq93c+4+Ce?8L0?FtY!qI7q)|v(!`Vjcr0Ry!66xR^h&dx
zr{YBq!o^eZToS-`5L-V#2Si9=nKfUCRo+7sHf0)=dMf4@5v4Nn^XcNQOx}GW?%Z?1
zXp|opLI>4>b#yd#$8QU2ePBeOrA5|5Cw?BTV3E`+*OC|D8IGsIjdec$M<)%%GaS@A
zm6S1Qv?K}RSOv}`NI<F>1^&FcPV-iZI+#-*SRjhIYoVq#wQ{NpJBeCP<$SLwSRc3+
zw!tECyJ+-6_`HtC_jg}Y-S>$0RF>AUdr~SIQY$|9RD4WU_QZ*kEKwiW_Z2D9_1;aT
zm3{Srt!UpaH|msr5F3<WemGnB+g$}~tEh&{gkO{&1j#K)j(!*heh@$0EQ+~npt*+q
zP-C(;UD&JqfIijzu!|ZN+7B-DtMbF{FD-spB;6wWsXnj;?KAm7#9c5ybP?h0UJYwk
zlON(`911l|8Z1eUez+Wb^1}nxc$g`QxvQbMn*C61^1~=$FZ-cVM!N2b?bNo=t~d={
zt6cHfPKzt%O3x@)Y(Nut4W%%&44QYdpa3mC1=2Je=p<7<Iq5Wy_D8!O!5_*$;v|zy
zs}IaXMdo8n5zU}?q#EUUR~A0nN+mgzY9zB|sY_ayYVT0$5u?;k_!toPw{D~abnTGI
zmb5+<yRyyLBg6Lbwa9@r$br@7ymSB$h!Cbo2m$f{HSu$i0o{%2{wx_FO-P&gA9R@n
zCV)(xULiW2$n}B8q$tgP=xH(AqGpjrE5D!~>bHEF^!bByTS4<Z%n|~5Qs71wxJegK
znR%2Hn8X5;#jUKjJ$3M8bTD<}0lgdjk%0w}GOdtk65-vs$xlo*pCQr7i3iSub)_|C
zhtU(YMdN8~gC#cSA4z{TNK$>^dwH+?)xcuEfIP3RG+v2Cldme>VAlsO5`Kd>Mk7&B
zlf<&8KdAHS{OxKfhwX_J2ky8ZC-N%UV01=bp=^8uNKIVdNI@F?HoA?vvPnLR!+~n~
zRO$lw{Ih^Z)C(Kfjz`FJI^$b3g$6@6ajXw7Chb6PSx#?{z(2iY8qobSOy1l5GZJL8
zf2NWc+cjGhvHNF%C~;W+DHqBt{#hwVLHv{D)%{Z?>NWhckNg$HKd#S@!9TO)bfNp_
zZJO$6sUpXlil0A=$;ODEWmJs)(;<S2*!{CYlsGK^+$WS-{8J-HLHsieXLcMvPmxT8
z;h%YAI_*4c@uM}_{X?h!`Z<_blcyo-Xl<Sp?HTxrKTh7Lod7N1#F)5^))-PQ3K<49
zp-e?u)Sh$YC+sA|Dg>vK>abLlJG+B*m3;*9`?Ks1y?;&>&TiE|T|qX-FMaP^_0Pzl
z{WC$7Xw^Sc<oKqfTpzdwZ_H578bf^^Q7SE6<rP&0>8dL1J-Dmp3q?j({X=$DtD!!A
zyXq=^4|N2-8jKf?L_mo2SRc4r-rHmOI*`r2@{<_H@)A+R9?L65iO{|ZwDQ#{c)!Tz
zt4BpuL41{Wt?sK+shBCOe<lA08TP$CZRIOHu0>p8T@dZKLr3o>S-HmSgmDm!fNrKe
z@W59(-BV|pt<=a7qX2f+2fq7+?7-uyif|eQrunY5Y+oF7S)VGo=;YQs#fdcmcA8>S
zB&N6kIYgK<nr2t|xEJ$6&uy03RqnW2>%zLC62sfjSLL9u5e+e{r?`tD<1hy|p?a}8
zxkVI>!EF;Yy-3``Nw305a*ER9R^%7<lAbEatp`lr<ZUG!-I^He>7HCYpnoVO3FovR
z?5rM@nT=|Og|V>EXp=SPnfrLTsgI48bE_|hlBHNETIOI&tkGdfec&#vsm->ih!Rgo
z+|44W0*f?+)GAbGcuK`d>(;%4)|vLYCi@Yb!kM0mX!FX6cEja+r$Vrn)=pS>R%7A0
z8Vk=VbC8L3l-zl(M-?d*8__YVsSWpwVNB1bP_RBQTikBKZLP5#lrrwkpl&9iXX%ZQ
z3Yj!S>Jdr*2T>F`uR<(=8tFx@uIM@Vv9tk;Eh-Kp>jRrne9uMTFh%t1ELvtS5{b5s
zyZR1#^=A=w0+#u0=$^~vdcQt!dZQ>~RufN4^m9Ja_XL5y_{@v`M0^Z<L1oG}PPMPy
zWfZmUk@H}LxsO%falB;+w&mDF*KyeK=7o~OiMMj>WzDu6d%XRCuJ|v<TPoH9rg(c&
z#Eu?s?ZKrv(;9C=#uRUOku*rWNvXq#HxzFbZ#U2u(iU%c#v3x;{`!8ac<TW*fu}z(
z;_X#@=6KtTkAV`pKazNZ5r><=^o-IfgIxkG!6M3~XB3g6=zx>X;=~Ay5;f~O^?awt
zvz~)bB<(?s{KK+T7p!$nQS+*Z06l89ik*TjYW^-{jHr1HPtIFM4cRVM8;8nL+flq#
z)Z8o1j4WAd^_ho=nm@hQDr(Z8CNOKO5jB<g%u%xp9|MEwK1kHq`cF>MgUAArj^Tcq
z21Pnf1QnfR?oTRx80!VUY!Q@M*B{krh^g0+3C&Xs)-eI}07lSwTD5dmyV+t(DY3gY
z&4m=XIWP;8Pw8sR96@HSYV4xlzY1?uio-?BA3utYrFnr)yU=ve=lGZu#j9axs}H;^
z+=7LDrP#bfy9o3Bl8jl2N{_E&a`$c`E}B4Yf|gof6>0hG40bLK3dE^7y@}D}2_rx?
z!qwN}6&g>yTO1h#w&4cn27i)#obb^BB)y#Hh6VM33#pz(v8b7<+U%+Lh^QY+qiS(}
zU+YpO4^XffCBG5fg2Fgkq8U||6yXPZ_Y|sP8?42i7sc!qJ`=3M+pQ(%1g)@)O9sBj
zE3)OyVQ4Gu28GLq3k9?=XpoH)?ior{>1}v?T(sw6%={aEi4<!B>A`$M1m2HkX{;8+
zKDEwxUIEWTJ=K;Ly%Znl;6$Aw-h=4dwFrOI`rxOxQE~ZAwOZ+U5as@(;)WIx5(jCh
z>y5aTW`+uC1O)-i5skP>%oiLoi$*K*I+6byjFJ2*KCAqXkAV`pw=N`k5o{U-A#&~e
zu+5xn)%rtbW#sPqzzi`Ss9hNQqCq)C!L2b`k9?iD9NREc23{;G(KGNk+N9a%?LP|{
zBLgoI2VUgK8d!tg6rOxj6g`Y};%XFcm4UDNnEYwUz~Wg>sCD9h-V|jvOCyAb+Cxp?
zr?-rLJCR~V9u7z2W8h!lwa&nL*Xb)hYkwSoX=*+l0B;<k=U&s3i|V=8iE@lR_i?zT
z=e`w{=si~jZmXXARLB@THw0fLYCU&~b3NLrA8PKLfa0xs?q|7grsK~#j?)<0GKA{6
zep_1g+%r%U7>pj3qx{vtRn)t(=O*A|AdK!E=FXtA-=ee_({8yz?mC(gwU*uY<1ob-
zPZ+VT!<$X#I_R5Z)u-0-V&6{*5D{V7>4}va$i~LmSoN89?03gd&rxp&C^s~S<tSE4
z>Yd7W_z~Z&Bq#FHQLGS}=~ySo3B`gpEIvY;%zM=kS?+0AV;(E5$Jt>}WR8o4qZ+ZA
zpeV)kI=T*q;=VqRD?9_YP{85-Sv<jz2@YcQ0ebU5Iu0f41N1FDF#<}dK;!6&CZ2G|
z2**K9`NmkWiPZgf$h8bF0d`A6FuUN1Ezg|WXz_|;mF0ExlxK}tN69(00}V}Vr7wp#
zrcX&cNu&vMbbTO33|(4|RFS=uV?PVz;@m07!;Ar{{F}mrSFmW=jH+;Ihuyh25fmBv
z3)#d5L`~zawUjRwjjxhLMe=NeDt9dxbYW60*|C&W3OmH}j-B6<5uN6BrbmY&|BJo6
z-sXv7meQN;AFQmq(mL0~irWp+Ks=uoHpYp<$VFshl(I#n7JTc8HN&i*#d_c7o{_>b
z|8!I+Lg8&%qR+1r-uL%5yn@xC)ibY=wnbd)GVw?htFcO~6b$d(EBc0I3Pjs2-upLn
z?3y6xhWEw=GxO1Jqyxhp9N11+V>nRn-fzWL$f<iH%#C<cgc=NC*NrwJ>m}A=^yn$V
zApca^oArTv-!=KIm&tGB6LUn}MXK0ud!}GTPL9R@G?$3(oMsBSJ%eoVb~j4zxzMB@
zsx2<xXey1hF)a!c)c#}NCfI0QfQ882h?swHAXmD7;%Ta0sJBiB_d~5|cO`RA5^@ic
zNhyL#J^(gvkmwAq{H8jsbQnA#QqI?Of-%rtOV3}X@ahC_m7J!g?;09c!;y$m@tsQf
z3~?#m^|BA_h3?OU#!63Ar|0Rj*dWxP><1gE?KG_?^~9lYn5;OhCq%F<qP49U&)sFZ
zX@V8xI{iW9KmLv4<r|Z%XJy7rbpU#r<us+%LqX@H2Sjk|bJBw}+Gy=)pOY4ez@)FO
z=sET9=h-a|bJ9Nez%*|k{+#qrSQBziI>dZ)uV}R~-wea|m`wA{8tZ%$25!*#W{z;m
zvCKCyBA{tYYs@$8X+Q>@Z!RNg`+Re`7y+7yN1@G@P;-NXCBjrsNWThSI3=VK8V4$?
z2AOZZL+MuY%}cD($WA+Vhn{bSb86#e8}rR2#1LzyYHH!x;?_3bY>>;i;PXwmku)z9
zX4%{`QdnlpHydbEcsTRTHT1PY<r#<h=0dY&LFSuh(bcWyo4M5g6*e;;#Y=!RVLQz?
z{iqNQT$BU#?(HVDId$)HJa^L@VV`flCx6i)PJLi65}z0Xw2~1kh*N|?#(Yyjn>6LO
zQ1eZ9Q<XvIn|&t7wwiBlg&`s5n+#LH+UJ|w>R{uM%r|FoARF@yo!;8F9~VQdDK8$?
zd~;gR`KA<K5tn%>*nET2tHYmfroTjOKkE5r#LFoD2h2BZL^$g6%~EkB6J);mjsniM
z2a@xHn$E0S7EE?xUnVBa>tAeX*$_C#)F)P9Y~YNufD%}AEOW_KqD97B@)N$I<UE%=
z2X4^0q(7;lo#9dMUEY<3Smu)D^cw>~=aT&-ZJ$ei5Jrd*uLVn%ql1K;c`kWQnBbIb
zE~E!aDq{wjOP)aKR&z-it2E}4%{Y(@wRh2YLR6_x-@AM*nnbZD=8{Hkp;+mvy-O*b
zt|%MrdzbZM@C)~RE)t?GN%s+!8FR^pbljnGVyL~#N%CbLIfFUOC7+nR7i2EUhefUC
zlFNdbc{>h9L(L`sp`ZyimwZ5s3a9S%&^u7db@sVrgm{}qxb895V)W>bcruJInu^k5
zzxogzEh)c+noHiNhfQ2%(7EI>lVe-WC6~jHkaJ0t$>sLBr2h-B@kr*9Cq!4!3ruS7
z@-L#;j<P=c=dsTv577+UYVUF>)*_B`i63u=9{ya?wU*j`)N{$NRQ$;1lGZ0|L&nQ_
zwx{JxiFa?<93cn)8~uY#?Dm&k*hB@w@PrucPp$Yiwc_i*?f<~*%V*JCLUI+`iS`4Y
z?4?!&XuVS{P3(#7)sQLXrvb(e3lmN>oN&N)7D&4+k9n_Y-)FLkTWM)17PgzI!aa1`
z>s2}dq=OH<m$D4UP4o*ma!7prJi8pSFI$V&h+7<_iLE;wsEJ9ij>s6rVIW{T$<>w<
zb)dVc_!LDM#gv&H6=fhOdm?a$Ql?+Ez-vxJ;5GZK?6hOIyf?L;9>WDWm25_{j2&Rm
z9qL_T2OJ~JLE~=|x6yQ}+zVe2#`l(Ns|53@zxc)we!a*t;eUXo7QaMnRLz@N^kylx
z&9J=!&yna^lK46`Xria<1NA6uURO{&fMq@T?TP+}2E409r|}iyi5otn=V+B@oB-E|
z+j`W2%ugMM6JQ(@ZV!Ax4101xo7GF(metN)2nSuj=sR_rU#A36o3LlI*yxJ&{OhE}
z=1a$NTczQF-2z4VeMWhGg{C`4x8xA}@=Q7`tT5J6PhgW_T1!1@-IwQr8+0wTl*}@(
zr9xQb*hZ6Y&c=W^Y~S>x@r1s<LZI-?aHD((OAg_iFWOptb7vrwZ$^U~)HgfrzR~+e
zgcpT5UhuTWb0S!XPUGC(p3};2YS8=>5j~A?J5p|a;NrbhKdq1IL`;jL?*hEwB_B)U
z<uj6_DMZTujwL(p8}>Y_C?6=w!x$fQV2OwoiLE0}Iw6FiX+08K^9<1~zpSDU7?l9%
zv5npZDpT;#PQ?yMf05ySxXComhfGlOO|0D)c%QFU+PvxIi8Rqv(c?)@+q<zMOcBpw
z;fDIaYvLC35*m)%YH_<!maY$cDq2kIQ#c#Hn1I{S70sy?yTloz_+g58m}R_V_e>4d
zq>_hl&S(@0yzqD95!_q&%#YySqmOcXF=Wb+>nxsdp;^J7z(vFL&FuQSah3%0kPWRT
zuDzhy<SjjtaJFfxh0_7O7jL54dSM?1b%?ZVc?JhlkY?)xi^YjSG;R;jYYC=gNTWLk
z=2Rhim)fINEI{i6o_~>t@G=VD?>#8)Yd5){4g;-*c1h{tgXrlgRq``VgH`^a?+=QB
zUWqlvLif{iZ+cqu({x%x)}06aduSpTcP+GTL~VQ4py%k>1Oh|!+yERziGmprg}s<-
zXdNfszD5@tf-hj1f~7%s%=dJbPp8EVd{qCX`E2DTS*AX)OH7%<ZV`p_tB-PQ!fy3g
z>Ro58cbc`@&-%?z3K~U4utvODY8{<zpGKvvN2km;=AVC&>j`uuPsG&Ya7Hy={54iw
zaFOWwWoD|S=k*;w)gTYCvYsLn4)5*ozdq?KOJk*#eNkphC=@Zt28&3GUHskjnJ8<D
zd8HjKH;ofx^c;J3{w-K`PD1cHWan4p5HV%vm5O4|&P@*4xvg;M(P!sq{D6#}owM+A
zf+^n|Np}7P^E!H`mSQRu-&QhZ=O=NxA$AQiJGU2HJv%=vTC8X1xwy4w=U;GmU}Wdc
zPlyo0XwcW>C!<iH+gc+#$Ko?*=YI6@n6k5vdNoLPUIar--a3}-yb(#th}6T$uBq72
znzL)~-^Bf)v+FgeN~~b??D`NMX|~F)7ec?0UE6SNt+HzhW-e=XeNnvLjASLhLZs60
zmUkSptN8?GkDgs0wq@51!LsX4XRY&1hYYPwBh1-#_OGIQgJ#$2zY(w1=n9ryqmBN@
z>{1^XEs7pqR=lg4syUP_XSMw}dof}~&zb+dtX6_o2U@K;S0ZQ}vf3Cq6`Qi!1&U(N
zY7_9%28LFvHD|1FNGrdqHvoACptH1BO4`!c6#Hsy7p<#qDUW#y8$0o8k<%JA4+iR4
z@b5TqGmYyb$%6Y|73~pOa5%oZWXgiyW9MMXf)RqNXTjgZ0MoPJHr(2?Ae{pmS+L_{
zB4o^2Fdu~iUH)oh!He*jv*4xl@tCsU6LJD-wy#m=!w{3Vj8SmpYt;5gv_@nfP8O`D
zgA>yl^WfpGF(0B8Hx_B)2PwoF^EEtZYn27d={QSYV|ux^R$1^)7;epiH)2Z`WQ}<`
zDsfn2enfAMsx#Lk%Yq%9wU(Q;hFW9#e}utYy?qDx2p-%YWfmMEiXLWWI~&Ft{qK<3
zZ2OvGY9P`r{^3Y_S+PP@-};U6=)cHgTm0!sBAOD3IH0#Bl~!3p6p_CL_yVRW7$Dy0
zIe>4so9wr*xE+qZqO6u5*16vxYITq$$$>}ABPjUc8+`-D@;ipzgaJn8R328@7T#@o
zSp4*jF5`H*^A@d@<fbhVj#+988>O1M25LXFI*ga%<}9uXm~6R0EXPDhnRcW{lBLJs
zL;~IuS$Z|z7Byw*DkwK)>FWen&(e3(Vq2UuHj??pxV2~LGteX>OXsYnnk**?ZBQss
z1b<RgL0MoPK693?ppU__w4=XgACbTJ;;hRQpoi!0(~sHT+p)(`{*D!o3-DxGzJ{1=
z_4l{fEz5(+26FKHr^z+?teA~kyTALONrt}<JV-TJ{QU!VrvVN9p#0sL`b54weFl9D
z=5KvB=`hlJS{!MdFk<s;oKE8ei_YOTQ%eR~8y16GQ^S4|uZLkaLSgK1jW=(TP|s4f
z(3Z9^giI8ttU=r5v>2RNU;!kKLwbHh9%_Bm^b$O03JrViq7rDvpJ9)_|E7E?P7AW>
z{P@tja+Duq@!O%i9B+|63@^WjMX4!#5~!_4_}m4qnDgyk9vR%rhwank?ZJI|{R4;N
z(|d#ZRQ%5MVfplWi<b`NQ)>?#hEH$77R%(*-qcpZr-Q)_>eK0=e2V06J%wsRzYC*U
ztH)Ib+S4kk^C=YK>I1tEVzGK?%r^Z)74(|}c=#wT{P-=63wa#;B)Pu=;a!PMLL~*X
z7$@_-r@CR3^+fjG`>9Lyc~Gr(Ta83>3-P%=kWJMLbT@apm!3aH2Ci61`cbX;hFyK&
zcibD}Pxgxo>Ma>X*?cLK$v$Z!-7e7tN|RzZo-A(h_>0ajH^@WoKu02$Z**DT-?v1I
zND}x(5Rz10k2X!Q5GJ?k7Hx93;2@X2>`u?~sBW<ex)|k+mM9OwmxhxLBkZEErZt6~
zhIcDWVYi8%1ylq{m@`nhbHY4QBg#>Y$%uQcMhtN>;;G<9w9cs_GEyn_O_9-~iXww{
ztigV@8NWXVzRADV6%y}tMF^h=#is64Pg*9TOKLFyYw#4cI@m8KG-9amyFAyuDWY_>
zh+z5*pNnI0Q9&6-Q)*>?1Ei}+B11?|f#U5i)9Nqq<vQU%emCG>aEtxjfR7--?*=Ru
z?RI0-^4A;b_dkeMzHuVIFQ6~PgRES1k}l-n?`bf@?C*6eLi;=W-ox~Fcj|VdXO70-
z-@ak^dnQj;&i>vhq)q-Veb(&nckp_+-QT&8V1IW*yU=qMf7g;P{$PKX(Oc@K_)fkj
zw7>U*Z+Ov?p~Q}kMurH#0Z@F5{=WHj!{6gR#OILl?HAG}e@8xJ_V?HLmZ#m{KmT3#
z_gc|ztG_)&J9>Xd>)92fZw0D1`HjXyt(x$R)T>Gu6xv%Pg4~Fl(14t<nZH2><XQ4^
zcY_~aP?7WHmdD9W`egH>xZMD59XYQ8k5k_c^rG*(mb)8W_!DsLc>!F^x2=xzEKAtd
zW{9OT3d)0Im?wI@Cv;;59f&*x629X`bs6?tBJ2?lb+d`XQs+pEU`!1eW9%3<Eu#pa
zJuxlRMGYNravON-Zez!=1D|=v@HKrDEz#EiM>Edb%BLkFubwYfROY<e_=+{J9;_FY
z8hN!68zIa~oL67PFKyZ5?p8?fI8P8JTjQ>QT5ZJLF}39~VVzsFrL<LBHsM6nJV(UZ
z+p+=sGovl%2WiW5kl?oDh~BccCBmUCBGPN8_}_7#KE;oJ+Dy$0j(h13#alA<fo}wg
zL&5f+iJyF=$kly>;o=gyX$@OB{y(<UlrXfwl$DOyiedD-X^87<1PUw8#e1AfZBcg!
zEAo%gil^C%_e4?@Ry=|O>?5?I-e!ebtMKtp8lJqEGM3q|6=Fmp)8lbHmIz|4HyVo@
zeU<qI8OXcRfpiv*<RiFZ2%q(_IImJ&Zk<Fhfd~VHWFz$8Ifl7^c_l%s|0DWUFI!;A
zSHac^M{>H{Bwv|)>j|<~<ft2$=uR~m8!Em^TlqAU^lPo8EptY1q(xH?1Y1K{<mopD
z5!~jnVBv4Xgk$3y)|vX0%%Z-%4f1lUA$|elKt26no#@yD_-B%0OrKq*&pl0_WA)GU
z`*~2ADNQhW(_-P@Q1g+rc&&8cF}Ha5|8Fg(lxk|RZ46#^gzcjs?}?-q&`-MXx){b&
z6Z!sa&Y%yxM*%Lf#>_?dNCUGzNp&H8R$WM+RTttr8u(>Ts41c@w5=CfCkI$i9~h7B
zm&t(#wb+8*1v^YR*gh~t$$tu4X<!P|AE#UK)dpL|!NvrvZ2hLnP2BiP@cPmp9MhF}
ztYvDCCHI>~)fsHTnY;gR3x2a%VB|<+V%4)Or}t`nhdV^BAht}zcqdPN=0W@*=5%v|
z52w1@MRiW&exa%XK|}w{pQxE@i#>|kW`wMb{#|9&wmJB0&WS-rkX*^qzs4$8vWQ5Y
zDjxldK2@YH)JKJpjSj~#mxMGmH22k?X^J-Lvt^Htwzko@2=OZDj9)@(YrtSOd+HF{
zP87=rN86SK(I)z&9t`fDdi787;dvC#Jt55Rhw~rjOiDi`W#URt7}f>9pWdg_IrD@)
zLUPE}sg;Ajn5t<*CZtq+Fl2m6#ScR=hEyCJ@2R|G8_4OYy?(<miwd-qBQ7@l*2aHM
z+$a3+1*cZ*!-gQa;_D$Toj>!GzZ&Kl_-W~Gtn#C-okCx?7;@bZ@2k^|3TdRgimC}o
zCrQ%%@$0w;j(gz$eh-9cnC?wiNs%ur*H_|=bLC`~xME#JnZ^FxtUO<dE7R}t=jQud
zv09p<p<G^OiLaQYect@cvca*g%z|v!jk$Swu4z73c5X@Lv^-z7mP&#emCek{^X28v
z&h+ON7PxXtT)r}Yu`l13H_Me<;F~@@7xfqTyW1t%MpYlm6_)y4h0|UB9G|NsH@`Gb
zDx6kW7Tf@-ATw`9VR5cMC*M_8RwipN@)e_91^&#u?%EK=E-`#^k?Y#-F4q)|u)D(U
zQ>4H}tuNQrL&l9s88afiyQ?)56c=8>(t>hA6H(4}txI!FacS+fnZ7K4Vew^`c}IJT
zeeh^umN&Nm9`-|b*qLoEPsEFh^sn2d-rUlXhtCIZX=zyw>@c^bWi4>+tt~AXz<aQH
z+KD$~lPg+UI$*1G7qB<*ao|Sqw*q$pJKxdL5&^jcU=LshFd66vW&@W4=K<FN*8sNy
zJK#m&Xsq0O17m@yzye?qa0zfJ@Ihb=@F`#eFlKQ}OEa(!FdA=O4+he2Q>O#dfY$?y
zfYrdIz}>(aV2{d{maV}4!2Q69z|PnP-Udtnt^;NO-v#=C`+&=VU9fdt2fPfp6*w2T
zAGi$I8Q)xZ2ABYB2GYNW9erm@OBrxBunM>oSPOgz*a&<McmTKs7=!PFv|rlNk_b!%
zP6RFh&H+{dR{>uDt_SV}ZUc6?tEJ^2Fag*N-%QE?4g!_|Cj(aj=KyyAR{{3}*8@9a
z^|=i=4yfU)v&BFca2qfQxDPlL7>0AaxxmwbtATxhb-+Ae6YwdZhOfQ`fIWb}0F!~;
zmZP76!-4aFWxzGS6~K+aO~9SN-M|QZD?Aow(mjAffyux-fH}a&feV2Lfop*s@vLAA
za1d}Wa5At1zR7(Lus5&{m<oIwm<J5Q^M=L1D}ZZ(CBQAf`M|xvHN;2!cEmHEwZO+#
zp<jWuc#571d<&Qd+yUGV41WmygkK>!7cX%P0uIH?GgE=D0Ota~#k){zfL-wl+Gb!P
zFaVqYjOwasbAUa8)j$vMbs+tUWEU*C7XqgPtAURJHxnNi0DcCH!Y_jE1NH=Vqthqg
zWxyQZRNzA30$??;8n_wQ01N<s0d~MoqISb8nZ1G2suAD7#Xvvsao}=b18^PiN8naq
z%-_&%U=pzNSr|{iMBrlJMBuxRqusz?fvbV%K7sfEdVo#9nLzDqO<N7@0el6R42*gb
zegzH(E(Wdut_5xZZUJrs?ghSGgL=<_|A7g>4u6N;z+|8wc*iq{Yv3y2df+DDHsJ5T
zgTUl<sMm#j155_)1ZD%<K8Lsj#sJp<bAX$HwZH&yGcc+<{0;00jCdaY26h4F0DA%#
z0;_>*foU%w9|6|@n}JLI1-s8h-UKE94+19wQ`aLO04D>hfD3@Nz$#!PFy=+r4Xmrf
zcsvi|bOXjC@ONM~up3V4=K=G8)xbXkHv_AIdx7r)JM=(1fxUs*I0;V!cEAa^A2=1b
z95`|_>ILQi8-cTd2Y}7M9_MS?DX+m_!0^}6Uf>wuLf|rBHSjgyW}x;4`~^G(7<GZB
z<pO&H?*^s<9|PtAw*!{~&)S0g3ycLe0G|f#2fhOAd?Df#m<SyBCj13V1(pG~09OHb
z0M`Q_d<*dfTo2T6t`h*dfScY%y}&LFs2A89xEMGTxE44SxCOWxxEDC+UCbN3kOzUW
zKzhSG4Y&zd1l$K)3XFdbb^|kj4Z!Px&A_?9=!>9dEBYBY377#~0Q3X1-^aKBt^?Kq
zUk5e;n}FKI=vSZ%xbj2z8(0I(25tk+14cC>K7khjHv*G@JAo5`5xwDeylvDIIF#Nx
z0!{_y02c!n0<XuJ^g7@Rz^%Xr;C|p&z|NN-u0Mg@z}4H}Z{YL5GT;ti74bhsoB+E5
z8-Yo{1Hc);m_8V{z(n9i;6&grz%t-)Jd>#c&H>f}R|6Y?9|8{me*nf@iuQem^1yiD
zL|}9i+6^25Tm$q0Hv-FmJAsb?BVytA&(UANr+{g|vv<JXz*yjN;se(KHv_i<zXI+D
zcK!nGj>E$|U?OlUa3ZkVPS_2+3|Ixs0oDTP-!j_<bbX0&3A_T>Egs_yI0*Oxa57N)
z3iB*52e=w|53mmSI<N`&8Bpu1X=A^}_yT4FlYv`-Ilzko=r3Rfuo`&IF4zr>2kr+Z
z13M=mPJju(jlc}xox72LfsX)J1J?oTfbI97USI-H>!)cgz}~=9_F{YhdjRu*LxGEd
zlYnc1dB82e&w<Ur?}5?%k;lG)zkp@mB0ho1|G~HbP6pNhR{<M<uLGNbJAlyxFdsCd
zpMYt=G++*}2v`kV3j6?A1Kba60FM0*<$-g6(TRu~U@Y)CU>fisun2h3K9mPe1l9m&
z0vmt}fz7~bVDv!rKQI<J@_UpA<^YR;vw=&2D}gn@7k~}GLHki2I0+bi8RUSmz?Hx>
z;K@HA&VXZp%Yk<Q*8x`nw*t@p5&Z>R4eWe5>;@(Pw*oVOoqj@jU=QGO;85T?;7!1-
zz-7Swz#3rZLC6EZ1YpktC=VPA^aHO2E(gv6t^-y9w*qT{`+@bq&Vvz_zyx61pHUuo
z8qg0+04@h+0M`K*0Jj3y0QUo50d~Fu^9e8kxC590JP7my^L{}d26jg1(-k&*oEBCV
z9d>4ic2P^iB)uExX{9YK7`6zQcF_cwVl;%M*7zs*9dcU7=;0k>Ms_;!#;Cd4m0d5p
zsBaI<ezN>z;M5ZI0}=S5`uzBRBIv8BJYQ7TV*I~-PD=~YvZlE^MlT2-c2e7^FbKEA
zUyJ_(;9m*U`7;gv7LcQEYH7i;!Qf9Y_<Ik*?*My3mG6BBe(E9kd57SW*<rKOQbkX+
zyWf|lX=kebAivZ9fAhDrJlz&~{WBy(<s(mdn>G)&6%8dnZACqG@Dsw&kSR9&upj(w
z;0N=Q3q`0Oh>tMRBKDZ-@f$i4!?DJ6&_Om#WPT@n*6kc_lrIDSE0lNQ)30xT0Di8y
ze7Fn-(q9X{3w_<i%pYy&Zv?*!_)hu{fFBv6d`ugxiBZ3k{zUNifloft+h_96MDU}b
zf2f)7E^k93F3_6M2l3z|)o2lmFv3({{>f;=D(LV)<`lDz6obDW{L8>U*UZ1h;BNze
z5cpWG82U2}{z34EgOBOW;O83rZV~85@Xt2$#~b`X;7<TQSR7FwO=kXi=JJz_@^iqS
zgz`@ORp4I-zS~@Wj!}L+`18Pb^3OK#XFAyDf=)l$Pka&QCt^{f`oPqWu1M_p9du9|
zlbG)mr&GcI80DSfXfF5-;5)_XYVcnUQN9lR=R)wCz+Vf#Q=DqZC9i|;6sJ}2;a>1X
zobKsu_{bEe$<PsgvvWVtTg>~R!zoVZf&U};PI0;hd=2`Y;&dbUr-1Jir#r!q2Hz=8
zBic#6QylgHzcb1^@sq)i0pATX^%ye6X*T#*fbSHi^T3aFu+IgR-C#fQMV#J%%|nnl
z-3%Qg9duBf2AJ;@r}TZY<tXnIr#->H1AM1ArGK+^R*3RB;1`DAF9d%&_)c+J4gNgv
zo#HeJ?RyM-5vQXNNy<m2INb{!>mlRR4;@axegu4{IPDF74fsxRnhO34;5)@>9{5|p
zcZ$=+;J*$&W&^|i=|;X=3;xI8JH_D^@VA5S6o-4kkHEQbu=cx9<vjT3N0j&AbHs_g
z3>$7SY=~`-y(Dx58%v~PGjtIDD$?;rPeVtzM<}6K^h1Zo!4Bdt2mdngk&%t^KEsA}
zTt1i$RG$8=b<&S*fKk54D8C>4Oz<x<^G)+&=M%9$2Hz>x6TrU~e5ZcS06!o6L1z6W
zM*V*9?*Jd$GsC_-gTEa7hrkckPt?A3;NJzlWBb96#rk}-S$}x4sDR4v2Y(9qXPEhE
zM*W>TV1GN`ITs{=KMDL(&E-cL<>@&?H0-<H%nz3i?g83f_<s`kG`B=Nae?83k&D}u
zN3@wA0aaw@D(HE=9DcxBNgvN`P6(r#Tp+Cn|Eqa8e=+m1#%gnl5D_v>kl6uSL&-#(
zgmJULS%z%s37L;?Z)v#&pLJWp<>tc$k_Y_D7PhopY`5hs!<IbA46SgMp?a1=X5<~t
zIid!9PY8Yk_`|`6R}DL-7=6<Wek%CA&HOBbAKejaKJdGn`4bI(EclbaPc`$yhY10)
zKMni^;A8J%)E_=V=NEzhJos0d`RFrB)1v+0e*iwkiSFlXjrwcA{}}w!%=}b?-vIvG
z;5&_-X7FDDAKA^&Z`xx<W6*B_-zi7Og8w@BPX0{;zroH&`^bgVz9R6ceNO&e3VtK_
z7n<$6PPWelT2I*D1U}`ih$k=;sCiBfFR@Ri=VD(u)IomDgN^|B!x5_yH<)yc5aX{u
zMJ(CcEgI(zi=BNn2>fX9oqRPJ{Epx|`DzaMo$Y*+uU3KI6?`XOtp~pw_)fmcfFF8*
zFMRbVX7wPx(oV)%ltUflEBZHqdxI~0m1WXl^OXmBMpioeDhK>@@SS|I5d2AYzR4HW
z;7<kr64<1-Bio1zdIh!se9_iV;ISZW-3uLl$OQ8zwRIkJ%miPw^?s8MTU!$_xRx(*
zUaQfszSDEmG_$Ry9N-6k2l)NX{CwFKio50D9{?Y&H`>8x2V`e&v?Boi_u+`&Q%!cl
zUv0h&7m7#^JzstHF6Uf8&s`q_pL`a~U)?al)qs!VNP}M}?Ib(a!H&(~3x7T9GGuK2
z%7&h=mO0xo5Bx^(o$Ocx{tob+>==Z0`~tqPW0bQUd!Z+0xpTjCz~P)H1iv@<^c*-?
z{E)v>!JiF2%rShy=M}I@%L6|T{IO;}`Ye2i(f3OsQx(F78t^xRA1pS=h6eC!!FTdy
zGx)E7AIwH7AB~A+T?l?G_>Vd8T_~RhKG|<sCy00m7m-6Ue#q>HOm!RFsBucMyRwZQ
zyH$`Wt7>UUhlnl{E*DuYkZQqS3;u31U)J+6DG~7xnd19`=V#J!5d0$WL-mIX8^TqP
zaT?1>;BNunsXwNIzaD(2{-A$fV-xtn`h#p-4Sp^7q5QcKGM!h3_9y+5t5pv;`;-1r
z-!0&W@@H?zEPK$|pQ+$41wWKOiy*TeGQs>s?Tvz+Pk>MBvxtY#iz+@$YqWLHu?{j$
zKHUmF{W61-Pxpgg1AZu<#>C*6^FyJ1ItVgLA942SWbikFAIhh5A#=y0!F@_Gyc+z4
z;0J39c9&Wr+A<sbQu0^HnTEeoD%&iMD31&``E4)R1KD8t%Z2jvFUV~I|3CPw`<?RB
z=SF^th0L-wA=ba(zXbj;n~qYbp!O7jzXSXMW`2R8e<}DsgWuoGH_eST;79)@xIbJd
z(*S-r_*a|DQyWa@#`_`D4>C^i)48jrT^XVdde0^vd}>3)i4ayXihAhynA$lJ<l&HU
zTIZL6?+Z~!75EducZyM}V?AV^4WT0g?WFf`gq<^R6U0spA@c%coa}Ug|51oKlEB{r
zekeP$A=C4*;QMJ8+A$COv%z1F&t@CLpEBZt-U)ghGEQr4dRJ&2_!paXOq1nloJ@tU
z>cHQQ&k<SZK;?^3OWIUMERHO18~!>;lV3aIPw`)Ec`RHmz=)rKKaYTqRAuNfJ$uOj
zzbXXZ5B?JHo!YV-{KeoWnf2c&+u{Ok9r$a(r*CBF?V$N{3GH0uv%*Hm^!S^zjR(N*
z3ckl&hv}Rv<}B>h!FSpxCxSmF1b-s<lfX|h>*qG0YOM_X+2A{!HCBN?2Ye?V*MeW{
zz;{7^BltPsuQ%6EdB7A?2O*<9?%WUE&_TaLhf_>ZKeR`A5mOh#(hxC~16}JOYndBO
zF|`o<z2G~ww;KE%A^4lYZv-D;*ul@LTp$I&_yGJ+G1K83^yyk>8+wDE48BuLq=KIo
zf}aQeWbmE(d@=afg{Xfm_!$m-YU390M}i-!&zm8$12UIFUhgl{8FMrg?E^oUA1Q8Q
z!EXlNDJG~N4uZcOvJnHY*bWgBbD-;~C!J$r75Ll1cZ!Mi;BO7V-v<8c;0J39SlU7S
z*$jTDm~dgSko2^(4N2hl2j3|srh-2de5XF23x0A4{j0&h41A|^gF5iZzF=n{)L%{D
zj{x7Pzcm;(0sKCY)%(hH*6sqIenG9jnQvN;B!NF0{8TgFbRIYr{KvrWXXcyEy61ww
z9(<fa8TFf<5w8Zn4t&dc$+XU>1OG$tgY~g!Klty1A8h?dd<_+E20z$Zh~~{I`0rit
zMLge*4S$GuPKB;{HO{u?fqy^vPPQ%v|32`YY+VcfV(^`8O-5T+fG=$Q35Pi$Y&`&7
zp1%k0cNf|ng9DBU;1}Vuu1D@K#c3(|ZV+T1fsB*AlfhpOzSG`u4)`0vcbbD&fxj1g
zCx5L6e>eESV%G)xwt;^D{7`Ms&d2zB#@R*}_<r!6Y)k^5-d%RGaVq#L!FRH8F8I~p
zhq7@EWcG)!VI%n6o^`fiC-_~#&xKF)zBIi{6M^KC4Zc%9_5gnZ_`}WRZ!*?n$>7fc
ze}<VaW94eKrp$p%9b|%?Us5bB1piI&o$^FA_&dPIk%iF)KKFNlv>E&l!4Kufy^uL?
zowJS(NTM;|htd%XnQX{RFxwF>7r)ewH1Jn~?=(i~UF$XAzX92ZLOhI7V^r-||0(@S
zy6AoBVb3}D3%y6(KLmdp_&vdQvh^VN*MaY3>vH&u-m4e3zS|+BtsW%HcF#N8ngjkX
zA#7a;{@xI_R)c>o^gG#_gtqhsU)b6&w5|K0>x~e$cE-b@mqPFpz^?({Y0PJU{}lMx
zWf?vjYxJuh{Kp*hyHI2~_*LN3nT8%8w056i=%|IvE(aY*ds-UW_zC#6_#83dM5~_1
zr5=cAW%!f#5BA%|COKO?lI$A%=}^nE9i3$<b|<2v)<V|F2W8-|0sl(Kn%k(J16F~*
z5&U3zll0eu|85BVjo`l?LjM8qcZbj)b1~+Q5c(6rZw{e<BKXn&bhf_?{IkJ#ilHj-
zyMceL*+1dqM8}EtgMT&nPV3G_@Uy|ESkV1zdX9Pk{2cIu<x|oh1I1IoA7L(!7@P$Q
zh@S}lJn)_RXCnB^Lh#GLUk$!v`@w$@e5X077W}2)V>@HC&-AWu<01G5n17qOd^ojE
zo*%?uqS_b2zC`ewL)bSF{2d|eD?0?giuq3V)q<b=g0ue`!5<2~lYb6`;Je_H7<4R^
zztQX;%0Z_0LkB_T9>@$f%b4DsoDBXm;14qMp@WV)DTd~N{}%X8eY^_%I`Ex*upaz#
z@x3f3{x<OEf$tRK2f?2OzEcc#!=|YW{L9Vuo8F@y1peJ2^iKwVVF>+mz+VtT|0?k5
zAG&d}e?9msLg?QH{&Mg!)QvI1XM*JagW#_Qf0UVz{-LEE@w>(1Od&-5gTUVqqW;O?
zzZ`-;2mBX9@K=Gq9(<=5UeEkaX8ZX$G1<Qj{3k-_KM4NgA@p~PlYA%rgTTKpg#O9k
zSB20&hxzel`%U9(71!?+pX<S|4pIL$@E-%;$^L`jQ~Wsb>3dQXpTYRau$jI;MgQ`W
zkL(}bG5XH%l#Ve=+PFKqDkIz-doGSl?ijnEt*2vRdAkuElL|T}4(S*>q+`#a9bH2^
z#tiKkJ+xz#7LB6wpoiKKNqYEdX$dPDANk%1+O1)cc<=G4u*l^nXe+`apKPza5+1pr
zz4o8*$Zt>3K5P?t`-xh4L}XKYttKLJb9=2SGV=2iwT+RHFPx}-7a94;iP}ePBmdPw
zo8K;Sc?a#8c9929)P8FhS$>kXBI@it9khQ(MZVWTd*~!ojyezZf8ywT>@~t8e`%-f
z36K1;o%UiI6l{oytclXTkBGcKO8a*t2%of#{3=TOy=~+>QCfYwx-iy#|5;(3^T3{y
z{99Pqs_@8%!?kC_aSuLSqW(WZ=Kk};&b)jQ25;EDuumhx_O!vmttPTNe%kd5vW~0M
zS`Jm$q4?5YQNtrgYd+|;`0xHR!cM+3EOJFy*mGf#FNDDsz2=rsJkohA{Lp1jTo@L4
zXPEX^G6v>`xTXGpu1=Rm-WYaQSo{0Kv?q-g9ICLz6KK)#>$nGwd*HYSj(gy^2abE-
zxCf4V;AlNCRUByH-6655)if91t2NeB5mK|df6;dT2H$s32Ds#hllb1VN`AoGLgK1B
zC=svMh>P|sbm4UxaWycX_M3F!_()to{N7SXA8Ojjd#pFb<!UFfE#K2GNz>I{g4T}(
zPvm=Xeu~fH41j3_Tucl6E{WmHE8-7$@-8l}PCH%kJ6h>!+;C;Liye0Y%d7gu9uzbs
z_iKx6AH)UecfMcEj&0$4WoI+rPhkGfe9zs%wf%9>$o*p180(UhB*rwxsf<O8a~YR1
zu4b%ZtYd6oY+`I?)Vgcpie_{%#xf=`rZG-sEMlC?xRh}<V+~^+qpan~|3>M%Kv{Og
zuwj?EdXAq~THr5r#l`mN+b8ytxKeQ&*NX|EY6$}~Li?`8E<<q?2F_v*1Q!e7RrH|p
z6ldW$6{tCn1sPmSZ?e(*GF{~X7S~enAq+3~rG=4Y#-4Y)_<Xvi#;suD&m8<u^{V`$
z=nL^7OzWblJfP@*#fM<+tr7C4Xi=-Bq^up!o0xurjo!rc_BQ%Af_|oUmCb$%YqB$j
z^WSLP(?!2cL3EWDRsKo>J(QiUhh=%Yo!xEpCWwV;r)cNe=uZ7O1`5OQ>mqBYpzR7~
z&tzf1soGZ7uZqmwN$o<?a4Cw!LZLrKvybyKp{Gl${;goTy&vh_pD^tVJ&&qdo&o(_
z_;cUAk|NHS@o_csE76NDk#uo3hL05Ar%00JZxiSwpD|C8J<R<KiI3<mF-vILElh8R
ziGk?9S4aXLQ;92%=?{trGRAyB-;F2vM-!zSj?%={0g0dJd#{uC;=2a;cp9=b(YM|%
z=`$o~WlZ1wCrJ?RT;XFL1~AEgRVnGJjr3h&qR+t@I$c90XknPRi2m69lA!!^2h%@Z
zX{GOC`icTc7w`GtV=r_$>4{)Ji)Rd=pK%iF&zADao+V80KT^_rNzhU--;thm;z0(U
zxiP&D3{z#9Bw!BcB;RAQq>Arf;NwC}{6v4B{XB>Z?PmJg1(Klpm%h(M@|!M|bd|P}
zQ7O@XpC#$a&&^DKaJZzWO3;R3fRVgi|L07fG*b$0XZe$`P$2o(yCmUCrVnL$G}|xE
z)WN%r={<W(K}8=A!$?n`6;}G=OfOg@=_)=yVfys@BwhJ=0u~;mrzgilyku)HF+Gau
zs@~t3{sPB|q8DKyLV6-NPHtg6bx3qXAItH;&CuwzbfTYqz15z(L664jEe50Be63{p
z=J{6n@mTngp4D-ZuHrDMo21X<_Fl}&9%cGO)|1BcqO+uYo~>PH!%?LFNA52kPTD@E
zk7jx0&ty1+<mor!=u-Zf!t}S;KUYe&R>kyZ@+Cph>0MFMQ(YzLm$UqnE=fPYbX9MM
z?vkDnD+Sfq`IhNrJYIIQo^A+u(!YfB42QLL6VrFzDg_6y{CcMMER_U=leq5eA@xk<
zajop}y+%_4I?dLPSDY{9H*&wjJaIkC^qzg?y&8`x7fAUo+>go+`<TAzYALVUOYfPS
zOqpY~q$7=sYb@y0-ZgXNy|RBV({JNEmdo-#_muKiu>4r2--5&?`i1*f*>n3vl71aK
z4BaQL-JmPmm?WSR0+RG}St6+zKH@57dd)0(uf~fDA4vWR4nP&>@vxid7cyP7i{yx2
zlp*!N3~?1OJ%;nc1f~y09whnBvn4_4d5`IHmP@*7*IdLI$^SS+(p_N^>6snT1Kf|w
z&Pt3=qW5M!Do!>teWhQPSM7ZuUdnIHlXT_7Q=nIUmK^!_QqW1ipT`B#rnqhpbiOgc
z0tY?sv7TDaSGRDPR}-ZEti_U`Y*^V((r5GdRpaG7riXLCbYeX(_m}cljFJQu|4UGi
z>|b%eq$~OKL`fgSajx=}d!VFOa~@Ok+S!*$x;;NHW%>o|XC;3*`t20dn~QNw7yWh_
zU2n0xeIB77a3MQ4a-LD~@FWHT(d(DU^0gAQ0fQuc%srBz<To?D11BC855o{Jq~}|=
zlvngRrYG<K-Oc*%yh6&a%#Z}QOI#l?-JU=Haix^+GEB;;{yjNK(%arD>Dwh}z9Euc
z&4H=Ldp;IaWM>)om$LKUOz%=G6)5^UsE_3B{k}R`(ie08s(!CR`$_)hkx~!Row!EA
zUn=&PB)|_k$xn)xR3$TRgrtugE$J!`R5Shgn<f2R3EDXbjFZE=;?MwrVY+&QPWtWn
zWHQsQK|Io>`gaY}6K|CCu@bcDDN>Jp-JXGVlK$n>q+mMB55zbj`YEg*!%AEaGJO*2
zp{u(D&7Uge?ej=`w4e0Y=bc-a{sQND)nC2GNckw_1G-eZ{sOx4t>nnR-?99lh4TIq
zW)4Hcsoo^cC#rw9G2Onddm00r<S#(Jp-a`<{VGW>x>wR~lc4n<C+P#3plrL1=@TxM
zg7GYW3mmItm?U5`=v1%W{;n8TL|@2ylz)C@`lRcm7Ns*|yp*rGPtrNfX`7h-!aPau
zBSE_d6A<aYty~g{nEn>V1JQflAqj6VJ>nYlHR3ax<1>osF3?GSC_7&H?FXjY*L9Ch
zlJeU*pQ~}v%=F!ymsGwTa;=nK!FfacjtuHPeR6Prrh`uQ1UQ~|vz?QsNc!`<p1hLj
zD?nF1WRid{S-#?KNyV@g*X8g#>3^T&M9tT`nBHZ8l;h!{4e(0&1)R5$PUSUK(&sFb
zx2j(nPrzwH_{o|&Z)IuiK9<kMyiJ#i=j$@1o)V@jdy>(9va<p0piB9)Q<kKEHCxg-
zytMO~USZSI9^)sNf35+Y^v7}>s(xI~^sla$`u`(A+sE`TZ0m%6KB?z2cChM~e=vPI
z`%T4F)pRLupVxZLko4_r|4^>?^c+c#s+0s3&%2p!U*F!1d5+p;-=B^}dx&n|kKf7k
zqPwJi)sGc7NO}9d@-?O}<atfCYX{TEu-{7A{t0<f&$l;A!UarU%k&WgB|-JkuT1Yc
zSJGA9{&T+6Gn4bxcGmOP0!e><oFrVt^aiFciMP@pE0ppNE|m1sSpIXS+t*`Vi=_PZ
zW2GRLVdA=x>64esd*z3uKS}x791lHM{u!p9gnH;w?QLHy<>%fh>8gK|N+jLBPrrxh
zc^tR5$YR=yekmV4QxeW*`p-;%H$xKWw?yblg&f600_vwLN&Llm2-BM}p6KFcYZqcZ
zCizr$fYSdL&}kjGgZq(w`-`r&Wm10cNO^yu1Z@D*6aFj-7c>1mrrXztx6YD!5;30W
zQs-UcF#gFN|6D=VIBjWnFuh=fq{BRM4Mu$=Z{J6kfv)<3MFrf&@^(GRnD2wh{{wW=
zZ$A$?=O#&y!8}Qq^8d=4CB1fnq^osEG&+>@Jb-aP7rR@V$#fU@dnd`(M$DD+H?sq-
zV)`nkFGZZvrTl#Ftx`U~1QoXrVO&wYugw+WdK-5#JsNRDR~HG|XXR4<BF@9>nf~-V
zN#8a`64ZQg!F)+?f2pLO%knKuzli5el^;qMNO}8u=4+<g&moI$m-5f@xKn-fKGXB!
zt@Y-<CgXPQd6Ld%X}2RUkRQ5me5yGA40NTFO&1VXA?1JPc~<4m$U7wcOO8Y3huNS9
z)AN!8y@B=Ifq0>-w*+nIBB_5W+qs?T{TEC6>mwyW#nqQgx1UG-6Y~nSH=Gl#vNLZ<
za64}Wo#Y=&mHK;ey-{~c`nx>f#CLDO+spJ1lBA&8@2^@a<vrXW6^DhGhe-dDd!#(V
zPh3-$N&3!Md5>vMT*Kh^VE()XbkQ#EkWMUr!*WTt&tLPHK6i=~9Lw_8!Vc17kB4WO
ze*a1-sN$pp`kUluV7{VD*_Ot1d%Lc<SIVEvcB=6;s!GzY$GE49+4yZB(iyGIzCzN)
zZz$rU=RPUFiN|S@WNUPescc}9fCpIq`THeR`DZ`VALM>i_PmC6QoHQuRJ~E2=-oz3
zJ(qALvzY!$vLvW=Z?9ESzPv!vm2G~eUr{RQs@|awNcmL63tewW(5`w=(xYtgGvpyj
z|B>TU<&#%HS9P%p0iUwGpY2!UrD(O((-z~5E>$-DVM)I(!%APp^i_x>x>Vf${Shg@
zzMrHkJy$;}>GtPG6V}LmwEY}=8tCNb=ayLYY-W1S1W8Ympk4bHDZeQ}5>)^0WcoDj
zC`ETYCgof0gP3mLKen%y^3(IAex81`>zQtUzBB1>Qr>^Flvn-xBhxRnjiZdmrF;z!
zMEXrQx^^+W0OOCYb0lcfo{;kPco?@<(l_zEpz>AUCnbI1VyS@Lr)^@o{rtbzQ&N78
zN6KHw^`<lZty?64!%lmX=^Zg&(bY$SHuY(#r}|<^xRU9&F?|Wv5p*g4oL(d4wPGv%
z)W1vmG|pEl|NPE$`+W57Gg5xg^-_<D!^@wQ^yk?Sm7h;uC+YV6+6PRxp9}SVPRgIn
z{i5tCVES;5LzTC?Jul@ekk9B+@_werCQAB13EIa@kC`9|D$Wc4LFe{oYDv7Wj}DXk
z`JmHydA?BItM$pcT1ijk0eTVZ-_LaWc)97HQr^DL?ec=8+xK@rF}*fkDrV5${Fjt}
zi{nS-nO9*L+4<O|QeMS#(TkGad6c9pJ0EBI4jynSuC$k=d~uPKSN`nB^fX?d^pI?A
zKGW^z#v@;rdPXjnf+|jyGQFs;q`O&9R-KezJysGrG5s^9`?=oJm>#=9%3pqqByh8}
z;Y?5JC+S03{vgx$VZBM0vS-9AQqLrwzf^mxm~P*fWxguq`^=Pjc=&1kHcEOk_lsJe
z*Zf=3J2G9(BNdw@{ovJ74>v>msNS$ma^&A$o29&cpXFovUXEvWpO*ESe2!^<{#67z
z#fiUI>Q(EjKflg&+x*q>4M|_Ybk(k2TO_@a?N|Ps7e@7-sZHefQdArM%<}egq1TxH
zZkCi({;zyf>fd>*q;r_!-wBiSF)Jkf9Il}2Taq4wbst?Z60}p^mUR0#9mn(tR;=uQ
zhv{^FOqUuj5e-sL)gnoUTf}whJCeTgPx4;*{~*)t=WL1ZO8EwkXEpBP-;?w`oZq^z
z{?C}6Q7Q>4|9rhw%Fml6>AhM0p7$kvJ&)h*OyBi^q&M=sp!)ru4<-Hj{!;K#mTzXd
zJ#Spp7(70QflhH{U$;#BNYd@+oPS~Z%{+kAd|JnJd;a->=>>jipla{yA4~mqe{TFl
z((U`xE!!mB{{BPQr;>i%y;8r5ha9F?@c?BvY2ScOac*B<{mk;uE|hw>8}RR+N&WWs
z8Hzzyb+PLOtYCTj^R>bzsb}gaDXqriE1ygH!W$)B#m}8PB)!KnNmt{d#}|@rU;jM7
z^q07yDnBRel=6>`lX{fRGeM_)L<8qfpJZzbSU$C{B%H_eYrd3v=44BP8ecU`x4+l)
zG1C|Gx~>!JIqNH_XZO{TpzN8<^g-O-D_MRW)9vqj4EkE?vA_RN#Pm7CrGoCP=L@DU
zX2r_SdzAb{DX7ku&fLXz^1xDlIBmD2KWNKWUori?N~uS+>()I|{w<!@&SiUkV*1JK
zAC*7H?3MDT+%5%kS^f#8f0ZW*>^`l>H&T8x_t!Zr|0dJz=eqUZN_o4V&-ss}_gNwp
zDEkYTzLN*8(m$+O$~TRZ@`+q;In#5QpyK2$rrXcElE0IB?C;&h?vr%;`u5E4CEdP`
zI(fgO+w)-_=&CJjqJY~S=znEB_Id4wAEf?mbEOv5t~E^m;08%gm7x8|^u3ozf{M3q
zew2FVaQ`aXCj2Dny*b{L{`3Qq{{0<NkCMOYXV$Y^(pA6w&UE|xcvF6n^7eh-eN4B{
zn_HMZCeCXAs$Zp^G#+0Z7Fx%Hl5UT~e=yw@FZEm|L3{W&Dc^OhB&0F@JEmWCpCp{d
z^t9ily#0C2BBt+JDFxLy(psdvJ^u`2x_!Of%=9FV|5C1ZJoXhdKOVH%^Eak9-Yf-G
z|DJ*M6UlpQ<7F??n@3pf+z>A1?dLYXG2K5`$`6pB^=l*L-{wHOfay;#{Q&15<%bRt
zQr`Ytz{B)&^Q3}dtY;h3SIv_IrRSwcsplnL_^5t-yRD?#pT8Vn`f|<#oml_ac2fR{
zxmNuZpu1Sc41Zzy9GgF1V*2CDta{FhqPLk_UkMKM(V$a*MX#{xd4lQoyf+umH%Z>U
zj(v-sdxD;{O6rMZ6SlLw{rTx%+e<yGIFYOI{t46V=lQWGO8sR6rQ+*Z{~FNAp0v4=
zpysI)I!OAt_e%O8mY>FS`?=pgnQmX#ZDo4rTcm;uS<eM0N&SQKB|+K0gz1Csk#yA;
zpD_J9mRI!N9i^UvSyEn&BdwF9uk0`Bs$KUoeH+WG`E(>U{^W<<@lsyJZN$lvo>4C8
z9KPBwO#gU-q$_)haG*+h?C)>v0$s_-67p}mQ>8rpo2+yxKRnFz&C4YHS_xXa&QgBR
z0!b)h`lq0~__G=Ivi#~oNmc&&{4}Y@J|A`MBI&ujj%Bm7MNF@*kb1b;+O4Ncd3zi_
z$Mml3e|D=jHb%;yd7IRu{JfOuk6bC~r%KT71Kq`+&G0PCC-8nv<*_AaNc|mSrL>z1
zE$k}k&+|G*^~JC=B|X6TO8IkqH%Yg@w{|zvYZ9bl<<E=HlJe)Ve@^3i^O<g6_ikkR
ze(p!*hhb++Ju??e1<KAArqjQ%OqZfZxTJjBQb||wyq)O*Ztq~p)(X2z`KBC6NN0Mt
zb0s~I?N@&2bDpHH87T#opTA&w1p6(G^?cYv%Aa?)Byif*V$YX!`nQ1TQubFd-Ja+F
z1G<utCFI{zFOYg}<G@t&h?bsJ?2qeHsCm7a({jE3%o!R8CH~Us)B9v;*}h`mjNB5x
zuh{F)_h#i47WhganO*3ekykh^GtZmtFDx$cW|o#|S%vvUc|N}{yH9Lz3GejWf?RKA
zadGA>udl#gJWHEioSE<QW|!vY&q5K?ofndRi)emkZb6@{q9V;ZDczqMH?Szzm*u-L
zx5VeoDl91R7nf%FnbkKlFRw5w6Lvwt3`y*tJENem*e7oiz24kHssOhMab9nUKhvL^
zC92HL%*&mPyTSr*W<j<$+b1>CeQa*7<{gnbcIc2)6e*qNP4SXV+USxQsf9CU_==@<
z-r?hhjCOn7W0JjIv}wec@m{xwiJs(fnm75HF+)bD3<J;7#%wDAHWkA@u5aw{;py%S
zZ^n?JscvYUG$!4jP?VWloHA<6K)wFB*p&RD!eW1BL6*;*?(dtQS(F070bXxbSy^0M
zT>P}m5;PMn$}O0Yl9ld{i_6N%M86hi=K4!gvfSyJ_~S;={xf}9a9>LLKrd+cOT>gc
zUrC9$A(}U36mf@v<#rE?PZ>EjJ<jVMnVKK#c8|n=Zuhu!e?NaIA|hpEa#054#-)$;
ziq8;)zPNaAN<p@-%*#R(ONugLNnQE`h|yg<-BD`?dc89WN<}mJ7Wi)T>K&W{HGRF~
zrlAc!pSPee+XqT(&m?5bD)JdF>Fc$+s=xPG{gf>Hlq}lCe!>m;35^_;4)zGqGLJVU
zeSnEEzzd(Ck+_oM+%u`IqmI1C2GGdMEcUs_jY?1OCXGl<89Hp@L~q|d34P+@%+Znt
zcO_cf<wZ>RsON^orHmuC-J3Aq6k;|<_Om%M@t7SsTsU&L*^#(W0S9i1@Z(7M5mBk=
z2*k0{jpNXk)M;_>=hzJISj3ZTzTW5*Q)8?_puz?U{+O{dL^NfHxhc5OV*+f77cmlI
zz3IL@47s=xe@gl&2)WTdbP5UM)*YAN9qr93_GS7x$VZ~5{qb=@a-i353_CF--Ra{o
zoTwsqu>OVm<RbV=`biDgajiQYqdd+%7V#y5)HEWIUyxe!F%{%umY}qok~ZoX^G<)^
zyZ+>#Y@Zw#h|T``xK}v~4mz5e;L+G@A8W&~N$>AXOYi5+|9>J_;s+vFX88P=UP^q$
zes4~0f!|wNko%`npSP&61Zgnd802E^G&+u=ZCrX^>SOpj-s>&)iK*1*%}hx<8c)Ns
z6vX||lNgK{UYav77&GEz7^VAzj!cziIFp-)WUMXaBph?f87eFs3Jdi)4mbKZ1sk(D
zn8Pt9(GH!_&nw1e>j8Wfgh-eNFmBxmCAqUXjz^h>PJb-9@~|@TWqb2|`O`|Ln`W;g
zp9WyRK5=7Wf!i_F;2MB<$jr_zR^#Y@hs)#oq1j^nRya$n41%UVbPf%AQ=c5c0^``a
zC{c7#qUa*5pj7X~$LbUG4Zc}e+={840z<67j%E;w)GZblrn$jsB9yB+3SOE=<y>l-
zA^vv+PqOR|bnx`T;u|xIv*CZ!+;|ink8y}ub{x7du79yFzi_4xxpg`=S6Hm4q+?-_
z;HNdJoPp%h-Dzci%o)!}4l1hDqEuf5L4;N=?)0HXB1@*FELKMzV#LMe72b$V;k3fi
zf^5tgBY6c8G(P_4th6v)c`@wVX;@zcTPll*5i_jXa_}5Wd&OcOw!^gdn&!03#>h^$
zEYD?c2X)#1b5o$jv&I5M?%6mEi#10w?YWV&aioxvIt|-NBxla!N4ExXyJw1phxE2w
zQ#f@I(jGRmjys{F82F}1+1L@#W;p0Z<&b+<`}(KvF=qqADm@$UK841++NOvtNrGJd
z5Iw<*A&)#@-nYhC_Ax4#I88MF?Oj%^*?hM<E04Cvqtv=nt(1;tK2<B)e$#L?R-h*C
zLkCufE%tvsu!1I;|2cU%jux@{L7zP7IlN6UZD%l#>6_r0hu#Ip#d$O6;L4ke1I-jV
z(n3|HFqXO5vLQxD98Dy-d7*)__Bo#?02<!*F@MZM-dK9-Lmul;3TriJu}Q<!PYZxy
zSODN4j+i)=7=_P#215*_OPzt0!5AumV**}lVgorr93+ZUrlWEYX{XJjq13btb66mm
zI|hEmR#@-DqZnpL)wF2qD^4lBIHt+R(RIp19B3L#LY!}klS{dV8wa1sx#kaa00sd2
zl7iBko$1fieR7nsr|&ta-&-C0sYp1Qur|$krjs0VF9uCV|Ie*?j_uqI(`kr<J1m*h
zwk+MB=XXBOpN8D!825OlfMXd9V>f1c4%z|6>Q)`->3P9f(_uYNFh>Kz*I^Z=d3_Y$
zWX|E9mN=vWl~x_we^^#KpAf}SMpP$6Zg+o7QbqpI2QB}D=G=HXK`AaQay~x6ap51I
z>GWBHGM%2}f}a%r&+(>Zu^2kz{#S$9dAV;}Fq_V#TJK71e*gdSSz}zv$Z@nHp=TP0
z@eo8ld&JU2JbI*Q8WAftn&OZ=$Cp>+D;5icAZt9-F%Ah5k20-mLYn?ZVh;r6lsjn*
z7@gK%J`Oe_*IHJrC&!xPExzQ%i#UR(bw}%^sJW<RC928<om(xH=;@q}bN-MA#m-SB
z9)PM{Bs$ExNkjr^^{~r091!bobe%Yb<mHNOMQ6C((!!%zwIzxP&~y|W>UiF$SFKuj
z48+?WQ1m<I)%q}TP)twS_0>9VXk{#>AF%0psT+@&Q}DROU|_OMCC2~SCjj)+ln?0W
zn8|6mkv<Vm|5`7AvA`1J+VS0kqge~N6ZNN#`DvrnJ}LAdw*@wy)YHC;j+4ngI;cF<
zxr;4C<7^@N-+YE9CKa_pGCxBT4E-4zAJ1IHYf$@U*x~}bdvY|cH*HG(hy(DxKAd}t
z4m4$qV9&yj(N@!v88Zrwu<*M;=ypAYJ53~iOkO|C7l4do4AbOuREut2YGBiE>Mz{z
zIY6rkgdWwZSCjbZES+1JwzF~)8E%_I^and3-lPci#0G~->WNLtSiDn}om=27E%D(k
zF6x{ATf9Ik_~P6dIsW{@62Cf@F&Wo-7E}H=Ee!0(PyfwyAyx~)(uH8?>B64#kgM&F
z+!N7sypB>L)4s8$usm>}w`dHO{bh*%!Vw7KlFu={S(*Rax}?>h%&-hfjGI65z|69Z
z<hSeoPkC1pBgv7K3zlE;v&+p0v<&isIIyMZo*$1T4zn{;UiX;swz_A%mM^KA>YVPv
z-Bs<X>UPfs?S&hh;lROr0tpHE$_Zb51X+lKB`$kG+5<wImJ3?*y@+@bFCrtevLdsl
zvuawJ$*!u-%FOtAKi~V_d$<Bb^x|YT{TP_!ktPyeO2(X0sY0R$bO7Ar%6v-1N-^nY
z!>i1(K-7)cAYu__aU0WDeQP$>0~hf8{MC{fSbob84`UU2BHm3F8(Lc<MPVsrr}^_m
zneD9A9b@v+HTBjlyxLum2epS<zPqq1oHQ<F^LpRhj+s;LVky1DE*4y=nEfskYJzyM
zmRwVthtNlBl=8T^wdoIACv0d3k+cCIIV&-=2w9QS2rI(X_zD4dj?#2w`j`NYO;Gd)
zBiNL7>re6_(Qh;@x4u?kL1o6hiyk2>9~lBzuYYx$$nd1`kZCZ?RB#_w+G2EaA9VWf
zJlM;2`nR;egU9_g242TC3DAqokK(RS*jh}H`eJ0kP?kxq&5mrhzuUi~zjjsALOX;d
zl>d$_>%<t?fg-P}j1fYxqU23DdM*U!9J&~o!xCV<-g50gQI%)8?>tL#C1bi(?_Pq6
z_Z|}#6k%#MRkDGA=w!-_Qy+DlxH3)na!qQzWyuXGTK^`R)^zH8Mc>Nf)whq_oCx{j
zhMt$z))>eR24p*~B&bdMv|f_c8s=}H05r;Du%;1S5U550Y<#LXy=AP#>S$$>$;<RR
zlOLioeUy`6AaT7umJB6^6o!wcr~?gm>0T@|J+15wt8qw-*;M_2ZuNR!!4`J2=PwVO
z1-`hTiXlaS5_*ups?t@FJu;e}ztCh^I8f#@{U*6oif!(avyw0jl?19&cpwZO7z|qM
z@uXp3F#x;V<*qn8zAoBpLW6j)m+VK#-T#s=?ePgZ131?Wxjl}C++fhb5XO?dYtk;V
z;hfWh%Pcn%X}sT+HHbIv6qje|Cgvq50PocyKCybsH*|ZEaLce{F`BZaIi&LD`NjMM
zp3LY&iY`?S-PUREbXu{=t#ur|D6bf3A$us8A|Wl^a@@W#br7Boy)nwKS1ooo@=7T`
zRZwqAfx~J7&Mis6c~!<20pVpSN?2<f<Pq(X+^O`4@bRm$ckXe@r;58AF7l5`hvwxV
z8s*w7Fi*kKQmUJ5QypJB%_ql;6U1O=)7kzzqcF%;GNplu-C^y#OHn<NWAB1n<Vuoo
z#Efkc_#g?UG5IGj=s5w`kUnUeIO!S$ND{6h%oag2LBidW>~eT&n9SMHe43pg!|^oN
zC?!8xsn8~1ilaR=%_gHSiM2Dh+_yZZ&5>!CrC6BXtmZOPwjKASCS`}P!*$l|+4%kK
z>Dh4CErsfmHoaGsWFOdwsz_3%93vWljmZv&b&hO3moDuF4!#NOb-l4BKo(H#%;gi-
zO_CUAHQ5kH@s_;3Czbx8LS0(^zht1paSIc|V^pw6S{}9_Ry(K|W)ZuThQ&8guX7T8
z8xnFz&sV|YBnCi8?Q6^mSZ`)27fGqcYm)|_krW@0c5AOFtO8jZ4&}8c=GQIChY$c2
z=tFpd;8uWC@uGYnCHPhOFw9&WrQ8y%sCgn7v=rxzSNEzicnd3<(cdnnU=&J@Jp}@K
z$R)>Cm29N0)+yF@SgZ+sxHZ`@GD}k|Vh1Bvg^j8r_lROKC%mepRFY}<rY(LzNj{J9
z52Oh4jR;@lGKWp}P~dpCq2%k+Aq1`N07!x<#Mk6;0_ogMksv4aAgf!?0##TBhaYfm
z_~pSNM2TDnV$TNb<s@m^N$Q6jxx?BcN0lVR$hlE_^n*UCarJ>qUtML$2c1ueqP2LD
zU80mRv{SXgQL2c#NUL+DH0nOo8YDw)Skc|B4f3S}YQUs)jwg(Dw)awmF-Ojd(ci*K
z*gPW})L4Rru<Ri%oDVpjp#ChCJ}Kd3NNYs9iT2zLuDM$$d-Nb0%663zmXLY9-R09#
zTpaqIEZvRrX!-E0yx<2>u;g^~ckk-iyqP`ZQt3%p>|;cSi$;f-=OoXoCF}y8r%rXN
zPE}}Q-#f2RJiFWa-i$IUOjS-~2gOZnLQVE^*|{>oz&!}Nw@EX|V@mXTC>2^HM0G=%
z23V=9m1#hUDRM?lnTEu=tff=YhEZFe3dxw_#v|c1x7LPl2CK~pF&j_z&H&J&ZY1iR
z?QRF1s9r9Yg(6ncIpu)Fis}!@gU%9b$wpHteWR0n^da)tCIb{*7-{pQI)%fN;jv5(
z>EKWDRx92QRK>20GF8LE`l?(Pe3-YlV?~N!wpZ%K=_Mgkl2lVm#>Em=ySG|8t?}zs
zMPC}-tO62}=E<56E`R_dLVEd+YJ2&rUClcdA8}rOr%E%ph_YXx!g4#=By-kGfN6Cu
z;^4MzEs98K?vmX>f+*4TXQyaOLRqq>zP$_cIR%igMVQ@MF-6GO1}(<~lddN>CeUa^
zvLkqOOB(#1S2+Qa2OYbpodvp4O`oR?7eoU2Cdw<`1sk=POo4tUB;#7ioPgbh(b2gR
zaNbZn9@9+mw(Y=4k}ETZ?TMlcYN#T?ppMBEEg2-|3`@F6=pfMMZ8(i9L_*%+TKB4W
z8_@lC3EeNTS!Li=k3(pya#6s_k%R0iNh56sD23H=NY#;SJ0T`X3iHm1u3-GxgzI2}
z2In0K=^8QG+w6vAlHy@waqQiNE#+eH#t@cNMI0V*O`WJ^mC5JkE>P236FVXvQAzAb
zS(R`zTPt<WESEUv-J4l!DN!n9*U-h}%zwXNe=MEf*9xn;^6=&i$guIy9IO`<eL<b%
z;V74#-e8Qv{93s~AU1hPVtQppi9a1$V3)*+NY7A*6&!WqF79&&sk=o$Bgv0sWzmob
z8Fn|)JWV0ytH>}(H*OtZSDP}ZC+>u-vF&$mpQDrOB13;FBm*DMRilD5_)eLkSTLr?
zn7foGZA_6)m33XPU6Y==wdpdc7?cuWY>SPEZnJyl$)W2U$wtj1k-kf1Ta2w*1b(G~
z;;eSBnypo6DQ>AVR=r4+^2{j`Ro$Ez?ak`&AgPD3*PIwKv-(l}J>)8(sbWBA>3TI@
z=y0tp1!Q(ci^E_8a%&j|^q@csX&Q@IPiZQkeoM!&rzU)@p=>OdDn19SE=;B3ruq?W
z)7H2}vkQu^&|sz75@TDJg_tnGLTGL?N~X4BOt_Tj5^DlU(UsN&KDREvP`PXNtY8$v
z6w&-3CrFa^pNWA(EP#?=8t8(R0GkBpHe6l}Jq0NPB|6s%#4cL+g;awU_oD-oqaeZ7
zZ9c3PolYujn79YHeUBc-LQKT~vjkudG1w8YAS#fJAj9AlT1Ql}wWQ?tby}AS5s-aj
zW4=AC$P(XC7?&-!f|s$3J1Ul;2uwg;(G_0us>z12RojB(YbU*VcN*BZixgl#zZ*Qy
zNls`%)b+PXrb+9@dbKjW9QDSOi%{*MwRb%i9V>0+Q8l&AZp4dc8yW$0It7;YsIj2+
z*XuF?2j9b4JH;N-=t!htTqZeJJ(F9mo^!Hp2r;M`5v)Ucu1H<ggfUV<5X#Ne&M4Nl
z9p;r-O}F5ygj`zVd9Z)B){$H}l^;ld4b(5%5=*Tr)0}2H%NDcYcro8g4M=;`4M<f@
z3N6S~<uzj31E&!%Lcw1gVS(dYij_nrAD>Cz(4Y@77;_D>?CdNO$`Z@1?yh!bepBQ!
zIUE~S+>M4~Maf;&d8l%j*Sa^#Y0!a`v526Z{<Yp$-94Me7xCNJVb2Pq_F9+S^3Dmm
zxZly~{^gmdr`>;3Z`d}X?ASWS^~QEO1wTY_(dj*&dhLTlN`?S`q!xVXDv97dPQTRO
z@YXgeU&$*I`gf`RBGn`^i7Ozsd~}g#=Tig+Y{*Lwb=l)JE&<>I7<Lxk(6wgmEZ|Sj
zVjjBcf$Jd+_*Lads7kb|KL2BbB!~BFEbProt#Xh?r>qAniK>BN0={e133#uFj|&-9
zw(9KC5Flz-HdS>eDb1CIy<(p-JIYtfl@lQ6)+X#)s?3x5vF?w`48>}YJ@8LDEPF$h
z!py5yeHt(qluv{8R;;2~UbmpSjHc{k3nPNTwgUUMibaHmypBa=^{x1dU?SVl_jOGz
z75So$!7o+7F%T44vYQzms+k5Br(VKTwLW-V8%cIsA~a5wg>V{#X%KG=FOamas1V3c
zo{e)DJ4r<sDK-PFz#3)_v;tBCATN#`s1T*@0nO{a1i!?0P+p|tz7TdzMvsBRMhdA4
zo!N5jkTj+&h&|WA4QjAWBa3(Sc@#t1qOA)77-??VVg$;46=i6!@#a`EDJyz(N>N4?
z36y?M+4y(G7`GJxV#>i=GArl^YcOqQfdH@FTKOg=Bx`xpz#GGMVA%SJ$}$4-q-L6x
zA;ePt3LLr0ssL_rZ=Fiyyg&$rHVm2-01Pkmj{d_a-=B?6KFppE$ETJ}bX&`qI(2gs
zgqaZQPE)EpjM8Y5#(>_HE#0b^l*N@}M!AdSoCtWOyd(t(!xAtd9`_919<LF`G0kb%
zH5Rrs?;|rBp*h)!(t|n~uG->GEj`#B+;d40aBV(SnS-E0$AaJh!^-FTPUbBon5{`^
zaAN<yrI6FND8+%1Q@kMLlu$W*x~Jf}$AIgQUCZyo|N0)iAMG2JJ$>>p8@&4{BkR^~
zhy5g*b$Q71O@kE*n<7b~vAx?c3S(<YBvvp<x_9fhcrj;3F-B>A?m5S828Oeoz;T6@
z7uK5+<+>kNb*SEnxIi#<k^DgXTd&Dj#YXF%V69oSy@6nLUJrFcO%p683Zp1(CZwDX
zOi@R%LyPN%x1T_P!#UUtDy`df;(3#HH4jNciKOPjqlLj_MWkqtH1uQ1tMhaVL^~w*
z&aK78`Dvczr>X?p-uo1bw*~o3y(WYIIg%F3qZE<Pfjn@M;N<6O5t*QtN^Q~<Eh$}N
z^k8zd5qolU;+JlwJ7FW%!4|K3_q^IREj;SxMeRade_xpzX%2sq1mJx{>~Tm|)xcar
zqo`?Q6k40I+a|OU_{G!ez^`y(gWND|G{h&)h9BmcuA%T8wT$wsQGSlt^dg@P7t>jq
zZh<fgsxn}g52(C?OOubXL#u$8X7l1A-ee2kvl{OJOh+zde8<{e)DAqKQBV;jEb@gm
zMli5KKqTExON!$59IeUOLK62BPB_fQ^Wk`=gZ7MmY^JitwuvFhHMvb2VDn=8miV9=
zATl#4JOIxKXh&<-jn;vVp!*VGFQt+hv4J>>nHCDFg0UfhWvFv&6rCd7G|_HOM66-?
z)Q7V<QsXSt#5F*{x<U^&sF7m2XL;m(Fdz$-WIh;JjOYomdYz)an%JVTTInTtPpQRT
zihsa4c5PZK)Nk!by9vmsRmpZmfAc!WTC{71<{V8gOwRB7?`OCA2B#Ox!fhp1FWaMS
ziKDnI2?#l$B^t}|7z@OjQZH8L1MGO2=GSh(J2A!TH)(xZ@4y9*sK7=G#g{#k)Gf$B
zwnx@wXBYx5@amTrwKW#wT$L(Mp>!NfET+-3uTUn;YZa)9gdIL%XQNKM&pihV81n#K
z#B6nLc0551l44_+6mH9NIW|wFdOJ&%P#4yRq7%}V<Zh}-p%n6!FHzMRz74Phs<W;K
zuOLgk8`Dd~NYQ~Mk{3Mj6r^upN}5S5FNp=~jb1x0OMRQu03^QO5$>@nrvl~0oKume
zo80BDbtpW^wC}n(v7$;@Bo+>a6A2(mH<-4i6(FzQKp~|3cs4xERG+NjWU=>5)t92>
z4REEMrFx`+5w*Ckstd#?>2lVkO|kwv${I%U;`D`T-l=RUrwn!OGTZmgQ!cT%s+O%x
zvBxMEImyx{(_*BWi+l?W%~ZV?EtjGuaj?93)I`vzkrr-|qsaWA%{Qf9-Rcw#tKyKq
z0w4<t)-dHrT3ImIV&R9dW9nALIb7r)l~Sx2mK9*$23UCLVOO!?`2iw3eM1pv@_~^g
z1gt^{=$hpk3u`Gx9l}Dg<&##|LXcQUvBv7U74Ms@r=Ubr6bSD4o_KLbXRB=A-0nzl
zL&Fu>(Qq*&mga2nDlPL`>8N$Q)z#NAgee=G$Q&X2QB|lX_D`wkH0)GQStnhY<y1pE
zuCeAJ?gL<fYQ=-6u2ekuoaG4ygTpEwxE}6iL~bg|GGQW|tK+7riC^I8Hc{Og(TRZ#
z*#>%3ZZ`%M2}s7m3b3}VQUMv!t+a561Q?_l?cF+Hf?W^SY-d2(aFtB$B(I#syBXk4
z76ez^D6h)|)?xt>DV+jSZN{4g;lWoC+>@k>m1~lB;IYqf`%!>NPev43+HCkGC4=Qa
z@kU^HMl)D|8Prisq2#l;Qx{=WBqG7;q!ysrXgD{_6Rh;r;+YT)l>DPbmC<zN&PHgT
zcOo|-fnPw&#1I_|7F^OUZplV~3_xSM=Zk8MVpYv%rrOo28;C*-C0bR43}c>m$E<^B
zNvWco;q@a>uW+wz231;7e3ew1U5plu+~H`+D&HR#JK;LFZKY?#CDd8CCf%sD5=30s
znaNS}plDbI@h4TWe3mQtUDR;eSXEH7FhqlF3Ng+Jv#2s~L_NolL~5c=F>AFneut`v
zwlYagX&Bh>T{LZ+(Bw^1l$gc^38m!qTO>BAXC=mCl|@o~`0Y^_E{>&19b7Ehkvf*x
zv(^jRWkVKQlW~m{6yha=9k7NDv!iKQX?cn-lt)9eXY;uPBAYN^0=dw|q-?*3>_P3~
z1}bLrfprZJ;3oRDpc5N)GOhxQaXg(X%;)yrWW1pF!@@7jurIM{71&-Yec03M)<bO+
zBONG6bwKzcCk*2S!K{=pj89b=zi49c2iRi53Ui_=xXp;fYIMux@Z9QU7Mpe5GGUzW
z^YWq{8;J<Qp{WERWY;Y}e`FKKROFo`f{qCWmIF)u<f<ql*ak-IjB&efz{sL~!(J%m
zEUFYQ78L?YTmgY?b1-gt%xay}g!?TNxG;)!dA2^GN7?E4*(e*$FOb$bR#CCE2Q6Le
zZA@2v0+?&t`UFDp(&eH>jgf@eA)ucNnlFQQtziRETR-dHlfTOKptM3^8@bC?2Y7;7
zfN^{=bqItz6cd`fjZ*A5Aq|3%VTlUXj&J1oWURn5H?`|UgtV7*^M<m9BI)}kNi?c^
z*_4YY-Oyj!3{<I6BRfDwj2Si+N<6S#j(<7Xbtq(4q89FmJT7W*A;=DBKRZ7%=;e|i
znS|t!LAff&@VkB#d|kIA1zFH<1D-&%00axHYp(nNU>gbKSDDI324~|gg`9BDx3dgo
z&0#Z)ho?wYJ}M@d5BJiz@p`OGHaST0AR9wif{m)>ybzp8ON3=>Lsp1bDH;HIOLx+B
z$pz*@n-r9@NNh6*ETW15geJ_EL|!2)z-z{W%V)}APg`9Bm35(35?T9V76b9)1Zbc;
zx`?|D%&Nl!-8B$eHk@awT+H6%!U`m~fFW^3D#9Cg^uBJG*kZC;XncjrjunMTS`R|N
z3yG@9WICT!Ty+IEt#q<GNtAISrrLZheX1@lVffjV=Ka>uK=i7OdmylUwX$O!k{~<9
zUU6`T5fmzdm`{#CKv|4VyclA3e1$UJ`D{L&K(Q}gWS2L+&j~lIyX-tywjIQ?96k)$
zeM^dMR1(Xy$dBbKyHQQiXPiJK($MiW!lEf|SvFTTo?t*_4xZ)5<B2V`(`MxXGODTL
z&eQYEc2DE-Ia?oGah~G=d5$Jb0to`K!4b7;XREmGjHlemXi^2M`90sC(@)`^&X-7y
z3${8h)8fc0H(7G*fn^wBf)Y@0r9qsQeZ3ncc0Jv#v9%cCGtebueHNxQM5UTP{)`eL
zhPH0)uySxI5Le5TUc%fsRpO;aa3Z#+7m~i7RmZwKT^s7(@TpcH)%k@cy(ud+1f_I$
zDX40ub2U-^t|~DWRg0ZgMTH|<+b0_Ka2ws*j!IT&RuXQkm_wZA!dK@R!`+m5#`Q&1
z@y?Bu+W?7g_<tB=fM}dPpAEB}G)Tipj}pMFwXFNwlo{h}x0~4^>d=lBJM)E$nkH=v
zyQw@es9Ur=FrZ&Js|J(VyfUVa`?)obB;}b_IVFxfQ)O^eMIjU}ZyPVg5+LFMJelHC
zF9|zIeX^|gmL+#h2he8yjK*D>?-c-cY^0cKD3RPI^@%B^4g)(ICyJE#o_zN(gX<4&
z`0NZNK5Wwb(~K(E?A$pTKYyOj^2sRA7B9|o%J5VaB!V(z7^^B3%RONLyLQnLq25F1
z)SFy`HBmE&AA^lCVd`#XNO!rlWYH`38sgg+v`_6Txb?adV74jxM0Ib|6B3C-#BN0x
zPIN<iPpOFE3{b@!u?F<dIGs-Nr^9EbDlgP6P}BI1og}%!+jtBo6tKL$KlykJxb7gI
zU!3Llzx(hZ$`#&J4>{Z$p+IJgwitQ(G!xD%o@q?WtqPu4M}|dy%DQ80Pp=2Zt9p(g
zX@z|73|U7%6Jnw(bW3Nt#8;Nv85Tc4pHzkeS_J#}M%)Ft2j%W8A5CXR88x7MF@U<#
zcS3sW=HA))bha2mJK=+bF<lm4O8L@(L++?9g5j%?O_Qd#2hUVhg`hM$wTaM%bjy;K
zxsfnd3OO-mPr?0YV^axQDlXQd>E$MX{3k%CcTE9%ED;Nx%HA~ILaJhx$Wn6R%Ut9&
zri!Y*5H~0bHbkur@9sJ+O_UkobwZI5<3NF8&O=CsvBQ*Y=hmdpH+GBRk=u>BZk;8D
zm(m1+q1WzRilDI@=CF3KE1(p~k*sHIui@rvS5XbD==kogS^-WEu(53hzl%PD-<jg6
zE*2|o$B2Wq-y&H;z&Pz-?k>1&V<3=JQ7*k!+}bo!RhYmm8&7PX%-#MSW4A{IeAN<Y
zw$EG`2fQbtlhHYkRKmcjgdHeQ3)oGc{TcADEG-3z@(W-?E2RUL`aV49150sReG9bt
z{IZJ2!<wmD2P#?O@Ey*j;ZY-Y(M|YN+40$Qq7&X!CqhW=sQ%&&yfxmk*Pa+FIK=yl
zMnI&F4bHpglPyQn^B0P~7Bt~W(T0@HK#hCAjDy0_EgZ`Y#j0IcDu_EtqjDXBMC+y{
z0Tb)l$o%bVl~!JzUnQ#!A8`fph@U3co2T?WCto>jN2mLjhXxNRLqlNRZw-#^^>X(3
ziz`^8o3#bJ#j}s>TGg#XZ2s<Bk732F)pe(vGH*lh%5J7wYg@s7iu9k>*1K>s2cmkG
z>Ot@nQB|#XiLF;RCUbb(g=O5?LQN-)1Z(n!B!nUzqe_!{6R8wxfbl98V^r2BJfvc&
zLy3~{DlPe{&698$;k8PG)pMWfUcMV^KHR%vt+^ZAI+L)nS-A?=F9#cVP>iG7MM8Io
zNq822((-RflsNjlSZ~*PLr7)F&<Y$CpCiV#t%mz*DK?4?Rx7rM>FJ4ml)y;whN4o|
zA{#5SI|HNA+XP!I;{?I|a52f(6V1SGvF&l2cS$d2kPCY_@B~s880Tu?T)+4Xp<~73
zGaZpp3a+o@NRpuH_2)0n7Q<&aE)Z*@;|c#p#gJy_y*~QJ<o)BxMgM#@MV`sxg?Q`P
z#rX8-+v6ki)^{H4eS0xH?x{aN8O~37{i7EXTtXigGyTaWvQ@^@iT5JIXF%$Pbb|Tq
z{B+Ult11_L{MtXB;wAku&quxfBEP~*6|3#frc@`s*UwL~=d<Bio}C=w+xQhOGa6;4
zi87uMv;g(3*>E-+;$i4J_;*}<cs9n@>n}vnr(S<FJv&2uve(kj@8ElW4*!1MeBWzd
z)4%ZXcg_2Jpud$ruj9op;~$@Y&z#T4oAQtG`>zDA@8Y#Q|HPcn$8QCH{|mwEz2N-6
zH0Sg2M)3FH`9HwtKmF>fDc}F6=6pW>kvadD%rU(GA>RKr{NwY#H0Sg2ZS$I*k;abC
ze+|FW&lvycPx$;B^oRK2<DFmBulfIQ{6E46Uy1vF@7MKT^6@QmBHuq>hmU`b&wnP)
z|HPcn$4|}qbX#<veE;U{-e2Jt8dLth{ol}^@bQMZVZJ_}&(HtY=KKfxwBGq|>R;^9
zd@-H>+xQor|0BFdm*DU3-M|a_xuO2=(fXD@;r#zCK9uL*xS{`=kDt<q;^!OYcRv0d
zUd!{p_<j8ceB{65ui)2w{4_ZK$L4%KezN5H{}i16!`Jnd`1tu1Us)gdy8P}x;}?1V
zZ_|L_hmU4D^_%!V9KX-;9-Ytg-}?kF=;sslfA8Od`{()7pZ0qHf?wqM|NbNW2_OH&
ztVjO)@cRD|od1n~)PKpxzuDz8^)bBue+K9O{g3tE@$p~ngX#Cf>;Es_rX_2(dGE9T
z(|`Bbf9Yd5-h6#Nehm-*b#eX|=KL?r`TTeK+uZu+_rH$wY3=j%zclB6$=5gcZ^Vk-
zKYU;RfOBd5`TU>!Oke3I|E-U&(TC!PuggdJT%NCA;e`LuC-FY#ui*3e^*3=cy~o$T
zufDC<dyUTzu796TG{@J?^=}66^Z9=eyw6`JkHHkHGwz$~|M0f{f^XvRd-%uq&(HO%
qc#rR0|E2!_vv27ueEx@gCH=nts@MCilJo!K9er1S9Gnom?EOFA2dakv

diff --git a/Source/Utils/main.cpp b/Source/Utils/main.cpp
deleted file mode 100644
index 1366093b1bb..00000000000
--- a/Source/Utils/main.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "MsgLogger.H"
-
-#include <iostream>
-#include <sstream>
-
-int main()
-{
-    MsgLogger::Logger logger;
-
-    logger.record_entry(
-        MsgLogger::Type::warning, MsgLogger::Importance::low,
-        "Particles", "species_1 has 0 particles at time 0");
-
-    logger.record_entry(
-        MsgLogger::Type::warning, MsgLogger::Importance::medium,
-        "Laser", "laser_1 has e_max=0 and will be disabled");
-
-    logger.record_entry(
-        MsgLogger::Type::warning, MsgLogger::Importance::high,
-        "Parallelization", "Parallelization is extremely inefficient!");
-
-    logger.record_entry(
-        MsgLogger::Type::warning, MsgLogger::Importance::medium,
-        "Laser", "laser_1 is out of the simulation box and will be disabled");
-
-    logger.record_entry(
-        MsgLogger::Type::warning, MsgLogger::Importance::medium,
-        "Algorithms", "algorithm xxx is experimental!");
-
-    std::stringstream ss;
-    logger.print_warnings(ss);
-
-    std::cout << ss.str();
-}
\ No newline at end of file

From 43ff84d9e4bac47dd112e0d96984a29e54dd111c Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Thu, 24 Jun 2021 17:20:33 -0700
Subject: [PATCH 57/58] Fix rst code blocks

---
 Docs/source/developers/repo_organization.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Docs/source/developers/repo_organization.rst b/Docs/source/developers/repo_organization.rst
index 41389672195..d9d64f7fbc0 100644
--- a/Docs/source/developers/repo_organization.rst
+++ b/Docs/source/developers/repo_organization.rst
@@ -71,9 +71,11 @@ Below we provide a simple example:
 
 ``MyClass_fwd.H``:
 .. code-block:: cpp
+
   class MyClass;
 
 ``MyClass.H``:
+
 .. code-block:: cpp
 
    #include "MyClass_fwd.H"
@@ -81,13 +83,14 @@ Below we provide a simple example:
    class MyClass{/* stuff */};
 
 ``MyClass.cpp``:
+
 .. code-block:: cpp
 
    #include "MyClass.H"
    class MyClass{/* stuff */};
 
-Usage:
-``SimpleUsage.H``
+Usage: in ``SimpleUsage.H``
+
 .. code-block:: cpp
 
    #include "MyClass_fwd.H"

From f1d9caef0aabc07e8e5b13f7b50e92b1d5ec16cd Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Thu, 24 Jun 2021 17:21:43 -0700
Subject: [PATCH 58/58] one more rst block

---
 Docs/source/developers/repo_organization.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Docs/source/developers/repo_organization.rst b/Docs/source/developers/repo_organization.rst
index d9d64f7fbc0..2bd1b939f3b 100644
--- a/Docs/source/developers/repo_organization.rst
+++ b/Docs/source/developers/repo_organization.rst
@@ -70,6 +70,7 @@ the forward declaration should appear in a header file named ``MyClass_fwd.H``,
 Below we provide a simple example:
 
 ``MyClass_fwd.H``:
+
 .. code-block:: cpp
 
   class MyClass;