#include <math.h>
#include "typedefs.h"
#include "string2.h"
-#include "gmxfio.h"
+#include "gromacs/fileio/gmxfio.h"
#include "smalloc.h"
#include "names.h"
-#include "confio.h"
+#include "gromacs/fileio/confio.h"
#include "mvdata.h"
#include "txtdump.h"
#include "pbc.h"
#include "calcmu.h"
#include "constr.h"
#include "xvgr.h"
-#include "trnio.h"
-#include "xtcio.h"
+#include "gromacs/fileio/trnio.h"
+#include "gromacs/fileio/xtcio.h"
#include "gmx_random.h"
#include "domdec.h"
#include "partdec.h"