Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / fileio / confio.c

diff --git a/src/gromacs/fileio/confio.c b/src/gromacs/fileio/confio.c
index 18cf7a1c5936996849a5ced67aceba01d340679b..e023771a00324d5e2e79086c52a02e507cdbd215 100644 (file)
--- a/src/gromacs/fileio/confio.c
+++ b/src/gromacs/fileio/confio.c
@@ -39,23 +39,21 @@
 #endif
 
 #include <math.h>
-#include "sysstuff.h"
 #include "typedefs.h"
 #include "gromacs/utility/smalloc.h"
-#include "sysstuff.h"
 #include <errno.h>
 #include "macros.h"
 #include "gromacs/utility/cstringutil.h"
 #include "confio.h"
 #include "vec.h"
 #include "symtab.h"
-#include "futil.h"
+#include "gromacs/utility/futil.h"
 #include "xdrf.h"
 #include "filenm.h"
 #include "pdbio.h"
 #include "tpxio.h"
 #include "trxio.h"
-#include "gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
 #include "copyrite.h"
 #include "pbc.h"
 #include "mtop_util.h"