#include "maths.h"
#include "macros.h"
#include "bondf.h"
-#include "gmxfio.h"
+#include "gromacs/fileio/gmxfio.h"
#include "string2.h"
#include "smalloc.h"
#include "strdb.h"
#include "sysstuff.h"
-#include "confio.h"
+#include "gromacs/fileio/confio.h"
#include "physics.h"
#include "statutil.h"
#include "vec.h"