#include "main.h"
#include "macros.h"
#include "smalloc.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "statutil.h"
#include "sysstuff.h"
#include "txtdump.h"
#include "gmx_fatal.h"
#include "names.h"
-#include "tpxio.h"
-#include "enxio.h"
+#include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trxio.h"
+#include "gromacs/fileio/enxio.h"
#include "mtop_util.h"
#include "string2.h"