#include <stdlib.h>
#include "gromacs/utility/smalloc.h"
-#include "macros.h"
-#include "typedefs.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/typedefs.h"
#include "gromacs/fileio/xvgr.h"
-#include "copyrite.h"
+#include "gromacs/legacyheaders/copyrite.h"
#include "gromacs/commandline/pargs.h"
#include "gromacs/math/vec.h"
#include "gromacs/topology/index.h"
#include "gromacs/fileio/tpxio.h"
#include "gromacs/fileio/trxio.h"
#include "cmat.h"
-#include "viewit.h"
+#include "gromacs/legacyheaders/viewit.h"
#include "gmx_ana.h"
#include "gromacs/math/do_fit.h"