#include "gromacs/fileio/confio.h"
#include "gromacs/commandline/pargs.h"
#include "gromacs/pbcutil/pbc.h"
-#include "force.h"
+#include "gromacs/legacyheaders/force.h"
#include "gromacs/utility/fatalerror.h"
#include "gromacs/utility/futil.h"
#include "gromacs/math/utilities.h"
-#include "macros.h"
+#include "gromacs/legacyheaders/macros.h"
#include "gromacs/math/vec.h"
#include "gromacs/fileio/tpxio.h"
-#include "mdrun.h"
+#include "gromacs/legacyheaders/mdrun.h"
#include "gromacs/random/random.h"
#include "gromacs/topology/index.h"
#include "gmx_ana.h"