-XBT_PUBLIC(void) MC_init_safety_stateless(void);
-XBT_PUBLIC(void) MC_init_safety_stateful(void);
-XBT_PUBLIC(void) MC_exit(void);
-XBT_PUBLIC(void) MC_exit_liveness(void);
-XBT_PUBLIC(void) MC_assert(int);
-XBT_PUBLIC(void) MC_assert_stateful(int);
-XBT_PUBLIC(void) MC_modelcheck(void);
-XBT_PUBLIC(void) MC_modelcheck_stateful(void);
-XBT_PUBLIC(void) MC_modelcheck_liveness(xbt_automaton_t a, char *prgm);
-XBT_PUBLIC(int) MC_random(int, int);
-XBT_PUBLIC(void) MC_process_clock_add(smx_process_t, double);
-XBT_PUBLIC(double) MC_process_clock_get(smx_process_t);
-XBT_PUBLIC(void) MC_diff(void);
+XBT_PRIVATE void _mc_cfg_cb_reduce(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_checkpoint(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_sparse_checkpoint(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_ksm(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_property(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_timeout(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_snapshot_fds(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_hash(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_max_depth(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_visited(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_dot_output(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_comms_determinism(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_send_determinism(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_termination(const char *name);
+
+XBT_PUBLIC(void) MC_run();
+XBT_PUBLIC(void) MC_process_clock_add(smx_actor_t, double);
+XBT_PUBLIC(double) MC_process_clock_get(smx_actor_t);
+XBT_PRIVATE void MC_automaton_load(const char *file);
+
+/****************************** MC ignore **********************************/
+XBT_PUBLIC(void) MC_ignore_heap(void *address, size_t size);
+XBT_PUBLIC(void) MC_remove_ignore_heap(void *address, size_t size);
+XBT_PUBLIC(void) MC_ignore_local_variable(const char *var_name, const char *frame);
+XBT_PUBLIC(void) MC_ignore_global_variable(const char *var_name);
+#if HAVE_UCONTEXT_H
+XBT_PUBLIC(void) MC_register_stack_area(void *stack, smx_actor_t process, ucontext_t* context, size_t size);
+#endif