*
* 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.
* 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 <string.h>
-#include "sysstuff.h"
-#include "gromacs/fileio/futil.h"
-#include "smalloc.h"
-#include "macros.h"
-#include "index.h"
+
+#include <algorithm>
+
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/topology/index.h"
#include "xdlghi.h"
#include "dialogs.h"
-#include "index.h"
-#include "gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
t_filter *init_filter(t_atoms *atoms, const char *fn, int natom_trx)
{