Merge release-5-0 into master

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

diff --git a/src/gromacs/gmxpreprocess/readir.c b/src/gromacs/gmxpreprocess/readir.c
index 68a2a71d73129744caa8b6471698f4515461890a..8bd07dfd7853a2f8d6b43f05093ed09c620149ec 100644 (file)
--- a/src/gromacs/gmxpreprocess/readir.c
+++ b/src/gromacs/gmxpreprocess/readir.c
@@ -39,17 +39,14 @@
 #endif
 
 #include <ctype.h>
-#include <stdlib.h>
 #include <limits.h>
-#include "sysstuff.h"
-#include "gromacs/utility/smalloc.h"
+#include <stdlib.h>
+
 #include "typedefs.h"
-#include "physics.h"
+#include "gromacs/math/units.h"
 #include "names.h"
-#include "gmx_fatal.h"
 #include "macros.h"
 #include "index.h"
-#include "symtab.h"
 #include "gromacs/utility/cstringutil.h"
 #include "readinp.h"
 #include "warninp.h"
@@ -57,13 +54,18 @@
 #include "toputil.h"
 #include "index.h"
 #include "network.h"
-#include "vec.h"
-#include "pbc.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/pbcutil/pbc.h"
 #include "mtop_util.h"
 #include "chargegroup.h"
 #include "inputrec.h"
 #include "calc_verletbuf.h"
 
+#include "gromacs/topology/block.h"
+#include "gromacs/topology/symtab.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
+
 #define MAXPTR 254
 #define NOGID  255
 
@@ -3085,7 +3087,7 @@ static void make_swap_groups(
 
 void make_IMD_group(t_IMD *IMDgroup, char *IMDgname, t_blocka *grps, char **gnames)
 {
-    int      ig = -1, i;
+    int      ig, i;
 
 
     ig            = search_string(IMDgname, grps->nr, gnames);