Merge branch 'master' into kim-simulator-models

# Resolved Conflicts:
#	src/KIM/kim_query.cpp
#	src/KIM/pair_kim.cpp

src/input.cpp

@@ -11,15 +11,14 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "input.h"
 #include <mpi.h>
-#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <errno.h>
 #include <cctype>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "input.h"
 #include "style_command.h"
 #include "universe.h"
 #include "atom.h"
@@ -52,10 +51,6 @@
 #include "memory.h"
 #include "utils.h"
 
-#ifdef _OPENMP
-#include <omp.h>
-#endif
-
 #ifdef _WIN32
 #include <direct.h>
 #endif