From 44372f52369cb101a3ca6757035d9e1ec2443fb6 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Sun, 30 Jun 2019 23:12:08 -0400
Subject: [PATCH] more fixes for USER-OMP

---
 src/USER-OMP/fix_rigid_nh_omp.cpp    | 6 ++++--
 src/USER-OMP/fix_rigid_omp.cpp       | 6 ++++--
 src/USER-OMP/fix_rigid_small_omp.cpp | 4 ++--
 src/lammps.cpp                       | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/USER-OMP/fix_rigid_nh_omp.cpp b/src/USER-OMP/fix_rigid_nh_omp.cpp
index 53d0134741..e6a6e065bf 100644
--- a/src/USER-OMP/fix_rigid_nh_omp.cpp
+++ b/src/USER-OMP/fix_rigid_nh_omp.cpp
@@ -15,6 +15,9 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
+#include <mpi.h>
+#include <cstring>
+
 #include "fix_rigid_nh_omp.h"
 
 #include "atom.h"
@@ -24,13 +27,12 @@
 #include "comm.h"
 #include "compute.h"
 #include "domain.h"
+#include "error.h"
 #include "force.h"
 #include "kspace.h"
 #include "modify.h"
 #include "update.h"
 
-#include <cstring>
-
 #if defined(_OPENMP)
 #include <omp.h>
 #endif
diff --git a/src/USER-OMP/fix_rigid_omp.cpp b/src/USER-OMP/fix_rigid_omp.cpp
index 12c6362ed8..20478b3ca1 100644
--- a/src/USER-OMP/fix_rigid_omp.cpp
+++ b/src/USER-OMP/fix_rigid_omp.cpp
@@ -15,6 +15,9 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
+#include <mpi.h>
+#include <cstring>
+
 #include "fix_rigid_omp.h"
 
 #include "atom.h"
@@ -23,8 +26,7 @@
 #include "atom_vec_tri.h"
 #include "comm.h"
 #include "domain.h"
-
-#include <cstring>
+#include "error.h"
 
 #if defined(_OPENMP)
 #include <omp.h>
diff --git a/src/USER-OMP/fix_rigid_small_omp.cpp b/src/USER-OMP/fix_rigid_small_omp.cpp
index a0495b3b93..1f6173497d 100644
--- a/src/USER-OMP/fix_rigid_small_omp.cpp
+++ b/src/USER-OMP/fix_rigid_small_omp.cpp
@@ -15,6 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
+#include <cstring>
+
 #include "fix_rigid_small_omp.h"
 
 #include "atom.h"
@@ -24,8 +26,6 @@
 #include "comm.h"
 #include "domain.h"
 
-#include <cstring>
-
 #if defined(_OPENMP)
 #include <omp.h>
 #endif
diff --git a/src/lammps.cpp b/src/lammps.cpp
index 83a2f057ee..052d14dfed 100644
--- a/src/lammps.cpp
+++ b/src/lammps.cpp
@@ -48,7 +48,7 @@
 #include "output.h"
 #include "citeme.h"
 #include "accelerator_kokkos.h"
-#include "accelerator_omp.h"
+#include "accelerator_omp.h"    // IWYU pragma: keep
 #include "timer.h"
 #include "lmppython.h"
 #include "version.h"