* To help us fund GROMACS development, we humbly ask that you cite
* the research papers on the package. Check out http://www.gromacs.org.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
+
+#include "hxprops.h"
#include <math.h>
#include <string.h>
-#include "typedefs.h"
-#include "macros.h"
-#include "physics.h"
-#include "vec.h"
-#include "index.h"
-#include "hxprops.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/listed-forces/bonded.h"
+#include "gromacs/math/units.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/topology/index.h"
+#include "gromacs/utility/fatalerror.h"
#include "gromacs/utility/smalloc.h"
-#include "bondf.h"
-
-#include "gmx_fatal.h"
real ellipticity(int nres, t_bb bb[])
{