#include "xvgr.h"
#include "vec.h"
#include "do_fit.h"
-#include "confio.h"
+#include "gromacs/fileio/confio.h"
#include "smalloc.h"
#include "nrnb.h"
#include "disre.h"
#include "force.h"
#include "gstat.h"
#include "main.h"
-#include "pdbio.h"
+#include "gromacs/fileio/pdbio.h"
#include "index.h"
#include "mdatoms.h"
-#include "tpxio.h"
+#include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trxio.h"
#include "mdrun.h"
#include "names.h"
-#include "matio.h"
+#include "gromacs/fileio/matio.h"
#include "mtop_util.h"
#include "gmx_ana.h"