#endif
#include <math.h>
-#include "sysstuff.h"
-#include "gromacs/commandline/pargs.h"
#include <string.h>
+
+#include "gromacs/commandline/pargs.h"
#include "gromacs/utility/smalloc.h"
#include "typedefs.h"
#include "gromacs/fileio/confio.h"
-#include "gromacs/fileio/futil.h"
+#include "gromacs/utility/futil.h"
#include "macros.h"
-#include "vec.h"
-#include "index.h"
-#include "gmx_fatal.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/topology/index.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/fatalerror.h"
#include "gmx_ana.h"
int gmx_genpr(int argc, char *argv[])