From 8afec3ec7045a3c88751c6c4a9d96bee260c82a4 Mon Sep 17 00:00:00 2001
From: Weiqun Zhang <WeiqunZhang@lbl.gov>
Date: Tue, 19 Mar 2024 08:38:59 -0700
Subject: [PATCH] Clang-Tidy 17: misc-header-include-cycle (#3820)

---
 Src/Base/AMReX_MultiFab.H                    | 4 ----
 Src/EB/AMReX_EBMultiFabUtil_C.H              | 1 +
 Src/EB/AMReX_EB_FluxRedistribute.cpp         | 1 +
 Src/EB/AMReX_EB_Redistribution.H             | 1 +
 Src/EB/AMReX_EB_Redistribution.cpp           | 2 ++
 Src/EB/AMReX_EB_RedistributionApply.cpp      | 1 +
 Src/LinearSolvers/MLMG/AMReX_MLLinOp.H       | 1 +
 Src/Particle/AMReX_Particle_mod_K.H          | 1 -
 Src/Particle/AMReX_WriteBinaryParticleData.H | 1 -
 9 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Src/Base/AMReX_MultiFab.H b/Src/Base/AMReX_MultiFab.H
index 91e278308ea..b2fc9c80a1f 100644
--- a/Src/Base/AMReX_MultiFab.H
+++ b/Src/Base/AMReX_MultiFab.H
@@ -11,10 +11,6 @@
 #include <AMReX_Periodicity.H>
 #include <AMReX_NonLocalBC.H>
 
-#ifdef AMREX_USE_EB
-#include <AMReX_EBMultiFabUtil.H>
-#endif
-
 #include <cstdint>
 
 namespace amrex
diff --git a/Src/EB/AMReX_EBMultiFabUtil_C.H b/Src/EB/AMReX_EBMultiFabUtil_C.H
index e47ad765bf2..666453cc117 100644
--- a/Src/EB/AMReX_EBMultiFabUtil_C.H
+++ b/Src/EB/AMReX_EBMultiFabUtil_C.H
@@ -2,6 +2,7 @@
 #define AMREX_EB_MULTIFAB_UTIL_C_H_
 #include <AMReX_Config.H>
 
+#include <AMReX_BCRec.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_EBCellFlag.H>
 
diff --git a/Src/EB/AMReX_EB_FluxRedistribute.cpp b/Src/EB/AMReX_EB_FluxRedistribute.cpp
index cf48f034f20..409576977d7 100644
--- a/Src/EB/AMReX_EB_FluxRedistribute.cpp
+++ b/Src/EB/AMReX_EB_FluxRedistribute.cpp
@@ -1,3 +1,4 @@
+#include <AMReX_BCRec.H>
 #include <AMReX_EBFluxRegister.H>
 #include <AMReX_YAFluxRegister.H>
 #include <AMReX_EBFArrayBox.H>
diff --git a/Src/EB/AMReX_EB_Redistribution.H b/Src/EB/AMReX_EB_Redistribution.H
index fc177ce1c4d..6d816d45d50 100644
--- a/Src/EB/AMReX_EB_Redistribution.H
+++ b/Src/EB/AMReX_EB_Redistribution.H
@@ -3,6 +3,7 @@
 #include <AMReX_Config.H>
 
 #include <AMReX.H>
+#include <AMReX_BCRec.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_MultiFabUtil.H>
 #include <AMReX_MultiCutFab.H>
diff --git a/Src/EB/AMReX_EB_Redistribution.cpp b/Src/EB/AMReX_EB_Redistribution.cpp
index 54fcea3889d..0bfcefa61c1 100644
--- a/Src/EB/AMReX_EB_Redistribution.cpp
+++ b/Src/EB/AMReX_EB_Redistribution.cpp
@@ -1,3 +1,4 @@
+#include <AMReX_BCRec.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiCutFab.H>
@@ -5,6 +6,7 @@
 #include <AMReX_EBFabFactory.H>
 #include <AMReX_EBFArrayBox.H>
 #include <AMReX_EB_Redistribution.H>
+#include <AMReX_EBMultiFabUtil.H>
 
 namespace amrex {
 
diff --git a/Src/EB/AMReX_EB_RedistributionApply.cpp b/Src/EB/AMReX_EB_RedistributionApply.cpp
index a6cbded198d..636aa546147 100644
--- a/Src/EB/AMReX_EB_RedistributionApply.cpp
+++ b/Src/EB/AMReX_EB_RedistributionApply.cpp
@@ -4,6 +4,7 @@
  *
  */
 
+#include <AMReX_BCRec.H>
 #include <AMReX_EB_Redistribution.H>
 #include <AMReX_EB_utils.H>
 
diff --git a/Src/LinearSolvers/MLMG/AMReX_MLLinOp.H b/Src/LinearSolvers/MLMG/AMReX_MLLinOp.H
index 2ace09ec21f..22a27e4473f 100644
--- a/Src/LinearSolvers/MLMG/AMReX_MLLinOp.H
+++ b/Src/LinearSolvers/MLMG/AMReX_MLLinOp.H
@@ -12,6 +12,7 @@
 #endif
 
 #ifdef AMREX_USE_EB
+#include <AMReX_EBMultiFabUtil.H>
 #include <AMReX_MultiCutFab.H>
 #endif
 
diff --git a/Src/Particle/AMReX_Particle_mod_K.H b/Src/Particle/AMReX_Particle_mod_K.H
index ac9254bd62c..4f07e0db697 100644
--- a/Src/Particle/AMReX_Particle_mod_K.H
+++ b/Src/Particle/AMReX_Particle_mod_K.H
@@ -2,7 +2,6 @@
 #define AMREX_PARTICLE_MOD_K_H_
 #include <AMReX_Config.H>
 
-#include <AMReX_Particles.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_REAL.H>
 #include <cmath>
diff --git a/Src/Particle/AMReX_WriteBinaryParticleData.H b/Src/Particle/AMReX_WriteBinaryParticleData.H
index 073384cc12d..7c31dff8ef3 100644
--- a/Src/Particle/AMReX_WriteBinaryParticleData.H
+++ b/Src/Particle/AMReX_WriteBinaryParticleData.H
@@ -3,7 +3,6 @@
 #include <AMReX_Config.H>
 
 #include <AMReX_TypeTraits.H>
-#include <AMReX_Particles.H>
 #include <AMReX_ParticleUtil.H>
 #include <AMReX_GpuDevice.H>