#include <math.h>
#include <string.h>
#include <ctype.h>
-#include "pdbio.h"
-#include "confio.h"
+#include "gromacs/fileio/pdbio.h"
+#include "gromacs/fileio/confio.h"
#include "symtab.h"
#include "smalloc.h"
#include "macros.h"
#include "strdb.h"
#include "physics.h"
#include "atomprop.h"
-#include "tpxio.h"
+#include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trxio.h"
#include "pbc.h"
#include "princ.h"
#include "txtdump.h"