#include "genconf.h"
#include "gromacs/math/utilities.h"
-#include "macros.h"
+#include "gromacs/legacyheaders/macros.h"
#include "gromacs/fileio/confio.h"
-#include "txtdump.h"
-#include "readinp.h"
-#include "names.h"
+#include "gromacs/legacyheaders/txtdump.h"
+#include "gromacs/legacyheaders/readinp.h"
+#include "gromacs/legacyheaders/names.h"
#include "sortwater.h"
#include "gromacs/fileio/trxio.h"