Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / bondfree.c

diff --git a/src/gromacs/gmxlib/bondfree.c b/src/gromacs/gmxlib/bondfree.c
index c465183bb3e1789bcfde934f888512bdecbdeff1..ff84e8834172c2e833d2a783cf72d9275f3fbcb7 100644 (file)
--- a/src/gromacs/gmxlib/bondfree.c
+++ b/src/gromacs/gmxlib/bondfree.c
@@ -38,30 +38,31 @@
 #include <config.h>
 #endif
 
-#include <math.h>
 #include <assert.h>
-#include "physics.h"
-#include "vec.h"
+#include <math.h>
+
+#include "gromacs/math/units.h"
+#include "gromacs/math/vec.h"
 #include "gromacs/math/utilities.h"
 #include "txtdump.h"
 #include "bondf.h"
-#include "gromacs/utility/smalloc.h"
-#include "pbc.h"
 #include "ns.h"
 #include "macros.h"
 #include "names.h"
-#include "gmx_fatal.h"
-#include "mshift.h"
-#include "main.h"
 #include "disre.h"
 #include "orires.h"
 #include "force.h"
 #include "nonbonded.h"
 #include "restcbt.h"
 
+#include "gromacs/pbcutil/ishift.h"
+#include "gromacs/pbcutil/mshift.h"
+#include "gromacs/pbcutil/pbc.h"
 #include "gromacs/simd/simd.h"
 #include "gromacs/simd/simd_math.h"
 #include "gromacs/simd/vector_operations.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
 
 /* Find a better place for this? */
 const int cmap_coeff_matrix[] = {