-#define ELM_NEW(t) calloc(1, sizeof(t))
-
-void _elm_win_shutdown(void);
-void _elm_win_rescale(void);
-
-int _elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, const char *style);
-int _elm_theme_object_icon_set(Evas_Object *parent, Evas_Object *o, const char *group, const char *style);
-int _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, const char *style);
-int _elm_theme_icon_set(Elm_Theme *th, Evas_Object *o, const char *group, const char *style);
-int _elm_theme_parse(Elm_Theme *th, const char *theme);
-void _elm_theme_shutdown(void);
-
-void _elm_module_init(void);
-void _elm_module_shutdown(void);
-void _elm_module_parse(const char *s);
-Elm_Module *_elm_module_find_as(const char *as);
-Elm_Module *_elm_module_add(const char *name, const char *as);
-void _elm_module_del(Elm_Module *m);
-const void *_elm_module_symbol_get(Elm_Module *m, const char *name);
-
-/* FIXME: should this be public? for now - private (but public symbols) */
-EAPI Evas_Object *elm_widget_add(Evas *evas);
-EAPI void elm_widget_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
-EAPI void elm_widget_del_pre_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
-EAPI void elm_widget_focus_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
-EAPI void elm_widget_activate_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
-EAPI void elm_widget_disable_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
-EAPI void elm_widget_theme_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
-EAPI void elm_widget_changed_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
-EAPI void elm_widget_signal_emit_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source));
-EAPI void elm_widget_signal_callback_add_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data));
-EAPI void elm_widget_signal_callback_del_hook_set(Evas_Object *obj, void *(*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source)));
-EAPI void elm_widget_theme(Evas_Object *obj);
-EAPI void elm_widget_on_focus_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
-EAPI void elm_widget_on_change_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
-#ifdef HAVE_CONFORMANT_AUTOSCROLL
-EAPI void elm_widget_imp_region_get_hook_set(Evas_Object *obj, Evas_Object * (*func) (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h), void *data);
-#endif
-EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
-EAPI void elm_widget_data_set(Evas_Object *obj, void *data);
-EAPI void *elm_widget_data_get(const Evas_Object *obj);
-EAPI void elm_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj);
-EAPI void elm_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj);
-EAPI void elm_widget_resize_object_set(Evas_Object *obj, Evas_Object *sobj);
-EAPI void elm_widget_hover_object_set(Evas_Object *obj, Evas_Object *sobj);
-EAPI void elm_widget_signal_emit(Evas_Object *obj, const char *emission, const char *source);
-EAPI void elm_widget_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source), void *data);
-EAPI void *elm_widget_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source));
-EAPI void elm_widget_can_focus_set(Evas_Object *obj, int can_focus);
-EAPI int elm_widget_can_focus_get(const Evas_Object *obj);
-EAPI int elm_widget_focus_get(const Evas_Object *obj);
-EAPI Evas_Object *elm_widget_focused_object_get(const Evas_Object *obj);
-EAPI Evas_Object *elm_widget_top_get(const Evas_Object *obj);
-EAPI int elm_widget_focus_jump(Evas_Object *obj, int forward);
-EAPI void elm_widget_focus_set(Evas_Object *obj, int first);
-EAPI void elm_widget_focused_object_clear(Evas_Object *obj);
-EAPI Evas_Object *elm_widget_parent_get(const Evas_Object *obj);
-EAPI void elm_widget_focus_steal(Evas_Object *obj);
-EAPI void elm_widget_activate(Evas_Object *obj);
-EAPI void elm_widget_change(Evas_Object *obj);
-EAPI void elm_widget_disabled_set(Evas_Object *obj, int disabled);
-EAPI int elm_widget_disabled_get(const Evas_Object *obj);
-#ifdef HAVE_CONFORMANT_AUTOSCROLL
-EAPI Evas_Object *elm_widget_imp_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-#endif
-EAPI void elm_widget_show_region_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-EAPI void elm_widget_show_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-EAPI void elm_widget_scroll_hold_push(Evas_Object *obj);
-EAPI void elm_widget_scroll_hold_pop(Evas_Object *obj);
-EAPI int elm_widget_scroll_hold_get(const Evas_Object *obj);
-EAPI void elm_widget_scroll_freeze_push(Evas_Object *obj);
-EAPI void elm_widget_scroll_freeze_pop(Evas_Object *obj);
-EAPI int elm_widget_scroll_freeze_get(const Evas_Object *obj);
-EAPI void elm_widget_scale_set(Evas_Object *obj, double scale);
-EAPI double elm_widget_scale_get(const Evas_Object *obj);
-EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th);
-EAPI Elm_Theme *elm_widget_theme_get(const Evas_Object *obj);
-EAPI void elm_widget_style_set(Evas_Object *obj, const char *style);
-EAPI const char *elm_widget_style_get(const Evas_Object *obj);
-EAPI void elm_widget_type_set(Evas_Object *obj, const char *type);
-EAPI const char *elm_widget_type_get(const Evas_Object *obj);
-EAPI void elm_widget_drag_lock_x_set(Evas_Object *obj, Eina_Bool lock);
-EAPI void elm_widget_drag_lock_y_set(Evas_Object *obj, Eina_Bool lock);
-EAPI Eina_Bool elm_widget_drag_lock_x_get(const Evas_Object *obj);
-EAPI Eina_Bool elm_widget_drag_lock_y_get(const Evas_Object *obj);
-EAPI int elm_widget_drag_child_locked_x_get(const Evas_Object *obj);
-EAPI int elm_widget_drag_child_locked_y_get(const Evas_Object *obj);
-
-EAPI Eina_Bool elm_widget_is(const Evas_Object *obj);
-EAPI Evas_Object *elm_widget_parent_widget_get(const Evas_Object *obj);
-
-EAPI Eina_List *_elm_stringlist_get(const char *str);
-EAPI void _elm_stringlist_free(Eina_List *list);
-
-Eina_Bool _elm_widget_type_check(const Evas_Object *obj, const char *type);
-
-void _elm_unneed_ethumb(void);
-
-void _elm_rescale(void);
-
-void _elm_config_init(void);
-void _elm_config_sub_init(void);
-void _elm_config_shutdown(void);
-
-Eina_Bool elm_selection_set(Elm_Sel_Type selection, Evas_Object *widget, Elm_Sel_Format format, const char *buf);
-Eina_Bool elm_selection_clear(Elm_Sel_Type selection, Evas_Object *widget);
-Eina_Bool elm_selection_get(Elm_Sel_Type selection, Elm_Sel_Format format, Evas_Object *widget);
-Eina_Bool elm_drop_target_add(Evas_Object *widget, Elm_Sel_Type, Elm_Drop_Cb, void *);
-Eina_Bool elm_drop_target_del(Evas_Object *widget);
-Eina_Bool elm_drag_start(Evas_Object *, Elm_Sel_Format, const char *, void (*)(void *,Evas_Object*),void*);
-
-Eina_Bool _elm_dangerous_call_check(const char *call);
-
-void _elm_widtype_register(const char **ptr);
+void _elm_win_shutdown(void);
+void _elm_win_rescale(Elm_Theme *th, Eina_Bool use_theme);
+
+Eina_Bool _elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, const char *style);
+Eina_Bool _elm_theme_object_icon_set(Evas_Object *parent, Evas_Object *o, const char *group, const char *style);
+Eina_Bool _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, const char *style);
+Eina_Bool _elm_theme_icon_set(Elm_Theme *th, Evas_Object *o, const char *group, const char *style);
+Eina_Bool _elm_theme_parse(Elm_Theme *th, const char *theme);
+void _elm_theme_shutdown(void);
+
+void _elm_module_init(void);
+void _elm_module_shutdown(void);
+void _elm_module_parse(const char *s);
+Elm_Module *_elm_module_find_as(const char *as);
+Elm_Module *_elm_module_add(const char *name, const char *as);
+void _elm_module_del(Elm_Module *m);
+Eina_Bool _elm_module_load(Elm_Module *m);
+void _elm_module_unload(Elm_Module *m);
+const void *_elm_module_symbol_get(Elm_Module *m, const char *name);
+
+void _elm_widget_type_clear(void);
+void _elm_widget_focus_region_show(const Evas_Object *obj);
+
+void _elm_unneed_ethumb(void);
+
+void _elm_rescale(void);
+void _elm_widget_mirrored_reload(Evas_Object *obj);
+
+void _elm_config_init(void);
+void _elm_config_sub_init(void);
+void _elm_config_shutdown(void);
+Eina_Bool _elm_config_save(void);
+void _elm_config_reload(void);
+
+void _elm_recache(void);