diff --git a/legacy/ecore/src/lib/ecore_config/Ecore_Config.h b/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
index 073c3fc2d1..d8c96e5554 100644
--- a/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
+++ b/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
@@ -20,18 +20,6 @@
 /* FIXME: this should only be included if evas is present */
 # include <Evas.h>
 
-/* debug */
-# define DEBUG 1
-# undef ECORE_CONFIG_DEBUG
-
-# ifdef ECORE_CONFIG_DEBUG
-#  define D(fmt,args...) do { if(DEBUG>=0) fprintf(stderr,fmt,## args); } while(0);
-#  define E(lvl,args...) do { if(DEBUG>=(lvl)) fprintf(stderr,## args); } while(0)
-# else
-#  define D(msg,args...)
-#  define E(lvl,args...) do { } while(0)
-# endif
-
 # define ECORE_CONFIG_GLOBAL_ID "_system"
 
 /* structures */
diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config.c b/legacy/ecore/src/lib/ecore_config/ecore_config.c
index 9a7671e1ee..eb2486e539 100644
--- a/legacy/ecore/src/lib/ecore_config/ecore_config.c
+++ b/legacy/ecore/src/lib/ecore_config/ecore_config.c
@@ -1,5 +1,6 @@
 #include "Ecore_Config.h"
 #include "config.h"
+#include "ecore_config_private.h"
 
 #include <string.h>
 #include <ctype.h>
@@ -1256,6 +1257,12 @@ ecore_config_init(char *name)
    char               *buf, *p, *path;
    Ecore_Config_Prop  *sys;
 
+   DEBUG = -1;
+   if ((p = getenv("ECORE_CONFIG_DEBUG")) && strlen(p) > 0)
+     {
+	DEBUG = atoi(p);
+     }
+
    __ecore_config_app_name = strdup(name);
    __ecore_config_server_local = ecore_config_init_local(name);
    if (!__ecore_config_server_local)
diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_private.h b/legacy/ecore/src/lib/ecore_config/ecore_config_private.h
new file mode 100644
index 0000000000..90a2072b9f
--- /dev/null
+++ b/legacy/ecore/src/lib/ecore_config/ecore_config_private.h
@@ -0,0 +1,14 @@
+#ifndef _ECORE_CONFIG_PRIVATE_H
+# define _ECORE_CONFIG_PRIVATE_H
+
+/* debug */
+int               DEBUG;
+# define D(fmt,args...) do { if(DEBUG>=0) fprintf(stderr,fmt,## args); } while(0);
+# define E(lvl,args...) do { if(DEBUG>=(lvl)) fprintf(stderr,## args); } while(0)
+
+
+
+
+
+
+#endif
diff --git a/legacy/ecore/src/lib/ecore_config/edb.c b/legacy/ecore/src/lib/ecore_config/edb.c
index 1e2721700d..d5ba50e0fb 100644
--- a/legacy/ecore/src/lib/ecore_config/edb.c
+++ b/legacy/ecore/src/lib/ecore_config/edb.c
@@ -1,6 +1,8 @@
 #include <Edb.h>
 #include "Ecore_Config.h"
 
+#include "ecore_config_private.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/legacy/ecore/src/lib/ecore_config/ipc_ecore.c b/legacy/ecore/src/lib/ecore_config/ipc_ecore.c
index 955e0c2f40..7a5a90c61b 100644
--- a/legacy/ecore/src/lib/ecore_config/ipc_ecore.c
+++ b/legacy/ecore/src/lib/ecore_config/ipc_ecore.c
@@ -3,6 +3,8 @@
 #include "ipc.h"
 #include "util.h"
 
+#include "ecore_config_private.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -56,6 +58,8 @@ _ecore_config_ipc_global_prop_list(Ecore_Config_Server * srv, const long serial)
    int                 f;
    char               *buf, *p, *type, *data;
 
+   db = NULL;
+   buf = NULL;
    s = estring_new(8192);
    f = 0;
    if ((p = getenv("HOME")))
diff --git a/legacy/ecore/src/lib/ecore_config/ipc_main.c b/legacy/ecore/src/lib/ecore_config/ipc_main.c
index 17ef3116b2..585f2255f4 100644
--- a/legacy/ecore/src/lib/ecore_config/ipc_main.c
+++ b/legacy/ecore/src/lib/ecore_config/ipc_main.c
@@ -6,6 +6,7 @@
 #include "ipc.h"
 
 #include "config.h"
+#include "ecore_config_private.h"
 
 #include <signal.h>
 #include <dlfcn.h>
diff --git a/legacy/ecore/src/lib/ecore_config/util.c b/legacy/ecore/src/lib/ecore_config/util.c
index 7f7c1e1203..d926e69886 100644
--- a/legacy/ecore/src/lib/ecore_config/util.c
+++ b/legacy/ecore/src/lib/ecore_config/util.c
@@ -19,6 +19,8 @@
 #include "Ecore_Config.h"
 #include "util.h"
 
+#include "ecore_config_private.h"
+
 #define CHUNKLEN 4096
 
 /*****************************************************************************/