Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / tools / compare.c

diff --git a/src/gromacs/tools/compare.c b/src/gromacs/tools/compare.c
index cbbf9f8ee473253c8c4c12adaea955b9dcfeb0f9..93f1d83f13a5c12edf486ebfc8a46cb276a0f964 100644 (file)
--- a/src/gromacs/tools/compare.c
+++ b/src/gromacs/tools/compare.c
@@ -42,18 +42,16 @@
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include "main.h"
 #include "macros.h"
 #include "gromacs/utility/smalloc.h"
-#include "gromacs/fileio/futil.h"
-#include "sysstuff.h"
+#include "gromacs/utility/futil.h"
 #include "txtdump.h"
-#include "gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
 #include "names.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/enxio.h"
-#include "mtop_util.h"
+#include "gromacs/topology/mtop_util.h"
 #include "gromacs/utility/cstringutil.h"
 
 static void cmp_int(FILE *fp, const char *s, int index, int i1, int i2)