/* This file is completely threadsafe - keep it that way! */
#include "gmxpre.h"
+#include "gen_ad.h"
+
#include <ctype.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
-#include "gromacs/legacyheaders/macros.h"
-#include "gromacs/utility/smalloc.h"
-#include "gromacs/utility/cstringutil.h"
#include "gromacs/fileio/confio.h"
-#include "gromacs/math/vec.h"
-#include "toputil.h"
-#include "topio.h"
-#include "gpp_nextnb.h"
+#include "gromacs/gmxpreprocess/gpp_nextnb.h"
+#include "gromacs/gmxpreprocess/pgutil.h"
+#include "gromacs/gmxpreprocess/resall.h"
+#include "gromacs/gmxpreprocess/topio.h"
+#include "gromacs/gmxpreprocess/toputil.h"
#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/utility/cstringutil.h"
#include "gromacs/utility/fatalerror.h"
-#include "pgutil.h"
-#include "resall.h"
-#include "gen_ad.h"
+#include "gromacs/utility/smalloc.h"
#define DIHEDRAL_WAS_SET_IN_RTP 0
static gmx_bool was_dihedral_set_in_rtp(t_param *dih)