#include "macros.h"
#include "names.h"
#include "typedefs.h"
-#include "tpxio.h"
-#include "trnio.h"
-#include "enxio.h"
+#include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trnio.h"
+#include "gromacs/fileio/enxio.h"
#include "readir.h"
#include "statutil.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "vec.h"
#include "mtop_util.h"
#include "random.h"