Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxana / gmx_covar.c

diff --git a/src/gromacs/gmxana/gmx_covar.c b/src/gromacs/gmxana/gmx_covar.c
index c9faa784de876a09870107c1decc63a88341790f..bc77018c309458cab2b539e8e688c5787e0644f1 100644 (file)
--- a/src/gromacs/gmxana/gmx_covar.c
+++ b/src/gromacs/gmxana/gmx_covar.c
@@ -47,30 +47,26 @@
 #endif
 
 #include "gromacs/commandline/pargs.h"
-#include "sysstuff.h"
 #include "typedefs.h"
 #include "gromacs/utility/smalloc.h"
 #include "macros.h"
-#include "vec.h"
-#include "pbc.h"
-#include "gromacs/fileio/futil.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/utility/futil.h"
 #include "index.h"
 #include "gromacs/fileio/confio.h"
 #include "gromacs/fileio/trnio.h"
-#include "mshift.h"
-#include "xvgr.h"
-#include "rmpbc.h"
+#include "gromacs/fileio/xvgr.h"
+#include "gromacs/pbcutil/rmpbc.h"
 #include "txtdump.h"
 #include "gromacs/fileio/matio.h"
 #include "eigio.h"
-#include "physics.h"
 #include "gmx_ana.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/fileio/trxio.h"
 
 #include "gromacs/linearalgebra/eigensolver.h"
 #include "gromacs/math/do_fit.h"
-#include "gromacs/legacyheaders/gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
 
 int gmx_covar(int argc, char *argv[])
 {