Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / gen_vsite.h

diff --git a/src/gromacs/gmxpreprocess/gen_vsite.h b/src/gromacs/gmxpreprocess/gen_vsite.h
index b922dae01c75937d143d4134ea6ebd367041b37d..6a350ef7093b373f8e8eded985adee4b06f76078 100644 (file)
--- a/src/gromacs/gmxpreprocess/gen_vsite.h
+++ b/src/gromacs/gmxpreprocess/gen_vsite.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -35,13 +35,13 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifndef _gen_vsite_h
-#define _gen_vsite_h
+#ifndef GMX_GMXPREPROCESS_GEN_VSITE_H
+#define GMX_GMXPREPROCESS_GEN_VSITE_H
 
-#include "typedefs.h"
-#include "grompp.h"
-#include "gpp_atomtype.h"
-#include "hackblock.h"
+#include "gromacs/gmxpreprocess/gpp_atomtype.h"
+#include "gromacs/gmxpreprocess/grompp-impl.h"
+#include "gromacs/gmxpreprocess/hackblock.h"
+#include "gromacs/legacyheaders/typedefs.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -50,17 +50,17 @@ extern "C"
 
 /* stuff for pdb2gmx */
 
-extern void do_vsites(int nrtp, t_restp rtp[], gpp_atomtype_t atype,
-                      t_atoms *at, t_symtab *symtab, rvec *x[],
-                      t_params plist[], int *dummy_type[], int *cgnr[],
-                      real mHmult, gmx_bool bVSiteAromatics,
-                      const char *ffdir);
+void do_vsites(int nrtp, t_restp rtp[], gpp_atomtype_t atype,
+               t_atoms *at, struct t_symtab *symtab, rvec *x[],
+               t_params plist[], int *dummy_type[], int *cgnr[],
+               real mHmult, gmx_bool bVSiteAromatics,
+               const char *ffdir);
 
-extern void do_h_mass(t_params *psb, int vsite_type[], t_atoms *at, real mHmult,
-                      gmx_bool bDeuterate);
+void do_h_mass(t_params *psb, int vsite_type[], t_atoms *at, real mHmult,
+               gmx_bool bDeuterate);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  /* _gen_vsite_h */
+#endif