#include "smalloc.h"
#include "string2.h"
#include "physics.h"
-#include "confio.h"
+#include "gromacs/fileio/confio.h"
#include "txtdump.h"
#include <math.h>
#include "macros.h"
#include "random.h"
-#include "futil.h"
+#include "gromacs/fileio/futil.h"
#include "atomprop.h"
#include "names.h"
#include "vec.h"
#include "vec.h"
#include "gbutil.h"
#include "addconf.h"
-#include "pdbio.h"
+#include "gromacs/fileio/pdbio.h"
#include "pbc.h"
#include "gmx_ana.h"
#include "xvgr.h"