Sort includes outside src/gromacs

[alexxy/gromacs.git] / src / programs / view / xdlghi.cpp

diff --git a/src/programs/view/xdlghi.cpp b/src/programs/view/xdlghi.cpp
index 3794b17b6fd999010bc7096ffe5d9079a0a45b53..7d79e3b8ccc50d6451731e2cff51675620a2c4ef 100644 (file)
--- a/src/programs/view/xdlghi.cpp
+++ b/src/programs/view/xdlghi.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2013, 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,20 +34,22 @@
  * 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 "xdlghi.h"
 
+#include <stdlib.h>
 #include <string.h>
 
-#include "gmx_fatal.h"
-#include "string2.h"
-#include "sysstuff.h"
-#include "smalloc.h"
-#include "macros.h"
-#include "xutil.h"
-#include "xdlghi.h"
+#include <algorithm>
+
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
+
 #include "fgrid.h"
+#include "xutil.h"
 
 t_dlgitem **CreateRadioButtonGroup(t_x11 *x11, char *szTitle,
                                    t_id GroupID, int nrb, t_id rb[],