Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / nonbonded / nb_free_energy.c

diff --git a/src/gromacs/gmxlib/nonbonded/nb_free_energy.c b/src/gromacs/gmxlib/nonbonded/nb_free_energy.c
index a2e145153bdff7eeb9640187324f9670af855c36..5414c668c6936a22a2238e2a079fba88c91e34ae 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_free_energy.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_free_energy.c
@@ -40,7 +40,7 @@
 
 #include <math.h>
 
-#include "vec.h"
+#include "gromacs/math/vec.h"
 #include "typedefs.h"
 #include "nonbonded.h"
 #include "nb_kernel.h"
@@ -48,7 +48,7 @@
 #include "macros.h"
 #include "nb_free_energy.h"
 
-#include "gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
 
 void
 gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,