Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / shellfc.c

diff --git a/src/gromacs/mdlib/shellfc.c b/src/gromacs/mdlib/shellfc.c
index 9ba0868252bb52febcfca33cd525999087599fc1..307fa38824a3c453c5e120d371afc5098f3f299d 100644 (file)
--- a/src/gromacs/mdlib/shellfc.c
+++ b/src/gromacs/mdlib/shellfc.c
@@ -38,12 +38,11 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <string.h>
+
 #include "typedefs.h"
 #include "types/commrec.h"
-#include "gromacs/utility/smalloc.h"
-#include "gmx_fatal.h"
-#include "vec.h"
 #include "txtdump.h"
 #include "force.h"
 #include "mdrun.h"
@@ -53,12 +52,17 @@
 #include "names.h"
 #include "constr.h"
 #include "domdec.h"
-#include "physics.h"
+#include "gromacs/math/units.h"
 #include "shellfc.h"
-#include "mtop_util.h"
+#include "gromacs/topology/mtop_util.h"
 #include "chargegroup.h"
 #include "macros.h"
 
+#include "gromacs/math/vec.h"
+#include "gromacs/pbcutil/mshift.h"
+#include "gromacs/pbcutil/pbc.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
 
 typedef struct {
     int     nnucl;