-/* Oli's macro */
-#ifndef GS_FAILURE_CONTEXT
-# define GS_FAILURE_CONTEXT
-#endif /* GS_FAILURE_CONTEXT */
-
-#define GS_FAILURE(str) \
- (fprintf(stderr, "FAILURE: %s(%s:%d)" GS_FAILURE_CONTEXT "%s\n", __func__, __FILE__, __LINE__, (str)), \
- abort())
-
-#define aligned(v, a) (((v) + (a - 1)) & ~(a - 1))
-#define max(a, b) (((a) > (b))?(a):(b))
-#define min(a, b) (((a) < (b))?(a):(b))
-
-#define TRUE 1
-#define FALSE 0
+#include <xbt.h> /* our toolbox */
+#include <xbt/ex.h> /* There's a whole bunch of exception handling in GRAS */