diff --git a/src/H5MD/dump_h5md.cpp b/src/H5MD/dump_h5md.cpp
index 46c587a992..3e19772bc8 100644
--- a/src/H5MD/dump_h5md.cpp
+++ b/src/H5MD/dump_h5md.cpp
@@ -16,23 +16,24 @@
    Contributing author: Pierre de Buyl (KU Leuven)
 ------------------------------------------------------------------------- */
 
-#include <cmath>
-#include <cstdio>
-
-#include <cstring>
-#include <climits>
-#include "ch5md.h"
 #include "dump_h5md.h"
-#include "domain.h"
+
 #include "atom.h"
-#include "update.h"
-#include "group.h"
-#include "output.h"
+#include "domain.h"
 #include "error.h"
 #include "force.h"
+#include "group.h"
 #include "memory.h"
+#include "output.h"
+#include "update.h"
 #include "version.h"
 
+#include "ch5md.h"
+
+#include <climits>
+#include <cmath>
+#include <cstring>
+
 using namespace LAMMPS_NS;
 
 #define MYMIN(a,b) ((a) < (b) ? (a) : (b))
diff --git a/src/MPIIO/dump_xyz_mpiio.cpp b/src/MPIIO/dump_xyz_mpiio.cpp
index 24fd130e3d..f322a0da58 100644
--- a/src/MPIIO/dump_xyz_mpiio.cpp
+++ b/src/MPIIO/dump_xyz_mpiio.cpp
@@ -16,17 +16,18 @@
    Contributing author: Paul Coffman (IBM)
 ------------------------------------------------------------------------- */
 
-#include "omp_compat.h"
 #include "dump_xyz_mpiio.h"
-#include <cmath>
 
-#include <cstring>
-#include "domain.h"
-#include "update.h"
 #include "compute.h"
-#include "memory.h"
+#include "domain.h"
 #include "error.h"
+#include "memory.h"
+#include "update.h"
 
+#include <cmath>
+#include <cstring>
+
+#include "omp_compat.h"
 #if defined(_OPENMP)
 #include <omp.h>
 #endif
diff --git a/src/dump_atom.cpp b/src/dump_atom.cpp
index dbb404b41b..4d3660f9de 100644
--- a/src/dump_atom.cpp
+++ b/src/dump_atom.cpp
@@ -13,13 +13,15 @@
 ------------------------------------------------------------------------- */
 
 #include "dump_atom.h"
-#include <cstring>
-#include "domain.h"
+
 #include "atom.h"
-#include "memory.h"
+#include "domain.h"
 #include "error.h"
+#include "memory.h"
 #include "update.h"
 
+#include <cstring>
+
 using namespace LAMMPS_NS;
 
 #define ONELINE 256
diff --git a/src/dump_xyz.cpp b/src/dump_xyz.cpp
index e88cea54b9..e009937959 100644
--- a/src/dump_xyz.cpp
+++ b/src/dump_xyz.cpp
@@ -13,12 +13,14 @@
 ------------------------------------------------------------------------- */
 
 #include "dump_xyz.h"
-#include <cstring>
+
 #include "atom.h"
 #include "error.h"
 #include "memory.h"
 #include "update.h"
 
+#include <cstring>
+
 using namespace LAMMPS_NS;
 
 #define ONELINE 128