#include "nrama.h"
#include "gromacs/utility/smalloc.h"
-#include "typedefs.h"
-#include "bondf.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/legacyheaders/bondf.h"
#include "gromacs/utility/futil.h"
#include "gromacs/utility/fatalerror.h"
#include "gromacs/pbcutil/rmpbc.h"