#include "gromacs/utility/futil.h"
#include "gromacs/math/vec.h"
#include "gromacs/utility/smalloc.h"
-#include "typedefs.h"
-#include "names.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/legacyheaders/names.h"
#include "gromacs/utility/fatalerror.h"
-#include "macros.h"
-#include "readinp.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/readinp.h"
#include "readir.h"
-#include "mdatoms.h"
+#include "gromacs/legacyheaders/mdatoms.h"
#include "gromacs/pbcutil/pbc.h"
#include "gromacs/pulling/pull.h"