Merge release-5-0 into master

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

diff --git a/src/gromacs/gmxana/gmx_density.c b/src/gromacs/gmxana/gmx_density.c
index b03ae2a90844e41945a6b998564887b68f1c8b35..7a657edb5e8daa6f1678bd42aa60e18e69038310 100644 (file)
--- a/src/gromacs/gmxana/gmx_density.c
+++ b/src/gromacs/gmxana/gmx_density.c
@@ -37,29 +37,32 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <math.h>
-#include <ctype.h>
 
-#include "sysstuff.h"
+#include <ctype.h>
+#include <math.h>
+#include <stdlib.h>
 #include <string.h>
+
 #include "gromacs/utility/cstringutil.h"
 #include "typedefs.h"
-#include "gromacs/utility/smalloc.h"
 #include "macros.h"
 #include "gstat.h"
-#include "vec.h"
-#include "xvgr.h"
-#include "pbc.h"
-#include "gromacs/fileio/futil.h"
-#include "gromacs/commandline/pargs.h"
-#include "index.h"
+#include "viewit.h"
+#include "gromacs/pbcutil/pbc.h"
+#include "gromacs/topology/index.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trxio.h"
-#include "physics.h"
+#include "gromacs/math/units.h"
 #include "gmx_ana.h"
 #include "macros.h"
 
-#include "gromacs/legacyheaders/gmx_fatal.h"
+#include "gromacs/commandline/pargs.h"
+#include "gromacs/fileio/xvgr.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/pbcutil/rmpbc.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
 
 typedef struct {
     char *atomname;