#include "names.h"
#include "smalloc.h"
#include "gmx_fatal.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "xvgr.h"
#include "vec.h"
#include "main.h"
#include "network.h"
#include "physics.h"
#include "force.h"
-#include "gmxfio.h"
+#include "gromacs/fileio/gmxfio.h"
#include "macros.h"
#include "tables.h"