#include "gromacs/math/units.h"
#include "gromacs/math/vec.h"
#include "gromacs/utility/smalloc.h"
-#include "typedefs.h"
+#include "gromacs/legacyheaders/typedefs.h"
#include "gromacs/utility/fatalerror.h"
#include "topio.h"
#include "toputil.h"
#include "convparm.h"
-#include "names.h"
+#include "gromacs/legacyheaders/names.h"
#include "gpp_atomtype.h"
#include "gromacs/math/utilities.h"