#endif
#include <math.h>
-#include "sysstuff.h"
#include "typedefs.h"
#include "types/commrec.h"
#include "macros.h"
#include "gromacs/utility/smalloc.h"
#include "physics.h"
#include "macros.h"
-#include "vec.h"
+#include "gromacs/math/vec.h"
#include "force.h"
#include "invblock.h"
#include "gromacs/fileio/confio.h"
#include "qmmm.h"
#include <stdio.h>
#include <string.h>
-#include "gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
#include "typedefs.h"
#include <stdlib.h>
#include "mtop_util.h"