Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxana / gmx_sham.c

diff --git a/src/gromacs/gmxana/gmx_sham.c b/src/gromacs/gmxana/gmx_sham.c
index 911fdbff0f4af502a695b6d4e9e5576bb8eb6a29..8e367e082e6e38501e4dcf715a67cfa12fcde7e8 100644 (file)
--- a/src/gromacs/gmxana/gmx_sham.c
+++ b/src/gromacs/gmxana/gmx_sham.c
@@ -37,21 +37,23 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+
 #include <math.h>
+#include <stdlib.h>
 #include <string.h>
+
 #include "gromacs/commandline/pargs.h"
-#include "sysstuff.h"
 #include "typedefs.h"
 #include "gromacs/utility/smalloc.h"
 #include "macros.h"
-#include "gmx_fatal.h"
-#include "vec.h"
-#include "gromacs/fileio/futil.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/utility/futil.h"
 #include "readinp.h"
 #include "txtdump.h"
 #include "gstat.h"
-#include "xvgr.h"
-#include "physics.h"
+#include "gromacs/fileio/xvgr.h"
+#include "gromacs/math/units.h"
 #include "gromacs/fileio/pdbio.h"
 #include "gromacs/fileio/matio.h"
 #include "gmx_ana.h"