Merge release-5-0 into master

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

diff --git a/src/gromacs/gmxpreprocess/addconf.c b/src/gromacs/gmxpreprocess/addconf.c
index 64f1f2853eb4188bac83d6bf4d76d405abd12b72..8fa4484f6694a3111f0308e725b2b17cb58beb93 100644 (file)
--- a/src/gromacs/gmxpreprocess/addconf.c
+++ b/src/gromacs/gmxpreprocess/addconf.c
@@ -42,9 +42,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "vec.h"
+
+#include "gromacs/math/vec.h"
 #include "macros.h"
-#include "gromacs/utility/smalloc.h"
 #include "types/commrec.h"
 #include "force.h"
 #include "names.h"
@@ -52,9 +52,14 @@
 #include "mdatoms.h"
 #include "nrnb.h"
 #include "ns.h"
-#include "mtop_util.h"
+#include "gromacs/topology/mtop_util.h"
 #include "chargegroup.h"
 
+#include "gromacs/pbcutil/pbc.h"
+#include "gromacs/topology/block.h"
+#include "gromacs/topology/topology.h"
+#include "gromacs/utility/smalloc.h"
+
 static real box_margin;
 
 static real max_dist(rvec *x, real *r, int start, int end)