#include "x2top.h"
-#include "config.h"
-
#include <assert.h>
+#include "gromacs/commandline/pargs.h"
+#include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/gmxfio.h"
+#include "gromacs/gmxpreprocess/gen_ad.h"
+#include "gromacs/gmxpreprocess/gpp_nextnb.h"
+#include "gromacs/gmxpreprocess/hackblock.h"
+#include "gromacs/gmxpreprocess/nm2type.h"
+#include "gromacs/gmxpreprocess/pdb2top.h"
+#include "gromacs/gmxpreprocess/toppush.h"
#include "gromacs/legacyheaders/copyrite.h"
-#include "gromacs/math/utilities.h"
#include "gromacs/legacyheaders/macros.h"
-#include "gromacs/legacyheaders/bondf.h"
-#include "gromacs/fileio/gmxfio.h"
-#include "gromacs/fileio/confio.h"
-#include "gromacs/math/units.h"
-#include "gromacs/legacyheaders/txtdump.h"
-#include "gromacs/legacyheaders/readinp.h"
#include "gromacs/legacyheaders/names.h"
-#include "toppush.h"
-#include "pdb2top.h"
-#include "gen_ad.h"
-#include "gpp_nextnb.h"
-#include "hackblock.h"
-#include "nm2type.h"
-
-#include "gromacs/commandline/pargs.h"
+#include "gromacs/legacyheaders/readinp.h"
+#include "gromacs/legacyheaders/txtdump.h"
+#include "gromacs/listed-forces/bonded.h"
+#include "gromacs/math/units.h"
+#include "gromacs/math/utilities.h"
#include "gromacs/math/vec.h"
#include "gromacs/pbcutil/pbc.h"
#include "gromacs/topology/symtab.h"