diff --git a/elm_code/lib/elm_code.c b/elm_code/lib/elm_code.c
index 9b895f5..d1e3282 100644
--- a/elm_code/lib/elm_code.c
+++ b/elm_code/lib/elm_code.c
@@ -3,20 +3,21 @@
 #endif
 
 #include <Eo.h>
+#include <Evas.h>
 
 #include "Elm_Code.h"
-#include "elm_code_parse.h"
 
 #include "elm_code_private.h"
 
 static int _elm_code_init = 0;
 int _elm_code_lib_log_dom = -1;
 
-const Eo_Event_Description ELM_CODE_EVENT_LINE_SET_DONE =
+EAPI const Eo_Event_Description ELM_CODE_EVENT_LINE_SET_DONE =
     EO_EVENT_DESCRIPTION("line,set,done", "");
-const Eo_Event_Description ELM_CODE_EVENT_FILE_LOAD_DONE =
+EAPI const Eo_Event_Description ELM_CODE_EVENT_FILE_LOAD_DONE =
     EO_EVENT_DESCRIPTION("file,load,done", "");
 
+
 EAPI int
 elm_code_init(void)
 {
diff --git a/elm_code/lib/elm_code_file.c b/elm_code/lib/elm_code_file.c
index 6c1944e..b4d7833 100644
--- a/elm_code/lib/elm_code_file.c
+++ b/elm_code/lib/elm_code_file.c
@@ -3,8 +3,6 @@
 #endif
 
 #include "Elm_Code.h"
-#include "elm_code_file.h"
-#include "elm_code_parse.h"
 
 #include "elm_code_private.h"
 
diff --git a/elm_code/lib/elm_code_parse.c b/elm_code/lib/elm_code_parse.c
index 2b1ddc2..0503aa0 100644
--- a/elm_code/lib/elm_code_parse.c
+++ b/elm_code/lib/elm_code_parse.c
@@ -3,7 +3,6 @@
 #endif
 
 #include "Elm_Code.h"
-#include "elm_code_parse.h"
 
 #include "elm_code_private.h"
 
diff --git a/elm_code/lib/elm_code_widget.c b/elm_code/lib/elm_code_widget.c
index 24a70d6..e7bcd7b 100644
--- a/elm_code/lib/elm_code_widget.c
+++ b/elm_code/lib/elm_code_widget.c
@@ -5,7 +5,7 @@
 #include <Eo.h>
 #include <Elementary.h>
 
-#include "elm_code_widget.h"
+#include "Elm_Code.h"
 
 #include "elm_code_private.h"