#include <math.h>
#include <string.h>
-#include "gromacs/legacyheaders/typedefs.h"
-#include "gromacs/legacyheaders/macros.h"
-#include "gromacs/legacyheaders/copyrite.h"
-#include "gromacs/utility/futil.h"
-#include "gstat.h"
-#include "gromacs/legacyheaders/txtdump.h"
-#include "eigio.h"
-#include "gromacs/topology/mtop_util.h"
-#include "gromacs/math/units.h"
-#include "gmx_ana.h"
-
#include "gromacs/commandline/pargs.h"
#include "gromacs/fileio/mtxio.h"
#include "gromacs/fileio/xvgr.h"
+#include "gromacs/gmxana/eigio.h"
+#include "gromacs/gmxana/gmx_ana.h"
+#include "gromacs/gmxana/gstat.h"
+#include "gromacs/legacyheaders/copyrite.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/txtdump.h"
+#include "gromacs/legacyheaders/typedefs.h"
#include "gromacs/linearalgebra/eigensolver.h"
#include "gromacs/linearalgebra/sparsematrix.h"
+#include "gromacs/math/units.h"
#include "gromacs/math/vec.h"
+#include "gromacs/topology/mtop_util.h"
+#include "gromacs/utility/futil.h"
#include "gromacs/utility/smalloc.h"
static double cv_corr(double nu, double T)