Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / grompp.c

diff --git a/src/gromacs/gmxpreprocess/grompp.c b/src/gromacs/gmxpreprocess/grompp.c
index 04ee47de4053d37c9ffca49f81165448a4312224..1aab6bf4eafd20121076baa7e910c71554bf55db 100644 (file)
--- a/src/gromacs/gmxpreprocess/grompp.c
+++ b/src/gromacs/gmxpreprocess/grompp.c
@@ -47,28 +47,21 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "sysstuff.h"
-#include "gromacs/utility/smalloc.h"
 #include "macros.h"
 #include "readir.h"
 #include "toputil.h"
 #include "topio.h"
 #include "gromacs/fileio/confio.h"
 #include "readir.h"
-#include "symtab.h"
 #include "names.h"
 #include "grompp-impl.h"
-#include "gromacs/random/random.h"
 #include "gromacs/gmxpreprocess/gen_maxwell_velocities.h"
-#include "vec.h"
-#include "gromacs/fileio/futil.h"
-#include "gromacs/commandline/pargs.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/utility/futil.h"
 #include "splitter.h"
 #include "gromacs/gmxpreprocess/sortwater.h"
 #include "convparm.h"
-#include "gmx_fatal.h"
 #include "warninp.h"
-#include "index.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/trnio.h"
 #include "gromacs/fileio/tpxio.h"
@@ -81,13 +74,20 @@
 #include "perf_est.h"
 #include "compute_io.h"
 #include "gpp_atomtype.h"
-#include "mtop_util.h"
+#include "gromacs/topology/mtop_util.h"
 #include "genborn.h"
 #include "calc_verletbuf.h"
 #include "tomorse.h"
 #include "gromacs/imd/imd.h"
 #include "gromacs/utility/cstringutil.h"
 
+#include "gromacs/commandline/pargs.h"
+#include "gromacs/pbcutil/pbc.h"
+#include "gromacs/random/random.h"
+#include "gromacs/topology/symtab.h"
+#include "gromacs/topology/topology.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
 
 static int rm_interactions(int ifunc, int nrmols, t_molinfo mols[])
 {