diff --git a/src/modules/battery/e_mod_config.c b/src/modules/battery/e_mod_config.c
index 6a1fff09f..a83976200 100644
--- a/src/modules/battery/e_mod_config.c
+++ b/src/modules/battery/e_mod_config.c
@@ -20,7 +20,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_battery_module(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/battery/e_mod_main.h b/src/modules/battery/e_mod_main.h
index d86f4d875..03d130ccb 100644
--- a/src/modules/battery/e_mod_main.h
+++ b/src/modules/battery/e_mod_main.h
@@ -50,7 +50,7 @@ EAPI void *e_modapi_init     (E_Module *m);
 EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
 
-EAPI E_Config_Dialog *e_int_config_battery_module(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_battery_module(E_Container *con, const char *params __UNUSED__);
     
 void _battery_config_updated(void);
 extern Config *battery_config;
diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c
index 4ffef6017..f283aed67 100644
--- a/src/modules/conf/e_conf.c
+++ b/src/modules/conf/e_conf.c
@@ -60,7 +60,7 @@ static int  _e_configure_module_update_cb(void *data, int type, void *event);
 
 static E_Configure *_e_configure = NULL;
 
-EAPI void
+void
 e_configure_show(E_Container *con) 
 {
    E_Configure *eco;
@@ -205,7 +205,7 @@ e_configure_show(E_Container *con)
    _e_configure = eco;
 }
 
-EAPI void 
+void 
 e_configure_del(void) 
 {
    if (_e_configure) e_object_del(E_OBJECT(_e_configure));
diff --git a/src/modules/conf/e_conf.h b/src/modules/conf/e_conf.h
index c65de9415..e04158190 100644
--- a/src/modules/conf/e_conf.h
+++ b/src/modules/conf/e_conf.h
@@ -4,8 +4,8 @@
 #ifndef E_CONF_H
 #define E_CONF_H
 
-EAPI void e_configure_show(E_Container *con);
-EAPI void e_configure_del(void);
+void e_configure_show(E_Container *con);
+void e_configure_del(void);
 
 #endif
 #endif
diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c
index 3f9292c3f..79bdb217c 100644
--- a/src/modules/conf_applications/e_int_config_apps.c
+++ b/src/modules/conf_applications/e_int_config_apps.c
@@ -39,7 +39,7 @@ static void _cb_down(void *data, void *data2);
 static int _save_menu(E_Config_Dialog_Data *cfdata);
 static int _save_order(E_Config_Dialog_Data *cfdata);
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Data *data;
@@ -55,7 +55,7 @@ e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__)
    return _create_dialog(con, data);
 }
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_apps_add(E_Container *con, const char *params __UNUSED__) 
 {
    E_Desktop_Edit *ed;
@@ -93,7 +93,7 @@ e_int_config_apps_add(E_Container *con, const char *params __UNUSED__)
    return ed->cfd;
 }
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Data *data;
@@ -109,7 +109,7 @@ e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__)
    return _create_dialog(con, data);
 }
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_apps_ibar_other(E_Container *con, const char *path) 
 {
    E_Config_Data *data;
@@ -124,7 +124,7 @@ e_int_config_apps_ibar_other(E_Container *con, const char *path)
    return _create_dialog(con, data);
 }
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Data *data;
@@ -140,7 +140,7 @@ e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__)
    return _create_dialog(con, data);
 }
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Data *data;
diff --git a/src/modules/conf_applications/e_int_config_apps.h b/src/modules/conf_applications/e_int_config_apps.h
index 2492ecd82..96bcae976 100644
--- a/src/modules/conf_applications/e_int_config_apps.h
+++ b/src/modules/conf_applications/e_int_config_apps.h
@@ -3,12 +3,12 @@
 #ifndef E_INT_CONFIG_APPS_H
 #define E_INT_CONFIG_APPS_H
 
