#include "rmpbc.h"
#include "statutil.h"
#include "xvgr.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "statutil.h"
-#include "tpxio.h"
+#include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trxio.h"
#include "index.h"
#include "smalloc.h"
#include "calcgrid.h"
#include "coulomb.h"
#include "pme.h"
#include "gstat.h"
-#include "matio.h"
+#include "gromacs/fileio/matio.h"
#include "mtop_util.h"
#include "gmx_ana.h"