-int __connman_storage_init_profile(void);
-int __connman_storage_load_profile(struct connman_profile *profile);
-int __connman_storage_save_profile(struct connman_profile *profile);
-int __connman_storage_load_service(struct connman_service *service);
-int __connman_storage_save_service(struct connman_service *service);
-int __connman_storage_load_device(struct connman_device *device);
-int __connman_storage_save_device(struct connman_device *device);
-
-#include <connman/driver.h>
-
-void __connman_driver_rescan(struct connman_driver *driver);
-
-#include <connman/element.h>
-
-int __connman_element_init(const char *device, const char *nodevice);
-void __connman_element_start(void);
-void __connman_element_stop(void);
-void __connman_element_cleanup(void);
-
-void __connman_element_initialize(struct connman_element *element);
-
-typedef void (* element_cb_t) (struct connman_element *element,
- gpointer user_data);
-
-void __connman_element_foreach(struct connman_element *element,
- enum connman_element_type type,
- element_cb_t callback, gpointer user_data);
-void __connman_element_list(struct connman_element *element,
- enum connman_element_type type,
- DBusMessageIter *iter);
-
-struct connman_service *__connman_element_get_service(struct connman_element *element);
-struct connman_device *__connman_element_get_device(struct connman_element *element);
-
-struct connman_device *__connman_element_find_device(enum connman_service_type type);
-int __connman_element_request_scan(enum connman_service_type type);
-int __connman_element_enable_technology(enum connman_service_type type);
-int __connman_element_disable_technology(enum connman_service_type type);
-
-gboolean __connman_element_device_isfiltered(const char *devname);
+GKeyFile *__connman_storage_open_service(const char *ident);
+void __connman_storage_save_service(GKeyFile *keyfile, const char *ident);
+GKeyFile *__connman_storage_load_provider(const char *identifier);
+void __connman_storage_save_provider(GKeyFile *keyfile, const char *identifier);