Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / orires.c

diff --git a/src/gromacs/gmxlib/orires.c b/src/gromacs/gmxlib/orires.c
index 0b1b2e113e83934346f66929920ef18ab0227578..d0239fb642437123c1620b00a88317944d4c0ca9 100644 (file)
--- a/src/gromacs/gmxlib/orires.c
+++ b/src/gromacs/gmxlib/orires.c
@@ -39,19 +39,21 @@
 #endif
 
 #include "typedefs.h"
-#include "gromacs/utility/smalloc.h"
-#include "vec.h"
 #include "types/commrec.h"
 #include "network.h"
 #include "orires.h"
 #include "main.h"
 #include "copyrite.h"
-#include "pbc.h"
-#include "mtop_util.h"
+#include "gromacs/pbcutil/pbc.h"
+#include "gromacs/topology/mtop_util.h"
 
 #include "gromacs/linearalgebra/nrjac.h"
 #include "gromacs/math/do_fit.h"
-#include "gmx_fatal.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/pbcutil/ishift.h"
+#include "gromacs/pbcutil/mshift.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
 
 void init_orires(FILE *fplog, const gmx_mtop_t *mtop,
                  rvec xref[],