#include "vec.h"
#include "gmxcomplex.h"
#include "smalloc.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "coulomb.h"
#include "gmx_fatal.h"
#include "pme.h"
#include "physics.h"
#include "nrnb.h"
#include "gmx_wallcycle.h"
-#include "pdbio.h"
+#include "gromacs/fileio/pdbio.h"
#include "gmx_cyclecounter.h"
#include "gmx_omp.h"
#include "macros.h"