-/*******************************************/
-/*** Config Globals **************************/
-/*******************************************/
-XBT_PUBLIC_DATA(xbt_cfg_t) _sg_cfg_set;
-XBT_PUBLIC(int) sg_cfg_get_int(const char* name);
-XBT_PUBLIC(double) sg_cfg_get_double(const char* name);
-XBT_PUBLIC(char*) sg_cfg_get_string(const char* name);
-XBT_PUBLIC(void) sg_cfg_get_peer(const char *name, char **peer, int *port);
-XBT_PUBLIC(xbt_dynar_t) sg_cfg_get_dynar(const char* name);
-
-void sg_config_init(int *argc, char **argv);
-void sg_config_finalize(void);
+/** Config Globals */
+SG_BEGIN_DECL()
+
+XBT_PUBLIC_DATA(xbt_cfg_t) simgrid_config;
+XBT_PUBLIC_DATA(int) _sg_cfg_init_status;
+XBT_PUBLIC_DATA(int) _sg_cfg_exit_asap;
+
+XBT_PUBLIC(void) sg_config_init(int *argc, char **argv);
+XBT_PUBLIC(void) sg_config_finalize();
+
+SG_END_DECL()
+
+#endif
\ No newline at end of file