#include "macros.h"
#include "vec.h"
#include "main.h"
-#include "confio.h"
+#include "gromacs/fileio/confio.h"
#include "update.h"
#include "gmx_random.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "mshift.h"
#include "tgroup.h"
#include "force.h"