diff --git a/src/KOKKOS/fix_acks2_reaxff_kokkos.cpp b/src/KOKKOS/fix_acks2_reaxff_kokkos.cpp
index 2413be51ea..6a1eb26da1 100644
--- a/src/KOKKOS/fix_acks2_reaxff_kokkos.cpp
+++ b/src/KOKKOS/fix_acks2_reaxff_kokkos.cpp
@@ -1,3 +1,4 @@
+// clang-format off
 /* ----------------------------------------------------------------------
    LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
    https://www.lammps.org/, Sandia National Laboratories
@@ -16,23 +17,25 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_acks2_reaxff_kokkos.h"
-#include <cmath>
-#include "kokkos.h"
+
 #include "atom.h"
-#include "atom_masks.h"
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "comm.h"
+#include "error.h"
 #include "force.h"
-#include "neighbor.h"
+#include "integrate.h"
+#include "kokkos.h"
+#include "memory_kokkos.h"
 #include "neigh_list_kokkos.h"
 #include "neigh_request.h"
-#include "update.h"
-#include "integrate.h"
-#include "memory_kokkos.h"
-#include "error.h"
+#include "neighbor.h"
 #include "pair_reaxff_kokkos.h"
+#include "update.h"
 
-using namespace LAMMPS_NS;
+#include <cmath>
+
+sing namespace LAMMPS_NS;
 using namespace FixConst;
 
 #define SMALL 0.0001
diff --git a/src/KOKKOS/fix_acks2_reaxff_kokkos.h b/src/KOKKOS/fix_acks2_reaxff_kokkos.h
index 9b5d4d9ada..67c737498f 100644
--- a/src/KOKKOS/fix_acks2_reaxff_kokkos.h
+++ b/src/KOKKOS/fix_acks2_reaxff_kokkos.h
@@ -12,16 +12,16 @@
 ------------------------------------------------------------------------- */
 
 #ifdef FIX_CLASS
-
-FixStyle(acks2/reaxff/kk,FixACKS2ReaxFFKokkos<LMPDeviceType>)
-FixStyle(acks2/reaxff/kk/device,FixACKS2ReaxFFKokkos<LMPDeviceType>)
-FixStyle(acks2/reaxff/kk/host,FixACKS2ReaxFFKokkos<LMPHostType>)
-FixStyle(acks2/reax/kk,FixACKS2ReaxFFKokkos<LMPDeviceType>)
-FixStyle(acks2/reax/kk/device,FixACKS2ReaxFFKokkos<LMPDeviceType>)
-FixStyle(acks2/reax/kk/host,FixACKS2ReaxFFKokkos<LMPHostType>)
-
+// clang-format off
+FixStyle(acks2/reaxff/kk,FixACKS2ReaxFFKokkos<LMPDeviceType>);
+FixStyle(acks2/reaxff/kk/device,FixACKS2ReaxFFKokkos<LMPDeviceType>);
+FixStyle(acks2/reaxff/kk/host,FixACKS2ReaxFFKokkos<LMPHostType>);
+FixStyle(acks2/reax/kk,FixACKS2ReaxFFKokkos<LMPDeviceType>);
+FixStyle(acks2/reax/kk/device,FixACKS2ReaxFFKokkos<LMPDeviceType>);
+FixStyle(acks2/reax/kk/host,FixACKS2ReaxFFKokkos<LMPHostType>);
+// clang-format on
 #else
-
+// clang-format off
 #ifndef LMP_FIX_ACKS2_REAXFF_KOKKOS_H
 #define LMP_FIX_ACKS2_REAXFF_KOKKOS_H