* To help us fund GROMACS development, we humbly ask that you cite
* the research papers on the package. Check out http://www.gromacs.org.
*/
+#include "gromacs/topology/mtop_util.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#include <stdlib.h>
#include <string.h>
-#include "typedefs.h"
-#include "mtop_util.h"
-#include "topsort.h"
+#include "gromacs/legacyheaders/types/ifunc.h"
+#include "gromacs/legacyheaders/types/inputrec.h"
#include "gromacs/topology/block.h"
#include "gromacs/topology/symtab.h"
+#include "gromacs/topology/topology.h"
+#include "gromacs/topology/topsort.h"
#include "gromacs/utility/fatalerror.h"
#include "gromacs/utility/smalloc.h"