#include "sysstuff.h"
#include "smalloc.h"
#include "string2.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "maths.h"
#include "gmx_fatal.h"
#include "vec.h"
#include "macros.h"
#include "index.h"
#include "strdb.h"
-#include "tpxio.h"
+#include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trxio.h"
#include "typedefs.h"
#include "statutil.h"
#include "oenv.h"
-#include "gmxfio.h"
+#include "gromacs/fileio/gmxfio.h"
#include "xvgr.h"
-#include "matio.h"
+#include "gromacs/fileio/matio.h"
#include "names.h"
#include "sfactor.h"