Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / gmxana / pp2shift.c

diff --git a/src/gromacs/gmxana/pp2shift.c b/src/gromacs/gmxana/pp2shift.c
index aec07370c057614503a89795c81f3cafc96d8c4d..fa12f6d0b6afed5d822f886780f87ceb6719b0ea 100644 (file)
--- a/src/gromacs/gmxana/pp2shift.c
+++ b/src/gromacs/gmxana/pp2shift.c
@@ -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.
@@ -34,21 +34,20 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
 
-#include <stdlib.h>
 #include <math.h>
-#include "typedefs.h"
-#include "gromacs/fileio/futil.h"
-#include "macros.h"
-#include "physics.h"
-#include "smalloc.h"
-#include "gstat.h"
+#include <stdlib.h>
+
 #include "gromacs/fileio/matio.h"
-#include "copyrite.h"
-#include "gmx_fatal.h"
+#include "gromacs/gmxana/gstat.h"
+#include "gromacs/legacyheaders/copyrite.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/math/units.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
 
 typedef struct {
     int    nx, ny;
@@ -137,7 +136,7 @@ static void dump_sd(const char *fn, t_shiftdata *sd)
         }
     }
     sprintf(buf, "%s.xpm", fn);
-    fp = ffopen(buf, "w");
+    fp = gmx_ffopen(buf, "w");
     write_xpm(fp, 0, fn, fn, "Phi", "Psi", nnx, nny,
               x_phi, y_psi, newdata, lo, hi, rlo, rhi, &nlevels);
     for (i = 0; (i < nnx); i++)
@@ -188,7 +187,7 @@ static t_shiftdata *read_shifts(const char *fn)
         }
         sd->data[i][j] = sd->data[i][0];
     }
-    ffclose(fp);
+    gmx_ffclose(fp);
 
     if (bDebugMode())
     {