#include <math.h>
-#include "gromacs/legacyheaders/macros.h"
-#include "gromacs/legacyheaders/copyrite.h"
-#include "gmx_ana.h"
-#include "sfactor.h"
-
#include "gromacs/commandline/pargs.h"
+#include "gromacs/gmxana/gmx_ana.h"
+#include "gromacs/gmxana/sfactor.h"
+#include "gromacs/legacyheaders/copyrite.h"
+#include "gromacs/legacyheaders/macros.h"
#include "gromacs/utility/smalloc.h"
int gmx_saxs(int argc, char *argv[])