#include "gromacs/fileio/tpxio.h"
#include "gromacs/fileio/trxio.h"
#include "gromacs/fileio/strdb.h"
-#include "vec.h"
+#include "gromacs/math/vec.h"
#include "macros.h"
#include "index.h"
#include "pbc.h"
-#include "xvgr.h"
-#include "gromacs/fileio/futil.h"
+#include "gromacs/fileio/xvgr.h"
+#include "viewit.h"
+#include "gromacs/utility/futil.h"
#include "gromacs/fileio/matio.h"
#include "gmx_ana.h"