#include "gromacs/legacyheaders/types/simple.h"
#include "gromacs/legacyheaders/types/state.h"
#include "gromacs/topology/index.h"
-#include "macros.h"
-#include "names.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/names.h"
#include "gromacs/gmxpreprocess/readir.h"
#include "gromacs/topology/mtop_util.h"
-#include "checkpoint.h"
+#include "gromacs/legacyheaders/checkpoint.h"
#include "gromacs/fileio/tpxio.h"
#include "gromacs/fileio/trnio.h"
#include "gromacs/fileio/enxio.h"