#include "typedefs.h"
#include "types/commrec.h"
#include "gromacs/utility/smalloc.h"
-#include "vec.h"
+#include "gromacs/math/vec.h"
#include "copyrite.h"
#include "gromacs/fileio/tpxio.h"
#include "readinp.h"
#include "checkpoint.h"
#include "gmx_ana.h"
#include "gromacs/random/random.h"
-#include "physics.h"
+#include "gromacs/math/units.h"
#include "mdatoms.h"
#include "coulomb.h"
-#include "mtop_util.h"
+#include "gromacs/topology/mtop_util.h"
#include "network.h"
#include "main.h"
#include "macros.h"
-#include "gromacs/legacyheaders/gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
/* We use the same defines as in mvdata.c here */
#define block_bc(cr, d) gmx_bcast( sizeof(d), &(d), (cr))