Merge release-5-0 into master

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

diff --git a/src/gromacs/pulling/pullutil.c b/src/gromacs/pulling/pullutil.c
index 19e762346c77e98eddfd8ea64a0d285b859b0662..3d90b1ae9c8aa6af93414d2510bef57a05a7a6f9 100644 (file)
--- a/src/gromacs/pulling/pullutil.c
+++ b/src/gromacs/pulling/pullutil.c
@@ -34,29 +34,25 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
+
+#include "config.h"
 
 #include <stdlib.h>
 
-#include "sysstuff.h"
-#include "princ.h"
-#include "gromacs/fileio/futil.h"
-#include "vec.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/math/vec.h"
 #include "gromacs/utility/smalloc.h"
-#include "typedefs.h"
-#include "types/commrec.h"
-#include "names.h"
-#include "gmx_fatal.h"
-#include "macros.h"
-#include "symtab.h"
-#include "index.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/legacyheaders/types/commrec.h"
+#include "gromacs/legacyheaders/names.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/legacyheaders/macros.h"
 #include "gromacs/fileio/confio.h"
-#include "network.h"
-#include "pbc.h"
+#include "gromacs/legacyheaders/network.h"
+#include "gromacs/pbcutil/pbc.h"
 #include "pull.h"
-#include "gmx_ga2la.h"
+#include "gromacs/legacyheaders/gmx_ga2la.h"
 
 static void pull_set_pbcatom(t_commrec *cr, t_pull_group *pgrp,
                              rvec *x,