#include <stdlib.h>
#include <string.h>
-#include "typedefs.h"
+#include "gromacs/legacyheaders/typedefs.h"
#include "gromacs/utility/smalloc.h"
-#include "macros.h"
+#include "gromacs/legacyheaders/macros.h"
#include "gromacs/math/vec.h"
#include "gstat.h"
#include "gromacs/utility/fatalerror.h"