#include "trnio.h"
#include "tngio.h"
#include "tngio_for_tools.h"
-#include "names.h"
+#include "gromacs/legacyheaders/names.h"
#include "gromacs/math/vec.h"
#include "gromacs/utility/futil.h"
#include "xtcio.h"
#include "pdbio.h"
#include "confio.h"
-#include "checkpoint.h"
+#include "gromacs/legacyheaders/checkpoint.h"
#include "xdrf.h"
#include "gromacs/fileio/timecontrol.h"