#include "genconf.h"
-#include "gromacs/math/utilities.h"
-#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/commandline/pargs.h"
#include "gromacs/fileio/confio.h"
-#include "gromacs/legacyheaders/txtdump.h"
-#include "gromacs/legacyheaders/readinp.h"
-#include "gromacs/legacyheaders/names.h"
-#include "sortwater.h"
#include "gromacs/fileio/trxio.h"
-
-#include "gromacs/commandline/pargs.h"
+#include "gromacs/gmxpreprocess/sortwater.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/names.h"
+#include "gromacs/legacyheaders/readinp.h"
+#include "gromacs/legacyheaders/txtdump.h"
#include "gromacs/math/3dtransforms.h"
+#include "gromacs/math/utilities.h"
#include "gromacs/math/vec.h"
#include "gromacs/random/random.h"
#include "gromacs/utility/fatalerror.h"