#include "string2.h"
#include "smalloc.h"
#include "sysstuff.h"
-#include "confio.h"
+#include "gromacs/fileio/confio.h"
#include "statutil.h"
#include "pbc.h"
#include "force.h"
#include "gmx_fatal.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "maths.h"
#include "macros.h"
#include "vec.h"
-#include "tpxio.h"
+#include "gromacs/fileio/tpxio.h"
#include "mdrun.h"
#include "main.h"
#include "random.h"