diff --git a/src/RIGID/fix_rattle.cpp b/src/RIGID/fix_rattle.cpp
index aef3cb3964..90aa6d487a 100644
--- a/src/RIGID/fix_rattle.cpp
+++ b/src/RIGID/fix_rattle.cpp
@@ -17,17 +17,18 @@
 
 #include "fix_rattle.h"
 
-#include <cmath>
-#include <cstring>
 #include "atom.h"
-#include "update.h"
-#include "modify.h"
-#include "domain.h"
-#include "force.h"
 #include "comm.h"
+#include "domain.h"
+#include "error.h"
+#include "force.h"
 #include "math_extra.h"
 #include "memory.h"
-#include "error.h"
+#include "modify.h"
+#include "update.h"
+
+#include <cmath>
+#include <cstring>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/RIGID/fix_rigid.cpp b/src/RIGID/fix_rigid.cpp
index 26bbb9477f..3cd4f5dbc8 100644
--- a/src/RIGID/fix_rigid.cpp
+++ b/src/RIGID/fix_rigid.cpp
@@ -13,29 +13,29 @@
 
 #include "fix_rigid.h"
 
-#include <cmath>
-
-#include <cstring>
-#include "math_extra.h"
-#include "math_eigen.h"
 #include "atom.h"
 #include "atom_vec_ellipsoid.h"
 #include "atom_vec_line.h"
 #include "atom_vec_tri.h"
-#include "domain.h"
-#include "update.h"
-#include "respa.h"
-#include "modify.h"
-#include "group.h"
 #include "comm.h"
-#include "random_mars.h"
-#include "force.h"
-#include "input.h"
-#include "variable.h"
-#include "math_const.h"
-#include "memory.h"
+#include "domain.h"
 #include "error.h"
+#include "force.h"
+#include "group.h"
+#include "input.h"
+#include "math_const.h"
+#include "math_eigen.h"
+#include "math_extra.h"
+#include "memory.h"
+#include "modify.h"
+#include "random_mars.h"
+#include "respa.h"
 #include "rigid_const.h"
+#include "update.h"
+#include "variable.h"
+
+#include <cmath>
+#include <cstring>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/RIGID/fix_rigid_nh.cpp b/src/RIGID/fix_rigid_nh.cpp
index 4dec04370e..3c4e332fd2 100644
--- a/src/RIGID/fix_rigid_nh.cpp
+++ b/src/RIGID/fix_rigid_nh.cpp
@@ -18,22 +18,24 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_rigid_nh.h"
-#include <cmath>
-#include <cstring>
-#include "math_extra.h"
+
 #include "atom.h"
+#include "comm.h"
 #include "compute.h"
 #include "domain.h"
-#include "update.h"
-#include "modify.h"
-#include "fix_deform.h"
-#include "group.h"
-#include "comm.h"
-#include "force.h"
-#include "kspace.h"
-#include "memory.h"
 #include "error.h"
+#include "fix_deform.h"
+#include "force.h"
+#include "group.h"
+#include "kspace.h"
+#include "math_extra.h"
+#include "memory.h"
+#include "modify.h"
 #include "rigid_const.h"
+#include "update.h"
+
+#include <cmath>
+#include <cstring>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/RIGID/fix_rigid_nvt_small.cpp b/src/RIGID/fix_rigid_nvt_small.cpp
index 0bcebd866d..0392f9c881 100644
--- a/src/RIGID/fix_rigid_nvt_small.cpp
+++ b/src/RIGID/fix_rigid_nvt_small.cpp
@@ -18,6 +18,7 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_rigid_nvt_small.h"
+
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/RIGID/fix_shake.cpp b/src/RIGID/fix_shake.cpp
index 390fe88309..5662e63c88 100644
--- a/src/RIGID/fix_shake.cpp
+++ b/src/RIGID/fix_shake.cpp
@@ -13,25 +13,26 @@
 
 #include "fix_shake.h"
 
+#include "angle.h"
+#include "atom.h"
+#include "atom_vec.h"
+#include "bond.h"
+#include "comm.h"
+#include "domain.h"
+#include "error.h"
+#include "fix_respa.h"
+#include "force.h"
+#include "group.h"
+#include "math_const.h"
+#include "memory.h"
+#include "modify.h"
+#include "molecule.h"
+#include "respa.h"
+#include "update.h"
+
 #include <cmath>
 #include <cctype>
 #include <cstring>
-#include "atom.h"
-#include "atom_vec.h"
-#include "molecule.h"
-#include "update.h"
-#include "respa.h"
-#include "modify.h"
-#include "domain.h"
-#include "force.h"
-#include "bond.h"
-#include "angle.h"
-#include "comm.h"
-#include "group.h"
-#include "fix_respa.h"
-#include "math_const.h"
-#include "memory.h"
-#include "error.h"
 
 using namespace LAMMPS_NS;
 using namespace FixConst;