#ifndef GRAS_H
#define GRAS_H
-#include <gros.h> /* our toolbox */
+#include <xbt.h> /* our toolbox */
#include <gras/core.h> /* FIXME: killme */
#include <gras/process.h>
#include <gras/datadesc.h>
#include <gras/messages.h>
-/* FIXME: This is amok */
-
-#include <gras/modules/base.h>
-#include <gras/modules/bandwidth.h>
-
#endif /* GRAS_H */