Merge release-5-0 into master

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

diff --git a/src/gromacs/gmxana/gmx_editconf.c b/src/gromacs/gmxana/gmx_editconf.c
index cd55910022a5f869a8c1c40bd0f6dbb390f3ef78..7d457f6d2ace1416926a61bbcb66ceecf6e33e3d 100644 (file)
--- a/src/gromacs/gmxana/gmx_editconf.c
+++ b/src/gromacs/gmxana/gmx_editconf.c
@@ -43,27 +43,26 @@
 
 #include "gromacs/fileio/pdbio.h"
 #include "gromacs/fileio/confio.h"
-#include "symtab.h"
-#include "gromacs/utility/smalloc.h"
 #include "macros.h"
-#include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/strdb.h"
-#include "index.h"
-#include "vec.h"
+#include "gromacs/topology/index.h"
 #include "typedefs.h"
 #include "gromacs/gmxlib/conformation-utilities.h"
-#include "physics.h"
-#include "atomprop.h"
+#include "gromacs/math/units.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trxio.h"
-#include "pbc.h"
 #include "princ.h"
 #include "txtdump.h"
 #include "viewit.h"
-#include "rmpbc.h"
 #include "gmx_ana.h"
 
-#include "gromacs/legacyheaders/gmx_fatal.h"
+#include "gromacs/commandline/pargs.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/pbcutil/pbc.h"
+#include "gromacs/pbcutil/rmpbc.h"
+#include "gromacs/topology/atomprop.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
 
 typedef struct
 {