diff --git a/src/KIM/fix_store_kim.cpp b/src/KIM/fix_store_kim.cpp
index 1bd924bcfb..16d606d2ed 100644
--- a/src/KIM/fix_store_kim.cpp
+++ b/src/KIM/fix_store_kim.cpp
@@ -54,8 +54,8 @@
    Designed for use with the kim-api-2.0.2 (and newer) package
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "fix_store_kim.h"
+#include <cstring>
 extern "C" {
 #include "KIM_SimulatorModel.h"
 }
diff --git a/src/KIM/fix_store_kim.h b/src/KIM/fix_store_kim.h
index 655be83ad0..6baf480993 100644
--- a/src/KIM/fix_store_kim.h
+++ b/src/KIM/fix_store_kim.h
@@ -63,7 +63,6 @@ FixStyle(STORE/KIM,FixStoreKIM)
 #ifndef LMP_FIX_STORE_KIM_H
 #define LMP_FIX_STORE_KIM_H
 
-#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/KIM/kim_init.cpp b/src/KIM/kim_init.cpp
index 83638f3428..bae286aff6 100644
--- a/src/KIM/kim_init.cpp
+++ b/src/KIM/kim_init.cpp
@@ -55,11 +55,11 @@
    Designed for use with the kim-api-2.1.0 (and newer) package
 ------------------------------------------------------------------------- */
 
+#include "kim_init.h"
 #include <cstring>
 #include <string>
 #include <sstream>
 #include <iomanip>
-#include "kim_init.h"
 #include "error.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KIM/kim_init.h b/src/KIM/kim_init.h
index 7c7a24615b..2b5dc520c7 100644
--- a/src/KIM/kim_init.h
+++ b/src/KIM/kim_init.h
@@ -65,6 +65,7 @@ CommandStyle(kim_init,KimInit)
 #define LMP_KIM_INIT_H
 
 #include "pointers.h"
+#include <string>
 
 namespace LAMMPS_NS {
 
diff --git a/src/KIM/kim_interactions.cpp b/src/KIM/kim_interactions.cpp
index d0fbb809d2..449b6bcb13 100644
--- a/src/KIM/kim_interactions.cpp
+++ b/src/KIM/kim_interactions.cpp
@@ -55,10 +55,10 @@
    Designed for use with the kim-api-2.1.0 (and newer) package
 ------------------------------------------------------------------------- */
 
+#include "kim_interactions.h"
 #include <cstring>
 #include <string>
 #include <sstream>
-#include "kim_interactions.h"
 #include "error.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KIM/kim_interactions.h b/src/KIM/kim_interactions.h
index 6da1880f84..8172004d53 100644
--- a/src/KIM/kim_interactions.h
+++ b/src/KIM/kim_interactions.h
@@ -65,6 +65,7 @@ CommandStyle(kim_interactions,KimInteractions)
 #define LMP_KIM_INTERACTIONS_H
 
 #include "pointers.h"
+#include <string>
 
 namespace LAMMPS_NS {
 
diff --git a/src/KIM/kim_query.cpp b/src/KIM/kim_query.cpp
index 85b865d03f..6688ed6690 100644
--- a/src/KIM/kim_query.cpp
+++ b/src/KIM/kim_query.cpp
@@ -54,11 +54,11 @@
    Designed for use with the kim-api-2.1.0 (and newer) package
 ------------------------------------------------------------------------- */
 
+#include "kim_query.h"
 #include <mpi.h>
 #include <cstring>
 #include <string>
 #include <sstream>
-#include "kim_query.h"
 #include "comm.h"
 #include "error.h"
 #include "input.h"
diff --git a/src/KIM/pair_kim.cpp b/src/KIM/pair_kim.cpp
index 50eef1de2b..74b92a3e2b 100644
--- a/src/KIM/pair_kim.cpp
+++ b/src/KIM/pair_kim.cpp
@@ -53,13 +53,13 @@
 /* ----------------------------------------------------------------------
    Designed for use with the kim-api-2.0.2 (and newer) package
 ------------------------------------------------------------------------- */
+#include "pair_kim.h"
 
 #include <cstring>
 #include <cstdlib>
 #include <string>
 
 // includes from LAMMPS
-#include "pair_kim.h"
 #include "atom.h"
 #include "comm.h"
 #include "universe.h"