diff --git a/legacy/ecore/src/lib/ecore_con/Ecore_Con.h b/legacy/ecore/src/lib/ecore_con/Ecore_Con.h
index a20f8dc47d..f5e4221fe8 100644
--- a/legacy/ecore/src/lib/ecore_con/Ecore_Con.h
+++ b/legacy/ecore/src/lib/ecore_con/Ecore_Con.h
@@ -119,9 +119,9 @@ extern "C" {
    EAPI int               ecore_con_init(void);
    EAPI int               ecore_con_shutdown(void);
    
-   EAPI Ecore_Con_Server *ecore_con_server_add(Ecore_Con_Type type, char *name, int port, const void *data);
+   EAPI Ecore_Con_Server *ecore_con_server_add(Ecore_Con_Type type, const char *name, int port, const void *data);
    
-   EAPI Ecore_Con_Server *ecore_con_server_connect(Ecore_Con_Type type, char *name, int port, const void *data);
+   EAPI Ecore_Con_Server *ecore_con_server_connect(Ecore_Con_Type type, const char *name, int port, const void *data);
    EAPI void             *ecore_con_server_del(Ecore_Con_Server *svr);
    EAPI void             *ecore_con_server_data_get(Ecore_Con_Server *svr);
    EAPI int               ecore_con_server_connected_get(Ecore_Con_Server *svr);
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c
index 96b2d80061..a0f3211aad 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c
@@ -137,7 +137,7 @@ ecore_con_shutdown(void)
  */
 Ecore_Con_Server *
 ecore_con_server_add(Ecore_Con_Type compl_type,
-		     char *name,
+		     const char *name,
 		     int port,
 		     const void *data)
 {
@@ -356,7 +356,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
  */
 Ecore_Con_Server *
 ecore_con_server_connect(Ecore_Con_Type compl_type,
-			 char *name,
+			 const char *name,
 			 int port,
 			 const void *data)
 {
diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c
index 9899f1cc59..918c2be707 100644
--- a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c
+++ b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c
@@ -1,4 +1,5 @@
 /* by Azundris, with thanks to Corey Donohoe <atmos@atmos.org> */
+#include "ecore_private.h"
 #include "ecore_config_ipc.h"
 #include "ecore_config_util.h"
 #include "ecore_config_private.h"
@@ -19,7 +20,7 @@
 #include "Ecore_Config.h"
 #include "config.h"
 
-#if 1 /* FIXME - No prototypes? */
+
 /*****************************************************************************/
 
 static int
@@ -46,7 +47,7 @@ _ecore_config_ipc_ecore_string_get(char **m, char **r)
 }
 
 static char               *
-_ecore_config_ipc_global_prop_list(Ecore_Config_Server * srv, const long serial)
+_ecore_config_ipc_global_prop_list(Ecore_Config_Server * srv __UNUSED__, long serial __UNUSED__)
 {
    Ecore_Config_DB_File  *db;
    char                 **keys;
@@ -227,7 +228,7 @@ _ecore_config_ipc_ecore_handle_request(Ecore_Ipc_Server * server,
 /*****************************************************************************/
 
 static int
-_ecore_config_ipc_client_add(void *data, int type, void *event)
+_ecore_config_ipc_client_add(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Ipc_Server  **server;
    Ecore_Ipc_Event_Client_Data *e;
@@ -243,7 +244,7 @@ _ecore_config_ipc_client_add(void *data, int type, void *event)
 }
 
 static int
-_ecore_config_ipc_client_del(void *data, int type, void *event)
+_ecore_config_ipc_client_del(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Ipc_Server  **server;
    Ecore_Ipc_Event_Client_Data *e;
@@ -259,7 +260,7 @@ _ecore_config_ipc_client_del(void *data, int type, void *event)
 }
 
 static int
-_ecore_config_ipc_client_sent(void *data, int type, void *event)
+_ecore_config_ipc_client_sent(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Ipc_Server  **server;
    Ecore_Ipc_Event_Client_Data *e;
@@ -277,7 +278,7 @@ _ecore_config_ipc_client_sent(void *data, int type, void *event)
 /*****************************************************************************/
 
 int
-_ecore_config_mod_init(char *pipe_name, void **data)
+_ecore_config_mod_init(const char *pipe_name, void **data)
 {
    Ecore_Ipc_Server  **server;
    struct stat         st;
@@ -376,4 +377,3 @@ _ecore_config_mod_poll(void **data)
 }
 
 /*****************************************************************************/
-#endif
diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_private.h b/legacy/ecore/src/lib/ecore_config/ecore_config_private.h
index 543d74c7a5..d3bff9a89d 100644
--- a/legacy/ecore/src/lib/ecore_config/ecore_config_private.h
+++ b/legacy/ecore/src/lib/ecore_config/ecore_config_private.h
@@ -8,6 +8,10 @@ extern int               DEBUG;
 
 typedef struct _Ecore_Config_DB_File Ecore_Config_DB_File;
 
+int                   _ecore_config_mod_init(const char *pipe_name, void **data);
+int                   _ecore_config_mod_exit(void **data);
+int                   _ecore_config_mod_poll(void **data);
+
 Ecore_Config_DB_File *_ecore_config_db_open_read(const char *file);
 Ecore_Config_DB_File *_ecore_config_db_open_write(const char *file);
 void                  _ecore_config_db_close(Ecore_Config_DB_File *db);
diff --git a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
index ecb9c1c220..bd43673dc2 100644
--- a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
+++ b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
@@ -104,7 +104,7 @@ extern "C" {
    EAPI int               ecore_ipc_shutdown(void);
    
    /* FIXME: need to add protocol type parameter */
-   EAPI Ecore_Ipc_Server *ecore_ipc_server_add(Ecore_Ipc_Type type, char *name, int port, const void *data);
+   EAPI Ecore_Ipc_Server *ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void *data);
    
    /* FIXME: need to add protocol type parameter */
    EAPI Ecore_Ipc_Server *ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *data);
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
index 55e2687178..1c0903b337 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
@@ -271,7 +271,7 @@ ecore_ipc_shutdown(void)
  * @todo    Need to add protocol type parameter to this function.
  */
 Ecore_Ipc_Server *
-ecore_ipc_server_add(Ecore_Ipc_Type compl_type, char *name, int port, const void *data)
+ecore_ipc_server_add(Ecore_Ipc_Type compl_type, const char *name, int port, const void *data)
 {
    Ecore_Ipc_Server *svr;
    Ecore_Ipc_Type type;