#include "smalloc.h"
#include "macros.h"
#include "symtab.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "statutil.h"
#include "gmx_fatal.h"
#include "pdb2top.h"
#include "topio.h"
#include "string2.h"
#include "physics.h"
-#include "pdbio.h"
+#include "gromacs/fileio/pdbio.h"
#include "gen_ad.h"
-#include "filenm.h"
+#include "gromacs/fileio/filenm.h"
#include "index.h"
#include "gen_vsite.h"
#include "add_par.h"