#include "sysstuff.h"
#include "string2.h"
#include "network.h"
-#include "confio.h"
+#include "gromacs/fileio/confio.h"
#include "smalloc.h"
#include "nrnb.h"
#include "main.h"
#include "ns.h"
#include "gmx_wallcycle.h"
#include "mtop_util.h"
-#include "gmxfio.h"
+#include "gromacs/fileio/gmxfio.h"
+#include "gromacs/fileio/trxio.h"
#include "pme.h"
#include "gbutil.h"
#include "gromacs/timing/walltime_accounting.h"