#include "vec.h"
#include "sysstuff.h"
#include "typedefs.h"
-#include "filenm.h"
+#include "gromacs/fileio/filenm.h"
+#include "gromacs/fileio/trxio.h"
#include "statutil.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "gmx_fatal.h"
#include "smalloc.h"
#include "pbc.h"