Merge release-5-0 into master

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

diff --git a/src/gromacs/mdlib/domdec_con.c b/src/gromacs/mdlib/domdec_con.c
index c9a358f5bdfb092cfdd00f66b946635b212eeac6..7e4062cb9ae84220e4a78353aa5a514dfe3f9183 100644 (file)
--- a/src/gromacs/mdlib/domdec_con.c
+++ b/src/gromacs/mdlib/domdec_con.c
@@ -38,19 +38,20 @@
 #endif
 #include <assert.h>
 
-#include "gromacs/utility/smalloc.h"
-#include "vec.h"
+#include "gromacs/math/vec.h"
 #include "constr.h"
 #include "types/commrec.h"
 #include "domdec.h"
 #include "domdec_network.h"
-#include "mtop_util.h"
+#include "gromacs/topology/mtop_util.h"
 #include "gmx_ga2la.h"
 #include "gmx_hash.h"
 #include "gmx_omp_nthreads.h"
 #include "macros.h"
 
-#include "gmx_fatal.h"
+#include "gromacs/pbcutil/ishift.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
 
 typedef struct {
     int  nsend;