#include <string.h>
#include "gromacs/math/utilities.h"
-#include "macros.h"
-#include "bondf.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/bondf.h"
#include "gromacs/utility/cstringutil.h"
#include "gromacs/utility/smalloc.h"
#include "gromacs/fileio/confio.h"
#include "gromacs/math/vec.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 "toppush.h"
#include "pdb2top.h"
#include "gpp_nextnb.h"