Sort all includes in src/gromacs

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

diff --git a/src/gromacs/gmxpreprocess/resall.h b/src/gromacs/gmxpreprocess/resall.h
index 6e85d8da97a527e8a7e60157aa39ef095190e7c2..487ed643e2a06febc6b4c69f5c069fffd7cd657f 100644 (file)
--- a/src/gromacs/gmxpreprocess/resall.h
+++ b/src/gromacs/gmxpreprocess/resall.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2010, by the GROMACS development team, led by
+ * Copyright (c) 2010,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 _resall_h
-#define _resall_h
+#ifndef GMX_GMXPREPROCESS_RESALL_H
+#define GMX_GMXPREPROCESS_RESALL_H
 
-#include "typedefs.h"
-#include "hackblock.h"
-#include "gpp_atomtype.h"
-#include "grompp.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" {
@@ -58,11 +58,11 @@ t_restp *get_restp(const char *rtpname, int nrtp, t_restp rtp[]);
  * Generates a fatal error when rtpname is not found.
  */
 
-gpp_atomtype_t read_atype(const char *ffdir, t_symtab *tab);
+gpp_atomtype_t read_atype(const char *ffdir, struct t_symtab *tab);
 /* read atom type database(s) */
 
 void read_resall(char *resdb, int *nrtp, t_restp **rtp,
-                 gpp_atomtype_t atype, t_symtab *tab,
+                 gpp_atomtype_t atype, struct t_symtab *tab,
                  gmx_bool bAllowOverrideRTP);
 /* read rtp database, append to the existing database */
 
@@ -73,4 +73,4 @@ void print_resall(FILE *out, int nrtp, t_restp rtp[],
 }
 #endif
 
-#endif  /* _resall_h */
+#endif