-EAPI E_Config_Dialog *e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__);
-EAPI E_Config_Dialog *e_int_config_apps_add(E_Container *con, const char *params __UNUSED__);
-EAPI E_Config_Dialog *e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__);
-EAPI E_Config_Dialog *e_int_config_apps_ibar_other(E_Container *con, const char *path);
-EAPI E_Config_Dialog *e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__);
-EAPI E_Config_Dialog *e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_apps_add(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_apps_ibar_other(E_Container *con, const char *path);
+E_Config_Dialog *e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_borders/e_int_config_borders.c b/src/modules/conf_borders/e_int_config_borders.c
index 5cc92d568..e18edbd6c 100644
--- a/src/modules/conf_borders/e_int_config_borders.c
+++ b/src/modules/conf_borders/e_int_config_borders.c
@@ -18,12 +18,13 @@ struct _E_Config_Dialog_Data
    int remember_border;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_borders(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
+   printf("e_int_config_borders\n");
    if (e_config_dialog_find("E", "appearance/borders")) return NULL;
    v = _config_view_new();
    if (!v) return NULL;
@@ -33,13 +34,14 @@ e_int_config_borders(E_Container *con, const char *params __UNUSED__)
    return cfd;
 }
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_borders_border(E_Container *con __UNUSED__, const char *params) 
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    E_Border *bd;
    
+   printf("e_int_config_borders_border\n");
    if (!params) return NULL;
    bd = NULL;
    sscanf(params, "%p", &bd);
diff --git a/src/modules/conf_borders/e_int_config_borders.h b/src/modules/conf_borders/e_int_config_borders.h
index c0d767f91..85499984f 100644
--- a/src/modules/conf_borders/e_int_config_borders.h
+++ b/src/modules/conf_borders/e_int_config_borders.h
@@ -3,8 +3,8 @@
 #ifndef E_INT_CONFIG_BORDERS_H
 #define E_INT_CONFIG_BORDERS_H
 
-EAPI E_Config_Dialog *e_int_config_borders(E_Container *con, const char *params __UNUSED__);
-EAPI E_Config_Dialog *e_int_config_borders_border(E_Container *con, const char *params);
+E_Config_Dialog *e_int_config_borders(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_borders_border(E_Container *con, const char *params);
 
 #endif
 #endif
diff --git a/src/modules/conf_clientlist/e_int_config_clientlist.c b/src/modules/conf_clientlist/e_int_config_clientlist.c
index 0ddf47182..b097274dc 100644
--- a/src/modules/conf_clientlist/e_int_config_clientlist.c
+++ b/src/modules/conf_clientlist/e_int_config_clientlist.c
@@ -21,7 +21,7 @@ struct _E_Config_Dialog_Data
    int max_caption_len;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_clientlist(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_clientlist/e_int_config_clientlist.h b/src/modules/conf_clientlist/e_int_config_clientlist.h
index 1ba0afa14..ae2339886 100644
--- a/src/modules/conf_clientlist/e_int_config_clientlist.h
+++ b/src/modules/conf_clientlist/e_int_config_clientlist.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_CLIENTLIST_H
 #define E_INT_CONFIG_CLIENTLIST_H
 
-EAPI E_Config_Dialog *e_int_config_clientlist(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_clientlist(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_colors/e_int_config_color_classes.c b/src/modules/conf_colors/e_int_config_color_classes.c
index 95d09a6b2..2a26c85bd 100644
--- a/src/modules/conf_colors/e_int_config_color_classes.c
+++ b/src/modules/conf_colors/e_int_config_color_classes.c
@@ -110,7 +110,7 @@ static void         _color2_cb_change     (void *data, Evas_Object *obj);
 static void         _color3_cb_change     (void *data, Evas_Object *obj);
 static void         _button_cb            (void *data, void *data2);
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_color_classes(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_colors/e_int_config_color_classes.h b/src/modules/conf_colors/e_int_config_color_classes.h
index 297c675a5..549e84125 100644
--- a/src/modules/conf_colors/e_int_config_color_classes.h
+++ b/src/modules/conf_colors/e_int_config_color_classes.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_COLOR_CLASSES_H
 #define E_INT_CONFIG_COLOR_CLASSES_H
 
-EAPI E_Config_Dialog *e_int_config_color_classes(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_color_classes(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_desk/e_int_config_desk.c b/src/modules/conf_desk/e_int_config_desk.c
index fc0b9b957..f53c122de 100644
--- a/src/modules/conf_desk/e_int_config_desk.c
+++ b/src/modules/conf_desk/e_int_config_desk.c
@@ -20,7 +20,7 @@ struct _E_Config_Dialog_Data
    Ecore_Event_Handler *hdl;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_desk(E_Container *con, const char *params)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_desk/e_int_config_desk.h b/src/modules/conf_desk/e_int_config_desk.h
index 850fc2ee9..d81092307 100644
--- a/src/modules/conf_desk/e_int_config_desk.h
+++ b/src/modules/conf_desk/e_int_config_desk.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_DESK_H
 #define E_INT_CONFIG_DESK_H
 
-EAPI E_Config_Dialog *e_int_config_desk(E_Container *con, const char *params);
+E_Config_Dialog *e_int_config_desk(E_Container *con, const char *params);
 
 #endif
 #endif
diff --git a/src/modules/conf_desklock/e_int_config_desklock.c b/src/modules/conf_desklock/e_int_config_desklock.c
index 671c6ce21..a8648dc47 100644
--- a/src/modules/conf_desklock/e_int_config_desklock.c
+++ b/src/modules/conf_desklock/e_int_config_desklock.c
@@ -73,7 +73,7 @@ struct _E_Config_Dialog_Data
 };
 
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_desklock/e_int_config_desklock.h b/src/modules/conf_desklock/e_int_config_desklock.h
index fee683bde..ed6d4f725 100644
--- a/src/modules/conf_desklock/e_int_config_desklock.h
+++ b/src/modules/conf_desklock/e_int_config_desklock.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_DESKLOCK_H
 #define E_INT_CONFIG_DESKLOCK_H
 
-EAPI E_Config_Dialog *e_int_config_desklock(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_desklock(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_desks/e_int_config_desks.c b/src/modules/conf_desks/e_int_config_desks.c
index 4dce38991..2f61d39ad 100644
--- a/src/modules/conf_desks/e_int_config_desks.c
+++ b/src/modules/conf_desks/e_int_config_desks.c
@@ -39,7 +39,7 @@ struct _E_Config_Dialog_Data
 };
 
 /* a nice easy setup function that does the dirty work */
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_desks(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_desks/e_int_config_desks.h b/src/modules/conf_desks/e_int_config_desks.h
index c885e5d2f..f164d259f 100644
--- a/src/modules/conf_desks/e_int_config_desks.h
+++ b/src/modules/conf_desks/e_int_config_desks.h
@@ -6,7 +6,7 @@
 #ifndef E_INT_CONFIG_DESKS_H
 #define E_INT_CONFIG_DESKS_H
 
-EAPI E_Config_Dialog *e_int_config_desks(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_desks(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_dialogs/e_int_config_dialogs.c b/src/modules/conf_dialogs/e_int_config_dialogs.c
index 85d68ffdc..0dae48324 100644
--- a/src/modules/conf_dialogs/e_int_config_dialogs.c
+++ b/src/modules/conf_dialogs/e_int_config_dialogs.c
@@ -18,7 +18,7 @@ struct _E_Config_Dialog_Data
    int remember_windows;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_dialogs(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_dialogs/e_int_config_dialogs.h b/src/modules/conf_dialogs/e_int_config_dialogs.h
index 998624339..273df2f0f 100644
--- a/src/modules/conf_dialogs/e_int_config_dialogs.h
+++ b/src/modules/conf_dialogs/e_int_config_dialogs.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_DIALOGS_H
 #define E_INT_CONFIG_DIALOGS_H
 
-EAPI E_Config_Dialog *e_int_config_dialogs(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_dialogs(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_display/e_int_config_display.c b/src/modules/conf_display/e_int_config_display.c
index 00639d226..a609f42ad 100644
--- a/src/modules/conf_display/e_int_config_display.c
+++ b/src/modules/conf_display/e_int_config_display.c
@@ -203,7 +203,7 @@ _surebox_new(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    return sb;
 }
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_display(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_display/e_int_config_display.h b/src/modules/conf_display/e_int_config_display.h
index 5fd44b654..9e31f328a 100644
--- a/src/modules/conf_display/e_int_config_display.h
+++ b/src/modules/conf_display/e_int_config_display.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_DISPLAY_H
 #define E_INT_CONFIG_DISPLAY_H
 
-EAPI E_Config_Dialog *e_int_config_display(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_display(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_dpms/e_int_config_dpms.c b/src/modules/conf_dpms/e_int_config_dpms.c
index 1fa27da89..ca725b536 100644
--- a/src/modules/conf_dpms/e_int_config_dpms.c
+++ b/src/modules/conf_dpms/e_int_config_dpms.c
@@ -89,7 +89,7 @@ _e_int_config_dpms_available(void)
    return 0;
 }
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_dpms(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_dpms/e_int_config_dpms.h b/src/modules/conf_dpms/e_int_config_dpms.h
index e5aa2753e..5d3a0b790 100644
--- a/src/modules/conf_dpms/e_int_config_dpms.h
+++ b/src/modules/conf_dpms/e_int_config_dpms.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_DPMS_H
 #define E_INT_CONFIG_DPMS_H
 
-EAPI E_Config_Dialog *e_int_config_dpms(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_dpms(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_edgebindings/e_int_config_edgebindings.c b/src/modules/conf_edgebindings/e_int_config_edgebindings.c
index 48aded601..29188c464 100644
--- a/src/modules/conf_edgebindings/e_int_config_edgebindings.c
+++ b/src/modules/conf_edgebindings/e_int_config_edgebindings.c
@@ -87,7 +87,7 @@ struct _E_Config_Dialog_Data
    E_Config_Dialog *cfd;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_edgebindings(E_Container *con, const char *params)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_edgebindings/e_int_config_edgebindings.h b/src/modules/conf_edgebindings/e_int_config_edgebindings.h
index 60f7b912b..56bd55980 100644
--- a/src/modules/conf_edgebindings/e_int_config_edgebindings.h
+++ b/src/modules/conf_edgebindings/e_int_config_edgebindings.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_EDGEBINDINGS_H
 #define E_INT_CONFIG_EDGEBINDINGS_H
 
-EAPI E_Config_Dialog *e_int_config_edgebindings(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_edgebindings(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_engine/e_int_config_engine.c b/src/modules/conf_engine/e_int_config_engine.c
index 08346ae1a..a5d02e7f0 100644
--- a/src/modules/conf_engine/e_int_config_engine.c
+++ b/src/modules/conf_engine/e_int_config_engine.c
@@ -19,7 +19,7 @@ struct _E_Config_Dialog_Data
    Evas_Object *o_composite;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_engine(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_engine/e_int_config_engine.h b/src/modules/conf_engine/e_int_config_engine.h
index 716641236..2d9181ed5 100644
--- a/src/modules/conf_engine/e_int_config_engine.h
+++ b/src/modules/conf_engine/e_int_config_engine.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_ENGINE_H
 #define E_INT_CONFIG_ENGINE_H
 
-EAPI E_Config_Dialog *e_int_config_engine(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_engine(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_exebuf/e_int_config_exebuf.c b/src/modules/conf_exebuf/e_int_config_exebuf.c
index 2f89346f6..bcae18ba0 100644
--- a/src/modules/conf_exebuf/e_int_config_exebuf.c
+++ b/src/modules/conf_exebuf/e_int_config_exebuf.c
@@ -30,7 +30,7 @@ struct _E_Config_Dialog_Data
 
 Eina_List *scroll_list = NULL;
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_exebuf(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_exebuf/e_int_config_exebuf.h b/src/modules/conf_exebuf/e_int_config_exebuf.h
index 8efc3fe58..710308b2b 100644
--- a/src/modules/conf_exebuf/e_int_config_exebuf.h
+++ b/src/modules/conf_exebuf/e_int_config_exebuf.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_EXEBUF_H
 #define E_INT_CONFIG_EXEBUF_H
 
-EAPI E_Config_Dialog *e_int_config_exebuf(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_exebuf(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_fonts/e_int_config_fonts.c b/src/modules/conf_fonts/e_int_config_fonts.c
index 183571744..124378310 100644
--- a/src/modules/conf_fonts/e_int_config_fonts.c
+++ b/src/modules/conf_fonts/e_int_config_fonts.c
@@ -149,7 +149,7 @@ struct _E_Config_Dialog_Data
      } gui;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_fonts(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_fonts/e_int_config_fonts.h b/src/modules/conf_fonts/e_int_config_fonts.h
index 64b1b1eaa..d7d8a4dd7 100644
--- a/src/modules/conf_fonts/e_int_config_fonts.h
+++ b/src/modules/conf_fonts/e_int_config_fonts.h
@@ -6,7 +6,7 @@
 #ifndef E_INT_CONFIG_FONTS_H
 #define E_INT_CONFIG_FONTS_H
 
-EAPI E_Config_Dialog *e_int_config_fonts(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_fonts(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.c b/src/modules/conf_icon_theme/e_int_config_icon_themes.c
index 3cd31be2b..90e8aac4c 100644
--- a/src/modules/conf_icon_theme/e_int_config_icon_themes.c
+++ b/src/modules/conf_icon_theme/e_int_config_icon_themes.c
@@ -24,7 +24,7 @@ struct _E_Config_Dialog_Data
    Ecore_Idler *fill_icon_themes_delayed;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.h b/src/modules/conf_icon_theme/e_int_config_icon_themes.h
index 0ecba0d66..c32c3300f 100644
--- a/src/modules/conf_icon_theme/e_int_config_icon_themes.h
+++ b/src/modules/conf_icon_theme/e_int_config_icon_themes.h
@@ -6,7 +6,7 @@
 #ifndef E_INT_CONFIG_ICON_THEMES_H
 #define E_INT_CONFIG_ICON_THEMES_H
 
-EAPI E_Config_Dialog *e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c
index 09d156d90..81279d141 100644
--- a/src/modules/conf_imc/e_int_config_imc.c
+++ b/src/modules/conf_imc/e_int_config_imc.c
@@ -87,7 +87,7 @@ struct _E_Config_Dialog_Data
    E_Win *win_import;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_imc(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
@@ -748,7 +748,7 @@ _e_imc_file_name_new_get(void)
 /** End IMC Utility Functions **/
 
 /** Import Dialog **/
-EAPI void
+void
 e_int_config_imc_import_done(E_Config_Dialog *dia)
 {
    E_Config_Dialog_Data *cfdata;
@@ -769,7 +769,7 @@ _cb_import(void *data1, void *data2)
      cfdata->win_import = e_int_config_imc_import(cfdata->cfd);
 }
 
-EAPI void
+void
 e_int_config_imc_update(E_Config_Dialog *dia, const char *file)
 {
    E_Config_Dialog_Data *cfdata;
diff --git a/src/modules/conf_imc/e_int_config_imc.h b/src/modules/conf_imc/e_int_config_imc.h
index 00d43dab3..7617c6954 100644
--- a/src/modules/conf_imc/e_int_config_imc.h
+++ b/src/modules/conf_imc/e_int_config_imc.h
@@ -6,9 +6,9 @@
 #ifndef E_INT_CONFIG_IMC_H
 #define E_INT_CONFIG_IMC_H
 
-EAPI E_Config_Dialog *e_int_config_imc(E_Container *con, const char *params __UNUSED__);
-EAPI void e_int_config_imc_import_done(E_Config_Dialog *dia);
-EAPI void e_int_config_imc_update(E_Config_Dialog *dia, const char *file);
+E_Config_Dialog *e_int_config_imc(E_Container *con, const char *params __UNUSED__);
+void e_int_config_imc_import_done(E_Config_Dialog *dia);
+void e_int_config_imc_update(E_Config_Dialog *dia, const char *file);
 
 #endif
 #endif
diff --git a/src/modules/conf_imc/e_int_config_imc_import.c b/src/modules/conf_imc/e_int_config_imc_import.c
index 79ecb311f..6c5eaee1e 100644
--- a/src/modules/conf_imc/e_int_config_imc_import.c
+++ b/src/modules/conf_imc/e_int_config_imc_import.c
@@ -35,7 +35,7 @@ static void _imc_import_cb_close     (void *data, void *data2);
 static void _imc_import_cb_key_down  (void *data, Evas *e, Evas_Object *obj, 
 					void *event);
 
-EAPI E_Win *
+E_Win *
 e_int_config_imc_import(E_Config_Dialog *parent)
 {
    Evas *evas;
@@ -139,7 +139,7 @@ e_int_config_imc_import(E_Config_Dialog *parent)
    return win;
 }
 
-EAPI void
+void
 e_int_config_imc_import_del(E_Win *win) 
 {
    Import *import;
diff --git a/src/modules/conf_imc/e_int_config_imc_import.h b/src/modules/conf_imc/e_int_config_imc_import.h
index 818ba8761..975173449 100644
--- a/src/modules/conf_imc/e_int_config_imc_import.h
+++ b/src/modules/conf_imc/e_int_config_imc_import.h
@@ -3,8 +3,8 @@
 #ifndef E_INT_CONFIG_IMC_IMPORT_H
 #define E_INT_CONFIG_IMC_IMPORT_H
 
-EAPI E_Win *e_int_config_imc_import(E_Config_Dialog *parent);
-EAPI void e_int_config_imc_import_del(E_Win *win);
+E_Win *e_int_config_imc_import(E_Config_Dialog *parent);
+void e_int_config_imc_import_del(E_Win *win);
     
 #endif
 #endif
diff --git a/src/modules/conf_interaction/e_int_config_interaction.c b/src/modules/conf_interaction/e_int_config_interaction.c
index fe997f681..cb0d8dbc5 100644
--- a/src/modules/conf_interaction/e_int_config_interaction.c
+++ b/src/modules/conf_interaction/e_int_config_interaction.c
@@ -17,7 +17,7 @@ struct _E_Config_Dialog_Data
    double thumbscroll_friction;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_interaction(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_interaction/e_int_config_interaction.h b/src/modules/conf_interaction/e_int_config_interaction.h
index 1cd6b7527..698afb076 100644
--- a/src/modules/conf_interaction/e_int_config_interaction.h
+++ b/src/modules/conf_interaction/e_int_config_interaction.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_INTERACTION_H
 #define E_INT_CONFIG_INTERACTION_H
 
-EAPI E_Config_Dialog *e_int_config_interaction(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_interaction(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c
index 5f696d157..e3ac3cf6f 100644
--- a/src/modules/conf_intl/e_int_config_intl.c
+++ b/src/modules/conf_intl/e_int_config_intl.c
@@ -563,7 +563,7 @@ const E_Intl_Pair charset_predefined_pairs[ ] = {
 
 
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_intl(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_intl/e_int_config_intl.h b/src/modules/conf_intl/e_int_config_intl.h
index 295f4568f..22ca1e62a 100644
--- a/src/modules/conf_intl/e_int_config_intl.h
+++ b/src/modules/conf_intl/e_int_config_intl.h
@@ -6,7 +6,7 @@
 #ifndef E_INT_CONFIG_INTL_H
 #define E_INT_CONFIG_INTL_H
 
-EAPI E_Config_Dialog *e_int_config_intl(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_intl(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c
index ccaa3aa70..86dd319fe 100644
--- a/src/modules/conf_keybindings/e_int_config_keybindings.c
+++ b/src/modules/conf_keybindings/e_int_config_keybindings.c
@@ -74,7 +74,7 @@ struct _E_Config_Dialog_Data
    E_Config_Dialog *cfd;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_keybindings(E_Container *con, const char *params)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.h b/src/modules/conf_keybindings/e_int_config_keybindings.h
index 3ffb983cf..0af90e27c 100644
--- a/src/modules/conf_keybindings/e_int_config_keybindings.h
+++ b/src/modules/conf_keybindings/e_int_config_keybindings.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_KEYBINDINGS_H
 #define E_INT_CONFIG_KEYBINDINGS_H
 
-EAPI E_Config_Dialog *e_int_config_keybindings(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_keybindings(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c
index 95a75343c..60d465dc9 100644
--- a/src/modules/conf_menus/e_int_config_menus.c
+++ b/src/modules/conf_menus/e_int_config_menus.c
@@ -24,7 +24,7 @@ struct _E_Config_Dialog_Data
    int menu_autoscroll_cursor_margin;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_menus(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_menus/e_int_config_menus.h b/src/modules/conf_menus/e_int_config_menus.h
index 194f0d043..1951ece58 100644
--- a/src/modules/conf_menus/e_int_config_menus.h
+++ b/src/modules/conf_menus/e_int_config_menus.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_MENUS_H
 #define E_INT_CONFIG_MENUS_H
 
-EAPI E_Config_Dialog *e_int_config_menus(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_menus(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_mime/e_int_config_mime.c b/src/modules/conf_mime/e_int_config_mime.c
index b6006bf12..ccf9fbef1 100644
--- a/src/modules/conf_mime/e_int_config_mime.c
+++ b/src/modules/conf_mime/e_int_config_mime.c
@@ -48,7 +48,7 @@ static void         _cb_config       (void *data, void *data2);
 
 Eina_List *types = NULL;
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_mime(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
@@ -66,7 +66,7 @@ e_int_config_mime(E_Container *con, const char *params __UNUSED__)
    return cfd;
 }
 
-EAPI void
+void
 e_int_config_mime_edit_done(void *data) 
 {
    E_Config_Dialog_Data *cfdata;
diff --git a/src/modules/conf_mime/e_int_config_mime.h b/src/modules/conf_mime/e_int_config_mime.h
index d8f27561c..e97c51874 100644
--- a/src/modules/conf_mime/e_int_config_mime.h
+++ b/src/modules/conf_mime/e_int_config_mime.h
@@ -3,8 +3,8 @@
 #ifndef E_INT_CONFIG_MIME_H
 #define E_INT_CONFIG_MIME_H
 
-EAPI E_Config_Dialog *e_int_config_mime(E_Container *con, const char *params __UNUSED__);
-EAPI void e_int_config_mime_edit_done(void *data);
+E_Config_Dialog *e_int_config_mime(E_Container *con, const char *params __UNUSED__);
+void e_int_config_mime_edit_done(void *data);
 
 #endif
 #endif
diff --git a/src/modules/conf_mime/e_int_config_mime_edit.c b/src/modules/conf_mime/e_int_config_mime_edit.c
index d6e73c5b2..d5898739d 100644
--- a/src/modules/conf_mime/e_int_config_mime_edit.c
+++ b/src/modules/conf_mime/e_int_config_mime_edit.c
@@ -44,7 +44,7 @@ struct _E_Config_Dialog_Data
 #define IFDUP(src, dst) if (src) dst = strdup(src); else dst = NULL;
 #define IFFREE(src) if (src) free(src); src = NULL;
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_mime/e_int_config_mime_edit.h b/src/modules/conf_mime/e_int_config_mime_edit.h
index da63bea0e..5d7e30082 100644
--- a/src/modules/conf_mime/e_int_config_mime_edit.h
+++ b/src/modules/conf_mime/e_int_config_mime_edit.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_MIME_EDIT_H
 #define E_INT_CONFIG_MIME_EDIT_H
 
-EAPI E_Config_Dialog *e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2);
+E_Config_Dialog *e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2);
 
 #endif
 #endif
diff --git a/src/modules/conf_mouse/e_int_config_mouse.c b/src/modules/conf_mouse/e_int_config_mouse.c
index 8aee863fe..3ce60d4ba 100644
--- a/src/modules/conf_mouse/e_int_config_mouse.c
+++ b/src/modules/conf_mouse/e_int_config_mouse.c
@@ -17,7 +17,7 @@ struct _E_Config_Dialog_Data
    double threshold;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_mouse(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_mouse/e_int_config_mouse.h b/src/modules/conf_mouse/e_int_config_mouse.h
index 643b27515..64dda048d 100644
--- a/src/modules/conf_mouse/e_int_config_mouse.h
+++ b/src/modules/conf_mouse/e_int_config_mouse.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_MOUSE_H
 #define E_INT_CONFIG_MOUSE_H
 
-EAPI E_Config_Dialog *e_int_config_mouse(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_mouse(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_mouse_cursor/e_int_config_cursor.c b/src/modules/conf_mouse_cursor/e_int_config_cursor.c
index 0e4aa9df6..0f894b7bc 100644
--- a/src/modules/conf_mouse_cursor/e_int_config_cursor.c
+++ b/src/modules/conf_mouse_cursor/e_int_config_cursor.c
@@ -25,7 +25,7 @@ struct _E_Config_Dialog_Data
      } gui;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_cursor(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_mouse_cursor/e_int_config_cursor.h b/src/modules/conf_mouse_cursor/e_int_config_cursor.h
index 5d87bdb92..ddfb9811a 100644
--- a/src/modules/conf_mouse_cursor/e_int_config_cursor.h
+++ b/src/modules/conf_mouse_cursor/e_int_config_cursor.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_CURSOR_H
 #define E_INT_CONFIG_CURSOR_H
 
-EAPI E_Config_Dialog *e_int_config_cursor(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_cursor(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
index 8aca1eabf..2cb830c59 100644
--- a/src/modules/conf_mousebindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
@@ -93,7 +93,7 @@ struct _E_Config_Dialog_Data
     } gui;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.h b/src/modules/conf_mousebindings/e_int_config_mousebindings.h
index 26965870f..1593a1bd0 100644
--- a/src/modules/conf_mousebindings/e_int_config_mousebindings.h
+++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_MOUSEBINDINGS_H
 #define E_INT_CONFIG_MOUSEBINDINGS_H
 
-EAPI E_Config_Dialog *e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_paths/e_int_config_paths.c b/src/modules/conf_paths/e_int_config_paths.c
index 8131b8533..24f2bbdf9 100644
--- a/src/modules/conf_paths/e_int_config_paths.c
+++ b/src/modules/conf_paths/e_int_config_paths.c
@@ -45,7 +45,7 @@ struct _E_Config_Dialog_Data
      } gui;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_paths(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_paths/e_int_config_paths.h b/src/modules/conf_paths/e_int_config_paths.h
index acd433cca..e4d2086f4 100644
--- a/src/modules/conf_paths/e_int_config_paths.h
+++ b/src/modules/conf_paths/e_int_config_paths.h
@@ -6,7 +6,7 @@
 #ifndef E_INT_CONFIG_PATHS_H
 #define E_INT_CONFIG_PATHS_H
 
-EAPI E_Config_Dialog *e_int_config_paths(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_paths(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_performance/e_int_config_performance.c b/src/modules/conf_performance/e_int_config_performance.c
index 1ea07b33e..bbcfc003e 100644
--- a/src/modules/conf_performance/e_int_config_performance.c
+++ b/src/modules/conf_performance/e_int_config_performance.c
@@ -20,7 +20,7 @@ struct _E_Config_Dialog_Data
    int edje_collection_cache;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_performance(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_performance/e_int_config_performance.h b/src/modules/conf_performance/e_int_config_performance.h
index c181a500f..2efbe47e1 100644
--- a/src/modules/conf_performance/e_int_config_performance.h
+++ b/src/modules/conf_performance/e_int_config_performance.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_PERFORMANCE_H
 #define E_INT_CONFIG_PERFORMANCE_H
 
-EAPI E_Config_Dialog *e_int_config_performance(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_performance(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c
index e683650c3..29797a5e4 100644
--- a/src/modules/conf_profiles/e_int_config_profiles.c
+++ b/src/modules/conf_profiles/e_int_config_profiles.c
@@ -12,7 +12,7 @@ static void _cb_reset(void *data, void *data2);
 static void _cb_dialog_yes(void *data);
 static void _cb_dialog_destroy(void *data);
 
-EAPI E_Dialog *_dia_new_profile(E_Config_Dialog_Data *cfdata);
+E_Dialog *_dia_new_profile(E_Config_Dialog_Data *cfdata);
 static void _new_profile_cb_close(void *data, E_Dialog *dia);
 static void _new_profile_cb_ok(void *data, E_Dialog *dia);
 static void _new_profile_cb_dia_del(void *obj);
@@ -37,7 +37,7 @@ struct _Del_Profile_Confirm_Data
    E_Config_Dialog_Data *cfdata;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_profiles(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
@@ -327,7 +327,7 @@ _cb_dialog_destroy(void *data)
    E_FREE(d);
 }
 
-EAPI E_Dialog *
+E_Dialog *
 _dia_new_profile(E_Config_Dialog_Data *cfdata)
 {
    E_Dialog *dia;
diff --git a/src/modules/conf_profiles/e_int_config_profiles.h b/src/modules/conf_profiles/e_int_config_profiles.h
index 2e1350389..ff18335f8 100644
--- a/src/modules/conf_profiles/e_int_config_profiles.h
+++ b/src/modules/conf_profiles/e_int_config_profiles.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_PROFILES_H
 #define E_INT_CONFIG_PROFILES_H
 
-EAPI E_Config_Dialog *e_int_config_profiles(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_profiles(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_scale/e_int_config_scale.c b/src/modules/conf_scale/e_int_config_scale.c
index cce7b3f1b..2c000d2a2 100644
--- a/src/modules/conf_scale/e_int_config_scale.c
+++ b/src/modules/conf_scale/e_int_config_scale.c
@@ -39,7 +39,7 @@ struct _E_Config_Dialog_Data
    } gui;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_scale(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_scale/e_int_config_scale.h b/src/modules/conf_scale/e_int_config_scale.h
index e4096e57b..3393afa65 100644
--- a/src/modules/conf_scale/e_int_config_scale.h
+++ b/src/modules/conf_scale/e_int_config_scale.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_SCALE_H
 #define E_INT_CONFIG_SCALE_H
 
-EAPI E_Config_Dialog *e_int_config_scale(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_scale(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_screensaver/e_int_config_screensaver.c b/src/modules/conf_screensaver/e_int_config_screensaver.c
index 5b1176fc7..0eceefd02 100644
--- a/src/modules/conf_screensaver/e_int_config_screensaver.c
+++ b/src/modules/conf_screensaver/e_int_config_screensaver.c
@@ -46,7 +46,7 @@ struct _E_Config_Dialog_Data
    } gui;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_screensaver(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_screensaver/e_int_config_screensaver.h b/src/modules/conf_screensaver/e_int_config_screensaver.h
index 4c99865c2..2f0ec8040 100644
--- a/src/modules/conf_screensaver/e_int_config_screensaver.h
+++ b/src/modules/conf_screensaver/e_int_config_screensaver.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_SCREENSAVER_H
 #define E_INT_CONFIG_SCREENSAVER_H
 
-EAPI E_Config_Dialog *e_int_config_screensaver(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_screensaver(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c
index e2c1c7f92..bab750cab 100644
--- a/src/modules/conf_shelves/e_int_config_shelf.c
+++ b/src/modules/conf_shelves/e_int_config_shelf.c
@@ -27,7 +27,7 @@ struct _Shelf_Del_Confirm_Data
     E_Shelf *es;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_shelf(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_shelves/e_int_config_shelf.h b/src/modules/conf_shelves/e_int_config_shelf.h
index ef1e61244..3d814fd3f 100644
--- a/src/modules/conf_shelves/e_int_config_shelf.h
+++ b/src/modules/conf_shelves/e_int_config_shelf.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_SHELF_H
 #define E_INT_CONFIG_SHELF_H
 
-EAPI E_Config_Dialog *e_int_config_shelf(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_shelf(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_startup/e_int_config_startup.c b/src/modules/conf_startup/e_int_config_startup.c
index 7cae0eeee..b2e0f1b5b 100644
--- a/src/modules/conf_startup/e_int_config_startup.c
+++ b/src/modules/conf_startup/e_int_config_startup.c
@@ -21,7 +21,7 @@ struct _E_Config_Dialog_Data
    char *splash;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_startup(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_startup/e_int_config_startup.h b/src/modules/conf_startup/e_int_config_startup.h
index b9f951de4..429edecbb 100644
--- a/src/modules/conf_startup/e_int_config_startup.h
+++ b/src/modules/conf_startup/e_int_config_startup.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_STARTUP_H
 #define E_INT_CONFIG_STARTUP_H
 
-EAPI E_Config_Dialog *e_int_config_startup(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_startup(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c
index 78b699070..5e1c4e7d9 100644
--- a/src/modules/conf_theme/e_int_config_theme.c
+++ b/src/modules/conf_theme/e_int_config_theme.c
@@ -71,7 +71,7 @@ static const char *parts_list[] =
      NULL
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_theme(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
@@ -94,7 +94,7 @@ e_int_config_theme(E_Container *con, const char *params __UNUSED__)
    return cfd;
 }
 
-EAPI void
+void
 e_int_config_theme_import_done(E_Config_Dialog *dia)
 {
    E_Config_Dialog_Data *cfdata;
@@ -103,7 +103,7 @@ e_int_config_theme_import_done(E_Config_Dialog *dia)
    cfdata->win_import = NULL;
 }
 
-EAPI void
+void
 e_int_config_theme_web_done(E_Config_Dialog *dia)
 {
    E_Config_Dialog_Data *cfdata;
@@ -112,7 +112,7 @@ e_int_config_theme_web_done(E_Config_Dialog *dia)
    cfdata->dia_web = NULL;
 }
 
-EAPI void
+void
 e_int_config_theme_update(E_Config_Dialog *dia, char *file)
 {
    E_Config_Dialog_Data *cfdata;
diff --git a/src/modules/conf_theme/e_int_config_theme.h b/src/modules/conf_theme/e_int_config_theme.h
index b24859a7c..3601972e3 100644
--- a/src/modules/conf_theme/e_int_config_theme.h
+++ b/src/modules/conf_theme/e_int_config_theme.h
@@ -6,11 +6,11 @@
 #ifndef E_INT_CONFIG_THEME_H
 #define E_INT_CONFIG_THEME_H
 
-EAPI E_Config_Dialog *e_int_config_theme(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_theme(E_Container *con, const char *params __UNUSED__);
 
-EAPI void             e_int_config_theme_import_done(E_Config_Dialog *dia);
-EAPI void             e_int_config_theme_update(E_Config_Dialog *dia, char *file);
-EAPI void             e_int_config_theme_web_done(E_Config_Dialog *dia);
+void             e_int_config_theme_import_done(E_Config_Dialog *dia);
+void             e_int_config_theme_update(E_Config_Dialog *dia, char *file);
+void             e_int_config_theme_web_done(E_Config_Dialog *dia);
 
 #endif
 #endif
diff --git a/src/modules/conf_theme/e_int_config_theme_import.c b/src/modules/conf_theme/e_int_config_theme_import.c
index a4a6934ae..107627193 100644
--- a/src/modules/conf_theme/e_int_config_theme_import.c
+++ b/src/modules/conf_theme/e_int_config_theme_import.c
@@ -35,7 +35,7 @@ static void _theme_import_cb_ok(void *data, void *data2);
 static void _theme_import_cb_close(void *data, void *data2);
 static void _theme_import_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event);
 
-EAPI E_Win *
+E_Win *
 e_int_config_theme_import(E_Config_Dialog *parent) 
 {
    Evas *evas;
@@ -148,7 +148,7 @@ e_int_config_theme_import(E_Config_Dialog *parent)
    return win;
 }
 
-EAPI void
+void
 e_int_config_theme_del(E_Win *win) 
 {
    Import *import;
diff --git a/src/modules/conf_theme/e_int_config_theme_import.h b/src/modules/conf_theme/e_int_config_theme_import.h
index ab838ec49..84ff8c2f5 100644
--- a/src/modules/conf_theme/e_int_config_theme_import.h
+++ b/src/modules/conf_theme/e_int_config_theme_import.h
@@ -3,8 +3,8 @@
 #ifndef E_INT_CONFIG_THEME_IMPORT_H
 #define E_INT_CONFIG_THEME_IMPORT_H
 
-EAPI E_Win *e_int_config_theme_import (E_Config_Dialog *parent);
-EAPI void   e_int_config_theme_del    (E_Win *win);
+E_Win *e_int_config_theme_import (E_Config_Dialog *parent);
+void   e_int_config_theme_del    (E_Win *win);
 
 #endif
 #endif
diff --git a/src/modules/conf_theme/e_int_config_theme_web.c b/src/modules/conf_theme/e_int_config_theme_web.c
index 067a35cb9..91ad18cf2 100644
--- a/src/modules/conf_theme/e_int_config_theme_web.c
+++ b/src/modules/conf_theme/e_int_config_theme_web.c
@@ -104,7 +104,7 @@ _web_apply(const char *path, void *data)
    if ((a) && (a->func.go)) a->func.go(NULL, NULL);
 }
 
-EAPI E_Dialog *
+E_Dialog *
 e_int_config_theme_web(E_Config_Dialog *parent)
 {
    E_Dialog *dia;
diff --git a/src/modules/conf_theme/e_int_config_theme_web.h b/src/modules/conf_theme/e_int_config_theme_web.h
index 121a62eb8..f65576558 100644
--- a/src/modules/conf_theme/e_int_config_theme_web.h
+++ b/src/modules/conf_theme/e_int_config_theme_web.h
@@ -3,8 +3,8 @@
 #ifndef E_INT_CONFIG_THEME_WEB_H
 #define E_INT_CONFIG_THEME_WEB_H
 
-EAPI E_Dialog *e_int_config_theme_web(E_Config_Dialog *parent);
-EAPI void      e_int_config_theme_web_del(E_Dialog *dia);
+E_Dialog *e_int_config_theme_web(E_Config_Dialog *parent);
+void      e_int_config_theme_web_del(E_Dialog *dia);
 
 #endif
 #endif
diff --git a/src/modules/conf_transitions/e_int_config_transitions.c b/src/modules/conf_transitions/e_int_config_transitions.c
index 2406d0c34..320de8c30 100644
--- a/src/modules/conf_transitions/e_int_config_transitions.c
+++ b/src/modules/conf_transitions/e_int_config_transitions.c
@@ -26,7 +26,7 @@ struct _E_Config_Dialog_Data
    Evas_Object *o_bg;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_transitions(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_transitions/e_int_config_transitions.h b/src/modules/conf_transitions/e_int_config_transitions.h
index 66d762b7a..6fbac25d6 100644
--- a/src/modules/conf_transitions/e_int_config_transitions.h
+++ b/src/modules/conf_transitions/e_int_config_transitions.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_TRANSITIONS_H
 #define E_INT_CONFIG_TRANSITIONS_H
 
-EAPI E_Config_Dialog *e_int_config_transitions(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_transitions(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_window_display/e_int_config_window_display.c b/src/modules/conf_window_display/e_int_config_window_display.c
index 93467f6e0..9c602d96b 100644
--- a/src/modules/conf_window_display/e_int_config_window_display.c
+++ b/src/modules/conf_window_display/e_int_config_window_display.c
@@ -37,7 +37,7 @@ struct _E_Config_Dialog_Data
 Eina_List *shading_list = NULL;
 
 /* a nice easy setup function that does the dirty work */
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_window_display(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_window_display/e_int_config_window_display.h b/src/modules/conf_window_display/e_int_config_window_display.h
index 9d693af46..930617469 100644
--- a/src/modules/conf_window_display/e_int_config_window_display.h
+++ b/src/modules/conf_window_display/e_int_config_window_display.h
@@ -6,7 +6,7 @@
 #ifndef E_INT_CONFIG_WINDOW_DISPLAY_H
 #define E_INT_CONFIG_WINDOW_DISPLAY_H
 
-EAPI E_Config_Dialog *e_int_config_window_display(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_window_display(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_window_focus/e_int_config_focus.c b/src/modules/conf_window_focus/e_int_config_focus.c
index 42e03a59c..e2690cc51 100644
--- a/src/modules/conf_window_focus/e_int_config_focus.c
+++ b/src/modules/conf_window_focus/e_int_config_focus.c
@@ -29,7 +29,7 @@ struct _E_Config_Dialog_Data
 };
 
 /* a nice easy setup function that does the dirty work */
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_focus(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_window_focus/e_int_config_focus.h b/src/modules/conf_window_focus/e_int_config_focus.h
index 736f589f0..913158c87 100644
--- a/src/modules/conf_window_focus/e_int_config_focus.h
+++ b/src/modules/conf_window_focus/e_int_config_focus.h
@@ -6,7 +6,7 @@
 #ifndef E_INT_CONFIG_FOCUS_H
 #define E_INT_CONFIG_FOCUS_H
 
-EAPI E_Config_Dialog *e_int_config_focus(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_focus(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
index 56b11692c..7809303e7 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
@@ -35,7 +35,7 @@ struct _E_Config_Dialog_Data
 Eina_List *resistance_list = NULL;
 
 /* a nice easy setup function that does the dirty work */
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_manipulation.h b/src/modules/conf_window_manipulation/e_int_config_window_manipulation.h
index 01e1a8011..b30b1c793 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_manipulation.h
+++ b/src/modules/conf_window_manipulation/e_int_config_window_manipulation.h
@@ -6,9 +6,9 @@
 #ifndef E_INT_CONFIG_WINDOW_MANIPULATION_H
 #define E_INT_CONFIG_WINDOW_MANIPULATION_H
 
-EAPI E_Config_Dialog *e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__);
-EAPI E_Config_Dialog *e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__);
-EAPI E_Config_Dialog *e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c b/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
index 62b6e7c95..b4fc0cdaf 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
@@ -23,7 +23,7 @@ struct _E_Config_Dialog_Data
 };
 
 /* a nice easy setup function that does the dirty work */
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_stacking.c b/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
index cfa3b54a2..888ce4e63 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
@@ -27,7 +27,7 @@ struct _E_Config_Dialog_Data
 Eina_List *autoraise_list = NULL;
 
 /* a nice easy setup function that does the dirty work */
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.c b/src/modules/conf_window_remembers/e_int_config_remembers.c
index 84157a339..ef5001440 100644
--- a/src/modules/conf_window_remembers/e_int_config_remembers.c
+++ b/src/modules/conf_window_remembers/e_int_config_remembers.c
@@ -16,7 +16,7 @@ struct _E_Config_Dialog_Data
    int remember_fm_wins;
 };
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_remembers(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.h b/src/modules/conf_window_remembers/e_int_config_remembers.h
index 3d344d3fe..244c73442 100644
--- a/src/modules/conf_window_remembers/e_int_config_remembers.h
+++ b/src/modules/conf_window_remembers/e_int_config_remembers.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_REMEMBERS_H
 #define E_INT_CONFIG_REMEMBERS_H
 
-EAPI E_Config_Dialog *e_int_config_remembers(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_remembers(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/conf_winlist/e_int_config_winlist.c b/src/modules/conf_winlist/e_int_config_winlist.c
index d5b6b130d..1088fec2c 100644
--- a/src/modules/conf_winlist/e_int_config_winlist.c
+++ b/src/modules/conf_winlist/e_int_config_winlist.c
@@ -42,7 +42,7 @@ Eina_List *iconified_list = NULL;
 Eina_List *warp_at_end_list = NULL;
 Eina_List *scroll_animation_list = NULL;
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_winlist(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/conf_winlist/e_int_config_winlist.h b/src/modules/conf_winlist/e_int_config_winlist.h
index d2df20848..5461e57c6 100644
--- a/src/modules/conf_winlist/e_int_config_winlist.h
+++ b/src/modules/conf_winlist/e_int_config_winlist.h
@@ -3,7 +3,7 @@
 #ifndef E_INT_CONFIG_WINLIST_H
 #define E_INT_CONFIG_WINLIST_H
 
-EAPI E_Config_Dialog *e_int_config_winlist(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_winlist(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/dropshadow/e_mod_config.c b/src/modules/dropshadow/e_mod_config.c
index ecbc2a25f..58548e5a0 100644
--- a/src/modules/dropshadow/e_mod_config.c
+++ b/src/modules/dropshadow/e_mod_config.c
@@ -18,7 +18,7 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/dropshadow/e_mod_config.h b/src/modules/dropshadow/e_mod_config.h
index e50d194eb..74d2cfc9b 100644
--- a/src/modules/dropshadow/e_mod_config.h
+++ b/src/modules/dropshadow/e_mod_config.h
@@ -3,6 +3,6 @@
 #ifndef E_MOD_CONFIG_H
 #define E_MOD_CONFIG_H
 #include "e_mod_main.h"
-EAPI E_Config_Dialog *e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__);
 #endif
 #endif
diff --git a/src/modules/exebuf/e_exebuf.c b/src/modules/exebuf/e_exebuf.c
index aeb2096f4..5c1150659 100644
--- a/src/modules/exebuf/e_exebuf.c
+++ b/src/modules/exebuf/e_exebuf.c
@@ -109,7 +109,7 @@ static int ev_last_which_list = NO_LIST;
 #define EXEBUFLEN 2048
 
 /* externally accessible functions */
-EAPI int
+int
 e_exebuf_init(void)
 {
    exelist_exe_edd = E_CONFIG_DD_NEW("E_Exe", E_Exe);
@@ -129,7 +129,7 @@ e_exebuf_init(void)
    return 1;
 }
 
-EAPI int
+int
 e_exebuf_shutdown(void)
 {
    E_CONFIG_DD_FREE(exelist_edd);
@@ -138,7 +138,7 @@ e_exebuf_shutdown(void)
    return 1;
 }
 
-EAPI int
+int
 e_exebuf_show(E_Zone *zone)
 {
    Evas_Object *o;
@@ -282,7 +282,7 @@ e_exebuf_show(E_Zone *zone)
    return 1;
 }
 
-EAPI void
+void
 e_exebuf_hide(void)
 {
    Ecore_Event_Handler *ev;
diff --git a/src/modules/exebuf/e_exebuf.h b/src/modules/exebuf/e_exebuf.h
index 935d9fb5e..4004fda67 100644
--- a/src/modules/exebuf/e_exebuf.h
+++ b/src/modules/exebuf/e_exebuf.h
@@ -7,11 +7,11 @@
 #ifndef E_EXEBUF_H
 #define E_EXEBUF_H
 
-EAPI int e_exebuf_init(void);
-EAPI int e_exebuf_shutdown(void);
+int e_exebuf_init(void);
+int e_exebuf_shutdown(void);
 
-EAPI int  e_exebuf_show(E_Zone *zone);
-EAPI void e_exebuf_hide(void);
+int  e_exebuf_show(E_Zone *zone);
+void e_exebuf_hide(void);
 
 #endif
 #endif
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 58889b28d..88026659c 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -143,7 +143,7 @@ static void _e_fwin_op_registry_abort_cb(void *data, Evas_Object *obj, const cha
 static Eina_List *fwins = NULL;
 
 /* externally accessible functions */
-EAPI int
+int
 e_fwin_init(void)
 {
    eina_init();
@@ -151,7 +151,7 @@ e_fwin_init(void)
    return 1;
 }
 
-EAPI int
+int
 e_fwin_shutdown(void)
 {
    E_Fwin *fwin;
@@ -167,13 +167,13 @@ e_fwin_shutdown(void)
 /* FIXME: this opens a new window - we need a way to inherit a zone as the
  * "fwin" window
  */
-EAPI void
+void
 e_fwin_new(E_Container *con, const char *dev, const char *path)
 {
    _e_fwin_new(con, dev, path);
 }
 
-EAPI void
+void
 e_fwin_zone_new(E_Zone *zone, const char *dev, const char *path)
 {
    E_Fwin *fwin;
@@ -263,7 +263,7 @@ e_fwin_zone_new(E_Zone *zone, const char *dev, const char *path)
    fwin->cur_page = fwin->pages->data;
 }
 
-EAPI void
+void
 e_fwin_all_unsel(void *data)
 {
    E_Fwin *fwin;
@@ -274,7 +274,7 @@ e_fwin_all_unsel(void *data)
    e_fm2_all_unsel(fwin->cur_page->fm_obj);
 }
 
-EAPI void 
+void 
 e_fwin_zone_shutdown(E_Zone *zone) 
 {
    Eina_List *f;
@@ -288,7 +288,7 @@ e_fwin_zone_shutdown(E_Zone *zone)
      }
 }
 
-EAPI void 
+void 
 e_fwin_reload_all(void) 
 {
    Eina_List *l, *ll, *lll;
@@ -340,7 +340,7 @@ e_fwin_reload_all(void)
 	       }
 }
 
-EAPI int
+int
 e_fwin_zone_find(E_Zone *zone)
 {
    Eina_List *f;
diff --git a/src/modules/fileman/e_fwin.h b/src/modules/fileman/e_fwin.h
index 70f304643..396a81098 100644
--- a/src/modules/fileman/e_fwin.h
+++ b/src/modules/fileman/e_fwin.h
@@ -7,14 +7,14 @@
 #ifndef E_FWIN_H
 #define E_FWIN_H
 
-EAPI int  e_fwin_init          (void);
-EAPI int  e_fwin_shutdown      (void);
-EAPI void e_fwin_new           (E_Container *con, const char *dev, const char *path);
-EAPI void e_fwin_zone_new      (E_Zone *zone, const char *dev, const char *path);
-EAPI void e_fwin_zone_shutdown (E_Zone *zone);
-EAPI void e_fwin_all_unsel     (void *data);
-EAPI void e_fwin_reload_all    (void);
-EAPI int  e_fwin_zone_find     (E_Zone *zone);
+int  e_fwin_init          (void);
+int  e_fwin_shutdown      (void);
+void e_fwin_new           (E_Container *con, const char *dev, const char *path);
+void e_fwin_zone_new      (E_Zone *zone, const char *dev, const char *path);
+void e_fwin_zone_shutdown (E_Zone *zone);
+void e_fwin_all_unsel     (void *data);
+void e_fwin_reload_all    (void);
+int  e_fwin_zone_find     (E_Zone *zone);
 
 #endif
 #endif
diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c
index 2e5240798..3e5b650bc 100644
--- a/src/modules/fileman/e_mod_config.c
+++ b/src/modules/fileman/e_mod_config.c
@@ -79,7 +79,7 @@ static int   _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static int   _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 e_int_config_fileman(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/fileman/e_mod_config.h b/src/modules/fileman/e_mod_config.h
index 8d2991ad4..6b68c65c9 100644
--- a/src/modules/fileman/e_mod_config.h
+++ b/src/modules/fileman/e_mod_config.h
@@ -4,7 +4,7 @@
 #ifndef E_MOD_CONFIG_H
 #define E_MOD_CONFIG_H
 
-EAPI E_Config_Dialog *e_int_config_fileman(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_fileman(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/gadman/e_mod_config.c b/src/modules/gadman/e_mod_config.c
index d340b04ff..04eb99fba 100644
--- a/src/modules/gadman/e_mod_config.c
+++ b/src/modules/gadman/e_mod_config.c
@@ -34,7 +34,7 @@ static void _cb_fm_change(void *data, Evas_Object *obj, void *event_info);
 static void _cb_fm_sel_change(void *data, Evas_Object *obj, void *event_info);
 static void _cb_button_up(void *data1, void *data2);
 
-EAPI E_Config_Dialog *
+E_Config_Dialog *
 _config_gadman_module(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
diff --git a/src/modules/gadman/e_mod_config.h b/src/modules/gadman/e_mod_config.h
index 18bf24489..efa97a845 100644
--- a/src/modules/gadman/e_mod_config.h
+++ b/src/modules/gadman/e_mod_config.h
@@ -3,7 +3,7 @@
 #ifndef E_MOD_CONFIG_H
 #define E_MOD_CONFIG_H
 
-EAPI E_Config_Dialog *_config_gadman_module(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *_config_gadman_module(E_Container *con, const char *params __UNUSED__);
 
 #endif
 #endif
diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c
index 8106f5550..b7800a415 100644
--- a/src/modules/syscon/e_syscon.c
+++ b/src/modules/syscon/e_syscon.c
@@ -29,20 +29,20 @@ static int inevas = 0;
 static Ecore_Timer *deftimer = NULL;
 
 /* externally accessible functions */
-EAPI int
+int
 e_syscon_init(void)
 {
    return 1;
 }
 
-EAPI int
+int
 e_syscon_shutdown(void)
 {
    e_syscon_hide();
    return 1;
 }
 
-EAPI int
+int
 e_syscon_show(E_Zone *zone, const char *defact)
 {
    Evas_Object *o, *o2;
@@ -281,7 +281,7 @@ e_syscon_show(E_Zone *zone, const char *defact)
    return 1;
 }
 
-EAPI void
+void
 e_syscon_hide(void)
 {
    if (!popup) return;
diff --git a/src/modules/syscon/e_syscon.h b/src/modules/syscon/e_syscon.h
index 2187b0509..5392158f3 100644
--- a/src/modules/syscon/e_syscon.h
+++ b/src/modules/syscon/e_syscon.h
@@ -7,11 +7,11 @@
 #ifndef E_SYSCON_H
 #define E_SYSCON_H
 
-EAPI int e_syscon_init(void);
-EAPI int e_syscon_shutdown(void);
+int e_syscon_init(void);
+int e_syscon_shutdown(void);
 
-EAPI int  e_syscon_show(E_Zone *zone, const char *defact);
-EAPI void e_syscon_hide(void);
+int  e_syscon_show(E_Zone *zone, const char *defact);
+void e_syscon_hide(void);
 
 #endif
 #endif
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index 032e8a3d5..52172ad24 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -67,20 +67,20 @@ static Ecore_Timer *scroll_timer = NULL;
 static Ecore_Animator *animator = NULL;
 
 /* externally accessible functions */
-EAPI int
+int
 e_winlist_init(void)
 {
    return 1;
 }
 
-EAPI int
+int
 e_winlist_shutdown(void)
 {
    e_winlist_hide();
    return 1;
 }
 
-EAPI int
+int
 e_winlist_show(E_Zone *zone)
 {
    int x, y, w, h;
@@ -211,7 +211,7 @@ e_winlist_show(E_Zone *zone)
    return 1;
 }
 
-EAPI void
+void
 e_winlist_hide(void)
 {
    E_Border *bd = NULL;
@@ -314,7 +314,7 @@ e_winlist_hide(void)
      }
 }
 
-EAPI void
+void
 e_winlist_next(void)
 {
    if (!winlist) return;
@@ -338,7 +338,7 @@ e_winlist_next(void)
    _e_winlist_activate();
 }
 
-EAPI void
+void
 e_winlist_prev(void)
 {
    if (!winlist) return;
@@ -362,7 +362,7 @@ e_winlist_prev(void)
    _e_winlist_activate();
 }
 
-EAPI void
+void
 e_winlist_modifiers_set(int mod)
 {
    if (!winlist) return;
diff --git a/src/modules/winlist/e_winlist.h b/src/modules/winlist/e_winlist.h
index 139b71c7b..1d53aea9a 100644
--- a/src/modules/winlist/e_winlist.h
+++ b/src/modules/winlist/e_winlist.h
@@ -7,14 +7,14 @@
 #ifndef E_WINLIST_H
 #define E_WINLIST_H
 
-EAPI int e_winlist_init(void);
-EAPI int e_winlist_shutdown(void);
+int e_winlist_init(void);
+int e_winlist_shutdown(void);
 
-EAPI int  e_winlist_show(E_Zone *zone);
-EAPI void e_winlist_hide(void);
-EAPI void e_winlist_next(void);
-EAPI void e_winlist_prev(void);
-EAPI void e_winlist_modifiers_set(int mod);
+int  e_winlist_show(E_Zone *zone);
+void e_winlist_hide(void);
+void e_winlist_next(void);
+void e_winlist_prev(void);
+void e_winlist_modifiers_set(int mod);
 
 #endif
 #endif
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index 678844afd..627bdc477 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -20,7 +20,7 @@ static int next_ok = 1;
 static int next_can = 0;
 static int next_prev = 0;
 
-EAPI int
+int
 e_wizard_init(void)
 {
    Eina_List *l;
@@ -52,7 +52,7 @@ e_wizard_init(void)
    return 1;
 }
 
-EAPI int
+int
 e_wizard_shutdown(void)
 {
    if (pop)
@@ -72,7 +72,7 @@ e_wizard_shutdown(void)
    return 1;
 }
 
-EAPI void
+void
 e_wizard_go(void)
 {
    if (!curpage)
@@ -94,7 +94,7 @@ e_wizard_go(void)
      }
 }
 
-EAPI void
+void
 e_wizard_apply(void)
 {
    Eina_List *l;
@@ -108,7 +108,7 @@ e_wizard_apply(void)
      }
 }
 
-EAPI void
+void
 e_wizard_next(void)
 {
    Eina_List *l;
@@ -148,7 +148,7 @@ e_wizard_next(void)
      }
 }
 
-EAPI void
+void
 e_wizard_page_show(Evas_Object *obj)
 {
    Evas_Coord minw, minh;
@@ -166,7 +166,7 @@ e_wizard_page_show(Evas_Object *obj)
      }
 }
 
-EAPI E_Wizard_Page *
+E_Wizard_Page *
 e_wizard_page_add(void *handle,
 		  int (*init)     (E_Wizard_Page *pg),
 		  int (*shutdown) (E_Wizard_Page *pg),
@@ -194,7 +194,7 @@ e_wizard_page_add(void *handle,
    return pg;
 }
 
-EAPI void
+void
 e_wizard_page_del(E_Wizard_Page *pg)
 {
    if (pg->handle) dlclose(pg->handle);
@@ -202,20 +202,20 @@ e_wizard_page_del(E_Wizard_Page *pg)
    free(pg);
 }
 
-EAPI void
+void
 e_wizard_button_next_enable_set(int enable)
 {
    next_ok = enable;
    _e_wizard_next_eval();
 }
 
-EAPI void
+void
 e_wizard_title_set(const char *title)
 {
    edje_object_part_text_set(o_bg, "e.text.title", title);
 }
 
-EAPI void
+void
 e_wizard_labels_update(void)
 {
    edje_object_part_text_set(o_bg, "e.text.label", _("Next"));
diff --git a/src/modules/wizard/e_wizard.h b/src/modules/wizard/e_wizard.h
index a05f65ab8..416ac5455 100644
--- a/src/modules/wizard/e_wizard.h
+++ b/src/modules/wizard/e_wizard.h
@@ -21,13 +21,13 @@ struct _E_Wizard_Page
    void *data;
 };
 
-EAPI int e_wizard_init(void);
-EAPI int e_wizard_shutdown(void);
-EAPI void e_wizard_go(void);
-EAPI void e_wizard_apply(void);
-EAPI void e_wizard_next(void);
-EAPI void e_wizard_page_show(Evas_Object *obj);
-EAPI E_Wizard_Page *
+int e_wizard_init(void);
+int e_wizard_shutdown(void);
+void e_wizard_go(void);
+void e_wizard_apply(void);
+void e_wizard_next(void);
+void e_wizard_page_show(Evas_Object *obj);
+E_Wizard_Page *
   e_wizard_page_add(void *handle,
 		    int (*init)     (E_Wizard_Page *pg),
 		    int (*shutdown) (E_Wizard_Page *pg),
@@ -35,10 +35,10 @@ EAPI E_Wizard_Page *
 		    int (*hide)     (E_Wizard_Page *pg),
 		    int (*apply)    (E_Wizard_Page *pg)
 		    );
-EAPI void e_wizard_page_del(E_Wizard_Page *pg);
-EAPI void e_wizard_button_next_enable_set(int enable);
-EAPI void e_wizard_title_set(const char *title);
-EAPI void e_wizard_labels_update(void);
+void e_wizard_page_del(E_Wizard_Page *pg);
+void e_wizard_button_next_enable_set(int enable);
+void e_wizard_title_set(const char *title);
+void e_wizard_labels_update(void);
     
 #endif
 #endif