#include "constr.h"
#include "mdatoms.h"
#include "names.h"
-#include "pdbio.h"
-#include "futil.h"
+#include "gromacs/fileio/pdbio.h"
+#include "gromacs/fileio/futil.h"
#include "force.h"
#include "pme.h"
#include "pull.h"
#include "nsgrid.h"
#include "shellfc.h"
#include "mtop_util.h"
-#include "gmxfio.h"
+#include "gromacs/fileio/gmxfio.h"
#include "gmx_ga2la.h"
#include "gmx_sort.h"
#include "macros.h"