Merge release-5-0 into master

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

diff --git a/src/gromacs/mdlib/update.c b/src/gromacs/mdlib/update.c
index 3d6d040bd4c9dcdf68eb6e53deca46e1b7e1d61b..9bdde8a28cb98ef207c43318b9bd4897dadcdddc 100644 (file)
--- a/src/gromacs/mdlib/update.c
+++ b/src/gromacs/mdlib/update.c
@@ -43,17 +43,13 @@
 #include <math.h>
 
 #include "types/commrec.h"
-#include "sysstuff.h"
-#include "gromacs/utility/smalloc.h"
 #include "typedefs.h"
 #include "nrnb.h"
-#include "physics.h"
+#include "gromacs/math/units.h"
 #include "macros.h"
-#include "vec.h"
-#include "main.h"
+#include "gromacs/math/vec.h"
 #include "update.h"
 #include "gromacs/random/random.h"
-#include "mshift.h"
 #include "tgroup.h"
 #include "force.h"
 #include "names.h"
@@ -65,10 +61,13 @@
 #include "gmx_omp_nthreads.h"
 
 #include "gromacs/fileio/confio.h"
-#include "gromacs/fileio/futil.h"
+#include "gromacs/pbcutil/mshift.h"
+#include "gromacs/pbcutil/pbc.h"
+#include "gromacs/pulling/pull.h"
 #include "gromacs/timing/wallcycle.h"
+#include "gromacs/utility/futil.h"
 #include "gromacs/utility/gmxomp.h"
-#include "gromacs/pulling/pull.h"
+#include "gromacs/utility/smalloc.h"
 
 /*For debugging, start at v(-dt/2) for velolcity verlet -- uncomment next line */
 /*#define STARTFROMDT2*/