Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / pulling / pull.c

diff --git a/src/gromacs/pulling/pull.c b/src/gromacs/pulling/pull.c
index 64bdbfd3a5b3c96264a23a1a43b3b17a9cfb220b..3ee55fe3ec413151f2a261ca796738ba39bff59c 100644 (file)
--- a/src/gromacs/pulling/pull.c
+++ b/src/gromacs/pulling/pull.c
@@ -38,30 +38,29 @@
 #include <config.h>
 #endif
 
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "gromacs/fileio/futil.h"
-#include "index.h"
-#include "gromacs/fileio/gmxfio.h"
-#include "vec.h"
+#include <string.h>
+
+#include "gromacs/utility/futil.h"
 #include "typedefs.h"
 #include "types/commrec.h"
 #include "network.h"
-#include "gromacs/fileio/filenm.h"
-#include <string.h>
-#include "gromacs/utility/smalloc.h"
 #include "pull.h"
-#include "xvgr.h"
 #include "names.h"
-#include "pbc.h"
-#include "mtop_util.h"
+#include "gromacs/pbcutil/pbc.h"
+#include "gromacs/topology/mtop_util.h"
 #include "mdrun.h"
 #include "gmx_ga2la.h"
 #include "copyrite.h"
 #include "macros.h"
-#include "vec.h"
+
+#include "gromacs/fileio/filenm.h"
+#include "gromacs/fileio/gmxfio.h"
+#include "gromacs/fileio/xvgr.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/utility/smalloc.h"
 
 static void pull_print_group_x(FILE *out, ivec dim, const t_pull_group *pgrp)
 {