Merge release-5-0 into master

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

diff --git a/src/gromacs/gmxana/gmx_cluster.c b/src/gromacs/gmxana/gmx_cluster.c
index 4919de60897ffb785ffe390c425f728141cf093f..1d957c8914c5076487c034653baf3974652e8165 100644 (file)
--- a/src/gromacs/gmxana/gmx_cluster.c
+++ b/src/gromacs/gmxana/gmx_cluster.c
@@ -39,6 +39,7 @@
 #endif
 
 #include <math.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "macros.h"
@@ -48,14 +49,14 @@
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/utility/cstringutil.h"
-#include "vec.h"
+#include "gromacs/math/vec.h"
 #include "macros.h"
-#include "index.h"
+#include "gromacs/topology/index.h"
 #include "gromacs/random/random.h"
-#include "pbc.h"
-#include "rmpbc.h"
-#include "xvgr.h"
-#include "gromacs/fileio/futil.h"
+#include "gromacs/pbcutil/pbc.h"
+#include "gromacs/pbcutil/rmpbc.h"
+#include "gromacs/fileio/xvgr.h"
+#include "gromacs/utility/futil.h"
 #include "gromacs/fileio/matio.h"
 #include "cmat.h"
 #include "gromacs/fileio/trnio.h"
@@ -64,7 +65,7 @@
 
 #include "gromacs/linearalgebra/eigensolver.h"
 #include "gromacs/math/do_fit.h"
-#include "gromacs/legacyheaders/gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
 
 /* print to two file pointers at once (i.e. stderr and log) */
 static gmx_inline