#include "types/commrec.h"
#include "gromacs/utility/smalloc.h"
#include "update.h"
-#include "vec.h"
+#include "gromacs/math/vec.h"
#include "macros.h"
#include "physics.h"
#include "names.h"
-#include "gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
#include "txtdump.h"
#include "nrnb.h"
#include "gromacs/random/random.h"