-#define sleep(x) smpi_sleep(x)
-#define gettimeofday(x, y) smpi_gettimeofday(x, y)
-#define main(x, y) smpi_simulated_main(x, y)
+#if SIMGRID_HAVE_MC
+#undef assert
+#define assert(x) MC_assert(x)
+#endif
+
+#ifdef TRACE_CALL_LOCATION /* Defined by smpicc on the command line */
+#include <smpi/smpi_extended_traces.h>
+#endif