Merge release-5-0 into master

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

diff --git a/src/gromacs/tools/dump.c b/src/gromacs/tools/dump.c
index 559328908cf96362d2099f32b5400df04f10243a..cdf422d4ae573639b1ebb32139e9079ac598691b 100644 (file)
--- a/src/gromacs/tools/dump.c
+++ b/src/gromacs/tools/dump.c
@@ -38,28 +38,23 @@
 #include <config.h>
 #endif
 
+#include <assert.h>
+#include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <math.h>
-#include <assert.h>
-#include "main.h"
+
 #include "macros.h"
-#include "gromacs/commandline/pargs.h"
-#include "sysstuff.h"
 #include "txtdump.h"
-#include "gmx_fatal.h"
-#include "gromacs/utility/smalloc.h"
 #include "names.h"
 #include "txtdump.h"
-#include "gromacs/gmxpreprocess/gmxcpp.h"
 #include "checkpoint.h"
-#include "mtop_util.h"
+#include "gromacs/topology/mtop_util.h"
 #include "gromacs/fileio/xtcio.h"
 #include "gromacs/fileio/enxio.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trnio.h"
-#include "gromacs/fileio/futil.h"
+#include "gromacs/utility/futil.h"
 #include "gromacs/fileio/tngio.h"
 #include "gromacs/fileio/tngio_for_tools.h"
 
@@ -67,9 +62,12 @@
 #include <unistd.h>
 #endif
 
-#include "gromacs/linearalgebra/mtxio.h"
+#include "gromacs/commandline/pargs.h"
+#include "gromacs/fileio/mtxio.h"
+#include "gromacs/gmxpreprocess/gmxcpp.h"
 #include "gromacs/linearalgebra/sparsematrix.h"
-
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
 
 static void list_tpx(const char *fn, gmx_bool bShowNumbers, const char *mdpfn,
                      gmx_bool bSysTop)