-#include "gromacs/legacyheaders/typedefs.h"
-#include "gromacs/utility/futil.h"
-#include "gromacs/topology/index.h"
+#include "gromacs/commandline/pargs.h"
+#include "gromacs/fileio/trxio.h"
+#include "gromacs/gmxana/gmx_ana.h"
+#include "gromacs/gmxana/gstat.h"