#include "macros.h"
#include "vec.h"
#include "pbc.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "statutil.h"
#include "index.h"
#include "mshift.h"
#include "xvgr.h"
#include "rmpbc.h"
-#include "tpxio.h"
+#include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trxio.h"
#include "do_fit.h"
#include "gmx_ana.h"