#include <math.h>
#include <string.h>
-#include "macros.h"
+#include "gromacs/legacyheaders/macros.h"
#include "gromacs/math/vec.h"
-#include "typedefs.h"
+#include "gromacs/legacyheaders/typedefs.h"
#include "gromacs/fileio/filenm.h"
#include "gromacs/fileio/trxio.h"
#include "gromacs/commandline/pargs.h"