Sort all includes in src/gromacs

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

diff --git a/src/gromacs/gmxpreprocess/gpp_atomtype.h b/src/gromacs/gmxpreprocess/gpp_atomtype.h
index 83fda2608f306b7cbe672e4130188e9b2e0b87a0..9dd46548b3ae6fa8eece4e85583559e92ed09e62 100644 (file)
--- a/src/gromacs/gmxpreprocess/gpp_atomtype.h
+++ b/src/gromacs/gmxpreprocess/gpp_atomtype.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2011, by the GROMACS development team, led by
+ * Copyright (c) 2011,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,12 +35,13 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifndef _gpp_atomtype_h
-#define _gpp_atomtype_h
+#ifndef GMX_GMXPREPROCESS_GPP_ATOMTYPE_H
+#define GMX_GMXPREPROCESS_GPP_ATOMTYPE_H
 
 #include <stdio.h>
-#include "typedefs.h"
-#include "grompp.h"
+
+#include "gromacs/gmxpreprocess/grompp-impl.h"
+#include "gromacs/legacyheaders/typedefs.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -82,7 +83,7 @@ gpp_atomtype_t init_atomtype(void);
 void done_atomtype(gpp_atomtype_t at);
 /* Free the memory in the structure */
 
-int set_atomtype(int nt, gpp_atomtype_t at, t_symtab *tab,
+int set_atomtype(int nt, gpp_atomtype_t at, struct t_symtab *tab,
                  t_atom *a, const char *name, t_param *nb,
                  int bondatomtype,
                  real radius, real vol, real surftens, int atomnumber,
@@ -95,7 +96,7 @@ set_atomtype_gbparam(gpp_atomtype_t at, int i,
                      real radius, real vol, real surftens,
                      real gb_radius, real S_hct);
 
-int add_atomtype(gpp_atomtype_t at, t_symtab *tab,
+int add_atomtype(gpp_atomtype_t at, struct t_symtab *tab,
                  t_atom *a, const char *name, t_param *nb,
                  int bondatomtype,
                  real radius, real vol, real surftens, real atomnumber,
@@ -117,4 +118,4 @@ void copy_atomtype_atomtypes(gpp_atomtype_t atype, t_atomtypes *atypes);
 }
 #endif
 
-#endif  /* _gpp_atomtype_h */
+#endif