Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / mdlib / genborn_allvsall.h

diff --git a/src/gromacs/mdlib/genborn_allvsall.h b/src/gromacs/mdlib/genborn_allvsall.h
index 59d0723f9c69c6e39123800561818162e9020a5c..83492bdef1e65dad07c950d0fd27d9d93a8f3729 100644 (file)
--- a/src/gromacs/mdlib/genborn_allvsall.h
+++ b/src/gromacs/mdlib/genborn_allvsall.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2009, 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.
@@ -37,12 +37,8 @@
 #ifndef _GENBORN_ALLVSALL_H
 #define _GENBORN_ALLVSALL_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "types/simple.h"
-#include "typedefs.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/legacyheaders/types/simple.h"
 
 int
 genborn_allvsall_calc_still_radii(t_forcerec *           fr,
@@ -50,7 +46,6 @@ genborn_allvsall_calc_still_radii(t_forcerec *           fr,
                                   gmx_genborn_t *        born,
                                   gmx_localtop_t *       top,
                                   real *                 x,
-                                  t_commrec *            cr,
                                   void *                 work);
 
 int
@@ -60,7 +55,6 @@ genborn_allvsall_calc_hct_obc_radii(t_forcerec *           fr,
                                     int                    gb_algorithm,
                                     gmx_localtop_t *       top,
                                     real *                 x,
-                                    t_commrec *            cr,
                                     void *                 work);
 
 int