diff --git a/Source/CCZ4/Constraints.hpp b/Source/CCZ4/Constraints.hpp
index 41e62fb5..519d07c1 100644
--- a/Source/CCZ4/Constraints.hpp
+++ b/Source/CCZ4/Constraints.hpp
@@ -17,6 +17,9 @@
 #include "Tensor.hpp"
 #include "simd.hpp"
 
+// AMReX includes
+#include <AMReX_MultiFab.H>
+
 // System includes
 #include <array>
 
@@ -80,6 +83,7 @@ class Constraints
                            int /*level*/);
 
   private:
+    // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
     static inline bool s_calc_mom_norm =
         false; // set to true with set_up() to store just sqrt(Mom1^2 + Mom2^2 +
                // Mom3^2) instead of Mom1, Mom2, Mom3 separately
diff --git a/Source/GRTeclynCore/GRAMRLevel.cpp b/Source/GRTeclynCore/GRAMRLevel.cpp
index 26063666..21d6c4bc 100644
--- a/Source/GRTeclynCore/GRAMRLevel.cpp
+++ b/Source/GRTeclynCore/GRAMRLevel.cpp
@@ -40,7 +40,7 @@ void GRAMRLevel::stateVariableSetUp()
             else if (bctype == BoundaryConditions::REFLECTIVE_BC)
             {
                 int parity =
-                    boundary_conditions.get_state_var_parity(icomp, idim);
+                    BoundaryConditions::get_state_var_parity(icomp, idim);
                 if (parity == 1)
                 {
                     bc.set(face, amrex::BCType::reflect_even);
diff --git a/Source/utils/Interval.hpp b/Source/utils/Interval.hpp
index ff89fa47..e2e8ba0a 100644
--- a/Source/utils/Interval.hpp
+++ b/Source/utils/Interval.hpp
@@ -5,6 +5,7 @@
 #ifndef INTERVAL_H_
 #define INTERVAL_H_
 
+#include <AMReX_Extension.H>
 #include <AMReX_GpuQualifiers.H>
 
 struct Interval
diff --git a/Tests/ConstraintsTest/ConstraintsTest.cpp b/Tests/ConstraintsTest/ConstraintsTest.cpp
index f1a16007..dd7c782b 100644
--- a/Tests/ConstraintsTest/ConstraintsTest.cpp
+++ b/Tests/ConstraintsTest/ConstraintsTest.cpp
@@ -65,6 +65,7 @@ void run_constraints_test()
         const auto &in_arrays = in_mf.arrays();
         amrex::ParallelFor(
             in_mf, in_mf.nGrowVect(),
+            // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
             [=] AMREX_GPU_DEVICE(int ibox, int i, int j, int k)
             {
                 const amrex::IntVect iv{i, j, k};
diff --git a/Tests/Weyl4Test/Weyl4Test.cpp b/Tests/Weyl4Test/Weyl4Test.cpp
index b10e99a7..ad92c446 100644
--- a/Tests/Weyl4Test/Weyl4Test.cpp
+++ b/Tests/Weyl4Test/Weyl4Test.cpp
@@ -65,6 +65,7 @@ void run_weyl4_test()
         const auto &in_arrays = in_mf.arrays();
         amrex::ParallelFor(
             in_mf, in_mf.nGrowVect(),
+            // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
             [=] AMREX_GPU_DEVICE(int ibox, int i, int j, int k)
             {
                 const amrex::IntVect iv{i, j, k};