-/* $Id$ */
+/* xbt.h - Public interface to the xbt (SimGrid's toolbox) */
-/* xbt.h - Public interface to the xbt (gras's toolbox) */
-
-/* Authors: Martin Quinson */
-/* Copyright (C) 2004 the OURAGAN project. */
+/* Copyright (c) 2004-2014. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
- under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef xbt_H
#define xbt_H
-#define max(a, b) (((a) > (b))?(a):(b))
-#define min(a, b) (((a) < (b))?(a):(b))
-
-#define TRUE 1
-#define FALSE 0
-
-#define GRAS_MAX_CHANNEL 10 /* FIXME: killme */
-
+#include <xbt/misc.h>
#include <xbt/sysdep.h>
+#include <xbt/str.h>
+#include <xbt/file.h>
+#include <xbt/function_types.h>
-#include <xbt/error.h>
+#include <xbt/asserts.h>
#include <xbt/log.h>
#include <xbt/module.h>
+#include <xbt/strbuff.h>
#include <xbt/dynar.h>
#include <xbt/dict.h>
-#include <xbt/set.h>
+#include <xbt/swag.h>
+#include <xbt/heap.h>
+#include <xbt/parmap.h>
#include <xbt/config.h>
+#include <xbt/cunit.h>
+
+#include <xbt/xbt_os_thread.h>
+#include <xbt/xbt_os_time.h>
-#endif /* xbt_H */
+#endif /* xbt_H */
