#include "typedefs.h"
#include "smalloc.h"
#include "string2.h"
-#include "confio.h"
+#include "gromacs/fileio/confio.h"
#include "symtab.h"
#include "vec.h"
#include "statutil.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "gmx_fatal.h"
#include "physics.h"
#include "calch.h"