Sort all includes in src/gromacs

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

diff --git a/src/gromacs/gmxpreprocess/pdb2top.h b/src/gromacs/gmxpreprocess/pdb2top.h
index 6b57be25237b65072095fdae5c028868276a95f0..cfbc800c879048746709698f1a4deac9228f09b8 100644 (file)
--- a/src/gromacs/gmxpreprocess/pdb2top.h
+++ b/src/gromacs/gmxpreprocess/pdb2top.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,14 +35,14 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifndef _pdb2top_h
-#define _pdb2top_h
+#ifndef GMX_GMXPREPROCESS_PDB2TOP_H
+#define GMX_GMXPREPROCESS_PDB2TOP_H
 
-#include "typedefs.h"
-#include "grompp.h"
-#include "gpp_atomtype.h"
-#include "toputil.h"
-#include "hackblock.h"
+#include "gromacs/gmxpreprocess/gpp_atomtype.h"
+#include "gromacs/gmxpreprocess/grompp-impl.h"
+#include "gromacs/gmxpreprocess/hackblock.h"
+#include "gromacs/gmxpreprocess/toputil.h"
+#include "gromacs/legacyheaders/typedefs.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -112,7 +112,7 @@ void write_top(FILE *out, char *pr, char *molname,
 
 void pdb2top(FILE *top_file, char *posre_fn, char *molname,
              t_atoms *atoms, rvec **x,
-             gpp_atomtype_t atype, t_symtab *tab,
+             gpp_atomtype_t atype, struct t_symtab *tab,
              int nrtp, t_restp rtp[],
              t_restp *restp, t_hackblock *hb,
              gmx_bool bAllowMissing,
@@ -131,4 +131,4 @@ void print_sums(t_atoms *atoms, gmx_bool bSystem);
 }
 #endif
 
-#endif  /* _pdb2top_h */
+#endif