Merge release-5-0 into master

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

diff --git a/src/gromacs/fileio/vmdio.c b/src/gromacs/fileio/vmdio.c
index 7d9c67c779d33613f2baf4c9d32d2be47739eb1c..b4ed95239e8e7eb757ca71064385ad310a290a16 100644 (file)
--- a/src/gromacs/fileio/vmdio.c
+++ b/src/gromacs/fileio/vmdio.c
@@ -32,10 +32,11 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "vmdio.h"
+
+#include "config.h"
 
 /* Derived from PluginMgr.C and catdcd.c */
 
@@ -90,7 +91,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <config.h>
 /*
  * Plugin header files; get plugin source from www.ks.uiuc.edu/Research/vmd"
  */
@@ -105,14 +105,13 @@
 #include <windows.h>
 #include <shlobj.h>
 #endif
-#include "gromacs/utility/smalloc.h"
-#include "futil.h"
-#include "vmdio.h"
-
 
-#include "types/simple.h"
-#include "vec.h"
-#include "gmxfio.h"
+#include "gromacs/fileio/gmxfio.h"
+#include "gromacs/fileio/trx.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/utility/basedefinitions.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
 
 
 typedef int (*initfunc)(void);