Merge release-5-0 into master

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

diff --git a/src/gromacs/fileio/trxio.c b/src/gromacs/fileio/trxio.c
index 2c9eb34e53000fa5875a6d23d43192125d4e8d5c..c96a142e1e707b153a55d53abc710ebd4b4aac51 100644 (file)
--- a/src/gromacs/fileio/trxio.c
+++ b/src/gromacs/fileio/trxio.c
@@ -43,13 +43,9 @@
 #include <assert.h>
 #include <math.h>
 
-#include "sysstuff.h"
-#include "typedefs.h"
 #ifdef GMX_USE_PLUGINS
 #include "vmdio.h"
 #endif
-#include "gromacs/utility/smalloc.h"
-#include "pbc.h"
 #include "gmxfio.h"
 #include "trxio.h"
 #include "tpxio.h"
@@ -57,8 +53,8 @@
 #include "tngio.h"
 #include "tngio_for_tools.h"
 #include "names.h"
-#include "vec.h"
-#include "futil.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/utility/futil.h"
 #include "xtcio.h"
 #include "pdbio.h"
 #include "confio.h"
@@ -66,7 +62,10 @@
 #include "xdrf.h"
 
 #include "gromacs/fileio/timecontrol.h"
-#include "gromacs/legacyheaders/gmx_fatal.h"
+#include "gromacs/fileio/trx.h"
+#include "gromacs/topology/atoms.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
 
 /* defines for frame counter output */
 #define SKIP1   10