Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / gmxana / sfactor.h

diff --git a/src/gromacs/gmxana/sfactor.h b/src/gromacs/gmxana/sfactor.h
index 8bdb91fa9304ee3ff40655c63abf27b099aaed56..0550909596862023457d8225edc28e48763f249f 100644 (file)
--- a/src/gromacs/gmxana/sfactor.h
+++ b/src/gromacs/gmxana/sfactor.h
@@ -34,22 +34,19 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-
 #ifndef _sfactor_h
 #define _sfactor_h
 
-
-#include "index.h"
-#include "types/simple.h"
-#include "../math/gmxcomplex.h"
-#include "oenv.h"
-
-
+#include "gromacs/legacyheaders/oenv.h"
+#include "gromacs/legacyheaders/types/simple.h"
+#include "gromacs/math/gmxcomplex.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct t_topology;
+struct t_trxframe;
 
 typedef struct gmx_structurefactors gmx_structurefactors_t;
 
@@ -79,8 +76,8 @@ double CMSF (gmx_structurefactors_t *gsf, int type, int nh, double lambda, doubl
 
 int return_atom_type (const char *name, gmx_structurefactors_t *gsf);
 
-void rearrange_atoms (reduced_atom_t * positions, t_trxframe *fr, atom_id * index,
-                      int isize, t_topology * top, gmx_bool flag, gmx_structurefactors_t *gsf);
+void rearrange_atoms (reduced_atom_t * positions, struct t_trxframe *fr, atom_id * index,
+                      int isize, struct t_topology * top, gmx_bool flag, gmx_structurefactors_t *gsf);
 
 int do_scattering_intensity (const char* fnTPS, const char* fnNDX,
                              const char* fnXVG, const char *fnTRX,