#include "macros.h"
#include "smalloc.h"
#include "statutil.h"
-#include "confio.h"
+#include "gromacs/fileio/confio.h"
#include "genhydro.h"
-#include "tpxio.h"
+#include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trxio.h"
#include "index.h"
#include "vec.h"
#include "hackblock.h"